3344 files changed, 72292 insertions, 44523 deletions

diff --git a/.gitignore b/.gitignore
index e1be781d50..344d651bf5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,8 @@ php_errors.log
 /plugins/ImageGraph/fonts/unifont.ttf
 /plugins/ImageGraph/fonts/unifont.ttf.zip
 /plugins/*/tests/System/processed
+/plugins/*/tests/UI/processed-ui-screenshots
+/plugins/*/tests/UI/screenshot-diffs
 /robots.txt
 /tmp/
 /vendor/
@@ -55,3 +57,5 @@ php_errors.log
 /tests/PHPUnit/proxy/plugins
 /tests/PHPUnit/proxy/tests
 /config/*.config.ini.php
+/Vagrantfile
+/misc/vagrant
diff --git a/.gitmodules b/.gitmodules
index 26ff2ad741..8d1fb3ee9c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,32 +1,41 @@
-[submodule "plugins/PleineLune"]
-	path = plugins/PleineLune
-	url = https://github.com/piwik/theme-PleineLune.git
-	branch = master
 [submodule "plugins/SecurityInfo"]
-	path = plugins/SecurityInfo
-	url = https://github.com/piwik/plugin-SecurityInfo.git
-	branch = master
+    path = plugins/SecurityInfo
+    url = https://github.com/piwik/plugin-SecurityInfo.git
+    branch = master
 [submodule "plugins/TreemapVisualization"]
-	path = plugins/TreemapVisualization
-	url = https://github.com/piwik/plugin-TreemapVisualization.git
-	branch = master
+    path = plugins/TreemapVisualization
+    url = https://github.com/piwik/plugin-TreemapVisualization.git
+    branch = master
 [submodule "plugins/VisitorGenerator"]
-	path = plugins/VisitorGenerator
-	url = https://github.com/piwik/plugin-VisitorGenerator.git
-	branch = master
-[submodule "tests/PHPUnit/UI"]
-	path = tests/PHPUnit/UI
-	url = https://github.com/piwik/piwik-ui-tests.git
-	branch = master
+    path = plugins/VisitorGenerator
+    url = https://github.com/piwik/plugin-VisitorGenerator.git
+    branch = master
 [submodule "plugins/CustomAlerts"]
-	path = plugins/CustomAlerts
-	url = https://github.com/piwik/plugin-CustomAlerts.git
-	branch = master
+    path = plugins/CustomAlerts
+    url = https://github.com/piwik/plugin-CustomAlerts.git
+    branch = master
 [submodule "plugins/TasksTimetable"]
-	path = plugins/TasksTimetable
-	url = https://github.com/piwik/plugin-TasksTimetable.git
+    path = plugins/TasksTimetable
+    url = https://github.com/piwik/plugin-TasksTimetable.git
     branch = master
 [submodule "plugins/LoginHttpAuth"]
-	path = plugins/LoginHttpAuth
-	url = https://github.com/piwik/plugin-LoginHttpAuth.git
+    path = plugins/LoginHttpAuth
+    url = https://github.com/piwik/plugin-LoginHttpAuth.git
+    branch = master
+[submodule "plugins/QueuedTracking"]
+    path = plugins/QueuedTracking
+    url = https://github.com/piwik/plugin-QueuedTracking.git
+    branch = master
+[submodule "tests/UI/expected-ui-screenshots"]
+    path = tests/UI/expected-ui-screenshots
+    url = https://github.com/piwik/piwik-ui-tests.git
+
+# Note: when you add a submodule that SHOULD be left in the packaged release such as the few submodules below,
+#       then you MUST add these submodules names in the SUBMODULES_PACKAGED_WITH_CORE variable in:
+#       https://github.com/piwik/piwik-package/blob/master/scripts/build-package.sh
+
+
+[submodule "libs/PiwikTracker"]
+    path = libs/PiwikTracker
+    url = https://github.com/piwik/piwik-php-tracker.git
     branch = master
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 555eaaf2bf..b52ca59452 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -5,13 +5,16 @@ tools:
     config:
       check_variables:
         enabled: false
+    dependency_paths:
+      - libs/
 
 filter:
+  paths:
+    - core/
+    - plugins/
   excluded_paths:
-    - 'tests/*'
-    - 'libs/*'
-    - 'misc/*'
-    - 'lang/*'
+    - '*/tests/*'
+    - '*/Test/*'
 
 build:
   environment:
diff --git a/.travis.yml b/.travis.yml
index e5f317ffef..e89e27b2ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,9 +11,12 @@ language: php
 
 php:
   - 5.6
-  - 5.3.3
+  - 5.3
 #  - hhvm
 
+services:
+  - redis-server
+
 # Separate different test suites
 env:
   matrix:
@@ -27,6 +30,7 @@ env:
     # All tests after another
     - TEST_SUITE=AllTests MYSQL_ADAPTER=PDO_MYSQL
     - TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI
+    - TEST_SUITE=UITests MYSQL_ADAPTER=PDO_MYSQL
   global:
     - PIWIK_ROOT_DIR=$TRAVIS_BUILD_DIR
     - secure: "AMhZmPZx4SUcuZRBzGHlQPxzM4D8FvFB3UThDa52gbi9KIBrwcumzV2VGi6B\n5fgjwtB4XTE1In7qhY2HMikPWBmWYYOQ5QcMPJsqqHt4iMmahx8WKzne6NOk\nNpqAuje/fulNGeP2LJZi0nrub3Fh4VwXaOvpNloKNQN/2JuqPtM="
@@ -37,17 +41,15 @@ matrix:
   fast_finish: true
   allow_failures:
     - php: hhvm
-    - php: 5.6
-      env: MYSQL_ADAPTER=PDO_MYSQL COVERAGE=Integration
-    - php: 5.6
-      env: MYSQL_ADAPTER=PDO_MYSQL COVERAGE=Unit
   exclude:
-    # Run test suites separately only on PHP 5.4 with PDO
-    - php: 5.3.3
+    # Run test suites separately only on PHP 5.6 with PDO
+    - php: 5.3
       env: TEST_SUITE=SystemTests MYSQL_ADAPTER=PDO_MYSQL
-    - php: 5.3.3
+    - php: 5.3
       env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL
-    - php: 5.3.3
+    - php: 5.3
+      env: TEST_SUITE=AllTests MYSQL_ADAPTER=PDO_MYSQL
+    - php: 5.3
       env: TEST_SUITE=UnitTests MYSQL_ADAPTER=PDO_MYSQL
     - php: hhvm
       env: TEST_SUITE=SystemTests MYSQL_ADAPTER=PDO_MYSQL
@@ -55,20 +57,23 @@ matrix:
       env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL
     - php: hhvm
       env: TEST_SUITE=UnitTests MYSQL_ADAPTER=PDO_MYSQL
+    # run UI tests on PHP 5.3 only
+    - php: 5.6
+      env: TEST_SUITE=UITests MYSQL_ADAPTER=PDO_MYSQL
     # run all tests not on PHP 5.6 and run MySQLI tests only on 5.6
     - php: 5.6
       env: TEST_SUITE=AllTests MYSQL_ADAPTER=PDO_MYSQL
-    - php: 5.3.3
+    - php: 5.3
       env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI
     - php: hhvm
       env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI
     # Javascript tests need to run only on one PHP version
-    - php: 5.3.3
+    - php: 5.3
       env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL
     - php: hhvm
       env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL
     # AngularJS tests need to run only on one PHP version
-    - php: 5.3.3
+    - php: 5.3
       env: TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL
     - php: hhvm
       env: TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL
@@ -80,17 +85,23 @@ before_install:
   - '[[ "$TRAVIS_PHP_VERSION" == 5.3* ]] && export USE_ZEND_ALLOC=0 || true'
 
 install:
+  - git fetch -q
+
   # make sure travis test scripts are always latest (so in older releases/branches, the latest scripts will still be used)
-  - git fetch
-  - git checkout master -- ./tests/travis ./plugins/TestRunner || true
+  - git checkout master -q -- ./tests/travis ./plugins/TestRunner || true
 
 before_script:
+  - ./tests/travis/install_mysql_5.6.sh
+
   - if ([ -z "$TEST_SUITE" ] || [ -n "$PLUGIN_NAME" ]);
     then composer require satooshi/php-coveralls dev-master;
     else
     phpenv config-rm xdebug.ini;
     fi
 
+  # add always_populate_raw_post_data=-1 to php.ini
+  - echo "always_populate_raw_post_data=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+
   - ./tests/travis/configure_git.sh
 
   # print out mysql information
@@ -99,14 +110,15 @@ before_script:
 
   # configure mysql
   - mysql -e "SET GLOBAL sql_mode = 'NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES'" # Travis default
+  # try to avoid mysql has gone away errors
+  - mysql -e "SET GLOBAL wait_timeout = 36000;"
+  - mysql -e "SET GLOBAL max_allowed_packet = 134209536;"
+  - mysql -e "SHOW VARIABLES LIKE 'max_allowed_packet';"
+  - mysql -e "SHOW VARIABLES LIKE 'wait_timeout';"
 
-  # Uncomment to enable sql_mode STRICT_TRANS_TABLES (new default in Mysql 5.6)
-  - mysql -e "SET GLOBAL sql_mode = 'NO_ENGINE_SUBSTITUTION'"
   - mysql -e "SELECT @@sql_mode;"
-  - mysql -e "SHOW GLOBAL VARIABLES;"
+  # - mysql -e "SHOW GLOBAL VARIABLES;"
 
-  # Start UI tests
-  - ./tests/travis/initiate_ui_tests.sh
   # travis now complains about this failing 9 times out of 10, so removing it. hopefully the random failures it prevented won't come back
   # - travis_retry composer self-update
 
@@ -115,13 +127,14 @@ before_script:
   # print out more debugging info
   - uname -a
   - date
+  # - php -i
   - php -r "var_dump(gd_info());"
   - mysql -e 'create database piwik_tests;'
 
   # Make sure we use Python 2.6
   - travis_retry sudo add-apt-repository ppa:fkrull/deadsnakes -y
-  - travis_retry sudo apt-get update
-  - travis_retry sudo apt-get install python2.6 python2.6-dev -y --force-yes
+  - travis_retry sudo apt-get update > /dev/null
+  - travis_retry sudo apt-get install python2.6 python2.6-dev -y --force-yes > /dev/null
 
   # Log Analytics works with Python 2.6 or 2.7 but we want to test on 2.6
   - python2.6 --version
@@ -130,7 +143,7 @@ before_script:
   - ./tests/travis/prepare.sh
   - ./tests/travis/setup_webserver.sh
 
-  - export GENERATE_TRAVIS_YML_COMMAND="php ./console generate:travis-yml --core"
+  - export GENERATE_TRAVIS_YML_COMMAND="php ./console generate:travis-yml --core --verbose"
   - ./tests/travis/autoupdate_travis_yml.sh
 
   - cd tests/PHPUnit
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c336a07228..f1a8eb4e96 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,21 +1,82 @@
 # Piwik Platform Changelog
 
-This is a changelog for Piwik platform developers. All changes for our HTTP API's, Plugins, Themes, etc will be listed here. 
+This is a changelog for Piwik platform developers. All changes for our HTTP API's, Plugins, Themes, etc will be listed here.
+
+## Piwik 2.11.0
+
+### Breaking Changes
+* The event `User.getLanguage` has been removed.
+* The following deprecated event has been removed: `TaskScheduler.getScheduledTasks`
+* Special handling for operating system `Windows` has been removed. Like other operating systems all versions will now only be reported as `Windows` with versions like `XP`, `7`, `8`, etc.
+* Reporting for operating systems has been adjusted to report information according to browser information. Visitor details now contain: `operatingSystemName`, `operatingSystemIcon`, `operatingSystemCode` and `operatingSystemVersion`
+
+### Deprecations
+* The following methods have been deprecated in favor of the new `Piwik\Intl` component:
+  * `Piwik\Common::getContinentsList()`: use `RegionDataProvider::getContinentList()` instead
+  * `Piwik\Common::getCountriesList()`: use `RegionDataProvider::getCountryList()` instead
+  * `Piwik\Common::getLanguagesList()`: use `LanguageDataProvider::getLanguageList()` instead
+  * `Piwik\Common::getLanguageToCountryList()`: use `LanguageDataProvider::getLanguageToCountryList()` instead
+  * `Piwik\Metrics\Formatter::getCurrencyList()`: use `CurrencyDataProvider::getCurrencyList()` instead
+* The `Piwik\Translate` class has been deprecated in favor of `Piwik\Translation\Translator`.
+* The `core:plugin` console has been deprecated in favor of the new `plugin:list`, `plugin:activate` and `plugin:deactivate` commands
+* The following classes have been deprecated:
+  * `Piwik\TaskScheduler`: use `Piwik\Scheduler\Scheduler` instead
+  * `Piwik\ScheduledTask`: use `Piwik\Scheduler\Task` instead
+* The API method `UserSettings.getLanguage` is deprecated and will be removed from May 1st 2015. Use `UserLanguage.getLanguage` instead
+* The API method `UserSettings.getLanguageCode` is deprecated and will be removed from May 1st 2015. Use `UserLanguage.getLanguageCode` instead
+* The `Piwik\Registry` class has been deprecated in favor of using the container:
+  * `Registry::get('auth')` should be replaced with `StaticContainer::get('Piwik\Auth')`
+  * `Registry::set('auth', $auth)` should be replaced with `StaticContainer::getContainer()->set('Piwik\Auth', $auth)`
+ 
+### New features
+* You can now generate UI / screenshot tests using the command `generate:test`
+* During UI tests we do now add a CSS class to the HTML element called `uiTest`. This allows you do hide content when screenshots are captured.
+
+### New commands
+* A new command (core:fix-duplicate-log-actions) has been added which can be used to remove duplicate actions and correct references to them in other tables. Duplicates were caused by this bug: https://github.com/piwik/piwik/issues/6436
+
+### Library updates
+* Updated AngularJS from 1.2.26 to 1.2.28
+* Updated piwik/device-detector from 2.8 to 3.0
+
+### Internal change
+* UI specs were moved from `tests/PHPUnit/UI` to `tests/UI`. We also moved the UI specs directly into the Piwik repository meaning the [piwik-ui-tests](https://github.com/piwik/piwik-ui-tests) repository contains only the expected screenshots from now on.
+* There is a new command `development:sync-system-test-processed` for core developers that allows you to copy processed test results from travis to your local dev environment.
 
 ## Piwik 2.10.0
 
 ### Breaking Changes
-* Some duplicate reports from UserSettings plugin have been removed. Widget URLs for those reports will still work till May 1st 2015. Please update those to the new reports of DevicesDetection plugin.
-* API responses containing visitor information will now longer contain the fields `screenType` and `screenTypeIcon` as those reports have been completely removed
+* API responses containing visitor information will no longer contain the fields `screenType` and `screenTypeIcon` as those reports have been completely removed
+* os, browser and browser plugin icons are now located in the DevicesDetection and DevicePlugins plugin. If you are not using the Reporting or Metadata API to get the icon locations please update your paths.
+* The deprecated method `Piwik\SettingsPiwik::rewriteTmpPathWithHostname()` has been removed.
+* The following events have been removed:
+  * `Log.formatFileMessage`
+  * `Log.formatDatabaseMessage`
+  * `Log.formatScreenMessage`
+  * These events have been removed as Piwik now uses the Monolog logging library. [Learn more.](http://developer.piwik.org/guides/logging)
+* The event `Log.getAvailableWriters` has been removed: to add custom log backends, you now need to configure Monolog handlers
+* The INI options `log_only_when_cli` and `log_only_when_debug_parameter` have been removed
+
+### Library updates
+* We added the `symfony/var-dumper` library allowing you to better print any arbitrary PHP variable via `dump($var1, $var2, ...)`.
+* Piwik now uses [Monolog](https://github.com/Seldaek/monolog) as a logger.
+* The tracker proxy (previously in `misc/proxy-hide-piwik-url/`) has been moved to a separate repository: [https://github.com/piwik/tracker-proxy](https://github.com/piwik/tracker-proxy).
 
 ### Deprecations
+* Some duplicate reports from UserSettings plugin have been removed. Widget URLs for those reports will still work till May 1st 2015. Please update those to the new reports of DevicesDetection plugin.
 * The API method `UserSettings.getBrowserVersion` is deprecated and will be removed from May 1st 2015. Use `DevicesDetection.getBrowserVersions` instead
 * The API method `UserSettings.getBrowser` is deprecated and will be removed from May 1st 2015. Use `DevicesDetection.getBrowsers` instead
 * The API method `UserSettings.getOSFamily` is deprecated and will be removed from May 1st 2015. Use `DevicesDetection.getOsFamilies` instead
 * The API method `UserSettings.getOS` is deprecated and will be removed from May 1st 2015. Use `DevicesDetection.getOsVersions` instead
 * The API method `UserSettings.getMobileVsDesktop` is deprecated and will be removed from May 1st 2015. Use `DevicesDetection.getType` instead
 * The API method `UserSettings.getBrowserType` is deprecated and will be removed from May 1st 2015. Use `DevicesDetection.getBrowserEngines` instead
-* The API method `UserSettings.getWideScreen` has been removed
+* The API method `UserSettings.getResolution` is deprecated and will be removed from May 1st 2015. Use `Resolution.getResolution` instead
+* The API method `UserSettings.getConfiguration` is deprecated and will be removed from May 1st 2015. Use `Resolution.getConfiguration` instead
+* The API method `UserSettings.getPlugin` is deprecated and will be removed from May 1st 2015. Use `DevicePlugins.getPlugin` instead
+* The API method `UserSettings.getWideScreen` has been removed. Use `UserSettings.getScreenType` instead.
+* `Piwik\SettingsPiwik::rewriteTmpPathWithInstanceId()` has been deprecated. Instead of hardcoding the `tmp/` path everywhere in the codebase and then calling `rewriteTmpPathWithInstanceId()`, developers should get the `path.tmp` configuration value from the DI container (e.g. `StaticContainer::getContainer()->get('path.tmp')`).
+* The method `Piwik\Log::setLogLevel()` has been deprecated
+* The method `Piwik\Log::getLogLevel()` has been deprecated
 
 ## Piwik 2.9.1
 
@@ -28,14 +89,6 @@ This is a changelog for Piwik platform developers. All changes for our HTTP API'
 ### New commands
 * `core:plugin list` lists all plugins currently activated in Piwik.
 
-## Piwik 2.10.0
-
-### Breaking Changes
-* The deprecated method `Piwik\SettingsPiwik::rewriteTmpPathWithHostname()` has been removed.
-
-### Deprecations
-* `Piwik\SettingsPiwik::rewriteTmpPathWithInstanceId()` has been deprecated. Instead of hardcoding the `tmp/` path everywhere in the codebase and then calling `rewriteTmpPathWithInstanceId()`, developers should get the `path.tmp` configuration value from the DI container (e.g. `StaticContainer::getContainer()->get('path.tmp')`).
-
 ## Piwik 2.9.0
 
 ### Breaking Changes
diff --git a/README.md b/README.md
index 4d3302298d..49ec6f8ae4 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@ We are grateful if you can share the Job Description with your friends and colle
 The Piwik project uses an ever-expanding comprehensive set of thousands of unit and integration tests and dozens of system [tests](https://github.com/piwik/piwik/tree/master/tests),
  running on the hosted distributed continuous integration platform Travis-CI.
 
-Build status (master branch) [![Build Status](https://travis-ci.org/piwik/piwik.svg?branch=master)](https://travis-ci.org/piwik/piwik) - Screenshot tests Build  [![Build Status](https://travis-ci.org/piwik/piwik-ui-tests.svg?branch=master)](https://travis-ci.org/piwik/piwik-ui-tests)
+Build status (master branch) [![Build Status](https://travis-ci.org/piwik/piwik.svg?branch=master)](https://travis-ci.org/piwik/piwik)
 
 Code Coverage: [![Code Coverage](https://scrutinizer-ci.com/g/piwik/piwik/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/piwik/piwik/?branch=master)
 
diff --git a/SECURITY.md b/SECURITY.md
index 36ef067a5b..7834108ad5 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -7,7 +7,7 @@ The Piwik Security Bug Bounty Program is designed to encourage security research
 
 ## Responsible disclosure by email
 
-If you have found a securty issue in Piwik please read [our security notes](http://piwik.org/security/) regarding responsible disclosures.
+If you have found a security issue in Piwik please read [our security notes](http://piwik.org/security/) regarding responsible disclosures.
 
 [Email your Report Vulnerability to the Piwik Security team](mailto:security@piwik.org?subject=Reporting%20Vulnerability%20in%20Piwik)
 
diff --git a/composer.json b/composer.json
index 91fffba957..959c0a7a34 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
     "support": {
         "forum": "http://forum.piwik.org/",
         "issues": "https://github.com/piwik/piwik/issues",
-        "wiki": "http://dev.piwik.org/",
+        "wiki": "https://github.com/piwik/piwik/wiki",
         "source": "https://github.com/piwik/piwik"
     },
     "autoload": {
@@ -39,19 +39,26 @@
         "php": ">=5.3.3",
         "twig/twig": "~1.0",
         "leafo/lessphp": "~0.4.0",
-        "symfony/console": "~2.3",
+        "symfony/console": "~2.6",
         "tedivm/jshrink": "~0.5.1",
         "mustangostang/spyc": "~0.5.0",
-        "piwik/device-detector": "~2.0",
+        "piwik/device-detector": "~3.0",
         "piwik/decompress": "~0.1.1",
         "piwik/network": "~0.1.0",
-        "mnapoli/php-di": "5.0.x-dev"
+        "piwik/cache": "~0.2.5",
+        "piwik/ini": "~1.0,>=1.0.3",
+        "mnapoli/php-di": "5.0.x-dev",
+        "psr/log": "~1.0",
+        "monolog/monolog": "~1.11",
+        "symfony/monolog-bridge": "~2.6",
+        "symfony/event-dispatcher": "~2.6"
     },
     "require-dev": {
         "aws/aws-sdk-php": "2.7.1",
         "phpunit/phpunit": "~4.1",
         "facebook/xhprof": "dev-master",
-        "phpseclib/phpseclib": "~0.3.8"
+        "phpseclib/phpseclib": "~0.3.8",
+        "symfony/var-dumper": "~2.6"
     },
     "repositories": [
         {
diff --git a/composer.lock b/composer.lock
index 3f75b72182..2d48b31a06 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,20 +4,20 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "92499fc432a629fefcd5c1b912e44d9c",
+    "hash": "ad2f11fd442b91f4ac1e6a131d664f96",
     "packages": [
         {
             "name": "container-interop/container-interop",
-            "version": "1.0.0",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/container-interop/container-interop.git",
-                "reference": "b4274c871bfd1ae8d8e527ba11734f4df1573e48"
+                "reference": "fc08354828f8fd3245f77a66b9e23a6bca48297e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/container-interop/container-interop/zipball/b4274c871bfd1ae8d8e527ba11734f4df1573e48",
-                "reference": "b4274c871bfd1ae8d8e527ba11734f4df1573e48",
+                "url": "https://api.github.com/repos/container-interop/container-interop/zipball/fc08354828f8fd3245f77a66b9e23a6bca48297e",
+                "reference": "fc08354828f8fd3245f77a66b9e23a6bca48297e",
                 "shasum": ""
             },
             "type": "library",
@@ -31,20 +31,20 @@
                 "MIT"
             ],
             "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
-            "time": "2014-03-16 14:50:05"
+            "time": "2014-12-30 15:22:37"
         },
         {
             "name": "doctrine/annotations",
-            "version": "v1.2.1",
+            "version": "v1.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/annotations.git",
-                "reference": "6a6bec0670bb6e71a263b08bc1b98ea242928633"
+                "reference": "eeda578cbe24a170331a1cfdf78be723412df7a4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/6a6bec0670bb6e71a263b08bc1b98ea242928633",
-                "reference": "6a6bec0670bb6e71a263b08bc1b98ea242928633",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/eeda578cbe24a170331a1cfdf78be723412df7a4",
+                "reference": "eeda578cbe24a170331a1cfdf78be723412df7a4",
                 "shasum": ""
             },
             "require": {
@@ -99,20 +99,20 @@
                 "docblock",
                 "parser"
             ],
-            "time": "2014-09-25 16:45:30"
+            "time": "2014-12-20 20:49:38"
         },
         {
             "name": "doctrine/cache",
-            "version": "v1.3.1",
+            "version": "v1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/cache.git",
-                "reference": "cf483685798a72c93bf4206e3dd6358ea07d64e7"
+                "reference": "2346085d2b027b233ae1d5de59b07440b9f288c8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/cf483685798a72c93bf4206e3dd6358ea07d64e7",
-                "reference": "cf483685798a72c93bf4206e3dd6358ea07d64e7",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/2346085d2b027b233ae1d5de59b07440b9f288c8",
+                "reference": "2346085d2b027b233ae1d5de59b07440b9f288c8",
                 "shasum": ""
             },
             "require": {
@@ -123,6 +123,7 @@
             },
             "require-dev": {
                 "phpunit/phpunit": ">=3.7",
+                "predis/predis": "~0.8",
                 "satooshi/php-coveralls": "~0.6"
             },
             "type": "library",
@@ -168,26 +169,31 @@
                 "cache",
                 "caching"
             ],
-            "time": "2014-09-17 14:24:04"
+            "time": "2015-01-15 20:38:55"
         },
         {
             "name": "doctrine/lexer",
-            "version": "v1.0",
+            "version": "v1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/lexer.git",
-                "reference": "2f708a85bb3aab5d99dab8be435abd73e0b18acb"
+                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/2f708a85bb3aab5d99dab8be435abd73e0b18acb",
-                "reference": "2f708a85bb3aab5d99dab8be435abd73e0b18acb",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
+                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.2"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
             "autoload": {
                 "psr-0": {
                     "Doctrine\\Common\\Lexer\\": "lib/"
@@ -199,19 +205,16 @@
             ],
             "authors": [
                 {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com",
-                    "homepage": "http://www.instaclick.com"
-                },
-                {
                     "name": "Roman Borschel",
                     "email": "roman@code-factory.org"
                 },
                 {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
                     "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com",
-                    "homepage": "https://github.com/schmittjoh",
-                    "role": "Developer of wrapped JMSSerializerBundle"
+                    "email": "schmittjoh@gmail.com"
                 }
             ],
             "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
@@ -220,7 +223,7 @@
                 "lexer",
                 "parser"
             ],
-            "time": "2013-01-12 18:59:04"
+            "time": "2014-09-09 13:34:57"
         },
         {
             "name": "leafo/lessphp",
@@ -269,28 +272,29 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/mnapoli/PHP-DI.git",
-                "reference": "27341c05b930e3768f19f4c4b20eec14ce84bd06"
+                "reference": "ee5145095555c4532220eab991bf7782e9a645c6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mnapoli/PHP-DI/zipball/27341c05b930e3768f19f4c4b20eec14ce84bd06",
-                "reference": "27341c05b930e3768f19f4c4b20eec14ce84bd06",
+                "url": "https://api.github.com/repos/mnapoli/PHP-DI/zipball/ee5145095555c4532220eab991bf7782e9a645c6",
+                "reference": "ee5145095555c4532220eab991bf7782e9a645c6",
                 "shasum": ""
             },
             "require": {
                 "container-interop/container-interop": "~1.0",
-                "doctrine/annotations": "1.*",
-                "doctrine/cache": "1.*",
+                "doctrine/annotations": "~1.2",
+                "doctrine/cache": "~1.0",
                 "mnapoli/phpdocreader": "~1.3",
-                "myclabs/php-enum": "1.*",
+                "myclabs/php-enum": "~1.1",
                 "php": ">=5.3.3"
             },
             "require-dev": {
-                "ocramius/proxy-manager": "~0.3",
-                "phpunit/phpunit": "~4.0"
+                "mnapoli/phpunit-easymock": "~0.1.1",
+                "ocramius/proxy-manager": "~0.5",
+                "phpunit/phpunit": "~4.4"
             },
             "suggest": {
-                "ocramius/proxy-manager": "Install it if you want to use lazy injection"
+                "ocramius/proxy-manager": "Install it if you want to use lazy injection (version ~0.5)"
             },
             "type": "library",
             "extra": {
@@ -299,10 +303,8 @@
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "DI\\": "src/",
-                    "IntegrationTests\\": "tests/",
-                    "UnitTests\\": "tests/"
+                "psr-4": {
+                    "DI\\": "src/DI/"
                 },
                 "files": [
                     "src/DI/functions.php"
@@ -319,7 +321,7 @@
                 "dependency injection",
                 "di"
             ],
-            "time": "2014-11-12 03:18:24"
+            "time": "2015-01-29 03:02:32"
         },
         {
             "name": "mnapoli/phpdocreader",
@@ -357,6 +359,78 @@
             "time": "2014-08-21 08:20:45"
         },
         {
+            "name": "monolog/monolog",
+            "version": "1.12.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Seldaek/monolog.git",
+                "reference": "1fbe8c2641f2b163addf49cc5e18f144bec6b19f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1fbe8c2641f2b163addf49cc5e18f144bec6b19f",
+                "reference": "1fbe8c2641f2b163addf49cc5e18f144bec6b19f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0",
+                "psr/log": "~1.0"
+            },
+            "provide": {
+                "psr/log-implementation": "1.0.0"
+            },
+            "require-dev": {
+                "aws/aws-sdk-php": "~2.4, >2.4.8",
+                "doctrine/couchdb": "~1.0@dev",
+                "graylog2/gelf-php": "~1.0",
+                "phpunit/phpunit": "~4.0",
+                "raven/raven": "~0.5",
+                "ruflin/elastica": "0.90.*",
+                "videlalvaro/php-amqplib": "~2.4"
+            },
+            "suggest": {
+                "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
+                "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
+                "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
+                "ext-mongo": "Allow sending log messages to a MongoDB server",
+                "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
+                "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"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.12.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Monolog\\": "src/Monolog"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
+            "homepage": "http://github.com/Seldaek/monolog",
+            "keywords": [
+                "log",
+                "logging",
+                "psr-3"
+            ],
+            "time": "2014-12-29 21:29:35"
+        },
+        {
             "name": "mustangostang/spyc",
             "version": "0.5.1",
             "source": {
@@ -405,34 +479,94 @@
         },
         {
             "name": "myclabs/php-enum",
-            "version": "1.2.1",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/php-enum.git",
-                "reference": "b52c2f215f5b251693369309ea7f537f9d92ec5e"
+                "reference": "c0bcd731d26d53d3db280cca0af33b3cd99fbafe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/php-enum/zipball/b52c2f215f5b251693369309ea7f537f9d92ec5e",
-                "reference": "b52c2f215f5b251693369309ea7f537f9d92ec5e",
+                "url": "https://api.github.com/repos/myclabs/php-enum/zipball/c0bcd731d26d53d3db280cca0af33b3cd99fbafe",
+                "reference": "c0bcd731d26d53d3db280cca0af33b3cd99fbafe",
                 "shasum": ""
             },
+            "require": {
+                "php": ">=5.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.*",
+                "squizlabs/php_codesniffer": "1.*"
+            },
             "type": "library",
             "autoload": {
-                "psr-0": {
-                    "MyCLabs": "src/"
+                "psr-4": {
+                    "MyCLabs\\Enum\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
+            "authors": [
+                {
+                    "name": "PHP Enum contributors",
+                    "homepage": "https://github.com/myclabs/php-enum/graphs/contributors"
+                }
+            ],
             "description": "PHP Enum implementation",
             "homepage": "http://github.com/myclabs/php-enum",
             "keywords": [
                 "enum"
             ],
-            "time": "2013-11-11 18:29:08"
+            "time": "2015-01-30 22:06:24"
+        },
+        {
+            "name": "piwik/cache",
+            "version": "0.2.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/piwik/component-cache.git",
+                "reference": "e97ed763c6e710734194664099edd5ee7a41d6b0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/piwik/component-cache/zipball/e97ed763c6e710734194664099edd5ee7a41d6b0",
+                "reference": "e97ed763c6e710734194664099edd5ee7a41d6b0",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/cache": "~1.4",
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Piwik\\Cache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "The Piwik Team",
+                    "email": "hello@piwik.org",
+                    "homepage": "http://piwik.org/the-piwik-team/"
+                }
+            ],
+            "description": "PHP caching library based on Doctrine cache",
+            "keywords": [
+                "array",
+                "cache",
+                "file",
+                "redis"
+            ],
+            "time": "2015-02-11 22:35:22"
         },
         {
             "name": "piwik/decompress",
@@ -471,24 +605,27 @@
         },
         {
             "name": "piwik/device-detector",
-            "version": "2.7",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/piwik/device-detector.git",
-                "reference": "a76f214f01054d102352b9e4045491460c19d78a"
+                "reference": "87720bc573642ad96ae9bdc42d82a843a8e65899"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/piwik/device-detector/zipball/a76f214f01054d102352b9e4045491460c19d78a",
-                "reference": "a76f214f01054d102352b9e4045491460c19d78a",
+                "url": "https://api.github.com/repos/piwik/device-detector/zipball/87720bc573642ad96ae9bdc42d82a843a8e65899",
+                "reference": "87720bc573642ad96ae9bdc42d82a843a8e65899",
                 "shasum": ""
             },
             "require": {
                 "mustangostang/spyc": "*",
-                "php": ">=5.3.1"
+                "php": ">=5.3.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "4.0.*"
+                "phpunit/phpunit": "4.1.*"
+            },
+            "suggest": {
+                "doctrine/cache": "Can directly be used for caching purpose"
             },
             "type": "library",
             "autoload": {
@@ -514,7 +651,39 @@
                 "parser",
                 "useragent"
             ],
-            "time": "2014-11-25 21:41:24"
+            "time": "2015-02-21 19:36:09"
+        },
+        {
+            "name": "piwik/ini",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/piwik/component-ini.git",
+                "reference": "5863e8a006d490c2eb50e32ef08c1c684dff0ed0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/piwik/component-ini/zipball/5863e8a006d490c2eb50e32ef08c1c684dff0ed0",
+                "reference": "5863e8a006d490c2eb50e32ef08c1c684dff0ed0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Piwik\\Ini\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0"
+            ],
+            "time": "2015-03-03 22:19:39"
         },
         {
             "name": "piwik/network",
@@ -549,18 +718,56 @@
             "time": "2014-10-23 03:30:23"
         },
         {
+            "name": "psr/log",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
+                "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Psr\\Log\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ],
+            "time": "2012-12-21 11:40:51"
+        },
+        {
             "name": "symfony/console",
-            "version": "v2.5.6",
+            "version": "v2.6.3",
             "target-dir": "Symfony/Component/Console",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Console.git",
-                "reference": "6f177fca24200a5b97aef5ce7a5c98124a0f0db0"
+                "reference": "6ac6491ff60c0e5a941db3ccdc75a07adbb61476"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Console/zipball/6f177fca24200a5b97aef5ce7a5c98124a0f0db0",
-                "reference": "6f177fca24200a5b97aef5ce7a5c98124a0f0db0",
+                "url": "https://api.github.com/repos/symfony/Console/zipball/6ac6491ff60c0e5a941db3ccdc75a07adbb61476",
+                "reference": "6ac6491ff60c0e5a941db3ccdc75a07adbb61476",
                 "shasum": ""
             },
             "require": {
@@ -568,16 +775,18 @@
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/event-dispatcher": "~2.1"
+                "symfony/event-dispatcher": "~2.1",
+                "symfony/process": "~2.1"
             },
             "suggest": {
                 "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": ""
+                "symfony/event-dispatcher": "",
+                "symfony/process": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5-dev"
+                    "dev-master": "2.6-dev"
                 }
             },
             "autoload": {
@@ -601,7 +810,123 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "http://symfony.com",
-            "time": "2014-10-05 13:57:04"
+            "time": "2015-01-06 17:50:02"
+        },
+        {
+            "name": "symfony/event-dispatcher",
+            "version": "v2.6.3",
+            "target-dir": "Symfony/Component/EventDispatcher",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/EventDispatcher.git",
+                "reference": "40ff70cadea3785d83cac1c8309514b36113064e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/40ff70cadea3785d83cac1c8309514b36113064e",
+                "reference": "40ff70cadea3785d83cac1c8309514b36113064e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/config": "~2.0,>=2.0.5",
+                "symfony/dependency-injection": "~2.6",
+                "symfony/expression-language": "~2.6",
+                "symfony/stopwatch": "~2.3"
+            },
+            "suggest": {
+                "symfony/dependency-injection": "",
+                "symfony/http-kernel": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\EventDispatcher\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Symfony EventDispatcher Component",
+            "homepage": "http://symfony.com",
+            "time": "2015-01-05 14:28:40"
+        },
+        {
+            "name": "symfony/monolog-bridge",
+            "version": "v2.6.3",
+            "target-dir": "Symfony/Bridge/Monolog",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/MonologBridge.git",
+                "reference": "83a451b5a2e16a14ffd07a42746c4b9db1a48c1d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/MonologBridge/zipball/83a451b5a2e16a14ffd07a42746c4b9db1a48c1d",
+                "reference": "83a451b5a2e16a14ffd07a42746c4b9db1a48c1d",
+                "shasum": ""
+            },
+            "require": {
+                "monolog/monolog": "~1.11",
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "symfony/console": "~2.4",
+                "symfony/event-dispatcher": "~2.2",
+                "symfony/http-kernel": "~2.4"
+            },
+            "suggest": {
+                "symfony/console": "For the possibility to show log messages in console commands depending on verbosity settings. You need version ~2.3 of the console for it.",
+                "symfony/event-dispatcher": "Needed when using log messages in console commands",
+                "symfony/http-kernel": "For using the debugging handlers together with the response life cycle of the HTTP kernel."
+            },
+            "type": "symfony-bridge",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Bridge\\Monolog\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Symfony Monolog Bridge",
+            "homepage": "http://symfony.com",
+            "time": "2015-01-03 08:01:59"
         },
         {
             "name": "tedivm/jshrink",
@@ -646,16 +971,16 @@
         },
         {
             "name": "twig/twig",
-            "version": "v1.16.2",
+            "version": "v1.18.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/fabpot/Twig.git",
-                "reference": "42f758d9fe2146d1f0470604fc05ee43580873fc"
+                "url": "https://github.com/twigphp/Twig.git",
+                "reference": "4cf7464348e7f9893a93f7096a90b73722be99cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fabpot/Twig/zipball/42f758d9fe2146d1f0470604fc05ee43580873fc",
-                "reference": "42f758d9fe2146d1f0470604fc05ee43580873fc",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/4cf7464348e7f9893a93f7096a90b73722be99cf",
+                "reference": "4cf7464348e7f9893a93f7096a90b73722be99cf",
                 "shasum": ""
             },
             "require": {
@@ -664,7 +989,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.16-dev"
+                    "dev-master": "1.18-dev"
                 }
             },
             "autoload": {
@@ -690,7 +1015,7 @@
                 },
                 {
                     "name": "Twig Team",
-                    "homepage": "https://github.com/fabpot/Twig/graphs/contributors",
+                    "homepage": "http://twig.sensiolabs.org/contributors",
                     "role": "Contributors"
                 }
             ],
@@ -699,7 +1024,7 @@
             "keywords": [
                 "templating"
             ],
-            "time": "2014-10-17 12:53:44"
+            "time": "2015-01-25 17:32:08"
         }
     ],
     "packages-dev": [
@@ -947,16 +1272,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "0.3.8",
+            "version": "0.3.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "5085202f1f37769aae59f9711c423f28159c9b29"
+                "reference": "c6e88ca6e81bc5a2d7161658e16a95b7ef8d6ad1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/5085202f1f37769aae59f9711c423f28159c9b29",
-                "reference": "5085202f1f37769aae59f9711c423f28159c9b29",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c6e88ca6e81bc5a2d7161658e16a95b7ef8d6ad1",
+                "reference": "c6e88ca6e81bc5a2d7161658e16a95b7ef8d6ad1",
                 "shasum": ""
             },
             "require": {
@@ -1041,20 +1366,20 @@
                 "x.509",
                 "x509"
             ],
-            "time": "2014-09-13 02:42:45"
+            "time": "2014-11-10 03:08:59"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "2.0.11",
+            "version": "2.0.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "53603b3c995f5aab6b59c8e08c3a663d2cc810b7"
+                "reference": "34cc484af1ca149188d0d9e91412191e398e0b67"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/53603b3c995f5aab6b59c8e08c3a663d2cc810b7",
-                "reference": "53603b3c995f5aab6b59c8e08c3a663d2cc810b7",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/34cc484af1ca149188d0d9e91412191e398e0b67",
+                "reference": "34cc484af1ca149188d0d9e91412191e398e0b67",
                 "shasum": ""
             },
             "require": {
@@ -1067,7 +1392,7 @@
             },
             "require-dev": {
                 "ext-xdebug": ">=2.1.4",
-                "phpunit/phpunit": "~4.1"
+                "phpunit/phpunit": "~4"
             },
             "suggest": {
                 "ext-dom": "*",
@@ -1086,9 +1411,6 @@
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
             "license": [
                 "BSD-3-Clause"
             ],
@@ -1106,7 +1428,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2014-08-31 06:33:04"
+            "time": "2015-01-24 10:06:35"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -1243,16 +1565,16 @@
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "1.3.0",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "f8d5d08c56de5cfd592b3340424a81733259a876"
+                "reference": "db32c18eba00b121c145575fcbcd4d4d24e6db74"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/f8d5d08c56de5cfd592b3340424a81733259a876",
-                "reference": "f8d5d08c56de5cfd592b3340424a81733259a876",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/db32c18eba00b121c145575fcbcd4d4d24e6db74",
+                "reference": "db32c18eba00b121c145575fcbcd4d4d24e6db74",
                 "shasum": ""
             },
             "require": {
@@ -1265,7 +1587,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.3-dev"
+                    "dev-master": "1.4-dev"
                 }
             },
             "autoload": {
@@ -1288,20 +1610,20 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2014-08-31 06:12:13"
+            "time": "2015-01-17 09:51:32"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "4.3.4",
+            "version": "4.4.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "23e4e0310f037aae873cc81b8658dbbb82878f71"
+                "reference": "2e8580deebb7d1ac92ac878595e6bffe01069c2a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/23e4e0310f037aae873cc81b8658dbbb82878f71",
-                "reference": "23e4e0310f037aae873cc81b8658dbbb82878f71",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2e8580deebb7d1ac92ac878595e6bffe01069c2a",
+                "reference": "2e8580deebb7d1ac92ac878595e6bffe01069c2a",
                 "shasum": ""
             },
             "require": {
@@ -1318,8 +1640,10 @@
                 "phpunit/phpunit-mock-objects": "~2.3",
                 "sebastian/comparator": "~1.0",
                 "sebastian/diff": "~1.1",
-                "sebastian/environment": "~1.0",
-                "sebastian/exporter": "~1.0",
+                "sebastian/environment": "~1.1",
+                "sebastian/exporter": "~1.1",
+                "sebastian/global-state": "~1.0",
+                "sebastian/recursion-context": "~1.0",
                 "sebastian/version": "~1.0",
                 "symfony/yaml": "~2.0"
             },
@@ -1332,7 +1656,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.3.x-dev"
+                    "dev-master": "4.4.x-dev"
                 }
             },
             "autoload": {
@@ -1341,10 +1665,6 @@
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                "",
-                "../../symfony/yaml/"
-            ],
             "license": [
                 "BSD-3-Clause"
             ],
@@ -1356,13 +1676,13 @@
                 }
             ],
             "description": "The PHP Unit Testing framework.",
-            "homepage": "http://www.phpunit.de/",
+            "homepage": "https://phpunit.de/",
             "keywords": [
                 "phpunit",
                 "testing",
                 "xunit"
             ],
-            "time": "2014-10-22 11:43:12"
+            "time": "2015-01-27 16:06:15"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -1421,30 +1741,30 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "1.0.1",
+            "version": "1.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "e54a01c0da1b87db3c5a3c4c5277ddf331da4aef"
+                "reference": "1dd8869519a225f7f2b9eb663e225298fade819e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/e54a01c0da1b87db3c5a3c4c5277ddf331da4aef",
-                "reference": "e54a01c0da1b87db3c5a3c4c5277ddf331da4aef",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1dd8869519a225f7f2b9eb663e225298fade819e",
+                "reference": "1dd8869519a225f7f2b9eb663e225298fade819e",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3",
-                "sebastian/diff": "~1.1",
-                "sebastian/exporter": "~1.0"
+                "sebastian/diff": "~1.2",
+                "sebastian/exporter": "~1.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.1"
+                "phpunit/phpunit": "~4.4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.1.x-dev"
                 }
             },
             "autoload": {
@@ -1481,7 +1801,7 @@
                 "compare",
                 "equality"
             ],
-            "time": "2014-05-11 23:00:21"
+            "time": "2015-01-29 16:28:08"
         },
         {
             "name": "sebastian/diff",
@@ -1537,16 +1857,16 @@
         },
         {
             "name": "sebastian/environment",
-            "version": "1.2.0",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "0d9bf79554d2a999da194a60416c15cf461eb67d"
+                "reference": "6e6c71d918088c251b181ba8b3088af4ac336dd7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/0d9bf79554d2a999da194a60416c15cf461eb67d",
-                "reference": "0d9bf79554d2a999da194a60416c15cf461eb67d",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6e6c71d918088c251b181ba8b3088af4ac336dd7",
+                "reference": "6e6c71d918088c251b181ba8b3088af4ac336dd7",
                 "shasum": ""
             },
             "require": {
@@ -1583,32 +1903,33 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2014-10-22 06:38:05"
+            "time": "2014-10-25 08:00:45"
         },
         {
             "name": "sebastian/exporter",
-            "version": "1.0.2",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "c7d59948d6e82818e1bdff7cadb6c34710eb7dc0"
+                "reference": "84839970d05254c73cde183a721c7af13aede943"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/c7d59948d6e82818e1bdff7cadb6c34710eb7dc0",
-                "reference": "c7d59948d6e82818e1bdff7cadb6c34710eb7dc0",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/84839970d05254c73cde183a721c7af13aede943",
+                "reference": "84839970d05254c73cde183a721c7af13aede943",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.3.3",
+                "sebastian/recursion-context": "~1.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.0"
+                "phpunit/phpunit": "~4.4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.2.x-dev"
                 }
             },
             "autoload": {
@@ -1648,20 +1969,124 @@
                 "export",
                 "exporter"
             ],
-            "time": "2014-09-10 00:51:36"
+            "time": "2015-01-27 07:23:06"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
+                "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "time": "2014-10-06 09:23:50"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "3989662bbb30a29d20d9faa04a846af79b276252"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/3989662bbb30a29d20d9faa04a846af79b276252",
+                "reference": "3989662bbb30a29d20d9faa04a846af79b276252",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "time": "2015-01-24 09:48:32"
         },
         {
             "name": "sebastian/version",
-            "version": "1.0.3",
+            "version": "1.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43"
+                "reference": "a77d9123f8e809db3fbdea15038c27a95da4058b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43",
-                "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/a77d9123f8e809db3fbdea15038c27a95da4058b",
+                "reference": "a77d9123f8e809db3fbdea15038c27a95da4058b",
                 "shasum": ""
             },
             "type": "library",
@@ -1683,45 +2108,41 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2014-03-07 15:35:33"
+            "time": "2014-12-15 14:25:24"
         },
         {
-            "name": "symfony/event-dispatcher",
-            "version": "v2.5.6",
-            "target-dir": "Symfony/Component/EventDispatcher",
+            "name": "symfony/var-dumper",
+            "version": "v2.6.3",
+            "target-dir": "Symfony/Component/VarDumper",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/EventDispatcher.git",
-                "reference": "804eb28dbbfba9ffdab21fe2066744906cea2212"
+                "url": "https://github.com/symfony/var-dumper.git",
+                "reference": "36af986811340fd4c1bc39cf848da388bbdd8473"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/804eb28dbbfba9ffdab21fe2066744906cea2212",
-                "reference": "804eb28dbbfba9ffdab21fe2066744906cea2212",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/36af986811340fd4c1bc39cf848da388bbdd8473",
+                "reference": "36af986811340fd4c1bc39cf848da388bbdd8473",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "~2.0",
-                "symfony/dependency-injection": "~2.0,<2.6.0",
-                "symfony/stopwatch": "~2.2"
-            },
             "suggest": {
-                "symfony/dependency-injection": "",
-                "symfony/http-kernel": ""
+                "ext-symfony_debug": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5-dev"
+                    "dev-master": "2.6-dev"
                 }
             },
             "autoload": {
+                "files": [
+                    "Resources/functions/dump.php"
+                ],
                 "psr-0": {
-                    "Symfony\\Component\\EventDispatcher\\": ""
+                    "Symfony\\Component\\VarDumper\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1730,31 +2151,31 @@
             ],
             "authors": [
                 {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
                 }
             ],
-            "description": "Symfony EventDispatcher Component",
+            "description": "Symfony mechanism for exploring and dumping PHP variables",
             "homepage": "http://symfony.com",
-            "time": "2014-10-01 15:43:05"
+            "keywords": [
+                "debug",
+                "dump"
+            ],
+            "time": "2015-01-01 13:28:01"
         },
         {
             "name": "symfony/yaml",
-            "version": "v2.5.6",
+            "version": "v2.6.3",
             "target-dir": "Symfony/Component/Yaml",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Yaml.git",
-                "reference": "2d9f527449cabfa8543dd7fa3a466d6ae83d6726"
+                "reference": "82462a90848a52c2533aa6b598b107d68076b018"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Yaml/zipball/2d9f527449cabfa8543dd7fa3a466d6ae83d6726",
-                "reference": "2d9f527449cabfa8543dd7fa3a466d6ae83d6726",
+                "url": "https://api.github.com/repos/symfony/Yaml/zipball/82462a90848a52c2533aa6b598b107d68076b018",
+                "reference": "82462a90848a52c2533aa6b598b107d68076b018",
                 "shasum": ""
             },
             "require": {
@@ -1763,7 +2184,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5-dev"
+                    "dev-master": "2.6-dev"
                 }
             },
             "autoload": {
@@ -1787,7 +2208,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "http://symfony.com",
-            "time": "2014-10-01 05:50:18"
+            "time": "2015-01-03 15:33:07"
         }
     ],
     "aliases": [],
@@ -1797,6 +2218,7 @@
         "facebook/xhprof": 20
     },
     "prefer-stable": false,
+    "prefer-lowest": false,
     "platform": {
         "php": ">=5.3.3"
     },
diff --git a/config/environment/cli.php b/config/environment/cli.php
new file mode 100644
index 0000000000..2852c01007
--- /dev/null
+++ b/config/environment/cli.php
@@ -0,0 +1,29 @@
+<?php
+
+use Interop\Container\ContainerInterface;
+use Monolog\Logger;
+use Symfony\Bridge\Monolog\Formatter\ConsoleFormatter;
+use Symfony\Bridge\Monolog\Handler\ConsoleHandler;
+use Symfony\Component\Console\Output\OutputInterface;
+
+return array(
+
+    // Log
+    'log.handlers' => array(
+        DI\link('Symfony\Bridge\Monolog\Handler\ConsoleHandler'),
+    ),
+    'Symfony\Bridge\Monolog\Handler\ConsoleHandler' => function (ContainerInterface $c) {
+        // Override the default verbosity map to make it more verbose by default
+        $verbosityMap = array(
+            OutputInterface::VERBOSITY_NORMAL => Logger::INFO,
+            OutputInterface::VERBOSITY_VERBOSE => Logger::DEBUG,
+            OutputInterface::VERBOSITY_VERY_VERBOSE => Logger::DEBUG,
+            OutputInterface::VERBOSITY_DEBUG => Logger::DEBUG,
+        );
+        $handler = new ConsoleHandler(null, true, $verbosityMap);
+        $handler->setFormatter(new ConsoleFormatter($c->get('log.console.format'), null, true, true));
+        return $handler;
+    },
+    'log.console.format' => '%start_tag%%level_name% %extra.class%[%datetime%]%end_tag% %message%' . PHP_EOL,
+
+);
diff --git a/config/environment/dev.php b/config/environment/dev.php
new file mode 100644
index 0000000000..0a730d708c
--- /dev/null
+++ b/config/environment/dev.php
@@ -0,0 +1,12 @@
+<?php
+
+return array(
+
+    'Piwik\Cache\Backend' => DI\object('Piwik\Cache\Backend\ArrayCache'),
+
+    'Piwik\Translation\Loader\LoaderInterface' => DI\object('Piwik\Translation\Loader\LoaderCache')
+        ->constructor(DI\link('Piwik\Translation\Loader\DevelopmentLoader')),
+    'Piwik\Translation\Loader\DevelopmentLoader' => DI\object()
+        ->constructor(DI\link('Piwik\Translation\Loader\JsonFileLoader')),
+
+);
diff --git a/config/environment/test.php b/config/environment/test.php
new file mode 100644
index 0000000000..4eac327a6e
--- /dev/null
+++ b/config/environment/test.php
@@ -0,0 +1,17 @@
+<?php
+
+return array(
+
+    // Disable logging
+    'Psr\Log\LoggerInterface' => DI\object('Psr\Log\NullLogger'),
+
+    'Piwik\Cache\Backend' => function () {
+        return \Piwik\Cache::buildBackend('file');
+    },
+    'cache.eager.cache_id' => 'eagercache-test-',
+
+    // Disable loading core translations
+    'Piwik\Translation\Translator' => DI\object()
+        ->constructorParameter('directories', array()),
+
+);
diff --git a/config/global.ini.php b/config/global.ini.php
index 1c5dc8dd39..49adf02a90 100644
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -29,7 +29,7 @@ schema = Mysql
 
 [database_tests]
 host = localhost
-username = root
+username = "@USERNAME@"
 password =
 dbname = piwik_tests
 tables_prefix = piwiktests_
@@ -64,20 +64,37 @@ log_writers[] = screen
 
 ; log level, everything logged w/ this level or one of greater severity
 ; will be logged. everything else will be ignored. possible values are:
-; NONE, ERROR, WARN, INFO, DEBUG, VERBOSE
-log_level = ERROR
-
-; if set to 1, only requests done in CLI mode (eg. the ./console core:archive cron run) will be logged
-; NOTE: log_only_when_debug_parameter will also be checked for
-log_only_when_cli = 0
-
-; if set to 1, only requests with "&debug" parameter will be logged
-; NOTE: log_only_when_cli will also be checked for
-log_only_when_debug_parameter = 0
+; ERROR, WARN, INFO, DEBUG
+log_level = WARN
 
 ; if configured to log in a file, log entries will be made to this file
 logger_file_path = tmp/logs/piwik.log
 
+[Cache]
+; available backends are 'file', 'array', 'null', 'redis', 'chained'
+; 'array' will cache data only during one request
+; 'null' will not cache anything at all
+; 'file' will cache on the filesystem
+; 'redis' will cache on a Redis server, use this if you are running Piwik with multiple servers. Further configuration in [RedisCache] is needed
+; 'chained' will chain multiple cache backends. Further configuration in [ChainedCache] is needed
+backend = chained
+
+[ChainedCache]
+; The chained cache will always try to read from the fastest backend first (the first listed one) to avoid requesting
+; the same cache entry from the slowest backend multiple times in one request.
+backends[] = array
+backends[] = file
+
+[RedisCache]
+; Redis server configuration.
+host = "127.0.0.1"
+port = 6379
+timeout = 0.0
+password = ""
+database = 14
+; In case you are using queued tracking: Make sure to configure a different database! Otherwise queued requests might
+; be flushed
+
 [Debug]
 ; if set to 1, the archiving process will always be triggered, even if the archive has already been computed
 ; this is useful when making changes to the archiving code so we can force the archiving process
@@ -244,11 +261,23 @@ time_before_today_archive_considered_outdated = 150
 ; This setting is only used if it hasn't been overriden via the UI yet, or if enable_general_settings_admin=0
 enable_browser_archiving_triggering = 1
 
+; By default, Piwik will force archiving of range periods from browser requests, even if enable_browser_archiving_triggering
+; is set to 0. This can sometimes create too much of a demand on system resources. Setting this option to 0 and setting
+; enable_browser_archiving_triggering to 0 will make sure ranges are not archived on browser request. Since the cron
+; archiver does not archive ranges, you must either disable ranges or make sure the ranges users' want to see will be
+; processed somehow.
+archiving_range_force_on_browser_request = 1
+
 ; By default Piwik runs OPTIMIZE TABLE SQL queries to free spaces after deleting some data.
 ; If your Piwik tracks millions of pages, the OPTIMIZE TABLE queries might run for hours (seen in "SHOW FULL PROCESSLIST \g")
 ; so you can disable these special queries here:
 enable_sql_optimize_queries = 1
 
+; By default Piwik is purging complete date range archives to free spaces after deleting some data.
+; If you are pre-processing custom ranges using CLI task to make them easily available in UI,
+; you can prevent this action from happening by setting this parameter to value bigger than 1
+purge_date_range_archives_after_X_days = 1
+
 ; MySQL minimum required version
 ; note: timezone support added in 4.1.3
 minimum_mysql_version = 4.1
@@ -449,6 +478,10 @@ api_service_url = http://api.piwik.org
 ; eg. $period=range&date=previous10 becomes $period=day&date=previous10. Use this setting to override the $period value.
 graphs_default_period_to_plot_when_period_range = day
 
+; When the ImageGraph plugin is activated, enabling this option causes the image graphs to show the evolution
+; within the selected period instead of the evolution across the last n periods.
+graphs_show_evolution_within_selected_period = 0
+
 ; The Overlay plugin shows the Top X following pages, Top X downloads and Top X outlinks which followed
 ; a view of the current page. The value X can be set here.
 overlay_following_pages_limit = 300
@@ -510,6 +543,13 @@ pivot_by_filter_enable_fetch_by_segment = 0
 pivot_by_filter_default_column_limit = 10
 
 [Tracker]
+
+; Piwik uses "Privacy by default" model. When one of your users visit multiple of your websites tracked in this Piwik,
+; Piwik will create for this user a fingerprint that will be different across the multiple websites.
+; If you want to track unique users across websites (for example when using the InterSites plugin) you may set this setting to 1.
+; Note: setting this to 0 increases your users' privacy.
+enable_fingerprinting_across_websites = 0
+
 ; Piwik uses first party cookies by default. If set to 1,
 ; the visit ID cookie will be set on the Piwik server domain as well
 ; this is useful when you want to do cross websites analysis
@@ -579,6 +619,16 @@ campaign_var_name = "pk_cpn,pk_campaign,piwik_campaign,utm_campaign,utm_source,u
 ; Includes by default the GA style campaign keyword parameter utm_term
 campaign_keyword_var_name = "pk_kwd,pk_keyword,piwik_kwd,utm_term"
 
+; if set to 1, actions that contain different campaign information from the visitor's ongoing visit will
+; be treated as the start of a new visit. This will include situations when campaign information was absent before,
+; but is present now.
+create_new_visit_when_campaign_changes = 1
+
+; if set to 1, actions that contain different website referrer information from the visitor's ongoing visit
+; will be treatedas the start of a new visit. This will include situations when website referrer information was
+; absent before, but is present now.
+create_new_visit_when_website_referrer_changes = 0
+
 ; maximum length of a Page Title or a Page URL recorded in the log_action.name table
 page_maximum_length = 1024;
 
@@ -596,7 +646,7 @@ bulk_requests_use_transaction = 1
 ; Comma separated list of known Referrer Spammers, ie. bot visits that set a fake Referrer field.
 ; All Visits with a Referrer URL host set to one of these will be excluded.
 ; If you find new spam entries in Referrers>Websites, please report them here: https://github.com/piwik/piwik/issues/5099
-referrer_urls_spam = "semalt.com"
+referrer_urls_spam = "semalt.com,buttons-for-website.com,7makemoneyonline.com,anticrawler.org,ranksonic.info,savetubevideo.com,kambasoft.com,ilovevitaly.com,priceg.com,blackhatworth.com,hulfingtonpost.com,darodar.com,econom.co,o-o-6-o-o.com,bestwebsitesawards.com,darodar.com,ranksonic.org,ranksonic.info"
 
 ; DO NOT USE THIS SETTING ON PUBLICLY AVAILABLE PIWIK SERVER
 ; !!! Security risk: if set to 0, it would allow anyone to push data to Piwik with custom dates in the past/future and even with fake IPs!
@@ -613,7 +663,7 @@ tracking_requests_require_authentication = 1
 ; for which all reports should be Archived during the cron execution
 ; All segment values MUST be URL encoded.
 ;Segments[]="visitorType==new"
-;Segments[]="visitorType==returning"
+;Segments[]="visitorType==returning,visitorType==returningCustomer"
 
 ; If you define Custom Variables for your visitor, for example set the visit type
 ;Segments[]="customVariableName1==VisitType;customVariableValue1==Customer"
@@ -658,6 +708,7 @@ username = ; Proxy username: optional; if specified, password is mandatory
 password = ; Proxy password: optional; if specified, username is mandatory
 
 [Plugins]
+; list of plugins (in order they will be loaded) that are activated by default in the Piwik platform
 Plugins[] = CorePluginsAdmin
 Plugins[] = CoreAdminHome
 Plugins[] = CoreHome
@@ -673,8 +724,10 @@ Plugins[] = Dashboard
 Plugins[] = MultiSites
 Plugins[] = Referrers
 Plugins[] = UserSettings
+Plugins[] = UserLanguage
 Plugins[] = DevicesDetection
 Plugins[] = Goals
+Plugins[] = Ecommerce
 Plugins[] = SEO
 Plugins[] = Events
 Plugins[] = UserCountry
@@ -686,6 +739,7 @@ Plugins[] = ExampleAPI
 Plugins[] = ExampleRssWidget
 Plugins[] = Provider
 Plugins[] = Feedback
+Plugins[] = Monolog
 
 Plugins[] = Login
 Plugins[] = UsersManager
@@ -709,6 +763,9 @@ Plugins[] = LeftMenu
 Plugins[] = Morpheus
 Plugins[] = Contents
 Plugins[] = TestRunner
+Plugins[] = BulkTracking
+Plugins[] = Resolution
+Plugins[] = DevicePlugins
 
 [PluginsInstalled]
 PluginsInstalled[] = Login
diff --git a/config/global.php b/config/global.php
index 7dc6daa18f..aff73fcdba 100644
--- a/config/global.php
+++ b/config/global.php
@@ -1,23 +1,58 @@
 <?php
 
 use Interop\Container\ContainerInterface;
+use Piwik\Cache\Eager;
+use Piwik\SettingsServer;
 
 return array(
 
     'path.root' => PIWIK_USER_PATH,
 
-    'path.tmp' => DI\factory(function (ContainerInterface $c) {
+    'path.tmp' => function (ContainerInterface $c) {
         $root = $c->get('path.root');
 
         // TODO remove that special case and instead have plugins override 'path.tmp' to add the instance id
-        if ($c->has('old_config.General.instance_id')) {
-            $instanceId = $c->get('old_config.General.instance_id');
+        if ($c->has('ini.General.instance_id')) {
+            $instanceId = $c->get('ini.General.instance_id');
             $instanceId = $instanceId ? '/' . $instanceId : '';
         } else {
             $instanceId = '';
         }
 
         return $root . '/tmp' . $instanceId;
-    }),
+    },
+
+    'path.cache' => DI\string('{path.tmp}/cache/tracker/'),
+
+    'Piwik\Cache\Eager' => function (ContainerInterface $c) {
+        $backend = $c->get('Piwik\Cache\Backend');
+        $cacheId = $c->get('cache.eager.cache_id');
+
+        if (SettingsServer::isTrackerApiRequest()) {
+            $eventToPersist = 'Tracker.end';
+            $cacheId .= 'tracker';
+        } else {
+            $eventToPersist = 'Request.dispatch.end';
+            $cacheId .= 'ui';
+        }
+
+        $cache = new Eager($backend, $cacheId);
+        \Piwik\Piwik::addAction($eventToPersist, function () use ($cache) {
+            $cache->persistCacheIfNeeded(43200);
+        });
+
+        return $cache;
+    },
+    'Piwik\Cache\Backend' => function (ContainerInterface $c) {
+        return \Piwik\Cache::buildBackend($c->get('ini.Cache.backend'));
+    },
+    'cache.eager.cache_id' => function () {
+        return 'eagercache-' . str_replace(array('.', '-'), '', \Piwik\Version::VERSION) . '-';
+    },
+
+    'Psr\Log\LoggerInterface' => DI\object('Psr\Log\NullLogger'),
+
+    'Piwik\Translation\Loader\LoaderInterface' => DI\object('Piwik\Translation\Loader\LoaderCache')
+        ->constructor(DI\link('Piwik\Translation\Loader\JsonFileLoader')),
 
 );
diff --git a/console b/console
index e3738ab10a..47b8ba59f9 100755
--- a/console
+++ b/console
@@ -3,27 +3,25 @@
 if (!defined('PIWIK_DOCUMENT_ROOT')) {
     define('PIWIK_DOCUMENT_ROOT', dirname(__FILE__) == '/' ? '' : dirname(__FILE__));
 }
+
+if (file_exists(PIWIK_DOCUMENT_ROOT . '/bootstrap.php')) {
+    require_once PIWIK_DOCUMENT_ROOT . '/bootstrap.php';
+}
+
 if (!defined('PIWIK_INCLUDE_PATH')) {
     define('PIWIK_INCLUDE_PATH', PIWIK_DOCUMENT_ROOT);
 }
-if (!defined('PIWIK_USER_PATH')) {
-    define('PIWIK_USER_PATH', PIWIK_DOCUMENT_ROOT);
-}
-
-require_once PIWIK_INCLUDE_PATH . '/core/testMinimumPhpVersion.php';
 
-@date_default_timezone_set('UTC');
-
-require_once PIWIK_INCLUDE_PATH . '/core/Loader.php';
-\Piwik\Loader::init();
-
-require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php';
-
-Piwik\Translate::loadEnglishTranslation();
+require_once PIWIK_INCLUDE_PATH . '/core/bootstrap.php';
 
 if (!Piwik\Common::isPhpCliMode()) {
     exit;
 }
 
+if (!defined('PIWIK_ENABLE_ERROR_HANDLER') || PIWIK_ENABLE_ERROR_HANDLER) {
+    Piwik\ErrorHandler::registerErrorHandler();
+    Piwik\ExceptionHandler::setUp();
+}
+
 $console = new Piwik\Console();
-$console->run();
\ No newline at end of file
+$console->run();
diff --git a/core/API/DataTableManipulator.php b/core/API/DataTableManipulator.php
index a1acc6e5b5..862f2db087 100644
--- a/core/API/DataTableManipulator.php
+++ b/core/API/DataTableManipulator.php
@@ -124,7 +124,7 @@ abstract class DataTableManipulator
             }
         }
 
-        $method = $this->getApiMethodForSubtable();
+        $method = $this->getApiMethodForSubtable($request);
         return $this->callApiAndReturnDataTable($this->apiModule, $method, $request);
     }
 
@@ -144,10 +144,16 @@ abstract class DataTableManipulator
      * @throws Exception
      * @return string
      */
-    private function getApiMethodForSubtable()
+    private function getApiMethodForSubtable($request)
     {
         if (!$this->apiMethodForSubtable) {
-            $meta = API::getInstance()->getMetadata('all', $this->apiModule, $this->apiMethod);
+            if (!empty($request['idSite'])) {
+                $idSite = $request['idSite'];
+            } else {
+                $idSite = 'all';
+            }
+
+            $meta = API::getInstance()->getMetadata($idSite, $this->apiModule, $this->apiMethod);
 
             if (empty($meta)) {
                 throw new Exception(sprintf(
diff --git a/core/API/DataTablePostProcessor.php b/core/API/DataTablePostProcessor.php
index 352771464e..999b3fe339 100644
--- a/core/API/DataTablePostProcessor.php
+++ b/core/API/DataTablePostProcessor.php
@@ -95,15 +95,23 @@ class DataTablePostProcessor
         // we automatically safe decode all datatable labels (against xss)
         $dataTable->queueFilter('SafeDecodeLabel');
 
+        $dataTable = $this->convertSegmentValueToSegment($dataTable);
         $dataTable = $this->applyQueuedFilters($dataTable);
         $dataTable = $this->applyRequestedColumnDeletion($dataTable);
         $dataTable = $this->applyLabelFilter($dataTable);
-
         $dataTable = $this->applyMetricsFormatting($dataTable);
 
         return $dataTable;
     }
 
+    private function convertSegmentValueToSegment(DataTableInterface $dataTable)
+    {
+        $dataTable->filter('AddSegmentBySegmentValue', array($this->report));
+        $dataTable->filter('ColumnCallbackDeleteMetadata', array('segmentValue'));
+
+        return $dataTable;
+    }
+
     /**
      * @param DataTableInterface $dataTable
      * @return DataTableInterface
@@ -118,6 +126,8 @@ class DataTablePostProcessor
             $pivotByColumn = Common::getRequestVar('pivotByColumn', false, 'string', $this->request);
             $pivotByColumnLimit = Common::getRequestVar('pivotByColumnLimit', false, 'int', $this->request);
 
+            $dataTable->filter('ColumnCallbackDeleteMetadata', array('segmentValue'));
+            $dataTable->filter('ColumnCallbackDeleteMetadata', array('segment'));
             $dataTable->filter('PivotByDimension', array($reportId, $pivotBy, $pivotByColumn, $pivotByColumnLimit,
                 PivotByDimension::isSegmentFetchingEnabledInConfig()));
         }
diff --git a/core/API/Proxy.php b/core/API/Proxy.php
index f442949a3c..0345693b62 100644
--- a/core/API/Proxy.php
+++ b/core/API/Proxy.php
@@ -415,7 +415,7 @@ class Proxy extends Singleton
     }
 
     /**
-     * Includes the class API by looking up plugins/UserSettings/API.php
+     * Includes the class API by looking up plugins/xxx/API.php
      *
      * @param string $fileName api class name eg. "API"
      * @throws Exception
diff --git a/core/API/Request.php b/core/API/Request.php
index 23677e45fb..1db4009606 100644
--- a/core/API/Request.php
+++ b/core/API/Request.php
@@ -46,7 +46,7 @@ use Piwik\Log;
  *
  * **Basic Usage**
  *
- *     $request = new Request('method=UserSettings.getLanguage&idSite=1&date=yesterday&period=week'
+ *     $request = new Request('method=UserLanguage.getLanguage&idSite=1&date=yesterday&period=week'
  *                          . '&format=xml&filter_limit=5&filter_offset=0')
  *     $result = $request->process();
  *     echo $result;
@@ -54,7 +54,7 @@ use Piwik\Log;
  * **Getting a unrendered DataTable**
  *
  *     // use the convenience method 'processRequest'
- *     $dataTable = Request::processRequest('UserSettings.getLanguage', array(
+ *     $dataTable = Request::processRequest('UserLanguage.getLanguage', array(
  *         'idSite' => 1,
  *         'date' => 'yesterday',
  *         'period' => 'week',
@@ -77,8 +77,8 @@ class Request
      * mappings. The current query parameters (everything in `$_GET` and `$_POST`) are
      * forwarded to request array before it is returned.
      *
-     * @param string|array $request The base request string or array, eg,
-     *                              `'module=UserSettings&action=getLanguage'`.
+     * @param string|array|null $request The base request string or array, eg,
+     *                                   `'module=UserLanguage&action=getLanguage'`.
      * @param array $defaultRequest Default query parameters. If a query parameter is absent in `$request`, it will be loaded
      *                              from this. Defaults to `$_GET + $_POST`.
      * @return array
@@ -125,7 +125,7 @@ class Request
      * Constructor.
      *
      * @param string|array $request Query string that defines the API call (must at least contain a **method** parameter),
-     *                              eg, `'method=UserSettings.getLanguage&idSite=1&date=yesterday&period=week&format=xml'`
+     *                              eg, `'method=UserLanguage.getLanguage&idSite=1&date=yesterday&period=week&format=xml'`
      *                              If a request is not provided, then we use the values in the `$_GET` and `$_POST`
      *                              superglobals.
      * @param array $defaultRequest Default query parameters. If a query parameter is absent in `$request`, it will be loaded
@@ -135,6 +135,7 @@ class Request
     {
         $this->request = self::getRequestArrayFromString($request, $defaultRequest);
         $this->sanitizeRequest();
+        $this->renameModuleAndActionInRequest();
     }
 
     /**
@@ -142,19 +143,23 @@ class Request
      * we rewrite to correct renamed plugin: Referrers
      *
      * @param $module
-     * @return string
+     * @param $action
+     * @return array( $module, $action )
      * @ignore
      */
-    public static function renameModule($module)
+    public static function getRenamedModuleAndAction($module, $action)
     {
-        $moduleToRedirect = array(
-            'Referers'   => 'Referrers',
-            'PDFReports' => 'ScheduledReports',
-        );
-        if (isset($moduleToRedirect[$module])) {
-            return $moduleToRedirect[$module];
-        }
-        return $module;
+        /**
+         * This event is posted in the Request dispatcher and can be used
+         * to overwrite the Module and Action to dispatch.
+         * This is useful when some Controller methods or API methods have been renamed or moved to another plugin.
+         *
+         * @param $module string
+         * @param $action string
+         */
+        Piwik::postEvent('Request.getRenamedModuleAndAction', array(&$module, &$action));
+
+        return array($module, $action);
     }
 
     /**
@@ -213,12 +218,12 @@ class Request
 
             list($module, $method) = $this->extractModuleAndMethod($moduleMethod);
 
-            $module = $this->renameModule($module);
+            list($module, $method) = self::getRenamedModuleAndAction($module, $method);
 
             if (!\Piwik\Plugin\Manager::getInstance()->isPluginActivated($module)) {
                 throw new PluginDeactivatedException($module);
             }
-            $apiClassName = $this->getClassNameAPI($module);
+            $apiClassName = self::getClassNameAPI($module);
 
             self::reloadAuthUsingTokenAuth($this->request);
 
@@ -265,7 +270,7 @@ class Request
              * query parameter is found in the request.
              *
              * Plugins that provide authentication capabilities should subscribe to this event
-             * and make sure the global authentication object (the object returned by `Registry::get('auth')`)
+             * and make sure the global authentication object (the object returned by `StaticContainer::get('Piwik\Auth')`)
              * is setup to use `$token_auth` when its `authenticate()` method is executed.
              *
              * @param string $token_auth The value of the **token_auth** query parameter.
@@ -412,4 +417,15 @@ class Request
         }
         return $segmentRaw;
     }
+
+    private function renameModuleAndActionInRequest()
+    {
+        if (empty($this->request['apiModule'])) {
+            return;
+        }
+        if (empty($this->request['apiAction'])) {
+            $this->request['apiAction'] = null;
+        }
+        list($this->request['apiModule'], $this->request['apiAction']) = $this->getRenamedModuleAndAction($this->request['apiModule'], $this->request['apiAction']);
+    }
 }
diff --git a/core/Archive.php b/core/Archive.php
index b407465a45..1931b6a343 100644
--- a/core/Archive.php
+++ b/core/Archive.php
@@ -10,6 +10,7 @@ namespace Piwik;
 
 use Piwik\Archive\Parameters;
 use Piwik\ArchiveProcessor\Rules;
+use Piwik\DataAccess\ArchiveInvalidator;
 use Piwik\DataAccess\ArchiveSelector;
 use Piwik\Period\Factory as PeriodFactory;
 
@@ -161,6 +162,11 @@ class Archive
     private $params;
 
     /**
+     * @var \Piwik\Cache\Cache
+     */
+    private static $cache;
+
+    /**
      * @param Parameters $params
      * @param bool $forceIndexedBySite Whether to force index the result of a query by site ID.
      * @param bool $forceIndexedByDate Whether to force index the result of a query by period.
@@ -190,10 +196,9 @@ class Archive
      *                             or date range (ie, 'YYYY-MM-DD,YYYY-MM-DD').
      * @param bool|false|string $segment Segment definition or false if no segment should be used. {@link Piwik\Segment}
      * @param bool|false|string $_restrictSitesToLogin Used only when running as a scheduled task.
-     * @param bool $skipAggregationOfSubTables Whether the archive, when it is processed, should also aggregate all sub-tables
      * @return Archive
      */
-    public static function build($idSites, $period, $strDate, $segment = false, $_restrictSitesToLogin = false, $skipAggregationOfSubTables = false)
+    public static function build($idSites, $period, $strDate, $segment = false, $_restrictSitesToLogin = false)
     {
         $websiteIds = Site::getIdSitesFromIdSitesString($idSites, $_restrictSitesToLogin);
 
@@ -214,7 +219,7 @@ class Archive
         $idSiteIsAll    = $idSites == self::REQUEST_ALL_WEBSITES_FLAG;
         $isMultipleDate = Period::isMultiplePeriod($strDate, $period);
 
-        return Archive::factory($segment, $allPeriods, $websiteIds, $idSiteIsAll, $isMultipleDate, $skipAggregationOfSubTables);
+        return Archive::factory($segment, $allPeriods, $websiteIds, $idSiteIsAll, $isMultipleDate);
     }
 
     /**
@@ -236,11 +241,10 @@ class Archive
      * @param bool $isMultipleDate Whether multiple dates are being queried or not. If true, then
      *                             the result of querying functions will be indexed by period,
      *                             regardless of whether `count($periods) == 1`.
-     * @param bool $skipAggregationOfSubTables Whether the archive should skip aggregation of all sub-tables
      *
      * @return Archive
      */
-    public static function factory(Segment $segment, array $periods, array $idSites, $idSiteIsAll = false, $isMultipleDate = false, $skipAggregationOfSubTables = false)
+    public static function factory(Segment $segment, array $periods, array $idSites, $idSiteIsAll = false, $isMultipleDate = false)
     {
         $forceIndexedBySite = false;
         $forceIndexedByDate = false;
@@ -253,7 +257,7 @@ class Archive
             $forceIndexedByDate = true;
         }
 
-        $params = new Parameters($idSites, $periods, $segment, $skipAggregationOfSubTables);
+        $params = new Parameters($idSites, $periods, $segment);
 
         return new Archive($params, $forceIndexedBySite, $forceIndexedByDate);
     }
@@ -443,7 +447,6 @@ class Archive
      * @param string $segment @see {@link build()}
      * @param bool $expanded If true, loads all subtables. See {@link getDataTableExpanded()}
      * @param int|null $idSubtable See {@link getDataTableExpanded()}
-     * @param bool $skipAggregationOfSubTables Whether or not we should skip the aggregation of all sub-tables and only aggregate parent DataTable.
      * @param int|null $depth See {@link getDataTableExpanded()}
      * @throws \Exception
      * @return DataTable|DataTable\Map See {@link getDataTable()} and
@@ -451,15 +454,11 @@ class Archive
      *                                 information
      */
     public static function getDataTableFromArchive($name, $idSite, $period, $date, $segment, $expanded,
-                                                   $idSubtable = null, $skipAggregationOfSubTables = false, $depth = null)
+                                                   $idSubtable = null, $depth = null)
     {
         Piwik::checkUserHasViewAccess($idSite);
 
-        if ($skipAggregationOfSubTables && ($expanded || $idSubtable)) {
-            throw new \Exception("Not expected to skipAggregationOfSubTables when expanded=1 or idSubtable is set.");
-        }
-
-        $archive = Archive::build($idSite, $period, $date, $segment, $_restrictSitesToLogin = false, $skipAggregationOfSubTables);
+        $archive = Archive::build($idSite, $period, $date, $segment, $_restrictSitesToLogin = false);
         if ($idSubtable === false) {
             $idSubtable = null;
         }
@@ -480,6 +479,69 @@ class Archive
         return $recordName . "_" . $id;
     }
 
+    private function getSiteIdsThatAreRequestedInThisArchiveButWereNotInvalidatedYet()
+    {
+        if (is_null(self::$cache)) {
+            self::$cache = Cache::getTransientCache();
+        }
+
+        $id = 'Archive.SiteIdsOfRememberedReportsInvalidated';
+
+        if (!self::$cache->contains($id)) {
+            self::$cache->save($id, array());
+        }
+
+        $siteIdsAlreadyHandled = self::$cache->fetch($id);
+        $siteIdsRequested      = $this->params->getIdSites();
+
+        foreach ($siteIdsRequested as $index => $siteIdRequested) {
+            $siteIdRequested = (int) $siteIdRequested;
+
+            if (in_array($siteIdRequested, $siteIdsAlreadyHandled)) {
+                unset($siteIdsRequested[$index]); // was already handled previously, do not do it again
+            } else {
+                $siteIdsAlreadyHandled[] = $siteIdRequested; // we will handle this id this time
+            }
+        }
+
+        self::$cache->save($id, $siteIdsAlreadyHandled);
+
+        return $siteIdsRequested;
+    }
+
+    private function invalidatedReportsIfNeeded()
+    {
+        $siteIdsRequested = $this->getSiteIdsThatAreRequestedInThisArchiveButWereNotInvalidatedYet();
+
+        if (empty($siteIdsRequested)) {
+            return; // all requested site ids were already handled
+        }
+
+        $invalidator  = new ArchiveInvalidator();
+        $sitesPerDays = $invalidator->getRememberedArchivedReportsThatShouldBeInvalidated();
+
+        foreach ($sitesPerDays as $date => $siteIds) {
+            if (empty($siteIds)) {
+                continue;
+            }
+
+            $siteIdsToActuallyInvalidate = array_intersect($siteIds, $siteIdsRequested);
+
+            if (empty($siteIdsToActuallyInvalidate)) {
+                continue; // all site ids that should be handled are already handled
+            }
+
+            try {
+                $invalidator->markArchivesAsInvalidated($siteIdsToActuallyInvalidate, $date, false);
+            } catch (\Exception $e) {
+                Site::clearCache();
+                throw $e;
+            }
+        }
+
+        Site::clearCache();
+    }
+
     /**
      * Queries archive tables for data and returns the result.
      * @param array|string $archiveNames
@@ -489,6 +551,7 @@ class Archive
      */
     private function get($archiveNames, $archiveDataType, $idSubtable = null)
     {
+
         if (!is_array($archiveNames)) {
             $archiveNames = array($archiveNames);
         }
@@ -537,6 +600,9 @@ class Archive
      * queried. This function will use the idarchive cache if it has the right data,
      * query archive tables for IDs w/o launching archiving, or launch archiving and
      * get the idarchive from ArchiveProcessor instances.
+     *
+     * @param string $archiveNames
+     * @return array
      */
     private function getArchiveIds($archiveNames)
     {
@@ -586,6 +652,8 @@ class Archive
      */
     private function cacheArchiveIdsAfterLaunching($archiveGroups, $plugins)
     {
+        $this->invalidatedReportsIfNeeded();
+
         $today = Date::today();
 
         foreach ($this->params->getPeriods() as $period) {
@@ -599,14 +667,14 @@ class Archive
                 // we already know there are no stats for this period
                 // we add one day to make sure we don't miss the day of the website creation
                 if ($twoDaysAfterPeriod->isEarlier($site->getCreationDate())) {
-                    Log::verbose("Archive site %s, %s (%s) skipped, archive is before the website was created.",
+                    Log::debug("Archive site %s, %s (%s) skipped, archive is before the website was created.",
                         $idSite, $period->getLabel(), $period->getPrettyString());
                     continue;
                 }
 
                 // if the starting date is in the future we know there is no visiidsite = ?t
                 if ($twoDaysBeforePeriod->isLater($today)) {
-                    Log::verbose("Archive site %s, %s (%s) skipped, archive is after today.",
+                    Log::debug("Archive site %s, %s (%s) skipped, archive is after today.",
                         $idSite, $period->getLabel(), $period->getPrettyString());
                     continue;
                 }
@@ -626,7 +694,7 @@ class Archive
     private function cacheArchiveIdsWithoutLaunching($plugins)
     {
         $idarchivesByReport = ArchiveSelector::getArchiveIds(
-            $this->params->getIdSites(), $this->params->getPeriods(), $this->params->getSegment(), $plugins, $this->params->isSkipAggregationOfSubTables());
+            $this->params->getIdSites(), $this->params->getPeriods(), $this->params->getSegment(), $plugins);
 
         // initialize archive ID cache for each report
         foreach ($plugins as $plugin) {
@@ -654,8 +722,7 @@ class Archive
                     $this->params->getIdSites(),
                     $this->params->getSegment(),
                     $this->getPeriodLabel(),
-                    $plugin,
-                    $this->params->isSkipAggregationOfSubTables()
+                    $plugin
         );
     }
 
@@ -722,6 +789,8 @@ class Archive
      * If this  function is not called, then periods with no visits will not add
      * entries to the cache. If the archive is used again, SQL will be executed to
      * try and find the archive IDs even though we know there are none.
+     *
+     * @param string $doneFlag
      */
     private function initializeArchiveIdCache($doneFlag)
     {
@@ -757,7 +826,7 @@ class Archive
     /**
      * Returns the name of the plugin that archives a given report.
      *
-     * @param string $report Archive data name, eg, `'nb_visits'`, `'UserSettings_...'`, etc.
+     * @param string $report Archive data name, eg, `'nb_visits'`, `'DevicesDetection_...'`, etc.
      * @return string Plugin name.
      * @throws \Exception If a plugin cannot be found or if the plugin for the report isn't
      *                    activated.
@@ -791,7 +860,7 @@ class Archive
      */
     private function prepareArchive(array $archiveGroups, Site $site, Period $period)
     {
-        $parameters = new ArchiveProcessor\Parameters($site, $period, $this->params->getSegment(), $this->params->isSkipAggregationOfSubTables());
+        $parameters = new ArchiveProcessor\Parameters($site, $period, $this->params->getSegment());
         $archiveLoader = new ArchiveProcessor\Loader($parameters);
 
         $periodString = $period->getRangeString();
diff --git a/core/Archive/Parameters.php b/core/Archive/Parameters.php
index d1a540dce0..ad7bef9eb6 100644
--- a/core/Archive/Parameters.php
+++ b/core/Archive/Parameters.php
@@ -35,22 +35,16 @@ class Parameters
      */
     private $segment;
 
-    /**
-     * @var bool
-     */
-    private $skipAggregationOfSubTables;
-
     public function getSegment()
     {
         return $this->segment;
     }
 
-    public function __construct($idSites, $periods, Segment $segment, $skipAggregationOfSubTables)
+    public function __construct($idSites, $periods, Segment $segment)
     {
         $this->idSites = $idSites;
         $this->periods = $periods;
         $this->segment = $segment;
-        $this->skipAggregationOfSubTables = $skipAggregationOfSubTables;
     }
 
     public function getPeriods()
@@ -62,11 +56,5 @@ class Parameters
     {
         return $this->idSites;
     }
-
-    public function isSkipAggregationOfSubTables()
-    {
-        return $this->skipAggregationOfSubTables;
-    }
-
 }
 
diff --git a/core/ArchiveProcessor.php b/core/ArchiveProcessor.php
index c93e913e0c..58282e72d1 100644
--- a/core/ArchiveProcessor.php
+++ b/core/ArchiveProcessor.php
@@ -112,8 +112,6 @@ class ArchiveProcessor
      */
     private $skipUniqueVisitorsCalculationForMultipleSites = true;
 
-    const SKIP_UNIQUE_VISITORS_FOR_MULTIPLE_SITES = 'enable_processing_unique_visitors_multiple_sites';
-
     public function __construct(Parameters $params, ArchiveWriter $archiveWriter)
     {
         $this->params = $params;
@@ -216,14 +214,9 @@ class ArchiveProcessor
 
             $table = $this->aggregateDataTableRecord($recordName, $columnsAggregationOperation, $columnsToRenameAfterAggregation);
 
-            $rowsCount = $table->getRowsCount();
-            $nameToCount[$recordName]['level0'] = $rowsCount;
+            $nameToCount[$recordName]['level0'] = $table->getRowsCount();
 
-            $rowsCountRecursive = $rowsCount;
-            if ($this->isAggregateSubTables()) {
-                $rowsCountRecursive = $table->getRowsCountRecursive();
-            }
-            $nameToCount[$recordName]['recursive'] = $rowsCountRecursive;
+            $nameToCount[$recordName]['recursive'] = $table->getRowsCountRecursive();
 
             $blob = $table->getSerialized($maximumRowsInDataTableLevelZero, $maximumRowsInSubDataTable, $columnToSortByBeforeTruncation);
             Common::destroy($table);
@@ -348,14 +341,8 @@ class ArchiveProcessor
      */
     protected function aggregateDataTableRecord($name, $columnsAggregationOperation = null, $columnsToRenameAfterAggregation = null)
     {
-        if ($this->isAggregateSubTables()) {
-            // By default we shall aggregate all sub-tables.
-            $dataTable = $this->getArchive()->getDataTableExpanded($name, $idSubTable = null, $depth = null, $addMetadataSubtableId = false);
-        } else {
-            // In some cases (eg. Actions plugin when period=range),
-            // for better performance we will only aggregate the parent table
-            $dataTable = $this->getArchive()->getDataTable($name, $idSubTable = null);
-        }
+        // By default we shall aggregate all sub-tables.
+        $dataTable = $this->getArchive()->getDataTableExpanded($name, $idSubTable = null, $depth = null, $addMetadataSubtableId = false);
 
         if ($dataTable instanceof Map) {
             // see https://github.com/piwik/piwik/issues/4377
@@ -391,19 +378,38 @@ class ArchiveProcessor
         ) {
             return;
         }
-        if ($row->getColumn('nb_uniq_visitors') !== false
-            || $row->getColumn('nb_users') !== false
+
+        if ($row->getColumn('nb_uniq_visitors') === false
+            && $row->getColumn('nb_users') === false
         ) {
-            if (SettingsPiwik::isUniqueVisitorsEnabled($this->getParams()->getPeriod()->getLabel())) {
-                $metrics = array(Metrics::INDEX_NB_UNIQ_VISITORS, Metrics::INDEX_NB_USERS);
-                $uniques = $this->computeNbUniques( $metrics );
-                $row->setColumn('nb_uniq_visitors', $uniques[Metrics::INDEX_NB_UNIQ_VISITORS]);
-                $row->setColumn('nb_users', $uniques[Metrics::INDEX_NB_USERS]);
-            } else {
-                $row->deleteColumn('nb_uniq_visitors');
-                $row->deleteColumn('nb_users');
+            return;
+        }
+
+        if (!SettingsPiwik::isUniqueVisitorsEnabled($this->getParams()->getPeriod()->getLabel())) {
+            $row->deleteColumn('nb_uniq_visitors');
+            $row->deleteColumn('nb_users');
+            return;
+        }
+
+        $metrics = array(
+            Metrics::INDEX_NB_USERS
+        );
+
+        if($this->getParams()->isSingleSite()) {
+            $uniqueVisitorsMetric = Metrics::INDEX_NB_UNIQ_VISITORS;
+        } else {
+            if(!SettingsPiwik::isSameFingerprintAcrossWebsites()) {
+                throw new Exception("Processing unique visitors across websites is enabled for this instance,
+                            but to process this metric you must first set enable_fingerprinting_across_websites=1
+                            in the config file, under the [Tracker] section.");
             }
+            $uniqueVisitorsMetric = Metrics::INDEX_NB_UNIQ_FINGERPRINTS;
         }
+        $metrics[] = $uniqueVisitorsMetric;
+
+        $uniques = $this->computeNbUniques( $metrics );
+        $row->setColumn('nb_uniq_visitors', $uniques[$uniqueVisitorsMetric]);
+        $row->setColumn('nb_users', $uniques[Metrics::INDEX_NB_USERS]);
     }
 
     protected function guessOperationForColumn($column)
@@ -424,7 +430,7 @@ class ArchiveProcessor
      * since unique visitors cannot be summed like other metrics.
      *
      * @param array Metrics Ids for which to aggregates count of values
-     * @return int
+     * @return array of metrics, where the key is metricid and the value is the metric value
      */
     protected function computeNbUniques($metrics)
     {
@@ -454,7 +460,7 @@ class ArchiveProcessor
             // as $date => $tableToSum
             $this->aggregatedDataTableMapsAsOne($data, $table);
         } else {
-            $table->addDataTable($data, $this->isAggregateSubTables());
+            $table->addDataTable($data);
         }
 
         return $table;
@@ -471,7 +477,7 @@ class ArchiveProcessor
             if ($tableToAggregate instanceof Map) {
                 $this->aggregatedDataTableMapsAsOne($tableToAggregate, $aggregated);
             } else {
-                $aggregated->addDataTable($tableToAggregate, $this->isAggregateSubTables());
+                $aggregated->addDataTable($tableToAggregate);
             }
         }
     }
@@ -487,7 +493,7 @@ class ArchiveProcessor
         }
 
         foreach ($columnsToRenameAfterAggregation as $oldName => $newName) {
-            $table->renameColumn($oldName, $newName, $this->isAggregateSubTables());
+            $table->renameColumn($oldName, $newName);
         }
     }
 
@@ -523,12 +529,4 @@ class ArchiveProcessor
 
         return $metrics;
     }
-
-    /**
-     * @return bool
-     */
-    protected function isAggregateSubTables()
-    {
-        return !$this->getParams()->isSkipAggregationOfSubTables();
-    }
 }
diff --git a/core/ArchiveProcessor/Parameters.php b/core/ArchiveProcessor/Parameters.php
index 1528d8210c..4edd1f4b58 100644
--- a/core/ArchiveProcessor/Parameters.php
+++ b/core/ArchiveProcessor/Parameters.php
@@ -48,12 +48,11 @@ class Parameters
      *
      * @ignore
      */
-    public function __construct(Site $site, Period $period, Segment $segment, $skipAggregationOfSubTables = false)
+    public function __construct(Site $site, Period $period, Segment $segment)
     {
         $this->site = $site;
         $this->period = $period;
         $this->segment = $segment;
-        $this->skipAggregationOfSubTables = $skipAggregationOfSubTables;
     }
 
     /**
@@ -169,18 +168,13 @@ class Parameters
         return count($this->getIdSites()) == 1;
     }
 
-    public function isSkipAggregationOfSubTables()
-    {
-        return $this->skipAggregationOfSubTables;
-    }
-
     public function logStatusDebug($isTemporary)
     {
         $temporary = 'definitive archive';
         if ($isTemporary) {
             $temporary = 'temporary archive';
         }
-        Log::verbose(
+        Log::debug(
             "%s archive, idSite = %d (%s), segment '%s', report = '%s', UTC datetime [%s -> %s]",
             $this->getPeriod()->getLabel(),
             $this->getSite()->getId(),
diff --git a/core/ArchiveProcessor/PluginsArchiver.php b/core/ArchiveProcessor/PluginsArchiver.php
index d1bb950d38..7487128728 100644
--- a/core/ArchiveProcessor/PluginsArchiver.php
+++ b/core/ArchiveProcessor/PluginsArchiver.php
@@ -16,6 +16,7 @@ use Piwik\DataTable\Manager;
 use Piwik\Metrics;
 use Piwik\Plugin\Archiver;
 use Piwik\Log;
+use Piwik\Timer;
 
 /**
  * This class creates the Archiver objects found in plugins and will trigger aggregation,
@@ -96,11 +97,12 @@ class PluginsArchiver
             $archiver = new $archiverClass($this->archiveProcessor);
 
             if (!$archiver->isEnabled()) {
-                Log::verbose("PluginsArchiver::%s: Skipping archiving for plugin '%s'.", __FUNCTION__, $pluginName);
+                Log::debug("PluginsArchiver::%s: Skipping archiving for plugin '%s'.", __FUNCTION__, $pluginName);
                 continue;
             }
 
             if ($this->shouldProcessReportsForPlugin($pluginName)) {
+                $timer = new Timer();
                 if ($this->isSingleSiteDayArchive) {
                     Log::debug("PluginsArchiver::%s: Archiving day reports for plugin '%s'.", __FUNCTION__, $pluginName);
 
@@ -110,8 +112,15 @@ class PluginsArchiver
 
                     $archiver->aggregateMultipleReports();
                 }
+
+                Log::debug("PluginsArchiver::%s: %s while archiving %s reports for plugin '%s'.",
+                    __FUNCTION__,
+                    $timer->getMemoryLeak(),
+                    $this->params->getPeriod()->getLabel(),
+                    $pluginName
+                );
             } else {
-                Log::verbose("PluginsArchiver::%s: Not archiving reports for plugin '%s'.", __FUNCTION__, $pluginName);
+                Log::debug("PluginsArchiver::%s: Not archiving reports for plugin '%s'.", __FUNCTION__, $pluginName);
             }
 
             Manager::getInstance()->deleteAll($latestUsedTableId);
diff --git a/core/ArchiveProcessor/Rules.php b/core/ArchiveProcessor/Rules.php
index 1334ad1f9a..06b38aa27d 100644
--- a/core/ArchiveProcessor/Rules.php
+++ b/core/ArchiveProcessor/Rules.php
@@ -10,6 +10,7 @@ namespace Piwik\ArchiveProcessor;
 
 use Exception;
 use Piwik\Config;
+use Piwik\Container\StaticContainer;
 use Piwik\DataAccess\ArchiveWriter;
 use Piwik\Date;
 use Piwik\Log;
@@ -45,13 +46,12 @@ class Rules
      * @param Segment $segment
      * @param string $periodLabel
      * @param string $plugin
-     * @param bool $isSkipAggregationOfSubTables
      * @return string
      */
-    public static function getDoneStringFlagFor(array $idSites, $segment, $periodLabel, $plugin, $isSkipAggregationOfSubTables)
+    public static function getDoneStringFlagFor(array $idSites, $segment, $periodLabel, $plugin)
     {
         if (!self::shouldProcessReportsAllPlugins($idSites, $segment, $periodLabel)) {
-            return self::getDoneFlagArchiveContainsOnePlugin($segment, $plugin, $isSkipAggregationOfSubTables);
+            return self::getDoneFlagArchiveContainsOnePlugin($segment, $plugin);
         }
         return self::getDoneFlagArchiveContainsAllPlugins($segment);
     }
@@ -82,10 +82,9 @@ class Rules
         return $segmentsToProcess;
     }
 
-    public static function getDoneFlagArchiveContainsOnePlugin(Segment $segment, $plugin, $isSkipAggregationOfSubTables = false)
+    public static function getDoneFlagArchiveContainsOnePlugin(Segment $segment, $plugin)
     {
-        $partial = self::isFlagArchivePartial($plugin, $isSkipAggregationOfSubTables);
-        return 'done' . $segment->getHash() . '.' . $plugin . $partial ;
+        return 'done' . $segment->getHash() . '.' . $plugin ;
     }
 
     private static function getDoneFlagArchiveContainsAllPlugins(Segment $segment)
@@ -94,29 +93,13 @@ class Rules
     }
 
     /**
-     * @param $plugin
-     * @param $isSkipAggregationOfSubTables
-     * @return string
-     */
-    private static function isFlagArchivePartial($plugin, $isSkipAggregationOfSubTables)
-    {
-        $partialArchive = '';
-        if ($plugin != "VisitsSummary" // VisitsSummary is always called when segmenting and should not have its own .partial archive
-            && $isSkipAggregationOfSubTables
-        ) {
-            $partialArchive = '.partial';
-        }
-        return $partialArchive;
-    }
-
-    /**
      * Return done flags used to tell how the archiving process for a specific archive was completed,
      *
      * @param array $plugins
      * @param $segment
      * @return array
      */
-    public static function getDoneFlags(array $plugins, Segment $segment, $isSkipAggregationOfSubTables)
+    public static function getDoneFlags(array $plugins, Segment $segment)
     {
         $doneFlags = array();
         $doneAllPlugins = self::getDoneFlagArchiveContainsAllPlugins($segment);
@@ -124,7 +107,7 @@ class Rules
 
         $plugins = array_unique($plugins);
         foreach ($plugins as $plugin) {
-            $doneOnePlugin = self::getDoneFlagArchiveContainsOnePlugin($segment, $plugin, $isSkipAggregationOfSubTables);
+            $doneOnePlugin = self::getDoneFlagArchiveContainsOnePlugin($segment, $plugin);
             $doneFlags[$plugin] = $doneOnePlugin;
         }
         return $doneFlags;
@@ -141,38 +124,24 @@ class Rules
      */
     public static function shouldPurgeOutdatedArchives(Date $date)
     {
-        $key = self::FLAG_TABLE_PURGED . "blob_" . $date->toString('Y_m');
-        $timestamp = Option::get($key);
-
-        // we shall purge temporary archives after their timeout is finished, plus an extra 6 hours
-        // in case archiving is disabled or run once a day, we give it this extra time to run
-        // and re-process more recent records...
-        $temporaryArchivingTimeout = self::getTodayArchiveTimeToLive();
-        $hoursBetweenPurge = 6;
-        $purgeEveryNSeconds = max($temporaryArchivingTimeout, $hoursBetweenPurge * 3600);
-
         // we only delete archives if we are able to process them, otherwise, the browser might process reports
         // when &segment= is specified (or custom date range) and would below, delete temporary archives that the
         // browser is not able to process until next cron run (which could be more than 1 hour away)
-        if (self::isRequestAuthorizedToArchive()
-            && (!$timestamp
-                || $timestamp < time() - $purgeEveryNSeconds)
-        ) {
-            Option::set($key, time());
-
-            if (self::isBrowserTriggerEnabled()) {
-                // If Browser Archiving is enabled, it is likely there are many more temporary archives
-                // We delete more often which is safe, since reports are re-processed on demand
-                $purgeArchivesOlderThan = Date::factory(time() - 2 * $temporaryArchivingTimeout)->getDateTime();
-            } else {
-                // If cron core:archive command is building the reports, we should keep all temporary reports from today
-                $purgeArchivesOlderThan = Date::factory('yesterday')->getDateTime();
-            }
-            return $purgeArchivesOlderThan;
+        if (! self::isRequestAuthorizedToArchive()){
+            Log::info("Purging temporary archives: skipped (no authorization)");
+            return false;
         }
 
-        Log::info("Purging temporary archives: skipped.");
-        return false;
+        $temporaryArchivingTimeout = self::getTodayArchiveTimeToLive();
+
+        if (self::isBrowserTriggerEnabled()) {
+            // If Browser Archiving is enabled, it is likely there are many more temporary archives
+            // We delete more often which is safe, since reports are re-processed on demand
+            return Date::factory(time() - 2 * $temporaryArchivingTimeout)->getDateTime();
+        } 
+
+        // If cron core:archive command is building the reports, we should keep all temporary reports from today
+        return Date::factory('yesterday')->getDateTime();
     }
 
     public static function getMinTimeProcessedForTemporaryArchive(
@@ -228,18 +197,28 @@ class Rules
 
     public static function isArchivingDisabledFor(array $idSites, Segment $segment, $periodLabel)
     {
+        $generalConfig = Config::getInstance()->General;
+
         if ($periodLabel == 'range') {
-            return false;
+            if (!isset($generalConfig['archiving_range_force_on_browser_request'])
+                || $generalConfig['archiving_range_force_on_browser_request'] != false
+            ) {
+                return false;
+            } else {
+                Log::debug("Not forcing archiving for range period.");
+            }
         }
+
         $processOneReportOnly = !self::shouldProcessReportsAllPlugins($idSites, $segment, $periodLabel);
         $isArchivingDisabled = !self::isRequestAuthorizedToArchive() || self::$archivingDisabledByTests;
 
-        if ($processOneReportOnly) {
-
+        if ($processOneReportOnly
+            && $periodLabel != 'range'
+        ) {
             // When there is a segment, we disable archiving when browser_archiving_disabled_enforce applies
             if (!$segment->isEmpty()
                 && $isArchivingDisabled
-                && Config::getInstance()->General['browser_archiving_disabled_enforce']
+                && $generalConfig['browser_archiving_disabled_enforce']
                 && !SettingsServer::isArchivePhpTriggered() // Only applies when we are not running core:archive command
             ) {
                 Log::debug("Archiving is disabled because of config setting browser_archiving_disabled_enforce=1");
diff --git a/core/AssetManager.php b/core/AssetManager.php
index 8c7d2adfa7..28f8407b79 100644
--- a/core/AssetManager.php
+++ b/core/AssetManager.php
@@ -225,7 +225,6 @@ class AssetManager extends Singleton
 
             if ($this->pluginContainsJScriptAssets($pluginName)) {
 
-                PiwikConfig::getInstance()->init();
                 if (Manager::getInstance()->isPluginBundledWithCore($pluginName)) {
 
                     $assetsToRemove[] = $this->getMergedCoreJSAsset();
@@ -253,7 +252,7 @@ class AssetManager extends Singleton
      */
     public function getAssetDirectory()
     {
-        $mergedFileDirectory = StaticContainer::getContainer()->get('path.tmp') . '/assets';
+        $mergedFileDirectory = StaticContainer::get('path.tmp') . '/assets';
 
         if (!is_dir($mergedFileDirectory)) {
             Filesystem::mkdir($mergedFileDirectory);
diff --git a/core/AssetManager/UIAsset/OnDiskUIAsset.php b/core/AssetManager/UIAsset/OnDiskUIAsset.php
index 1c24420770..fc4b834342 100644
--- a/core/AssetManager/UIAsset/OnDiskUIAsset.php
+++ b/core/AssetManager/UIAsset/OnDiskUIAsset.php
@@ -10,6 +10,7 @@ namespace Piwik\AssetManager\UIAsset;
 
 use Exception;
 use Piwik\AssetManager\UIAsset;
+use Piwik\Filesystem;
 
 class OnDiskUIAsset extends UIAsset
 {
@@ -58,12 +59,15 @@ class OnDiskUIAsset extends UIAsset
     {
         if ($this->exists()) {
 
-            if (!unlink($this->getAbsoluteLocation()))
+            try {
+                Filesystem::remove($this->getAbsoluteLocation());
+            } catch (Exception $e) {
                 throw new Exception("Unable to delete merged file : " . $this->getAbsoluteLocation() . ". Please delete the file and refresh");
+            }
 
             // try to remove compressed version of the merged file.
-            @unlink($this->getAbsoluteLocation() . ".deflate");
-            @unlink($this->getAbsoluteLocation() . ".gz");
+            Filesystem::remove($this->getAbsoluteLocation() . ".deflate", true);
+            Filesystem::remove($this->getAbsoluteLocation() . ".gz", true);
         }
     }
 
diff --git a/core/Auth.php b/core/Auth.php
index 8e3a1e28e9..45bc22062b 100644
--- a/core/Auth.php
+++ b/core/Auth.php
@@ -16,7 +16,7 @@ use Exception;
  *
  * Plugins that provide Auth implementations must provide a class that implements
  * this interface. Additionally, an instance of that class must be set in the
- * {@link \Piwik\Registry} class with the 'auth' key during the
+ * container with the 'Piwik\Auth' key during the
  * [Request.initAuthenticationObject](http://developer.piwik.org/api-reference/events#requestinitauthenticationobject)
  * event.
  *
@@ -34,13 +34,13 @@ use Exception;
  * **How an Auth implementation will be used**
  *
  *     // authenticating by password
- *     $auth = \Piwik\Registry::get('auth');
+ *     $auth = StaticContainer::get('Piwik\Auth');
  *     $auth->setLogin('user');
  *     $auth->setPassword('password');
  *     $result = $auth->authenticate();
  *
  *     // authenticating by token auth
- *     $auth = \Piwik\Registry::get('auth');
+ *     $auth = StaticContainer::get('Piwik\Auth');
  *     $auth->setLogin('user');
  *     $auth->setTokenAuth('...');
  *     $result = $auth->authenticate();
diff --git a/core/Cache.php b/core/Cache.php
new file mode 100644
index 0000000000..3036d05006
--- /dev/null
+++ b/core/Cache.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik;
+
+use Piwik\Cache\Backend;
+use Piwik\Container\StaticContainer;
+
+class Cache
+{
+
+    /**
+     * This can be considered as the default cache to use in case you don't know which one to pick. It does not support
+     * the caching of any objects though. Only boolean, numbers, strings and arrays are supported. Whenever you request
+     * an entry from the cache it will fetch the entry. Cache entries might be persisted but not necessarily. It
+     * depends on the configured backend.
+     *
+     * @return Cache\Lazy
+     */
+    public static function getLazyCache()
+    {
+        return StaticContainer::get('Piwik\Cache\Lazy');
+    }
+
+    /**
+     * This class is used to cache any data during one request. It won't be persisted between requests and it can
+     * cache all kind of data, even objects or resources. This cache is very fast.
+     *
+     * @return Cache\Transient
+     */
+    public static function getTransientCache()
+    {
+        return StaticContainer::get('Piwik\Cache\Transient');
+    }
+
+    /**
+     * This cache stores all its cache entries under one "cache" entry in a configurable backend.
+     *
+     * This comes handy for things that you need very often, nearly in every request. For example plugin metadata, the
+     * list of tracker plugins, the list of available languages, ...
+     * Instead of having to read eg. a hundred cache entries from files (or any other backend) it only loads one cache
+     * entry which contains the hundred keys. Should be used only for things that you need very often and only for
+     * cache entries that are not too large to keep loading and parsing the single cache entry fast.
+     * All cache entries it contains have the same life time. For fast performance it won't validate any cache ids.
+     * It is not possible to cache any objects using this cache.
+     *
+     * @return Cache\Eager
+     */
+    public static function getEagerCache()
+    {
+        return StaticContainer::get('Piwik\Cache\Eager');
+    }
+
+    public static function flushAll()
+    {
+        self::getLazyCache()->flushAll();
+        self::getTransientCache()->flushAll();
+        self::getEagerCache()->flushAll();
+    }
+
+    /**
+     * @param $type
+     * @return Cache\Backend
+     */
+    public static function buildBackend($type)
+    {
+        $factory = new Cache\Backend\Factory();
+        $options = self::getOptions($type);
+
+        $backend = $factory->buildBackend($type, $options);
+
+        return $backend;
+    }
+
+    private static function getOptions($type)
+    {
+        $options = self::getBackendOptions($type);
+
+        switch ($type) {
+            case 'file':
+
+                $options = array('directory' => StaticContainer::get('path.cache'));
+                break;
+
+            case 'chained':
+
+                foreach ($options['backends'] as $backend) {
+                    $options[$backend] = self::getOptions($backend);
+                }
+
+                break;
+
+            case 'redis':
+
+                if (!empty($options['timeout'])) {
+                    $options['timeout'] = (float)Common::forceDotAsSeparatorForDecimalPoint($options['timeout']);
+                }
+
+                break;
+        }
+
+        return $options;
+    }
+
+    private static function getBackendOptions($backend)
+    {
+        $key = ucfirst($backend) . 'Cache';
+        $options = Config::getInstance()->$key;
+
+        return $options;
+    }
+}
diff --git a/core/Cache/CacheDecorator.php b/core/Cache/CacheDecorator.php
deleted file mode 100644
index f35154ba72..0000000000
--- a/core/Cache/CacheDecorator.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Cache;
-
-use Piwik\Tracker;
-use Piwik\Translate;
-
-/**
- * Caching class used for static caching.
- */
-class CacheDecorator implements CacheInterface
-{
-    /**
-     * @var StaticCache
-     */
-    protected $staticCache;
-
-    public function __construct(CacheInterface $cache)
-    {
-        $this->staticCache = $cache;
-    }
-
-    public function get()
-    {
-        return $this->staticCache->get();
-    }
-
-    public function has()
-    {
-        return $this->staticCache->has();
-    }
-
-    public function setCacheKey($cacheKey)
-    {
-        $this->staticCache->setCacheKey($cacheKey);
-    }
-
-    public function getCacheKey()
-    {
-        return $this->staticCache->getCacheKey();
-    }
-
-    public function set($content)
-    {
-        $this->staticCache->set($content);
-    }
-
-}
diff --git a/core/Cache/CacheInterface.php b/core/Cache/CacheInterface.php
deleted file mode 100644
index 65039e5436..0000000000
--- a/core/Cache/CacheInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Cache;
-
-use Piwik\Tracker;
-use Piwik\Translate;
-
-/**
- * Caching class used for static caching.
- */
-interface CacheInterface
-{
-    public function get();
-
-    public function has();
-
-    public function setCacheKey($cacheKey);
-
-    public function getCacheKey();
-
-    public function set($content);
-
-}
diff --git a/core/Cache/LanguageAwareStaticCache.php b/core/Cache/LanguageAwareStaticCache.php
deleted file mode 100644
index 62b4773282..0000000000
--- a/core/Cache/LanguageAwareStaticCache.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Cache;
-
-use Piwik\Translate;
-
-/**
- * Caching class used for static caching which is language aware. It'll cache the given content depending on the
- * current loaded language. This prevents you from having to invalidate the cache during tests in case the loaded
- * language changes etc.
- *
- * TODO convert this to a decorator... see {@link StaticCache}
- */
-class LanguageAwareStaticCache extends StaticCache
-{
-    protected function completeKey($cacheKey)
-    {
-        return $cacheKey . Translate::getLanguageLoaded();
-    }
-}
diff --git a/core/Cache/PersistentCache.php b/core/Cache/PersistentCache.php
deleted file mode 100644
index 5a98621a4c..0000000000
--- a/core/Cache/PersistentCache.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Cache;
-
-use Piwik\CacheFile;
-use Piwik\Development;
-use Piwik\Piwik;
-use Piwik\SettingsServer;
-use Piwik\Version;
-
-/**
- * Caching class that persists all cached values between requests. Meaning whatever you cache will be stored on the
- * file system. It differs from other caches such as {@link CacheFile} that it does not create a file for each cacheKey.
- * Reading and writing new values does not cause multiple reads / writes on the file system and is therefore faster.
- * The cache won't be invalidated after any time by default but when the tracker cache is cleared. This is usually the
- * case when a new plugin is installed or an existing plugin or the core is updated.
- * You should be careful when caching any data since we won't modify the cache key. So if your data depends on which
- * plugins are activated or should not be available to each user than make sure to include unique names in the cache
- * key such as the names of all loaded plugin names.
- * If development mode is enabled in the config this cache acts as a {@link StaticCache}. Meaning it won't persist any
- * data between requests.
- */
-class PersistentCache
-{
-    /**
-     * @var CacheFile
-     */
-    private static $storage = null;
-    private static $content = null;
-    private static $isDirty = false;
-
-    private $cacheKey;
-
-    /**
-     * Initializes the cache.
-     * @param string $cacheKey
-     */
-    public function __construct($cacheKey)
-    {
-        $this->cacheKey = $cacheKey;
-
-        if (is_null(self::$content)) {
-            self::$content = array();
-            self::populateCache();
-        }
-    }
-
-    /**
-     * Overwrites a previously set cache key. Useful if you want to reuse the same instance for different cache keys
-     * for performance reasons.
-     * @param string $cacheKey
-     */
-    public function setCacheKey($cacheKey)
-    {
-        $this->cacheKey = $cacheKey;
-    }
-
-    /**
-     * Get the content related to the current cache key. Make sure to call the method {@link has()} to verify whether
-     * there is actually any content set under this cache key.
-     * @return mixed
-     */
-    public function get()
-    {
-        return self::$content[$this->cacheKey];
-    }
-
-    /**
-     * Check whether any content was actually stored for the current cache key.
-     * @return bool
-     */
-    public function has()
-    {
-        return array_key_exists($this->cacheKey, self::$content);
-    }
-
-    /**
-     * Set (overwrite) any content related to the current set cache key.
-     * @param $content
-     */
-    public function set($content)
-    {
-        self::$content[$this->cacheKey] = $content;
-        self::$isDirty = true;
-    }
-
-    private static function populateCache()
-    {
-        if (Development::isEnabled()) {
-            return;
-        }
-
-        if (SettingsServer::isTrackerApiRequest()) {
-            $eventToPersist = 'Tracker.end';
-            $mode           = '-tracker';
-        } else {
-            $eventToPersist = 'Request.dispatch.end';
-            $mode           = '-ui';
-        }
-
-        $cache = self::getStorage()->get(self::getCacheFilename() . $mode);
-
-        if (is_array($cache)) {
-            self::$content = $cache;
-        }
-
-        Piwik::addAction($eventToPersist, array(__CLASS__, 'persistCache'));
-    }
-
-    private static function getCacheFilename()
-    {
-        return 'StaticCache-' . str_replace(array('.', '-'), '', Version::VERSION);
-    }
-
-    /**
-     * @ignore
-     */
-    public static function persistCache()
-    {
-        if (self::$isDirty) {
-            if (SettingsServer::isTrackerApiRequest()) {
-                $mode = '-tracker';
-            } else {
-                $mode = '-ui';
-            }
-
-            self::getStorage()->set(self::getCacheFilename() . $mode, self::$content);
-        }
-    }
-
-    /**
-     * @ignore
-     */
-    public static function _reset()
-    {
-        self::$content = array();
-    }
-
-    /**
-     * @return CacheFile
-     */
-    private static function getStorage()
-    {
-        if (is_null(self::$storage)) {
-            self::$storage = new CacheFile('tracker', 43200);
-            self::$storage->addOnDeleteCallback(function () {
-                PersistentCache::_reset();
-            });
-        }
-
-        return self::$storage;
-    }
-}
diff --git a/core/Cache/PluginAwareStaticCache.php b/core/Cache/PluginAwareStaticCache.php
deleted file mode 100644
index 1bc3a25bd5..0000000000
--- a/core/Cache/PluginAwareStaticCache.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Cache;
-
-use Piwik\Plugin\Manager as PluginManager;
-use Piwik\Translate;
-
-/**
- * Caching class used for static caching which is plugin aware. It'll cache the given content depending on the plugins
- * that are installed. This prevents you from having to invalidate the cache during tests in case the loaded plugins
- * changes etc. The key is language aware as well.
- *
- * TODO convert this to a decorator... see {@link StaticCache}
- */
-class PluginAwareStaticCache extends StaticCache
-{
-    protected function completeKey($cacheKey)
-    {
-        $pluginManager = PluginManager::getInstance();
-        $pluginNames   = $pluginManager->getLoadedPluginsName();
-        $cacheKey      = $cacheKey . md5(implode('', $pluginNames)) . Translate::getLanguageLoaded();
-
-        return $cacheKey;
-    }
-}
diff --git a/core/Cache/StaticCache.php b/core/Cache/StaticCache.php
deleted file mode 100644
index 0c102e18d3..0000000000
--- a/core/Cache/StaticCache.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Cache;
-
-/**
- * Caching class used for static caching. Any content that is set here won't be cached between requests. If you do want
- * to persist any content between requests have a look at {@link PersistentCache}
- *
- * TODO the default static cache should actually not be language aware. Especially since we would end up in classes like
- * LanguageAwareStaticCache, PluginAwareStaticCache, PluginAwareLanguageAwareStaticCache, PluginAwareXYZStaticCache,...
- * once we have dependency injection we should "build" all the caches we need removing duplicated code and extend the
- * static cache by using decorators which "enrich" the cache key depending on their awareness.
- */
-class StaticCache
-{
-    protected static $staticCache = array();
-
-    private $cacheKey;
-
-    /**
-     * Initializes the cache.
-     * @param string $cacheKey
-     */
-    public function __construct($cacheKey)
-    {
-        $this->setCacheKey($cacheKey);
-    }
-
-    /**
-     * Overwrites a previously set cache key. Useful if you want to reuse the same instance for different cache keys
-     * for performance reasons.
-     * @param string $cacheKey
-     */
-    public function setCacheKey($cacheKey)
-    {
-        $this->cacheKey = $this->completeKey($cacheKey);
-    }
-
-    /**
-     * Get the content related to the current cache key. Make sure to call the method {@link has()} to verify whether
-     * there is actually any content set under this cache key.
-     * @return mixed
-     */
-    public function get()
-    {
-        return self::$staticCache[$this->cacheKey];
-    }
-
-    /**
-     * Check whether any content was actually stored for the current cache key.
-     * @return bool
-     */
-    public function has()
-    {
-        return array_key_exists($this->cacheKey, self::$staticCache);
-    }
-
-    /**
-     * Reset the stored content of the current cache key.
-     */
-    public function clear()
-    {
-        unset(self::$staticCache[$this->cacheKey]);
-    }
-
-    /**
-     * Reset the stored content of the current cache key.
-     * @ignore
-     */
-    public static function clearAll()
-    {
-        self::$staticCache = array();
-    }
-
-    /**
-     * Set (overwrite) any content related to the current set cache key.
-     * @param $content
-     */
-    public function set($content)
-    {
-        self::$staticCache[$this->cacheKey] = $content;
-    }
-
-    protected function completeKey($cacheKey)
-    {
-        return $cacheKey;
-    }
-}
\ No newline at end of file
diff --git a/core/CacheFile.php b/core/CacheFile.php
deleted file mode 100644
index b8ec14c575..0000000000
--- a/core/CacheFile.php
+++ /dev/null
@@ -1,237 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik;
-
-use Exception;
-use Piwik\Container\StaticContainer;
-
-/**
- * This class is used to cache data on the filesystem.
- *
- * It is for example used by the Tracker process to cache various settings and websites attributes in tmp/cache/tracker/*
- *
- */
-class CacheFile
-{
-    // for testing purposes since tests run on both CLI/FPM (changes in CLI can't invalidate
-    // opcache in FPM, so we have to invalidate before reading)
-    public static $invalidateOpCacheBeforeRead = false;
-
-    /**
-     * @var string
-     */
-    private $cachePath;
-
-    /**
-     * Minimum enforced TTL in seconds
-     */
-    const MINIMUM_TTL = 60;
-
-    /**
-     * @var \Callable[]
-     */
-    private static $onDeleteCallback = array();
-
-    /**
-     * @param string $directory directory to use
-     * @param int $timeToLiveInSeconds TTL
-     */
-    public function __construct($directory, $timeToLiveInSeconds = 300)
-    {
-        $this->cachePath = StaticContainer::getContainer()->get('path.tmp') . '/cache/' . $directory . '/';
-
-        if ($timeToLiveInSeconds < self::MINIMUM_TTL) {
-            $timeToLiveInSeconds = self::MINIMUM_TTL;
-        }
-        $this->ttl = $timeToLiveInSeconds;
-    }
-
-    /**
-     * Function to fetch a cache entry
-     *
-     * @param string $id The cache entry ID
-     * @return array|bool  False on error, or array the cache content
-     */
-    public function get($id)
-    {
-        if (empty($id)) {
-            return false;
-        }
-
-        $id = $this->cleanupId($id);
-
-        $cache_complete = false;
-        $content        = '';
-        $expires_on     = false;
-
-        // We are assuming that most of the time cache will exists
-        $cacheFilePath = $this->cachePath . $id . '.php';
-        if (self::$invalidateOpCacheBeforeRead) {
-            $this->opCacheInvalidate($cacheFilePath);
-        }
-
-        $ok = @include($cacheFilePath);
-
-        if ($ok && $cache_complete == true) {
-
-            if (empty($expires_on)
-                || $expires_on < time()
-            ) {
-                return false;
-            }
-
-            return $content;
-        }
-
-        return false;
-    }
-
-    private function getExpiresTime()
-    {
-        return time() + $this->ttl;
-    }
-
-    protected function cleanupId($id)
-    {
-        if (!Filesystem::isValidFilename($id)) {
-            throw new Exception("Invalid cache ID request $id");
-        }
-
-        return $id;
-    }
-
-    /**
-     * A function to store content a cache entry.
-     *
-     * @param string $id The cache entry ID
-     * @param array $content The cache content
-     * @throws \Exception
-     * @return bool  True if the entry was succesfully stored
-     */
-    public function set($id, $content)
-    {
-        if (empty($id)) {
-            return false;
-        }
-
-        if (!is_dir($this->cachePath)) {
-            Filesystem::mkdir($this->cachePath);
-        }
-
-        if (!is_writable($this->cachePath)) {
-            return false;
-        }
-
-        $id = $this->cleanupId($id);
-        $id = $this->cachePath . $id . '.php';
-
-        if (is_object($content)) {
-            throw new \Exception('You cannot use the CacheFile to cache an object, only arrays, strings and numbers.');
-        }
-
-        $cache_literal = $this->buildCacheLiteral($content);
-
-        // Write cache to a temp file, then rename it, overwriting the old cache
-        // On *nix systems this should guarantee atomicity
-        $tmp_filename = tempnam($this->cachePath, 'tmp_');
-        @chmod($tmp_filename, 0640);
-        if ($fp = @fopen($tmp_filename, 'wb')) {
-            @fwrite($fp, $cache_literal, strlen($cache_literal));
-            @fclose($fp);
-
-            if (!@rename($tmp_filename, $id)) {
-                // On some systems rename() doesn't overwrite destination
-                @unlink($id);
-                if (!@rename($tmp_filename, $id)) {
-                    // Make sure that no temporary file is left over
-                    // if the destination is not writable
-                    @unlink($tmp_filename);
-                }
-            }
-
-            $this->opCacheInvalidate($id);
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * A function to delete a single cache entry
-     *
-     * @param string $id The cache entry ID
-     * @return bool  True if the entry was succesfully deleted
-     */
-    public function delete($id)
-    {
-        if (empty($id)) {
-            return false;
-        }
-
-        $id = $this->cleanupId($id);
-
-        $filename = $this->cachePath . $id . '.php';
-
-        if (file_exists($filename)) {
-            $this->opCacheInvalidate($filename);
-            @unlink($filename);
-            return true;
-        }
-
-        return false;
-    }
-
-    public function addOnDeleteCallback($onDeleteCallback)
-    {
-        self::$onDeleteCallback[] = $onDeleteCallback;
-    }
-
-    /**
-     * A function to delete all cache entries in the directory
-     */
-    public function deleteAll()
-    {
-        $self = $this;
-        $beforeUnlink = function ($path) use ($self) {
-            $self->opCacheInvalidate($path);
-        };
-
-        Filesystem::unlinkRecursive($this->cachePath, $deleteRootToo = false, $beforeUnlink);
-
-        if (!empty(self::$onDeleteCallback)) {
-            foreach (self::$onDeleteCallback as $callback) {
-                $callback();
-            }
-        }
-    }
-
-    public function opCacheInvalidate($filepath)
-    {
-        if (is_file($filepath)) {
-            if (function_exists('opcache_invalidate')) {
-                @opcache_invalidate($filepath, $force = true);
-            }
-            if (function_exists('apc_delete_file')) {
-                @apc_delete_file($filepath);
-            }
-        }
-    }
-
-    private function buildCacheLiteral($content)
-    {
-        $cache_literal  = "<" . "?php\n";
-        $cache_literal .= "$" . "content   = " . var_export($content, true) . ";\n";
-        $cache_literal .= "$" . "expires_on   = " . $this->getExpiresTime() . ";\n";
-        $cache_literal .= "$" . "cache_complete   = true;\n";
-        $cache_literal .= "?" . ">";
-
-        return $cache_literal;
-    }
-}
diff --git a/core/CacheId.php b/core/CacheId.php
new file mode 100644
index 0000000000..e445424009
--- /dev/null
+++ b/core/CacheId.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik;
+
+use Piwik\Translate;
+use Piwik\Plugin\Manager;
+
+class CacheId
+{
+    public static function languageAware($cacheId)
+    {
+        return $cacheId . '-' . Translate::getLanguageLoaded();
+    }
+
+    public static function pluginAware($cacheId)
+    {
+        $pluginManager = Manager::getInstance();
+        $pluginNames   = $pluginManager->getLoadedPluginsName();
+        $cacheId       = $cacheId . '-' . md5(implode('', $pluginNames));
+        $cacheId       = self::languageAware($cacheId);
+
+        return $cacheId;
+    }
+}
diff --git a/core/CliMulti.php b/core/CliMulti.php
index 8a1bffd773..3fb8dcdeba 100644
--- a/core/CliMulti.php
+++ b/core/CliMulti.php
@@ -25,7 +25,7 @@ class CliMulti {
     public $supportsAsync = null;
 
     /**
-     * @var \Piwik\CliMulti\Process[]
+     * @var Process[]
      */
     private $processes = array();
 
@@ -36,7 +36,7 @@ class CliMulti {
     private $concurrentProcessesLimit = null;
 
     /**
-     * @var \Piwik\CliMulti\Output[]
+     * @var Output[]
      */
     private $outputs = array();
 
@@ -118,7 +118,7 @@ class CliMulti {
     {
         $bin = $this->findPhpBinary();
 
-        return sprintf('%s %s/console climulti:request --piwik-domain=%s %s > %s 2>&1 &',
+        return sprintf('%s %s/console climulti:request -q --piwik-domain=%s %s > %s 2>&1 &',
                        $bin, PIWIK_INCLUDE_PATH, escapeshellarg($hostname), escapeshellarg($query), $outputFile);
     }
 
@@ -229,7 +229,7 @@ class CliMulti {
 
     public static function getTmpPath()
     {
-        return StaticContainer::getContainer()->get('path.tmp') . '/climulti';
+        return StaticContainer::get('path.tmp') . '/climulti';
     }
 
     private function executeAsyncCli($url, Output $output, $cmdId)
diff --git a/core/CliMulti/Process.php b/core/CliMulti/Process.php
index 62c8be895d..118482c854 100644
--- a/core/CliMulti/Process.php
+++ b/core/CliMulti/Process.php
@@ -177,7 +177,7 @@ class Process
             return false;
         }
 
-        if (static::commandExists('ps') && self::returnsSuccessCode('ps') && self::commandExists('awk')) {
+        if (self::commandExists('ps') && self::returnsSuccessCode('ps') && self::commandExists('awk')) {
             return true;
         }
 
@@ -203,7 +203,7 @@ class Process
         $command = 'shell_exec';
         $disabled = explode(',', ini_get('disable_functions'));
         $disabled = array_map('trim', $disabled);
-        return in_array($command, $disabled);
+        return in_array($command, $disabled)  || !function_exists($command);
     }
 
     private static function returnsSuccessCode($command)
diff --git a/core/CliMulti/RequestCommand.php b/core/CliMulti/RequestCommand.php
index a13b10c488..4db6ccef22 100644
--- a/core/CliMulti/RequestCommand.php
+++ b/core/CliMulti/RequestCommand.php
@@ -9,12 +9,15 @@
 namespace Piwik\CliMulti;
 
 use Piwik\Config;
+use Piwik\Container\StaticContainer;
+use Piwik\Db;
+use Piwik\Log;
+use Piwik\Option;
 use Piwik\Plugin\ConsoleCommand;
 use Piwik\Url;
 use Piwik\UrlHelper;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
@@ -26,20 +29,26 @@ class RequestCommand extends ConsoleCommand
     {
         $this->setName('climulti:request');
         $this->setDescription('Parses and executes the given query. See Piwik\CliMulti. Intended only for system usage.');
-        $this->addArgument('url-query', null, InputOption::VALUE_REQUIRED, 'Piwik URL query string, for instance: "module=API&method=API.getPiwikVersion&token_auth=123456789"');
+        $this->addArgument('url-query', InputArgument::REQUIRED, 'Piwik URL query string, for instance: "module=API&method=API.getPiwikVersion&token_auth=123456789"');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        $this->recreateContainerWithWebEnvironment();
+
         $this->initHostAndQueryString($input);
 
         if ($this->isTestModeEnabled()) {
             Config::getInstance()->setTestEnvironment();
-            $indexFile = '/tests/PHPUnit/proxy/index.php';
+            $indexFile = '/tests/PHPUnit/proxy/';
+
+            $this->resetDatabase();
         } else {
-            $indexFile = '/index.php';
+            $indexFile = '/';
         }
 
+        $indexFile .= 'index.php';
+
         if (!empty($_GET['pid'])) {
             $process = new Process($_GET['pid']);
 
@@ -79,4 +88,22 @@ class RequestCommand extends ConsoleCommand
         }
     }
 
-}
\ No newline at end of file
+    /**
+     * We will be simulating an HTTP request here (by including index.php).
+     *
+     * To avoid weird side-effects (e.g. the logging output messing up the HTTP response on the CLI output)
+     * we need to recreate the container with the default environment instead of the CLI environment.
+     */
+    private function recreateContainerWithWebEnvironment()
+    {
+        StaticContainer::setEnvironment(null);
+        StaticContainer::clearContainer();
+        Log::unsetInstance();
+    }
+
+    private function resetDatabase()
+    {
+        Option::clearCache();
+        Db::destroyDatabaseObject();
+    }
+}
diff --git a/core/Columns/Updater.php b/core/Columns/Updater.php
index 6c42ba0dff..4272f46f56 100644
--- a/core/Columns/Updater.php
+++ b/core/Columns/Updater.php
@@ -14,14 +14,16 @@ use Piwik\Plugin\Dimension\VisitDimension;
 use Piwik\Plugin\Dimension\ConversionDimension;
 use Piwik\Db;
 use Piwik\Updater as PiwikUpdater;
-use Piwik\Cache\PersistentCache;
 use Piwik\Filesystem;
+use Piwik\Cache as PiwikCache;
 
 /**
  * Class that handles dimension updates
  */
 class Updater extends \Piwik\Updates
 {
+    private static $cacheId = 'AllDimensionModifyTime';
+
     /**
      * @var Updater
      */
@@ -315,15 +317,22 @@ class Updater extends \Piwik\Updates
     private static function cacheCurrentDimensionFileChanges()
     {
         $changes = self::getCurrentDimensionFileChanges();
-        $persistentCache = new PersistentCache('AllDimensionModifyTime');
-        $persistentCache->set($changes);
+
+        $cache = self::buildCache();
+        $cache->save(self::$cacheId, $changes);
+    }
+
+    private static function buildCache()
+    {
+        return PiwikCache::getEagerCache();
     }
 
     private static function getCachedDimensionFileChanges()
     {
-        $persistentCache = new PersistentCache('AllDimensionModifyTime');
-        if ($persistentCache->has()) {
-            return $persistentCache->get();
+        $cache = self::buildCache();
+
+        if ($cache->contains(self::$cacheId)) {
+            return $cache->fetch(self::$cacheId);
         }
 
         return array();
diff --git a/core/Common.php b/core/Common.php
index b5ed581d82..7e3bcbc7af 100644
--- a/core/Common.php
+++ b/core/Common.php
@@ -9,9 +9,12 @@
 namespace Piwik;
 
 use Exception;
+use Piwik\Container\StaticContainer;
+use Piwik\Intl\Data\Provider\LanguageDataProvider;
+use Piwik\Intl\Data\Provider\RegionDataProvider;
 use Piwik\Plugins\UserCountry\LocationProvider\DefaultProvider;
 use Piwik\Tracker;
-use Piwik\Tracker\Cache;
+use Piwik\Tracker\Cache as TrackerCache;
 
 /**
  * Contains helper methods used by both Piwik Core and the Piwik Tracking engine.
@@ -518,7 +521,13 @@ class Common
      */
     public static function generateUniqId()
     {
-        return md5(uniqid(rand(), true));
+        if (function_exists('mt_rand')) {
+            $rand = mt_rand();
+        } else {
+            $rand = rand();
+        }
+
+        return md5(uniqid($rand, true));
     }
 
     /**
@@ -743,14 +752,16 @@ class Common
      *
      * @see core/DataFiles/Countries.php
      *
-     * @return array  Array of 3 letter continent codes
+     * @return array Array of 3 letter continent codes
+     *
+     * @deprecated Use Piwik\Intl\Data\Provider\RegionDataProvider instead.
+     * @see \Piwik\Intl\Data\Provider\RegionDataProvider::getContinentList()
      */
     public static function getContinentsList()
     {
-        require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/Countries.php';
-
-        $continentsList = $GLOBALS['Piwik_ContinentList'];
-        return $continentsList;
+        /** @var RegionDataProvider $dataProvider */
+        $dataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\RegionDataProvider');
+        return $dataProvider->getContinentList();
     }
 
     /**
@@ -759,20 +770,16 @@ class Common
      * @see core/DataFiles/Countries.php
      *
      * @param bool $includeInternalCodes
-     * @return array  Array of (2 letter ISO codes => 3 letter continent code)
+     * @return array Array of (2 letter ISO codes => 3 letter continent code)
+     *
+     * @deprecated Use Piwik\Intl\Data\Provider\RegionDataProvider instead.
+     * @see \Piwik\Intl\Data\Provider\RegionDataProvider::getCountryList()
      */
     public static function getCountriesList($includeInternalCodes = false)
     {
-        require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/Countries.php';
-
-        $countriesList = $GLOBALS['Piwik_CountryList'];
-        $extras = $GLOBALS['Piwik_CountryList_Extras'];
-
-        if ($includeInternalCodes) {
-            return array_merge($countriesList, $extras);
-        }
-
-        return $countriesList;
+        /** @var RegionDataProvider $dataProvider */
+        $dataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\RegionDataProvider');
+        return $dataProvider->getCountryList($includeInternalCodes);
     }
 
     /**
@@ -783,13 +790,15 @@ class Common
      * @return array Array of two letter ISO codes mapped with their associated language names (in English). E.g.
      *               `array('en' => 'English', 'ja' => 'Japanese')`.
      * @api
+     *
+     * @deprecated Use Piwik\Intl\Data\Provider\LanguageDataProvider instead.
+     * @see \Piwik\Intl\Data\Provider\LanguageDataProvider::getLanguageList()
      */
     public static function getLanguagesList()
     {
-        require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/Languages.php';
-
-        $languagesList = $GLOBALS['Piwik_LanguageList'];
-        return $languagesList;
+        /** @var LanguageDataProvider $dataProvider */
+        $dataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\LanguageDataProvider');
+        return $dataProvider->getLanguageList();
     }
 
     /**
@@ -800,13 +809,15 @@ class Common
      * @return array Array of two letter ISO language codes mapped with two letter ISO country codes:
      *               `array('fr' => 'fr') // French => France`
      * @api
+     *
+     * @deprecated Use Piwik\Intl\Data\Provider\LanguageDataProvider instead.
+     * @see \Piwik\Intl\Data\Provider\LanguageDataProvider::getLanguageToCountryList()
      */
     public static function getLanguageToCountryList()
     {
-        require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/LanguageToCountry.php';
-
-        $languagesList = $GLOBALS['Piwik_LanguageToCountry'];
-        return $languagesList;
+        /** @var LanguageDataProvider $dataProvider */
+        $dataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\LanguageDataProvider');
+        return $dataProvider->getLanguageToCountryList();
     }
 
     /**
@@ -818,11 +829,20 @@ class Common
      */
     public static function getSearchEngineUrls()
     {
-        require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/SearchEngines.php';
+        $cacheId = 'Common.getSearchEngineUrls';
+        $cache = Cache::getTransientCache();
+        $searchEngines = $cache->fetch($cacheId);
+
+        if (empty($searchEngines)) {
 
-        $searchEngines = $GLOBALS['Piwik_SearchEngines'];
+            require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/SearchEngines.php';
 
-        Piwik::postEvent('Referrer.addSearchEngineUrls', array(&$searchEngines));
+            $searchEngines = $GLOBALS['Piwik_SearchEngines'];
+
+            Piwik::postEvent('Referrer.addSearchEngineUrls', array(&$searchEngines));
+
+            $cache->save($cacheId, $searchEngines);
+        }
 
         return $searchEngines;
     }
@@ -836,13 +856,21 @@ class Common
      */
     public static function getSearchEngineNames()
     {
-        $searchEngines = self::getSearchEngineUrls();
+        $cacheId = 'Common.getSearchEngineNames';
+        $cache = Cache::getTransientCache();
+        $nameToUrl = $cache->fetch($cacheId);
+
+        if (empty($nameToUrl)) {
 
-        $nameToUrl = array();
-        foreach ($searchEngines as $url => $info) {
-            if (!isset($nameToUrl[$info[0]])) {
-                $nameToUrl[$info[0]] = $url;
+            $searchEngines = self::getSearchEngineUrls();
+
+            $nameToUrl = array();
+            foreach ($searchEngines as $url => $info) {
+                if (!isset($nameToUrl[$info[0]])) {
+                    $nameToUrl[$info[0]] = $url;
+                }
             }
+            $cache->save($cacheId, $nameToUrl);
         }
 
         return $nameToUrl;
@@ -857,11 +885,20 @@ class Common
      */
     public static function getSocialUrls()
     {
-        require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/Socials.php';
+        $cacheId = 'Common.getSocialUrls';
+        $cache = Cache::getTransientCache();
+        $socialUrls = $cache->fetch($cacheId);
+
+        if (empty($socialUrls)) {
 
-        $socialUrls = $GLOBALS['Piwik_socialUrl'];
+            require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/Socials.php';
 
-        Piwik::postEvent('Referrer.addSocialUrls', array(&$socialUrls));
+            $socialUrls = $GLOBALS['Piwik_socialUrl'];
+
+            Piwik::postEvent('Referrer.addSocialUrls', array(&$socialUrls));
+
+            $cache->save($cacheId, $socialUrls);
+        }
 
         return $socialUrls;
     }
@@ -948,7 +985,11 @@ class Common
             return self::LANGUAGE_CODE_INVALID;
         }
 
-        $validCountries = self::getCountriesList();
+        /** @var RegionDataProvider $dataProvider */
+        $dataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\RegionDataProvider');
+
+        $validCountries = $dataProvider->getCountryList();
+
         return self::extractCountryCodeFromBrowserLanguage($lang, $validCountries, $enableLanguageToCountryGuess);
     }
 
@@ -962,7 +1003,10 @@ class Common
      */
     public static function extractCountryCodeFromBrowserLanguage($browserLanguage, $validCountries, $enableLanguageToCountryGuess)
     {
-        $langToCountry = self::getLanguageToCountryList();
+        /** @var LanguageDataProvider $dataProvider */
+        $dataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\LanguageDataProvider');
+
+        $langToCountry = $dataProvider->getLanguageToCountryList();
 
         if ($enableLanguageToCountryGuess) {
             if (preg_match('/^([a-z]{2,3})(?:,|;|$)/', $browserLanguage, $matches)) {
@@ -1059,11 +1103,12 @@ class Common
      */
     public static function getContinent($country)
     {
-        $countryList = self::getCountriesList();
-        if (isset($countryList[$country])) {
-            return $countryList[$country];
-        }
-        return 'unk';
+        /** @var RegionDataProvider $dataProvider */
+        $dataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\RegionDataProvider');
+
+        $countryList = $dataProvider->getCountryList();
+
+        return isset($countryList[$country]) ? $countryList[$country] : 'unk';
     }
 
     /*
@@ -1182,10 +1227,12 @@ class Common
         }
 
         if (strpos(PHP_SAPI, '-fcgi') === false) {
-            $key = $_SERVER['SERVER_PROTOCOL'];
+            $key = 'HTTP/1.1';
 
-            if (strlen($key) > 15 || empty($key)) {
-                $key = 'HTTP/1.1';
+            if (array_key_exists('SERVER_PROTOCOL', $_SERVER)
+                && strlen($_SERVER['SERVER_PROTOCOL']) < 15
+                && strlen($_SERVER['SERVER_PROTOCOL']) > 1) {
+                $key = $_SERVER['SERVER_PROTOCOL'];
             }
 
         } else {
@@ -1203,7 +1250,7 @@ class Common
      */
     public static function getCurrentLocationProviderId()
     {
-        $cache = Cache::getCacheGeneral();
+        $cache = TrackerCache::getCacheGeneral();
         return empty($cache['currentLocationProviderId'])
             ? DefaultProvider::ID
             : $cache['currentLocationProviderId'];
@@ -1225,25 +1272,32 @@ class Common
         $var = null;
     }
 
-    public static function printDebug($info = '')
+    /**
+     * @todo This method is weird, it's debugging statements but seem to only work for the tracker, maybe it
+     * should be moved elsewhere
+     */
+    public static function  printDebug($info = '')
     {
         if (isset($GLOBALS['PIWIK_TRACKER_DEBUG']) && $GLOBALS['PIWIK_TRACKER_DEBUG']) {
 
+            if(!headers_sent()) {
+                // prevent XSS in tracker debug output
+                header('Content-type: text/plain');
+            }
+
             if (is_object($info)) {
                 $info = var_export($info, true);
             }
 
-            Log::getInstance()->setLogLevel(Log::DEBUG);
-
             if (is_array($info) || is_object($info)) {
                 $info = Common::sanitizeInputValues($info);
                 $out = var_export($info, true);
                 foreach (explode("\n", $out) as $line) {
-                    Log::debug($line);
+                    echo $line . "\n";
                 }
             } else {
                 foreach (explode("\n", $info) as $line) {
-                    Log::debug(htmlspecialchars($line, ENT_QUOTES));
+                    echo $line . "\n";
                 }
             }
         }
@@ -1255,8 +1309,11 @@ class Common
      */
     protected static function checkValidLanguagesIsSet($validLanguages)
     {
+        /** @var LanguageDataProvider $dataProvider */
+        $dataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\LanguageDataProvider');
+
         if (empty($validLanguages)) {
-            $validLanguages = array_keys(Common::getLanguagesList());
+            $validLanguages = array_keys($dataProvider->getLanguageList());
             return $validLanguages;
         }
         return $validLanguages;
diff --git a/core/Config.php b/core/Config.php
index db2e1e5d6a..014424c119 100644
--- a/core/Config.php
+++ b/core/Config.php
@@ -10,6 +10,9 @@
 namespace Piwik;
 
 use Exception;
+use Piwik\Ini\IniReader;
+use Piwik\Ini\IniReadingException;
+use Piwik\Ini\IniWriter;
 
 /**
  * Singleton that provides read & write access to Piwik's INI configuration.
@@ -45,9 +48,7 @@ class Config extends Singleton
     const DEFAULT_GLOBAL_CONFIG_PATH = '/config/global.ini.php';
 
     /**
-     * Contains configuration files values
-     *
-     * @var array
+     * @var boolean
      */
     protected $initialized = false;
     protected $configGlobal = array();
@@ -61,16 +62,25 @@ class Config extends Singleton
     /**
      * @var boolean
      */
-    protected $isTest = false;
+    protected $doNotWriteConfigInTests = false;
+
+    /**
+     * @var IniReader
+     */
+    private $iniReader;
 
     /**
-     * Constructor
+     * @var IniWriter
      */
+    private $iniWriter;
+
     public function __construct($pathGlobal = null, $pathLocal = null, $pathCommon = null)
     {
         $this->pathGlobal = $pathGlobal ?: self::getGlobalConfigPath();
         $this->pathCommon = $pathCommon ?: self::getCommonConfigPath();
         $this->pathLocal = $pathLocal ?: self::getLocalConfigPath();
+        $this->iniReader = new IniReader();
+        $this->iniWriter = new IniWriter();
     }
 
     /**
@@ -113,19 +123,15 @@ class Config extends Singleton
     public function setTestEnvironment($pathLocal = null, $pathGlobal = null, $pathCommon = null, $allowSaving = false)
     {
         if (!$allowSaving) {
-            $this->isTest = true;
+            $this->doNotWriteConfigInTests = true;
         }
 
-        $this->clear();
-
         $this->pathLocal = $pathLocal ?: Config::getLocalConfigPath();
         $this->pathGlobal = $pathGlobal ?: Config::getGlobalConfigPath();
         $this->pathCommon = $pathCommon ?: Config::getCommonConfigPath();
 
         $this->init();
 
-        // this proxy will not record any data in the production database.
-        // this provides security for Piwik installs and tests were setup.
         if (isset($this->configGlobal['database_tests'])
             || isset($this->configLocal['database_tests'])
         ) {
@@ -269,10 +275,11 @@ class Config extends Singleton
      */
     public function forceUsageOfLocalHostnameConfig($hostname)
     {
-        $hostConfig = static::getLocalConfigInfoForHostname($hostname);
+        $hostConfig = self::getLocalConfigInfoForHostname($hostname);
 
-        if (!Filesystem::isValidFilename($hostConfig['file'])) {
-            throw new Exception('Hostname is not valid');
+        $filename = $hostConfig['file'];
+        if (!Filesystem::isValidFilename($filename)) {
+            throw new Exception('Piwik domain is not a valid looking hostname (' . $filename . ').');
         }
 
         $this->pathLocal   = $hostConfig['path'];
@@ -298,6 +305,7 @@ class Config extends Singleton
     {
         $this->configGlobal = array();
         $this->configLocal = array();
+        $this->configCommon = array();
         $this->configCache = array();
         $this->initialized = false;
     }
@@ -309,6 +317,7 @@ class Config extends Singleton
      */
     public function init()
     {
+        $this->clear();
         $this->initialized = true;
         $reportError = SettingsServer::isTrackerApiRequest();
 
@@ -317,20 +326,33 @@ class Config extends Singleton
             throw new Exception(Piwik::translate('General_ExceptionConfigurationFileNotFound', array($this->pathGlobal)));
         }
 
-        $this->configGlobal = _parse_ini_file($this->pathGlobal, true);
-
-        if (empty($this->configGlobal) && $reportError) {
-            throw new Exception(Piwik::translate('General_ExceptionUnreadableFileDisabledMethod', array($this->pathGlobal, "parse_ini_file()")));
+        try {
+            $this->configGlobal = $this->iniReader->readFile($this->pathGlobal);
+        } catch (IniReadingException $e) {
+            if ($reportError) {
+                throw new Exception(Piwik::translate('General_ExceptionUnreadableFileDisabledMethod', array($this->pathGlobal, "parse_ini_file()")));
+            }
         }
 
-        $this->configCommon = _parse_ini_file($this->pathCommon, true);
+        try {
+            if (file_exists($this->pathCommon)) {
+                $this->configCommon = $this->iniReader->readFile($this->pathCommon);
+            } else {
+                $this->configCommon = false;
+            }
+        } catch (IniReadingException $e) {
+            $this->configCommon = false;
+        }
 
         // Check config.ini.php last
         $this->checkLocalConfigFound();
 
-        $this->configLocal = _parse_ini_file($this->pathLocal, true);
-        if (empty($this->configLocal) && $reportError) {
-            throw new Exception(Piwik::translate('General_ExceptionUnreadableFileDisabledMethod', array($this->pathLocal, "parse_ini_file()")));
+        try {
+            $this->configLocal = $this->iniReader->readFile($this->pathLocal);
+        } catch (IniReadingException $e) {
+            if ($reportError) {
+                throw new Exception(Piwik::translate('General_ExceptionUnreadableFileDisabledMethod', array($this->pathLocal, "parse_ini_file()")));
+            }
         }
     }
 
@@ -365,8 +387,10 @@ class Config extends Singleton
                 $value = $this->decodeValues($value);
             }
             return $values;
+        } elseif (is_string($values)) {
+            return html_entity_decode($values, ENT_COMPAT, 'UTF-8');
         }
-        return html_entity_decode($values, ENT_COMPAT, 'UTF-8');
+        return $values;
     }
 
     /**
@@ -381,11 +405,9 @@ class Config extends Singleton
             foreach ($values as &$value) {
                 $value = $this->encodeValues($value);
             }
-        } else {
-            if (is_float($values)) {
-                $values = Common::forceDotAsSeparatorForDecimalPoint($values);
-            }
-
+        } elseif (is_float($values)) {
+            $values = Common::forceDotAsSeparatorForDecimalPoint($values);
+        } elseif (is_string($values)) {
             $values = htmlentities($values, ENT_COMPAT, 'UTF-8');
             $values = str_replace('$', '&#36;', $values);
         }
@@ -556,13 +578,12 @@ class Config extends Singleton
     {
         $dirty = false;
 
-        $output = "; <?php exit; ?> DO NOT REMOVE THIS LINE\n";
-        $output .= "; file automatically generated or modified by Piwik; you can manually override the default values in global.ini.php by redefining them in this file.\n";
-
         if (!$configCache) {
             return false;
         }
 
+        $configToWrite = array();
+
         // If there is a common.config.ini.php, this will ensure config.ini.php does not duplicate its values
         if (!empty($configCommon)) {
             $configGlobal = $this->array_merge_recursive_distinct($configGlobal, $configCommon);
@@ -605,38 +626,13 @@ class Config extends Singleton
                 $dirty = true;
             }
 
-            // no point in writing empty sections, so skip if the cached section is empty
-            if (empty($config)) {
-                continue;
-            }
-
-            $output .= "[$section]\n";
-
-            foreach ($config as $name => $value) {
-                $value = $this->encodeValues($value);
-
-                if (is_numeric($name)) {
-                    $name = $section;
-                    $value = array($value);
-                }
-
-                if (is_array($value)) {
-                    foreach ($value as $currentValue) {
-                        $output .= $name . "[] = \"$currentValue\"\n";
-                    }
-                } else {
-                    if (!is_numeric($value)) {
-                        $value = "\"$value\"";
-                    }
-                    $output .= $name . ' = ' . $value . "\n";
-                }
-            }
-
-            $output .= "\n";
+            $configToWrite[$section] = array_map(array($this, 'encodeValues'), $config);
         }
 
         if ($dirty) {
-            return $output;
+            $header = "; <?php exit; ?> DO NOT REMOVE THIS LINE\n";
+            $header .= "; file automatically generated or modified by Piwik; you can manually override the default values in global.ini.php by redefining them in this file.\n";
+            return $this->iniWriter->writeToString($configToWrite, $header);
         }
         return false;
     }
@@ -655,7 +651,7 @@ class Config extends Singleton
      */
     protected function writeConfig($configLocal, $configGlobal, $configCommon, $configCache, $pathLocal, $clear = true)
     {
-        if ($this->isTest) {
+        if ($this->doNotWriteConfigInTests) {
             return;
         }
 
diff --git a/core/Console.php b/core/Console.php
index d0268569c9..de51756f39 100644
--- a/core/Console.php
+++ b/core/Console.php
@@ -8,7 +8,9 @@
  */
 namespace Piwik;
 
+use Piwik\Container\StaticContainer;
 use Piwik\Plugin\Manager as PluginManager;
+use Symfony\Bridge\Monolog\Handler\ConsoleHandler;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -29,12 +31,15 @@ class Console extends Application
         );
 
         $this->getDefinition()->addOption($option);
+
+        StaticContainer::setEnvironment('cli');
     }
 
     public function doRun(InputInterface $input, OutputInterface $output)
     {
         $this->initPiwikHost($input);
         $this->initConfig($output);
+        $this->initLoggerOutput($output);
 
         try {
             self::initPlugins();
@@ -42,8 +47,6 @@ class Console extends Application
             // Piwik not installed yet, no config file?
         }
 
-        Translate::reloadLanguage('en');
-
         $commands = $this->getAvailableCommands();
 
         foreach ($commands as $command) {
@@ -142,6 +145,21 @@ class Console extends Application
         }
     }
 
+    /**
+     * Register the console output into the logger.
+     *
+     * Ideally, this should be done automatically with events:
+     * @see http://symfony.com/fr/doc/current/components/console/events.html
+     * @see Symfony\Bridge\Monolog\Handler\ConsoleHandler::onCommand()
+     * But it would require to install Symfony's Event Dispatcher.
+     */
+    private function initLoggerOutput(OutputInterface $output)
+    {
+        /** @var ConsoleHandler $consoleLogHandler */
+        $consoleLogHandler = StaticContainer::get('Symfony\Bridge\Monolog\Handler\ConsoleHandler');
+        $consoleLogHandler->setOutput($output);
+    }
+
     public static function initPlugins()
     {
         Plugin\Manager::getInstance()->loadActivatedPlugins();
diff --git a/core/Container/ContainerFactory.php b/core/Container/ContainerFactory.php
new file mode 100644
index 0000000000..cbbc36a00a
--- /dev/null
+++ b/core/Container/ContainerFactory.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Container;
+
+use DI\Container;
+use DI\ContainerBuilder;
+use Doctrine\Common\Cache\ArrayCache;
+use Piwik\Config;
+use Piwik\Development;
+use Piwik\Plugin\Manager;
+
+/**
+ * Creates a configured DI container.
+ */
+class ContainerFactory
+{
+    /**
+     * Optional environment config to load.
+     *
+     * @var string|null
+     */
+    private $environment;
+
+    /**
+     * @param string|null $environment Optional environment config to load.
+     */
+    public function __construct($environment = null)
+    {
+        $this->environment = $environment;
+    }
+
+    /**
+     * @link http://php-di.org/doc/container-configuration.html
+     * @throws \Exception
+     * @return Container
+     */
+    public function create()
+    {
+        $builder = new ContainerBuilder();
+
+        $builder->useAnnotations(false);
+        $builder->setDefinitionCache(new ArrayCache());
+
+        // INI config
+        $builder->addDefinitions(new IniConfigDefinitionSource(Config::getInstance()));
+
+        // Global config
+        $builder->addDefinitions(PIWIK_USER_PATH . '/config/global.php');
+
+        // Plugin configs
+        $this->addPluginConfigs($builder);
+
+        // Development config
+        if (Development::isEnabled()) {
+            $builder->addDefinitions(PIWIK_USER_PATH . '/config/environment/dev.php');
+        }
+
+        // User config
+        if (file_exists(PIWIK_USER_PATH . '/config/config.php')) {
+            $builder->addDefinitions(PIWIK_USER_PATH . '/config/config.php');
+        }
+
+        // Environment config
+        $this->addEnvironmentConfig($builder);
+
+        return $builder->build();
+    }
+
+    private function addEnvironmentConfig(ContainerBuilder $builder)
+    {
+        if (!$this->environment) {
+            return;
+        }
+
+        $file = sprintf('%s/config/environment/%s.php', PIWIK_USER_PATH, $this->environment);
+
+        $builder->addDefinitions($file);
+    }
+
+    private function addPluginConfigs(ContainerBuilder $builder)
+    {
+        $plugins = Manager::getInstance()->getActivatedPluginsFromConfig();
+
+        foreach ($plugins as $plugin) {
+            $file = Manager::getPluginsDirectory() . $plugin . '/config/config.php';
+
+            if (! file_exists($file)) {
+                continue;
+            }
+
+            $builder->addDefinitions($file);
+        }
+    }
+}
diff --git a/core/Container/IniConfigDefinitionSource.php b/core/Container/IniConfigDefinitionSource.php
index b84d33d94f..9f5b32c226 100644
--- a/core/Container/IniConfigDefinitionSource.php
+++ b/core/Container/IniConfigDefinitionSource.php
@@ -9,16 +9,14 @@
 namespace Piwik\Container;
 
 use DI\Definition\Exception\DefinitionException;
-use DI\Definition\MergeableDefinition;
 use DI\Definition\Source\ChainableDefinitionSource;
-use DI\Definition\Source\DefinitionSource;
 use DI\Definition\ValueDefinition;
 use Piwik\Config;
 
 /**
  * Import the old INI config into PHP-DI.
  */
-class IniConfigDefinitionSource implements DefinitionSource, ChainableDefinitionSource
+class IniConfigDefinitionSource extends ChainableDefinitionSource
 {
     /**
      * @var Config
@@ -31,29 +29,19 @@ class IniConfigDefinitionSource implements DefinitionSource, ChainableDefinition
     private $prefix;
 
     /**
-     * @var DefinitionSource
-     */
-    private $chainedSource;
-
-    /**
      * @param Config $config
      * @param string $prefix Prefix for the container entries.
      */
-    public function __construct(Config $config, $prefix = 'old_config.')
+    public function __construct(Config $config, $prefix = 'ini.')
     {
         $this->config = $config;
         $this->prefix = $prefix;
     }
 
-    public function getDefinition($name, MergeableDefinition $parentDefinition = null)
+    protected function findDefinition($name)
     {
-        // INI only contains values, so no definition merging here
-        if ($parentDefinition) {
-            return $this->notFound($name, $parentDefinition);
-        }
-
         if (strpos($name, $this->prefix) !== 0) {
-            return $this->notFound($name, $parentDefinition);
+            return null;
         }
 
         list($sectionName, $configKey) = $this->parseEntryName($name);
@@ -65,17 +53,12 @@ class IniConfigDefinitionSource implements DefinitionSource, ChainableDefinition
         }
 
         if (! array_key_exists($configKey, $section)) {
-            return $this->notFound($name, $parentDefinition);
+            return null;
         }
 
         return new ValueDefinition($name, $section[$configKey]);
     }
 
-    public function chain(DefinitionSource $source)
-    {
-        $this->chainedSource = $source;
-    }
-
     private function parseEntryName($name)
     {
         $parts = explode('.', $name, 3);
@@ -102,13 +85,4 @@ class IniConfigDefinitionSource implements DefinitionSource, ChainableDefinition
 
         return $section;
     }
-
-    private function notFound($name, $parentDefinition)
-    {
-        if ($this->chainedSource) {
-            return $this->chainedSource->getDefinition($name, $parentDefinition);
-        }
-
-        return null;
-    }
 }
diff --git a/core/Container/StaticContainer.php b/core/Container/StaticContainer.php
index b46f01e1ca..874851acde 100644
--- a/core/Container/StaticContainer.php
+++ b/core/Container/StaticContainer.php
@@ -9,9 +9,6 @@
 namespace Piwik\Container;
 
 use DI\Container;
-use DI\ContainerBuilder;
-use Doctrine\Common\Cache\ArrayCache;
-use Piwik\Config;
 
 /**
  * This class provides a static access to the container.
@@ -28,6 +25,13 @@ class StaticContainer
     private static $container;
 
     /**
+     * Optional environment config to load.
+     *
+     * @var bool
+     */
+    private static $environment;
+
+    /**
      * @return Container
      */
     public static function getContainer()
@@ -39,33 +43,49 @@ class StaticContainer
         return self::$container;
     }
 
+    public static function clearContainer()
+    {
+        self::$container = null;
+    }
+
+    /**
+     * Only use this in tests.
+     *
+     * @param Container $container
+     */
+    public static function set(Container $container)
+    {
+        self::$container = $container;
+    }
+
     /**
      * @link http://php-di.org/doc/container-configuration.html
      */
     private static function createContainer()
     {
-        if (!class_exists('DI\ContainerBuilder')) {
-            throw new \Exception('DI\ContainerBuilder could not be found, maybe you are using Piwik from git and need to update Composer: php composer.phar update');
-        }
-
-        $builder = new ContainerBuilder();
-
-        $builder->useAnnotations(false);
-
-        // TODO set a better cache
-        $builder->setDefinitionCache(new ArrayCache());
-
-        // Old global INI config
-        $builder->addDefinitions(new IniConfigDefinitionSource(Config::getInstance()));
-
-        // Global config
-        $builder->addDefinitions(PIWIK_USER_PATH . '/config/global.php');
+        $containerFactory = new ContainerFactory(self::$environment);
+        return $containerFactory->create();
+    }
 
-        // User config
-        if (file_exists(PIWIK_USER_PATH . '/config/config.php')) {
-            $builder->addDefinitions(PIWIK_USER_PATH . '/config/config.php');
-        }
+    /**
+     * Set the application environment (cli, test, …) or null for the default one.
+     *
+     * @param string|null $environment
+     */
+    public static function setEnvironment($environment)
+    {
+        self::$environment = $environment;
+    }
 
-        return $builder->build();
+    /**
+     * Proxy to Container::get()
+     *
+     * @param string $name Container entry name.
+     * @return mixed
+     * @throws \DI\NotFoundException
+     */
+    public static function get($name)
+    {
+        return self::getContainer()->get($name);
     }
 }
diff --git a/core/Cookie.php b/core/Cookie.php
index 993d97f1e2..39c0de95e4 100644
--- a/core/Cookie.php
+++ b/core/Cookie.php
@@ -374,7 +374,8 @@ class Cookie
      */
     public function __toString()
     {
-        $str  = 'COOKIE ' . $this->name . ', rows count: ' . count($this->value) . ', cookie size = ' . strlen($this->generateContentString()) . " bytes\n";
+        $str  = 'COOKIE ' . $this->name . ', rows count: ' . count($this->value) . ', cookie size = ' . strlen($this->generateContentString()) . " bytes, ";
+        $str .= 'path: ' . $this->path. ', expire: ' . $this->expire . "\n";
         $str .= var_export($this->value, $return = true);
 
         return $str;
diff --git a/core/CronArchive.php b/core/CronArchive.php
index eb4e45e383..29c897c8bf 100644
--- a/core/CronArchive.php
+++ b/core/CronArchive.php
@@ -12,10 +12,15 @@ use Exception;
 use Piwik\ArchiveProcessor\Rules;
 use Piwik\CronArchive\FixedSiteIds;
 use Piwik\CronArchive\SharedSiteIds;
+use Piwik\DataAccess\ArchiveInvalidator;
+use Piwik\Exception\UnexpectedWebsiteFoundException;
 use Piwik\Metrics\Formatter;
 use Piwik\Period\Factory as PeriodFactory;
 use Piwik\DataAccess\InvalidatedReports;
+use Piwik\Plugins\CoreAdminHome\API as CoreAdminHomeAPI;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
+use Piwik\Plugins\UsersManager\API as APIUsersManager;
+use Piwik\Plugins\UsersManager\UserPreferences;
 
 /**
  * ./console core:archive runs as a cron and is a useful tool for general maintenance,
@@ -73,6 +78,7 @@ class CronArchive
     private $segments = array();
     private $piwikUrl = false;
     private $token_auth = false;
+    private $validTokenAuths = array();
     private $visitsToday = 0;
     private $requests = 0;
     private $output = '';
@@ -81,6 +87,8 @@ class CronArchive
     private $lastSuccessRunTimestamp = false;
     private $errors = array();
 
+    private $apiToInvalidateArchivedReport;
+
     const NO_ERROR = "no error";
 
     public $testmode = false;
@@ -214,7 +222,6 @@ class CronArchive
     {
         $this->formatter = new Formatter();
 
-        $this->initLog();
         $this->initPiwikHost($piwikUrl);
         $this->initCore();
         $this->initTokenAuth();
@@ -250,9 +257,11 @@ class CronArchive
         $this->allWebsites = APISitesManager::getInstance()->getAllSitesId();
 
         if (!empty($this->shouldArchiveOnlySpecificPeriods)) {
-            $this->log("- Will process the following periods: " . implode(", ", $this->shouldArchiveOnlySpecificPeriods) . " (--force-periods)");
+            $this->log("- Will only process the following periods: " . implode(", ", $this->shouldArchiveOnlySpecificPeriods) . " (--force-periods)");
         }
 
+        $this->invalidateArchivedReportsForSitesThatNeedToBeArchivedAgain();
+
         $websitesIds = $this->initWebsiteIds();
         $this->filterWebsiteIds($websitesIds);
 
@@ -393,7 +402,8 @@ class CronArchive
     public function logFatalError($m)
     {
         $this->logError($m);
-        exit(1);
+
+        throw new Exception($m);
     }
 
     public function runScheduledTasks()
@@ -426,10 +436,10 @@ class CronArchive
 
         if ($this->archiveAndRespectTTL) {
             Option::clearCachedOption($this->lastRunKey($idSite, "periods"));
-            $lastTimestampWebsiteProcessedPeriods = Option::get($this->lastRunKey($idSite, "periods"));
+            $lastTimestampWebsiteProcessedPeriods = $this->getPeriodLastProcessedTimestamp($idSite);
 
             Option::clearCachedOption($this->lastRunKey($idSite, "day"));
-            $lastTimestampWebsiteProcessedDay = Option::get($this->lastRunKey($idSite, "day"));
+            $lastTimestampWebsiteProcessedDay = $this->getDayLastProcessedTimestamp($idSite);
         }
 
         $this->updateIdSitesInvalidatedOldReports();
@@ -501,7 +511,14 @@ class CronArchive
             return false;
         }
 
-        $shouldProceed = $this->processArchiveDays($idSite, $lastTimestampWebsiteProcessedDay, $shouldArchivePeriods, $timerWebsite);
+        try {
+            $shouldProceed = $this->processArchiveDays($idSite, $lastTimestampWebsiteProcessedDay, $shouldArchivePeriods, $timerWebsite);
+        } catch(UnexpectedWebsiteFoundException $e) {
+            // this website was deleted in the meantime
+            $shouldProceed = false;
+            $this->log("Skipped website id $idSite, got: UnexpectedWebsiteFoundException, " . $timerWebsite->__toString());
+        }
+
         if (!$shouldProceed) {
             return false;
         }
@@ -515,18 +532,8 @@ class CronArchive
             return false;
         }
 
-        $success = true;
-        foreach (array('week', 'month', 'year') as $period) {
-
-            if (!$this->shouldProcessPeriod($period)) {
-                // if any period was skipped, we do not mark the Periods archiving as successful
-                $success = false;
-                continue;
-            }
+        $success = $this->processArchiveForPeriods($idSite, $lastTimestampWebsiteProcessedPeriods);
 
-            $success = $this->archiveVisitsAndSegments($idSite, $period, $lastTimestampWebsiteProcessedPeriods)
-                && $success;
-        }
         // Record succesful run of this website's periods archiving
         if ($success) {
             Option::set($this->lastRunKey($idSite, "periods"), time());
@@ -554,6 +561,37 @@ class CronArchive
     }
 
     /**
+     * @param $idSite
+     * @param $lastTimestampWebsiteProcessedPeriods
+     * @return bool
+     */
+    private function processArchiveForPeriods($idSite, $lastTimestampWebsiteProcessedPeriods)
+    {
+        $success = true;
+
+        foreach (array('week', 'month', 'year') as $period) {
+
+            if (!$this->shouldProcessPeriod($period)) {
+                // if any period was skipped, we do not mark the Periods archiving as successful
+                $success = false;
+                continue;
+            }
+
+            $date = $this->getApiDateParameter($idSite, $period, $lastTimestampWebsiteProcessedPeriods);
+            $periodArchiveWasSuccessful = $this->archiveVisitsAndSegments($idSite, $period, $date);
+            $success = $periodArchiveWasSuccessful && $success;
+        }
+
+        // period=range
+        $customDateRangesToPreProcessForSite = $this->getCustomDateRangeToPreProcess($idSite);
+        foreach ($customDateRangesToPreProcessForSite as $dateRange) {
+            $periodArchiveWasSuccessful = $this->archiveVisitsAndSegments($idSite, 'range', $dateRange);
+            $success = $periodArchiveWasSuccessful && $success;
+        }
+        return $success;
+    }
+
+    /**
      * Checks the config file is found.
      *
      * @param $piwikUrl
@@ -682,7 +720,8 @@ class CronArchive
 
         $this->visitsToday += $visitsToday;
         $this->websitesWithVisitsSinceLastRun++;
-        $this->archiveVisitsAndSegments($idSite, "day", $processDaysSince);
+
+        $this->archiveVisitsAndSegments($idSite, "day", $this->getApiDateParameter($idSite, "day", $processDaysSince));
         $this->logArchivedWebsite($idSite, "day", $date, $visitsLastDays, $visitsToday, $timerWebsite);
 
         return true;
@@ -705,17 +744,16 @@ class CronArchive
      * Requests are triggered using cURL multi handle
      *
      * @param $idSite int
-     * @param $period
-     * @param $lastTimestampWebsiteProcessed
+     * @param $period string
+     * @param $date string
      * @return bool True on success, false if some request failed
      */
-    private function archiveVisitsAndSegments($idSite, $period, $lastTimestampWebsiteProcessed)
+    private function archiveVisitsAndSegments($idSite, $period, $date)
     {
         $timer = new Timer();
 
         $url  = $this->piwikUrl;
 
-        $date = $this->getApiDateParameter($idSite, $period, $lastTimestampWebsiteProcessed);
         $url .= $this->getVisitsRequestUrl($idSite, $period, $date);
 
         $url .= self::APPEND_TO_API_REQUEST;
@@ -754,6 +792,12 @@ class CronArchive
                     $this->logError("Error unserializing the following response from $url: " . $content);
                 }
 
+                if($period == 'range') {
+                    // range returns one dataset (the sum of data between the two dates),
+                    // whereas other periods return lastN which is N datasets in an array. Here we make our period=range dataset look like others:
+                    $stats = array($stats);
+                }
+
                 $visitsInLastPeriods = $this->getVisitsFromApiResponse($stats);
                 $visitsLastPeriod = $this->getVisitsLastPeriodFromApiResponse($stats);
             }
@@ -781,11 +825,7 @@ class CronArchive
     public function log($m)
     {
         $this->output .= $m . "\n";
-        try {
-            Log::info($m);
-        } catch(Exception $e) {
-            print($m . "\n");
-        }
+        Log::info($m);
     }
 
     public function logError($m)
@@ -806,6 +846,7 @@ class CronArchive
         } else {
             $message .= "Response was '$response'";
         }
+
         $this->logError($message);
         return false;
     }
@@ -853,28 +894,6 @@ class CronArchive
     }
 
     /**
-     * Configures Piwik\Log so messages are written in output
-     */
-    private function initLog()
-    {
-        $config = Config::getInstance();
-
-        $log = $config->log;
-        $log['log_only_when_debug_parameter'] = 0;
-        $log[Log::LOG_WRITERS_CONFIG_OPTION][] = "screen";
-
-        $config->log = $log;
-
-        Log::unsetInstance();
-
-        // Make sure we log at least INFO (if logger is set to DEBUG then keep it)
-        $logLevel = Log::getInstance()->getLogLevel();
-        if ($logLevel < Log::INFO) {
-            Log::getInstance()->setLogLevel(Log::INFO);
-        }
-    }
-
-    /**
      * Init Piwik, connect DB, create log & config objects, etc.
      */
     private function initCore()
@@ -894,7 +913,7 @@ class CronArchive
     {
         $this->todayArchiveTimeToLive = Rules::getTodayArchiveTimeToLive();
         $this->processPeriodsMaximumEverySeconds = $this->getDelayBetweenPeriodsArchives();
-        $this->lastSuccessRunTimestamp = Option::get(self::OPTION_ARCHIVING_FINISHED_TS);
+        $this->lastSuccessRunTimestamp = $this->getLastSuccessRunTimestamp();
         $this->shouldArchiveOnlySitesWithTrafficSince = $this->isShouldArchiveAllSitesWithTrafficSince();
         $this->shouldArchiveOnlySpecificPeriods = $this->getPeriodsToProcess();
 
@@ -936,6 +955,40 @@ class CronArchive
     }
 
     /**
+     * @internal
+     */
+    public function setApiToInvalidateArchivedReport($api)
+    {
+        $this->apiToInvalidateArchivedReport = $api;
+    }
+
+    private function getApiToInvalidateArchivedReport()
+    {
+        if ($this->apiToInvalidateArchivedReport) {
+            return $this->apiToInvalidateArchivedReport;
+        }
+
+        return CoreAdminHomeAPI::getInstance();
+    }
+    
+    public function invalidateArchivedReportsForSitesThatNeedToBeArchivedAgain()
+    {
+        $invalidator  = new ArchiveInvalidator();
+        $sitesPerDays = $invalidator->getRememberedArchivedReportsThatShouldBeInvalidated();
+
+        foreach ($sitesPerDays as $date => $siteIds) {
+            $listSiteIds = implode(',', $siteIds);
+
+            try {
+                $this->log('Will invalidate archived reports for ' . $date . ' for following siteIds: ' . $listSiteIds);
+                $this->getApiToInvalidateArchivedReport()->invalidateArchivedReports($siteIds, $date);
+            } catch (Exception $e) {
+                $this->log('Failed to invalidate archived reports: ' . $e->getMessage());
+            }
+        }
+    }
+
+    /**
      *  Returns the list of sites to loop over and archive.
      *  @return array
      */
@@ -961,22 +1014,31 @@ class CronArchive
 
     private function initTokenAuth()
     {
-        $token = '';
+        $tokens = array();
 
         /**
          * @ignore
          */
-        Piwik::postEvent('CronArchive.getTokenAuth', array(&$token));
-        
-        $this->token_auth = $token;
+        Piwik::postEvent('CronArchive.getTokenAuth', array(&$tokens));
+
+        $this->validTokenAuths = $tokens;
+        $this->token_auth = array_shift($tokens);
     }
 
-    public function getTokenAuth()
+    public function isTokenAuthSuperUserToken($token_auth)
     {
-        return $this->token_auth;
+        if(empty($token_auth)
+            || strlen($token_auth) != 32) {
+            return false;
+        }
+
+        return in_array($token_auth, $this->validTokenAuths);
     }
 
-    private function initPiwikHost($piwikUrl = false)
+    /**
+     * @param string|bool $piwikUrl
+     */
+    protected function initPiwikHost($piwikUrl = false)
     {
         // If core:archive command run as a web cron, we use the current hostname+path
         if (empty($piwikUrl)) {
@@ -998,7 +1060,7 @@ class CronArchive
         }
 
         if (!\Piwik\UrlHelper::isLookLikeUrl($piwikUrl)) {
-            $this->logFatalErrorUrlExpected();
+            $this->logFatalErrorUrlExpected($piwikUrl);
         }
 
         // ensure there is a trailing slash
@@ -1128,7 +1190,7 @@ class CronArchive
     /**
      *  Test that the specified piwik URL is a valid Piwik endpoint.
      */
-    private function checkPiwikUrlIsValid()
+    protected function checkPiwikUrlIsValid()
     {
         $response = $this->request("?module=API&method=API.getDefaultMetricTranslations&format=original&serialize=1");
         $responseUnserialized = @unserialize($response);
@@ -1207,10 +1269,11 @@ class CronArchive
         return true;
     }
 
-    private function logFatalErrorUrlExpected()
+    private function logFatalErrorUrlExpected($piwikUrl = false)
     {
-        $this->logFatalError("./console core:archive expects the argument 'url' to be set to your Piwik URL, for example: --url=http://example.org/piwik/ "
-            . "\n--help for more information");
+        $this->logFatalError("./console core:archive expects the argument 'url' to be set to your Piwik URL, for example: --url=http://example.org/piwik/"
+            . ($piwikUrl ? "\n '$piwikUrl' supplied" : "")
+            . "\nuse --help for more information");
     }
 
     private function getVisitsLastPeriodFromApiResponse($stats)
@@ -1272,7 +1335,7 @@ class CronArchive
      */
     private function logArchivedWebsite($idSite, $period, $date, $visitsInLastPeriods, $visitsToday, Timer $timer)
     {
-        if (substr($date, 0, 4) === 'last') {
+        if (strpos($date, 'last') === 0 || strpos($date, 'previous') === 0) {
             $visitsInLastPeriods = (int)$visitsInLastPeriods . " visits in last " . $date . " " . $period . "s, ";
             $thisPeriod = $period == "day" ? "today" : "this " . $period;
             $visitsInLastPeriod = (int)$visitsToday . " visits " . $thisPeriod . ", ";
@@ -1352,7 +1415,8 @@ class CronArchive
             $dateLastMax = self::DEFAULT_DATE_LAST_WEEKS;
         }
         if (empty($lastTimestampWebsiteProcessed)) {
-            $lastTimestampWebsiteProcessed = strtotime(\Piwik\Site::getCreationDateFor($idSite));
+            $creationDateFor = \Piwik\Site::getCreationDateFor($idSite);
+            $lastTimestampWebsiteProcessed = strtotime($creationDateFor);
         }
 
         // Enforcing last2 at minimum to work around timing issues and ensure we make most archives available
@@ -1379,4 +1443,93 @@ class CronArchive
 
         return self::MAX_CONCURRENT_API_REQUESTS;
     }
+
+    /**
+     * @param $idSite
+     * @return false|string
+     */
+    private function getPeriodLastProcessedTimestamp($idSite)
+    {
+        $timestamp = Option::get($this->lastRunKey($idSite, "periods"));
+        return $this->sanitiseTimestamp($timestamp);
+    }
+
+    /**
+     * @param $idSite
+     * @return false|string
+     */
+    private function getDayLastProcessedTimestamp($idSite)
+    {
+        $timestamp = Option::get($this->lastRunKey($idSite, "day"));
+        return $this->sanitiseTimestamp($timestamp);
+    }
+
+    /**
+     * @return false|string
+     */
+    private function getLastSuccessRunTimestamp()
+    {
+        $timestamp = Option::get(self::OPTION_ARCHIVING_FINISHED_TS);
+        return $this->sanitiseTimestamp($timestamp);
+    }
+
+    private function sanitiseTimestamp($timestamp)
+    {
+        $now = time();
+        return ($timestamp < $now) ? $timestamp : $now;
+    }
+
+    /**
+     * @param $idSite
+     * @return array of date strings
+     */
+    private function getCustomDateRangeToPreProcess($idSite)
+    {
+        static $cache = null;
+        if(is_null($cache)) {
+            $cache = $this->loadCustomDateRangeToPreProcess();
+        }
+        if(empty($cache[$idSite])) {
+            return array();
+        }
+        $dates = array_unique($cache[$idSite]);
+        return $dates;
+    }
+
+    /**
+     * @return array
+     */
+    private function loadCustomDateRangeToPreProcess()
+    {
+        $customDateRangesToProcessForSites = array();
+        // For all users who have selected this website to load by default,
+        // we load the default period/date that will be loaded for this user
+        // and make sure it's pre-archived
+        $userPreferences = APIUsersManager::getInstance()->getAllUsersPreferences(array(APIUsersManager::PREFERENCE_DEFAULT_REPORT_DATE, APIUsersManager::PREFERENCE_DEFAULT_REPORT));
+        foreach ($userPreferences as $userLogin => $userPreferences) {
+
+            $defaultDate = $userPreferences[APIUsersManager::PREFERENCE_DEFAULT_REPORT_DATE];
+            $preference = new UserPreferences();
+            $period = $preference->getDefaultPeriod($defaultDate);
+            if ($period != 'range') {
+                continue;
+            }
+
+            if (isset($userPreferences[APIUsersManager::PREFERENCE_DEFAULT_REPORT])
+                && is_numeric($userPreferences[APIUsersManager::PREFERENCE_DEFAULT_REPORT])) {
+                // If user selected one particular website ID
+                $idSites = array($userPreferences[APIUsersManager::PREFERENCE_DEFAULT_REPORT]);
+            } else {
+                // If user selected "All websites"  or some other random value, we pre-process all websites that he has access to
+                $idSites = APISitesManager::getInstance()->getSitesIdWithAtLeastViewAccess($userLogin);
+            }
+
+            foreach ($idSites as $idSite) {
+                $customDateRangesToProcessForSites[$idSite][] = $defaultDate;
+            }
+        }
+
+        return $customDateRangesToProcessForSites;
+    }
+
 }
diff --git a/core/DataAccess/Actions.php b/core/DataAccess/Actions.php
new file mode 100644
index 0000000000..9efc4fc2a5
--- /dev/null
+++ b/core/DataAccess/Actions.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+namespace Piwik\DataAccess;
+
+use Piwik\Db;
+use Piwik\Common;
+
+/**
+ * Data Access Object for operations dealing with the log_action table.
+ */
+class Actions
+{
+    /**
+     * Removes a list of actions from the log_action table by ID.
+     *
+     * @param int[] $idActions
+     */
+    public function delete($idActions)
+    {
+        foreach ($idActions as &$id) {
+            $id = (int)$id;
+        }
+
+        $table = Common::prefixTable('log_action');
+
+        $sql = "DELETE FROM $table WHERE idaction IN (" . implode(",", $idActions) . ")";
+        Db::query($sql);
+    }
+}
\ No newline at end of file
diff --git a/core/DataAccess/ArchiveInvalidator.php b/core/DataAccess/ArchiveInvalidator.php
index 6648c637c8..916d94991b 100644
--- a/core/DataAccess/ArchiveInvalidator.php
+++ b/core/DataAccess/ArchiveInvalidator.php
@@ -9,12 +9,14 @@
 
 namespace Piwik\DataAccess;
 
-
 use Piwik\Date;
 use Piwik\Db;
+use Piwik\Option;
 use Piwik\Plugins\PrivacyManager\PrivacyManager;
 use Piwik\Period;
 use Piwik\Period\Week;
+use Piwik\Plugins\SitesManager\Model as SitesManagerModel;
+use Piwik\Site;
 
 /**
  * Marks archives as Invalidated by setting the done flag to a special value (see Model->updateArchiveAsInvalidated)
@@ -32,6 +34,73 @@ class ArchiveInvalidator {
     private $minimumDateWithLogs = false;
     private $invalidDates = array();
 
+    private $rememberArchivedReportIdStart = 'report_to_invalidate_';
+
+    public function rememberToInvalidateArchivedReportsLater($idSite, Date $date)
+    {
+        $key   = $this->buildRememberArchivedReportId($idSite, $date->toString());
+        $value = Option::get($key);
+
+        // we do not really have to get the value first. we could simply always try to call set() and it would update or
+        // insert the record if needed but we do not want to lock the table (especially since there are still some
+        // MyISAM installations)
+
+        if (false === $value) {
+            Option::set($key, '1');
+        }
+    }
+
+    public function getRememberedArchivedReportsThatShouldBeInvalidated()
+    {
+        $reports = Option::getLike($this->rememberArchivedReportIdStart . '%_%');
+
+        $sitesPerDay = array();
+
+        foreach ($reports as $report => $value) {
+            $report = str_replace($this->rememberArchivedReportIdStart, '', $report);
+            $report = explode('_', $report);
+            $siteId = (int) $report[0];
+            $date   = $report[1];
+
+            if (empty($sitesPerDay[$date])) {
+                $sitesPerDay[$date] = array();
+            }
+
+            $sitesPerDay[$date][] = $siteId;
+        }
+
+        return $sitesPerDay;
+    }
+
+    private function buildRememberArchivedReportId($idSite, $date)
+    {
+        $id  = $this->buildRememberArchivedReportIdForSite($idSite);
+        $id .= '_' . trim($date);
+
+        return $id;
+    }
+
+    private function buildRememberArchivedReportIdForSite($idSite)
+    {
+        return $this->rememberArchivedReportIdStart . (int) $idSite;
+    }
+
+    public function forgetRememberedArchivedReportsToInvalidateForSite($idSite)
+    {
+        $id = $this->buildRememberArchivedReportIdForSite($idSite) . '_%';
+        Option::deleteLike($id);
+    }
+
+    /**
+     * @internal
+     */
+    public function forgetRememberedArchivedReportsToInvalidate($idSite, Date $date)
+    {
+        $id = $this->buildRememberArchivedReportId($idSite, $date->toString());
+
+        Option::delete($id);
+    }
+
     /**
      * @param $idSites array
      * @param $dates string
@@ -45,16 +114,31 @@ class ArchiveInvalidator {
         $datesToInvalidate = $this->getDatesToInvalidateFromString($dates);
         $minDate = $this->getMinimumDateToInvalidate($datesToInvalidate);
 
-        \Piwik\Plugins\SitesManager\API::getInstance()->updateSiteCreatedTime($idSites, $minDate);
+        $this->updateSiteCreatedTime($idSites, $minDate);
 
         $datesByMonth = $this->getDatesByYearMonth($datesToInvalidate);
         $this->markArchivesInvalidatedFor($idSites, $period, $datesByMonth);
 
         $this->persistInvalidatedArchives($idSites, $datesByMonth);
 
+        foreach ($idSites as $idSite) {
+            foreach ($datesToInvalidate as $date) {
+                $this->forgetRememberedArchivedReportsToInvalidate($idSite, $date);
+            }
+        }
+
         return $this->makeOutputLogs();
     }
 
+    private function updateSiteCreatedTime($idSites, Date $minDate)
+    {
+        $idSites    = Site::getIdSitesFromIdSitesString($idSites);
+        $minDateSql = $minDate->subDay(1)->getDatetime();
+
+        $model = new SitesManagerModel();
+        $model->updateSiteCreatedTime($idSites, $minDateSql);
+    }
+
     /**
      * @param $toInvalidate
      * @return bool|Date
@@ -90,7 +174,12 @@ class ArchiveInvalidator {
 
         // In each table, invalidate day/week/month/year containing this date
         $archiveTables = ArchiveTableCreator::getTablesArchivesInstalled();
-        foreach ($archiveTables as $table) {
+
+        $archiveNumericTables = array_filter($archiveTables, function($name) {
+            return ArchiveTableCreator::getTypeFromTableName($name) == ArchiveTableCreator::NUMERIC_TABLE;
+        });
+
+        foreach ($archiveNumericTables as $table) {
             // Extract Y_m from table name
             $suffix = ArchiveTableCreator::getDateFromTableName($table);
             if (!isset($datesByMonth[$suffix])) {
@@ -105,7 +194,7 @@ class ArchiveInvalidator {
     /**
      * Ensure the specified dates are valid.
      * Store invalid date so we can log them
-     * @param $dates string
+     * @param array $dates
      * @return Date[]
      */
     private function getDatesToInvalidateFromString($dates)
@@ -129,6 +218,7 @@ class ArchiveInvalidator {
                 $this->invalidDates[] = $theDate;
             }
         }
+
         return $toInvalidate;
     }
 
@@ -136,13 +226,13 @@ class ArchiveInvalidator {
     {
         // If using the feature "Delete logs older than N days"...
         $purgeDataSettings = PrivacyManager::getPurgeDataSettings();
-        $logsAreDeletedBeforeThisDate = $purgeDataSettings['delete_logs_schedule_lowest_interval'];
+        $logsDeletedWhenOlderThanDays = $purgeDataSettings['delete_logs_older_than'];
         $logsDeleteEnabled = $purgeDataSettings['delete_logs_enable'];
 
         if ($logsDeleteEnabled
-            && $logsAreDeletedBeforeThisDate
+            && $logsDeletedWhenOlderThanDays
         ) {
-            $this->minimumDateWithLogs = Date::factory('today')->subDay($logsAreDeletedBeforeThisDate);
+            $this->minimumDateWithLogs = Date::factory('today')->subDay($logsDeletedWhenOlderThanDays);
         }
     }
 
diff --git a/core/DataAccess/ArchivePurger.php b/core/DataAccess/ArchivePurger.php
index 7a961f99db..e7f185f475 100644
--- a/core/DataAccess/ArchivePurger.php
+++ b/core/DataAccess/ArchivePurger.php
@@ -10,6 +10,7 @@ namespace Piwik\DataAccess;
 
 use Exception;
 use Piwik\ArchiveProcessor\Rules;
+use Piwik\Config;
 use Piwik\Date;
 use Piwik\Db;
 use Piwik\Log;
@@ -104,12 +105,13 @@ class ArchivePurger
     {
         $numericTable = ArchiveTableCreator::getNumericTable($date);
         $blobTable    = ArchiveTableCreator::getBlobTable($date);
-        $yesterday    = Date::factory('yesterday')->getDateTime();
+        $daysRangesValid = Config::getInstance()->General['purge_date_range_archives_after_X_days'];
+        $pastDate    = Date::factory('today')->subDay($daysRangesValid)->getDateTime();
 
-        self::getModel()->deleteArchivesWithPeriod($numericTable, $blobTable, Piwik::$idPeriods['range'], $yesterday);
+        self::getModel()->deleteArchivesWithPeriod($numericTable, $blobTable, Piwik::$idPeriods['range'], $pastDate);
 
         Log::debug("Purging Custom Range archives: done [ purged archives older than %s from %s / blob ]",
-            $yesterday, $numericTable);
+            $pastDate, $numericTable);
     }
 
     /**
diff --git a/core/DataAccess/ArchiveSelector.php b/core/DataAccess/ArchiveSelector.php
index 56dede02b7..de9521d756 100644
--- a/core/DataAccess/ArchiveSelector.php
+++ b/core/DataAccess/ArchiveSelector.php
@@ -60,10 +60,9 @@ class ArchiveSelector
 
         $requestedPlugin = $params->getRequestedPlugin();
         $segment         = $params->getSegment();
-        $isSkipAggregationOfSubTables = $params->isSkipAggregationOfSubTables();
         $plugins = array("VisitsSummary", $requestedPlugin);
 
-        $doneFlags      = Rules::getDoneFlags($plugins, $segment, $isSkipAggregationOfSubTables);
+        $doneFlags      = Rules::getDoneFlags($plugins, $segment);
         $doneFlagValues = Rules::getSelectableDoneFlagValues();
 
         $results = self::getModel()->getArchiveIdAndVisits($numericTable, $idSite, $period, $dateStartIso, $dateEndIso, $minDatetimeIsoArchiveProcessedUTC, $doneFlags, $doneFlagValues);
@@ -72,8 +71,9 @@ class ArchiveSelector
             return false;
         }
 
-        $idArchive = self::getMostRecentIdArchiveFromResults($segment, $requestedPlugin, $isSkipAggregationOfSubTables, $results);
-        $idArchiveVisitsSummary = self::getMostRecentIdArchiveFromResults($segment, "VisitsSummary", $isSkipAggregationOfSubTables, $results);
+        $idArchive = self::getMostRecentIdArchiveFromResults($segment, $requestedPlugin, $results);
+
+        $idArchiveVisitsSummary = self::getMostRecentIdArchiveFromResults($segment, "VisitsSummary", $results);
 
         list($visits, $visitsConverted) = self::getVisitsMetricsFromResults($idArchive, $idArchiveVisitsSummary, $results);
 
@@ -113,10 +113,10 @@ class ArchiveSelector
         return array($visits, $visitsConverted);
     }
 
-    protected static function getMostRecentIdArchiveFromResults(Segment $segment, $requestedPlugin, $isSkipAggregationOfSubTables, $results)
+    protected static function getMostRecentIdArchiveFromResults(Segment $segment, $requestedPlugin, $results)
     {
         $idArchive = false;
-        $namesRequestedPlugin = Rules::getDoneFlags(array($requestedPlugin), $segment, $isSkipAggregationOfSubTables);
+        $namesRequestedPlugin = Rules::getDoneFlags(array($requestedPlugin), $segment);
 
         foreach ($results as $result) {
             if ($idArchive === false
@@ -137,7 +137,6 @@ class ArchiveSelector
      * @param array $periods
      * @param Segment $segment
      * @param array $plugins List of plugin names for which data is being requested.
-     * @param bool $isSkipAggregationOfSubTables Whether we are selecting an archive that may be partial (no sub-tables)
      * @return array Archive IDs are grouped by archive name and period range, ie,
      *               array(
      *                   'VisitsSummary.done' => array(
@@ -146,7 +145,7 @@ class ArchiveSelector
      *               )
      * @throws
      */
-    public static function getArchiveIds($siteIds, $periods, $segment, $plugins, $isSkipAggregationOfSubTables = false)
+    public static function getArchiveIds($siteIds, $periods, $segment, $plugins)
     {
         if (empty($siteIds)) {
             throw new \Exception("Website IDs could not be read from the request, ie. idSite=");
@@ -154,9 +153,9 @@ class ArchiveSelector
 
         $getArchiveIdsSql = "SELECT idsite, name, date1, date2, MAX(idarchive) as idarchive
                                FROM %s
-                              WHERE %s
-                                AND " . self::getNameCondition($plugins, $segment, $isSkipAggregationOfSubTables) . "
-                                AND idsite IN (" . implode(',', $siteIds) . ")
+                              WHERE idsite IN (" . Common::getSqlStringFieldsArray($siteIds) . ")
+                                AND " . self::getNameCondition($plugins, $segment) . "
+                                AND %s
                            GROUP BY idsite, date1, date2";
 
         $monthToPeriods = array();
@@ -171,7 +170,7 @@ class ArchiveSelector
         foreach ($monthToPeriods as $table => $periods) {
             $firstPeriod = reset($periods);
 
-            $bind = array();
+            $bind = array_values($siteIds);
 
             if ($firstPeriod instanceof Range) {
                 $dateCondition = "period = ? AND date1 = ? AND date2 = ?";
@@ -282,14 +281,13 @@ class ArchiveSelector
      *
      * @param array $plugins
      * @param Segment $segment
-     * @param bool $isSkipAggregationOfSubTables
      * @return string
      */
-    private static function getNameCondition(array $plugins, Segment $segment, $isSkipAggregationOfSubTables)
+    private static function getNameCondition(array $plugins, Segment $segment)
     {
         // the flags used to tell how the archiving process for a specific archive was completed,
         // if it was completed
-        $doneFlags    = Rules::getDoneFlags($plugins, $segment, $isSkipAggregationOfSubTables);
+        $doneFlags    = Rules::getDoneFlags($plugins, $segment);
         $allDoneFlags = "'" . implode("','", $doneFlags) . "'";
 
         $possibleValues = Rules::getSelectableDoneFlagValues();
diff --git a/core/DataAccess/ArchiveWriter.php b/core/DataAccess/ArchiveWriter.php
index 1fcacf790d..32943ceeb4 100644
--- a/core/DataAccess/ArchiveWriter.php
+++ b/core/DataAccess/ArchiveWriter.php
@@ -67,7 +67,7 @@ class ArchiveWriter
         $this->period    = $params->getPeriod();
 
         $idSites = array($this->idSite);
-        $this->doneFlag = Rules::getDoneStringFlagFor($idSites, $this->segment, $this->period->getLabel(), $params->getRequestedPlugin(), $params->isSkipAggregationOfSubTables());
+        $this->doneFlag = Rules::getDoneStringFlagFor($idSites, $this->segment, $this->period->getLabel(), $params->getRequestedPlugin());
         $this->isArchiveTemporary = $isArchiveTemporary;
 
         $this->dateStart = $this->period->getDateStart();
diff --git a/core/DataAccess/LogAggregator.php b/core/DataAccess/LogAggregator.php
index 83946b1f6f..8b8d5175ff 100644
--- a/core/DataAccess/LogAggregator.php
+++ b/core/DataAccess/LogAggregator.php
@@ -158,14 +158,15 @@ class LogAggregator
     protected function getVisitsMetricFields()
     {
         return array(
-            Metrics::INDEX_NB_UNIQ_VISITORS    => "count(distinct " . self::LOG_VISIT_TABLE . ".idvisitor)",
-            Metrics::INDEX_NB_VISITS           => "count(*)",
-            Metrics::INDEX_NB_ACTIONS          => "sum(" . self::LOG_VISIT_TABLE . ".visit_total_actions)",
-            Metrics::INDEX_MAX_ACTIONS         => "max(" . self::LOG_VISIT_TABLE . ".visit_total_actions)",
-            Metrics::INDEX_SUM_VISIT_LENGTH    => "sum(" . self::LOG_VISIT_TABLE . ".visit_total_time)",
-            Metrics::INDEX_BOUNCE_COUNT        => "sum(case " . self::LOG_VISIT_TABLE . ".visit_total_actions when 1 then 1 when 0 then 1 else 0 end)",
-            Metrics::INDEX_NB_VISITS_CONVERTED => "sum(case " . self::LOG_VISIT_TABLE . ".visit_goal_converted when 1 then 1 else 0 end)",
-            Metrics::INDEX_NB_USERS            => "count(distinct " . self::LOG_VISIT_TABLE . ".user_id)",
+            Metrics::INDEX_NB_UNIQ_VISITORS               => "count(distinct " . self::LOG_VISIT_TABLE . ".idvisitor)",
+            Metrics::INDEX_NB_UNIQ_FINGERPRINTS           => "count(distinct " . self::LOG_VISIT_TABLE . ".config_id)",
+            Metrics::INDEX_NB_VISITS                      => "count(*)",
+            Metrics::INDEX_NB_ACTIONS                     => "sum(" . self::LOG_VISIT_TABLE . ".visit_total_actions)",
+            Metrics::INDEX_MAX_ACTIONS                    => "max(" . self::LOG_VISIT_TABLE . ".visit_total_actions)",
+            Metrics::INDEX_SUM_VISIT_LENGTH               => "sum(" . self::LOG_VISIT_TABLE . ".visit_total_time)",
+            Metrics::INDEX_BOUNCE_COUNT                   => "sum(case " . self::LOG_VISIT_TABLE . ".visit_total_actions when 1 then 1 when 0 then 1 else 0 end)",
+            Metrics::INDEX_NB_VISITS_CONVERTED            => "sum(case " . self::LOG_VISIT_TABLE . ".visit_goal_converted when 1 then 1 else 0 end)",
+            Metrics::INDEX_NB_USERS                       => "count(distinct " . self::LOG_VISIT_TABLE . ".user_id)",
         );
     }
 
@@ -445,8 +446,14 @@ class LogAggregator
 
     protected function isMetricRequested($metricId, $metricsRequested)
     {
-        return $metricsRequested === false
-            || in_array($metricId, $metricsRequested);
+        // do not process INDEX_NB_UNIQ_FINGERPRINTS unless specifically asked for
+        if($metricsRequested === false) {
+            if($metricId == Metrics::INDEX_NB_UNIQ_FINGERPRINTS) {
+                return false;
+            }
+            return true;
+        }
+        return in_array($metricId, $metricsRequested);
     }
 
     protected function getWhereStatement($tableName, $datetimeField, $extraWhere = false)
diff --git a/core/DataAccess/LogQueryBuilder.php b/core/DataAccess/LogQueryBuilder.php
new file mode 100644
index 0000000000..a5b2fcf986
--- /dev/null
+++ b/core/DataAccess/LogQueryBuilder.php
@@ -0,0 +1,284 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\DataAccess;
+
+
+use Exception;
+use Piwik\Common;
+use Piwik\Segment\SegmentExpression;
+
+class LogQueryBuilder
+{
+    public function __construct(SegmentExpression $segmentExpression)
+    {
+        $this->segmentExpression = $segmentExpression;
+    }
+
+    public function getSelectQueryString($select, $from, $where, $bind, $groupBy, $orderBy, $limit)
+    {
+        if (!is_array($from)) {
+            $from = array($from);
+        }
+
+        if(!$this->segmentExpression->isEmpty()) {
+            $this->segmentExpression->parseSubExpressionsIntoSqlExpressions($from);
+            $segmentSql = $this->segmentExpression->getSql();
+            $where = $this->getWhereMatchBoth($where, $segmentSql['where']);
+            $bind = array_merge($bind, $segmentSql['bind']);
+        }
+
+        $joins = $this->generateJoinsString($from);
+        $joinWithSubSelect = $joins['joinWithSubSelect'];
+        $from = $joins['sql'];
+
+        if ($joinWithSubSelect) {
+            $sql = $this->buildWrappedSelectQuery($select, $from, $where, $groupBy, $orderBy, $limit);
+        } else {
+            $sql = $this->buildSelectQuery($select, $from, $where, $groupBy, $orderBy, $limit);
+        }
+        return array(
+            'sql' => $sql,
+            'bind' => $bind
+        );
+    }
+
+
+    /**
+     * Generate the join sql based on the needed tables
+     * @param array $tables tables to join
+     * @throws Exception if tables can't be joined
+     * @return array
+     */
+    private function generateJoinsString($tables)
+    {
+        $knownTables = array("log_visit", "log_link_visit_action", "log_conversion", "log_conversion_item");
+        $visitsAvailable = $actionsAvailable = $conversionsAvailable = $conversionItemAvailable = false;
+        $joinWithSubSelect = false;
+        $sql = '';
+
+        // make sure the tables are joined in the right order
+        // base table first, then action before conversion
+        // this way, conversions can be joined on idlink_va
+        $actionIndex = array_search("log_link_visit_action", $tables);
+        $conversionIndex = array_search("log_conversion", $tables);
+        if ($actionIndex > 0 && $conversionIndex > 0 && $actionIndex > $conversionIndex) {
+            $tables[$actionIndex] = "log_conversion";
+            $tables[$conversionIndex] = "log_link_visit_action";
+        }
+
+        // same as above: action before visit
+        $actionIndex = array_search("log_link_visit_action", $tables);
+        $visitIndex = array_search("log_visit", $tables);
+        if ($actionIndex > 0 && $visitIndex > 0 && $actionIndex > $visitIndex) {
+            $tables[$actionIndex] = "log_visit";
+            $tables[$visitIndex] = "log_link_visit_action";
+        }
+
+        foreach ($tables as $i => $table) {
+            if (is_array($table)) {
+                // join condition provided
+                $alias = isset($table['tableAlias']) ? $table['tableAlias'] : $table['table'];
+                $sql .= "
+				LEFT JOIN " . Common::prefixTable($table['table']) . " AS " . $alias
+                    . " ON " . $table['joinOn'];
+                continue;
+            }
+
+            if (!in_array($table, $knownTables)) {
+                throw new Exception("Table '$table' can't be used for segmentation");
+            }
+
+            $tableSql = Common::prefixTable($table) . " AS $table";
+
+            if ($i == 0) {
+                // first table
+                $sql .= $tableSql;
+            } else {
+                if ($actionsAvailable && $table == "log_conversion") {
+                    // have actions, need conversions => join on idlink_va
+                    $join = "log_conversion.idlink_va = log_link_visit_action.idlink_va "
+                        . "AND log_conversion.idsite = log_link_visit_action.idsite";
+                } else if ($actionsAvailable && $table == "log_visit") {
+                    // have actions, need visits => join on idvisit
+                    $join = "log_visit.idvisit = log_link_visit_action.idvisit";
+                } else if ($visitsAvailable && $table == "log_link_visit_action") {
+                    // have visits, need actions => we have to use a more complex join
+                    // we don't hande this here, we just return joinWithSubSelect=true in this case
+                    $joinWithSubSelect = true;
+                    $join = "log_link_visit_action.idvisit = log_visit.idvisit";
+                } else if ($conversionsAvailable && $table == "log_link_visit_action") {
+                    // have conversions, need actions => join on idlink_va
+                    $join = "log_conversion.idlink_va = log_link_visit_action.idlink_va";
+                } else if (($visitsAvailable && $table == "log_conversion")
+                    || ($conversionsAvailable && $table == "log_visit")
+                ) {
+                    // have visits, need conversion (or vice versa) => join on idvisit
+                    // notice that joining conversions on visits has lower priority than joining it on actions
+                    $join = "log_conversion.idvisit = log_visit.idvisit";
+
+                    // if conversions are joined on visits, we need a complex join
+                    if ($table == "log_conversion") {
+                        $joinWithSubSelect = true;
+                    }
+                } elseif ($conversionItemAvailable && $table === 'log_visit') {
+                    $join = "log_conversion_item.idvisit = log_visit.idvisit";
+                } elseif ($conversionItemAvailable && $table === 'log_link_visit_action') {
+                    $join = "log_conversion_item.idvisit = log_link_visit_action.idvisit";
+                } elseif ($conversionItemAvailable && $table === 'log_conversion') {
+                    $join = "log_conversion_item.idvisit = log_conversion.idvisit";
+                } else {
+                    throw new Exception("Table '$table' can't be joined for segmentation");
+                }
+
+                // the join sql the default way
+                $sql .= "
+				LEFT JOIN $tableSql ON $join";
+            }
+
+            // remember which tables are available
+            $visitsAvailable = ($visitsAvailable || $table == "log_visit");
+            $actionsAvailable = ($actionsAvailable || $table == "log_link_visit_action");
+            $conversionsAvailable = ($conversionsAvailable || $table == "log_conversion");
+            $conversionItemAvailable = ($conversionItemAvailable || $table == "log_conversion_item");
+        }
+
+        $return = array(
+            'sql'               => $sql,
+            'joinWithSubSelect' => $joinWithSubSelect
+        );
+        return $return;
+
+    }
+
+
+    /**
+     * Build a select query where actions have to be joined on visits (or conversions)
+     * In this case, the query gets wrapped in another query so that grouping by visit is possible
+     * @param string $select
+     * @param string $from
+     * @param string $where
+     * @param string $groupBy
+     * @param string $orderBy
+     * @param string $limit
+     * @throws Exception
+     * @return string
+     */
+    private function buildWrappedSelectQuery($select, $from, $where, $groupBy, $orderBy, $limit)
+    {
+        $matchTables = "(log_visit|log_conversion_item|log_conversion|log_action)";
+        preg_match_all("/". $matchTables ."\.[a-z0-9_\*]+/", $select, $matches);
+        $neededFields = array_unique($matches[0]);
+
+        if (count($neededFields) == 0) {
+            throw new Exception("No needed fields found in select expression. "
+                . "Please use a table prefix.");
+        }
+
+        $innerSelect = implode(", \n", $neededFields);
+        $innerFrom = $from;
+        $innerWhere = $where;
+
+        $innerLimit = $limit;
+        $innerGroupBy = "log_visit.idvisit";
+        $innerOrderBy = "NULL";
+        if($innerLimit && $orderBy) {
+            // only When LIMITing we can apply to the inner query the same ORDER BY as the parent query
+            $innerOrderBy = $orderBy;
+        }
+        if($innerLimit) {
+            // When LIMITing, no need to GROUP BY (GROUPing by is done before the LIMIT which is super slow when large amount of rows is matched)
+            $innerGroupBy = false;
+        }
+
+        $innerQuery = $this->buildSelectQuery($innerSelect, $innerFrom, $innerWhere, $innerGroupBy, $innerOrderBy, $innerLimit);
+
+        $select = preg_replace('/'.$matchTables.'\./', 'log_inner.', $select);
+        $from = "
+        (
+            $innerQuery
+        ) AS log_inner";
+        $where = false;
+        $orderBy = preg_replace('/'.$matchTables.'\./', 'log_inner.', $orderBy);
+        $groupBy = preg_replace('/'.$matchTables.'\./', 'log_inner.', $groupBy);
+        $query = $this->buildSelectQuery($select, $from, $where, $groupBy, $orderBy, $limit);
+        return $query;
+    }
+
+
+    /**
+     * Build select query the normal way
+     *
+     * @param string $select fieldlist to be selected
+     * @param string $from tablelist to select from
+     * @param string $where where clause
+     * @param string $groupBy group by clause
+     * @param string $orderBy order by clause
+     * @param string $limit limit by clause
+     * @return string
+     */
+    private function buildSelectQuery($select, $from, $where, $groupBy, $orderBy, $limit)
+    {
+        $sql = "
+			SELECT
+				$select
+			FROM
+				$from";
+
+        if ($where) {
+            $sql .= "
+			WHERE
+				$where";
+        }
+
+        if ($groupBy) {
+            $sql .= "
+			GROUP BY
+				$groupBy";
+        }
+
+        if ($orderBy) {
+            $sql .= "
+			ORDER BY
+				$orderBy";
+        }
+
+        $limit = (int)$limit;
+        if ($limit >= 1) {
+            $sql .= "
+            LIMIT
+                $limit";
+        }
+
+        return $sql;
+    }
+
+    /**
+     * @param $where
+     * @param $segmentWhere
+     * @return string
+     * @throws
+     */
+    protected function getWhereMatchBoth($where, $segmentWhere)
+    {
+        if (empty($segmentWhere) && empty($where)) {
+            throw new \Exception("Segment where clause should be non empty.");
+        }
+        if (empty($segmentWhere)) {
+            return $where;
+        }
+        if (empty($where)) {
+            return $segmentWhere;
+        }
+        return "( $where )
+                AND
+                ($segmentWhere)";
+    }
+
+} 
\ No newline at end of file
diff --git a/core/DataAccess/Model.php b/core/DataAccess/Model.php
index dd020af083..239bce6a23 100644
--- a/core/DataAccess/Model.php
+++ b/core/DataAccess/Model.php
@@ -37,6 +37,9 @@ class Model
         // prevent error 'The SELECT would examine more than MAX_JOIN_SIZE rows'
         Db::get()->query('SET SQL_BIG_SELECTS=1');
 
+        $idSites = array_values($idSites);
+        $idSitesString = Common::getSqlStringFieldsArray($idSites);
+
         $query = 'SELECT t1.idarchive FROM `' . $archiveTable . '` t1
                   INNER JOIN `' . $archiveTable . '` t2
                       ON t1.name    = t2.name
@@ -45,13 +48,13 @@ class Model
                       AND t1.date2  = t2.date2
                       AND t1.period = t2.period
                   WHERE t1.value = ' . ArchiveWriter::DONE_INVALIDATED . '
-                  AND t1.idsite IN (' . implode(",", $idSites) . ')
+                  AND t1.idsite IN (' . $idSitesString . ')
                   AND t2.value IN(' . ArchiveWriter::DONE_OK . ', ' . ArchiveWriter::DONE_OK_TEMPORARY . ')
                   AND t1.ts_archived < t2.ts_archived
                   AND t1.name LIKE \'done%\'
         ';
 
-        $result = Db::fetchAll($query);
+        $result = Db::fetchAll($query, $idSites);
 
         $archiveIds = array_map(
             function ($elm) {
@@ -80,6 +83,10 @@ class Model
         }
         $sql = implode(" OR ", $sql);
 
+        $idSites = array_values($idSites);
+        $sqlSites = " AND idsite IN (" . Common::getSqlStringFieldsArray($idSites) . ")";
+        $bind = array_merge($bind, $idSites);
+
         $sqlPeriod = "";
         if ($periodId) {
             $sqlPeriod = " AND period = ? ";
@@ -89,7 +96,7 @@ class Model
         $query = "UPDATE $archiveTable " .
             " SET value = " . ArchiveWriter::DONE_INVALIDATED .
             " WHERE ( $sql ) " .
-            " AND idsite IN (" . implode(",", $idSites) . ")" .
+            $sqlSites .
             $sqlPeriod;
         Db::query($query, $bind);
     }
@@ -122,12 +129,13 @@ class Model
 
     public function deleteArchiveIds($numericTable, $blobTable, $idsToDelete)
     {
-        $query = "DELETE FROM %s WHERE idarchive IN (" . implode(',', $idsToDelete) . ")";
+        $idsToDelete = array_values($idsToDelete);
+        $query = "DELETE FROM %s WHERE idarchive IN (" . Common::getSqlStringFieldsArray($idsToDelete) . ")";
 
-        Db::query(sprintf($query, $numericTable));
+        Db::query(sprintf($query, $numericTable), $idsToDelete);
 
         try {
-            Db::query(sprintf($query, $blobTable));
+            Db::query(sprintf($query, $blobTable), $idsToDelete);
         } catch (Exception $e) {
             // Individual blob tables could be missing
         }
@@ -195,7 +203,15 @@ class Model
     public function allocateNewArchiveId($numericTable)
     {
         $sequence  = new Sequence($numericTable);
-        $idarchive = $sequence->getNextId();
+
+        try {
+            $idarchive = $sequence->getNextId();
+        } catch(Exception $e) {
+            // edge case: sequence was not found, create it now
+            $sequence->create();
+
+            $idarchive = $sequence->getNextId();
+        }
 
         return $idarchive;
     }
diff --git a/core/DataAccess/TableMetadata.php b/core/DataAccess/TableMetadata.php
new file mode 100644
index 0000000000..92e1e8b34e
--- /dev/null
+++ b/core/DataAccess/TableMetadata.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+namespace Piwik\DataAccess;
+
+use Piwik\Db;
+
+/**
+ * Data Access Object that can be used to get metadata information about
+ * the MySQL tables Piwik uses.
+ */
+class TableMetadata
+{
+    /**
+     * Returns the list of column names for a table.
+     *
+     * @param string $table Prefixed table name.
+     * @return string[] List of column names..
+     */
+    public function getColumns($table)
+    {
+        $table = str_replace("`", "", $table);
+
+        $columns = Db::fetchAll("SHOW COLUMNS FROM `" . $table . "`");
+
+        $columnNames = array();
+        foreach ($columns as $column) {
+            $columnNames[] = $column['Field'];
+        }
+
+        return $columnNames;
+    }
+
+    /**
+     * Returns the list of idaction columns in a table. A column is
+     * assumed to be an idaction reference if it has `"idaction"` in its
+     * name (eg, `"idaction_url"` or `"idaction_content_name"`.
+     *
+     * @param string $table Prefixed table name.
+     * @return string[]
+     */
+    public function getIdActionColumnNames($table)
+    {
+        $columns = $this->getColumns($table);
+
+        $columns = array_filter($columns, function ($columnName) {
+            return strpos($columnName, 'idaction') !== false;
+        });
+
+        return array_values($columns);
+    }
+}
\ No newline at end of file
diff --git a/core/DataFiles/Countries.php b/core/DataFiles/Countries.php
deleted file mode 100644
index 4d752d75ae..0000000000
--- a/core/DataFiles/Countries.php
+++ /dev/null
@@ -1,326 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-
-/**
- * Country code and continent database.
- *
- * The mapping of countries to continents is from MaxMind with the exception
- * of Central America.  MaxMind groups Central American countries with
- * North America.  Piwik previously grouped Central American countries with
- * South America.  Given this conflict and the fact that most of Central
- * America lies on its own continental plate (i.e., the Caribbean Plate), we
- * currently use a separate continent code (amc).
- */
-if (!isset($GLOBALS['Piwik_CountryList'])) {
-    // Primary reference: ISO 3166-1 alpha-2
-    $GLOBALS['Piwik_CountryList'] = array(
-        'ad' => 'eur',
-        'ae' => 'asi',
-        'af' => 'asi',
-        'ag' => 'amc',
-        'ai' => 'amc',
-        'al' => 'eur',
-        'am' => 'asi',
-        'ao' => 'afr',
-        'aq' => 'ant',
-        'ar' => 'ams',
-        'as' => 'oce',
-        'at' => 'eur',
-        'au' => 'oce',
-        'aw' => 'amc',
-        'ax' => 'eur',
-        'az' => 'asi',
-        'ba' => 'eur',
-        'bb' => 'amc',
-        'bd' => 'asi',
-        'be' => 'eur',
-        'bf' => 'afr',
-        'bg' => 'eur',
-        'bh' => 'asi',
-        'bi' => 'afr',
-        'bj' => 'afr',
-        'bl' => 'amc',
-        'bm' => 'amc',
-        'bn' => 'asi',
-        'bo' => 'ams',
-        'bq' => 'amc',
-        'br' => 'ams',
-        'bs' => 'amc',
-        'bt' => 'asi',
-        'bv' => 'ant',
-        'bw' => 'afr',
-        'by' => 'eur',
-        'bz' => 'amc',
-        'ca' => 'amn',
-        'cc' => 'asi',
-        'cd' => 'afr',
-        'cf' => 'afr',
-        'cg' => 'afr',
-        'ch' => 'eur',
-        'ci' => 'afr',
-        'ck' => 'oce',
-        'cl' => 'ams',
-        'cm' => 'afr',
-        'cn' => 'asi',
-        'co' => 'ams',
-        'cr' => 'amc',
-        'cu' => 'amc',
-        'cv' => 'afr',
-        'cw' => 'amc',
-        'cx' => 'asi',
-        'cy' => 'eur',
-        'cz' => 'eur',
-        'de' => 'eur',
-        'dj' => 'afr',
-        'dk' => 'eur',
-        'dm' => 'amc',
-        'do' => 'amc',
-        'dz' => 'afr',
-        'ec' => 'ams',
-        'ee' => 'eur',
-        'eg' => 'afr',
-        'eh' => 'afr',
-        'er' => 'afr',
-        'es' => 'eur',
-        'et' => 'afr',
-        'fi' => 'eur',
-        'fj' => 'oce',
-        'fk' => 'ams',
-        'fm' => 'oce',
-        'fo' => 'eur',
-        'fr' => 'eur',
-        'ga' => 'afr',
-        'gb' => 'eur',
-        'gd' => 'amc',
-        'ge' => 'asi',
-        'gf' => 'ams',
-        'gg' => 'eur',
-        'gh' => 'afr',
-        'gi' => 'eur',
-        'gl' => 'amn',
-        'gm' => 'afr',
-        'gn' => 'afr',
-        'gp' => 'amc',
-        'gq' => 'afr',
-        'gr' => 'eur',
-        'gs' => 'ant',
-        'gt' => 'amc',
-        'gu' => 'oce',
-        'gw' => 'afr',
-        'gy' => 'ams',
-        'hk' => 'asi',
-        'hm' => 'ant',
-        'hn' => 'amc',
-        'hr' => 'eur',
-        'ht' => 'amc',
-        'hu' => 'eur',
-        'id' => 'asi',
-        'ie' => 'eur',
-        'il' => 'asi',
-        'im' => 'eur',
-        'in' => 'asi',
-        'io' => 'asi',
-        'iq' => 'asi',
-        'ir' => 'asi',
-        'is' => 'eur',
-        'it' => 'eur',
-        'je' => 'eur',
-        'jm' => 'amc',
-        'jo' => 'asi',
-        'jp' => 'asi',
-        'ke' => 'afr',
-        'kg' => 'asi',
-        'kh' => 'asi',
-        'ki' => 'oce',
-        'km' => 'afr',
-        'kn' => 'amc',
-        'kp' => 'asi',
-        'kr' => 'asi',
-        'kw' => 'asi',
-        'ky' => 'amc',
-        'kz' => 'asi',
-        'la' => 'asi',
-        'lb' => 'asi',
-        'lc' => 'amc',
-        'li' => 'eur',
-        'lk' => 'asi',
-        'lr' => 'afr',
-        'ls' => 'afr',
-        'lt' => 'eur',
-        'lu' => 'eur',
-        'lv' => 'eur',
-        'ly' => 'afr',
-        'ma' => 'afr',
-        'mc' => 'eur',
-        'md' => 'eur',
-        'me' => 'eur',
-        'mf' => 'amc',
-        'mg' => 'afr',
-        'mh' => 'oce',
-        'mk' => 'eur',
-        'ml' => 'afr',
-        'mm' => 'asi',
-        'mn' => 'asi',
-        'mo' => 'asi',
-        'mp' => 'oce',
-        'mq' => 'amc',
-        'mr' => 'afr',
-        'ms' => 'amc',
-        'mt' => 'eur',
-        'mu' => 'afr',
-        'mv' => 'asi',
-        'mw' => 'afr',
-        'mx' => 'amn',
-        'my' => 'asi',
-        'mz' => 'afr',
-        'na' => 'afr',
-        'nc' => 'oce',
-        'ne' => 'afr',
-        'nf' => 'oce',
-        'ng' => 'afr',
-        'ni' => 'amc',
-        'nl' => 'eur',
-        'no' => 'eur',
-        'np' => 'asi',
-        'nr' => 'oce',
-        'nu' => 'oce',
-        'nz' => 'oce',
-        'om' => 'asi',
-        'pa' => 'amc',
-        'pe' => 'ams',
-        'pf' => 'oce',
-        'pg' => 'oce',
-        'ph' => 'asi',
-        'pk' => 'asi',
-        'pl' => 'eur',
-        'pm' => 'amn',
-        'pn' => 'oce',
-        'pr' => 'amc',
-        'ps' => 'asi',
-        'pt' => 'eur',
-        'pw' => 'oce',
-        'py' => 'ams',
-        'qa' => 'asi',
-        're' => 'afr',
-        'ro' => 'eur',
-        'rs' => 'eur',
-        'ru' => 'eur',
-        'rw' => 'afr',
-        'sa' => 'asi',
-        'sb' => 'oce',
-        'sc' => 'afr',
-        'sd' => 'afr',
-        'se' => 'eur',
-        'sg' => 'asi',
-        'sh' => 'afr',
-        'si' => 'eur',
-        'sj' => 'eur',
-        'sk' => 'eur',
-        'sl' => 'afr',
-        'sm' => 'eur',
-        'sn' => 'afr',
-        'so' => 'afr',
-        'sr' => 'ams',
-        'ss' => 'afr',
-        'st' => 'afr',
-        'sv' => 'amc',
-        'sx' => 'amc',
-        'sy' => 'asi',
-        'sz' => 'afr',
-        'tc' => 'amc',
-        'td' => 'afr',
-        'tf' => 'ant',
-        'tg' => 'afr',
-        'th' => 'asi',
-        'ti' => 'asi',
-        'tj' => 'asi',
-        'tk' => 'oce',
-        'tl' => 'asi',
-        'tm' => 'asi',
-        'tn' => 'afr',
-        'to' => 'oce',
-        'tr' => 'eur',
-        'tt' => 'amc',
-        'tv' => 'oce',
-        'tw' => 'asi',
-        'tz' => 'afr',
-        'ua' => 'eur',
-        'ug' => 'afr',
-        'um' => 'oce',
-        'us' => 'amn',
-        'uy' => 'ams',
-        'uz' => 'asi',
-        'va' => 'eur',
-        'vc' => 'amc',
-        've' => 'ams',
-        'vg' => 'amc',
-        'vi' => 'amc',
-        'vn' => 'asi',
-        'vu' => 'oce',
-        'wf' => 'oce',
-        'ws' => 'oce',
-        'ye' => 'asi',
-        'yt' => 'afr',
-        'za' => 'afr',
-        'zm' => 'afr',
-        'zw' => 'afr',
-    );
-
-    // codes for internal use
-    $GLOBALS['Piwik_CountryList_Extras'] = array(
-        // unknown
-        'xx'  => 'unk',
-
-        // exceptionally reserved
-        'ac'  => 'afr', // .ac TLD
-        'cp'  => 'amc',
-        'dg'  => 'asi',
-        'ea'  => 'afr',
-        'eu'  => 'eur', // .eu TLD
-        'fx'  => 'eur',
-        'ic'  => 'afr',
-        'su'  => 'eur', // .su TLD
-        'ta'  => 'afr',
-        'uk'  => 'eur', // .uk TLD
-
-        // transitionally reserved
-        'an'  => 'amc', // former Netherlands Antilles
-        'bu'  => 'asi',
-        'cs'  => 'eur', // former Serbia and Montenegro
-        'nt'  => 'asi',
-        'sf'  => 'eur',
-        'tp'  => 'oce', // .tp TLD
-        'yu'  => 'eur', // .yu TLD
-        'zr'  => 'afr',
-
-        // MaxMind GeoIP specific
-        'a1'  => 'unk',
-        'a2'  => 'unk',
-        'ap'  => 'asi',
-        'o1'  => 'unk',
-
-        // Catalonia (Spain)
-        'cat' => 'eur',
-    );
-}
-
-if (!isset($GLOBALS['Piwik_ContinentList'])) {
-    // Primary reference: ISO 3166-1 alpha-2
-    $GLOBALS['Piwik_ContinentList'] = array(
-        'unk', // unknown
-        'amn', // North America
-        'amc', // Central America
-        'ams', // South America
-        'eur', // Europe
-        'afr', // Africa
-        'asi', // Asia
-        'oce', // Oceania
-        'ant', // Antarctica
-    );
-}
diff --git a/core/DataFiles/Currencies.php b/core/DataFiles/Currencies.php
deleted file mode 100644
index 4ebdf810e9..0000000000
--- a/core/DataFiles/Currencies.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-
-/**
- * International currencies in circulation.
- *
- * @see http://en.wikipedia.org/wiki/List_of_circulating_currencies
- */
-if (!isset($GLOBALS['Piwik_CurrencyList'])) {
-    $GLOBALS['Piwik_CurrencyList'] = array(
-        // 'ISO-4217 CODE' => array('currency symbol', 'description'),
-
-        // Top 5 by global trading volume
-        'USD' => array('$', 'US dollar'),
-        'EUR' => array('€', 'Euro'),
-        'JPY' => array('¥', 'Japanese yen'),
-        'GBP' => array('£', 'British pound'),
-        'CHF' => array('Fr', 'Swiss franc'),
-
-        'AFN' => array('؋', 'Afghan afghani'),
-        'ALL' => array('L', 'Albanian lek'),
-        'DZD' => array('د.ج', 'Algerian dinar'),
-        'AOA' => array('Kz', 'Angolan kwanza'),
-        'ARS' => array('$', 'Argentine peso'),
-        'AMD' => array('դր.', 'Armenian dram'),
-        'AWG' => array('ƒ', 'Aruban florin'),
-        'AUD' => array('$', 'Australian dollar'),
-        'AZN' => array('m', 'Azerbaijani manat'),
-        'BSD' => array('$', 'Bahamian dollar'),
-        'BHD' => array('.د.ب', 'Bahraini dinar'),
-        'BDT' => array('৳', 'Bangladeshi taka'),
-        'BBD' => array('$', 'Barbadian dollar'),
-        'BYR' => array('Br', 'Belarusian ruble'),
-        'BZD' => array('$', 'Belize dollar'),
-        'BMD' => array('$', 'Bermudian dollar'),
-        'BTC' => array('BTC', 'Bitcoin'),
-        'BTN' => array('Nu.', 'Bhutanese ngultrum'),
-        'BOB' => array('Bs.', 'Bolivian boliviano'),
-        'BAM' => array('KM', 'Bosnia Herzegovina mark'),
-        'BWP' => array('P', 'Botswana pula'),
-        'BRL' => array('R$', 'Brazilian real'),
-//			'GBP' => array('£', 'British pound'),
-        'BND' => array('$', 'Brunei dollar'),
-        'BGN' => array('лв', 'Bulgarian lev'),
-        'BIF' => array('Fr', 'Burundian franc'),
-        'KHR' => array('៛', 'Cambodian riel'),
-        'CAD' => array('$', 'Canadian dollar'),
-        'CVE' => array('$', 'Cape Verdean escudo'),
-        'KYD' => array('$', 'Cayman Islands dollar'),
-        'XAF' => array('Fr', 'Central African CFA franc'),
-        'CLP' => array('$', 'Chilean peso'),
-        'CNY' => array('元', 'Chinese yuan'),
-        'COP' => array('$', 'Colombian peso'),
-        'KMF' => array('Fr', 'Comorian franc'),
-        'CDF' => array('Fr', 'Congolese franc'),
-        'CRC' => array('₡', 'Costa Rican colón'),
-        'HRK' => array('kn', 'Croatian kuna'),
-        'XPF' => array('F', 'CFP franc'),
-        'CUC' => array('$', 'Cuban convertible peso'),
-        'CUP' => array('$', 'Cuban peso'),
-        'CMG' => array('ƒ', 'Curaçao and Sint Maarten guilder'),
-        'CZK' => array('Kč', 'Czech koruna'),
-        'DKK' => array('kr', 'Danish krone'),
-        'DJF' => array('Fr', 'Djiboutian franc'),
-        'DOP' => array('$', 'Dominican peso'),
-        'XCD' => array('$', 'East Caribbean dollar'),
-        'EGP' => array('ج.م', 'Egyptian pound'),
-        'ERN' => array('Nfk', 'Eritrean nakfa'),
-        'ETB' => array('Br', 'Ethiopian birr'),
-//			'EUR' => array('€', 'Euro'),
-        'FKP' => array('£', 'Falkland Islands pound'),
-        'FJD' => array('$', 'Fijian dollar'),
-        'GMD' => array('D', 'Gambian dalasi'),
-        'GEL' => array('ლ', 'Georgian lari'),
-        'GHS' => array('₵', 'Ghanaian cedi'),
-        'GIP' => array('£', 'Gibraltar pound'),
-        'GTQ' => array('Q', 'Guatemalan quetzal'),
-        'GNF' => array('Fr', 'Guinean franc'),
-        'GYD' => array('$', 'Guyanese dollar'),
-        'HTG' => array('G', 'Haitian gourde'),
-        'HNL' => array('L', 'Honduran lempira'),
-        'HKD' => array('$', 'Hong Kong dollar'),
-        'HUF' => array('Ft', 'Hungarian forint'),
-        'ISK' => array('kr', 'Icelandic króna'),
-        'INR' => array('‎₹', 'Indian rupee'),
-        'IDR' => array('Rp', 'Indonesian rupiah'),
-        'IRR' => array('﷼', 'Iranian rial'),
-        'IQD' => array('ع.د', 'Iraqi dinar'),
-        'ILS' => array('₪', 'Israeli new shekel'),
-        'JMD' => array('$', 'Jamaican dollar'),
-//			'JPY' => array('¥', 'Japanese yen'),
-        'JOD' => array('د.ا', 'Jordanian dinar'),
-        'KZT' => array('₸', 'Kazakhstani tenge'),
-        'KES' => array('Sh', 'Kenyan shilling'),
-        'KWD' => array('د.ك', 'Kuwaiti dinar'),
-        'KGS' => array('лв', 'Kyrgyzstani som'),
-        'LAK' => array('₭', 'Lao kip'),
-        'LBP' => array('ل.ل', 'Lebanese pound'),
-        'LSL' => array('L', 'Lesotho loti'),
-        'LRD' => array('$', 'Liberian dollar'),
-        'LYD' => array('ل.د', 'Libyan dinar'),
-        'LTL' => array('Lt', 'Lithuanian litas'),
-        'MOP' => array('P', 'Macanese pataca'),
-        'MKD' => array('ден', 'Macedonian denar'),
-        'MGA' => array('Ar', 'Malagasy ariary'),
-        'MWK' => array('MK', 'Malawian kwacha'),
-        'MYR' => array('RM', 'Malaysian ringgit'),
-        'MVR' => array('ރ.', 'Maldivian rufiyaa'),
-        'MRO' => array('UM', 'Mauritanian ouguiya'),
-        'MUR' => array('₨', 'Mauritian rupee'),
-        'MXN' => array('$', 'Mexican peso'),
-        'MDL' => array('L', 'Moldovan leu'),
-        'MNT' => array('₮', 'Mongolian tögrög'),
-        'MAD' => array('د.م.', 'Moroccan dirham'),
-        'MZN' => array('MTn', 'Mozambican metical'),
-        'MMK' => array('K', 'Myanma kyat'),
-        'NAD' => array('$', 'Namibian dollar'),
-        'NPR' => array('₨', 'Nepalese rupee'),
-        'ANG' => array('ƒ', 'Netherlands Antillean guilder'),
-        'TWD' => array('$', 'New Taiwan dollar'),
-        'NZD' => array('$', 'New Zealand dollar'),
-        'NIO' => array('C$', 'Nicaraguan córdoba'),
-        'NGN' => array('₦', 'Nigerian naira'),
-        'KPW' => array('₩', 'North Korean won'),
-        'NOK' => array('kr', 'Norwegian krone'),
-        'OMR' => array('ر.ع.', 'Omani rial'),
-        'PKR' => array('₨', 'Pakistani rupee'),
-        'PAB' => array('B/.', 'Panamanian balboa'),
-        'PGK' => array('K', 'Papua New Guinean kina'),
-        'PYG' => array('₲', 'Paraguayan guaraní'),
-        'PEN' => array('S/.', 'Peruvian nuevo sol'),
-        'PHP' => array('₱', 'Philippine peso'),
-        'PLN' => array('zł', 'Polish złoty'),
-        'QAR' => array('ر.ق', 'Qatari riyal'),
-        'RON' => array('L', 'Romanian leu'),
-        'RUB' => array('руб.', 'Russian ruble'),
-        'RWF' => array('Fr', 'Rwandan franc'),
-        'SHP' => array('£', 'Saint Helena pound'),
-        'SVC' => array('₡', 'Salvadoran colón'),
-        'WST' => array('T', 'Samoan tala'),
-        'STD' => array('Db', 'São Tomé and Príncipe dobra'),
-        'SAR' => array('ر.س', 'Saudi riyal'),
-        'RSD' => array('дин. or din.', 'Serbian dinar'),
-        'SCR' => array('₨', 'Seychellois rupee'),
-        'SLL' => array('Le', 'Sierra Leonean leone'),
-        'SGD' => array('$', 'Singapore dollar'),
-        'SBD' => array('$', 'Solomon Islands dollar'),
-        'SOS' => array('Sh', 'Somali shilling'),
-        'ZAR' => array('R', 'South African rand'),
-        'KRW' => array('₩', 'South Korean won'),
-        'LKR' => array('Rs', 'Sri Lankan rupee'),
-        'SDG' => array('جنيه سوداني', 'Sudanese pound'),
-        'SRD' => array('$', 'Surinamese dollar'),
-        'SZL' => array('L', 'Swazi lilangeni'),
-        'SEK' => array('kr', 'Swedish krona'),
-//			'CHF' => array('Fr', 'Swiss franc'),
-        'SYP' => array('ل.س', 'Syrian pound'),
-        'TJS' => array('ЅМ', 'Tajikistani somoni'),
-        'TZS' => array('Sh', 'Tanzanian shilling'),
-        'THB' => array('฿', 'Thai baht'),
-        'TOP' => array('T$', 'Tongan paʻanga'),
-        'TTD' => array('$', 'Trinidad and Tobago dollar'),
-        'TND' => array('د.ت', 'Tunisian dinar'),
-        'TRY' => array('TL', 'Turkish lira'),
-        'TMM' => array('m', 'Turkmenistani manat'),
-        'UGX' => array('Sh', 'Ugandan shilling'),
-        'UAH' => array('₴', 'Ukrainian hryvnia'),
-        'AED' => array('د.إ', 'United Arab Emirates dirham'),
-//			'USD' => array('$', 'United States dollar'),
-        'UYU' => array('$', 'Uruguayan peso'),
-        'UZS' => array('лв', 'Uzbekistani som'),
-        'VUV' => array('Vt', 'Vanuatu vatu'),
-        'VEF' => array('Bs F', 'Venezuelan bolívar'),
-        'VND' => array('₫', 'Vietnamese đồng'),
-        'XOF' => array('Fr', 'West African CFA franc'),
-        'YER' => array('﷼', 'Yemeni rial'),
-        'ZMW' => array('ZK', 'Zambian kwacha'),
-        'ZWL' => array('$', 'Zimbabwean dollar'),
-    );
-}
diff --git a/core/DataFiles/LanguageToCountry.php b/core/DataFiles/LanguageToCountry.php
deleted file mode 100644
index fdfbb97e72..0000000000
--- a/core/DataFiles/LanguageToCountry.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-
-/**
- * Language to Country mapping
- *
- * This list is used to guess the visitor's country when the region is
- * not specified in the first language tag.  Inclusion/exclusion is
- * based on Piwik.org visitor statistics and probability of disambiguation.
- * (Notably, "en" and "zh" are excluded.)
- *
- * If you want to add a new entry, please email us at hello at piwik.org
- */
-if (!isset($GLOBALS['Piwik_LanguageToCountry'])) {
-    $GLOBALS['Piwik_LanguageToCountry'] = array(
-        'bg' => 'bg', // Bulgarian  => Bulgaria
-        'ca' => 'es', // Catalan    => Spain
-        'cs' => 'cz', // Czech      => Czech Republic
-        'da' => 'dk', // Danish     => Denmark
-        'de' => 'de', // German     => Germany
-        'el' => 'gr', // Greek      => Greece
-        'es' => 'es', // Spanish    => Spain
-        'et' => 'ee', // Estonian   => Estonia
-        'fa' => 'ir', // Farsi      => Iran
-        'fi' => 'fi', // Finnish    => Finland
-        'fr' => 'fr', // French     => France
-        'he' => 'il', // Hebrew     => Israel
-        'hr' => 'hr', // Croatian   => Croatia
-        'hu' => 'hu', // Hungarian  => Hungary
-        'id' => 'id', // Indonesian => Indonesia
-        'is' => 'is', // Icelandic  => Iceland
-        'it' => 'it', // Italian    => Italy
-        'ja' => 'jp', // Japanese   => Japan
-        'ko' => 'kr', // Korean     => South Korea
-        'lt' => 'lt', // Lithuanian => Lithuania
-        'lv' => 'lv', // Latvian    => Latvia
-        'mk' => 'mk', // Macedonian => Macedonia
-        'ms' => 'my', // Malay      => Malaysia
-        'nb' => 'no', // Bokmål     => Norway
-        'nl' => 'nl', // Dutch      => Netherlands
-        'nn' => 'no', // Nynorsk    => Norway
-        'no' => 'no', // Norwegian  => Norway
-        'pl' => 'pl', // Polish     => Poland
-        'pt' => 'pt', // Portugese  => Portugal
-        'ro' => 'ro', // Romanian   => Romania
-        'ru' => 'ru', // Russian    => Russia
-        'sk' => 'sk', // Slovak     => Slovakia
-        'sl' => 'si', // Slovene    => Slovenia
-        'sq' => 'al', // Albanian   => Albania
-        'sr' => 'rs', // Serbian    => Serbia
-        'sv' => 'se', // Swedish    => Sweden
-        'th' => 'th', // Thai       => Thailand
-        'bo' => 'ti', // Tibetan    => Tibet
-        'tr' => 'tr', // Turkish    => Turkey
-        'uk' => 'ua', // Ukrainian  => Ukraine
-    );
-}
diff --git a/core/DataFiles/Languages.php b/core/DataFiles/Languages.php
deleted file mode 100644
index d41b443ff4..0000000000
--- a/core/DataFiles/Languages.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-
-/*
- * Language database
- */
-if (!isset($GLOBALS['Piwik_LanguageList'])) {
-    // Reference: ISO 639-1 alpha-2
-    $GLOBALS['Piwik_LanguageList'] = array(
-        'aa' => array('Afar'),
-        'ab' => array('Abkhazian'),
-        'ae' => array('Avestan'),
-        'af' => array('Afrikaans'),
-        'ak' => array('Akan'),
-        'am' => array('Amharic'),
-        'an' => array('Aragonese'),
-        'ar' => array('Arabic'),
-        'as' => array('Assamese'),
-        'av' => array('Avaric'),
-        'ay' => array('Aymara'),
-        'az' => array('Azerbaijani'),
-        'ba' => array('Bashkir'),
-        'be' => array('Belarusian'),
-        'bg' => array('Bulgarian'),
-        'bh' => array('Bihari'), // 'Bihari languages'
-        'bi' => array('Bislama'),
-        'bm' => array('Bambara'),
-        'bn' => array('Bengali'),
-        'bo' => array('Tibetan'),
-        'br' => array('Breton'),
-        'bs' => array('Bosnian'),
-        'ca' => array('Catalan', 'Valencian'),
-        'ce' => array('Chechen'),
-        'ch' => array('Chamorro'),
-        'co' => array('Corsican'),
-        'cr' => array('Cree'),
-        'cs' => array('Czech'),
-        'cu' => array('Church Slavic', 'Old Slavonic', 'Church Slavonic', 'Old Bulgarian', 'Old Church Slavonic'),
-        'cv' => array('Chuvash'),
-        'cy' => array('Welsh'),
-        'da' => array('Danish'),
-        'de' => array('German'),
-        'dv' => array('Divehi', 'Dhivehi', 'Maldivian'),
-        'dz' => array('Dzongkha'),
-        'ee' => array('Ewe'),
-        'el' => array('Greek', 'Modern Greek', 'Hellenic'), // Greek, Modern (1453-)
-        'en' => array('English'),
-        'eo' => array('Esperanto'),
-        'es' => array('Spanish', 'Castilian'),
-        'et' => array('Estonian'),
-        'eu' => array('Basque'),
-        'fa' => array('Persian'),
-        'ff' => array('Fulah'),
-        'fi' => array('Finnish'),
-        'fj' => array('Fijian'),
-        'fo' => array('Faroese'),
-        'fr' => array('French'),
-        'fy' => array('Western Frisian'),
-        'ga' => array('Irish'),
-        'gd' => array('Gaelic', 'Scottish Gaelic'),
-        'gl' => array('Galician'),
-        'gn' => array('Guarani'),
-        'gu' => array('Gujarati'),
-        'gv' => array('Manx'),
-        'ha' => array('Hausa'),
-        'he' => array('Hebrew'),
-        'hi' => array('Hindi'),
-        'ho' => array('Hiri Motu'),
-        'hr' => array('Croatian'),
-        'ht' => array('Haitian', 'Haitian Creole'),
-        'hu' => array('Hungarian'),
-        'hy' => array('Armenian'),
-        'hz' => array('Herero'),
-        'ia' => array('Interlingua'), // 'Interlingua (International Auxiliary Language Association)'
-        'id' => array('Indonesian'),
-        'ie' => array('Interlingue', 'Occidental'),
-        'ig' => array('Igbo'),
-        'ii' => array('Sichuan Yi', 'Nuosu'),
-        'ik' => array('Inupiaq'),
-        'io' => array('Ido'),
-        'is' => array('Icelandic'),
-        'it' => array('Italian'),
-        'iu' => array('Inuktitut'),
-        'ja' => array('Japanese'),
-        'jv' => array('Javanese'),
-        'ka' => array('Georgian'),
-        'kg' => array('Kongo'),
-        'ki' => array('Kikuyu', 'Gikuyu'),
-        'kj' => array('Kuanyama', 'Kwanyama'),
-        'kk' => array('Kazakh'),
-        'kl' => array('Kalaallisut', 'Greenlandic'),
-        'km' => array('Central Khmer'),
-        'kn' => array('Kannada'),
-        'ko' => array('Korean'),
-        'kr' => array('Kanuri'),
-        'ks' => array('Kashmiri'),
-        'ku' => array('Kurdish'),
-        'kv' => array('Komi'),
-        'kw' => array('Cornish'),
-        'ky' => array('Kirghiz', 'Kyrgyz'),
-        'la' => array('Latin'),
-        'lb' => array('Luxembourgish', 'Letzeburgesch'),
-        'lg' => array('Ganda'),
-        'li' => array('Limburgan', 'Limburger', 'Limburgish'),
-        'ln' => array('Lingala'),
-        'lo' => array('Lao'),
-        'lt' => array('Lithuanian'),
-        'lu' => array('Luba-Katanga'),
-        'lv' => array('Latvian'),
-        'mg' => array('Malagasy'),
-        'mh' => array('Marshallese'),
-        'mi' => array('Maori'),
-        'mk' => array('Macedonian'),
-        'ml' => array('Malayalam'),
-        'mn' => array('Mongolian'),
-//		'mo' => array('Moldavian'), // deprecated
-        'mr' => array('Marathi'),
-        'ms' => array('Malay'),
-        'mt' => array('Maltese'),
-        'my' => array('Burmese'),
-        'na' => array('Nauru'),
-        'nb' => array('Norwegian Bokmål'),
-        'nd' => array('North Ndebele'),
-        'ne' => array('Nepali'),
-        'ng' => array('Ndonga'),
-        'nl' => array('Dutch', 'Flemish'),
-        'nn' => array('Norwegian Nynorsk'),
-        'no' => array('Norwegian'),
-        'nr' => array('South Ndebele'),
-        'nv' => array('Navajo', 'Navaho'),
-        'ny' => array('Chichewa', 'Chewa', 'Nyanja'),
-        'oc' => array('Occitan', 'Provençal'), // Occitan (post 1500)
-        'oj' => array('Ojibwa'),
-        'om' => array('Oromo'),
-        'or' => array('Oriya'),
-        'os' => array('Ossetian', 'Ossetic'),
-        'pa' => array('Panjabi', 'Punjabi'),
-        'pi' => array('Pali'),
-        'pl' => array('Polish'),
-        'ps' => array('Pushto', 'Pashto'),
-        'pt' => array('Portuguese'),
-        'qu' => array('Quechua'),
-        'rm' => array('Romansh'),
-        'rn' => array('Rundi'),
-        'ro' => array('Romanian', 'Moldavian', 'Moldovan'),
-        'ru' => array('Russian'),
-        'rw' => array('Kinyarwanda'),
-        'sa' => array('Sanskrit'),
-        'sc' => array('Sardinian'),
-        'sd' => array('Sindhi'),
-        'se' => array('Northern Sami'),
-        'sg' => array('Sango'),
-//		'sh' => array('Serbo-Croatian'), // deprecated
-        'si' => array('Sinhala', 'Sinhalese'),
-        'sk' => array('Slovak'),
-        'sl' => array('Slovenian'),
-        'sm' => array('Samoan'),
-        'sn' => array('Shona'),
-        'so' => array('Somali'),
-        'sq' => array('Albanian'),
-        'sr' => array('Serbian'),
-        'ss' => array('Swati'),
-        'st' => array('Southern Soth'),
-        'su' => array('Sundanese'),
-        'sv' => array('Swedish'),
-        'sw' => array('Swahili'),
-        'ta' => array('Tamil'),
-        'te' => array('Telugu'),
-        'tg' => array('Tajik'),
-        'th' => array('Thai'),
-        'ti' => array('Tigrinya'),
-        'tk' => array('Turkmen'),
-        'tl' => array('Tagalog'),
-        'tn' => array('Tswana'),
-        'to' => array('Tonga'), // Tonga (Tonga Islands)
-        'tr' => array('Turkish'),
-        'ts' => array('Tsonga'),
-        'tt' => array('Tatar'),
-        'tw' => array('Twi'),
-        'ty' => array('Tahitian'),
-        'ug' => array('Uighur', 'Uyghur'),
-        'uk' => array('Ukrainian'),
-        'ur' => array('Urdu'),
-        'uz' => array('Uzbek'),
-        've' => array('Venda'),
-        'vi' => array('Vietnamese'),
-        'vo' => array('Volapük'),
-        'wa' => array('Walloon'),
-        'wo' => array('Wolof'),
-        'xh' => array('Xhosa'),
-        'yi' => array('Yiddish'),
-        'yo' => array('Yoruba'),
-        'za' => array('Zhuang', 'Chuang'),
-        'zh' => array('Chinese'),
-        'zu' => array('Zulu'),
-    );
-}
diff --git a/core/DataFiles/SearchEngines.php b/core/DataFiles/SearchEngines.php
index c44836eb2c..084c00e5e1 100644
--- a/core/DataFiles/SearchEngines.php
+++ b/core/DataFiles/SearchEngines.php
@@ -189,6 +189,8 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
         'searchqu.com'                   => array('Ask'),
         'search.tb.ask.com'              => array('Ask'),
         'nortonsafe.search.ask.com'      => array('Ask'),
+        'safesearch.avira.com'           => array('Ask'),
+        'avira.search.ask.com'           => array('Ask'),        
 
         // Atlas
         'searchatlas.centrum.cz'         => array('Atlas', 'q', '?q={k}'),
@@ -208,6 +210,8 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
         // Baidu
         'www.baidu.com'                  => array('Baidu', array('wd', 'word', 'kw'), 's?wd={k}', array('UTF-8', 'gb2312')),
         'www1.baidu.com'                 => array('Baidu'),
+        'm.baidu.com'                    => array('Baidu'),
+        'www.baidu.co.th'                => array('Baidu'),
         'zhidao.baidu.com'               => array('Baidu'),
         'tieba.baidu.com'                => array('Baidu'),
         'news.baidu.com'                 => array('Baidu'),
@@ -281,6 +285,7 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
 
         // DasOertliche
         'www.dasoertliche.de'            => array('DasOertliche', 'kw'),
+        'www2.dasoertliche.de'            => array('DasOertliche', array('ph', 'kw')),        
 
         // DasTelefonbuch
         'www1.dastelefonbuch.de'         => array('DasTelefonbuch', 'kw'),
@@ -451,6 +456,7 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
         'suche.gmx.net'                  => array('Google', 'q', 'web?q={k}'),
         'search.incredibar.com'          => array('Google', 'q', 'search.php?q={k}'),
         'www.delta-search.com'           => array('Google', 'q'),
+        'www1.delta-search.com'          => array('Google', 'q'),        
         'search.1und1.de'                => array('Google', 'q', 'web?q={k}'),
         'search.zonealarm.com'           => array('Google'),
         'start.lenovo.com'               => array('Google', 'q', 'search/index.php?q={k}'),
@@ -462,11 +468,8 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
         'search.smt.docomo.ne.jp'        => array('Google', 'MT'),
         'image.search.smt.docomo.ne.jp'  => array('Google', 'MT'),
         'gfsoso.com'                     => array('Google', 'q'),
-
-        // Google Earth
-        // - 2010-09-13: are these redirects now?
-        'www.googleearth.de'             => array('Google'),
-        'www.googleearth.fr'             => array('Google'),
+        'searches.safehomepage.com'      => array('Google', 'q'),
+        'searches.f-secure.com'          => array('Google', 'query', 'search?query={k}'),
 
         // Google Cache
         'webcache.googleusercontent.com' => array('Google', '/\/search\?q=cache:[A-Za-z0-9]+:[^+]+([^&]+)/', 'search?q={k}'),
@@ -523,6 +526,9 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
         // Gule Sider
         'www.gulesider.no'               => array('Gule Sider', 'q'),
 
+        // Haosou
+        'www.haosou.com'                 => array('Haosou', 'q', 's?q={k}'),
+
         // HighBeam
         'www.highbeam.com'               => array('HighBeam', 'q', 'Search.aspx?q={k}'),
 
@@ -614,6 +620,8 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
         'eu.ixquick.com'                 => array('Ixquick'),
         's8-eu.ixquick.com'              => array('Ixquick'),
         's1-eu.ixquick.de'               => array('Ixquick'),
+        's2-eu4.ixquick.com'             => array('Ixquick'),
+        's5-eu4.ixquick.com'             => array('Ixquick'),        
 
         // Jyxo
         'jyxo.1188.cz'                   => array('Jyxo', 'q', 's?q={k}'),
@@ -675,6 +683,7 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
         // Metager
         'meta.rrzn.uni-hannover.de'      => array('Metager', 'eingabe', 'meta/cgi-bin/meta.ger1?eingabe={k}'),
         'www.metager.de'                 => array('Metager'),
+        'metager.de'                     => array('Metager'),        
 
         // Metager2
         'metager2.de'                    => array('Metager2', 'q', 'search/index.php?q={k}'),
@@ -751,6 +760,9 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
         // PeoplePC
         'search.peoplepc.com'            => array('PeoplePC', 'q', 'search?q={k}'),
 
+	// PeopleCheck
+        'extern.peoplecheck.de'            => array('PeopleCheck', 'q', 'link.php?q={k}'),
+	
         // Picsearch
         'www.picsearch.com'              => array('Picsearch', 'q', 'index.cgi?q={k}'),
 
@@ -772,6 +784,9 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
         'www.qualigo.de'                 => array('Qualigo'),
         'www.qualigo.nl'                 => array('Qualigo'),
 
+	    // Qwant
+        'www.qwant.com'                 => array('Qwant', 'q'),
+        
         // Rakuten
         'websearch.rakuten.co.jp'        => array('Rakuten', 'qt', 'WebIS?qt={k}'),
 
@@ -828,6 +843,13 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
         // Skynet
         'www.skynet.be'                  => array('Skynet', 'q', 'services/recherche/google?q={k}'),
 
+        // sm.cn
+        'm.sm.cn'                        => array('sm.cn', 'q', 's?q={k}'),
+        'm.sp.sm.cn'                     => array('sm.cn'),
+
+        // sm.de
+        'www.sm.de'                      => array('sm.de', 'q', '?q={k}'),
+
         // SmartAdressbar
         'search.smartaddressbar.com'     => array('SmartAddressbar', 's', '?s={k}'),
 
@@ -843,6 +865,7 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
 
         // Sogou
         'www.sogou.com'                  => array('Sogou', 'query', 'web?query={k}', 'gb2312'),
+        'm.sogou.com'                    => array('Sogou', 'keyword'),
 
         // Softonic
         'search.softonic.com'            => array('Softonic', 'q', 'default/default?q={k}'),
@@ -903,9 +926,15 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
 
         // Toolbarhome
         'www.toolbarhome.com'            => array('Toolbarhome', 'q', 'search.aspx?q={k}'),
-
         'vshare.toolbarhome.com'         => array('Toolbarhome'),
 
+        // Toppreise.ch
+        'www.toppreise.ch'     => array('Toppreise.ch', 'search', 'index.php?search={k}', 'ISO-8859-1'),
+        'toppreise.ch'         => array('Toppreise.ch', null, null, 'ISO-8859-1'),
+        'fr.toppreise.ch'      => array('Toppreise.ch', null, null, 'ISO-8859-1'),
+        'de.toppreise.ch'      => array('Toppreise.ch', null, null, 'ISO-8859-1'),
+        'en.toppreise.ch'      => array('Toppreise.ch', null, null, 'ISO-8859-1'),
+
         // Trouvez.com
         'www.trouvez.com'                => array('Trouvez.com', 'query'),
 
@@ -1017,7 +1046,7 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
 //		'{}.dir.yahoo.com'			=> array('Yahoo! Directory'),
 
         // Yahoo! Images
-        'images.search.yahoo.com'        => array('Yahoo! Images', 'p', 'search/images?p={k}'),
+        'images.search.yahoo.com'        => array('Yahoo! Images', array('p', 'va'), 'search/images?p={k}'),
 //		'*.images.search.yahoo.com'=> array('Yahoo! Images'), // see built-in helper in Common.php
         '{}.images.yahoo.com'            => array('Yahoo! Images'),
         'cade.images.yahoo.com'          => array('Yahoo! Images'),
@@ -1082,5 +1111,8 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
 
         // Zoznam
         'www.zoznam.sk'                  => array('Zoznam', 's', 'hladaj.fcgi?s={k}&co=svet'),
+
+        // Zxuso
+        'www.zxuso.com'                  => array('Zxuso', 'wd', 'ri/?wd={k}'),
     );
 }
diff --git a/core/DataTable.php b/core/DataTable.php
index 61e8abb1eb..b060a87245 100644
--- a/core/DataTable.php
+++ b/core/DataTable.php
@@ -356,10 +356,11 @@ class DataTable implements DataTableInterface, \IteratorAggregate, \ArrayAccess
 
         if ($this->enableRecursiveSort === true) {
             foreach ($this->getRows() as $row) {
-                if (($idSubtable = $row->getIdSubDataTable()) !== null) {
-                    $table = Manager::getInstance()->getTable($idSubtable);
-                    $table->enableRecursiveSort();
-                    $table->sort($functionCallback, $columnSortedBy);
+
+                $subTable = $row->getSubtable();
+                if ($subTable) {
+                    $subTable->enableRecursiveSort();
+                    $subTable->sort($functionCallback, $columnSortedBy);
                 }
             }
         }
@@ -476,10 +477,9 @@ class DataTable implements DataTableInterface, \IteratorAggregate, \ArrayAccess
      * metadata can be used to specify a different type of operation.
      *
      * @param \Piwik\DataTable $tableToSum
-     * @param bool $doAggregateSubTables
      * @throws Exception
      */
-    public function addDataTable(DataTable $tableToSum, $doAggregateSubTables = true)
+    public function addDataTable(DataTable $tableToSum)
     {
         if ($tableToSum instanceof Simple) {
             if ($tableToSum->getRowsCount() > 1) {
@@ -489,7 +489,7 @@ class DataTable implements DataTableInterface, \IteratorAggregate, \ArrayAccess
             $this->aggregateRowFromSimpleTable($row);
         } else {
             foreach ($tableToSum->getRows() as $row) {
-                $this->aggregateRowWithLabel($row, $doAggregateSubTables);
+                $this->aggregateRowWithLabel($row);
             }
         }
     }
@@ -868,8 +868,8 @@ class DataTable implements DataTableInterface, \IteratorAggregate, \ArrayAccess
     {
         $totalCount = 0;
         foreach ($this->rows as $row) {
-            if (($idSubTable = $row->getIdSubDataTable()) !== null) {
-                $subTable = Manager::getInstance()->getTable($idSubTable);
+            $subTable = $row->getSubtable();
+            if ($subTable) {
                 $count = $subTable->getRowsCountRecursive();
                 $totalCount += $count;
             }
@@ -901,15 +901,14 @@ class DataTable implements DataTableInterface, \IteratorAggregate, \ArrayAccess
      * @param string $oldName Old column name.
      * @param string $newName New column name.
      */
-    public function renameColumn($oldName, $newName, $doRenameColumnsOfSubTables = true)
+    public function renameColumn($oldName, $newName)
     {
         foreach ($this->getRows() as $row) {
             $row->renameColumn($oldName, $newName);
 
-            if ($doRenameColumnsOfSubTables) {
-                if (($idSubDataTable = $row->getIdSubDataTable()) !== null) {
-                    Manager::getInstance()->getTable($idSubDataTable)->renameColumn($oldName, $newName);
-                }
+            $subTable = $row->getSubtable();
+            if ($subTable) {
+                $subTable->renameColumn($oldName, $newName);
             }
         }
         if (!is_null($this->summaryRow)) {
@@ -929,8 +928,9 @@ class DataTable implements DataTableInterface, \IteratorAggregate, \ArrayAccess
             foreach ($names as $name) {
                 $row->deleteColumn($name);
             }
-            if (($idSubDataTable = $row->getIdSubDataTable()) !== null) {
-                Manager::getInstance()->getTable($idSubDataTable)->deleteColumns($names, $deleteRecursiveInSubtables);
+            $subTable = $row->getSubtable();
+            if ($subTable) {
+                $subTable->deleteColumns($names, $deleteRecursiveInSubtables);
             }
         }
         if (!is_null($this->summaryRow)) {
@@ -1110,20 +1110,13 @@ class DataTable implements DataTableInterface, \IteratorAggregate, \ArrayAccess
         // but returns all serialized tables and subtable in an array of 1 dimension
         $aSerializedDataTable = array();
         foreach ($this->rows as $row) {
-            if (($idSubTable = $row->getIdSubDataTable()) !== null) {
-                $subTable = null;
-                try {
-                    $subTable = Manager::getInstance()->getTable($idSubTable);
-                } catch(TableNotFoundException $e) {
-                    // This occurs is an unknown & random data issue. Catch Exception and remove subtable from the row.
-                    $row->removeSubtable();
-                    // Go to next row
-                    continue;
-                }
-
+            $subTable = $row->getSubtable();
+            if ($subTable) {
                 $depth++;
                 $aSerializedDataTable = $aSerializedDataTable + $subTable->getSerialized($maximumRowsInSubDataTable, $maximumRowsInSubDataTable, $columnToSortByBeforeTruncation);
                 $depth--;
+            } else {
+                $row->removeSubtable();
             }
         }
         // we load the current Id of the DataTable
@@ -1595,7 +1588,7 @@ class DataTable implements DataTableInterface, \IteratorAggregate, \ArrayAccess
      * @param $row
      * @throws \Exception
      */
-    protected function aggregateRowWithLabel(Row $row, $doAggregateSubTables = true)
+    protected function aggregateRowWithLabel(Row $row)
     {
         $labelToLookFor = $row->getColumn('label');
         if ($labelToLookFor === false) {
@@ -1611,17 +1604,15 @@ class DataTable implements DataTableInterface, \IteratorAggregate, \ArrayAccess
         } else {
             $rowFound->sumRow($row, $copyMeta = true, $this->getMetadata(self::COLUMN_AGGREGATION_OPS_METADATA_NAME));
 
-            if ($doAggregateSubTables) {
-                // if the row to add has a subtable whereas the current row doesn't
-                // we simply add it (cloning the subtable)
-                // if the row has the subtable already
-                // then we have to recursively sum the subtables
-                if (($idSubTable = $row->getIdSubDataTable()) !== null) {
-                    $subTable = Manager::getInstance()->getTable($idSubTable);
-                    $subTable->metadata[self::COLUMN_AGGREGATION_OPS_METADATA_NAME]
-                        = $this->getMetadata(self::COLUMN_AGGREGATION_OPS_METADATA_NAME);
-                    $rowFound->sumSubtable($subTable);
-                }
+            // if the row to add has a subtable whereas the current row doesn't
+            // we simply add it (cloning the subtable)
+            // if the row has the subtable already
+            // then we have to recursively sum the subtables
+            $subTable = $row->getSubtable();
+            if ($subTable) {
+                $subTable->metadata[self::COLUMN_AGGREGATION_OPS_METADATA_NAME]
+                    = $this->getMetadata(self::COLUMN_AGGREGATION_OPS_METADATA_NAME);
+                $rowFound->sumSubtable($subTable);
             }
         }
     }
diff --git a/core/DataTable/BaseFilter.php b/core/DataTable/BaseFilter.php
index fb2dc009f9..dc4756d82e 100644
--- a/core/DataTable/BaseFilter.php
+++ b/core/DataTable/BaseFilter.php
@@ -73,8 +73,8 @@ abstract class BaseFilter
         if (!$this->enableRecursive) {
             return;
         }
-        if ($row->isSubtableLoaded()) {
-            $subTable = Manager::getInstance()->getTable($row->getIdSubDataTable());
+        $subTable = $row->getSubtable();
+        if ($subTable) {
             $this->filter($subTable);
         }
     }
diff --git a/core/DataTable/Filter/AddSegmentByLabel.php b/core/DataTable/Filter/AddSegmentByLabel.php
new file mode 100644
index 0000000000..2e9fd693d1
--- /dev/null
+++ b/core/DataTable/Filter/AddSegmentByLabel.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\DataTable\Filter;
+
+use Piwik\DataTable;
+use Piwik\DataTable\BaseFilter;
+use Piwik\Development;
+
+/**
+ * Executes a filter for each row of a {@link DataTable} and generates a segment filter for each row.
+ *
+ * **Basic usage example**
+ *
+ *     $dataTable->filter('AddSegmentByLabel', array('segmentName'));
+ *     $dataTable->filter('AddSegmentByLabel', array(array('segmentName1', 'segment2'), ';');
+ *
+ * @api
+ */
+class AddSegmentByLabel extends BaseFilter
+{
+    private $segments;
+    private $delimiter;
+
+    /**
+     * Generates a segment filter based on the label column and the given segment names
+     *
+     * @param DataTable $table
+     * @param string|array $segmentOrSegments Either one segment or an array of segments.
+     *                                        If more than one segment is given a delimter has to be defined.
+     * @param string $delimiter               The delimiter by which the label should be splitted.
+     */
+    public function __construct($table, $segmentOrSegments, $delimiter = '')
+    {
+        parent::__construct($table);
+
+        if (!is_array($segmentOrSegments)) {
+            $segmentOrSegments = array($segmentOrSegments);
+        }
+
+        $this->segments  = $segmentOrSegments;
+        $this->delimiter = $delimiter;
+    }
+
+    /**
+     * See {@link AddSegmentByLabel}.
+     *
+     * @param DataTable $table
+     */
+    public function filter($table)
+    {
+        if (empty($this->segments)) {
+            $msg = 'AddSegmentByLabel is called without having any segments defined';
+            Development::error($msg);
+            return;
+        }
+
+        if (count($this->segments) === 1) {
+            $segment = reset($this->segments);
+
+            foreach ($table->getRows() as $key => $row) {
+                if ($key == DataTable::ID_SUMMARY_ROW) {
+                    continue;
+                }
+
+                $label = $row->getColumn('label');
+
+                if (!empty($label)) {
+                    $row->setMetadata('segment', $segment . '==' . urlencode($label));
+                }
+            }
+        } else if (!empty($this->delimiter)) {
+            $numSegments  = count($this->segments);
+            $conditionAnd = ';';
+
+            foreach ($table->getRows() as $key => $row) {
+                if ($key == DataTable::ID_SUMMARY_ROW) {
+                    continue;
+                }
+
+                $label = $row->getColumn('label');
+                if (!empty($label)) {
+                    $parts = explode($this->delimiter, $label);
+
+                    if (count($parts) === $numSegments) {
+                        $filter = array();
+                        foreach ($this->segments as $index => $segment) {
+                            if (!empty($segment)) {
+                                $filter[] = $segment . '==' . urlencode($parts[$index]);
+                            }
+                        }
+                        $row->setMetadata('segment', implode($conditionAnd, $filter));
+                    }
+                }
+            }
+        } else {
+            $names = implode(', ', $this->segments);
+            $msg   = 'Multiple segments are given but no delimiter defined. Segments: ' . $names;
+            Development::error($msg);
+        }
+    }
+}
diff --git a/core/DataTable/Filter/AddSegmentByLabelMapping.php b/core/DataTable/Filter/AddSegmentByLabelMapping.php
new file mode 100644
index 0000000000..29fbdceda8
--- /dev/null
+++ b/core/DataTable/Filter/AddSegmentByLabelMapping.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\DataTable\Filter;
+
+use Piwik\DataTable;
+use Piwik\DataTable\BaseFilter;
+
+/**
+ * Executes a filter for each row of a {@link DataTable} and generates a segment filter for each row.
+ * It will map the label column to a segmentValue by searching for the label in the index of the given
+ * mapping array.
+ *
+ * **Basic usage example**
+ *
+ *     $dataTable->filter('AddSegmentByLabelMapping', array('segmentName', array('1' => 'smartphone, '2' => 'desktop')));
+ *
+ * @api
+ */
+class AddSegmentByLabelMapping extends BaseFilter
+{
+    private $segment;
+    private $mapping;
+
+    /**
+     * @param DataTable $table
+     * @param string $segment
+     * @param array $mapping
+     */
+    public function __construct($table, $segment, $mapping)
+    {
+        parent::__construct($table);
+
+        $this->segment = $segment;
+        $this->mapping = $mapping;
+    }
+
+    /**
+     * See {@link AddSegmentByLabelMapping}.
+     *
+     * @param DataTable $table
+     */
+    public function filter($table)
+    {
+        if (empty($this->segment) || empty($this->mapping)) {
+            return;
+        }
+
+        foreach ($table->getRows() as $row) {
+            $label = $row->getColumn('label');
+
+            if (!empty($this->mapping[$label])) {
+                $label = $this->mapping[$label];
+                $row->setMetadata('segment', $this->segment . '==' . urlencode($label));
+            }
+        }
+    }
+}
diff --git a/core/DataTable/Filter/AddSegmentBySegmentValue.php b/core/DataTable/Filter/AddSegmentBySegmentValue.php
new file mode 100644
index 0000000000..7417a48c67
--- /dev/null
+++ b/core/DataTable/Filter/AddSegmentBySegmentValue.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\DataTable\Filter;
+
+use Piwik\DataTable\BaseFilter;
+use Piwik\DataTable;
+
+/**
+ * Converts for each row of a {@link DataTable} a segmentValue to a segment (expression). The name of the segment
+ * is automatically detected based on the given report.
+ *
+ * **Basic usage example**
+ *
+ *     $dataTable->filter('AddSegmentBySegmentValue', array($reportInstance));
+ *
+ * @api
+ */
+class AddSegmentBySegmentValue extends BaseFilter
+{
+    /**
+     * @var \Piwik\Plugin\Report
+     */
+    private $report;
+
+    /**
+     * @param DataTable $table
+     * @param $report
+     */
+    public function __construct($table, $report)
+    {
+        parent::__construct($table);
+        $this->report = $report;
+    }
+
+    /**
+     * See {@link AddSegmentBySegmentValue}.
+     *
+     * @param DataTable $table
+     * @return int The number of deleted rows.
+     */
+    public function filter($table)
+    {
+        if (empty($this->report) || !$table->getRowsCount()) {
+            return;
+        }
+
+        $dimension = $this->report->getDimension();
+
+        if (empty($dimension)) {
+            return;
+        }
+
+        $segments = $dimension->getSegments();
+
+        if (empty($segments)) {
+            return;
+        }
+
+        /** @var \Piwik\Plugin\Segment $segment */
+        $segment     = reset($segments);
+        $segmentName = $segment->getSegment();
+
+        foreach ($table->getRows() as $row) {
+            $value  = $row->getMetadata('segmentValue');
+            $filter = $row->getMetadata('segment');
+
+            if ($value !== false && $filter === false) {
+                $row->setMetadata('segment', sprintf('%s==%s', $segmentName, urlencode($value)));
+            }
+        }
+    }
+}
diff --git a/core/DataTable/Filter/AddSegmentValue.php b/core/DataTable/Filter/AddSegmentValue.php
new file mode 100644
index 0000000000..857bf02ce3
--- /dev/null
+++ b/core/DataTable/Filter/AddSegmentValue.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\DataTable\Filter;
+
+use Piwik\DataTable;
+
+/**
+ * Executes a filter for each row of a {@link DataTable} and generates a segment filter for each row.
+ *
+ * **Basic usage example**
+ *
+ *     $dataTable->filter('AddSegmentValue', array());
+ *     $dataTable->filter('AddSegmentValue', array(function ($label) {
+ *        $transformedValue = urldecode($transformedValue);
+ *        return $transformedValue;
+ *    });
+ *
+ * @api
+ */
+class AddSegmentValue extends ColumnCallbackAddMetadata
+{
+    public function __construct($table, $callback = null)
+    {
+        parent::__construct($table, 'label', 'segmentValue', $callback, null, false);
+    }
+
+}
diff --git a/core/DataTable/Filter/ColumnCallbackDeleteMetadata.php b/core/DataTable/Filter/ColumnCallbackDeleteMetadata.php
new file mode 100644
index 0000000000..bb8618a6cb
--- /dev/null
+++ b/core/DataTable/Filter/ColumnCallbackDeleteMetadata.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\DataTable\Filter;
+
+use Piwik\DataTable;
+use Piwik\DataTable\BaseFilter;
+
+/**
+ * Executes a callback for each row of a {@link DataTable} and removes the defined metadata column from each row.
+ *
+ * **Basic usage example**
+ *
+ *     $dataTable->filter('ColumnCallbackDeleteMetadata', array('segmentValue'));
+ *
+ * @api
+ */
+class ColumnCallbackDeleteMetadata extends BaseFilter
+{
+    private $metadataToRemove;
+
+    /**
+     * Constructor.
+     *
+     * @param DataTable $table The DataTable instance that will be filtered.
+     * @param string $metadataToRemove The name of the metadata field that will be removed from each row.
+     */
+    public function __construct($table, $metadataToRemove)
+    {
+        parent::__construct($table);
+
+        $this->metadataToRemove = $metadataToRemove;
+    }
+
+    /**
+     * See {@link ColumnCallbackDeleteMetadata}.
+     *
+     * @param DataTable $table
+     */
+    public function filter($table)
+    {
+        $this->enableRecursive(true);
+
+        foreach ($table->getRows() as $row) {
+            $row->deleteMetadata($this->metadataToRemove);
+
+            $this->filterSubTable($row);
+        }
+    }
+}
diff --git a/core/DataTable/Filter/ColumnCallbackReplace.php b/core/DataTable/Filter/ColumnCallbackReplace.php
index 3e167b5593..4d78831e88 100644
--- a/core/DataTable/Filter/ColumnCallbackReplace.php
+++ b/core/DataTable/Filter/ColumnCallbackReplace.php
@@ -81,6 +81,7 @@ class ColumnCallbackReplace extends BaseFilter
             }
 
             foreach ($this->columnsToFilter as $column) {
+
                 // when a value is not defined, we set it to zero by default (rather than displaying '-')
                 $value = $this->getElementToReplace($row, $column);
                 if ($value === false) {
diff --git a/core/DataTable/Filter/PatternRecursive.php b/core/DataTable/Filter/PatternRecursive.php
index 697403c2e3..f383a13260 100644
--- a/core/DataTable/Filter/PatternRecursive.php
+++ b/core/DataTable/Filter/PatternRecursive.php
@@ -62,18 +62,15 @@ class PatternRecursive extends BaseFilter
             // AND 2 - the label is not found in the children
             $patternNotFoundInChildren = false;
 
-            try {
-                $idSubTable = $row->getIdSubDataTable();
-                $subTable = Manager::getInstance()->getTable($idSubTable);
-
+            $subTable = $row->getSubtable();
+            if(!$subTable) {
+                $patternNotFoundInChildren = true;
+            } else {
                 // we delete the row if we couldn't find the pattern in any row in the
                 // children hierarchy
                 if ($this->filter($subTable) == 0) {
                     $patternNotFoundInChildren = true;
                 }
-            } catch (Exception $e) {
-                // there is no subtable loaded for example
-                $patternNotFoundInChildren = true;
             }
 
             if ($patternNotFoundInChildren
diff --git a/core/DataTable/Filter/PrependSegment.php b/core/DataTable/Filter/PrependSegment.php
new file mode 100644
index 0000000000..34d14e6f0a
--- /dev/null
+++ b/core/DataTable/Filter/PrependSegment.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\DataTable\Filter;
+
+use Piwik\DataTable;
+
+/**
+ * Executes a callback for each row of a {@link DataTable} and prepends each existing segment with the
+ * given segment.
+ *
+ * **Basic usage example**
+ *
+ *     $dataTable->filter('PrependSegment', array('segmentName==segmentValue;'));
+ *
+ * @api
+ */
+class PrependSegment extends PrependValueToMetadata
+{
+    /**
+     * @param DataTable $table
+     * @param string $prependSegment The segment to prepend if a segment is already defined. Make sure to include
+     *                               A condition, eg the segment should end with ';' or ','
+     */
+    public function __construct($table, $prependSegment = '')
+    {
+        parent::__construct($table, 'segment', $prependSegment);
+    }
+}
diff --git a/core/DataTable/Filter/PrependValueToMetadata.php b/core/DataTable/Filter/PrependValueToMetadata.php
new file mode 100644
index 0000000000..3e2e0ceb82
--- /dev/null
+++ b/core/DataTable/Filter/PrependValueToMetadata.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\DataTable\Filter;
+
+use Piwik\DataTable;
+use Piwik\DataTable\BaseFilter;
+
+/**
+ * Executes a callback for each row of a {@link DataTable} and prepends the given value to each metadata entry
+ * but only if the given metadata entry exists.
+ *
+ * **Basic usage example**
+ *
+ *     $dataTable->filter('PrependValueToMetadata', array('segment', 'segmentName==segmentValue'));
+ *
+ * @api
+ */
+class PrependValueToMetadata extends BaseFilter
+{
+    private $metadataColumn;
+    private $valueToPrepend;
+
+    /**
+     * @param DataTable $table
+     * @param string $metadataName    The name of the metadata that should be prepended
+     * @param string $valueToPrepend  The value to prepend if the metadata entry exists
+     */
+    public function __construct($table, $metadataName, $valueToPrepend)
+    {
+        parent::__construct($table);
+
+        $this->metadataColumn = $metadataName;
+        $this->valueToPrepend = $valueToPrepend;
+    }
+
+    /**
+     * See {@link PrependValueToMetadata}.
+     *
+     * @param DataTable $table
+     */
+    public function filter($table)
+    {
+        if (empty($this->metadataColumn) || empty($this->valueToPrepend)) {
+            return;
+        }
+
+        $metadataColumn = $this->metadataColumn;
+        $valueToPrepend = $this->valueToPrepend;
+
+        $table->filter(function (DataTable $dataTable) use ($metadataColumn, $valueToPrepend) {
+            foreach ($dataTable->getRows() as $row) {
+                $filter = $row->getMetadata($metadataColumn);
+                if ($filter !== false) {
+                    $row->setMetadata($metadataColumn, $valueToPrepend . $filter);
+                }
+            }
+        });
+    }
+}
diff --git a/core/DataTable/Filter/ReplaceSummaryRowLabel.php b/core/DataTable/Filter/ReplaceSummaryRowLabel.php
index 3c1e31e2d0..1e550f6e3f 100644
--- a/core/DataTable/Filter/ReplaceSummaryRowLabel.php
+++ b/core/DataTable/Filter/ReplaceSummaryRowLabel.php
@@ -65,8 +65,8 @@ class ReplaceSummaryRowLabel extends BaseFilter
 
         // recurse
         foreach ($rows as $row) {
-            if ($row->isSubtableLoaded()) {
-                $subTable = Manager::getInstance()->getTable($row->getIdSubDataTable());
+            $subTable = $row->getSubtable();
+            if ($subTable) {
                 $this->filter($subTable);
             }
         }
diff --git a/core/DataTable/Filter/Sort.php b/core/DataTable/Filter/Sort.php
index 6ffe33bced..42441c8e30 100644
--- a/core/DataTable/Filter/Sort.php
+++ b/core/DataTable/Filter/Sort.php
@@ -67,22 +67,14 @@ class Sort extends BaseFilter
     /**
      * Sorting method used for sorting numbers
      *
-     * @param number $a
-     * @param number $b
+     * @param Row $a
+     * @param Row $b
      * @return int
      */
     public function numberSort($a, $b)
     {
-        $valA = $a->getColumn($this->columnToSort);
-        $valB = $b->getColumn($this->columnToSort);
-
-        if ($valA === false) {
-            $valA = null;
-        }
-
-        if ($valB === false) {
-            $valB = null;
-        }
+        $valA = $this->getColumnValue($a);
+        $valB = $this->getColumnValue($b);
 
         return !isset($valA)
         && !isset($valB)
@@ -118,16 +110,8 @@ class Sort extends BaseFilter
      */
     function naturalSort($a, $b)
     {
-        $valA = $a->getColumn($this->columnToSort);
-        $valB = $b->getColumn($this->columnToSort);
-
-        if ($valA === false) {
-            $valA = null;
-        }
-
-        if ($valB === false) {
-            $valB = null;
-        }
+        $valA = $this->getColumnValue($a);
+        $valB = $this->getColumnValue($b);
 
         return !isset($valA)
         && !isset($valB)
@@ -153,16 +137,8 @@ class Sort extends BaseFilter
      */
     function sortString($a, $b)
     {
-        $valA = $a->getColumn($this->columnToSort);
-        $valB = $b->getColumn($this->columnToSort);
-
-        if ($valA === false) {
-            $valA = null;
-        }
-
-        if ($valB === false) {
-            $valB = null;
-        }
+        $valA = $this->getColumnValue($a);
+        $valB = $this->getColumnValue($b);
 
         return !isset($valA)
         && !isset($valB)
@@ -179,6 +155,18 @@ class Sort extends BaseFilter
             );
     }
 
+    protected function getColumnValue(Row $table )
+    {
+        $value = $table->getColumn($this->columnToSort);
+
+        if ($value === false
+            || is_array($value)
+        ) {
+            return null;
+        }
+        return $value;
+    }
+
     /**
      * Sets the column to be used for sorting
      *
diff --git a/core/DataTable/Filter/Truncate.php b/core/DataTable/Filter/Truncate.php
index df0cf7509e..632eb2755e 100644
--- a/core/DataTable/Filter/Truncate.php
+++ b/core/DataTable/Filter/Truncate.php
@@ -85,6 +85,9 @@ class Truncate extends BaseFilter
         }
     }
 
+    /**
+     * @param DataTable $table
+     */
     private function addSummaryRow($table)
     {
         $table->filter('Sort', array($this->columnToSortByBeforeTruncating, 'desc'));
diff --git a/core/DataTable/Manager.php b/core/DataTable/Manager.php
index d225b8fb87..07e7bc01b2 100644
--- a/core/DataTable/Manager.php
+++ b/core/DataTable/Manager.php
@@ -61,7 +61,7 @@ class Manager extends Singleton
     public function getTable($idTable)
     {
         if (!isset($this->tables[$idTable])) {
-            throw new TableNotFoundException(sprintf("This report has been reprocessed since your last click. To see this error less often, please increase the timeout value in seconds in Settings > General Settings. (error: id %s not found).", $idTable));
+            throw new TableNotFoundException(sprintf("Error: table id %s not found in memory. (If this error is causing you problems in production, please report it in Piwik issue tracker.)", $idTable));
         }
 
         return $this->tables[$idTable];
diff --git a/core/DataTable/Renderer/Console.php b/core/DataTable/Renderer/Console.php
index 0e1c127fb1..a4fcbff0c5 100644
--- a/core/DataTable/Renderer/Console.php
+++ b/core/DataTable/Renderer/Console.php
@@ -120,14 +120,10 @@ class Console extends Renderer
                 . $row->getIdSubDataTable() . "]<br />\n";
 
             if (!is_null($row->getIdSubDataTable())) {
-                if ($row->isSubtableLoaded()) {
+                $subTable = $row->getSubtable();
+                if ($subTable) {
                     $depth++;
-                    $output .= $this->renderTable(
-                        Manager::getInstance()->getTable(
-                            $row->getIdSubDataTable()
-                        ),
-                        $prefix . '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'
-                    );
+                    $output .= $this->renderTable($subTable, $prefix . '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;');
                     $depth--;
                 } else {
                     $output .= "-- Sub DataTable not loaded<br />\n";
diff --git a/core/DataTable/Renderer/Json.php b/core/DataTable/Renderer/Json.php
index f53ea60e67..b5d2ebf979 100644
--- a/core/DataTable/Renderer/Json.php
+++ b/core/DataTable/Renderer/Json.php
@@ -71,7 +71,8 @@ class Json extends Renderer
         };
         array_walk_recursive($array, $callback);
 
-        $str = json_encode($array);
+        // silence "Warning: json_encode(): Invalid UTF-8 sequence in argument"
+        $str = @json_encode($array);
 
         return $str;
     }
diff --git a/core/DataTable/Renderer/Php.php b/core/DataTable/Renderer/Php.php
index 56360b939c..eb6d32a3e3 100644
--- a/core/DataTable/Renderer/Php.php
+++ b/core/DataTable/Renderer/Php.php
@@ -206,10 +206,11 @@ class Php extends Renderer
                 $newRow['issummaryrow'] = true;
             }
 
+            $subTable = $row->getSubtable();
             if ($this->isRenderSubtables()
-                && $row->isSubtableLoaded()
+                && $subTable
             ) {
-                $subTable = $this->renderTable(Manager::getInstance()->getTable($row->getIdSubDataTable()));
+                $subTable = $this->renderTable($subTable);
                 $newRow['subtable'] = $subTable;
                 if ($this->hideIdSubDatatable === false
                     && isset($newRow['metadata']['idsubdatatable_in_db'])
diff --git a/core/DataTable/Row.php b/core/DataTable/Row.php
index c6c0d21e9f..5f21f3fdec 100644
--- a/core/DataTable/Row.php
+++ b/core/DataTable/Row.php
@@ -224,11 +224,15 @@ class Row implements \ArrayAccess, \IteratorAggregate
 
     private function isColumnValueCallable($name)
     {
+        if (! is_callable($name)) {
+            return false;
+        }
+
         if (is_object($name) && ($name instanceof \Closure)) {
             return true;
         }
 
-        return is_array($name) && array_key_exists(0, $name) && is_object($name[0]) && is_callable($name);
+        return is_array($name) && isset($name[0]) && is_object($name[0]);
     }
 
     private function resolveCallableColumn($columnName)
@@ -317,7 +321,11 @@ class Row implements \ArrayAccess, \IteratorAggregate
     public function getSubtable()
     {
         if ($this->isSubtableLoaded()) {
-            return Manager::getInstance()->getTable($this->getIdSubDataTable());
+            try {
+                return Manager::getInstance()->getTable($this->getIdSubDataTable());
+            } catch(TableNotFoundException $e) {
+                // edge case
+            }
         }
         return false;
     }
diff --git a/core/DataTable/Row/DataTableSummaryRow.php b/core/DataTable/Row/DataTableSummaryRow.php
index 7d477a304c..2c9eda5e8e 100644
--- a/core/DataTable/Row/DataTableSummaryRow.php
+++ b/core/DataTable/Row/DataTableSummaryRow.php
@@ -47,9 +47,8 @@ class DataTableSummaryRow extends Row
      */
     public function recalculate()
     {
-        $id = $this->getIdSubDataTable();
-        if ($id !== null) {
-            $subTable = Manager::getInstance()->getTable($id);
+        $subTable = $this->getSubtable();
+        if ($subTable) {
             $this->sumTable($subTable);
         }
     }
diff --git a/core/Date.php b/core/Date.php
index 5b8e0fab6e..a046f4e27a 100644
--- a/core/Date.php
+++ b/core/Date.php
@@ -10,6 +10,7 @@
 namespace Piwik;
 
 use Exception;
+use Piwik\Container\StaticContainer;
 
 /**
  * Utility class that wraps date/time related PHP functions. Using this class can
@@ -104,7 +105,6 @@ class Date
      */
     public static function factory($dateString, $timezone = null)
     {
-        $invalidDateException = new Exception(Piwik::translate('General_ExceptionInvalidDateFormat', array("YYYY-MM-DD, or 'today' or 'yesterday'", "strtotime", "http://php.net/strtotime")) . ": $dateString");
         if ($dateString instanceof self) {
             $dateString = $dateString->toString();
         }
@@ -125,7 +125,7 @@ class Date
                 ($dateString = strtotime($dateString)) === false
             )
         ) {
-            throw $invalidDateException;
+            throw self::getInvalidDateFormatException($dateString);
         } else {
             $date = new Date($dateString);
         }
@@ -133,7 +133,7 @@ class Date
         // can't be doing web analytics before the 1st website
         // Tue, 06 Aug 1991 00:00:00 GMT
         if ($timestamp < 681436800) {
-            throw $invalidDateException;
+            throw self::getInvalidDateFormatException($dateString);
         }
         if (empty($timezone)) {
             return $date;
@@ -154,6 +154,19 @@ class Date
     }
 
     /**
+     * Returns the current hour in UTC timezone.
+     * @return string
+     * @throws Exception
+     */
+    public function getHourUTC()
+    {
+        $dateTime = $this->getDatetime();
+        $hourInTz = Date::factory($dateTime, 'UTC')->toString('G');
+
+        return $hourInTz;
+    }
+
+    /**
      * Returns the start of the day of the current timestamp in UTC. For example,
      * if the current timestamp is `'2007-07-24 14:04:24'` in UTC, the result will
      * be `'2007-07-24'`.
@@ -243,6 +256,17 @@ class Date
     }
 
     /**
+     * Returns the date in the "Y-m-d H:i:s" PHP format
+     *
+     * @param int $timestamp
+     * @return string
+     */
+    public static function getDatetimeFromTimestamp($timestamp)
+    {
+        return date("Y-m-d H:i:s", $timestamp);
+    }
+
+    /**
      * Returns the Unix timestamp of the date in UTC.
      *
      * @return int
@@ -598,15 +622,16 @@ class Date
      */
     public function getLocalized($template)
     {
+        $translator = StaticContainer::get('Piwik\Translation\Translator');
         $day = $this->toString('j');
         $dayOfWeek = $this->toString('N');
         $monthOfYear = $this->toString('n');
         $patternToValue = array(
             "%day%"        => $day,
-            "%shortMonth%" => Piwik::translate('General_ShortMonth_' . $monthOfYear),
-            "%longMonth%"  => Piwik::translate('General_LongMonth_' . $monthOfYear),
-            "%shortDay%"   => Piwik::translate('General_ShortDay_' . $dayOfWeek),
-            "%longDay%"    => Piwik::translate('General_LongDay_' . $dayOfWeek),
+            "%shortMonth%" => $translator->translate('General_ShortMonth_' . $monthOfYear),
+            "%longMonth%"  => $translator->translate('General_LongMonth_' . $monthOfYear),
+            "%shortDay%"   => $translator->translate('General_ShortDay_' . $dayOfWeek),
+            "%longDay%"    => $translator->translate('General_LongDay_' . $dayOfWeek),
             "%longYear%"   => $this->toString('Y'),
             "%shortYear%"  => $this->toString('y'),
             "%time%"       => $this->toString('H:i:s')
@@ -751,4 +776,10 @@ class Date
     {
         return $secs / self::NUM_SECONDS_IN_DAY;
     }
+
+    private static function getInvalidDateFormatException($dateString)
+    {
+        $message = Piwik::translate('General_ExceptionInvalidDateFormat', array("YYYY-MM-DD, or 'today' or 'yesterday'", "strtotime", "http://php.net/strtotime"));
+        return new Exception($message . ": $dateString");
+    }
 }
diff --git a/core/Db.php b/core/Db.php
index fa26f34f02..a96786e1e3 100644
--- a/core/Db.php
+++ b/core/Db.php
@@ -9,6 +9,7 @@
 namespace Piwik;
 
 use Exception;
+use Piwik\DataAccess\TableMetadata;
 use Piwik\Db\Adapter;
 use Piwik\Tracker;
 
@@ -35,6 +36,8 @@ class Db
 {
     private static $connection = null;
 
+    private static $logQueries = true;
+
     /**
      * Returns the database connection and creates it if it hasn't been already.
      *
@@ -385,17 +388,12 @@ class Db
      *
      * @param string|array $table The name of the table you want to get the columns definition for.
      * @return \Zend_Db_Statement
+     * @deprecated since 2.11.0
      */
     public static function getColumnNamesFromTable($table)
     {
-        $columns = self::fetchAll("SHOW COLUMNS FROM `" . $table . "`");
-
-        $columnNames = array();
-        foreach ($columns as $column) {
-            $columnNames[] = $column['Field'];
-        }
-
-        return $columnNames;
+        $tableMetadataAccess = new TableMetadata();
+        return $tableMetadataAccess->getColumns($table);
     }
 
     /**
@@ -710,7 +708,27 @@ class Db
 
     private static function logSql($functionName, $sql, $parameters = array())
     {
-        // NOTE: at the moment we dont log bind in order to avoid sensitive information leaks
-        Log::verbose("Db::%s() executing SQL:\n%s", $functionName, $sql);
+        if (self::$logQueries === false) {
+            return;
+        }
+
+        // NOTE: at the moment we don't log parameters in order to avoid sensitive information leaks
+        Log::debug("Db::%s() executing SQL: %s", $functionName, $sql);
+    }
+
+    /**
+     * @param bool $enable
+     */
+    public static function enableQueryLog($enable)
+    {
+        self::$logQueries = $enable;
+    }
+
+    /**
+     * @return boolean
+     */
+    public static function isQueryLogEnabled()
+    {
+        return self::$logQueries;
     }
 }
diff --git a/core/Db/Adapter.php b/core/Db/Adapter.php
index 5ddd529caa..b75690bc08 100644
--- a/core/Db/Adapter.php
+++ b/core/Db/Adapter.php
@@ -38,6 +38,7 @@ class Adapter
         }
 
         $className = self::getAdapterClassName($adapterName);
+
         $adapter   = new $className($dbInfos);
 
         if ($connect) {
@@ -56,10 +57,15 @@ class Adapter
      *
      * @param string $adapterName
      * @return string
+     * @throws \Exception
      */
     private static function getAdapterClassName($adapterName)
     {
-        return 'Piwik\Db\Adapter\\' . str_replace(' ', '\\', ucwords(str_replace(array('_', '\\'), ' ', strtolower($adapterName))));
+        $className = 'Piwik\Db\Adapter\\' . str_replace(' ', '\\', ucwords(str_replace(array('_', '\\'), ' ', strtolower($adapterName))));
+        if(!class_exists($className)) {
+            throw new \Exception("Adapter $adapterName is not valid.");
+        }
+        return $className;
     }
 
     /**
diff --git a/core/Db/BatchInsert.php b/core/Db/BatchInsert.php
index bb620d692e..2fbd6674ad 100644
--- a/core/Db/BatchInsert.php
+++ b/core/Db/BatchInsert.php
@@ -57,7 +57,7 @@ class BatchInsert
      */
     public static function tableInsertBatch($tableName, $fields, $values, $throwException = false)
     {
-        $filePath = StaticContainer::getContainer()->get('path.tmp') . '/assets/' . $tableName . '-' . Common::generateUniqId() . '.csv';
+        $filePath = StaticContainer::get('path.tmp') . '/assets/' . $tableName . '-' . Common::generateUniqId() . '.csv';
 
         $loadDataInfileEnabled = Config::getInstance()->General['enable_load_data_infile'];
 
@@ -92,7 +92,6 @@ class BatchInsert
                     return true;
                 }
             } catch (Exception $e) {
-                Log::info("LOAD DATA INFILE failed or not supported, falling back to normal INSERTs... Error was: %s", $e->getMessage());
 
                 if ($throwException) {
                     throw $e;
@@ -189,18 +188,16 @@ class BatchInsert
 
                 return true;
             } catch (Exception $e) {
-//				echo $sql . ' ---- ' .  $e->getMessage();
                 $code = $e->getCode();
                 $message = $e->getMessage() . ($code ? "[$code]" : '');
-                if (!Db::get()->isErrNo($e, '1148')) {
-                    Log::info("LOAD DATA INFILE failed... Error was: %s", $message);
-                }
                 $exceptions[] = "\n  Try #" . (count($exceptions) + 1) . ': ' . $queryStart . ": " . $message;
             }
         }
 
         if (count($exceptions)) {
-            throw new Exception(implode(",", $exceptions));
+            $message = "LOAD DATA INFILE failed... Error was: " . implode(",", $exceptions);
+            Log::info($message);
+            throw new Exception($message);
         }
 
         return false;
diff --git a/core/DeviceDetectorCache.php b/core/DeviceDetectorCache.php
index ba65b82c9f..7cf2a15226 100644
--- a/core/DeviceDetectorCache.php
+++ b/core/DeviceDetectorCache.php
@@ -8,6 +8,7 @@
  */
 namespace Piwik;
 
+use Piwik\Cache as PiwikCache;
 use Exception;
 
 /**
@@ -17,29 +18,40 @@ use Exception;
  *
  * Static caching speeds up multiple detections in one request, which is the case when sending bulk requests
  */
-class DeviceDetectorCache extends CacheFile implements \DeviceDetector\Cache\CacheInterface
+class DeviceDetectorCache implements \DeviceDetector\Cache\Cache
 {
     protected static $staticCache = array();
 
+    private $cache;
+    private $ttl;
+
+    public function __construct($ttl = 300)
+    {
+        $this->ttl   = (int) $ttl;
+        $this->cache = PiwikCache::getEagerCache();
+    }
+
     /**
      * Function to fetch a cache entry
      *
      * @param string $id The cache entry ID
      * @return array|bool  False on error, or array the cache content
      */
-    public function get($id)
+    public function fetch($id)
     {
         if (empty($id)) {
             return false;
         }
 
-        $id = $this->cleanupId($id);
-
         if (array_key_exists($id, self::$staticCache)) {
             return self::$staticCache[$id];
         }
 
-        return parent::get($id);
+        if (!$this->cache->contains($id)) {
+            return false;
+        }
+
+        return $this->cache->fetch($id);
     }
 
     /**
@@ -50,16 +62,36 @@ class DeviceDetectorCache extends CacheFile implements \DeviceDetector\Cache\Cac
      * @throws \Exception
      * @return bool  True if the entry was succesfully stored
      */
-    public function set($id, $content)
+    public function save($id, $content, $ttl=0)
     {
         if (empty($id)) {
             return false;
         }
 
-        $id = $this->cleanupId($id);
-
         self::$staticCache[$id] = $content;
 
-        return parent::set($id, $content);
+        return $this->cache->save($id, $content, $this->ttl);
+    }
+
+    public function contains($id)
+    {
+        return !empty(self::$staticCache[$id]) && $this->cache->contains($id);
+    }
+
+    public function delete($id)
+    {
+        if (empty($id)) {
+            return false;
+        }
+
+        unset(self::$staticCache[$id]);
+
+        return $this->cache->delete($id);
+    }
+
+    public function flushAll()
+    {
+        return $this->cache->flushAll();
     }
+
 }
diff --git a/core/DeviceDetectorFactory.php b/core/DeviceDetectorFactory.php
index c61da87a14..c7962a96f0 100644
--- a/core/DeviceDetectorFactory.php
+++ b/core/DeviceDetectorFactory.php
@@ -28,7 +28,7 @@ class DeviceDetectorFactory
 
         $deviceDetector = new DeviceDetector($userAgent);
         $deviceDetector->discardBotInformation();
-        $deviceDetector->setCache(new DeviceDetectorCache('tracker', 86400));
+        $deviceDetector->setCache(new DeviceDetectorCache(86400));
         $deviceDetector->parse();
 
         self::$deviceDetectorInstances[$userAgent] = $deviceDetector;
diff --git a/core/Error.php b/core/Error.php
deleted file mode 100644
index c56e3301a7..0000000000
--- a/core/Error.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik;
-
-require_once PIWIK_INCLUDE_PATH . '/core/Log.php';
-
-/**
- * Holds PHP error information (non-exception errors). Also contains log formatting logic
- * for PHP errors and Piwik's error handler function.
- */
-class Error
-{
-    /**
-     * The backtrace string to use when testing.
-     *
-     * @var string
-     */
-    public static $debugBacktraceForTests = null;
-
-    /**
-     * The error number. See http://php.net/manual/en/errorfunc.constants.php#errorfunc.constants.errorlevels
-     *
-     * @var int
-     */
-    public $errno;
-
-    /**
-     * The error message.
-     *
-     * @var string
-     */
-    public $errstr;
-
-    /**
-     * The file in which the error occurred.
-     *
-     * @var string
-     */
-    public $errfile;
-
-    /**
-     * The line number on which the error occurred.
-     *
-     * @var int
-     */
-    public $errline;
-
-    /**
-     * The error backtrace.
-     *
-     * @var string
-     */
-    public $backtrace;
-
-    /**
-     * Constructor.
-     *
-     * @param int $errno
-     * @param string $errstr
-     * @param string $errfile
-     * @param int $errline
-     * @param string $backtrace
-     */
-    public function __construct($errno, $errstr, $errfile, $errline, $backtrace)
-    {
-        $this->errno = $errno;
-        $this->errstr = $errstr;
-        $this->errfile = $errfile;
-        $this->errline = $errline;
-        $this->backtrace = $backtrace;
-    }
-
-    /**
-     * Returns a string description of a PHP error number.
-     *
-     * @param int $errno `E_ERROR`, `E_WARNING`, `E_PARSE`, etc.
-     * @return string
-     */
-    public static function getErrNoString($errno)
-    {
-        switch ($errno) {
-            case E_ERROR:
-                return "Error";
-            case E_WARNING:
-                return "Warning";
-            case E_PARSE:
-                return "Parse Error";
-            case E_NOTICE:
-                return "Notice";
-            case E_CORE_ERROR:
-                return "Core Error";
-            case E_CORE_WARNING:
-                return "Core Warning";
-            case E_COMPILE_ERROR:
-                return "Compile Error";
-            case E_COMPILE_WARNING:
-                return "Compile Warning";
-            case E_USER_ERROR:
-                return "User Error";
-            case E_USER_WARNING:
-                return "User Warning";
-            case E_USER_NOTICE:
-                return "User Notice";
-            case E_STRICT:
-                return "Strict Notice";
-            case E_RECOVERABLE_ERROR:
-                return "Recoverable Error";
-            case E_DEPRECATED:
-                return "Deprecated";
-            case E_USER_DEPRECATED:
-                return "User Deprecated";
-            default:
-                return "Unknown error ($errno)";
-        }
-    }
-
-    public static function formatFileAndDBLogMessage(&$message, $level, $tag, $datetime, $log)
-    {
-        if ($message instanceof Error) {
-            $message = $message->errfile . '(' . $message->errline . '): ' . Error::getErrNoString($message->errno)
-                . ' - ' . $message->errstr . "\n" . $message->backtrace;
-
-            $message = $log->formatMessage($level, $tag, $datetime, $message);
-        }
-    }
-
-    public static function formatScreenMessage(&$message, $level, $tag, $datetime, $log)
-    {
-        if ($message instanceof Error) {
-            $errno = $message->errno & error_reporting();
-
-            // problem when using error_reporting with the @ silent fail operator
-            // it gives an errno 0, and in this case the objective is to NOT display anything on the screen!
-            // is there any other case where the errno is zero at this point?
-            if ($errno == 0) {
-                $message = false;
-                return;
-            }
-
-            Common::sendHeader('Content-Type: text/html; charset=utf-8');
-
-            $htmlString = '';
-            $htmlString .= "\n<div style='word-wrap: break-word; border: 3px solid red; padding:4px; width:70%; background-color:#FFFF96;'>
-        <strong>There is an error. Please report the message (Piwik " . (class_exists('Piwik\Version') ? Version::VERSION : '') . ")
-        and full backtrace in the <a href='?module=Proxy&action=redirect&url=http://forum.piwik.org' target='_blank'>Piwik forums</a> (please do a Search first as it might have been reported already!).<br /><br/>
-        ";
-            $htmlString .= Error::getErrNoString($message->errno);
-            $htmlString .= ":</strong> <em>{$message->errstr}</em> in <strong>{$message->errfile}</strong>";
-            $htmlString .= " on line <strong>{$message->errline}</strong>\n";
-            $htmlString .= "<br /><br />Backtrace --&gt;<div style=\"font-family:Courier;font-size:10pt\"><br />\n";
-            $htmlString .= str_replace("\n", "<br />\n", $message->backtrace);
-            $htmlString .= "</div><br />";
-            $htmlString .= "\n </pre></div><br />";
-
-            $message = $htmlString;
-        }
-    }
-
-    public static function setErrorHandler()
-    {
-        Piwik::addAction('Log.formatFileMessage', array('\\Piwik\\Error', 'formatFileAndDBLogMessage'));
-        Piwik::addAction('Log.formatDatabaseMessage', array('\\Piwik\\Error', 'formatFileAndDBLogMessage'));
-        Piwik::addAction('Log.formatScreenMessage', array('\\Piwik\\Error', 'formatScreenMessage'));
-
-        set_error_handler(array('\\Piwik\\Error', 'errorHandler'));
-    }
-
-    public static function errorHandler($errno, $errstr, $errfile, $errline)
-    {
-        // if the error has been suppressed by the @ we don't handle the error
-        if (error_reporting() == 0) {
-            return;
-        }
-
-        $backtrace = '';
-        if (empty(self::$debugBacktraceForTests)) {
-            $bt = @debug_backtrace();
-            if ($bt !== null && isset($bt[0])) {
-                foreach ($bt as $i => $debug) {
-                    $backtrace .= "#$i  "
-                        . (isset($debug['class']) ? $debug['class'] : '')
-                        . (isset($debug['type']) ? $debug['type'] : '')
-                        . (isset($debug['function']) ? $debug['function'] : '')
-                        . '(...) called at ['
-                        . (isset($debug['file']) ? $debug['file'] : '') . ':'
-                        . (isset($debug['line']) ? $debug['line'] : '') . ']' . "\n";
-                }
-            }
-        } else {
-            $backtrace = self::$debugBacktraceForTests;
-        }
-
-        $error = new Error($errno, $errstr, $errfile, $errline, $backtrace);
-        Log::error($error);
-
-        switch ($errno) {
-            case E_ERROR:
-            case E_PARSE:
-            case E_CORE_ERROR:
-            case E_CORE_WARNING:
-            case E_COMPILE_ERROR:
-            case E_COMPILE_WARNING:
-            case E_USER_ERROR:
-                exit;
-                break;
-
-            case E_WARNING:
-            case E_NOTICE:
-            case E_USER_WARNING:
-            case E_USER_NOTICE:
-            case E_STRICT:
-            case E_RECOVERABLE_ERROR:
-            case E_DEPRECATED:
-            case E_USER_DEPRECATED:
-            default:
-                // do not exit
-                break;
-        }
-    }
-}
diff --git a/core/ErrorHandler.php b/core/ErrorHandler.php
new file mode 100644
index 0000000000..fe36a355fd
--- /dev/null
+++ b/core/ErrorHandler.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik;
+
+use Piwik\Exception\ErrorException;
+
+/**
+ * Piwik's error handler function.
+ */
+class ErrorHandler
+{
+    /**
+     * Returns a string description of a PHP error number.
+     *
+     * @param int $errno `E_ERROR`, `E_WARNING`, `E_PARSE`, etc.
+     * @return string
+     */
+    public static function getErrNoString($errno)
+    {
+        switch ($errno) {
+            case E_ERROR:
+                return "Error";
+            case E_WARNING:
+                return "Warning";
+            case E_PARSE:
+                return "Parse Error";
+            case E_NOTICE:
+                return "Notice";
+            case E_CORE_ERROR:
+                return "Core Error";
+            case E_CORE_WARNING:
+                return "Core Warning";
+            case E_COMPILE_ERROR:
+                return "Compile Error";
+            case E_COMPILE_WARNING:
+                return "Compile Warning";
+            case E_USER_ERROR:
+                return "User Error";
+            case E_USER_WARNING:
+                return "User Warning";
+            case E_USER_NOTICE:
+                return "User Notice";
+            case E_STRICT:
+                return "Strict Notice";
+            case E_RECOVERABLE_ERROR:
+                return "Recoverable Error";
+            case E_DEPRECATED:
+                return "Deprecated";
+            case E_USER_DEPRECATED:
+                return "User Deprecated";
+            default:
+                return "Unknown error ($errno)";
+        }
+    }
+
+    public static function registerErrorHandler()
+    {
+        set_error_handler(array('Piwik\ErrorHandler', 'errorHandler'));
+    }
+
+    public static function errorHandler($errno, $errstr, $errfile, $errline)
+    {
+        // if the error has been suppressed by the @ we don't handle the error
+        if (error_reporting() == 0) {
+            return;
+        }
+
+        switch ($errno) {
+            case E_ERROR:
+            case E_PARSE:
+            case E_CORE_ERROR:
+            case E_CORE_WARNING:
+            case E_COMPILE_ERROR:
+            case E_COMPILE_WARNING:
+            case E_USER_ERROR:
+                Common::sendResponseCode(500);
+                // Convert the error to an exception with an HTML message
+                $e = new \Exception();
+                $message = self::getHtmlMessage($errno, $errstr, $errfile, $errline, $e->getTraceAsString());
+                throw new ErrorException($message, 0, $errno, $errfile, $errline);
+                break;
+
+            case E_WARNING:
+            case E_NOTICE:
+            case E_USER_WARNING:
+            case E_USER_NOTICE:
+            case E_STRICT:
+            case E_RECOVERABLE_ERROR:
+            case E_DEPRECATED:
+            case E_USER_DEPRECATED:
+            default:
+                Log::warning(self::createLogMessage($errno, $errstr, $errfile, $errline));
+                break;
+        }
+    }
+
+    private static function createLogMessage($errno, $errstr, $errfile, $errline)
+    {
+        return sprintf(
+            "%s(%d): %s - %s - Piwik " . (class_exists('Piwik\Version') ? Version::VERSION : '') . " - Please report this message in the Piwik forums: http://forum.piwik.org (please do a search first as it might have been reported already)",
+            $errfile,
+            $errline,
+            ErrorHandler::getErrNoString($errno),
+            $errstr
+        );
+    }
+
+    private static function getHtmlMessage($errno, $errstr, $errfile, $errline, $trace)
+    {
+        $trace = Log::$debugBacktraceForTests ?: $trace;
+
+        $message = ErrorHandler::getErrNoString($errno) . ' - ' . $errstr;
+
+        $html = "<strong>There is an error. Please report the message (Piwik " . (class_exists('Piwik\Version') ? Version::VERSION : '') . ")
+        and full backtrace in the <a href='?module=Proxy&action=redirect&url=http://forum.piwik.org' target='_blank'>Piwik forums</a> (please do a Search first as it might have been reported already!).</strong><br /><br/>
+        ";
+        $html .= "<strong>{$message}</strong> in <em>{$errfile}</em>";
+        $html .= " on line {$errline}<br />";
+        $html .= "<br />Backtrace:<div style=\"font-family:Courier;font-size:10pt\"><br />\n";
+        $html .= str_replace("\n", "<br />\n", $trace);
+        $html .= "</div>";
+
+        return $html;
+    }
+}
diff --git a/core/Exception/DatabaseSchemaIsNewerThanCodebaseException.php b/core/Exception/DatabaseSchemaIsNewerThanCodebaseException.php
new file mode 100644
index 0000000000..accc4ce5d5
--- /dev/null
+++ b/core/Exception/DatabaseSchemaIsNewerThanCodebaseException.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Exception;
+
+class DatabaseSchemaIsNewerThanCodebaseException extends Exception
+{
+
+}
\ No newline at end of file
diff --git a/core/Exception/ErrorException.php b/core/Exception/ErrorException.php
new file mode 100644
index 0000000000..1673d8def8
--- /dev/null
+++ b/core/Exception/ErrorException.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Piwik\Exception;
+
+/**
+ * ErrorException
+ *
+ * @author Matthieu Napoli <matthieu@mnapoli.fr>
+ */
+class ErrorException extends \ErrorException
+{
+    public function isHtmlMessage()
+    {
+        return true;
+    }
+}
diff --git a/core/ExceptionHandler.php b/core/ExceptionHandler.php
index 8566385070..e68a058e4a 100644
--- a/core/ExceptionHandler.php
+++ b/core/ExceptionHandler.php
@@ -8,54 +8,92 @@
  */
 namespace Piwik;
 
-use Piwik\API\ResponseBuilder;
-use Piwik\Plugin;
+use Exception;
+use Piwik\Plugins\CoreAdminHome\CustomLogo;
 
 /**
- * Contains Piwik's uncaught exception handler and log file formatting for exception
- * instances.
+ * Contains Piwik's uncaught exception handler.
  */
 class ExceptionHandler
 {
-    /**
-     * The backtrace string to use when testing.
-     *
-     * @var string
-     */
-    public static $debugBacktraceForTests = null;
-
     public static function setUp()
     {
-        Piwik::addAction('Log.formatFileMessage', array('\\Piwik\\ExceptionHandler', 'formatFileAndDBLogMessage'));
-        Piwik::addAction('Log.formatDatabaseMessage', array('\\Piwik\\ExceptionHandler', 'formatFileAndDBLogMessage'));
-        Piwik::addAction('Log.formatScreenMessage', array('\\Piwik\\ExceptionHandler', 'formatScreenMessage'));
+        set_exception_handler(array('Piwik\ExceptionHandler', 'handleException'));
+    }
+
+    public static function handleException(Exception $exception)
+    {
+        if (Common::isPhpCliMode()) {
+            self::dieWithCliError($exception);
+        }
 
-        set_exception_handler(array('\\Piwik\\ExceptionHandler', 'logException'));
+        self::dieWithHtmlErrorPage($exception);
     }
 
-    public static function formatFileAndDBLogMessage(&$message, $level, $tag, $datetime, $log)
+    public static function dieWithCliError(Exception $exception)
     {
-        if ($message instanceof \Exception) {
-            $message = sprintf("%s(%d): %s\n%s", $message->getFile(), $message->getLine(), $message->getMessage(),
-                self::$debugBacktraceForTests ? : $message->getTraceAsString());
+        $message = $exception->getMessage();
 
-            $message = $log->formatMessage($level, $tag, $datetime, $message);
+        if (!method_exists($exception, 'isHtmlMessage') || !$exception->isHtmlMessage()) {
+            $message = strip_tags(str_replace('<br />', PHP_EOL, $message));
         }
+
+        $message = sprintf(
+            "Uncaught exception: %s\nin %s line %d\n%s\n",
+            $message,
+            $exception->getFile(),
+            $exception->getLine(),
+            $exception->getTraceAsString()
+        );
+
+        echo $message;
+
+        exit(1);
     }
 
-    public static function formatScreenMessage(&$message, $level, $tag, $datetime, $log)
+    public static function dieWithHtmlErrorPage(Exception $exception)
     {
-        if ($message instanceof \Exception) {
-            Common::sendHeader('Content-Type: text/html; charset=utf-8');
+        Common::sendHeader('Content-Type: text/html; char1set=utf-8');
 
-            $outputFormat = strtolower(Common::getRequestVar('format', 'html', 'string'));
-            $response = new ResponseBuilder($outputFormat);
-            $message = $response->getResponseException(new \Exception($message->getMessage()));
-        }
+        echo self::getErrorResponse($exception);
+
+        exit(1);
     }
 
-    public static function logException(\Exception $exception)
+    private static function getErrorResponse(Exception $ex)
     {
-        Log::error($exception);
+        $debugTrace = $ex->getTraceAsString();
+
+        $message = $ex->getMessage();
+
+        if (!method_exists($ex, 'isHtmlMessage') || !$ex->isHtmlMessage()) {
+            $message = Common::sanitizeInputValue($message);
+        }
+
+        $logo = new CustomLogo();
+
+        $logoHeaderUrl = false;
+        $logoFaviconUrl = false;
+        try {
+            $logoHeaderUrl = $logo->getHeaderLogoUrl();
+            $logoFaviconUrl = $logo->getPathUserFavicon();
+        } catch (Exception $ex) {
+            Log::debug($ex);
+        }
+
+        $result = Piwik_GetErrorMessagePage($message, $debugTrace, true, true, $logoHeaderUrl, $logoFaviconUrl);
+
+        /**
+         * Triggered before a Piwik error page is displayed to the user.
+         *
+         * This event can be used to modify the content of the error page that is displayed when
+         * an exception is caught.
+         *
+         * @param string &$result The HTML of the error page.
+         * @param Exception $ex The Exception displayed in the error page.
+         */
+        Piwik::postEvent('FrontController.modifyErrorPage', array(&$result, $ex));
+
+        return $result;
     }
 }
diff --git a/core/Filesystem.php b/core/Filesystem.php
index 125c47bfda..850b44da63 100644
--- a/core/Filesystem.php
+++ b/core/Filesystem.php
@@ -10,7 +10,8 @@ namespace Piwik;
 
 use Exception;
 use Piwik\Container\StaticContainer;
-use Piwik\Tracker\Cache;
+use Piwik\Tracker\Cache as TrackerCache;
+use Piwik\Cache as PiwikCache;
 
 /**
  * Contains helper functions that deal with the filesystem.
@@ -26,7 +27,8 @@ class Filesystem
     {
         AssetManager::getInstance()->removeMergedAssets($pluginName);
         View::clearCompiledTemplates();
-        Cache::deleteTrackerCache();
+        TrackerCache::deleteTrackerCache();
+        PiwikCache::flushAll();
         self::clearPhpCaches();
     }
 
@@ -409,12 +411,36 @@ class Filesystem
     }
 
     /**
+     * Remove a file.
+     *
+     * @param string $file
+     * @param bool $silenceErrors If true, no exception will be thrown in case removing fails.
+     */
+    public static function remove($file, $silenceErrors = false)
+    {
+        if (!file_exists($file)) {
+            return;
+        }
+
+        $result = @unlink($file);
+
+        // Testing if the file still exist avoids race conditions
+        if (!$result && file_exists($file)) {
+            if ($silenceErrors) {
+                Log::warning('Failed to delete file ' . $file);
+            } else {
+                throw new \RuntimeException('Unable to delete file ' . $file);
+            }
+        }
+    }
+
+    /**
      * @param $path
      * @return int
      */
     private static function getChmodForPath($path)
     {
-        $pathIsTmp = StaticContainer::getContainer()->get('path.tmp');
+        $pathIsTmp = StaticContainer::get('path.tmp');
         if (strpos($path, $pathIsTmp) === 0) {
             // tmp/* folder
             return 0750;
diff --git a/core/FrontController.php b/core/FrontController.php
index 7d1702315f..bd473bba8f 100644
--- a/core/FrontController.php
+++ b/core/FrontController.php
@@ -18,7 +18,6 @@ use Piwik\Http\Router;
 use Piwik\Plugin\Controller;
 use Piwik\Plugin\Report;
 use Piwik\Plugin\Widgets;
-use Piwik\Plugins\CoreAdminHome\CustomLogo;
 use Piwik\Session;
 
 /**
@@ -230,7 +229,7 @@ class FrontController extends Singleton
                 Profiler::printQueryCount();
             }
         } catch (Exception $e) {
-            Log::verbose($e);
+            Log::debug($e);
         }
     }
 
@@ -254,6 +253,8 @@ class FrontController extends Singleton
     {
         $lastError = error_get_last();
         if (!empty($lastError) && $lastError['type'] == E_ERROR) {
+            Common::sendResponseCode(500);
+
             $controller = FrontController::getInstance();
             $controller->init();
             $message = $controller->dispatch('CorePluginsAdmin', 'safemode', array($lastError));
@@ -263,7 +264,7 @@ class FrontController extends Singleton
     }
 
     /**
-     * Loads the config file and assign to the global registry
+     * Loads the config file
      * This is overridden in tests to ensure test config file is used
      *
      * @return Exception
@@ -309,11 +310,9 @@ class FrontController extends Singleton
         }
         $initialized = true;
 
-        Registry::set('timer', new Timer);
-
         $exceptionToThrow = self::createConfigObject();
 
-        $tmpPath = StaticContainer::getContainer()->get('path.tmp');
+        $tmpPath = StaticContainer::get('path.tmp');
 
         $directoriesToCheck = array(
             $tmpPath,
@@ -324,15 +323,13 @@ class FrontController extends Singleton
             $tmpPath . '/templates_c/',
         );
 
-        Translate::loadEnglishTranslation();
-
         Filechecks::dieIfDirectoriesNotWritable($directoriesToCheck);
 
         $this->handleMaintenanceMode();
         $this->handleProfiler();
         $this->handleSSLRedirection();
 
-        Plugin\Manager::getInstance()->loadPluginTranslations('en');
+        Plugin\Manager::getInstance()->loadPluginTranslations();
         Plugin\Manager::getInstance()->loadActivatedPlugins();
 
         if ($exceptionToThrow) {
@@ -399,6 +396,8 @@ class FrontController extends Singleton
          */
         Piwik::postEvent('Request.dispatchCoreAndPluginUpdatesScreen');
 
+        Updater::throwIfPiwikVersionIsOlderThanDBSchema();
+
         \Piwik\Plugin\Manager::getInstance()->installLoadedPlugins();
 
         // ensure the current Piwik URL is known for later use
@@ -416,14 +415,14 @@ class FrontController extends Singleton
          * **Example**
          *
          *     Piwik::addAction('Request.initAuthenticationObject', function() {
-         *         Piwik\Registry::set('auth', new MyAuthImplementation());
+         *         StaticContainer::getContainer()->set('Piwik\Auth', new MyAuthImplementation());
          *     });
          */
         Piwik::postEvent('Request.initAuthenticationObject');
         try {
-            $authAdapter = Registry::get('auth');
+            $authAdapter = StaticContainer::get('Piwik\Auth');
         } catch (Exception $e) {
-            $message = "Authentication object cannot be found in the Registry. Maybe the Login plugin is not activated?
+            $message = "Authentication object cannot be found in the container. Maybe the Login plugin is not activated?
                         <br />You can activate the plugin by adding:<br />
                         <code>Plugins[] = Login</code><br />
                         under the <code>[Plugins]</code> section in your config/config.ini.php";
@@ -442,7 +441,6 @@ class FrontController extends Singleton
         }
         SettingsServer::raiseMemoryLimitIfNecessary();
 
-        Translate::reloadLanguage();
         \Piwik\Plugin\Manager::getInstance()->postLoadPlugins();
 
         /**
@@ -468,6 +466,8 @@ class FrontController extends Singleton
             && ($module !== 'API' || ($action && $action !== 'index'))
         ) {
             Session::start();
+
+            $this->closeSessionEarlyForFasterUI();
         }
 
         if (is_null($parameters)) {
@@ -478,7 +478,7 @@ class FrontController extends Singleton
             throw new Exception("Invalid module name '$module'");
         }
 
-        $module = Request::renameModule($module);
+        list($module, $action) = Request::getRenamedModuleAndAction($module, $action);
 
         if (!\Piwik\Plugin\Manager::getInstance()->isPluginActivated($module)) {
             throw new PluginDeactivatedException($module);
@@ -537,6 +537,25 @@ class FrontController extends Singleton
         Url::redirectToHttps();
     }
 
+    private function closeSessionEarlyForFasterUI()
+    {
+        $isDashboardReferrer = !empty($_SERVER['HTTP_REFERER']) && strpos($_SERVER['HTTP_REFERER'], 'module=CoreHome&action=index') !== false;
+        $isAllWebsitesReferrer = !empty($_SERVER['HTTP_REFERER']) && strpos($_SERVER['HTTP_REFERER'], 'module=MultiSites&action=index') !== false;
+
+        if ($isDashboardReferrer
+            && !empty($_POST['token_auth'])
+            && Common::getRequestVar('widget', 0, 'int') === 1
+        ) {
+            Session::close();
+        }
+
+        if (($isDashboardReferrer || $isAllWebsitesReferrer)
+            && Common::getRequestVar('viewDataTable', '', 'string') === 'sparkline'
+        ) {
+            Session::close();
+        }
+    }
+
     private function handleProfiler()
     {
         if (!empty($_GET['xhprof'])) {
@@ -611,47 +630,4 @@ class FrontController extends Singleton
         return $result;
     }
 
-    /**
-     * Returns HTML that displays an exception's error message (and possibly stack trace).
-     * The result of this method is echo'd by dispatch.php.
-     *
-     * @param Exception $ex The exception to use when generating the error page's HTML.
-     * @return string The HTML to echo.
-     */
-    public function getErrorResponse(Exception $ex)
-    {
-        $debugTrace = $ex->getTraceAsString();
-
-        $message = $ex->getMessage();
-
-        if (!method_exists($ex, 'isHtmlMessage') || !$ex->isHtmlMessage()) {
-            $message = Common::sanitizeInputValue($message);
-        }
-
-        $logo = new CustomLogo();
-
-        $logoHeaderUrl = false;
-        $logoFaviconUrl = false;
-        try {
-            $logoHeaderUrl = $logo->getHeaderLogoUrl();
-            $logoFaviconUrl = $logo->getPathUserFavicon();
-        } catch (Exception $ex) {
-            Log::debug($ex);
-        }
-
-        $result = Piwik_GetErrorMessagePage($message, $debugTrace, true, true, $logoHeaderUrl, $logoFaviconUrl);
-
-        /**
-         * Triggered before a Piwik error page is displayed to the user.
-         *
-         * This event can be used to modify the content of the error page that is displayed when
-         * an exception is caught.
-         *
-         * @param string &$result The HTML of the error page.
-         * @param Exception $ex The Exception displayed in the error page.
-         */
-        Piwik::postEvent('FrontController.modifyErrorPage', array(&$result, $ex));
-
-        return $result;
-    }
 }
diff --git a/core/Http.php b/core/Http.php
index 3643fc8553..25d6d59566 100644
--- a/core/Http.php
+++ b/core/Http.php
@@ -47,7 +47,7 @@ class Http
 
     protected static function isCurlEnabled()
     {
-        return function_exists('curl_init');
+        return function_exists('curl_init') && function_exists('curl_exec');
     }
 
     /**
@@ -99,7 +99,7 @@ class Http
      *
      * @param string $method
      * @param string $aUrl
-     * @param int $timeout
+     * @param int $timeout in seconds
      * @param string $userAgent
      * @param string $destinationPath
      * @param resource $file
@@ -444,6 +444,7 @@ class Http
                 // only get header info if not saving directly to file
                 CURLOPT_HEADER         => is_resource($file) ? false : true,
                 CURLOPT_CONNECTTIMEOUT => $timeout,
+                CURLOPT_TIMEOUT        => $timeout,
             );
             // Case core:archive command is triggering archiving on https:// and the certificate is not valid
             if ($acceptInvalidSslCertificate) {
diff --git a/core/Intl/Data/Provider/CurrencyDataProvider.php b/core/Intl/Data/Provider/CurrencyDataProvider.php
new file mode 100644
index 0000000000..ae73a5bce0
--- /dev/null
+++ b/core/Intl/Data/Provider/CurrencyDataProvider.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Intl\Data\Provider;
+
+/**
+ * Provides currency data.
+ */
+class CurrencyDataProvider
+{
+    private $currencyList;
+
+    /**
+     * Returns the list of all known currency symbols.
+     *
+     * @return array An array mapping currency codes to their respective currency symbols
+     *               and a description, eg, `array('USD' => array('$', 'US dollar'))`.
+     * @api
+     */
+    public function getCurrencyList()
+    {
+        if ($this->currencyList === null) {
+            $this->currencyList = require __DIR__ . '/../Resources/currencies.php';
+        }
+
+        return $this->currencyList;
+    }
+}
diff --git a/core/Intl/Data/Provider/LanguageDataProvider.php b/core/Intl/Data/Provider/LanguageDataProvider.php
new file mode 100644
index 0000000000..52f0b72f4c
--- /dev/null
+++ b/core/Intl/Data/Provider/LanguageDataProvider.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Intl\Data\Provider;
+
+/**
+ * Provides language data.
+ */
+class LanguageDataProvider
+{
+    private $languageList;
+    private $languageToCountryList;
+
+    /**
+     * Returns the list of valid language codes.
+     *
+     * @return string[] Array of 2 letter ISO code => language name (in english).
+     *                  E.g. `array('en' => 'English', 'ja' => 'Japanese')`.
+     * @api
+     */
+    public function getLanguageList()
+    {
+        if ($this->languageList === null) {
+            $this->languageList = require __DIR__ . '/../Resources/languages.php';
+        }
+
+        return $this->languageList;
+    }
+
+    /**
+     * Returns the list of language to country mappings.
+     *
+     * @return string[] Array of 2 letter ISO language code => 2 letter ISO country code.
+     *                  E.g. `array('fr' => 'fr') // French => France`.
+     * @api
+     */
+    public function getLanguageToCountryList()
+    {
+        if ($this->languageToCountryList === null) {
+            $this->languageToCountryList = require __DIR__ . '/../Resources/languages-to-countries.php';
+        }
+
+        return $this->languageToCountryList;
+    }
+}
diff --git a/core/Intl/Data/Provider/RegionDataProvider.php b/core/Intl/Data/Provider/RegionDataProvider.php
new file mode 100644
index 0000000000..e66614871b
--- /dev/null
+++ b/core/Intl/Data/Provider/RegionDataProvider.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Intl\Data\Provider;
+
+/**
+ * Provides region related data (continents, countries, etc.).
+ */
+class RegionDataProvider
+{
+    private $continentList;
+    private $countryList;
+    private $countryExtraList;
+
+    /**
+     * Returns the list of continent codes.
+     *
+     * @return string[] Array of 3 letter continent codes
+     * @api
+     */
+    public function getContinentList()
+    {
+        if ($this->continentList === null) {
+            $this->continentList = require __DIR__ . '/../Resources/continents.php';
+        }
+
+        return $this->continentList;
+    }
+
+    /**
+     * Returns the list of valid country codes.
+     *
+     * @param bool $includeInternalCodes
+     * @return string[] Array of 2 letter country ISO codes => 3 letter continent code
+     * @api
+     */
+    public function getCountryList($includeInternalCodes = false)
+    {
+        if ($this->countryList === null) {
+            $this->countryList = require __DIR__ . '/../Resources/countries.php';
+        }
+        if ($this->countryExtraList === null) {
+            $this->countryExtraList = require __DIR__ . '/../Resources/countries-extra.php';
+        }
+
+        if ($includeInternalCodes) {
+            return array_merge($this->countryList, $this->countryExtraList);
+        }
+
+        return $this->countryList;
+    }
+}
diff --git a/core/Intl/Data/Resources/continents.php b/core/Intl/Data/Resources/continents.php
new file mode 100644
index 0000000000..4e346b2cc6
--- /dev/null
+++ b/core/Intl/Data/Resources/continents.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+/**
+ * Continent database.
+ *
+ * Primary reference: ISO 3166-1 alpha-2
+ */
+return array(
+    'unk', // unknown
+    'amn', // North America
+    'amc', // Central America
+    'ams', // South America
+    'eur', // Europe
+    'afr', // Africa
+    'asi', // Asia
+    'oce', // Oceania
+    'ant', // Antarctica
+);
diff --git a/core/Intl/Data/Resources/countries-extra.php b/core/Intl/Data/Resources/countries-extra.php
new file mode 100644
index 0000000000..e237dd6b6d
--- /dev/null
+++ b/core/Intl/Data/Resources/countries-extra.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+/**
+ * Country codes database.
+ *
+ * The mapping of countries to continents is from MaxMind with the exception
+ * of Central America.  MaxMind groups Central American countries with
+ * North America.  Piwik previously grouped Central American countries with
+ * South America.  Given this conflict and the fact that most of Central
+ * America lies on its own continental plate (i.e., the Caribbean Plate), we
+ * currently use a separate continent code (amc).
+ */
+return array(
+    // unknown
+    'xx'  => 'unk',
+
+    // exceptionally reserved
+    'ac'  => 'afr', // .ac TLD
+    'cp'  => 'amc',
+    'dg'  => 'asi',
+    'ea'  => 'afr',
+    'eu'  => 'eur', // .eu TLD
+    'fx'  => 'eur',
+    'ic'  => 'afr',
+    'su'  => 'eur', // .su TLD
+    'ta'  => 'afr',
+    'uk'  => 'eur', // .uk TLD
+
+    // transitionally reserved
+    'an'  => 'amc', // former Netherlands Antilles
+    'bu'  => 'asi',
+    'cs'  => 'eur', // former Serbia and Montenegro
+    'nt'  => 'asi',
+    'sf'  => 'eur',
+    'tp'  => 'oce', // .tp TLD
+    'yu'  => 'eur', // .yu TLD
+    'zr'  => 'afr',
+
+    // MaxMind GeoIP specific
+    'a1'  => 'unk',
+    'a2'  => 'unk',
+    'ap'  => 'asi',
+    'o1'  => 'unk',
+
+    // Catalonia (Spain)
+    'cat' => 'eur',
+);
diff --git a/core/Intl/Data/Resources/countries.php b/core/Intl/Data/Resources/countries.php
new file mode 100644
index 0000000000..15197f8846
--- /dev/null
+++ b/core/Intl/Data/Resources/countries.php
@@ -0,0 +1,272 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+/**
+ * Country code and continent database.
+ *
+ * The mapping of countries to continents is from MaxMind with the exception
+ * of Central America.  MaxMind groups Central American countries with
+ * North America.  Piwik previously grouped Central American countries with
+ * South America.  Given this conflict and the fact that most of Central
+ * America lies on its own continental plate (i.e., the Caribbean Plate), we
+ * currently use a separate continent code (amc).
+ *
+ * Primary reference: ISO 3166-1 alpha-2
+ */
+return array(
+    'ad' => 'eur',
+    'ae' => 'asi',
+    'af' => 'asi',
+    'ag' => 'amc',
+    'ai' => 'amc',
+    'al' => 'eur',
+    'am' => 'asi',
+    'ao' => 'afr',
+    'aq' => 'ant',
+    'ar' => 'ams',
+    'as' => 'oce',
+    'at' => 'eur',
+    'au' => 'oce',
+    'aw' => 'amc',
+    'ax' => 'eur',
+    'az' => 'asi',
+    'ba' => 'eur',
+    'bb' => 'amc',
+    'bd' => 'asi',
+    'be' => 'eur',
+    'bf' => 'afr',
+    'bg' => 'eur',
+    'bh' => 'asi',
+    'bi' => 'afr',
+    'bj' => 'afr',
+    'bl' => 'amc',
+    'bm' => 'amc',
+    'bn' => 'asi',
+    'bo' => 'ams',
+    'bq' => 'amc',
+    'br' => 'ams',
+    'bs' => 'amc',
+    'bt' => 'asi',
+    'bv' => 'ant',
+    'bw' => 'afr',
+    'by' => 'eur',
+    'bz' => 'amc',
+    'ca' => 'amn',
+    'cc' => 'asi',
+    'cd' => 'afr',
+    'cf' => 'afr',
+    'cg' => 'afr',
+    'ch' => 'eur',
+    'ci' => 'afr',
+    'ck' => 'oce',
+    'cl' => 'ams',
+    'cm' => 'afr',
+    'cn' => 'asi',
+    'co' => 'ams',
+    'cr' => 'amc',
+    'cu' => 'amc',
+    'cv' => 'afr',
+    'cw' => 'amc',
+    'cx' => 'asi',
+    'cy' => 'eur',
+    'cz' => 'eur',
+    'de' => 'eur',
+    'dj' => 'afr',
+    'dk' => 'eur',
+    'dm' => 'amc',
+    'do' => 'amc',
+    'dz' => 'afr',
+    'ec' => 'ams',
+    'ee' => 'eur',
+    'eg' => 'afr',
+    'eh' => 'afr',
+    'er' => 'afr',
+    'es' => 'eur',
+    'et' => 'afr',
+    'fi' => 'eur',
+    'fj' => 'oce',
+    'fk' => 'ams',
+    'fm' => 'oce',
+    'fo' => 'eur',
+    'fr' => 'eur',
+    'ga' => 'afr',
+    'gb' => 'eur',
+    'gd' => 'amc',
+    'ge' => 'asi',
+    'gf' => 'ams',
+    'gg' => 'eur',
+    'gh' => 'afr',
+    'gi' => 'eur',
+    'gl' => 'amn',
+    'gm' => 'afr',
+    'gn' => 'afr',
+    'gp' => 'amc',
+    'gq' => 'afr',
+    'gr' => 'eur',
+    'gs' => 'ant',
+    'gt' => 'amc',
+    'gu' => 'oce',
+    'gw' => 'afr',
+    'gy' => 'ams',
+    'hk' => 'asi',
+    'hm' => 'ant',
+    'hn' => 'amc',
+    'hr' => 'eur',
+    'ht' => 'amc',
+    'hu' => 'eur',
+    'id' => 'asi',
+    'ie' => 'eur',
+    'il' => 'asi',
+    'im' => 'eur',
+    'in' => 'asi',
+    'io' => 'asi',
+    'iq' => 'asi',
+    'ir' => 'asi',
+    'is' => 'eur',
+    'it' => 'eur',
+    'je' => 'eur',
+    'jm' => 'amc',
+    'jo' => 'asi',
+    'jp' => 'asi',
+    'ke' => 'afr',
+    'kg' => 'asi',
+    'kh' => 'asi',
+    'ki' => 'oce',
+    'km' => 'afr',
+    'kn' => 'amc',
+    'kp' => 'asi',
+    'kr' => 'asi',
+    'kw' => 'asi',
+    'ky' => 'amc',
+    'kz' => 'asi',
+    'la' => 'asi',
+    'lb' => 'asi',
+    'lc' => 'amc',
+    'li' => 'eur',
+    'lk' => 'asi',
+    'lr' => 'afr',
+    'ls' => 'afr',
+    'lt' => 'eur',
+    'lu' => 'eur',
+    'lv' => 'eur',
+    'ly' => 'afr',
+    'ma' => 'afr',
+    'mc' => 'eur',
+    'md' => 'eur',
+    'me' => 'eur',
+    'mf' => 'amc',
+    'mg' => 'afr',
+    'mh' => 'oce',
+    'mk' => 'eur',
+    'ml' => 'afr',
+    'mm' => 'asi',
+    'mn' => 'asi',
+    'mo' => 'asi',
+    'mp' => 'oce',
+    'mq' => 'amc',
+    'mr' => 'afr',
+    'ms' => 'amc',
+    'mt' => 'eur',
+    'mu' => 'afr',
+    'mv' => 'asi',
+    'mw' => 'afr',
+    'mx' => 'amn',
+    'my' => 'asi',
+    'mz' => 'afr',
+    'na' => 'afr',
+    'nc' => 'oce',
+    'ne' => 'afr',
+    'nf' => 'oce',
+    'ng' => 'afr',
+    'ni' => 'amc',
+    'nl' => 'eur',
+    'no' => 'eur',
+    'np' => 'asi',
+    'nr' => 'oce',
+    'nu' => 'oce',
+    'nz' => 'oce',
+    'om' => 'asi',
+    'pa' => 'amc',
+    'pe' => 'ams',
+    'pf' => 'oce',
+    'pg' => 'oce',
+    'ph' => 'asi',
+    'pk' => 'asi',
+    'pl' => 'eur',
+    'pm' => 'amn',
+    'pn' => 'oce',
+    'pr' => 'amc',
+    'ps' => 'asi',
+    'pt' => 'eur',
+    'pw' => 'oce',
+    'py' => 'ams',
+    'qa' => 'asi',
+    're' => 'afr',
+    'ro' => 'eur',
+    'rs' => 'eur',
+    'ru' => 'eur',
+    'rw' => 'afr',
+    'sa' => 'asi',
+    'sb' => 'oce',
+    'sc' => 'afr',
+    'sd' => 'afr',
+    'se' => 'eur',
+    'sg' => 'asi',
+    'sh' => 'afr',
+    'si' => 'eur',
+    'sj' => 'eur',
+    'sk' => 'eur',
+    'sl' => 'afr',
+    'sm' => 'eur',
+    'sn' => 'afr',
+    'so' => 'afr',
+    'sr' => 'ams',
+    'ss' => 'afr',
+    'st' => 'afr',
+    'sv' => 'amc',
+    'sx' => 'amc',
+    'sy' => 'asi',
+    'sz' => 'afr',
+    'tc' => 'amc',
+    'td' => 'afr',
+    'tf' => 'ant',
+    'tg' => 'afr',
+    'th' => 'asi',
+    'ti' => 'asi',
+    'tj' => 'asi',
+    'tk' => 'oce',
+    'tl' => 'asi',
+    'tm' => 'asi',
+    'tn' => 'afr',
+    'to' => 'oce',
+    'tr' => 'eur',
+    'tt' => 'amc',
+    'tv' => 'oce',
+    'tw' => 'asi',
+    'tz' => 'afr',
+    'ua' => 'eur',
+    'ug' => 'afr',
+    'um' => 'oce',
+    'us' => 'amn',
+    'uy' => 'ams',
+    'uz' => 'asi',
+    'va' => 'eur',
+    'vc' => 'amc',
+    've' => 'ams',
+    'vg' => 'amc',
+    'vi' => 'amc',
+    'vn' => 'asi',
+    'vu' => 'oce',
+    'wf' => 'oce',
+    'ws' => 'oce',
+    'ye' => 'asi',
+    'yt' => 'afr',
+    'za' => 'afr',
+    'zm' => 'afr',
+    'zw' => 'afr',
+);
diff --git a/core/Intl/Data/Resources/currencies.php b/core/Intl/Data/Resources/currencies.php
new file mode 100644
index 0000000000..6190c3108f
--- /dev/null
+++ b/core/Intl/Data/Resources/currencies.php
@@ -0,0 +1,183 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+/**
+ * International currencies in circulation.
+ *
+ * @see http://en.wikipedia.org/wiki/List_of_circulating_currencies
+ */
+return array(
+    // 'ISO-4217 CODE' => array('currency symbol', 'description'),
+
+    // Top 5 by global trading volume
+    'USD' => array('$', 'US dollar'),
+    'EUR' => array('€', 'Euro'),
+    'JPY' => array('¥', 'Japanese yen'),
+    'GBP' => array('£', 'British pound'),
+    'CHF' => array('Fr', 'Swiss franc'),
+
+    'AFN' => array('؋', 'Afghan afghani'),
+    'ALL' => array('L', 'Albanian lek'),
+    'DZD' => array('د.ج', 'Algerian dinar'),
+    'AOA' => array('Kz', 'Angolan kwanza'),
+    'ARS' => array('$', 'Argentine peso'),
+    'AMD' => array('դր.', 'Armenian dram'),
+    'AWG' => array('ƒ', 'Aruban florin'),
+    'AUD' => array('$', 'Australian dollar'),
+    'AZN' => array('m', 'Azerbaijani manat'),
+    'BSD' => array('$', 'Bahamian dollar'),
+    'BHD' => array('.د.ب', 'Bahraini dinar'),
+    'BDT' => array('৳', 'Bangladeshi taka'),
+    'BBD' => array('$', 'Barbadian dollar'),
+    'BYR' => array('Br', 'Belarusian ruble'),
+    'BZD' => array('$', 'Belize dollar'),
+    'BMD' => array('$', 'Bermudian dollar'),
+    'BTC' => array('BTC', 'Bitcoin'),
+    'BTN' => array('Nu.', 'Bhutanese ngultrum'),
+    'BOB' => array('Bs.', 'Bolivian boliviano'),
+    'BAM' => array('KM', 'Bosnia Herzegovina mark'),
+    'BWP' => array('P', 'Botswana pula'),
+    'BRL' => array('R$', 'Brazilian real'),
+//  'GBP' => array('£', 'British pound'),
+    'BND' => array('$', 'Brunei dollar'),
+    'BGN' => array('лв', 'Bulgarian lev'),
+    'BIF' => array('Fr', 'Burundian franc'),
+    'KHR' => array('៛', 'Cambodian riel'),
+    'CAD' => array('$', 'Canadian dollar'),
+    'CVE' => array('$', 'Cape Verdean escudo'),
+    'KYD' => array('$', 'Cayman Islands dollar'),
+    'XAF' => array('Fr', 'Central African CFA franc'),
+    'CLP' => array('$', 'Chilean peso'),
+    'CNY' => array('元', 'Chinese yuan'),
+    'COP' => array('$', 'Colombian peso'),
+    'KMF' => array('Fr', 'Comorian franc'),
+    'CDF' => array('Fr', 'Congolese franc'),
+    'CRC' => array('₡', 'Costa Rican colón'),
+    'HRK' => array('kn', 'Croatian kuna'),
+    'XPF' => array('F', 'CFP franc'),
+    'CUC' => array('$', 'Cuban convertible peso'),
+    'CUP' => array('$', 'Cuban peso'),
+    'CMG' => array('ƒ', 'Curaçao and Sint Maarten guilder'),
+    'CZK' => array('Kč', 'Czech koruna'),
+    'DKK' => array('kr', 'Danish krone'),
+    'DJF' => array('Fr', 'Djiboutian franc'),
+    'DOP' => array('$', 'Dominican peso'),
+    'XCD' => array('$', 'East Caribbean dollar'),
+    'EGP' => array('ج.م', 'Egyptian pound'),
+    'ERN' => array('Nfk', 'Eritrean nakfa'),
+    'ETB' => array('Br', 'Ethiopian birr'),
+//			'EUR' => array('€', 'Euro'),
+    'FKP' => array('£', 'Falkland Islands pound'),
+    'FJD' => array('$', 'Fijian dollar'),
+    'GMD' => array('D', 'Gambian dalasi'),
+    'GEL' => array('ლ', 'Georgian lari'),
+    'GHS' => array('₵', 'Ghanaian cedi'),
+    'GIP' => array('£', 'Gibraltar pound'),
+    'GTQ' => array('Q', 'Guatemalan quetzal'),
+    'GNF' => array('Fr', 'Guinean franc'),
+    'GYD' => array('$', 'Guyanese dollar'),
+    'HTG' => array('G', 'Haitian gourde'),
+    'HNL' => array('L', 'Honduran lempira'),
+    'HKD' => array('$', 'Hong Kong dollar'),
+    'HUF' => array('Ft', 'Hungarian forint'),
+    'ISK' => array('kr', 'Icelandic króna'),
+    'INR' => array('‎₹', 'Indian rupee'),
+    'IDR' => array('Rp', 'Indonesian rupiah'),
+    'IRR' => array('﷼', 'Iranian rial'),
+    'IQD' => array('ع.د', 'Iraqi dinar'),
+    'ILS' => array('₪', 'Israeli new shekel'),
+    'JMD' => array('$', 'Jamaican dollar'),
+//  'JPY' => array('¥', 'Japanese yen'),
+    'JOD' => array('د.ا', 'Jordanian dinar'),
+    'KZT' => array('₸', 'Kazakhstani tenge'),
+    'KES' => array('Sh', 'Kenyan shilling'),
+    'KWD' => array('د.ك', 'Kuwaiti dinar'),
+    'KGS' => array('лв', 'Kyrgyzstani som'),
+    'LAK' => array('₭', 'Lao kip'),
+    'LBP' => array('ل.ل', 'Lebanese pound'),
+    'LSL' => array('L', 'Lesotho loti'),
+    'LRD' => array('$', 'Liberian dollar'),
+    'LYD' => array('ل.د', 'Libyan dinar'),
+    'LTL' => array('Lt', 'Lithuanian litas'),
+    'MOP' => array('P', 'Macanese pataca'),
+    'MKD' => array('ден', 'Macedonian denar'),
+    'MGA' => array('Ar', 'Malagasy ariary'),
+    'MWK' => array('MK', 'Malawian kwacha'),
+    'MYR' => array('RM', 'Malaysian ringgit'),
+    'MVR' => array('ރ.', 'Maldivian rufiyaa'),
+    'MRO' => array('UM', 'Mauritanian ouguiya'),
+    'MUR' => array('₨', 'Mauritian rupee'),
+    'MXN' => array('$', 'Mexican peso'),
+    'MDL' => array('L', 'Moldovan leu'),
+    'MNT' => array('₮', 'Mongolian tögrög'),
+    'MAD' => array('د.م.', 'Moroccan dirham'),
+    'MZN' => array('MTn', 'Mozambican metical'),
+    'MMK' => array('K', 'Myanma kyat'),
+    'NAD' => array('$', 'Namibian dollar'),
+    'NPR' => array('₨', 'Nepalese rupee'),
+    'ANG' => array('ƒ', 'Netherlands Antillean guilder'),
+    'TWD' => array('$', 'New Taiwan dollar'),
+    'NZD' => array('$', 'New Zealand dollar'),
+    'NIO' => array('C$', 'Nicaraguan córdoba'),
+    'NGN' => array('₦', 'Nigerian naira'),
+    'KPW' => array('₩', 'North Korean won'),
+    'NOK' => array('kr', 'Norwegian krone'),
+    'OMR' => array('ر.ع.', 'Omani rial'),
+    'PKR' => array('₨', 'Pakistani rupee'),
+    'PAB' => array('B/.', 'Panamanian balboa'),
+    'PGK' => array('K', 'Papua New Guinean kina'),
+    'PYG' => array('₲', 'Paraguayan guaraní'),
+    'PEN' => array('S/.', 'Peruvian nuevo sol'),
+    'PHP' => array('₱', 'Philippine peso'),
+    'PLN' => array('zł', 'Polish złoty'),
+    'QAR' => array('ر.ق', 'Qatari riyal'),
+    'RON' => array('L', 'Romanian leu'),
+    'RUB' => array('руб.', 'Russian ruble'),
+    'RWF' => array('Fr', 'Rwandan franc'),
+    'SHP' => array('£', 'Saint Helena pound'),
+    'SVC' => array('₡', 'Salvadoran colón'),
+    'WST' => array('T', 'Samoan tala'),
+    'STD' => array('Db', 'São Tomé and Príncipe dobra'),
+    'SAR' => array('ر.س', 'Saudi riyal'),
+    'RSD' => array('дин. or din.', 'Serbian dinar'),
+    'SCR' => array('₨', 'Seychellois rupee'),
+    'SLL' => array('Le', 'Sierra Leonean leone'),
+    'SGD' => array('$', 'Singapore dollar'),
+    'SBD' => array('$', 'Solomon Islands dollar'),
+    'SOS' => array('Sh', 'Somali shilling'),
+    'ZAR' => array('R', 'South African rand'),
+    'KRW' => array('₩', 'South Korean won'),
+    'LKR' => array('Rs', 'Sri Lankan rupee'),
+    'SDG' => array('جنيه سوداني', 'Sudanese pound'),
+    'SRD' => array('$', 'Surinamese dollar'),
+    'SZL' => array('L', 'Swazi lilangeni'),
+    'SEK' => array('kr', 'Swedish krona'),
+//  'CHF' => array('Fr', 'Swiss franc'),
+    'SYP' => array('ل.س', 'Syrian pound'),
+    'TJS' => array('ЅМ', 'Tajikistani somoni'),
+    'TZS' => array('Sh', 'Tanzanian shilling'),
+    'THB' => array('฿', 'Thai baht'),
+    'TOP' => array('T$', 'Tongan paʻanga'),
+    'TTD' => array('$', 'Trinidad and Tobago dollar'),
+    'TND' => array('د.ت', 'Tunisian dinar'),
+    'TRY' => array('TL', 'Turkish lira'),
+    'TMM' => array('m', 'Turkmenistani manat'),
+    'UGX' => array('Sh', 'Ugandan shilling'),
+    'UAH' => array('₴', 'Ukrainian hryvnia'),
+    'AED' => array('د.إ', 'United Arab Emirates dirham'),
+//  'USD' => array('$', 'United States dollar'),
+    'UYU' => array('$', 'Uruguayan peso'),
+    'UZS' => array('лв', 'Uzbekistani som'),
+    'VUV' => array('Vt', 'Vanuatu vatu'),
+    'VEF' => array('Bs F', 'Venezuelan bolívar'),
+    'VND' => array('₫', 'Vietnamese đồng'),
+    'XOF' => array('Fr', 'West African CFA franc'),
+    'YER' => array('﷼', 'Yemeni rial'),
+    'ZMW' => array('ZK', 'Zambian kwacha'),
+    'ZWL' => array('$', 'Zimbabwean dollar'),
+);
diff --git a/core/Intl/Data/Resources/languages-to-countries.php b/core/Intl/Data/Resources/languages-to-countries.php
new file mode 100644
index 0000000000..91ab0940c5
--- /dev/null
+++ b/core/Intl/Data/Resources/languages-to-countries.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+/**
+ * Language to Country mapping
+ *
+ * This list is used to guess the visitor's country when the region is
+ * not specified in the first language tag.  Inclusion/exclusion is
+ * based on Piwik.org visitor statistics and probability of disambiguation.
+ * (Notably, "en" and "zh" are excluded.)
+ *
+ * If you want to add a new entry, please email us at hello at piwik.org
+ */
+return array(
+    'bg' => 'bg', // Bulgarian  => Bulgaria
+    'ca' => 'es', // Catalan    => Spain
+    'cs' => 'cz', // Czech      => Czech Republic
+    'da' => 'dk', // Danish     => Denmark
+    'de' => 'de', // German     => Germany
+    'el' => 'gr', // Greek      => Greece
+    'es' => 'es', // Spanish    => Spain
+    'et' => 'ee', // Estonian   => Estonia
+    'fa' => 'ir', // Farsi      => Iran
+    'fi' => 'fi', // Finnish    => Finland
+    'fr' => 'fr', // French     => France
+    'he' => 'il', // Hebrew     => Israel
+    'hr' => 'hr', // Croatian   => Croatia
+    'hu' => 'hu', // Hungarian  => Hungary
+    'id' => 'id', // Indonesian => Indonesia
+    'is' => 'is', // Icelandic  => Iceland
+    'it' => 'it', // Italian    => Italy
+    'ja' => 'jp', // Japanese   => Japan
+    'ko' => 'kr', // Korean     => South Korea
+    'lt' => 'lt', // Lithuanian => Lithuania
+    'lv' => 'lv', // Latvian    => Latvia
+    'mk' => 'mk', // Macedonian => Macedonia
+    'ms' => 'my', // Malay      => Malaysia
+    'nb' => 'no', // Bokmål     => Norway
+    'nl' => 'nl', // Dutch      => Netherlands
+    'nn' => 'no', // Nynorsk    => Norway
+    'no' => 'no', // Norwegian  => Norway
+    'pl' => 'pl', // Polish     => Poland
+    'pt' => 'pt', // Portugese  => Portugal
+    'ro' => 'ro', // Romanian   => Romania
+    'ru' => 'ru', // Russian    => Russia
+    'sk' => 'sk', // Slovak     => Slovakia
+    'sl' => 'si', // Slovene    => Slovenia
+    'sq' => 'al', // Albanian   => Albania
+    'sr' => 'rs', // Serbian    => Serbia
+    'sv' => 'se', // Swedish    => Sweden
+    'th' => 'th', // Thai       => Thailand
+    'bo' => 'ti', // Tibetan    => Tibet
+    'tr' => 'tr', // Turkish    => Turkey
+    'uk' => 'ua', // Ukrainian  => Ukraine
+);
diff --git a/core/Intl/Data/Resources/languages.php b/core/Intl/Data/Resources/languages.php
new file mode 100644
index 0000000000..ca6930f369
--- /dev/null
+++ b/core/Intl/Data/Resources/languages.php
@@ -0,0 +1,201 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+/**
+ * Language database
+ *
+ * Reference: ISO 639-1 alpha-2
+ */
+return array(
+    'aa' => array('Afar'),
+    'ab' => array('Abkhazian'),
+    'ae' => array('Avestan'),
+    'af' => array('Afrikaans'),
+    'ak' => array('Akan'),
+    'am' => array('Amharic'),
+    'an' => array('Aragonese'),
+    'ar' => array('Arabic'),
+    'as' => array('Assamese'),
+    'av' => array('Avaric'),
+    'ay' => array('Aymara'),
+    'az' => array('Azerbaijani'),
+    'ba' => array('Bashkir'),
+    'be' => array('Belarusian'),
+    'bg' => array('Bulgarian'),
+    'bh' => array('Bihari'), // 'Bihari languages'
+    'bi' => array('Bislama'),
+    'bm' => array('Bambara'),
+    'bn' => array('Bengali'),
+    'bo' => array('Tibetan'),
+    'br' => array('Breton'),
+    'bs' => array('Bosnian'),
+    'ca' => array('Catalan', 'Valencian'),
+    'ce' => array('Chechen'),
+    'ch' => array('Chamorro'),
+    'co' => array('Corsican'),
+    'cr' => array('Cree'),
+    'cs' => array('Czech'),
+    'cu' => array('Church Slavic', 'Old Slavonic', 'Church Slavonic', 'Old Bulgarian', 'Old Church Slavonic'),
+    'cv' => array('Chuvash'),
+    'cy' => array('Welsh'),
+    'da' => array('Danish'),
+    'de' => array('German'),
+    'dv' => array('Divehi', 'Dhivehi', 'Maldivian'),
+    'dz' => array('Dzongkha'),
+    'ee' => array('Ewe'),
+    'el' => array('Greek', 'Modern Greek', 'Hellenic'), // Greek, Modern (1453-)
+    'en' => array('English'),
+    'eo' => array('Esperanto'),
+    'es' => array('Spanish', 'Castilian'),
+    'et' => array('Estonian'),
+    'eu' => array('Basque'),
+    'fa' => array('Persian'),
+    'ff' => array('Fulah'),
+    'fi' => array('Finnish'),
+    'fj' => array('Fijian'),
+    'fo' => array('Faroese'),
+    'fr' => array('French'),
+    'fy' => array('Western Frisian'),
+    'ga' => array('Irish'),
+    'gd' => array('Gaelic', 'Scottish Gaelic'),
+    'gl' => array('Galician'),
+    'gn' => array('Guarani'),
+    'gu' => array('Gujarati'),
+    'gv' => array('Manx'),
+    'ha' => array('Hausa'),
+    'he' => array('Hebrew'),
+    'hi' => array('Hindi'),
+    'ho' => array('Hiri Motu'),
+    'hr' => array('Croatian'),
+    'ht' => array('Haitian', 'Haitian Creole'),
+    'hu' => array('Hungarian'),
+    'hy' => array('Armenian'),
+    'hz' => array('Herero'),
+    'ia' => array('Interlingua'), // 'Interlingua (International Auxiliary Language Association)'
+    'id' => array('Indonesian'),
+    'ie' => array('Interlingue', 'Occidental'),
+    'ig' => array('Igbo'),
+    'ii' => array('Sichuan Yi', 'Nuosu'),
+    'ik' => array('Inupiaq'),
+    'io' => array('Ido'),
+    'is' => array('Icelandic'),
+    'it' => array('Italian'),
+    'iu' => array('Inuktitut'),
+    'ja' => array('Japanese'),
+    'jv' => array('Javanese'),
+    'ka' => array('Georgian'),
+    'kg' => array('Kongo'),
+    'ki' => array('Kikuyu', 'Gikuyu'),
+    'kj' => array('Kuanyama', 'Kwanyama'),
+    'kk' => array('Kazakh'),
+    'kl' => array('Kalaallisut', 'Greenlandic'),
+    'km' => array('Central Khmer'),
+    'kn' => array('Kannada'),
+    'ko' => array('Korean'),
+    'kr' => array('Kanuri'),
+    'ks' => array('Kashmiri'),
+    'ku' => array('Kurdish'),
+    'kv' => array('Komi'),
+    'kw' => array('Cornish'),
+    'ky' => array('Kirghiz', 'Kyrgyz'),
+    'la' => array('Latin'),
+    'lb' => array('Luxembourgish', 'Letzeburgesch'),
+    'lg' => array('Ganda'),
+    'li' => array('Limburgan', 'Limburger', 'Limburgish'),
+    'ln' => array('Lingala'),
+    'lo' => array('Lao'),
+    'lt' => array('Lithuanian'),
+    'lu' => array('Luba-Katanga'),
+    'lv' => array('Latvian'),
+    'mg' => array('Malagasy'),
+    'mh' => array('Marshallese'),
+    'mi' => array('Maori'),
+    'mk' => array('Macedonian'),
+    'ml' => array('Malayalam'),
+    'mn' => array('Mongolian'),
+//  'mo' => array('Moldavian'), // deprecated
+    'mr' => array('Marathi'),
+    'ms' => array('Malay'),
+    'mt' => array('Maltese'),
+    'my' => array('Burmese'),
+    'na' => array('Nauru'),
+    'nb' => array('Norwegian Bokmål'),
+    'nd' => array('North Ndebele'),
+    'ne' => array('Nepali'),
+    'ng' => array('Ndonga'),
+    'nl' => array('Dutch', 'Flemish'),
+    'nn' => array('Norwegian Nynorsk'),
+    'no' => array('Norwegian'),
+    'nr' => array('South Ndebele'),
+    'nv' => array('Navajo', 'Navaho'),
+    'ny' => array('Chichewa', 'Chewa', 'Nyanja'),
+    'oc' => array('Occitan', 'Provençal'), // Occitan (post 1500)
+    'oj' => array('Ojibwa'),
+    'om' => array('Oromo'),
+    'or' => array('Oriya'),
+    'os' => array('Ossetian', 'Ossetic'),
+    'pa' => array('Panjabi', 'Punjabi'),
+    'pi' => array('Pali'),
+    'pl' => array('Polish'),
+    'ps' => array('Pushto', 'Pashto'),
+    'pt' => array('Portuguese'),
+    'qu' => array('Quechua'),
+    'rm' => array('Romansh'),
+    'rn' => array('Rundi'),
+    'ro' => array('Romanian', 'Moldavian', 'Moldovan'),
+    'ru' => array('Russian'),
+    'rw' => array('Kinyarwanda'),
+    'sa' => array('Sanskrit'),
+    'sc' => array('Sardinian'),
+    'sd' => array('Sindhi'),
+    'se' => array('Northern Sami'),
+    'sg' => array('Sango'),
+//  'sh' => array('Serbo-Croatian'), // deprecated
+    'si' => array('Sinhala', 'Sinhalese'),
+    'sk' => array('Slovak'),
+    'sl' => array('Slovenian'),
+    'sm' => array('Samoan'),
+    'sn' => array('Shona'),
+    'so' => array('Somali'),
+    'sq' => array('Albanian'),
+    'sr' => array('Serbian'),
+    'ss' => array('Swati'),
+    'st' => array('Southern Soth'),
+    'su' => array('Sundanese'),
+    'sv' => array('Swedish'),
+    'sw' => array('Swahili'),
+    'ta' => array('Tamil'),
+    'te' => array('Telugu'),
+    'tg' => array('Tajik'),
+    'th' => array('Thai'),
+    'ti' => array('Tigrinya'),
+    'tk' => array('Turkmen'),
+    'tl' => array('Tagalog'),
+    'tn' => array('Tswana'),
+    'to' => array('Tonga'), // Tonga (Tonga Islands)
+    'tr' => array('Turkish'),
+    'ts' => array('Tsonga'),
+    'tt' => array('Tatar'),
+    'tw' => array('Twi'),
+    'ty' => array('Tahitian'),
+    'ug' => array('Uighur', 'Uyghur'),
+    'uk' => array('Ukrainian'),
+    'ur' => array('Urdu'),
+    'uz' => array('Uzbek'),
+    've' => array('Venda'),
+    'vi' => array('Vietnamese'),
+    'vo' => array('Volapük'),
+    'wa' => array('Walloon'),
+    'wo' => array('Wolof'),
+    'xh' => array('Xhosa'),
+    'yi' => array('Yiddish'),
+    'yo' => array('Yoruba'),
+    'za' => array('Zhuang', 'Chuang'),
+    'zh' => array('Chinese'),
+    'zu' => array('Zulu'),
+);
diff --git a/core/Intl/Locale.php b/core/Intl/Locale.php
new file mode 100644
index 0000000000..7c18b727c5
--- /dev/null
+++ b/core/Intl/Locale.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Piwik\Intl;
+
+class Locale
+{
+    public static function setLocale($locale)
+    {
+        $localeVariant = str_replace('UTF-8', 'UTF8', $locale);
+
+        setlocale(LC_ALL, $locale, $localeVariant);
+        setlocale(LC_CTYPE, '');
+    }
+
+    public static function setDefaultLocale()
+    {
+        self::setLocale('en_US.UTF-8');
+    }
+}
diff --git a/core/Loader.php b/core/Loader.php
deleted file mode 100644
index b89e7743f9..0000000000
--- a/core/Loader.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-
-namespace Piwik;
-
-/**
- * Initializes the Composer Autoloader
- * @package Piwik
- */
-class Loader
-{
-    public static function init()
-    {
-        return self::getLoader();
-    }
-
-    /**
-     * @return \Composer\Autoload\ClassLoader
-     */
-    private static function getLoader()
-    {
-        if (file_exists(PIWIK_INCLUDE_PATH . '/vendor/autoload.php')) {
-            $path = PIWIK_INCLUDE_PATH . '/vendor/autoload.php'; // Piwik is the main project
-        } else {
-            $path = PIWIK_INCLUDE_PATH . '/../../autoload.php'; // Piwik is installed as a dependency
-        }
-
-        $loader = require $path;
-
-        return $loader;
-    }
-}
diff --git a/core/Log.php b/core/Log.php
index 1315362c38..260e57fea6 100644
--- a/core/Log.php
+++ b/core/Log.php
@@ -4,12 +4,13 @@
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
  */
+
 namespace Piwik;
 
+use Monolog\Logger;
 use Piwik\Container\StaticContainer;
-use Piwik\Db;
+use Psr\Log\LoggerInterface;
 
 /**
  * Logging utility class.
@@ -19,9 +20,7 @@ use Piwik\Db;
  * the name of the current class is used.
  *
  * You can log messages using one of the public static functions (eg, 'error', 'warning',
- * 'info', etc.). Messages logged with the **error** level will **always** be logged to
- * the screen, regardless of whether the [log] log_writer config option includes the
- * screen writer.
+ * 'info', etc.).
  *
  * Currently, Piwik supports the following logging backends:
  *
@@ -29,6 +28,8 @@ use Piwik\Db;
  * - **file**: logging to a file
  * - **database**: logging to Piwik's MySQL database
  *
+ * Messages logged in the console will always be logged to the console output.
+ *
  * ### Logging configuration
  *
  * The logging utility can be configured by manipulating the INI config options in the
@@ -43,63 +44,14 @@ use Piwik\Db;
  *                or **VERBOSE**. Log entries made with a log level that is as or more
  *                severe than the current log level will be outputted. Others will be
  *                ignored. The default level is **WARN**.
- * - `log_only_when_cli`: 0 or 1. If 1, logging is only enabled when Piwik is executed
- *                        in the command line (for example, by the core:archive command
- *                        script). Default: 0.
- * - `log_only_when_debug_parameter`: 0 or 1. If 1, logging is only enabled when the
- *                                    `debug` query parameter is 1. Default: 0.
  * - `logger_file_path`: For the file log writer, specifies the path to the log file
  *                       to log to or a path to a directory to store logs in. If a
  *                       directory, the file name is piwik.log. Can be relative to
  *                       Piwik's root dir or an absolute path. Defaults to **tmp/logs**.
  *
- * ### Custom message formatting
- *
- * If you'd like to format log messages differently for different backends, you can use
- * one of the `'Log.format...Message'` events.
- *
- * These events are fired when an object is logged. You can create your own custom class
- * containing the information to log and listen to these events to format it correctly for
- * different backends.
- *
- * If you don't care about the backend when formatting an object, implement a `__toString()`
- * in the custom class.
- *
- * ### Custom log writers
- *
- * New logging backends can be added via the {@hook Log.getAvailableWriters}` event. A log
- * writer is just a callback that accepts log entry information (such as the message,
- * level, etc.), so any backend could conceivably be used (including existing PSR3
- * backends).
- *
- * ### Examples
- *
- * **Basic logging**
- *
- *     Log::error("This log message will end up on the screen and in a file.")
- *     Log::verbose("This log message uses %s params, but %s will only be called if the"
- *                . " configured log level includes %s.", "sprintf", "sprintf", "verbose");
  *
- * **Logging objects**
- *
- *     class MyDebugInfo
- *     {
- *         // ...
- *
- *         public function __toString()
- *         {
- *             return // ...
- *         }
- *     }
- *
- *     try {
- *         $myThirdPartyServiceClient->doSomething();
- *     } catch (Exception $unexpectedError) {
- *         $debugInfo = new MyDebugInfo($unexpectedError, $myThirdPartyServiceClient);
- *         Log::debug($debugInfo);
- *     }
- *
- * @method static \Piwik\Log getInstance()
+ * @deprecated Inject and use Psr\Log\LoggerInterface instead of this class.
+ * @see \Psr\Log\LoggerInterface
  */
 class Log extends Singleton
 {
@@ -117,78 +69,62 @@ class Log extends Singleton
     const LOGGER_FILE_PATH_CONFIG_OPTION = 'logger_file_path';
     const STRING_MESSAGE_FORMAT_OPTION = 'string_message_format';
 
-    const FORMAT_FILE_MESSAGE_EVENT = 'Log.formatFileMessage';
-
-    const FORMAT_SCREEN_MESSAGE_EVENT = 'Log.formatScreenMessage';
-
-    const FORMAT_DATABASE_MESSAGE_EVENT = 'Log.formatDatabaseMessage';
-
-    const GET_AVAILABLE_WRITERS_EVENT = 'Log.getAvailableWriters';
-
     /**
-     * The current logging level. Everything of equal or greater priority will be logged.
-     * Everything else will be ignored.
-     *
-     * @var int
-     */
-    private $currentLogLevel = self::WARN;
-
-    /**
-     * The array of callbacks executed when logging to a file. Each callback writes a log
-     * message to a logging backend.
-     *
-     * @var array
-     */
-    private $writers = array();
-
-    /**
-     * The log message format string that turns a tag name, date-time and message into
-     * one string to log.
+     * The backtrace string to use when testing.
      *
      * @var string
      */
-    private $logMessageFormat = "%level% %tag%[%datetime%] %message%";
+    public static $debugBacktraceForTests;
 
     /**
-     * If we're logging to a file, this is the path to the file to log to.
+     * Singleton instance.
      *
-     * @var string
+     * @var Log
      */
-    private $logToFilePath;
+    private static $instance;
 
     /**
-     * True if we're currently setup to log to a screen, false if otherwise.
-     *
-     * @var bool
+     * @var LoggerInterface
      */
-    private $loggingToScreen;
+    private $logger;
+
+    public static function getInstance()
+    {
+        if (self::$instance === null) {
+            self::$instance = StaticContainer::get(__CLASS__);
+        }
+        return self::$instance;
+    }
+    public static function unsetInstance()
+    {
+        self::$instance = null;
+    }
+    public static function setSingletonInstance($instance)
+    {
+        self::$instance = $instance;
+    }
 
     /**
-     * Constructor.
+     * @param LoggerInterface $logger
      */
-    protected function __construct()
+    public function __construct(LoggerInterface $logger)
     {
-        $logConfig = Config::getInstance()->log;
-        $this->setCurrentLogLevelFromConfig($logConfig);
-        $this->setLogWritersFromConfig($logConfig);
-        $this->setLogFilePathFromConfig($logConfig);
-        $this->setStringLogMessageFormat($logConfig);
-        $this->disableLoggingBasedOnConfig($logConfig);
+        $this->logger = $logger;
     }
 
     /**
      * Logs a message using the ERROR log level.
      *
-     * _Note: Messages logged with the ERROR level are always logged to the screen in addition
-     * to configured writers._
-     *
      * @param string $message The log message. This can be a sprintf format string.
      * @param ... mixed Optional sprintf params.
      * @api
+     *
+     * @deprecated Inject and call Psr\Log\LoggerInterface::error() instead.
+     * @see \Psr\Log\LoggerInterface::error()
      */
     public static function error($message /* ... */)
     {
-        self::logMessage(self::ERROR, $message, array_slice(func_get_args(), 1));
+        self::logMessage(Logger::ERROR, $message, array_slice(func_get_args(), 1));
     }
 
     /**
@@ -197,10 +133,13 @@ class Log extends Singleton
      * @param string $message The log message. This can be a sprintf format string.
      * @param ... mixed Optional sprintf params.
      * @api
+     *
+     * @deprecated Inject and call Psr\Log\LoggerInterface::warning() instead.
+     * @see \Psr\Log\LoggerInterface::warning()
      */
     public static function warning($message /* ... */)
     {
-        self::logMessage(self::WARN, $message, array_slice(func_get_args(), 1));
+        self::logMessage(Logger::WARNING, $message, array_slice(func_get_args(), 1));
     }
 
     /**
@@ -209,10 +148,13 @@ class Log extends Singleton
      * @param string $message The log message. This can be a sprintf format string.
      * @param ... mixed Optional sprintf params.
      * @api
+     *
+     * @deprecated Inject and call Psr\Log\LoggerInterface::info() instead.
+     * @see \Psr\Log\LoggerInterface::info()
      */
     public static function info($message /* ... */)
     {
-        self::logMessage(self::INFO, $message, array_slice(func_get_args(), 1));
+        self::logMessage(Logger::INFO, $message, array_slice(func_get_args(), 1));
     }
 
     /**
@@ -221,10 +163,13 @@ class Log extends Singleton
      * @param string $message The log message. This can be a sprintf format string.
      * @param ... mixed Optional sprintf params.
      * @api
+     *
+     * @deprecated Inject and call Psr\Log\LoggerInterface::debug() instead.
+     * @see \Psr\Log\LoggerInterface::debug()
      */
     public static function debug($message /* ... */)
     {
-        self::logMessage(self::DEBUG, $message, array_slice(func_get_args(), 1));
+        self::logMessage(Logger::DEBUG, $message, array_slice(func_get_args(), 1));
     }
 
     /**
@@ -233,481 +178,66 @@ class Log extends Singleton
      * @param string $message The log message. This can be a sprintf format string.
      * @param ... mixed Optional sprintf params.
      * @api
+     *
+     * @deprecated Inject and call Psr\Log\LoggerInterface::debug() instead (the verbose level doesn't exist in the PSR standard).
+     * @see \Psr\Log\LoggerInterface::debug()
      */
     public static function verbose($message /* ... */)
     {
-        self::logMessage(self::VERBOSE, $message, array_slice(func_get_args(), 1));
+        self::logMessage(Logger::DEBUG, $message, array_slice(func_get_args(), 1));
     }
 
     /**
-     * Creates log message combining logging info including a log level, tag name,
-     * date time, and caller-provided log message. The log message can be set through
-     * the `[log] string_message_format` INI config option. By default it will
-     * create log messages like:
-     *
-     * **LEVEL [tag:datetime] log message**
-     *
-     * @param int $level
-     * @param string $tag
-     * @param string $datetime
-     * @param string $message
-     * @return string
+     * @param int $logLevel
+     * @deprecated Will be removed, log levels are now applied on each Monolog handler.
      */
-    public function formatMessage($level, $tag, $datetime, $message)
-    {
-        return str_replace(
-            array("%tag%", "%message%", "%datetime%", "%level%"),
-            array($tag, trim($message), $datetime, $this->getStringLevel($level)),
-            $this->logMessageFormat
-        );
-    }
-
-    private function setLogWritersFromConfig($logConfig)
-    {
-        // set the log writers
-        $logWriters = @$logConfig[self::LOG_WRITERS_CONFIG_OPTION];
-        if (empty($logWriters)) {
-            return;
-        }
-
-        $logWriters = array_map('trim', $logWriters);
-        foreach ($logWriters as $writerName) {
-            $this->addLogWriter($writerName);
-        }
-    }
-
-    public function addLogWriter($writerName)
-    {
-        if (array_key_exists($writerName, $this->writers)) {
-            return;
-        }
-
-        $availableWritersByName = $this->getAvailableWriters();
-
-        if (empty($availableWritersByName[$writerName])) {
-            return;
-        }
-
-        $this->writers[$writerName] = $availableWritersByName[$writerName];
-    }
-
-    private function setCurrentLogLevelFromConfig($logConfig)
-    {
-        if (!empty($logConfig[self::LOG_LEVEL_CONFIG_OPTION])) {
-            $logLevel = $this->getLogLevelFromStringName($logConfig[self::LOG_LEVEL_CONFIG_OPTION]);
-
-            if ($logLevel >= self::NONE // sanity check
-                && $logLevel <= self::VERBOSE
-            ) {
-                $this->setLogLevel($logLevel);
-            }
-        }
-    }
-
-    private function setStringLogMessageFormat($logConfig)
-    {
-        if (isset($logConfig['string_message_format'])) {
-            $this->logMessageFormat = $logConfig['string_message_format'];
-        }
-    }
-
-    private function setLogFilePathFromConfig($logConfig)
-    {
-        $logPath = @$logConfig[self::LOGGER_FILE_PATH_CONFIG_OPTION];
-
-        // Absolute path
-        if (strpos($logPath, '/') === 0) {
-            $this->logToFilePath = $logPath;
-            return;
-        }
-
-        // Remove 'tmp/' at the beginning
-        if (strpos($logPath, 'tmp/') === 0) {
-            $logPath = substr($logPath, strlen('tmp'));
-        }
-
-        if (empty($logPath)) {
-            $logPath = $this->getDefaultFileLogPath();
-        }
-
-        $logPath = StaticContainer::getContainer()->get('path.tmp') . $logPath;
-        if (is_dir($logPath)) {
-            $logPath .= '/piwik.log';
-        }
-        $this->logToFilePath = $logPath;
-    }
-
-    private function getDefaultFileLogPath()
-    {
-        return '/logs/piwik.log';
-    }
-
-    private function getAvailableWriters()
-    {
-        $writers = array();
-
-        /**
-         * This event is called when the Log instance is created. Plugins can use this event to
-         * make new logging writers available.
-         *
-         * A logging writer is a callback with the following signature:
-         *
-         *     function (int $level, string $tag, string $datetime, string $message)
-         *
-         * `$level` is the log level to use, `$tag` is the log tag used, `$datetime` is the date time
-         * of the logging call and `$message` is the formatted log message.
-         *
-         * Logging writers must be associated by name in the array passed to event handlers. The
-         * name specified can be used in Piwik's INI configuration.
-         *
-         * **Example**
-         *
-         *     public function getAvailableWriters(&$writers) {
-         *         $writers['myloggername'] = function ($level, $tag, $datetime, $message) {
-         *             // ...
-         *         };
-         *     }
-         *
-         *     // 'myloggername' can now be used in the log_writers config option.
-         *
-         * @param array $writers Array mapping writer names with logging writers.
-         */
-        Piwik::postEvent(self::GET_AVAILABLE_WRITERS_EVENT, array(&$writers));
-
-        $writers['file'] = array($this, 'logToFile');
-        $writers['screen'] = array($this, 'logToScreen');
-        $writers['database'] = array($this, 'logToDatabase');
-        return $writers;
-    }
-
     public function setLogLevel($logLevel)
     {
-        $this->currentLogLevel = $logLevel;
     }
 
+    /**
+     * @deprecated Will be removed, log levels are now applied on each Monolog handler.
+     */
     public function getLogLevel()
     {
-        return $this->currentLogLevel;
     }
 
-    private function logToFile($level, $tag, $datetime, $message)
+    private function doLog($level, $message, $parameters = array())
     {
-        $message = $this->getMessageFormattedFile($level, $tag, $datetime, $message);
-        if (empty($message)) {
-            return;
-        }
-
-        if (!@file_put_contents($this->logToFilePath, $message, FILE_APPEND)
-            && !defined('PIWIK_TEST_MODE')
-        ) {
-            $message = Filechecks::getErrorMessageMissingPermissions($this->logToFilePath);
-            throw new \Exception($message);
+        // To ensure the compatibility with PSR-3, the message must be a string
+        if ($message instanceof \Exception) {
+            $parameters['exception'] = $message;
+            $message = $message->getMessage();
         }
-    }
-
-    private function logToScreen($level, $tag, $datetime, $message)
-    {
-        $message = $this->getMessageFormattedScreen($level, $tag, $datetime, $message);
-        if (empty($message)) {
-            return;
+        if (! is_string($message)) {
+            throw new \InvalidArgumentException('Trying to log a message that is not a string');
         }
 
-        echo $message;
+        $this->logger->log($level, $message, $parameters);
     }
 
-    private function logToDatabase($level, $tag, $datetime, $message)
+    private static function logMessage($level, $message, $parameters)
     {
-        $message = $this->getMessageFormattedDatabase($level, $tag, $datetime, $message);
-        if (empty($message)) {
-            return;
-        }
-
-        $sql = "INSERT INTO " . Common::prefixTable('logger_message')
-            . " (tag, timestamp, level, message)"
-            . " VALUES (?, ?, ?, ?)";
-        Db::query($sql, array($tag, $datetime, self::getStringLevel($level), (string)$message));
+        self::getInstance()->doLog($level, $message, $parameters);
     }
 
-    private function doLog($level, $message, $sprintfParams = array())
+    public static function getMonologLevel($level)
     {
-        if (!$this->shouldLoggerLog($level)) {
-            return;
-        }
-
-        $datetime = date("Y-m-d H:i:s");
-        if (is_string($message)
-            && !empty($sprintfParams)
-        ) {
-            // handle array sprintf parameters
-            foreach ($sprintfParams as &$param) {
-                if (is_array($param)) {
-                    $param = json_encode($param);
-                }
-            }
-
-            $message = vsprintf($message, $sprintfParams);
-        }
-
-        if (version_compare(phpversion(), '5.3.6', '>=')) {
-            $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS | DEBUG_BACKTRACE_PROVIDE_OBJECT);
-        } else {
-            $backtrace = debug_backtrace();
-        }
-        $tag = Plugin::getPluginNameFromBacktrace($backtrace);
-
-        // if we can't determine the plugin, use the name of the calling class
-        if ($tag == false) {
-            $tag = $this->getClassNameThatIsLogging($backtrace);
-        }
-
-        $this->writeMessage($level, $tag, $datetime, $message);
-    }
-
-    private function writeMessage($level, $tag, $datetime, $message)
-    {
-        foreach ($this->writers as $writer) {
-            call_user_func($writer, $level, $tag, $datetime, $message);
-        }
-
-        if ($level == self::ERROR) {
-            $message = $this->getMessageFormattedScreen($level, $tag, $datetime, $message);
-            $this->writeErrorToStandardErrorOutput($message);
-            if (!isset($this->writers['screen'])) {
-                echo $message;
-            }
-        }
-    }
-
-    private static function logMessage($level, $message, $sprintfParams)
-    {
-        self::getInstance()->doLog($level, $message, $sprintfParams);
-    }
-
-    private function shouldLoggerLog($level)
-    {
-        return $level <= $this->currentLogLevel;
-    }
-
-    private function disableLoggingBasedOnConfig($logConfig)
-    {
-        $disableLogging = false;
-
-        if (!empty($logConfig['log_only_when_cli'])
-            && !Common::isPhpCliMode()
-        ) {
-            $disableLogging = true;
-        }
-
-        if (!empty($logConfig['log_only_when_debug_parameter'])
-            && !isset($_REQUEST['debug'])
-        ) {
-            $disableLogging = true;
-        }
-
-        if ($disableLogging) {
-            $this->currentLogLevel = self::NONE;
-        }
-    }
-
-    private function getLogLevelFromStringName($name)
-    {
-        $name = strtoupper($name);
-        switch ($name) {
-            case 'NONE':
-                return self::NONE;
-            case 'ERROR':
-                return self::ERROR;
-            case 'WARN':
-                return self::WARN;
-            case 'INFO':
-                return self::INFO;
-            case 'DEBUG':
-                return self::DEBUG;
-            case 'VERBOSE':
-                return self::VERBOSE;
+        switch ($level) {
+            case self::ERROR:
+                return Logger::ERROR;
+            case self::WARN:
+                return Logger::WARNING;
+            case self::INFO:
+                return Logger::INFO;
+            case self::DEBUG:
+                return Logger::DEBUG;
+            case self::VERBOSE:
+                return Logger::DEBUG;
+            case self::NONE:
             default:
-                return -1;
-        }
-    }
-
-    private function getStringLevel($level)
-    {
-        static $levelToName = array(
-            self::NONE    => 'NONE',
-            self::ERROR   => 'ERROR',
-            self::WARN    => 'WARN',
-            self::INFO    => 'INFO',
-            self::DEBUG   => 'DEBUG',
-            self::VERBOSE => 'VERBOSE'
-        );
-        return $levelToName[$level];
-    }
-
-    private function getClassNameThatIsLogging($backtrace)
-    {
-        foreach ($backtrace as $tracepoint) {
-            if (isset($tracepoint['class'])
-                && $tracepoint['class'] != "Piwik\\Log"
-                && $tracepoint['class'] != "Piwik\\Piwik"
-                && $tracepoint['class'] != "Piwik\\CronArchive"
-            ) {
-                return $tracepoint['class'];
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @param $level
-     * @param $tag
-     * @param $datetime
-     * @param $message
-     * @return string
-     */
-    private function getMessageFormattedScreen($level, $tag, $datetime, $message)
-    {
-        static $currentRequestKey;
-        if (empty($currentRequestKey)) {
-            $currentRequestKey = substr(Common::generateUniqId(), 0, 5);
-        }
-
-        if (is_string($message)) {
-            if (!defined('PIWIK_TEST_MODE')) {
-                $message = '[' . $currentRequestKey . '] ' . $message;
-            }
-            $message = $this->formatMessage($level, $tag, $datetime, $message);
-
-            if (!Common::isPhpCliMode()) {
-                $message = Common::sanitizeInputValue($message);
-                $message = '<pre>' . $message . '</pre>';
-            }
-        } else {
-            $logger = $this;
-
-            /**
-             * Triggered when trying to log an object to the screen. Plugins can use
-             * this event to convert objects to strings before they are logged.
-             *
-             * The result of this callback can be HTML so no sanitization is done on the result.
-             * This means **YOU MUST SANITIZE THE MESSAGE YOURSELF** if you use this event.
-             *
-             * **Example**
-             *
-             *     public function formatScreenMessage(&$message, $level, $tag, $datetime, $logger) {
-             *         if ($message instanceof MyCustomDebugInfo) {
-             *             $message = Common::sanitizeInputValue($message->formatForScreen());
-             *         }
-             *     }
-             *
-             * @param mixed &$message The object that is being logged. Event handlers should
-             *                        check if the object is of a certain type and if it is,
-             *                        set `$message` to the string that should be logged.
-             * @param int $level The log level used with this log entry.
-             * @param string $tag The current plugin that started logging (or if no plugin,
-             *                    the current class).
-             * @param string $datetime Datetime of the logging call.
-             * @param Log $logger The Log singleton.
-             */
-            Piwik::postEvent(self::FORMAT_SCREEN_MESSAGE_EVENT, array(&$message, $level, $tag, $datetime, $logger));
+                // Highest level possible, need to do better in the future...
+                return Logger::EMERGENCY;
         }
-        $message = trim($message);
-        return $message . "\n";
-    }
-
-    /**
-     * @param $message
-     */
-    private function writeErrorToStandardErrorOutput($message)
-    {
-        if (defined('PIWIK_TEST_MODE')) {
-            // do not log on stderr during tests (prevent display of errors in CI output)
-            return;
-        }
-        $fe = fopen('php://stderr', 'w');
-        fwrite($fe, $message);
-    }
-
-    /**
-     * @param $level
-     * @param $tag
-     * @param $datetime
-     * @param $message
-     * @return string
-     */
-    private function getMessageFormattedDatabase($level, $tag, $datetime, $message)
-    {
-        if (is_string($message)) {
-            $message = $this->formatMessage($level, $tag, $datetime, $message);
-        } else {
-            $logger = $this;
-
-            /**
-             * Triggered when trying to log an object to a database table. Plugins can use
-             * this event to convert objects to strings before they are logged.
-             *
-             * **Example**
-             *
-             *     public function formatDatabaseMessage(&$message, $level, $tag, $datetime, $logger) {
-             *         if ($message instanceof MyCustomDebugInfo) {
-             *             $message = $message->formatForDatabase();
-             *         }
-             *     }
-             *
-             * @param mixed &$message The object that is being logged. Event handlers should
-             *                        check if the object is of a certain type and if it is,
-             *                        set `$message` to the string that should be logged.
-             * @param int $level The log level used with this log entry.
-             * @param string $tag The current plugin that started logging (or if no plugin,
-             *                    the current class).
-             * @param string $datetime Datetime of the logging call.
-             * @param Log $logger The Log singleton.
-             */
-            Piwik::postEvent(self::FORMAT_DATABASE_MESSAGE_EVENT, array(&$message, $level, $tag, $datetime, $logger));
-        }
-        $message = trim($message);
-        return $message;
-    }
-
-    /**
-     * @param $level
-     * @param $tag
-     * @param $datetime
-     * @param $message
-     * @return string
-     */
-    private function getMessageFormattedFile($level, $tag, $datetime, $message)
-    {
-        if (is_string($message)) {
-            $message = $this->formatMessage($level, $tag, $datetime, $message);
-        } else {
-            $logger = $this;
-
-            /**
-             * Triggered when trying to log an object to a file. Plugins can use
-             * this event to convert objects to strings before they are logged.
-             *
-             * **Example**
-             *
-             *     public function formatFileMessage(&$message, $level, $tag, $datetime, $logger) {
-             *         if ($message instanceof MyCustomDebugInfo) {
-             *             $message = $message->formatForFile();
-             *         }
-             *     }
-             *
-             * @param mixed &$message The object that is being logged. Event handlers should
-             *                        check if the object is of a certain type and if it is,
-             *                        set `$message` to the string that should be logged.
-             * @param int $level The log level used with this log entry.
-             * @param string $tag The current plugin that started logging (or if no plugin,
-             *                    the current class).
-             * @param string $datetime Datetime of the logging call.
-             * @param Log $logger The Log singleton.
-             */
-            Piwik::postEvent(self::FORMAT_FILE_MESSAGE_EVENT, array(&$message, $level, $tag, $datetime, $logger));
-        }
-
-        $message = trim($message);
-        $message = str_replace("\n", "\n  ", $message);
-        return $message . "\n";
     }
 }
diff --git a/core/Mail.php b/core/Mail.php
index 1e9ef0bb52..9825eb3378 100644
--- a/core/Mail.php
+++ b/core/Mail.php
@@ -8,7 +8,9 @@
  */
 namespace Piwik;
 
+use Piwik\Container\StaticContainer;
 use Piwik\Plugins\CoreAdminHome\CustomLogo;
+use Piwik\Translation\Translator;
 use Zend_Mail;
 
 /**
@@ -35,10 +37,13 @@ class Mail extends Zend_Mail
     {
         $customLogo = new CustomLogo();
 
+        /** @var Translator $translator */
+        $translator = StaticContainer::get('Piwik\Translation\Translator');
+
         if ($customLogo->isEnabled()) {
-            $fromEmailName = Piwik::translate('CoreHome_WebAnalyticsReports');
+            $fromEmailName = $translator->translate('CoreHome_WebAnalyticsReports');
         } else {
-            $fromEmailName = Piwik::translate('ScheduledReports_PiwikReports');
+            $fromEmailName = $translator->translate('ScheduledReports_PiwikReports');
         }
 
         $fromEmailAddress = Config::getInstance()->General['noreply_email_address'];
@@ -105,7 +110,8 @@ class Mail extends Zend_Mail
             $smtpConfig['ssl'] = $mailConfig['encryption'];
         }
 
-        $tr = new \Zend_Mail_Transport_Smtp($mailConfig['host'], $smtpConfig);
+        $host = trim($mailConfig['host']);
+        $tr = new \Zend_Mail_Transport_Smtp($host, $smtpConfig);
         Mail::setDefaultTransport($tr);
         @ini_set("smtp_port", $mailConfig['port']);
     }
diff --git a/core/Menu/MenuAdmin.php b/core/Menu/MenuAdmin.php
index 13e8480596..5335091285 100644
--- a/core/Menu/MenuAdmin.php
+++ b/core/Menu/MenuAdmin.php
@@ -117,7 +117,7 @@ class MenuAdmin extends MenuAbstract
      */
     public function addManageItem($menuName, $url, $order = 50, $tooltip = false)
     {
-        $this->addItem('CoreAdminHome_MenuManage', $menuName, $url, $order, $tooltip);
+        $this->addItem('CoreAdminHome_Administration', $menuName, $url, $order, $tooltip);
     }
 
     /**
@@ -144,29 +144,6 @@ class MenuAdmin extends MenuAbstract
     }
 
     /**
-     * Returns the current AdminMenu name
-     *
-     * @return boolean
-     */
-    public function getCurrentAdminMenuName()
-    {
-        $menu = MenuAdmin::getInstance()->getMenu();
-        $currentModule = Piwik::getModule();
-        $currentAction = Piwik::getAction();
-        foreach ($menu as $submenu) {
-            foreach ($submenu as $subMenuName => $parameters) {
-                if (strpos($subMenuName, '_') !== 0 &&
-                    $parameters['_url']['module'] == $currentModule
-                    && $parameters['_url']['action'] == $currentAction
-                ) {
-                    return $subMenuName;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
      * @deprecated since version 2.4.0. See {@link Piwik\Plugin\Menu} for new implementation.
      */
     public static function removeEntry($menuName, $subMenuName = false)
diff --git a/core/Menu/MenuUser.php b/core/Menu/MenuUser.php
index 758ac3d578..ac3bc295ab 100755
--- a/core/Menu/MenuUser.php
+++ b/core/Menu/MenuUser.php
@@ -40,6 +40,20 @@ class MenuUser extends MenuAbstract
      * @api
      * @since 2.5.0
      */
+    public function addPersonalItem($menuName, $url, $order = 50, $tooltip = false)
+    {
+        $this->addItem('UsersManager_MenuPersonal', $menuName, $url, $order, $tooltip);
+    }
+
+    /**
+     * See {@link add()}. Adds a new menu item to the manage section of the user menu.
+     * @param string $menuName
+     * @param array $url
+     * @param int $order
+     * @param bool|string $tooltip
+     * @api
+     * @since 2.5.0
+     */
     public function addManageItem($menuName, $url, $order = 50, $tooltip = false)
     {
         $this->addItem('CoreAdminHome_MenuManage', $menuName, $url, $order, $tooltip);
diff --git a/core/Metrics.php b/core/Metrics.php
index 009fa36151..4b48bf13f2 100644
--- a/core/Metrics.php
+++ b/core/Metrics.php
@@ -8,8 +8,7 @@
  */
 namespace Piwik;
 
-use Piwik\Cache\LanguageAwareStaticCache;
-use Piwik\Cache\PluginAwareStaticCache;
+use Piwik\Cache as PiwikCache;
 use Piwik\Metrics\Formatter;
 
 require_once PIWIK_INCLUDE_PATH . "/core/Piwik.php";
@@ -87,6 +86,9 @@ class Metrics
     const INDEX_CONTENT_NB_IMPRESSIONS = 41;
     const INDEX_CONTENT_NB_INTERACTIONS = 42;
 
+    // Unique visitors fingerprints (useful to process unique visitors across websites)
+    const INDEX_NB_UNIQ_FINGERPRINTS = 43;
+
     // Goal reports
     const INDEX_GOAL_NB_CONVERSIONS = 1;
     const INDEX_GOAL_REVENUE = 2;
@@ -99,6 +101,7 @@ class Metrics
 
     public static $mappingFromIdToName = array(
         Metrics::INDEX_NB_UNIQ_VISITORS                      => 'nb_uniq_visitors',
+        Metrics::INDEX_NB_UNIQ_FINGERPRINTS                  => 'nb_uniq_fingerprints',
         Metrics::INDEX_NB_VISITS                             => 'nb_visits',
         Metrics::INDEX_NB_ACTIONS                            => 'nb_actions',
         Metrics::INDEX_NB_USERS                              => 'nb_users',
@@ -250,10 +253,11 @@ class Metrics
 
     public static function getDefaultMetricTranslations()
     {
-        $cache = new PluginAwareStaticCache('DefaultMetricTranslations');
+        $cacheId = CacheId::pluginAware('DefaultMetricTranslations');
+        $cache   = PiwikCache::getTransientCache();
 
-        if ($cache->has()) {
-            return $cache->get();
+        if ($cache->contains($cacheId)) {
+            return $cache->fetch($cacheId);
         }
 
         $translations = array(
@@ -302,17 +306,18 @@ class Metrics
 
         $translations = array_map(array('\\Piwik\\Piwik','translate'), $translations);
 
-        $cache->set($translations);
+        $cache->save($cacheId, $translations);
 
         return $translations;
     }
 
     public static function getDefaultMetrics()
     {
-        $cache = new LanguageAwareStaticCache('DefaultMetrics');
+        $cacheId = CacheId::languageAware('DefaultMetrics');
+        $cache   = PiwikCache::getTransientCache();
 
-        if ($cache->has()) {
-            return $cache->get();
+        if ($cache->contains($cacheId)) {
+            return $cache->fetch($cacheId);
         }
 
         $translations = array(
@@ -323,17 +328,18 @@ class Metrics
         );
         $translations = array_map(array('\\Piwik\\Piwik','translate'), $translations);
 
-        $cache->set($translations);
+        $cache->save($cacheId, $translations);
 
         return $translations;
     }
 
     public static function getDefaultProcessedMetrics()
     {
-        $cache = new LanguageAwareStaticCache('DefaultProcessedMetrics');
+        $cacheId = CacheId::languageAware('DefaultProcessedMetrics');
+        $cache   = PiwikCache::getTransientCache();
 
-        if ($cache->has()) {
-            return $cache->get();
+        if ($cache->contains($cacheId)) {
+            return $cache->fetch($cacheId);
         }
 
         $translations = array(
@@ -345,7 +351,7 @@ class Metrics
         );
         $translations = array_map(array('\\Piwik\\Piwik','translate'), $translations);
 
-        $cache->set($translations);
+        $cache->save($cacheId, $translations);
 
         return $translations;
     }
@@ -383,10 +389,11 @@ class Metrics
 
     public static function getDefaultMetricsDocumentation()
     {
-        $cache = new PluginAwareStaticCache('DefaultMetricsDocumentation');
+        $cacheId = CacheId::pluginAware('DefaultMetricsDocumentation');
+        $cache   = PiwikCache::getTransientCache();
 
-        if ($cache->has()) {
-            return $cache->get();
+        if ($cache->contains($cacheId)) {
+            return $cache->fetch($cacheId);
         }
 
         $translations = array(
@@ -412,7 +419,7 @@ class Metrics
 
         $translations = array_map(array('\\Piwik\\Piwik','translate'), $translations);
 
-        $cache->set($translations);
+        $cache->save($cacheId, $translations);
 
         return $translations;
     }
diff --git a/core/Metrics/Formatter.php b/core/Metrics/Formatter.php
index 0e5bbe719e..bce37e3be4 100644
--- a/core/Metrics/Formatter.php
+++ b/core/Metrics/Formatter.php
@@ -8,7 +8,9 @@
 namespace Piwik\Metrics;
 
 use Piwik\Common;
+use Piwik\Container\StaticContainer;
 use Piwik\DataTable;
+use Piwik\Intl\Data\Provider\CurrencyDataProvider;
 use Piwik\Piwik;
 use Piwik\Plugin\Metric;
 use Piwik\Plugin\ProcessedMetric;
@@ -19,8 +21,6 @@ use Piwik\Tracker\GoalManager;
 /**
  * Contains methods to format metric values. Passed to the {@link \Piwik\Plugin\Metric::format()}
  * method when formatting Metrics.
- *
- * @api
  */
 class Formatter
 {
@@ -36,6 +36,7 @@ class Formatter
      *
      * @param number $value
      * @return string
+     * @api
      */
     public function getPrettyNumber($value, $precision = 0)
     {
@@ -56,6 +57,7 @@ class Formatter
      * @param bool $displayTimeAsSentence If set to true, will output `"5min 17s"`, if false `"00:05:17"`.
      * @param bool $round Whether to round to the nearest second or not.
      * @return string
+     * @api
      */
     public function getPrettyTimeFromSeconds($numberOfSeconds, $displayTimeAsSentence = false, $round = false)
     {
@@ -124,6 +126,7 @@ class Formatter
      * @param string $unit The specific unit to use, if any. If null, the unit is determined by $size.
      * @param int $precision The precision to use when rounding.
      * @return string eg, `'128 M'` or `'256 K'`.
+     * @api
      */
     public function getPrettySizeFromBytes($size, $unit = null, $precision = 1)
     {
@@ -131,18 +134,8 @@ class Formatter
             return '0 M';
         }
 
-        $units = array('B', 'K', 'M', 'G', 'T');
-
-        $currentUnit = null;
-        foreach ($units as $idx => $currentUnit) {
-            if ($size >= 1024 && $unit != $currentUnit && $idx != count($units) - 1) {
-                $size = $size / 1024;
-            } else {
-                break;
-            }
-        }
-
-        return round($size, $precision) . " " . $currentUnit;
+        list($size, $sizeUnit) = $this->getPrettySizeFromBytesWithUnit($size, $unit, $precision);
+        return $size . " " . $sizeUnit;
     }
 
     /**
@@ -151,6 +144,7 @@ class Formatter
      * @param int|string $value The monetary value to format.
      * @param int $idSite The ID of the site whose currency will be used.
      * @return string
+     * @api
      */
     public function getPrettyMoney($value, $idSite)
     {
@@ -192,6 +186,7 @@ class Formatter
      *
      * @param float $value
      * @return string
+     * @api
      */
     public function getPrettyPercentFromQuotient($value)
     {
@@ -204,6 +199,7 @@ class Formatter
      *
      * @param int $idSite The ID of the site to return the currency symbol for.
      * @return string eg, `'$'`.
+     * @api
      */
     public static function getCurrencySymbol($idSite)
     {
@@ -222,17 +218,16 @@ class Formatter
      *
      * @return array An array mapping currency codes to their respective currency symbols
      *               and a description, eg, `array('USD' => array('$', 'US dollar'))`.
+     *
+     * @deprecated Use Piwik\Intl\Data\Provider\CurrencyDataProvider instead.
+     * @see \Piwik\Intl\Data\Provider\CurrencyDataProvider::getCurrencyList()
+     * @api
      */
     public static function getCurrencyList()
     {
-        static $currenciesList = null;
-
-        if (is_null($currenciesList)) {
-            require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/Currencies.php';
-            $currenciesList = $GLOBALS['Piwik_CurrencyList'];
-        }
-
-        return $currenciesList;
+        /** @var CurrencyDataProvider $dataProvider */
+        $dataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\CurrencyDataProvider');
+        return $dataProvider->getCurrencyList();
     }
 
     /**
@@ -242,6 +237,7 @@ class Formatter
      * @param DataTable $dataTable The table to format metrics for.
      * @param Report|null $report The report the table belongs to.
      * @param string[]|null $metricsToFormat Whitelist of names of metrics to format.
+     * @api
      */
     public function formatMetrics(DataTable $dataTable, Report $report = null, $metricsToFormat = null)
     {
@@ -280,6 +276,29 @@ class Formatter
         }
     }
 
+    protected function getPrettySizeFromBytesWithUnit($size, $unit = null, $precision = 1)
+    {
+        $units = array('B', 'K', 'M', 'G', 'T');
+        $numUnits = count($units) - 1;
+
+        $currentUnit = null;
+        foreach ($units as $idx => $currentUnit) {
+            if ($unit && $unit !== $currentUnit) {
+                $size = $size / 1024;
+            } elseif ($unit && $unit === $currentUnit) {
+                break;
+            } elseif ($size >= 1024 && $idx != $numUnits) {
+                $size = $size / 1024;
+            } else {
+                break;
+            }
+        }
+
+        $size = round($size, $precision);
+
+        return array($size, $currentUnit);
+    }
+
     private function makeRegexToMatchMetrics($metricsToFormat)
     {
         $metricsRegexParts = array();
diff --git a/core/Notification/Manager.php b/core/Notification/Manager.php
index 921dc3fb82..402f1aeaf0 100644
--- a/core/Notification/Manager.php
+++ b/core/Notification/Manager.php
@@ -9,6 +9,7 @@
 namespace Piwik\Notification;
 
 use Piwik\Notification;
+use Piwik\Session;
 use Piwik\Session\SessionNamespace;
 
 /**
@@ -103,12 +104,20 @@ class Manager
 
     private static function addNotification($id, Notification $notification)
     {
+        if (!self::isEnabled()) {
+            return;
+        }
+
         $session = static::getSession();
         $session->notifications[$id] = $notification;
     }
 
     private static function getAllNotifications()
     {
+        if (!self::isEnabled()) {
+            return array();
+        }
+
         $session = static::getSession();
 
         return $session->notifications;
@@ -116,12 +125,21 @@ class Manager
 
     private static function removeNotification($id)
     {
+        if (!self::isEnabled()) {
+            return;
+        }
+
         $session = static::getSession();
         if (array_key_exists($id, $session->notifications)) {
             unset($session->notifications[$id]);
         }
     }
 
+    private static function isEnabled()
+    {
+        return Session::isWritable() && Session::isReadable();
+    }
+
     /**
      * @return SessionNamespace
      */
@@ -131,7 +149,7 @@ class Manager
             static::$session = new SessionNamespace('notification');
         }
 
-        if (empty(static::$session->notifications)) {
+        if (empty(static::$session->notifications) && self::isEnabled()) {
             static::$session->notifications = array();
         }
 
diff --git a/core/Period.php b/core/Period.php
index eb3c0fda89..d4044ed68e 100644
--- a/core/Period.php
+++ b/core/Period.php
@@ -8,8 +8,10 @@
  */
 namespace Piwik;
 
+use Piwik\Container\StaticContainer;
 use Piwik\Period\Factory as PeriodFactory;
 use Piwik\Period\Range;
+use Piwik\Translation\Translator;
 
 /**
  * Date range representation.
@@ -30,7 +32,7 @@ abstract class Period
 {
     /**
      * Array of subperiods
-     * @var \Piwik\Period[]
+     * @var Period[]
      */
     protected $subperiods = array();
     protected $subperiodsProcessed = false;
@@ -46,6 +48,11 @@ abstract class Period
     protected $date = null;
 
     /**
+     * @var Translator
+     */
+    protected $translator;
+
+    /**
      * Constructor.
      *
      * @param Date $date
@@ -54,6 +61,8 @@ abstract class Period
     public function __construct(Date $date)
     {
         $this->date = clone $date;
+
+        $this->translator = StaticContainer::get('Piwik\Translation\Translator');
     }
 
     /**
diff --git a/core/Period/Day.php b/core/Period/Day.php
index b8212844cd..551e5e65aa 100644
--- a/core/Period/Day.php
+++ b/core/Period/Day.php
@@ -38,7 +38,7 @@ class Day extends Period
     {
         //"Mon 15 Aug"
         $date     = $this->getDateStart();
-        $template = Piwik::translate('CoreHome_ShortDateFormat');
+        $template = $this->translator->translate('CoreHome_ShortDateFormat');
 
         $out = $date->getLocalized($template);
         return $out;
@@ -53,7 +53,7 @@ class Day extends Period
     {
         //"Mon 15 Aug"
         $date     = $this->getDateStart();
-        $template = Piwik::translate('CoreHome_DateFormat');
+        $template = $this->translator->translate('CoreHome_DateFormat');
 
         $out = $date->getLocalized($template);
         return $out;
diff --git a/core/Period/Month.php b/core/Period/Month.php
index 4609180980..252d394db2 100644
--- a/core/Period/Month.php
+++ b/core/Period/Month.php
@@ -25,7 +25,7 @@ class Month extends Period
     public function getLocalizedShortString()
     {
         //"Aug 09"
-        $out = $this->getDateStart()->getLocalized(Piwik::translate('CoreHome_ShortMonthFormat'));
+        $out = $this->getDateStart()->getLocalized($this->translator->translate('CoreHome_ShortMonthFormat'));
         return $out;
     }
 
@@ -37,7 +37,7 @@ class Month extends Period
     public function getLocalizedLongString()
     {
         //"August 2009"
-        $out = $this->getDateStart()->getLocalized(Piwik::translate('CoreHome_LongMonthFormat'));
+        $out = $this->getDateStart()->getLocalized($this->translator->translate('CoreHome_LongMonthFormat'));
         return $out;
     }
 
diff --git a/core/Period/Range.php b/core/Period/Range.php
index 36692dc0de..77d7afdcbd 100644
--- a/core/Period/Range.php
+++ b/core/Period/Range.php
@@ -9,7 +9,9 @@
 namespace Piwik\Period;
 
 use Exception;
+use Piwik\Cache;
 use Piwik\Common;
+use Piwik\Container\StaticContainer;
 use Piwik\Date;
 use Piwik\Period;
 use Piwik\Piwik;
@@ -33,6 +35,11 @@ class Range extends Period
     protected $today;
 
     /**
+     * @var null|Date
+     */
+    protected $defaultEndDate;
+
+    /**
      * Constructor.
      *
      * @param string $strPeriod The type of period each subperiod is. Either `'day'`, `'week'`,
@@ -54,6 +61,43 @@ class Range extends Period
         }
 
         $this->today = $today;
+
+        $this->translator = StaticContainer::get('Piwik\Translation\Translator');
+    }
+
+    private function getCache()
+    {
+        return Cache::getTransientCache();
+    }
+
+    private function getCacheId()
+    {
+        $end = '';
+        if ($this->defaultEndDate) {
+            $end = $this->defaultEndDate->getTimestamp();
+        }
+
+        $today = $this->today->getTimestamp();
+
+        return 'range' . $this->strPeriod . $this->strDate . $this->timezone . $end . $today;
+    }
+
+    private function loadAllFromCache()
+    {
+        $range = $this->getCache()->fetch($this->getCacheId());
+
+        if (!empty($range)) {
+            foreach ($range as $key => $val) {
+                $this->$key = $val;
+            }
+        }
+    }
+
+    private function cacheAll()
+    {
+        $props = get_object_vars($this);
+
+        $this->getCache()->save($this->getCacheId(), $props);
     }
 
     /**
@@ -66,7 +110,7 @@ class Range extends Period
         //"30 Dec 08 - 26 Feb 09"
         $dateStart = $this->getDateStart();
         $dateEnd   = $this->getDateEnd();
-        $template  = Piwik::translate('CoreHome_ShortDateFormatWithYear');
+        $template  = $this->translator->translate('CoreHome_ShortDateFormatWithYear');
 
         $shortDateStart = $dateStart->getLocalized($template);
         $shortDateEnd   = $dateEnd->getLocalized($template);
@@ -109,7 +153,7 @@ class Range extends Period
      */
     public function getPrettyString()
     {
-        $out = Piwik::translate('General_DateRangeFromTo', array($this->getDateStart()->toString(), $this->getDateEnd()->toString()));
+        $out = $this->translator->translate('General_DateRangeFromTo', array($this->getDateStart()->toString(), $this->getDateEnd()->toString()));
         return $out;
     }
 
@@ -156,6 +200,12 @@ class Range extends Period
             return;
         }
 
+        $this->loadAllFromCache();
+
+        if ($this->subperiodsProcessed) {
+            return;
+        }
+
         parent::generate();
 
         if (preg_match('/(last|previous)([0-9]*)/', $this->strDate, $regs)) {
@@ -186,7 +236,9 @@ class Range extends Period
 
             // last1 means only one result ; last2 means 2 results so we remove only 1 to the days/weeks/etc
             $lastN--;
-            $lastN = abs($lastN);
+            if ($lastN < 0) {
+                $lastN = 0;
+            }
 
             $startDate = $endDate->addPeriod(-1 * $lastN, $period);
 
@@ -195,11 +247,6 @@ class Range extends Period
             $strDateEnd = $dateRange[2];
             $startDate = Date::factory($strDateStart);
 
-            if ($strDateEnd == 'today') {
-                $strDateEnd = 'now';
-            } elseif ($strDateEnd == 'yesterday') {
-                $strDateEnd = 'yesterdaySameTime';
-            }
             // we set the timezone in the Date object only if the date is relative eg. 'today', 'yesterday', 'now'
             $timezone = null;
             if (strpos($strDateEnd, '-') === false) {
@@ -207,11 +254,12 @@ class Range extends Period
             }
             $endDate = Date::factory($strDateEnd, $timezone);
         } else {
-            throw new Exception(Piwik::translate('General_ExceptionInvalidDateRange', array($this->strDate, ' \'lastN\', \'previousN\', \'YYYY-MM-DD,YYYY-MM-DD\'')));
+            throw new Exception($this->translator->translate('General_ExceptionInvalidDateRange', array($this->strDate, ' \'lastN\', \'previousN\', \'YYYY-MM-DD,YYYY-MM-DD\'')));
         }
 
         if ($this->strPeriod != 'range') {
             $this->fillArraySubPeriods($startDate, $endDate, $this->strPeriod);
+            $this->cacheAll();
             return;
         }
 
@@ -219,6 +267,7 @@ class Range extends Period
         // When period=range, we want End Date to be the actual specified end date,
         // rather than the end of the month / week / whatever is used for processing this range
         $this->endDate = $endDate;
+        $this->cacheAll();
     }
 
     /**
@@ -460,4 +509,17 @@ class Range extends Period
 
         return $isEndOfWeekLaterThanEndDate;
     }
+
+    /**
+     * Returns the date range string comprising two dates
+     *
+     * @return string eg, `'2012-01-01,2012-01-31'`.
+     */
+    public function getRangeString()
+    {
+        $dateStart = $this->getDateStart();
+        $dateEnd   = $this->getDateEnd();
+
+        return $dateStart->toString("Y-m-d") . "," . $dateEnd->toString("Y-m-d");
+    }
 }
diff --git a/core/Period/Week.php b/core/Period/Week.php
index 23f7ab32b6..a8af2fbed8 100644
--- a/core/Period/Week.php
+++ b/core/Period/Week.php
@@ -28,7 +28,7 @@ class Week extends Period
         $dateStart = $this->getDateStart();
         $dateEnd   = $this->getDateEnd();
 
-        $string = Piwik::translate('CoreHome_ShortWeekFormat');
+        $string = $this->translator->translate('CoreHome_ShortWeekFormat');
         $string = self::getTranslatedRange($string, $dateStart, $dateEnd);
         return $string;
     }
@@ -40,10 +40,10 @@ class Week extends Period
      */
     public function getLocalizedLongString()
     {
-        $format = Piwik::translate('CoreHome_LongWeekFormat');
+        $format = $this->translator->translate('CoreHome_LongWeekFormat');
         $string = self::getTranslatedRange($format, $this->getDateStart(), $this->getDateEnd());
 
-        return Piwik::translate('CoreHome_PeriodWeek') . " " . $string;
+        return $this->translator->translate('CoreHome_PeriodWeek') . " " . $string;
     }
 
     /**
@@ -73,7 +73,7 @@ class Week extends Period
         $dateStart = $this->getDateStart();
         $dateEnd   = $this->getDateEnd();
 
-        $out = Piwik::translate('General_DateRangeFromTo', array($dateStart->toString(), $dateEnd->toString()));
+        $out = $this->translator->translate('General_DateRangeFromTo', array($dateStart->toString(), $dateEnd->toString()));
 
         return $out;
     }
diff --git a/core/Piwik.php b/core/Piwik.php
index bc5244dd52..c846acec82 100644
--- a/core/Piwik.php
+++ b/core/Piwik.php
@@ -9,6 +9,7 @@
 namespace Piwik;
 
 use Exception;
+use Piwik\Container\StaticContainer;
 use Piwik\Db\Adapter;
 use Piwik\Db\Schema;
 use Piwik\Db;
@@ -16,6 +17,7 @@ use Piwik\Plugin;
 use Piwik\Plugins\UsersManager\API as APIUsersManager;
 use Piwik\Session;
 use Piwik\Tracker;
+use Piwik\Translation\Translator;
 use Piwik\View;
 
 /**
@@ -299,8 +301,10 @@ class Piwik
     public static function hasUserSuperUserAccess()
     {
         try {
-            self::checkUserHasSuperUserAccess();
-            return true;
+            $hasAccess = Access::getInstance()->hasSuperUserAccess();
+
+            return $hasAccess;
+
         } catch (Exception $e) {
             return false;
         }
@@ -485,7 +489,7 @@ class Piwik
      */
     public static function getLoginPluginName()
     {
-        return Registry::get('auth')->getName();
+        return StaticContainer::get('Piwik\Auth')->getName();
     }
 
     /**
@@ -499,7 +503,7 @@ class Piwik
     }
 
     /**
-     * Returns the current module read from the URL (eg. 'API', 'UserSettings', etc.)
+     * Returns the current module read from the URL (eg. 'API', 'DevicesDetection', etc.)
      *
      * @return string
      */
@@ -589,7 +593,7 @@ class Piwik
         ) {
             return;
         }
-        $loginMinimumLength = 3;
+        $loginMinimumLength = 2;
         $loginMaximumLength = 100;
         $l = strlen($userLogin);
         if (!($l >= $loginMinimumLength
@@ -731,25 +735,16 @@ class Piwik
      * @param string $translationId Translation ID, eg, `'General_Date'`.
      * @param array|string|int $args `sprintf` arguments to be applied to the internationalized
      *                               string.
+     * @param string|null $language Optionally force the language.
      * @return string The translated string or `$translationId`.
      * @api
      */
-    public static function translate($translationId, $args = array())
+    public static function translate($translationId, $args = array(), $language = null)
     {
-        if (!is_array($args)) {
-            $args = array($args);
-        }
+        /** @var Translator $translator */
+        $translator = StaticContainer::get('Piwik\Translation\Translator');
 
-        if (strpos($translationId, "_") !== false) {
-            list($plugin, $key) = explode("_", $translationId, 2);
-            if (isset($GLOBALS['Piwik_translations'][$plugin]) && isset($GLOBALS['Piwik_translations'][$plugin][$key])) {
-                $translationId = $GLOBALS['Piwik_translations'][$plugin][$key];
-            }
-        }
-        if (count($args) == 0) {
-            return $translationId;
-        }
-        return vsprintf($translationId, $args);
+        return $translator->translate($translationId, $args, $language);
     }
 
     /**
diff --git a/core/Plugin.php b/core/Plugin.php
index 55a70ab501..af564a002b 100644
--- a/core/Plugin.php
+++ b/core/Plugin.php
@@ -8,7 +8,6 @@
  */
 namespace Piwik;
 
-use Piwik\Cache\PersistentCache;
 use Piwik\Plugin\Dependency;
 use Piwik\Plugin\MetadataLoader;
 
@@ -108,10 +107,10 @@ class Plugin
 
     /**
      * As the cache is used quite often we avoid having to create instances all the time. We reuse it which is not
-     * perfect but efficient. If the cache is used we need to make sure to call setCacheKey() before usage as there
+     * perfect but efficient. If the cache is used we need to make sure to call setId() before usage as there
      * is maybe a different key set since last usage.
      *
-     * @var PersistentCache
+     * @var \Piwik\Cache\Eager
      */
     private $cache;
 
@@ -131,14 +130,28 @@ class Plugin
         }
         $this->pluginName = $pluginName;
 
-        $metadataLoader = new MetadataLoader($pluginName);
-        $this->pluginInformation = $metadataLoader->load();
+        $cacheId = 'Plugin' . $pluginName . 'Metadata';
+        $cache = Cache::getEagerCache();
 
-        if ($this->hasDefinedPluginInformationInPluginClass() && $metadataLoader->hasPluginJson()) {
-            throw new \Exception('Plugin ' . $pluginName . ' has defined the method getInformation() and as well as having a plugin.json file. Please delete the getInformation() method from the plugin class. Alternatively, you may delete the plugin directory from plugins/' . $pluginName);
+        if ($cache->contains($cacheId)) {
+            $this->pluginInformation = $cache->fetch($cacheId);
+        } else {
+            $metadataLoader = new MetadataLoader($pluginName);
+            $this->pluginInformation = $metadataLoader->load();
+
+            if ($this->hasDefinedPluginInformationInPluginClass() && $metadataLoader->hasPluginJson()) {
+                throw new \Exception('Plugin ' . $pluginName . ' has defined the method getInformation() and as well as having a plugin.json file. Please delete the getInformation() method from the plugin class. Alternatively, you may delete the plugin directory from plugins/' . $pluginName);
+            }
+
+            $cache->save($cacheId, $this->pluginInformation);
         }
+    }
 
-        $this->cache = new PersistentCache('Plugin' . $pluginName);
+    private function createCacheIfNeeded()
+    {
+        if (is_null($this->cache)) {
+            $this->cache = Cache::getEagerCache();
+        }
     }
 
     private function hasDefinedPluginInformationInPluginClass()
@@ -305,15 +318,17 @@ class Plugin
      */
     public function findComponent($componentName, $expectedSubclass)
     {
-        $this->cache->setCacheKey('Plugin' . $this->pluginName . $componentName . $expectedSubclass);
+        $this->createCacheIfNeeded();
+
+        $cacheId = 'Plugin' . $this->pluginName . $componentName . $expectedSubclass;
 
         $componentFile = sprintf('%s/plugins/%s/%s.php', PIWIK_INCLUDE_PATH, $this->pluginName, $componentName);
 
-        if ($this->cache->has()) {
-            $klassName = $this->cache->get();
+        if ($this->cache->contains($cacheId)) {
+            $classname = $this->cache->fetch($cacheId);
 
-            if (empty($klassName)) {
-                return; // might by "false" in case has no menu, widget, ...
+            if (empty($classname)) {
+                return null; // might by "false" in case has no menu, widget, ...
             }
 
             if (file_exists($componentFile)) {
@@ -321,38 +336,40 @@ class Plugin
             }
 
         } else {
-            $this->cache->set(false); // prevent from trying to load over and over again for instance if there is no Menu for a plugin
+            $this->cache->save($cacheId, false); // prevent from trying to load over and over again for instance if there is no Menu for a plugin
 
             if (!file_exists($componentFile)) {
-                return;
+                return null;
             }
 
             require_once $componentFile;
 
-            $klassName = sprintf('Piwik\\Plugins\\%s\\%s', $this->pluginName, $componentName);
+            $classname = sprintf('Piwik\\Plugins\\%s\\%s', $this->pluginName, $componentName);
 
-            if (!class_exists($klassName)) {
-                return;
+            if (!class_exists($classname)) {
+                return null;
             }
 
-            if (!empty($expectedSubclass) && !is_subclass_of($klassName, $expectedSubclass)) {
+            if (!empty($expectedSubclass) && !is_subclass_of($classname, $expectedSubclass)) {
                 Log::warning(sprintf('Cannot use component %s for plugin %s, class %s does not extend %s',
-                    $componentName, $this->pluginName, $klassName, $expectedSubclass));
-                return;
+                    $componentName, $this->pluginName, $classname, $expectedSubclass));
+                return null;
             }
 
-            $this->cache->set($klassName);
+            $this->cache->save($cacheId, $classname);
         }
 
-        return new $klassName;
+        return new $classname;
     }
 
     public function findMultipleComponents($directoryWithinPlugin, $expectedSubclass)
     {
-        $this->cache->setCacheKey('Plugin' . $this->pluginName . $directoryWithinPlugin . $expectedSubclass);
+        $this->createCacheIfNeeded();
+
+        $cacheId = 'Plugin' . $this->pluginName . $directoryWithinPlugin . $expectedSubclass;
 
-        if ($this->cache->has()) {
-            $components = $this->cache->get();
+        if ($this->cache->contains($cacheId)) {
+            $components = $this->cache->fetch($cacheId);
 
             if ($this->includeComponents($components)) {
                 return $components;
@@ -363,7 +380,7 @@ class Plugin
 
         $components = $this->doFindMultipleComponents($directoryWithinPlugin, $expectedSubclass);
 
-        $this->cache->set($components);
+        $this->cache->save($cacheId, $components);
 
         return $components;
     }
diff --git a/core/Plugin/ComponentFactory.php b/core/Plugin/ComponentFactory.php
index 68415e9397..751f1157d4 100644
--- a/core/Plugin/ComponentFactory.php
+++ b/core/Plugin/ComponentFactory.php
@@ -24,7 +24,7 @@ class ComponentFactory
      * associated subdirectory.
      *
      * @param string $pluginName The name of the plugin the component is expected to belong to,
-     *                           eg, `'UserSettings'`.
+     *                           eg, `'DevicesDetection'`.
      * @param string $componentClassSimpleName The component's class name w/o namespace, eg,
      *                                         `"GetKeywords"`.
      * @param string $componentTypeClass The fully qualified class name of the component type, eg,
@@ -70,7 +70,7 @@ class ComponentFactory
      * @param string $componentTypeClass The fully qualified class name of the component type, eg,
      *                                   `"Piwik\Plugin\Report"`.
      * @param string $pluginName|false The name of the plugin the component is expected to belong to,
-     *                                 eg, `'UserSettings'`.
+     *                                 eg, `'DevicesDetection'`.
      * @param callback $predicate
      * @return mixed The component that satisfies $predicate or null if not found.
      */
diff --git a/core/Plugin/Controller.php b/core/Plugin/Controller.php
index 4afcbf25ad..a810d38545 100644
--- a/core/Plugin/Controller.php
+++ b/core/Plugin/Controller.php
@@ -15,6 +15,7 @@ use Piwik\API\Request;
 use Piwik\Common;
 use Piwik\Config as PiwikConfig;
 use Piwik\Config;
+use Piwik\Container\StaticContainer;
 use Piwik\DataTable\Filter\CalculateEvolutionFilter;
 use Piwik\Date;
 use Piwik\Exception\NoPrivilegesException;
@@ -31,8 +32,6 @@ use Piwik\Piwik;
 use Piwik\Plugins\CoreAdminHome\CustomLogo;
 use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Evolution;
 use Piwik\Plugins\LanguagesManager\LanguagesManager;
-use Piwik\Plugins\UsersManager\UserPreferences;
-use Piwik\Registry;
 use Piwik\SettingsPiwik;
 use Piwik\Site;
 use Piwik\Url;
@@ -581,43 +580,55 @@ abstract class Controller
      */
     protected function setGeneralVariablesView($view)
     {
-        $view->date = $this->strDate;
-
         $view->idSite = $this->idSite;
         $this->checkSitePermission();
         $this->setPeriodVariablesView($view);
 
-        $rawDate = Common::getRequestVar('date');
-        $periodStr = Common::getRequestVar('period');
-        if ($periodStr != 'range') {
-            $date = Date::factory($this->strDate);
-            $period = Period\Factory::build($periodStr, $date);
-        } else {
-            $period = new Range($periodStr, $rawDate, $this->site->getTimezone());
-        }
-        $view->rawDate = $rawDate;
-        $view->prettyDate = self::getCalendarPrettyDate($period);
-
         $view->siteName = $this->site->getName();
         $view->siteMainUrl = $this->site->getMainUrl();
 
+        $siteTimezone = $this->site->getTimezone();
+
         $datetimeMinDate = $this->site->getCreationDate()->getDatetime();
-        $minDate = Date::factory($datetimeMinDate, $this->site->getTimezone());
+        $minDate = Date::factory($datetimeMinDate, $siteTimezone);
         $this->setMinDateView($minDate, $view);
 
-        $maxDate = Date::factory('now', $this->site->getTimezone());
+        $maxDate = Date::factory('now', $siteTimezone);
         $this->setMaxDateView($maxDate, $view);
 
+        $rawDate   = Common::getRequestVar('date');
+        $periodStr = Common::getRequestVar('period');
+
+        if ($periodStr != 'range') {
+            $date      = Date::factory($this->strDate);
+            $validDate = $this->getValidDate($date, $minDate, $maxDate);
+            $period    = Period\Factory::build($periodStr, $validDate);
+
+            if ($date->toString() !== $validDate->toString()) {
+                // we to not always change date since it could convert a strDate "today" to "YYYY-MM-DD"
+                // only change $this->strDate if it was not valid before
+                $this->setDate($validDate);
+            }
+        } else {
+            $period = new Range($periodStr, $rawDate, $siteTimezone);
+        }
+
         // Setting current period start & end dates, for pre-setting the calendar when "Date Range" is selected
         $dateStart = $period->getDateStart();
-        if ($dateStart->isEarlier($minDate)) {
-            $dateStart = $minDate;
-        }
-        $dateEnd = $period->getDateEnd();
-        if ($dateEnd->isLater($maxDate)) {
-            $dateEnd = $maxDate;
+        $dateStart = $this->getValidDate($dateStart, $minDate, $maxDate);
+
+        $dateEnd   = $period->getDateEnd();
+        $dateEnd   = $this->getValidDate($dateEnd, $minDate, $maxDate);
+
+        if ($periodStr == 'range') {
+            // make sure we actually display the correct calendar pretty date
+            $newRawDate = $dateStart->toString() . ',' . $dateEnd->toString();
+            $period = new Range($periodStr, $newRawDate, $siteTimezone);
         }
 
+        $view->date = $this->strDate;
+        $view->prettyDate = self::getCalendarPrettyDate($period);
+        $view->rawDate = $rawDate;
         $view->startDate = $dateStart;
         $view->endDate = $dateEnd;
 
@@ -636,6 +647,19 @@ abstract class Controller
         }
     }
 
+    private function getValidDate(Date $date, Date $minDate, Date $maxDate)
+    {
+        if ($date->isEarlier($minDate)) {
+            $date = $minDate;
+        }
+
+        if ($date->isLater($maxDate)) {
+            $date = $maxDate;
+        }
+
+        return $date;
+    }
+
     /**
      * Assigns a set of generally useful variables to a {@link Piwik\View} instance.
      *
@@ -852,7 +876,7 @@ abstract class Controller
             $currentLogin = Piwik::getCurrentUserLogin();
             $emails = implode(',', Piwik::getAllSuperUserAccessEmailAddresses());
             $errorMessage  = sprintf(Piwik::translate('CoreHome_NoPrivilegesAskPiwikAdmin'), $currentLogin, "<br/><a href='mailto:" . $emails . "?subject=Access to Piwik for user $currentLogin'>", "</a>");
-            $errorMessage .= "<br /><br />&nbsp;&nbsp;&nbsp;<b><a href='index.php?module=" . Registry::get('auth')->getName() . "&amp;action=logout'>&rsaquo; " . Piwik::translate('General_Logout') . "</a></b><br />";
+            $errorMessage .= "<br /><br />&nbsp;&nbsp;&nbsp;<b><a href='index.php?module=" . StaticContainer::get('Piwik\Auth')->getName() . "&amp;action=logout'>&rsaquo; " . Piwik::translate('General_Logout') . "</a></b><br />";
 
             $ex = new NoPrivilegesException($errorMessage);
             $ex->setIsHtmlMessage();
@@ -979,7 +1003,9 @@ abstract class Controller
 
     protected function checkSitePermission()
     {
-        if (empty($this->site) || empty($this->idSite)) {
+        if (!empty($this->idSite) && empty($this->site)) {
+            throw new NoAccessException(Piwik::translate('General_ExceptionPrivilegeAccessWebsite', array("'view'", $this->idSite)));
+        } else if (empty($this->site) || empty($this->idSite)) {
             throw new Exception("The requested website idSite is not found in the request, or is invalid.
 				Please check that you are logged in Piwik and have permission to access the specified website.");
         }
diff --git a/core/Plugin/ControllerAdmin.php b/core/Plugin/ControllerAdmin.php
index 008cb4d2f4..b0c86a6b1a 100644
--- a/core/Plugin/ControllerAdmin.php
+++ b/core/Plugin/ControllerAdmin.php
@@ -29,8 +29,6 @@ use Piwik\View;
  */
 abstract class ControllerAdmin extends Controller
 {
-    private static $isEacceleratorUsed = false;
-
     private static function notifyWhenTrackingStatisticsDisabled()
     {
         $statsEnabled = PiwikConfig::getInstance()->Tracker['record_statistics'];
@@ -105,27 +103,10 @@ abstract class ControllerAdmin extends Controller
         }
     }
 
-    /**
-     * See https://github.com/piwik/piwik/issues/4439#comment:8 and https://github.com/eaccelerator/eaccelerator/issues/12
-     *
-     * Eaccelerator does not support closures and is known to be not comptabile with Piwik. Therefore we are disabling
-     * it automatically. At this point it looks like Eaccelerator is no longer under development and the bug has not
-     * been fixed within a year.
-     */
-    public static function disableEacceleratorIfEnabled()
-    {
-        $isEacceleratorUsed = ini_get('eaccelerator.enable');
-
-        if (!empty($isEacceleratorUsed)) {
-            self::$isEacceleratorUsed = true;
-
-            @ini_set('eaccelerator.enable', 0);
-        }
-    }
-
     private static function notifyIfEAcceleratorIsUsed()
     {
-        if (!self::$isEacceleratorUsed) {
+        $isEacceleratorUsed = ini_get('eaccelerator.enable');
+        if (empty($isEacceleratorUsed)) {
             return;
         }
         $message = sprintf("You are using the PHP accelerator & optimizer eAccelerator which is known to be not compatible with Piwik.
@@ -167,7 +148,6 @@ abstract class ControllerAdmin extends Controller
      * - **statisticsNotRecorded** - Set to true if the `[Tracker] record_statistics` INI
      *                               config is `0`. If not `0`, this variable will not be defined.
      * - **topMenu** - The result of `MenuTop::getInstance()->getMenu()`.
-     * - **currentAdminMenuName** - The currently selected admin menu name.
      * - **enableFrames** - The value of the `[General] enable_framed_pages` INI config option. If
      *                    true, {@link Piwik\View::setXFrameOptions()} is called on the view.
      * - **isSuperUser** - Whether the current user is a superuser or not.
@@ -189,7 +169,6 @@ abstract class ControllerAdmin extends Controller
 
         $view->topMenu  = MenuTop::getInstance()->getMenu();
         $view->userMenu = MenuUser::getInstance()->getMenu();
-        $view->currentAdminMenuName = MenuAdmin::getInstance()->getCurrentAdminMenuName();
 
         $view->isDataPurgeSettingsEnabled = self::isDataPurgeSettingsEnabled();
         $enableFrames = PiwikConfig::getInstance()->General['enable_framed_settings'];
diff --git a/core/Plugin/Dimension/ActionDimension.php b/core/Plugin/Dimension/ActionDimension.php
index bc09b01fc3..f0daaf547c 100644
--- a/core/Plugin/Dimension/ActionDimension.php
+++ b/core/Plugin/Dimension/ActionDimension.php
@@ -8,7 +8,8 @@
  */
 namespace Piwik\Plugin\Dimension;
 
-use Piwik\Cache\PluginAwareStaticCache;
+use Piwik\CacheId;
+use Piwik\Cache as PiwikCache;
 use Piwik\Columns\Dimension;
 use Piwik\Plugin\Manager as PluginManager;
 use Piwik\Plugin\Segment;
@@ -212,9 +213,10 @@ abstract class ActionDimension extends Dimension
      */
     public static function getAllDimensions()
     {
-        $cache = new PluginAwareStaticCache('ActionDimensions');
+        $cacheId = CacheId::pluginAware('ActionDimensions');
+        $cache   = PiwikCache::getTransientCache();
 
-        if (!$cache->has()) {
+        if (!$cache->contains($cacheId)) {
 
             $plugins   = PluginManager::getInstance()->getPluginsLoadedAndActivated();
             $instances = array();
@@ -225,10 +227,10 @@ abstract class ActionDimension extends Dimension
                 }
             }
 
-            $cache->set($instances);
+            $cache->save($cacheId, $instances);
         }
 
-        return $cache->get();
+        return $cache->fetch($cacheId);
     }
 
     /**
diff --git a/core/Plugin/Dimension/ConversionDimension.php b/core/Plugin/Dimension/ConversionDimension.php
index 7cf2a813c0..34a8006111 100644
--- a/core/Plugin/Dimension/ConversionDimension.php
+++ b/core/Plugin/Dimension/ConversionDimension.php
@@ -8,7 +8,8 @@
  */
 namespace Piwik\Plugin\Dimension;
 
-use Piwik\Cache\PluginAwareStaticCache;
+use Piwik\CacheId;
+use Piwik\Cache as PiwikCache;
 use Piwik\Columns\Dimension;
 use Piwik\Plugin\Manager as PluginManager;
 use Piwik\Common;
@@ -155,9 +156,10 @@ abstract class ConversionDimension extends Dimension
      */
     public static function getAllDimensions()
     {
-        $cache = new PluginAwareStaticCache('ConversionDimensions');
+        $cacheId = CacheId::pluginAware('ConversionDimensions');
+        $cache   = PiwikCache::getTransientCache();
 
-        if (!$cache->has()) {
+        if (!$cache->contains($cacheId)) {
 
             $plugins   = PluginManager::getInstance()->getPluginsLoadedAndActivated();
             $instances = array();
@@ -168,10 +170,10 @@ abstract class ConversionDimension extends Dimension
                 }
             }
 
-            $cache->set($instances);
+            $cache->save($cacheId, $instances);
         }
 
-        return $cache->get();
+        return $cache->fetch($cacheId);
     }
 
     /**
diff --git a/core/Plugin/Dimension/VisitDimension.php b/core/Plugin/Dimension/VisitDimension.php
index 09a58554c0..97dfd6f57b 100644
--- a/core/Plugin/Dimension/VisitDimension.php
+++ b/core/Plugin/Dimension/VisitDimension.php
@@ -8,7 +8,8 @@
  */
 namespace Piwik\Plugin\Dimension;
 
-use Piwik\Cache\PluginAwareStaticCache;
+use Piwik\CacheId;
+use Piwik\Cache as PiwikCache;
 use Piwik\Columns\Dimension;
 use Piwik\Common;
 use Piwik\Db;
@@ -270,14 +271,34 @@ abstract class VisitDimension extends Dimension
     }
 
     /**
+     * This hook is executed by the tracker when determining if an action is the start of a new visit
+     * or part of an existing one. Derived classes can use it to force new visits based on dimension
+     * data.
+     *
+     * For example, the Campaign dimension in the Referrers plugin will force a new visit if the
+     * campaign information for the current action is different from the last.
+     *
+     * @param Request $request The current tracker request information.
+     * @param Visitor $visitor The information for the currently recognized visitor.
+     * @param Action|null $action The current action information (if any).
+     * @return bool Return true to force a visit, false if otherwise.
+     * @api
+     */
+    public function shouldForceNewVisit(Request $request, Visitor $visitor, Action $action = null)
+    {
+        return false;
+    }
+
+    /**
      * Get all visit dimensions that are defined by all activated plugins.
      * @return VisitDimension[]
      */
     public static function getAllDimensions()
     {
-        $cache = new PluginAwareStaticCache('VisitDimensions');
+        $cacheId = CacheId::pluginAware('VisitDimensions');
+        $cache   = PiwikCache::getTransientCache();
 
-        if (!$cache->has()) {
+        if (!$cache->contains($cacheId)) {
 
             $plugins   = PluginManager::getInstance()->getPluginsLoadedAndActivated();
             $instances = array();
@@ -290,10 +311,10 @@ abstract class VisitDimension extends Dimension
 
             usort($instances, array('self', 'sortByRequiredFields'));
 
-            $cache->set($instances);
+            $cache->save($cacheId, $instances);
         }
 
-        return $cache->get();
+        return $cache->fetch($cacheId);
     }
 
     /**
diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php
index 9f8941170b..6e0d5ba91a 100644
--- a/core/Plugin/Manager.php
+++ b/core/Plugin/Manager.php
@@ -9,14 +9,12 @@
 
 namespace Piwik\Plugin;
 
-use Piwik\Cache\PersistentCache;
-use Piwik\CacheFile;
+use Piwik\Cache;
 use Piwik\Columns\Dimension;
-use Piwik\Common;
 use Piwik\Config as PiwikConfig;
 use Piwik\Config;
+use Piwik\Container\StaticContainer;
 use Piwik\Db;
-use Piwik\Development;
 use Piwik\EventDispatcher;
 use Piwik\Filesystem;
 use Piwik\Log;
@@ -26,9 +24,8 @@ use Piwik\Plugin;
 use Piwik\Singleton;
 use Piwik\Theme;
 use Piwik\Tracker;
-use Piwik\Translate;
+use Piwik\Translation\Translator;
 use Piwik\Updater;
-use Piwik\SettingsServer;
 use Piwik\Plugin\Dimension\ActionDimension;
 use Piwik\Plugin\Dimension\ConversionDimension;
 use Piwik\Plugin\Dimension\VisitDimension;
@@ -93,12 +90,14 @@ class Manager extends Singleton
         'ExampleTheme'
     );
 
+    private $trackerPluginsNotToLoad = array();
+
     /**
      * Loads plugin that are enabled
      */
     public function loadActivatedPlugins()
     {
-        $pluginsToLoad = Config::getInstance()->Plugins['Plugins'];
+        $pluginsToLoad = $this->getActivatedPluginsFromConfig();
         $this->loadPlugins($pluginsToLoad);
     }
 
@@ -108,7 +107,7 @@ class Manager extends Singleton
     public function loadCorePluginsDuringTracker()
     {
         $pluginsToLoad = Config::getInstance()->Plugins['Plugins'];
-        $pluginsToLoad = array_diff($pluginsToLoad, Tracker::getPluginsNotToLoad());
+        $pluginsToLoad = array_diff($pluginsToLoad, $this->getTrackerPluginsNotToLoad());
         $this->loadPlugins($pluginsToLoad);
     }
 
@@ -117,10 +116,11 @@ class Manager extends Singleton
      */
     public function loadTrackerPlugins()
     {
-        $cache = new PersistentCache('PluginsTracker');
+        $cacheId = 'PluginsTracker';
+        $cache = Cache::getEagerCache();
 
-        if ($cache->has()) {
-            $pluginsTracker = $cache->get();
+        if ($cache->contains($cacheId)) {
+            $pluginsTracker = $cache->fetch($cacheId);
         } else {
 
             $this->unloadPlugins();
@@ -135,22 +135,46 @@ class Manager extends Singleton
             }
 
             if (!empty($pluginsTracker)) {
-                $cache->set($pluginsTracker);
+                $cache->save($cacheId, $pluginsTracker);
             }
         }
 
-        $this->unloadPlugins();
-
         if (empty($pluginsTracker)) {
+            $this->unloadPlugins();
             return array();
         }
 
-        $pluginsTracker = array_diff($pluginsTracker, Tracker::getPluginsNotToLoad());
+        $pluginsTracker = array_diff($pluginsTracker, $this->getTrackerPluginsNotToLoad());
         $this->doNotLoadAlwaysActivatedPlugins();
         $this->loadPlugins($pluginsTracker);
+
+        // we could simply unload all plugins first before loading plugins but this way it is much faster
+        // since we won't have to create each plugin again and we won't have to parse each plugin metadata file
+        // again etc
+        $this->makeSureOnlyActivatedPluginsAreLoaded();
+
         return $pluginsTracker;
     }
 
+    /**
+     * Do not load the specified plugins (used during testing, to disable Provider plugin)
+     * @param array $plugins
+     */
+    public function setTrackerPluginsNotToLoad($plugins)
+    {
+        $this->trackerPluginsNotToLoad = $plugins;
+    }
+
+    /**
+     * Get list of plugins to not load
+     *
+     * @return array
+     */
+    public function getTrackerPluginsNotToLoad()
+    {
+        return $this->trackerPluginsNotToLoad;
+    }
+
     public function getCorePluginsDisabledByDefault()
     {
         return array_merge( $this->corePluginsDisabledByDefault, $this->coreThemesDisabledByDefault);
@@ -177,10 +201,11 @@ class Manager extends Singleton
     /**
      * Update Plugins config
      *
-     * @param array $plugins Plugins
+     * @param array $pluginsToLoad Plugins
      */
     private function updatePluginsConfig($pluginsToLoad)
     {
+        $pluginsToLoad = $this->sortPluginsSameOrderAsGlobalConfig($pluginsToLoad);
         $section = PiwikConfig::getInstance()->Plugins;
         $section['Plugins'] = $pluginsToLoad;
         PiwikConfig::getInstance()->Plugins = $section;
@@ -237,7 +262,7 @@ class Manager extends Singleton
     public function isPluginActivated($name)
     {
         return in_array($name, $this->pluginsToLoad)
-        || $this->isPluginAlwaysActivated($name);
+        || ($this->doLoadAlwaysActivatedPlugins && $this->isPluginAlwaysActivated($name));
     }
 
     /**
@@ -403,7 +428,7 @@ class Manager extends Singleton
      */
     public function installLoadedPlugins()
     {
-        Log::verbose("Loaded plugins: " . implode(", ", array_keys($this->getLoadedPlugins())));
+        Log::debug("Loaded plugins: " . implode(", ", array_keys($this->getLoadedPlugins())));
         $messages = array();
         foreach ($this->getLoadedPlugins() as $plugin) {
             try {
@@ -543,7 +568,8 @@ class Manager extends Singleton
      */
     public function loadAllPluginsAndGetTheirInfo()
     {
-        $language = Translate::getLanguageToLoad();
+        /** @var Translator $translator */
+        $translator = StaticContainer::get('Piwik\Translation\Translator');
 
         $plugins = array();
 
@@ -567,7 +593,7 @@ class Manager extends Singleton
                     'uninstallable'   => true,
                 );
             } else {
-                $this->loadTranslation($pluginName, $language);
+                $translator->addDirectory(self::getPluginsDirectory() . $pluginName . '/lang');
                 $this->loadPlugin($pluginName);
                 $info = array(
                     'activated'       => $this->isPluginActivated($pluginName),
@@ -578,7 +604,6 @@ class Manager extends Singleton
 
             $plugins[$pluginName] = $info;
         }
-        $this->loadPluginTranslations();
 
         $loadedPlugins = $this->getLoadedPlugins();
         foreach ($loadedPlugins as $oPlugin) {
@@ -610,12 +635,7 @@ class Manager extends Singleton
      */
     public function isPluginBundledWithCore($name)
     {
-        // Reading the plugins from the global.ini.php config file
-        $pluginsBundledWithPiwik = PiwikConfig::getInstance()->getFromGlobalConfig('Plugins');
-        $pluginsBundledWithPiwik = $pluginsBundledWithPiwik['Plugins'];
-
-        return (!empty($pluginsBundledWithPiwik)
-                    && in_array($name, $pluginsBundledWithPiwik))
+        return $this->isPluginEnabledByDefault($name)
                 || in_array($name, $this->getCorePluginsDisabledByDefault())
                 || $name == self::DEFAULT_THEME;
     }
@@ -644,8 +664,7 @@ class Manager extends Singleton
      */
     public function loadPlugins(array $pluginsToLoad)
     {
-        $pluginsToLoad = array_unique($pluginsToLoad);
-        $this->pluginsToLoad = $pluginsToLoad;
+        $this->pluginsToLoad = $this->makePluginsToLoad($pluginsToLoad);
         $this->reloadActivatedPlugins();
     }
 
@@ -666,57 +685,6 @@ class Manager extends Singleton
     }
 
     /**
-     * Load translations for loaded plugins
-     *
-     * @param bool|string $language Optional language code
-     */
-    public function loadPluginTranslations($language = false)
-    {
-        if (empty($language)) {
-            $language = Translate::getLanguageToLoad();
-        }
-
-        $cache    = new CacheFile('tracker', 43200); // ttl=12hours
-        $cacheKey = 'PluginTranslations';
-
-        if (!empty($language)) {
-            $cacheKey .= '-' . trim($language);
-        }
-
-        if (!empty($this->loadedPlugins)) {
-            // makes sure to create a translation in case loaded plugins change (ie Tests vs Tracker vs UI etc)
-            $cacheKey .= '-' . md5(implode('', $this->getLoadedPluginsName()));
-        }
-
-        $translations = $cache->get($cacheKey);
-
-        if (!empty($translations) &&
-            is_array($translations) &&
-            !Development::isEnabled()) {
-
-            Translate::mergeTranslationArray($translations);
-            return;
-        }
-
-        $translations = array();
-        $pluginNames  = self::getAllPluginsNames();
-
-        foreach ($pluginNames as $pluginName) {
-            if ($this->isPluginLoaded($pluginName) ||
-                $this->isPluginBundledWithCore($pluginName)) {
-
-                $this->loadTranslation($pluginName, $language);
-
-                if (isset($GLOBALS['Piwik_translations'][$pluginName])) {
-                    $translations[$pluginName] = $GLOBALS['Piwik_translations'][$pluginName];
-                }
-            }
-        }
-
-        $cache->set($cacheKey, $translations);
-    }
-
-    /**
      * Execute postLoad() hook for loaded plugins
      */
     public function postLoadPlugins()
@@ -742,7 +710,7 @@ class Manager extends Singleton
      *
      *     array(
      *         'UserCountry' => Plugin $pluginObject,
-     *         'UserSettings' => Plugin $pluginObject,
+     *         'UserLanguage' => Plugin $pluginObject,
      *     );
      *
      * @return Plugin[]
@@ -776,7 +744,7 @@ class Manager extends Singleton
      *
      *     array(
      *         'UserCountry' => Plugin $pluginObject,
-     *         'UserSettings' => Plugin $pluginObject,
+     *         'UserLanguage' => Plugin $pluginObject,
      *     );
      *
      * @return Plugin[]
@@ -799,7 +767,7 @@ class Manager extends Singleton
      *
      *     array(
      *         'UserCountry'
-     *         'UserSettings'
+     *         'UserLanguage'
      *     );
      *
      * @return string[]
@@ -809,6 +777,13 @@ class Manager extends Singleton
         return $this->pluginsToLoad;
     }
 
+    public function getActivatedPluginsFromConfig()
+    {
+        $plugins = @Config::getInstance()->Plugins['Plugins'];
+
+        return $this->makePluginsToLoad($plugins);
+    }
+
     /**
      * Returns a Plugin object by name.
      *
@@ -830,12 +805,6 @@ class Manager extends Singleton
      */
     private function reloadActivatedPlugins()
     {
-        if ($this->doLoadAlwaysActivatedPlugins) {
-            $this->pluginsToLoad = array_merge($this->pluginsToLoad, $this->pluginToAlwaysActivate);
-        }
-
-        $this->pluginsToLoad = array_unique($this->pluginsToLoad);
-
         $pluginsToPostPendingEventsTo = array();
         foreach ($this->pluginsToLoad as $pluginName) {
             if (!$this->isPluginLoaded($pluginName)
@@ -1005,67 +974,14 @@ class Manager extends Singleton
      *
      * @param string $pluginName plugin name without prefix (eg. 'UserCountry')
      * @param Plugin $newPlugin
+     * @internal
      */
-    private function addLoadedPlugin($pluginName, Plugin $newPlugin)
+    public function addLoadedPlugin($pluginName, Plugin $newPlugin)
     {
         $this->loadedPlugins[$pluginName] = $newPlugin;
     }
 
     /**
-     * Load translation
-     *
-     * @param Plugin $plugin
-     * @param string $langCode
-     * @throws \Exception
-     * @return bool whether the translation was found and loaded
-     */
-    private function loadTranslation($plugin, $langCode)
-    {
-        // we are in Tracker mode if Loader is not (yet) loaded
-        if (SettingsServer::isTrackerApiRequest()) {
-            return false;
-        }
-
-        if (is_string($plugin)) {
-            $pluginName = $plugin;
-        } else {
-            $pluginName = $plugin->getPluginName();
-        }
-
-        $path = self::getPluginsDirectory() . $pluginName . '/lang/%s.json';
-
-        $defaultLangPath = sprintf($path, $langCode);
-        $defaultEnglishLangPath = sprintf($path, 'en');
-
-        $translationsLoaded = false;
-
-        // merge in english translations as default first
-        if (file_exists($defaultEnglishLangPath)) {
-            $translations = $this->getTranslationsFromFile($defaultEnglishLangPath);
-            $translationsLoaded = true;
-            if (isset($translations[$pluginName])) {
-                // only merge translations of plugin - prevents overwritten strings
-                Translate::mergeTranslationArray(array($pluginName => $translations[$pluginName]));
-            }
-        }
-
-        // merge in specific language translations (to overwrite english defaults)
-        if (!empty($langCode) &&
-            $defaultEnglishLangPath != $defaultLangPath &&
-            file_exists($defaultLangPath)) {
-
-            $translations = $this->getTranslationsFromFile($defaultLangPath);
-            $translationsLoaded = true;
-            if (isset($translations[$pluginName])) {
-                // only merge translations of plugin - prevents overwritten strings
-                Translate::mergeTranslationArray(array($pluginName => $translations[$pluginName]));
-            }
-        }
-
-        return $translationsLoaded;
-    }
-
-    /**
      * Return names of all installed plugins.
      *
      * @return array
@@ -1193,27 +1109,6 @@ class Manager extends Singleton
     }
 
     /**
-     * @param  string $pathToTranslationFile
-     * @throws \Exception
-     * @return mixed
-     */
-    private function getTranslationsFromFile($pathToTranslationFile)
-    {
-        $data         = file_get_contents($pathToTranslationFile);
-        $translations = json_decode($data, true);
-
-        if (is_null($translations) && Common::hasJsonErrorOccurred()) {
-            $jsonError = Common::getLastJsonError();
-
-            $message = sprintf('Not able to load translation file %s: %s', $pathToTranslationFile, $jsonError);
-
-            throw new \Exception($message);
-        }
-
-        return $translations;
-    }
-
-    /**
      * @param $pluginName
      * @return bool
      */
@@ -1335,18 +1230,84 @@ class Manager extends Singleton
     {
         Option::delete('version_' . $version);
     }
-}
 
-/**
- */
-class PluginException extends \Exception
-{
-    function __construct($pluginName, $message)
+    private function makeSureOnlyActivatedPluginsAreLoaded()
+    {
+        foreach ($this->getLoadedPlugins() as $pluginName => $plugin) {
+            if (!in_array($pluginName, $this->pluginsToLoad)) {
+                $this->unloadPlugin($plugin);
+            }
+        }
+    }
+
+    /**
+     * Reading the plugins from the global.ini.php config file
+     *
+     * @return array
+     */
+    protected function getPluginsFromGlobalIniConfigFile()
+    {
+        $pluginsBundledWithPiwik = PiwikConfig::getInstance()->getFromGlobalConfig('Plugins');
+        $pluginsBundledWithPiwik = $pluginsBundledWithPiwik['Plugins'];
+        return $pluginsBundledWithPiwik;
+    }
+
+    /**
+     * @param $name
+     * @return bool
+     */
+    protected function isPluginEnabledByDefault($name)
+    {
+        $pluginsBundledWithPiwik = $this->getPluginsFromGlobalIniConfigFile();
+
+        if(empty($pluginsBundledWithPiwik)) {
+            return false;
+        }
+        return in_array($name, $pluginsBundledWithPiwik);
+    }
+
+    /**
+     * @param array $pluginsToLoad
+     * @return array
+     */
+    private function makePluginsToLoad(array $pluginsToLoad)
     {
-        parent::__construct("There was a problem installing the plugin " . $pluginName . ": " . $message . "
-				If this plugin has already been installed, and if you want to hide this message</b>, you must add the following line under the
-				[PluginsInstalled]
-				entry in your config/config.ini.php file:
-				PluginsInstalled[] = $pluginName");
+        $pluginsToLoad = array_unique($pluginsToLoad);
+        if ($this->doLoadAlwaysActivatedPlugins) {
+            $pluginsToLoad = array_merge($pluginsToLoad, $this->pluginToAlwaysActivate);
+        }
+        $pluginsToLoad = array_unique($pluginsToLoad);
+        $pluginsToLoad = $this->sortPluginsSameOrderAsGlobalConfig($pluginsToLoad);
+        return $pluginsToLoad;
+    }
+
+    private function sortPluginsSameOrderAsGlobalConfig(array $plugins)
+    {
+        $global = $this->getPluginsFromGlobalIniConfigFile();
+        if(empty($global)) {
+            return $plugins;
+        }
+        $global = array_values($global);
+        $plugins = array_values($plugins);
+
+        $defaultPluginsLoadedFirst = array_intersect($global, $plugins);
+
+        $otherPluginsToLoadAfterDefaultPlugins = array_diff($plugins, $defaultPluginsLoadedFirst);
+
+        // sort by name to have a predictable order for those extra plugins
+        sort($otherPluginsToLoadAfterDefaultPlugins);
+
+        $sorted = array_merge($defaultPluginsLoadedFirst, $otherPluginsToLoadAfterDefaultPlugins);
+
+        return $sorted;
+    }
+
+    public function loadPluginTranslations()
+    {
+        /** @var Translator $translator */
+        $translator = StaticContainer::get('Piwik\Translation\Translator');
+        foreach ($this->getAllPluginsNames() as $pluginName) {
+            $translator->addDirectory(self::getPluginsDirectory() . $pluginName . '/lang');
+        }
     }
 }
diff --git a/core/Plugin/Menu.php b/core/Plugin/Menu.php
index 0cdc1878df..d2c54645f1 100644
--- a/core/Plugin/Menu.php
+++ b/core/Plugin/Menu.php
@@ -195,7 +195,7 @@ class Menu
             $defaultDate = $userPreferences->getDefaultDate();
         }
         if (empty($defaultPeriod)) {
-            $defaultPeriod = $userPreferences->getDefaultPeriod();
+            $defaultPeriod = $userPreferences->getDefaultPeriod(false);
         }
         return array(
             'idSite' => $websiteId,
diff --git a/core/Plugin/PluginException.php b/core/Plugin/PluginException.php
new file mode 100644
index 0000000000..90aa03a342
--- /dev/null
+++ b/core/Plugin/PluginException.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugin;
+
+class PluginException extends \Exception
+{
+    public function __construct($pluginName, $message)
+    {
+        parent::__construct("There was a problem installing the plugin " . $pluginName . ": " . $message . "
+				If this plugin has already been installed, and if you want to hide this message</b>, you must add the following line under the
+				[PluginsInstalled]
+				entry in your config/config.ini.php file:
+				PluginsInstalled[] = $pluginName");
+    }
+}
diff --git a/core/Plugin/Report.php b/core/Plugin/Report.php
index 1824b6774f..62ed594f8c 100644
--- a/core/Plugin/Report.php
+++ b/core/Plugin/Report.php
@@ -10,15 +10,16 @@ namespace Piwik\Plugin;
 
 use Piwik\API\Proxy;
 use Piwik\API\Request;
-use Piwik\Cache\LanguageAwareStaticCache;
+use Piwik\Cache;
+use Piwik\CacheId;
 use Piwik\Columns\Dimension;
 use Piwik\DataTable;
 use Piwik\Menu\MenuReporting;
 use Piwik\Metrics;
+use Piwik\Cache as PiwikCache;
 use Piwik\Piwik;
 use Piwik\Plugin\Manager as PluginManager;
 use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable;
-use Piwik\Translate;
 use Piwik\WidgetsList;
 use Piwik\ViewDataTable\Factory as ViewDataTableFactory;
 use Exception;
@@ -195,7 +196,7 @@ class Report
         'Goals_Goals',
         'General_Visitors',
         'DevicesDetection_DevicesDetection',
-        'UserSettings_VisitorSettings',
+        'General_VisitorSettings',
         'API'
     );
 
@@ -270,6 +271,16 @@ class Report
     }
 
     /**
+     * Returns if the default viewDataTable type should always be used. e.g. the type won't be changeable through config or url params.
+     * Defaults to false
+     * @return bool
+     */
+    public function alwaysUseDefaultViewDataTable ()
+    {
+        return false;
+    }
+
+    /**
      * Here you can configure how your report should be displayed and which capabilities your report has. For instance
      * whether your report supports a "search" or not. EG `$view->config->show_search = false`. You can also change the
      * default request config. For instance you can change how many rows are displayed by default:
@@ -301,7 +312,8 @@ class Report
 
         $apiAction = $apiProxy->buildApiActionName($this->module, $this->action);
 
-        $view      = ViewDataTableFactory::build(null, $apiAction, $this->module . '.' . $this->action);
+        $view = ViewDataTableFactory::build(null, $apiAction, $this->module . '.' . $this->action);
+
         $rendered  = $view->render();
 
         return $rendered;
@@ -404,7 +416,7 @@ class Report
      * default metric translation for this metric using the {@hook Metrics.getDefaultMetricTranslations} event. If you
      * want to overwrite any default metric translation you should overwrite this method, call this parent method to
      * get all default translations and overwrite any custom metric translations.
-     * @return array
+     * @return array|mixed
      * @api
      */
     public function getProcessedMetrics()
@@ -723,7 +735,38 @@ class Report
      */
     public static function factory($module, $action)
     {
-        return ComponentFactory::factory($module, ucfirst($action), __CLASS__);
+        $listApiToReport = self::getMapOfModuleActionsToReport();
+        $api = $module . '.' . ucfirst($action);
+
+        if (!array_key_exists($api, $listApiToReport)) {
+            return null;
+        }
+
+        $klassName = $listApiToReport[$api];
+
+        return new $klassName;
+    }
+
+    private static function getMapOfModuleActionsToReport()
+    {
+        $cacheId = CacheId::pluginAware('ReportFactoryMap');
+
+        $cache = Cache::getEagerCache();
+        if ($cache->contains($cacheId)) {
+            $mapApiToReport = $cache->fetch($cacheId);
+        } else {
+            $reports = self::getAllReports();
+
+            $mapApiToReport = array();
+            foreach ($reports as $report) {
+                $key = $report->getModule() . '.' . ucfirst($report->getAction());
+                $mapApiToReport[$key] = get_class($report);
+            }
+
+            $cache->save($cacheId, $mapApiToReport);
+        }
+
+        return $mapApiToReport;
     }
 
     /**
@@ -735,9 +778,10 @@ class Report
     public static function getAllReports()
     {
         $reports = self::getAllReportClasses();
-        $cache   = new LanguageAwareStaticCache('Reports' . implode('', $reports));
+        $cacheId = CacheId::languageAware('Reports' . md5(implode('', $reports)));
+        $cache   = PiwikCache::getTransientCache();
 
-        if (!$cache->has()) {
+        if (!$cache->contains($cacheId)) {
             $instances = array();
 
             foreach ($reports as $report) {
@@ -746,10 +790,10 @@ class Report
 
             usort($instances, array('self', 'sort'));
 
-            $cache->set($instances);
+            $cache->save($cacheId, $instances);
         }
 
-        return $cache->get();
+        return $cache->fetch($cacheId);
     }
 
     /**
@@ -785,10 +829,10 @@ class Report
 
         foreach ($metricsToTranslate as $metric) {
             if ($metric instanceof Metric) {
-                $metricName = $metric->getName();
+                $metricName  = $metric->getName();
                 $translation = $metric->getTranslatedName();
             } else {
-                $metricName = $metric;
+                $metricName  = $metric;
                 $translation = @$translations[$metric];
             }
 
diff --git a/core/Plugin/Segment.php b/core/Plugin/Segment.php
index 795d4da157..2f0c84db63 100644
--- a/core/Plugin/Segment.php
+++ b/core/Plugin/Segment.php
@@ -96,7 +96,7 @@ class Segment
 
     /**
      * Set (overwrite) the segment display name. This name will be visible in the API and the UI. It should be a
-     * translation key such as 'Actions_ColumnEntryPageTitle' or 'UserSettings_ColumnResolution'.
+     * translation key such as 'Actions_ColumnEntryPageTitle' or 'Resolution_ColumnResolution'.
      * @param string $name
      * @api
      */
@@ -253,4 +253,4 @@ class Segment
 
         return $segment;
     }
-}
+}
\ No newline at end of file
diff --git a/core/Plugin/Settings.php b/core/Plugin/Settings.php
index 23d1472ca9..8a674ae370 100644
--- a/core/Plugin/Settings.php
+++ b/core/Plugin/Settings.php
@@ -180,12 +180,14 @@ abstract class Settings
      */
     protected function addSetting(Setting $setting)
     {
-        if (!ctype_alnum($setting->getName())) {
+        $name = $setting->getName();
+
+        if (!ctype_alnum($name)) {
             $msg = sprintf('The setting name "%s" in plugin "%s" is not valid. Only alpha and numerical characters are allowed', $setting->getName(), $this->pluginName);
             throw new \Exception($msg);
         }
 
-        if (array_key_exists($setting->getName(), $this->settings)) {
+        if (array_key_exists($name, $this->settings)) {
             throw new \Exception(sprintf('A setting with name "%s" does already exist for plugin "%s"', $setting->getName(), $this->pluginName));
         }
 
@@ -195,7 +197,7 @@ abstract class Settings
         $setting->setStorage($this->storage);
         $setting->setPluginName($this->pluginName);
 
-        $this->settings[$setting->getName()] = $setting;
+        $this->settings[$name] = $setting;
     }
 
     /**
@@ -265,11 +267,14 @@ abstract class Settings
 
     private function setDefaultTypeAndFieldIfNeeded(Setting $setting)
     {
-        if (!is_null($setting->uiControlType) && is_null($setting->type)) {
+        $hasControl = !is_null($setting->uiControlType);
+        $hasType    = !is_null($setting->type);
+
+        if ($hasControl && !$hasType) {
             $setting->type = $this->getDefaultType($setting->uiControlType);
-        } elseif (!is_null($setting->type) && is_null($setting->uiControlType)) {
+        } elseif ($hasType && !$hasControl) {
             $setting->uiControlType = $this->getDefaultCONTROL($setting->type);
-        } elseif (is_null($setting->uiControlType) && is_null($setting->type)) {
+        } elseif (!$hasControl && !$hasType) {
             $setting->type = static::TYPE_STRING;
             $setting->uiControlType = static::CONTROL_TEXT;
         }
diff --git a/core/Plugin/Tasks.php b/core/Plugin/Tasks.php
index 87b2c34d41..2d131d86c4 100644
--- a/core/Plugin/Tasks.php
+++ b/core/Plugin/Tasks.php
@@ -9,8 +9,8 @@
 namespace Piwik\Plugin;
 
 use Piwik\Development;
-use Piwik\ScheduledTask;
-use Piwik\ScheduledTime;
+use Piwik\Scheduler\Schedule\Schedule;
+use Piwik\Scheduler\Task;
 
 /**
  * Base class for all Tasks declarations.
@@ -21,15 +21,15 @@ use Piwik\ScheduledTime;
 class Tasks
 {
     /**
-     * @var ScheduledTask[]
+     * @var Task[]
      */
     private $tasks = array();
 
-    const LOWEST_PRIORITY  = ScheduledTask::LOWEST_PRIORITY;
-    const LOW_PRIORITY     = ScheduledTask::LOW_PRIORITY;
-    const NORMAL_PRIORITY  = ScheduledTask::NORMAL_PRIORITY;
-    const HIGH_PRIORITY    = ScheduledTask::HIGH_PRIORITY;
-    const HIGHEST_PRIORITY = ScheduledTask::HIGHEST_PRIORITY;
+    const LOWEST_PRIORITY  = Task::LOWEST_PRIORITY;
+    const LOW_PRIORITY     = Task::LOW_PRIORITY;
+    const NORMAL_PRIORITY  = Task::NORMAL_PRIORITY;
+    const HIGH_PRIORITY    = Task::HIGH_PRIORITY;
+    const HIGHEST_PRIORITY = Task::HIGHEST_PRIORITY;
 
     /**
      * This method is called to collect all schedule tasks. Register all your tasks here that should be executed
@@ -41,7 +41,7 @@ class Tasks
     }
 
     /**
-     * @return ScheduledTask[] $tasks
+     * @return Task[] $tasks
      */
     public function getScheduledTasks()
     {
@@ -60,7 +60,7 @@ class Tasks
      *                                       For instance '$param1###$param2###$param3'
      * @param int $priority                  Can be any constant such as self::LOW_PRIORITY
      *
-     * @return ScheduledTime
+     * @return Schedule
      * @api
      */
     protected function hourly($methodName, $methodParameter = null, $priority = self::NORMAL_PRIORITY)
@@ -109,13 +109,13 @@ class Tasks
      * @param string|object $objectOrClassName
      * @param string $methodName
      * @param null|string $methodParameter
-     * @param string|ScheduledTime $time
+     * @param string|Schedule $time
      * @param int $priority
      *
-     * @return ScheduledTime
+     * @return \Piwik\Scheduler\Schedule\Schedule
      *
      * @throws \Exception If a wrong time format is given. Needs to be either a string such as 'daily', 'weekly', ...
-     *                    or an instance of {@link Piwik\ScheduledTime}
+     *                    or an instance of {@link Piwik\Scheduler\Schedule\Schedule}
      *
      * @api
      */
@@ -124,14 +124,14 @@ class Tasks
         $this->checkIsValidTask($objectOrClassName, $methodName);
 
         if (is_string($time)) {
-            $time = ScheduledTime::factory($time);
+            $time = Schedule::factory($time);
         }
 
-        if (!($time instanceof ScheduledTime)) {
-            throw new \Exception('$time should be an instance of ScheduledTime');
+        if (!($time instanceof Schedule)) {
+            throw new \Exception('$time should be an instance of Schedule');
         }
 
-        $this->scheduleTask(new ScheduledTask($objectOrClassName, $methodName, $methodParameter, $time, $priority));
+        $this->scheduleTask(new Task($objectOrClassName, $methodName, $methodParameter, $time, $priority));
 
         return $time;
     }
@@ -140,9 +140,9 @@ class Tasks
      * In case you need very high flexibility and none of the other convenient methods such as {@link hourly()} or
      * {@link custom()} suit you, you can use this method to add a custom scheduled task.
      *
-     * @param ScheduledTask $task
+     * @param Task $task
      */
-    protected function scheduleTask(ScheduledTask $task)
+    protected function scheduleTask(Task $task)
     {
         $this->tasks[] = $task;
     }
diff --git a/core/Plugin/Visualization.php b/core/Plugin/Visualization.php
index 8c843806de..15b468e362 100644
--- a/core/Plugin/Visualization.php
+++ b/core/Plugin/Visualization.php
@@ -19,6 +19,7 @@ use Piwik\NoAccessException;
 use Piwik\Option;
 use Piwik\Period;
 use Piwik\Piwik;
+use Piwik\Plugins\API\API as ApiApi;
 use Piwik\Plugins\PrivacyManager\PrivacyManager;
 use Piwik\View;
 use Piwik\ViewDataTable\Manager as ViewDataTableManager;
@@ -207,6 +208,7 @@ class Visualization extends ViewDataTable
         $view->visualization         = $this;
         $view->visualizationTemplate = static::TEMPLATE_FILE;
         $view->visualizationCssClass = $this->getDefaultDataTableCssClass();
+        $view->reportMetdadata = $this->getReportMetadata();
 
         if (null === $this->dataTable) {
             $view->dataTable = null;
@@ -231,6 +233,22 @@ class Visualization extends ViewDataTable
         return $view;
     }
 
+    private function getReportMetadata()
+    {
+        $request = $this->request->getRequestArray() + $_GET + $_POST;
+
+        $idSite  = Common::getRequestVar('idSite', null, 'string', $request);
+        $module  = $this->requestConfig->getApiModuleToRequest();
+        $action  = $this->requestConfig->getApiMethodToRequest();
+        $metadata = ApiApi::getInstance()->getMetadata($idSite, $module, $action);
+
+        if (!empty($metadata)) {
+            return array_shift($metadata);
+        }
+
+        return false;
+    }
+
     private function overrideSomeConfigPropertiesIfNeeded()
     {
         if (empty($this->config->footer_icons)) {
diff --git a/core/Profiler.php b/core/Profiler.php
index cb68432725..b6cbfb67dd 100644
--- a/core/Profiler.php
+++ b/core/Profiler.php
@@ -338,6 +338,6 @@ class Profiler
      */
     private static function getPathToXHProfRunIds()
     {
-        return StaticContainer::getContainer()->get('path.tmp') . '/cache/tests-xhprof-runs';
+        return StaticContainer::get('path.tmp') . '/cache/tests-xhprof-runs';
     }
 }
diff --git a/core/RankingQuery.php b/core/RankingQuery.php
index f44845f075..cd4f830669 100644
--- a/core/RankingQuery.php
+++ b/core/RankingQuery.php
@@ -214,7 +214,7 @@ class RankingQuery
      */
     public function execute($innerQuery, $bind = array())
     {
-        $query = $this->generateQuery($innerQuery);
+        $query = $this->generateRankingQuery($innerQuery);
         $data  = Db::fetchAll($query, $bind);
 
         if ($this->columnToMarkExcludedRows !== false) {
@@ -268,7 +268,7 @@ class RankingQuery
      *                            itself.
      * @return string             The entire ranking query SQL.
      */
-    public function generateQuery($innerQuery)
+    public function generateRankingQuery($innerQuery)
     {
         // +1 to include "Others"
         $limit = $this->limit + 1;
diff --git a/core/Registry.php b/core/Registry.php
index 5022bf09e2..bc80f22518 100644
--- a/core/Registry.php
+++ b/core/Registry.php
@@ -4,25 +4,21 @@
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
  */
+
 namespace Piwik;
 
+use Piwik\Container\StaticContainer;
+
 /**
  * Registry class.
  *
  * @method static Registry getInstance()
  * @api
+ * @deprecated This class will be removed, use the container instead.
  */
 class Registry extends Singleton
 {
-    private $data;
-
-    protected function __construct()
-    {
-        $this->data = array();
-    }
-
     public static function isRegistered($key)
     {
         return self::getInstance()->hasKey($key);
@@ -40,19 +36,28 @@ class Registry extends Singleton
 
     public function setKey($key, $value)
     {
-        $this->data[$key] = $value;
+        if ($key === 'auth') {
+            $key = 'Piwik\Auth';
+        }
+
+        StaticContainer::getContainer()->set($key, $value);
     }
 
     public function getKey($key)
     {
-        if (!$this->hasKey($key)) {
-            throw new \Exception(sprintf("Key '%s' doesn't exist in Registry", $key));
+        if ($key === 'auth') {
+            $key = 'Piwik\Auth';
         }
-        return $this->data[$key];
+
+        return StaticContainer::get($key);
     }
 
     public function hasKey($key)
     {
-        return array_key_exists($key, $this->data);
+        if ($key === 'auth') {
+            $key = 'Piwik\Auth';
+        }
+
+        return StaticContainer::getContainer()->has($key);
     }
 }
diff --git a/core/ReportRenderer.php b/core/ReportRenderer.php
index 5486d5cd21..98cc547cd7 100644
--- a/core/ReportRenderer.php
+++ b/core/ReportRenderer.php
@@ -23,13 +23,15 @@ use Piwik\BaseFactory;
  */
 abstract class ReportRenderer extends BaseFactory
 {
-    const DEFAULT_REPORT_FONT = 'dejavusans';
-    const REPORT_TEXT_COLOR = "68,68,68";
-    const REPORT_TITLE_TEXT_COLOR = "126,115,99";
-    const TABLE_HEADER_BG_COLOR = "228,226,215";
-    const TABLE_HEADER_TEXT_COLOR = "37,87,146";
-    const TABLE_CELL_BORDER_COLOR = "231,231,231";
-    const TABLE_BG_COLOR = "249,250,250";
+    const DEFAULT_REPORT_FONT_FAMILY = 'dejavusans';
+    const REPORT_TEXT_COLOR = "13,13,13";
+    const REPORT_TITLE_TEXT_COLOR = "13,13,13";
+    const TABLE_HEADER_BG_COLOR = "255,255,255";
+    const TABLE_HEADER_TEXT_COLOR = "13,13,13";
+    const TABLE_HEADER_TEXT_TRANSFORM = "uppercase";
+    const TABLE_HEADER_TEXT_WEIGHT = "normal";
+    const TABLE_CELL_BORDER_COLOR = "217,217,217";
+    const TABLE_BG_COLOR = "242,242,242";
 
     const HTML_FORMAT = 'html';
     const PDF_FORMAT = 'pdf';
@@ -145,7 +147,7 @@ abstract class ReportRenderer extends BaseFactory
      */
     protected static function getOutputPath($filename)
     {
-        $outputFilename = StaticContainer::getContainer()->get('path.tmp') . '/assets/' . $filename;
+        $outputFilename = StaticContainer::get('path.tmp') . '/assets/' . $filename;
 
         @chmod($outputFilename, 0600);
         @unlink($outputFilename);
diff --git a/core/ReportRenderer/Html.php b/core/ReportRenderer/Html.php
index d8ff678bc8..6c0e950c3e 100644
--- a/core/ReportRenderer/Html.php
+++ b/core/ReportRenderer/Html.php
@@ -22,9 +22,9 @@ class Html extends ReportRenderer
     const IMAGE_GRAPH_WIDTH = 700;
     const IMAGE_GRAPH_HEIGHT = 200;
 
-    const REPORT_TITLE_TEXT_SIZE = 11;
+    const REPORT_TITLE_TEXT_SIZE = 24;
     const REPORT_TABLE_HEADER_TEXT_SIZE = 11;
-    const REPORT_TABLE_ROW_TEXT_SIZE = 11;
+    const REPORT_TABLE_ROW_TEXT_SIZE = '13px';
     const REPORT_BACK_TO_TOP_TEXT_SIZE = 9;
 
     const HTML_CONTENT_TYPE = 'text/html';
@@ -107,6 +107,7 @@ class Html extends ReportRenderer
 
     private function assignCommonParameters(View $view)
     {
+        $view->assign("reportFontFamily", ReportRenderer::DEFAULT_REPORT_FONT_FAMILY);
         $view->assign("reportTitleTextColor", ReportRenderer::REPORT_TITLE_TEXT_COLOR);
         $view->assign("reportTitleTextSize", self::REPORT_TITLE_TEXT_SIZE);
         $view->assign("reportTextColor", ReportRenderer::REPORT_TEXT_COLOR);
@@ -114,7 +115,9 @@ class Html extends ReportRenderer
         $view->assign("tableHeaderTextColor", ReportRenderer::TABLE_HEADER_TEXT_COLOR);
         $view->assign("tableCellBorderColor", ReportRenderer::TABLE_CELL_BORDER_COLOR);
         $view->assign("tableBgColor", ReportRenderer::TABLE_BG_COLOR);
+        $view->assign("reportTableHeaderTextWeight", self::TABLE_HEADER_TEXT_WEIGHT);
         $view->assign("reportTableHeaderTextSize", self::REPORT_TABLE_HEADER_TEXT_SIZE);
+        $view->assign("reportTableHeaderTextTransform", ReportRenderer::TABLE_HEADER_TEXT_TRANSFORM);
         $view->assign("reportTableRowTextSize", self::REPORT_TABLE_ROW_TEXT_SIZE);
         $view->assign("reportBackToTopTextSize", self::REPORT_BACK_TO_TOP_TEXT_SIZE);
         $view->assign("currentPath", SettingsPiwik::getPiwikUrl());
diff --git a/core/ReportRenderer/Pdf.php b/core/ReportRenderer/Pdf.php
index 47c2ebf900..3843cd942c 100644
--- a/core/ReportRenderer/Pdf.php
+++ b/core/ReportRenderer/Pdf.php
@@ -75,7 +75,7 @@ class Pdf extends ReportRenderer
     private $reportColumns;
     private $reportRowsMetadata;
     private $currentPage = 0;
-    private $reportFont = ReportRenderer::DEFAULT_REPORT_FONT;
+    private $reportFont = ReportRenderer::DEFAULT_REPORT_FONT_FAMILY;
     private $TCPDF;
     private $orientation = self::PORTRAIT;
 
@@ -115,7 +115,7 @@ class Pdf extends ReportRenderer
 
             case 'en':
             default:
-                $reportFont = ReportRenderer::DEFAULT_REPORT_FONT;
+                $reportFont = ReportRenderer::DEFAULT_REPORT_FONT_FAMILY;
                 break;
         }
         $this->reportFont = $reportFont;
@@ -328,7 +328,7 @@ class Pdf extends ReportRenderer
         $this->TCPDF->SetTextColor($this->reportTextColor[0], $this->reportTextColor[1], $this->reportTextColor[2]);
         $this->TCPDF->SetFont('');
 
-        $fill = false;
+        $fill = true;
         $url = false;
         $leftSpacesBeforeLogo = str_repeat(' ', $this->leftSpacesBeforeLogo);
 
@@ -494,12 +494,13 @@ class Pdf extends ReportRenderer
         $posX = $initPosX;
         foreach ($this->reportColumns as $columnName) {
             $columnName = $this->formatText($columnName);
+
             //Label column
             if ($countColumns == 0) {
-                $this->TCPDF->MultiCell($this->labelCellWidth, $maxCellHeight, $columnName, 1, 'C', true);
+                $this->TCPDF->MultiCell($this->labelCellWidth, $maxCellHeight, $columnName, $border = 0, $align = 'L', true);
                 $this->TCPDF->SetXY($posX + $this->labelCellWidth, $posY);
             } else {
-                $this->TCPDF->MultiCell($this->cellWidth, $maxCellHeight, $columnName, 1, 'C', true);
+                $this->TCPDF->MultiCell($this->cellWidth, $maxCellHeight, $columnName, $border = 0, $align = 'L', true);
                 $this->TCPDF->SetXY($posX + $this->cellWidth, $posY);
             }
             $countColumns++;
diff --git a/core/ScheduledTask.php b/core/ScheduledTask.php
index d570f5bea2..dd4063ef88 100644
--- a/core/ScheduledTask.php
+++ b/core/ScheduledTask.php
@@ -9,8 +9,7 @@
 
 namespace Piwik;
 
-use Exception;
-use Piwik\ScheduledTime;
+use Piwik\Scheduler\Task;
 
 /**
  * Contains metadata referencing PHP code that should be executed at regular
@@ -18,188 +17,11 @@ use Piwik\ScheduledTime;
  *
  * See the {@link TaskScheduler} docs to learn more about scheduled tasks.
  *
- *
  * @api
+ *
+ * @deprecated Use Piwik\Scheduler\Task instead
+ * @see \Piwik\Scheduler\Task
  */
-class ScheduledTask
+class ScheduledTask extends Task
 {
-    const LOWEST_PRIORITY = 12;
-    const LOW_PRIORITY = 9;
-    const NORMAL_PRIORITY = 6;
-    const HIGH_PRIORITY = 3;
-    const HIGHEST_PRIORITY = 0;
-
-    /**
-     * Object instance on which the method will be executed by the task scheduler
-     * @var string
-     */
-    private $objectInstance;
-
-    /**
-     * Class name where the specified method is located
-     * @var string
-     */
-    private $className;
-
-    /**
-     * Class method to run when task is scheduled
-     * @var string
-     */
-    private $methodName;
-
-    /**
-     * Parameter to pass to the executed method
-     * @var string
-     */
-    private $methodParameter;
-
-    /**
-     * The scheduled time policy
-     * @var ScheduledTime
-     */
-    private $scheduledTime;
-
-    /**
-     * The priority of a task. Affects the order in which this task will be run.
-     * @var int
-     */
-    private $priority;
-
-    /**
-     * Constructor.
-     *
-     * @param mixed $objectInstance The object or class that contains the method to execute regularly.
-     *                              Usually this will be a {@link Plugin} instance.
-     * @param string $methodName The name of the method that will be regularly executed.
-     * @param mixed|null $methodParameter An optional parameter to pass to the method when executed.
-     *                                    Must be convertible to string.
-     * @param ScheduledTime|null $scheduledTime A {@link ScheduledTime} instance that describes when the method
-     *                                          should be executed and how long before the next execution.
-     * @param int $priority The priority of the task. Tasks with a higher priority will be executed first.
-     *                      Tasks with low priority will be executed last.
-     * @throws Exception
-     */
-    public function __construct($objectInstance, $methodName, $methodParameter, $scheduledTime,
-                                $priority = self::NORMAL_PRIORITY)
-    {
-        $this->className = $this->getClassNameFromInstance($objectInstance);
-
-        if ($priority < self::HIGHEST_PRIORITY || $priority > self::LOWEST_PRIORITY) {
-            throw new Exception("Invalid priority for ScheduledTask '$this->className.$methodName': $priority");
-        }
-
-        $this->objectInstance = $objectInstance;
-        $this->methodName = $methodName;
-        $this->scheduledTime = $scheduledTime;
-        $this->methodParameter = $methodParameter;
-        $this->priority = $priority;
-    }
-
-    protected function getClassNameFromInstance($_objectInstance)
-    {
-        if (is_string($_objectInstance)) {
-            return $_objectInstance;
-        }
-
-        $namespaced = get_class($_objectInstance);
-
-        return $namespaced;
-    }
-
-    /**
-     * Returns the object instance that contains the method to execute. Returns a class
-     * name if the method is static.
-     *
-     * @return mixed
-     */
-    public function getObjectInstance()
-    {
-        return $this->objectInstance;
-    }
-
-    /**
-     * Returns the name of the class that contains the method to execute.
-     *
-     * @return string
-     */
-    public function getClassName()
-    {
-        return $this->className;
-    }
-
-    /**
-     * Returns the name of the method that will be executed.
-     *
-     * @return string
-     */
-    public function getMethodName()
-    {
-        return $this->methodName;
-    }
-
-    /**
-     * Returns the value that will be passed to the method when executed, or `null` if
-     * no value will be supplied.
-     *
-     * @return string|null
-     */
-    public function getMethodParameter()
-    {
-        return $this->methodParameter;
-    }
-
-    /**
-     * Returns a {@link ScheduledTime} instance that describes when the method should be executed
-     * and how long before the next execution.
-     *
-     * @return ScheduledTime
-     */
-    public function getScheduledTime()
-    {
-        return $this->scheduledTime;
-    }
-
-    /**
-     * Returns the time in milliseconds when this task will be executed next.
-     *
-     * @return int
-     */
-    public function getRescheduledTime()
-    {
-        return $this->getScheduledTime()->getRescheduledTime();
-    }
-
-    /**
-     * Returns the task priority. The priority will be an integer whose value is
-     * between {@link HIGH_PRIORITY} and {@link LOW_PRIORITY}.
-     *
-     * @return int
-     */
-    public function getPriority()
-    {
-        return $this->priority;
-    }
-
-    /**
-     * Returns a unique name for this scheduled task. The name is stored in the DB and is used
-     * to store a task's previous execution time. The name is created using:
-     *
-     * - the name of the class that contains the method to execute,
-     * - the name of the method to regularly execute,
-     * - and the value that is passed to the executed task.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return self::getTaskName($this->getClassName(), $this->getMethodName(), $this->getMethodParameter());
-    }
-
-    /**
-     * @ignore
-     */
-    public static function getTaskName($className, $methodName, $methodParameter = null)
-    {
-        return $className . '.' . $methodName . ($methodParameter == null ? '' : '_' . $methodParameter);
-    }
 }
diff --git a/core/ScheduledTaskTimetable.php b/core/ScheduledTaskTimetable.php
deleted file mode 100644
index 92aa1b340e..0000000000
--- a/core/ScheduledTaskTimetable.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-
-namespace Piwik;
-
-/**
- * This data structure holds the scheduled times for each active scheduled task.
- */
-class ScheduledTaskTimetable
-{
-    const TIMETABLE_OPTION_STRING = "TaskScheduler.timetable";
-
-    private $timetable;
-
-    public function __construct()
-    {
-        $optionData = Option::get(self::TIMETABLE_OPTION_STRING);
-        $unserializedTimetable = @unserialize($optionData);
-
-        $this->timetable = $unserializedTimetable === false ? array() : $unserializedTimetable;
-    }
-
-    public function getTimetable()
-    {
-        return $this->timetable;
-    }
-
-    public function setTimetable($timetable)
-    {
-        $this->timetable = $timetable;
-    }
-
-    public function removeInactiveTasks($activeTasks)
-    {
-        $activeTaskNames = array();
-        foreach ($activeTasks as $task) {
-            $activeTaskNames[] = $task->getName();
-        }
-        foreach (array_keys($this->timetable) as $taskName) {
-            if (!in_array($taskName, $activeTaskNames)) {
-                unset($this->timetable[$taskName]);
-            }
-        }
-    }
-
-    public function getScheduledTaskNames()
-    {
-        return array_keys($this->timetable);
-    }
-
-    public function getScheduledTaskTime($taskName)
-    {
-        return isset($this->timetable[$taskName]) ? Date::factory($this->timetable[$taskName]) : false;
-    }
-
-    /**
-     * Checks if the task should be executed
-     *
-     * Task has to be executed if :
-     *  - the task has already been scheduled once and the current system time is greater than the scheduled time.
-     *  - execution is forced, see $forceTaskExecution
-     *
-     * @param string $taskName
-     *
-     * @return boolean
-     */
-    public function shouldExecuteTask($taskName)
-    {
-        $forceTaskExecution = (defined('DEBUG_FORCE_SCHEDULED_TASKS') && DEBUG_FORCE_SCHEDULED_TASKS);
-
-        return $forceTaskExecution || ($this->taskHasBeenScheduledOnce($taskName) && time() >= $this->timetable[$taskName]);
-    }
-
-    /**
-     * Checks if a task should be rescheduled
-     *
-     * Task has to be rescheduled if :
-     *  - the task has to be executed
-     *  - the task has never been scheduled before
-     *
-     * @param string $taskName
-     *
-     * @return boolean
-     */
-    public function taskShouldBeRescheduled($taskName)
-    {
-        return !$this->taskHasBeenScheduledOnce($taskName) || $this->shouldExecuteTask($taskName);
-    }
-
-    public function rescheduleTask($task)
-    {
-        // update the scheduled time
-        $this->timetable[$task->getName()] = $task->getRescheduledTime();
-        $this->save();
-    }
-
-    public function save()
-    {
-        Option::set(self::TIMETABLE_OPTION_STRING, serialize($this->timetable));
-    }
-
-    public function getScheduledTimeForMethod($className, $methodName, $methodParameter = null)
-    {
-        $taskName = ScheduledTask::getTaskName($className, $methodName, $methodParameter);
-
-        return $this->taskHasBeenScheduledOnce($taskName) ? $this->timetable[$taskName] : false;
-    }
-
-    public function taskHasBeenScheduledOnce($taskName)
-    {
-        return isset($this->timetable[$taskName]);
-    }
-}
diff --git a/core/ScheduledTime.php b/core/ScheduledTime.php
deleted file mode 100644
index 3da4afe98b..0000000000
--- a/core/ScheduledTime.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-
-namespace Piwik;
-
-use Exception;
-use Piwik\ScheduledTime\Daily;
-use Piwik\ScheduledTime\Hourly;
-use Piwik\ScheduledTime\Monthly;
-use Piwik\ScheduledTime\Weekly;
-
-/**
- * Describes the interval on which a scheduled task is executed. Use the {@link factory()} method
- * to create ScheduledTime instances.
- *
- * @see \Piwik\ScheduledTask
- */
-abstract class ScheduledTime
-{
-    const PERIOD_NEVER = 'never';
-    const PERIOD_DAY = 'day';
-    const PERIOD_WEEK = 'week';
-    const PERIOD_MONTH = 'month';
-    const PERIOD_HOUR = 'hour';
-    const PERIOD_YEAR = 'year';
-    const PERIOD_RANGE = 'range';
-
-    /**
-     * @link http://php.net/manual/en/function.date.php, format string : 'G'
-     * Defaults to midnight
-     * @var integer
-     */
-    protected $hour = 0;
-
-    /**
-     * For weekly scheduling : http://php.net/manual/en/function.date.php, format string : 'N', defaults to Monday
-     * For monthly scheduling : day of the month (1 to 31) (note: will be capped at the latest day available the
-     * month), defaults to first day of the month
-     * @var integer
-     */
-    protected $day = 1;
-
-    protected $timezone = null;
-
-    /**
-     * @param $period
-     * @return Daily|Monthly|Weekly
-     * @throws \Exception
-     * @ignore
-     */
-    public static function getScheduledTimeForPeriod($period)
-    {
-        switch ($period) {
-            case self::PERIOD_MONTH:
-                return new Monthly();
-            case self::PERIOD_WEEK:
-                return new Weekly();
-            case self::PERIOD_DAY:
-                return new Daily();
-            case self::PERIOD_HOUR:
-                return new Hourly();
-
-            default:
-                throw new Exception('period ' . $period . 'is undefined.');
-        }
-    }
-
-    /**
-     * Returns the system time used by subclasses to compute schedulings.
-     * This method has been introduced so unit tests can override the current system time.
-     * @return int
-     */
-    protected function getTime()
-    {
-        return time();
-    }
-
-    /**
-     * Computes the next scheduled time based on the system time at which the method has been called and
-     * the underlying scheduling interval.
-     *
-     * @abstract
-     * @return integer Returns the rescheduled time measured in the number of seconds since the Unix Epoch
-     * @ignore
-     */
-    abstract public function getRescheduledTime();
-
-    /**
-     * Sets the day of the period to execute the scheduled task. Not a valid operation for all period types.
-     *
-     * @abstract
-     * @param  int $_day a number describing the day to set. Its meaning depends on the ScheduledTime's period type.
-     * @throws Exception if method not supported by subclass or parameter _day is invalid
-     */
-    abstract public function setDay($_day);
-
-    /**
-     * Sets the hour of the day on which the task should be executed.
-     *
-     * @param  int $hour Must be `>= 0` and `< 24`.
-     * @throws Exception If the current scheduled period is **hourly** or if `$hour` is invalid.
-     * @api
-     */
-    public function setHour($hour)
-    {
-        if (!($hour >= 0 && $hour < 24)) {
-            throw new Exception ("Invalid hour parameter, must be >=0 and < 24");
-        }
-
-        $this->hour = $hour;
-    }
-
-    /**
-     * By setting a timezone you make sure the scheduled task will be run at the requested time in the
-     * given timezone. This is useful for instance in case you want to make sure a task runs at midnight in a website's
-     * timezone.
-     *
-     * @param string $timezone
-     */
-    public function setTimezone($timezone)
-    {
-        $this->timezone = $timezone;
-    }
-
-    protected function adjustTimezone($rescheduledTime)
-    {
-        if (is_null($this->timezone)) {
-            return $rescheduledTime;
-        }
-
-        $arbitraryDateInUTC = Date::factory('2011-01-01');
-        $dateInTimezone     = Date::factory($arbitraryDateInUTC, $this->timezone);
-
-        $midnightInTimezone = date('H', $dateInTimezone->getTimestamp());
-
-        if ($arbitraryDateInUTC->isEarlier($dateInTimezone)) {
-            $hoursDifference = 0 - $midnightInTimezone;
-        } else {
-            $hoursDifference = 24 - $midnightInTimezone;
-        }
-
-        $hoursDifference  = $hoursDifference % 24;
-
-        $rescheduledTime += (3600 * $hoursDifference);
-
-        if ($this->getTime() > $rescheduledTime) {
-            // make sure the rescheduled date is in the future
-            $rescheduledTime = (24 * 3600) + $rescheduledTime;
-        }
-
-        return $rescheduledTime;
-    }
-
-    /**
-     * Computes the delta in seconds needed to adjust the rescheduled time to the required hour.
-     *
-     * @param int $rescheduledTime The rescheduled time to be adjusted
-     * @return int adjusted rescheduled time
-     */
-    protected function adjustHour($rescheduledTime)
-    {
-        if ($this->hour !== null) {
-            // Reset the number of minutes and set the scheduled hour to the one specified with setHour()
-            $rescheduledTime = mktime($this->hour,
-                0,
-                date('s', $rescheduledTime),
-                date('n', $rescheduledTime),
-                date('j', $rescheduledTime),
-                date('Y', $rescheduledTime)
-            );
-        }
-        return $rescheduledTime;
-    }
-
-    /**
-     * Returns a new ScheduledTime instance using a string description of the scheduled period type
-     * and a string description of the day within the period to execute the task on.
-     *
-     * @param string $periodType The scheduled period type. Can be `'hourly'`, `'daily'`, `'weekly'`, or `'monthly'`.
-     * @param bool|false|int|string $periodDay A string describing the day within the scheduled period to execute
-     *                                    the task on. Only valid for week and month periods.
-     *
-     *                                    If `'weekly'` is supplied for `$periodType`, this should be a day
-     *                                    of the week, for example, `'monday'` or `'tuesday'`.
-     *
-     *                                    If `'monthly'` is supplied for `$periodType`, this can be a numeric
-     *                                    day in the month or a day in one week of the month. For example,
-     *                                    `12`, `23`, `'first sunday'` or `'fourth tuesday'`.
-     * @throws Exception
-     * @api
-     */
-    public static function factory($periodType, $periodDay = false)
-    {
-        switch ($periodType) {
-            case 'hourly':
-                return new Hourly();
-            case 'daily':
-                return new Daily();
-            case 'weekly':
-                $result = new Weekly();
-                if ($periodDay !== false) {
-                    $result->setDay($periodDay);
-                }
-                return $result;
-            case 'monthly':
-                $result = new Monthly($periodDay);
-                if ($periodDay !== false) {
-                    if (is_int($periodDay)) {
-                        $result->setDay($periodDay);
-                    } else {
-                        $result->setDayOfWeekFromString($periodDay);
-                    }
-                }
-                return $result;
-            default:
-                throw new Exception("Unsupported scheduled period type: '$periodType'. Supported values are"
-                                  . " 'hourly', 'daily', 'weekly' or 'monthly'.");
-        }
-    }
-}
diff --git a/core/ScheduledTime/Daily.php b/core/ScheduledTime/Daily.php
deleted file mode 100644
index df05dc2f38..0000000000
--- a/core/ScheduledTime/Daily.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\ScheduledTime;
-
-use Exception;
-use Piwik\ScheduledTime;
-
-/**
- * Daily class is used to schedule tasks every day.
- *
- * @see ScheduledTask
- */
-class Daily extends ScheduledTime
-{
-    /**
-     * @see ScheduledTime::getRescheduledTime
-     * @return int
-     *
-     */
-    public function getRescheduledTime()
-    {
-        $currentTime = $this->getTime();
-
-        // Add one day
-        $rescheduledTime = mktime(date('H', $currentTime),
-            date('i', $currentTime),
-            date('s', $currentTime),
-            date('n', $currentTime),
-            date('j', $currentTime) + 1,
-            date('Y', $currentTime)
-        );
-
-        // Adjusts the scheduled hour
-        $rescheduledTime = $this->adjustHour($rescheduledTime);
-        $rescheduledTime = $this->adjustTimezone($rescheduledTime);
-
-        return $rescheduledTime;
-    }
-
-    /**
-     * @see ScheduledTime::setDay
-     * @param int $_day
-     * @throws \Exception
-     * @ignore
-     */
-    public function setDay($_day)
-    {
-        throw new Exception ("Method not supported");
-    }
-}
diff --git a/core/ScheduledTime/Hourly.php b/core/ScheduledTime/Hourly.php
deleted file mode 100644
index 4fc8c3ed16..0000000000
--- a/core/ScheduledTime/Hourly.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\ScheduledTime;
-
-use Exception;
-use Piwik\ScheduledTime;
-
-/**
- * Hourly class is used to schedule tasks every hour.
- *
- * @see ScheduledTask
- *
- */
-class Hourly extends ScheduledTime
-{
-    /**
-     * @see ScheduledTime::getRescheduledTime
-     * @return int
-     */
-    public function getRescheduledTime()
-    {
-        $currentTime = $this->getTime();
-
-        // Adds one hour and reset the number of minutes
-        $rescheduledTime = mktime(date('H', $currentTime) + 1,
-            0,
-            date('s', $currentTime),
-            date('n', $currentTime),
-            date('j', $currentTime),
-            date('Y', $currentTime)
-        );
-        return $rescheduledTime;
-    }
-
-    /**
-     * @see ScheduledTime::setHour
-     * @param int $_hour
-     * @throws \Exception
-     * @return int
-     */
-    public function setHour($_hour)
-    {
-        throw new Exception ("Method not supported");
-    }
-
-    /**
-     * @see ScheduledTime::setDay
-     * @param int $_day
-     * @throws \Exception
-     * @return int
-     */
-    public function setDay($_day)
-    {
-        throw new Exception ("Method not supported");
-    }
-}
diff --git a/core/ScheduledTime/Monthly.php b/core/ScheduledTime/Monthly.php
deleted file mode 100644
index 84189f9bad..0000000000
--- a/core/ScheduledTime/Monthly.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\ScheduledTime;
-
-use Exception;
-use Piwik\ScheduledTime;
-
-/**
- * Monthly class is used to schedule tasks every month.
- *
- * @see ScheduledTask
- *
- */
-class Monthly extends ScheduledTime
-{
-    /**
-     * List of available week number strings used in setDayOfWeekFromString.
-     */
-    private static $weekNumberStringToInt = array('first' => 0, 'second' => 1, 'third' => 2, 'fourth' => 3);
-
-    /**
-     * Day of the week for scheduled time.
-     *
-     * @var int
-     */
-    private $dayOfWeek = null;
-
-    /**
-     * Week number for scheduled time.
-     *
-     * @var int
-     */
-    private $week = null;
-
-    public function setDayOfWeekFromString($day)
-    {
-        @list($weekNumberString, $dayNumberString) = explode(' ', $day);
-
-        // get day number
-        $day = Weekly::getDayIntFromString($dayNumberString) % 7;
-
-        // get week number
-        $weekNumberString = strtolower($weekNumberString);
-        if (isset(self::$weekNumberStringToInt[$weekNumberString])) {
-            $week = self::$weekNumberStringToInt[$weekNumberString];
-        } else {
-            throw new Exception("Invalid week describer in ScheduledTime\\Monthly::setDayOfWeekFromString: '$weekNumberString'. "
-                              . "Supported values are 'first', 'second', 'third', 'fourth'.");
-        }
-
-        $this->setDayOfWeek($day, $week);
-    }
-
-    /**
-     * @return int
-     */
-    public function getRescheduledTime()
-    {
-        $currentTime = $this->getTime();
-
-        // Adds one month
-        $rescheduledTime = mktime(date('H', $currentTime),
-            date('i', $currentTime),
-            date('s', $currentTime),
-            date('n', $currentTime) + 1,
-            1,
-            date('Y', $currentTime)
-        );
-
-        $nextMonthLength = date('t', $rescheduledTime);
-
-        // Sets scheduled day
-        $scheduledDay = date('j', $currentTime);
-
-        if ($this->day !== null) {
-            $scheduledDay = $this->day;
-        }
-
-        if ($this->dayOfWeek !== null
-            && $this->week !== null
-        ) {
-            $newTime = $rescheduledTime + $this->week * 7 * 86400;
-            while (date("w", $newTime) != $this->dayOfWeek % 7) // modulus for sanity check
-            {
-                $newTime += 86400;
-            }
-            $scheduledDay = ($newTime - $rescheduledTime) / 86400 + 1;
-        }
-
-        // Caps scheduled day
-        if ($scheduledDay > $nextMonthLength) {
-            $scheduledDay = $nextMonthLength;
-        }
-
-        // Adjusts the scheduled day
-        $rescheduledTime += ($scheduledDay - 1) * 86400;
-
-        // Adjusts the scheduled hour
-        $rescheduledTime = $this->adjustHour($rescheduledTime);
-        $rescheduledTime = $this->adjustTimezone($rescheduledTime);
-
-        return $rescheduledTime;
-    }
-
-    /**
-     * @param int $_day the day to set, has to be >= 1 and < 32
-     * @throws Exception if parameter _day is invalid
-     */
-    public function setDay($_day)
-    {
-        if (!($_day >= 1 && $_day < 32)) {
-            throw new Exception ("Invalid day parameter, must be >=1 and < 32");
-        }
-
-        $this->day = $_day;
-    }
-
-    /**
-     * Makes this scheduled time execute on a particular day of the week on each month.
-     *
-     * @param int $_day the day of the week to use, between 0-6 (inclusive). 0 -> Sunday
-     * @param int $_week the week to use, between 0-3 (inclusive)
-     * @throws Exception if either parameter is invalid
-     */
-    public function setDayOfWeek($_day, $_week)
-    {
-        if (!($_day >= 0 && $_day < 7)) {
-            throw new Exception("Invalid day of week parameter, must be >= 0 & < 7");
-        }
-
-        if (!($_week >= 0 && $_week < 4)) {
-            throw new Exception("Invalid week number, must be >= 1 & < 4");
-        }
-
-        $this->dayOfWeek = $_day;
-        $this->week = $_week;
-    }
-}
diff --git a/core/ScheduledTime/Weekly.php b/core/ScheduledTime/Weekly.php
deleted file mode 100644
index 5ae499b9eb..0000000000
--- a/core/ScheduledTime/Weekly.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\ScheduledTime;
-
-use Exception;
-use Piwik\ScheduledTime;
-
-/**
- * Weekly class is used to schedule tasks every week.
- *
- * @see ScheduledTask
- *
- */
-class Weekly extends ScheduledTime
-{
-    /**
-     * @see ScheduledTime::getRescheduledTime
-     * @return int
-     */
-    public function getRescheduledTime()
-    {
-        $currentTime = $this->getTime();
-
-        $daysFromNow = 7;
-
-        // Adjusts the scheduled day
-        if ($this->day !== null) {
-            $daysFromNow = ($this->day - date('N', $currentTime) + 7) % 7;
-
-            if ($daysFromNow == 0) {
-                $daysFromNow = 7;
-            }
-        }
-
-        // Adds correct number of days
-        $rescheduledTime = mktime(date('H', $currentTime),
-            date('i', $currentTime),
-            date('s', $currentTime),
-            date('n', $currentTime),
-            date('j', $currentTime) + $daysFromNow,
-            date('Y', $currentTime)
-        );
-
-        // Adjusts the scheduled hour
-        $rescheduledTime = $this->adjustHour($rescheduledTime);
-        $rescheduledTime = $this->adjustTimezone($rescheduledTime);
-
-        return $rescheduledTime;
-    }
-
-    /**
-     * @param int $day the day to set, has to be >= 1 and < 8
-     * @throws Exception if parameter _day is invalid
-     */
-    public function setDay($day)
-    {
-        if (!is_int($day)) {
-            $day = self::getDayIntFromString($day);
-        }
-
-        if (!($day >= 1 && $day < 8)) {
-            throw new Exception ("Invalid day parameter, must be >=1 and < 8");
-        }
-
-        $this->day = $day;
-    }
-
-    public static function getDayIntFromString($dayString)
-    {
-        $time = strtotime($dayString);
-        if ($time === false) {
-            throw new Exception("Invalid day string '$dayString'. Must be 'monday', 'tuesday', etc.");
-        }
-
-        return date("N", $time);
-    }
-}
diff --git a/core/Scheduler/Schedule/Daily.php b/core/Scheduler/Schedule/Daily.php
new file mode 100644
index 0000000000..7b1248f187
--- /dev/null
+++ b/core/Scheduler/Schedule/Daily.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Scheduler\Schedule;
+
+use Exception;
+
+/**
+ * Daily class is used to schedule tasks every day.
+ *
+ * @see \Piwik\Scheduler\Task
+ */
+class Daily extends Schedule
+{
+    /**
+     * @see ScheduledTime::getRescheduledTime
+     * @return int
+     *
+     */
+    public function getRescheduledTime()
+    {
+        $currentTime = $this->getTime();
+
+        // Add one day
+        $rescheduledTime = mktime(date('H', $currentTime),
+            date('i', $currentTime),
+            date('s', $currentTime),
+            date('n', $currentTime),
+            date('j', $currentTime) + 1,
+            date('Y', $currentTime)
+        );
+
+        // Adjusts the scheduled hour
+        $rescheduledTime = $this->adjustHour($rescheduledTime);
+        $rescheduledTime = $this->adjustTimezone($rescheduledTime);
+
+        return $rescheduledTime;
+    }
+
+    /**
+     * @see ScheduledTime::setDay
+     * @param int $_day
+     * @throws \Exception
+     * @ignore
+     */
+    public function setDay($_day)
+    {
+        throw new Exception ("Method not supported");
+    }
+}
diff --git a/core/Scheduler/Schedule/Hourly.php b/core/Scheduler/Schedule/Hourly.php
new file mode 100644
index 0000000000..5830d378ed
--- /dev/null
+++ b/core/Scheduler/Schedule/Hourly.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Scheduler\Schedule;
+
+use Exception;
+
+/**
+ * Hourly class is used to schedule tasks every hour.
+ *
+ * @see \Piwik\Scheduler\Task
+ */
+class Hourly extends Schedule
+{
+    /**
+     * @see ScheduledTime::getRescheduledTime
+     * @return int
+     */
+    public function getRescheduledTime()
+    {
+        $currentTime = $this->getTime();
+
+        // Adds one hour and reset the number of minutes
+        $rescheduledTime = mktime(date('H', $currentTime) + 1,
+            0,
+            date('s', $currentTime),
+            date('n', $currentTime),
+            date('j', $currentTime),
+            date('Y', $currentTime)
+        );
+        return $rescheduledTime;
+    }
+
+    /**
+     * @see ScheduledTime::setHour
+     * @param int $_hour
+     * @throws \Exception
+     * @return int
+     */
+    public function setHour($_hour)
+    {
+        throw new Exception ("Method not supported");
+    }
+
+    /**
+     * @see ScheduledTime::setDay
+     * @param int $_day
+     * @throws \Exception
+     * @return int
+     */
+    public function setDay($_day)
+    {
+        throw new Exception ("Method not supported");
+    }
+}
diff --git a/core/Scheduler/Schedule/Monthly.php b/core/Scheduler/Schedule/Monthly.php
new file mode 100644
index 0000000000..64a96f69dd
--- /dev/null
+++ b/core/Scheduler/Schedule/Monthly.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Scheduler\Schedule;
+
+use Exception;
+
+/**
+ * Monthly class is used to schedule tasks every month.
+ *
+ * @see \Piwik\Scheduler\Task
+ */
+class Monthly extends Schedule
+{
+    /**
+     * List of available week number strings used in setDayOfWeekFromString.
+     */
+    private static $weekNumberStringToInt = array('first' => 0, 'second' => 1, 'third' => 2, 'fourth' => 3);
+
+    /**
+     * Day of the week for scheduled time.
+     *
+     * @var int
+     */
+    private $dayOfWeek = null;
+
+    /**
+     * Week number for scheduled time.
+     *
+     * @var int
+     */
+    private $week = null;
+
+    public function setDayOfWeekFromString($day)
+    {
+        @list($weekNumberString, $dayNumberString) = explode(' ', $day);
+
+        // get day number
+        $day = Weekly::getDayIntFromString($dayNumberString) % 7;
+
+        // get week number
+        $weekNumberString = strtolower($weekNumberString);
+        if (isset(self::$weekNumberStringToInt[$weekNumberString])) {
+            $week = self::$weekNumberStringToInt[$weekNumberString];
+        } else {
+            throw new Exception("Invalid week describer in Schedule\\Monthly::setDayOfWeekFromString: '$weekNumberString'. "
+                              . "Supported values are 'first', 'second', 'third', 'fourth'.");
+        }
+
+        $this->setDayOfWeek($day, $week);
+    }
+
+    /**
+     * @return int
+     */
+    public function getRescheduledTime()
+    {
+        $currentTime = $this->getTime();
+
+        // Adds one month
+        $rescheduledTime = mktime(date('H', $currentTime),
+            date('i', $currentTime),
+            date('s', $currentTime),
+            date('n', $currentTime) + 1,
+            1,
+            date('Y', $currentTime)
+        );
+
+        $nextMonthLength = date('t', $rescheduledTime);
+
+        // Sets scheduled day
+        $scheduledDay = date('j', $currentTime);
+
+        if ($this->day !== null) {
+            $scheduledDay = $this->day;
+        }
+
+        if ($this->dayOfWeek !== null
+            && $this->week !== null
+        ) {
+            $newTime = $rescheduledTime + $this->week * 7 * 86400;
+            while (date("w", $newTime) != $this->dayOfWeek % 7) // modulus for sanity check
+            {
+                $newTime += 86400;
+            }
+            $scheduledDay = ($newTime - $rescheduledTime) / 86400 + 1;
+        }
+
+        // Caps scheduled day
+        if ($scheduledDay > $nextMonthLength) {
+            $scheduledDay = $nextMonthLength;
+        }
+
+        // Adjusts the scheduled day
+        $rescheduledTime += ($scheduledDay - 1) * 86400;
+
+        // Adjusts the scheduled hour
+        $rescheduledTime = $this->adjustHour($rescheduledTime);
+        $rescheduledTime = $this->adjustTimezone($rescheduledTime);
+
+        return $rescheduledTime;
+    }
+
+    /**
+     * @param int $_day the day to set, has to be >= 1 and < 32
+     * @throws Exception if parameter _day is invalid
+     */
+    public function setDay($_day)
+    {
+        if (!($_day >= 1 && $_day < 32)) {
+            throw new Exception ("Invalid day parameter, must be >=1 and < 32");
+        }
+
+        $this->day = $_day;
+    }
+
+    /**
+     * Makes this scheduled time execute on a particular day of the week on each month.
+     *
+     * @param int $_day the day of the week to use, between 0-6 (inclusive). 0 -> Sunday
+     * @param int $_week the week to use, between 0-3 (inclusive)
+     * @throws Exception if either parameter is invalid
+     */
+    public function setDayOfWeek($_day, $_week)
+    {
+        if (!($_day >= 0 && $_day < 7)) {
+            throw new Exception("Invalid day of week parameter, must be >= 0 & < 7");
+        }
+
+        if (!($_week >= 0 && $_week < 4)) {
+            throw new Exception("Invalid week number, must be >= 1 & < 4");
+        }
+
+        $this->dayOfWeek = $_day;
+        $this->week = $_week;
+    }
+}
diff --git a/core/Scheduler/Schedule/Schedule.php b/core/Scheduler/Schedule/Schedule.php
new file mode 100644
index 0000000000..4642389b44
--- /dev/null
+++ b/core/Scheduler/Schedule/Schedule.php
@@ -0,0 +1,224 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Scheduler\Schedule;
+
+use Exception;
+use Piwik\Date;
+
+/**
+ * Describes the interval on which a scheduled task is executed. Use the {@link factory()} method
+ * to create Schedule instances.
+ *
+ * @see \Piwik\Scheduler\Task
+ */
+abstract class Schedule
+{
+    const PERIOD_NEVER = 'never';
+    const PERIOD_DAY = 'day';
+    const PERIOD_WEEK = 'week';
+    const PERIOD_MONTH = 'month';
+    const PERIOD_HOUR = 'hour';
+    const PERIOD_YEAR = 'year';
+    const PERIOD_RANGE = 'range';
+
+    /**
+     * @link http://php.net/manual/en/function.date.php, format string : 'G'
+     * Defaults to midnight
+     * @var integer
+     */
+    protected $hour = 0;
+
+    /**
+     * For weekly scheduling : http://php.net/manual/en/function.date.php, format string : 'N', defaults to Monday
+     * For monthly scheduling : day of the month (1 to 31) (note: will be capped at the latest day available the
+     * month), defaults to first day of the month
+     * @var integer
+     */
+    protected $day = 1;
+
+    protected $timezone = null;
+
+    /**
+     * @param $period
+     * @return Daily|Monthly|Weekly
+     * @throws \Exception
+     * @ignore
+     */
+    public static function getScheduledTimeForPeriod($period)
+    {
+        switch ($period) {
+            case self::PERIOD_MONTH:
+                return new Monthly();
+            case self::PERIOD_WEEK:
+                return new Weekly();
+            case self::PERIOD_DAY:
+                return new Daily();
+            case self::PERIOD_HOUR:
+                return new Hourly();
+
+            default:
+                throw new Exception('period ' . $period . 'is undefined.');
+        }
+    }
+
+    /**
+     * Returns the system time used by subclasses to compute schedulings.
+     * This method has been introduced so unit tests can override the current system time.
+     * @return int
+     */
+    protected function getTime()
+    {
+        return time();
+    }
+
+    /**
+     * Computes the next scheduled time based on the system time at which the method has been called and
+     * the underlying scheduling interval.
+     *
+     * @abstract
+     * @return integer Returns the rescheduled time measured in the number of seconds since the Unix Epoch
+     * @ignore
+     */
+    abstract public function getRescheduledTime();
+
+    /**
+     * Sets the day of the period to execute the scheduled task. Not a valid operation for all period types.
+     *
+     * @abstract
+     * @param  int $_day a number describing the day to set. Its meaning depends on the Schedule's period type.
+     * @throws Exception if method not supported by subclass or parameter _day is invalid
+     */
+    abstract public function setDay($_day);
+
+    /**
+     * Sets the hour of the day on which the task should be executed.
+     *
+     * @param  int $hour Must be `>= 0` and `< 24`.
+     * @throws Exception If the current scheduled period is **hourly** or if `$hour` is invalid.
+     * @api
+     */
+    public function setHour($hour)
+    {
+        if (!($hour >= 0 && $hour < 24)) {
+            throw new Exception ("Invalid hour parameter, must be >=0 and < 24");
+        }
+
+        $this->hour = $hour;
+    }
+
+    /**
+     * By setting a timezone you make sure the scheduled task will be run at the requested time in the
+     * given timezone. This is useful for instance in case you want to make sure a task runs at midnight in a website's
+     * timezone.
+     *
+     * @param string $timezone
+     */
+    public function setTimezone($timezone)
+    {
+        $this->timezone = $timezone;
+    }
+
+    protected function adjustTimezone($rescheduledTime)
+    {
+        if (is_null($this->timezone)) {
+            return $rescheduledTime;
+        }
+
+        $arbitraryDateInUTC = Date::factory('2011-01-01');
+        $dateInTimezone     = Date::factory($arbitraryDateInUTC, $this->timezone);
+
+        $midnightInTimezone = date('H', $dateInTimezone->getTimestamp());
+
+        if ($arbitraryDateInUTC->isEarlier($dateInTimezone)) {
+            $hoursDifference = 0 - $midnightInTimezone;
+        } else {
+            $hoursDifference = 24 - $midnightInTimezone;
+        }
+
+        $hoursDifference  = $hoursDifference % 24;
+
+        $rescheduledTime += (3600 * $hoursDifference);
+
+        if ($this->getTime() > $rescheduledTime) {
+            // make sure the rescheduled date is in the future
+            $rescheduledTime = (24 * 3600) + $rescheduledTime;
+        }
+
+        return $rescheduledTime;
+    }
+
+    /**
+     * Computes the delta in seconds needed to adjust the rescheduled time to the required hour.
+     *
+     * @param int $rescheduledTime The rescheduled time to be adjusted
+     * @return int adjusted rescheduled time
+     */
+    protected function adjustHour($rescheduledTime)
+    {
+        if ($this->hour !== null) {
+            // Reset the number of minutes and set the scheduled hour to the one specified with setHour()
+            $rescheduledTime = mktime($this->hour,
+                0,
+                date('s', $rescheduledTime),
+                date('n', $rescheduledTime),
+                date('j', $rescheduledTime),
+                date('Y', $rescheduledTime)
+            );
+        }
+        return $rescheduledTime;
+    }
+
+    /**
+     * Returns a new Schedule instance using a string description of the scheduled period type
+     * and a string description of the day within the period to execute the task on.
+     *
+     * @param string $periodType The scheduled period type. Can be `'hourly'`, `'daily'`, `'weekly'`, or `'monthly'`.
+     * @param bool|false|int|string $periodDay A string describing the day within the scheduled period to execute
+     *                                    the task on. Only valid for week and month periods.
+     *
+     *                                    If `'weekly'` is supplied for `$periodType`, this should be a day
+     *                                    of the week, for example, `'monday'` or `'tuesday'`.
+     *
+     *                                    If `'monthly'` is supplied for `$periodType`, this can be a numeric
+     *                                    day in the month or a day in one week of the month. For example,
+     *                                    `12`, `23`, `'first sunday'` or `'fourth tuesday'`.
+     * @return Hourly|Daily|Weekly|Monthly
+     * @throws Exception
+     * @api
+     */
+    public static function factory($periodType, $periodDay = false)
+    {
+        switch ($periodType) {
+            case 'hourly':
+                return new Hourly();
+            case 'daily':
+                return new Daily();
+            case 'weekly':
+                $result = new Weekly();
+                if ($periodDay !== false) {
+                    $result->setDay($periodDay);
+                }
+                return $result;
+            case 'monthly':
+                $result = new Monthly($periodDay);
+                if ($periodDay !== false) {
+                    if (is_int($periodDay)) {
+                        $result->setDay($periodDay);
+                    } else {
+                        $result->setDayOfWeekFromString($periodDay);
+                    }
+                }
+                return $result;
+            default:
+                throw new Exception("Unsupported scheduled period type: '$periodType'. Supported values are"
+                                  . " 'hourly', 'daily', 'weekly' or 'monthly'.");
+        }
+    }
+}
diff --git a/core/Scheduler/Schedule/Weekly.php b/core/Scheduler/Schedule/Weekly.php
new file mode 100644
index 0000000000..2f984c2db6
--- /dev/null
+++ b/core/Scheduler/Schedule/Weekly.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Scheduler\Schedule;
+
+use Exception;
+
+/**
+ * Weekly class is used to schedule tasks every week.
+ *
+ * @see \Piwik\Scheduler\Task
+ */
+class Weekly extends Schedule
+{
+    /**
+     * @see ScheduledTime::getRescheduledTime
+     * @return int
+     */
+    public function getRescheduledTime()
+    {
+        $currentTime = $this->getTime();
+
+        $daysFromNow = 7;
+
+        // Adjusts the scheduled day
+        if ($this->day !== null) {
+            $daysFromNow = ($this->day - date('N', $currentTime) + 7) % 7;
+
+            if ($daysFromNow == 0) {
+                $daysFromNow = 7;
+            }
+        }
+
+        // Adds correct number of days
+        $rescheduledTime = mktime(date('H', $currentTime),
+            date('i', $currentTime),
+            date('s', $currentTime),
+            date('n', $currentTime),
+            date('j', $currentTime) + $daysFromNow,
+            date('Y', $currentTime)
+        );
+
+        // Adjusts the scheduled hour
+        $rescheduledTime = $this->adjustHour($rescheduledTime);
+        $rescheduledTime = $this->adjustTimezone($rescheduledTime);
+
+        return $rescheduledTime;
+    }
+
+    /**
+     * @param int $day the day to set, has to be >= 1 and < 8
+     * @throws Exception if parameter _day is invalid
+     */
+    public function setDay($day)
+    {
+        if (!is_int($day)) {
+            $day = self::getDayIntFromString($day);
+        }
+
+        if (!($day >= 1 && $day < 8)) {
+            throw new Exception ("Invalid day parameter, must be >=1 and < 8");
+        }
+
+        $this->day = $day;
+    }
+
+    public static function getDayIntFromString($dayString)
+    {
+        $time = strtotime($dayString);
+        if ($time === false) {
+            throw new Exception("Invalid day string '$dayString'. Must be 'monday', 'tuesday', etc.");
+        }
+
+        return date("N", $time);
+    }
+}
diff --git a/core/Scheduler/Scheduler.php b/core/Scheduler/Scheduler.php
new file mode 100644
index 0000000000..7156e1be9c
--- /dev/null
+++ b/core/Scheduler/Scheduler.php
@@ -0,0 +1,192 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Scheduler;
+
+use Exception;
+use Piwik\Timer;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Schedules task execution.
+ *
+ * A scheduled task is a callback that should be executed every so often (such as daily,
+ * weekly, monthly, etc.). They are registered by extending {@link \Piwik\Plugin\Tasks}.
+ *
+ * Tasks are executed when the `core:archive` command is executed.
+ *
+ * ### Examples
+ *
+ * **Scheduling a task**
+ *
+ *     class Tasks extends \Piwik\Plugin\Tasks
+ *     {
+ *         public function schedule()
+ *         {
+ *             $this->hourly('myTask');  // myTask() will be executed once every hour
+ *         }
+ *         public function myTask()
+ *         {
+ *             // do something
+ *         }
+ *     }
+ *
+ * **Executing all pending tasks**
+ *
+ *     $results = $scheduler->run();
+ *     $task1Result = $results[0];
+ *     $task1Name = $task1Result['task'];
+ *     $task1Output = $task1Result['output'];
+ *
+ *     echo "Executed task '$task1Name'. Task output:\n$task1Output";
+ */
+class Scheduler
+{
+    /**
+     * Is the scheduler running any task.
+     * @var bool
+     */
+    private $isRunningTask = false;
+
+    /**
+     * @var Timetable
+     */
+    private $timetable;
+
+    /**
+     * @var TaskLoader
+     */
+    private $loader;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    public function __construct(TaskLoader $loader, LoggerInterface $logger)
+    {
+        $this->timetable = new Timetable();
+        $this->loader = $loader;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Executes tasks that are scheduled to run, then reschedules them.
+     *
+     * @return array An array describing the results of scheduled task execution. Each element
+     *               in the array will have the following format:
+     *
+     *               ```
+     *               array(
+     *                   'task' => 'task name',
+     *                   'output' => '... task output ...'
+     *               )
+     *               ```
+     */
+    public function run()
+    {
+        $tasks = $this->loader->loadTasks();
+
+        $this->logger->debug('{count} scheduled tasks loaded', array('count' => count($tasks)));
+
+        // remove from timetable tasks that are not active anymore
+        $this->timetable->removeInactiveTasks($tasks);
+
+        // for every priority level, starting with the highest and concluding with the lowest
+        $executionResults = array();
+        for ($priority = Task::HIGHEST_PRIORITY;
+             $priority <= Task::LOWEST_PRIORITY;
+             ++$priority) {
+            // loop through each task
+            foreach ($tasks as $task) {
+                // if the task does not have the current priority level, don't execute it yet
+                if ($task->getPriority() != $priority) {
+                    continue;
+                }
+
+                $taskName = $task->getName();
+                $shouldExecuteTask = $this->timetable->shouldExecuteTask($taskName);
+
+                if ($this->timetable->taskShouldBeRescheduled($taskName)) {
+                    $this->timetable->rescheduleTask($task);
+                }
+
+                if ($shouldExecuteTask) {
+                    $this->isRunningTask = true;
+                    $message = $this->executeTask($task);
+                    $this->isRunningTask = false;
+
+                    $executionResults[] = array('task' => $taskName, 'output' => $message);
+                }
+            }
+        }
+
+        return $executionResults;
+    }
+
+    /**
+     * Determines a task's scheduled time and persists it, overwriting the previous scheduled time.
+     *
+     * Call this method if your task's scheduled time has changed due to, for example, an option that
+     * was changed.
+     *
+     * @param Task $task Describes the scheduled task being rescheduled.
+     * @api
+     */
+    public function rescheduleTask(Task $task)
+    {
+        $this->logger->debug('Rescheduling task {task}', array('task' => $task->getName()));
+
+        $this->timetable->rescheduleTask($task);
+    }
+
+    /**
+     * Returns true if the scheduler is currently running a task.
+     *
+     * @return bool
+     */
+    public function isRunningTask()
+    {
+        return $this->isRunningTask;
+    }
+
+    /**
+     * Return the next scheduled time given the class and method names of a scheduled task.
+     *
+     * @param string $className The name of the class that contains the scheduled task method.
+     * @param string $methodName The name of the scheduled task method.
+     * @param string|null $methodParameter Optional method parameter.
+     * @return mixed int|bool The time in miliseconds when the scheduled task will be executed
+     *                        next or false if it is not scheduled to run.
+     */
+    public function getScheduledTimeForMethod($className, $methodName, $methodParameter = null)
+    {
+        return $this->timetable->getScheduledTimeForMethod($className, $methodName, $methodParameter);
+    }
+
+    /**
+     * Executes the given task
+     *
+     * @param Task $task
+     * @return string
+     */
+    private function executeTask($task)
+    {
+        $this->logger->debug('Running task {task}', array('task' => $task->getName()));
+
+        try {
+            $timer = new Timer();
+            call_user_func(array($task->getObjectInstance(), $task->getMethodName()), $task->getMethodParameter());
+            $message = $timer->__toString();
+        } catch (Exception $e) {
+            $message = 'ERROR: ' . $e->getMessage();
+        }
+
+        return $message;
+    }
+}
diff --git a/core/Scheduler/Task.php b/core/Scheduler/Task.php
new file mode 100644
index 0000000000..f3c4381a22
--- /dev/null
+++ b/core/Scheduler/Task.php
@@ -0,0 +1,200 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Scheduler;
+
+use Exception;
+use Piwik\Scheduler\Schedule\Schedule;
+
+/**
+ * Describes a task that should be executed on a given time.
+ *
+ * See the {@link TaskScheduler} docs to learn more about scheduled tasks.
+ *
+ * @api
+ */
+class Task
+{
+    const LOWEST_PRIORITY = 12;
+    const LOW_PRIORITY = 9;
+    const NORMAL_PRIORITY = 6;
+    const HIGH_PRIORITY = 3;
+    const HIGHEST_PRIORITY = 0;
+
+    /**
+     * Object instance on which the method will be executed by the task scheduler
+     * @var string
+     */
+    private $objectInstance;
+
+    /**
+     * Class name where the specified method is located
+     * @var string
+     */
+    private $className;
+
+    /**
+     * Class method to run when task is scheduled
+     * @var string
+     */
+    private $methodName;
+
+    /**
+     * Parameter to pass to the executed method
+     * @var string
+     */
+    private $methodParameter;
+
+    /**
+     * The scheduled time policy
+     * @var Schedule
+     */
+    private $scheduledTime;
+
+    /**
+     * The priority of a task. Affects the order in which this task will be run.
+     * @var int
+     */
+    private $priority;
+
+    /**
+     * @param mixed $objectInstance The object or class that contains the method to execute regularly.
+     *                              Usually this will be a {@link Plugin} instance.
+     * @param string $methodName The name of the method that will be regularly executed.
+     * @param mixed|null $methodParameter An optional parameter to pass to the method when executed.
+     *                                    Must be convertible to string.
+     * @param Schedule|null $scheduledTime A {@link Schedule} instance that describes when the method
+     *                                          should be executed and how long before the next execution.
+     * @param int $priority The priority of the task. Tasks with a higher priority will be executed first.
+     *                      Tasks with low priority will be executed last.
+     * @throws Exception
+     */
+    public function __construct($objectInstance, $methodName, $methodParameter, $scheduledTime,
+                                $priority = self::NORMAL_PRIORITY)
+    {
+        $this->className = $this->getClassNameFromInstance($objectInstance);
+
+        if ($priority < self::HIGHEST_PRIORITY || $priority > self::LOWEST_PRIORITY) {
+            throw new Exception("Invalid priority for ScheduledTask '$this->className.$methodName': $priority");
+        }
+
+        $this->objectInstance = $objectInstance;
+        $this->methodName = $methodName;
+        $this->scheduledTime = $scheduledTime;
+        $this->methodParameter = $methodParameter;
+        $this->priority = $priority;
+    }
+
+    protected function getClassNameFromInstance($_objectInstance)
+    {
+        if (is_string($_objectInstance)) {
+            return $_objectInstance;
+        }
+
+        $namespaced = get_class($_objectInstance);
+
+        return $namespaced;
+    }
+
+    /**
+     * Returns the object instance that contains the method to execute. Returns a class
+     * name if the method is static.
+     *
+     * @return mixed
+     */
+    public function getObjectInstance()
+    {
+        return $this->objectInstance;
+    }
+
+    /**
+     * Returns the name of the class that contains the method to execute.
+     *
+     * @return string
+     */
+    public function getClassName()
+    {
+        return $this->className;
+    }
+
+    /**
+     * Returns the name of the method that will be executed.
+     *
+     * @return string
+     */
+    public function getMethodName()
+    {
+        return $this->methodName;
+    }
+
+    /**
+     * Returns the value that will be passed to the method when executed, or `null` if
+     * no value will be supplied.
+     *
+     * @return string|null
+     */
+    public function getMethodParameter()
+    {
+        return $this->methodParameter;
+    }
+
+    /**
+     * Returns a {@link Schedule} instance that describes when the method should be executed
+     * and how long before the next execution.
+     *
+     * @return \Piwik\Scheduler\Schedule\Schedule
+     */
+    public function getScheduledTime()
+    {
+        return $this->scheduledTime;
+    }
+
+    /**
+     * Returns the time in milliseconds when this task will be executed next.
+     *
+     * @return int
+     */
+    public function getRescheduledTime()
+    {
+        return $this->getScheduledTime()->getRescheduledTime();
+    }
+
+    /**
+     * Returns the task priority. The priority will be an integer whose value is
+     * between {@link HIGH_PRIORITY} and {@link LOW_PRIORITY}.
+     *
+     * @return int
+     */
+    public function getPriority()
+    {
+        return $this->priority;
+    }
+
+    /**
+     * Returns a unique name for this scheduled task. The name is stored in the DB and is used
+     * to store a task's previous execution time. The name is created using:
+     *
+     * - the name of the class that contains the method to execute,
+     * - the name of the method to regularly execute,
+     * - and the value that is passed to the executed task.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return self::getTaskName($this->getClassName(), $this->getMethodName(), $this->getMethodParameter());
+    }
+
+    /**
+     * @ignore
+     */
+    public static function getTaskName($className, $methodName, $methodParameter = null)
+    {
+        return $className . '.' . $methodName . ($methodParameter == null ? '' : '_' . $methodParameter);
+    }
+}
diff --git a/core/Scheduler/TaskLoader.php b/core/Scheduler/TaskLoader.php
new file mode 100644
index 0000000000..44ec80c54b
--- /dev/null
+++ b/core/Scheduler/TaskLoader.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Scheduler;
+
+use Piwik\Plugin\Manager as PluginManager;
+use Piwik\Plugin\Tasks;
+
+/**
+ * Loads scheduled tasks.
+ */
+class TaskLoader
+{
+    /**
+     * @return Task[]
+     */
+    public function loadTasks()
+    {
+        $tasks = array();
+
+        /** @var Tasks[] $pluginTasks */
+        $pluginTasks = PluginManager::getInstance()->findComponents('Tasks', 'Piwik\Plugin\Tasks');
+
+        foreach ($pluginTasks as $pluginTask) {
+
+            $pluginTask->schedule();
+
+            foreach ($pluginTask->getScheduledTasks() as $task) {
+                $tasks[] = $task;
+            }
+        }
+
+        return $tasks;
+    }
+}
diff --git a/core/Scheduler/Timetable.php b/core/Scheduler/Timetable.php
new file mode 100644
index 0000000000..5c9bc69696
--- /dev/null
+++ b/core/Scheduler/Timetable.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Scheduler;
+
+use Piwik\Option;
+use Piwik\Date;
+
+/**
+ * This data structure holds the scheduled times for each active scheduled task.
+ */
+class Timetable
+{
+    const TIMETABLE_OPTION_STRING = "TaskScheduler.timetable";
+
+    private $timetable;
+
+    public function __construct()
+    {
+        $optionData = Option::get(self::TIMETABLE_OPTION_STRING);
+        $unserializedTimetable = @unserialize($optionData);
+
+        $this->timetable = $unserializedTimetable === false ? array() : $unserializedTimetable;
+    }
+
+    public function getTimetable()
+    {
+        return $this->timetable;
+    }
+
+    public function setTimetable($timetable)
+    {
+        $this->timetable = $timetable;
+    }
+
+    /**
+     * @param Task[] $activeTasks
+     */
+    public function removeInactiveTasks($activeTasks)
+    {
+        $activeTaskNames = array();
+        foreach ($activeTasks as $task) {
+            $activeTaskNames[] = $task->getName();
+        }
+        foreach (array_keys($this->timetable) as $taskName) {
+            if (!in_array($taskName, $activeTaskNames)) {
+                unset($this->timetable[$taskName]);
+            }
+        }
+    }
+
+    public function getScheduledTaskNames()
+    {
+        return array_keys($this->timetable);
+    }
+
+    public function getScheduledTaskTime($taskName)
+    {
+        return isset($this->timetable[$taskName]) ? Date::factory($this->timetable[$taskName]) : false;
+    }
+
+    /**
+     * Checks if the task should be executed
+     *
+     * Task has to be executed if :
+     *  - the task has already been scheduled once and the current system time is greater than the scheduled time.
+     *  - execution is forced, see $forceTaskExecution
+     *
+     * @param string $taskName
+     *
+     * @return boolean
+     */
+    public function shouldExecuteTask($taskName)
+    {
+        $forceTaskExecution = (defined('DEBUG_FORCE_SCHEDULED_TASKS') && DEBUG_FORCE_SCHEDULED_TASKS);
+
+        if ($forceTaskExecution) {
+            return true;
+        }
+
+        return $this->taskHasBeenScheduledOnce($taskName) && time() >= $this->timetable[$taskName];
+    }
+
+    /**
+     * Checks if a task should be rescheduled
+     *
+     * Task has to be rescheduled if :
+     *  - the task has to be executed
+     *  - the task has never been scheduled before
+     *
+     * @param string $taskName
+     *
+     * @return boolean
+     */
+    public function taskShouldBeRescheduled($taskName)
+    {
+        return !$this->taskHasBeenScheduledOnce($taskName) || $this->shouldExecuteTask($taskName);
+    }
+
+    public function rescheduleTask(Task $task)
+    {
+        // update the scheduled time
+        $this->timetable[$task->getName()] = $task->getRescheduledTime();
+        $this->save();
+    }
+
+    public function save()
+    {
+        Option::set(self::TIMETABLE_OPTION_STRING, serialize($this->timetable));
+    }
+
+    public function getScheduledTimeForMethod($className, $methodName, $methodParameter = null)
+    {
+        $taskName = Task::getTaskName($className, $methodName, $methodParameter);
+
+        return $this->taskHasBeenScheduledOnce($taskName) ? $this->timetable[$taskName] : false;
+    }
+
+    public function taskHasBeenScheduledOnce($taskName)
+    {
+        return isset($this->timetable[$taskName]);
+    }
+}
diff --git a/core/Segment.php b/core/Segment.php
index 420946794d..487245cf1c 100644
--- a/core/Segment.php
+++ b/core/Segment.php
@@ -9,7 +9,9 @@
 namespace Piwik;
 
 use Exception;
+use Piwik\DataAccess\LogQueryBuilder;
 use Piwik\Plugins\API\API;
+use Piwik\Segment\SegmentExpression;
 
 /**
  * Limits the set of visits Piwik uses when aggregating analytics data.
@@ -57,7 +59,17 @@ class Segment
     /**
      * @var SegmentExpression
      */
-    protected $segment = null;
+    protected $segmentExpression = null;
+
+    /**
+     * @var string
+     */
+    protected $string = null;
+
+    /**
+     * @var array
+     */
+    protected $idSites = null;
 
     /**
      * Truncate the Segments to 8k
@@ -70,7 +82,7 @@ class Segment
      * @param string $segmentCondition The segment condition, eg, `'browserCode=ff;countryCode=CA'`.
      * @param array $idSites The list of sites the segment will be used with. Some segments are
      *                       dependent on the site, such as goal segments.
-     * @throws Exception
+     * @throws
      */
     public function __construct($segmentCondition, $idSites)
     {
@@ -103,7 +115,7 @@ class Segment
         $this->string  = $string;
         $this->idSites = $idSites;
         $segment = new SegmentExpression($string);
-        $this->segment = $segment;
+        $this->segmentExpression = $segment;
 
         // parse segments
         $expressions = $segment->parseSubExpressions();
@@ -127,7 +139,7 @@ class Segment
      */
     public function isEmpty()
     {
-        return empty($this->string);
+        return $this->segmentExpression->isEmpty();
     }
 
     protected $availableSegments = array();
@@ -222,236 +234,16 @@ class Segment
      * @param array|string $bind (optional) Bind parameters, eg, `array($col1Value, $col2Value)`.
      * @param false|string $orderBy (optional) Order by clause, eg, `"t1.col1 ASC"`.
      * @param false|string $groupBy (optional) Group by clause, eg, `"t2.col2"`.
+     * @param int $limit Limit by clause
+     * @param int If set to value >= 1 then the Select query (and All inner queries) will be LIMIT'ed by this value.
+     *              Use only when you're not aggregating or it will sample the data.
      * @return string The entire select query.
      */
-    public function getSelectQuery($select, $from, $where = false, $bind = array(), $orderBy = false, $groupBy = false)
-    {
-        if (!is_array($from)) {
-            $from = array($from);
-        }
-
-        if (!$this->isEmpty()) {
-            $this->segment->parseSubExpressionsIntoSqlExpressions($from);
-
-            $joins = $this->generateJoins($from);
-            $from = $joins['sql'];
-            $joinWithSubSelect = $joins['joinWithSubSelect'];
-
-            $segmentSql = $this->segment->getSql();
-            $segmentWhere = $segmentSql['where'];
-            if (!empty($segmentWhere)) {
-                if (!empty($where)) {
-                    $where = "( $where )
-				AND
-				($segmentWhere)";
-                } else {
-                    $where = $segmentWhere;
-                }
-            }
-
-            $bind = array_merge($bind, $segmentSql['bind']);
-        } else {
-            $joins = $this->generateJoins($from);
-            $from = $joins['sql'];
-            $joinWithSubSelect = $joins['joinWithSubSelect'];
-        }
-
-        if ($joinWithSubSelect) {
-            $sql = $this->buildWrappedSelectQuery($select, $from, $where, $orderBy, $groupBy);
-        } else {
-            $sql = $this->buildSelectQuery($select, $from, $where, $orderBy, $groupBy);
-        }
-        return array(
-            'sql'  => $sql,
-            'bind' => $bind
-        );
-    }
-
-    /**
-     * Generate the join sql based on the needed tables
-     * @param array $tables tables to join
-     * @throws Exception if tables can't be joined
-     * @return array
-     */
-    private function generateJoins($tables)
-    {
-        $knownTables = array("log_visit", "log_link_visit_action", "log_conversion", "log_conversion_item");
-        $visitsAvailable = $actionsAvailable = $conversionsAvailable = $conversionItemAvailable = false;
-        $joinWithSubSelect = false;
-        $sql = '';
-
-        // make sure the tables are joined in the right order
-        // base table first, then action before conversion
-        // this way, conversions can be joined on idlink_va
-        $actionIndex = array_search("log_link_visit_action", $tables);
-        $conversionIndex = array_search("log_conversion", $tables);
-        if ($actionIndex > 0 && $conversionIndex > 0 && $actionIndex > $conversionIndex) {
-            $tables[$actionIndex] = "log_conversion";
-            $tables[$conversionIndex] = "log_link_visit_action";
-        }
-
-        // same as above: action before visit
-        $actionIndex = array_search("log_link_visit_action", $tables);
-        $visitIndex = array_search("log_visit", $tables);
-        if ($actionIndex > 0 && $visitIndex > 0 && $actionIndex > $visitIndex) {
-            $tables[$actionIndex] = "log_visit";
-            $tables[$visitIndex] = "log_link_visit_action";
-        }
-
-        foreach ($tables as $i => $table) {
-            if (is_array($table)) {
-                // join condition provided
-                $alias = isset($table['tableAlias']) ? $table['tableAlias'] : $table['table'];
-                $sql .= "
-				LEFT JOIN " . Common::prefixTable($table['table']) . " AS " . $alias
-                    . " ON " . $table['joinOn'];
-                continue;
-            }
-
-            if (!in_array($table, $knownTables)) {
-                throw new Exception("Table '$table' can't be used for segmentation");
-            }
-
-            $tableSql = Common::prefixTable($table) . " AS $table";
-
-            if ($i == 0) {
-                // first table
-                $sql .= $tableSql;
-            } else {
-                if ($actionsAvailable && $table == "log_conversion") {
-                    // have actions, need conversions => join on idlink_va
-                    $join = "log_conversion.idlink_va = log_link_visit_action.idlink_va "
-                        . "AND log_conversion.idsite = log_link_visit_action.idsite";
-                } else if ($actionsAvailable && $table == "log_visit") {
-                    // have actions, need visits => join on idvisit
-                    $join = "log_visit.idvisit = log_link_visit_action.idvisit";
-                } else if ($visitsAvailable && $table == "log_link_visit_action") {
-                    // have visits, need actions => we have to use a more complex join
-                    // we don't hande this here, we just return joinWithSubSelect=true in this case
-                    $joinWithSubSelect = true;
-                    $join = "log_link_visit_action.idvisit = log_visit.idvisit";
-                } else if ($conversionsAvailable && $table == "log_link_visit_action") {
-                    // have conversions, need actions => join on idlink_va
-                    $join = "log_conversion.idlink_va = log_link_visit_action.idlink_va";
-                } else if (($visitsAvailable && $table == "log_conversion")
-                    || ($conversionsAvailable && $table == "log_visit")
-                ) {
-                    // have visits, need conversion (or vice versa) => join on idvisit
-                    // notice that joining conversions on visits has lower priority than joining it on actions
-                    $join = "log_conversion.idvisit = log_visit.idvisit";
-
-                    // if conversions are joined on visits, we need a complex join
-                    if ($table == "log_conversion") {
-                        $joinWithSubSelect = true;
-                    }
-                } elseif ($conversionItemAvailable && $table === 'log_visit') {
-                    $join = "log_conversion_item.idvisit = log_visit.idvisit";
-                } elseif ($conversionItemAvailable && $table === 'log_link_visit_action') {
-                    $join = "log_conversion_item.idvisit = log_link_visit_action.idvisit";
-                } elseif ($conversionItemAvailable && $table === 'log_conversion') {
-                    $join = "log_conversion_item.idvisit = log_conversion.idvisit";
-                } else {
-                    throw new Exception("Table '$table' can't be joined for segmentation");
-                }
-
-                // the join sql the default way
-                $sql .= "
-				LEFT JOIN $tableSql ON $join";
-            }
-
-            // remember which tables are available
-            $visitsAvailable = ($visitsAvailable || $table == "log_visit");
-            $actionsAvailable = ($actionsAvailable || $table == "log_link_visit_action");
-            $conversionsAvailable = ($conversionsAvailable || $table == "log_conversion");
-            $conversionItemAvailable = ($conversionItemAvailable || $table == "log_conversion_item");
-        }
-
-        $return = array(
-            'sql'               => $sql,
-            'joinWithSubSelect' => $joinWithSubSelect
-        );
-        return $return;
-
-    }
-
-    /**
-     * Build select query the normal way
-     * @param string $select fieldlist to be selected
-     * @param string $from tablelist to select from
-     * @param string $where where clause
-     * @param string $orderBy order by clause
-     * @param string $groupBy group by clause
-     * @return string
-     */
-    private function buildSelectQuery($select, $from, $where, $orderBy, $groupBy)
-    {
-        $sql = "
-			SELECT
-				$select
-			FROM
-				$from";
-
-        if ($where) {
-            $sql .= "
-			WHERE
-				$where";
-        }
-
-        if ($groupBy) {
-            $sql .= "
-			GROUP BY
-				$groupBy";
-        }
-
-        if ($orderBy) {
-            $sql .= "
-			ORDER BY
-				$orderBy";
-        }
-
-        return $sql;
-    }
-
-    /**
-     * Build a select query where actions have to be joined on visits (or conversions)
-     * In this case, the query gets wrapped in another query so that grouping by visit is possible
-     * @param string $select
-     * @param string $from
-     * @param string $where
-     * @param string $orderBy
-     * @param string $groupBy
-     * @throws Exception
-     * @return string
-     */
-    private function buildWrappedSelectQuery($select, $from, $where, $orderBy, $groupBy)
+    public function getSelectQuery($select, $from, $where = false, $bind = array(), $orderBy = false, $groupBy = false, $limit = 0)
     {
-        $matchTables = "(log_visit|log_conversion_item|log_conversion|log_action)";
-        preg_match_all("/". $matchTables ."\.[a-z0-9_\*]+/", $select, $matches);
-        $neededFields = array_unique($matches[0]);
-
-        if (count($neededFields) == 0) {
-            throw new Exception("No needed fields found in select expression. "
-                . "Please use a table prefix.");
-        }
-
-        $select = preg_replace('/'.$matchTables.'\./', 'log_inner.', $select);
-        $orderBy = preg_replace('/'.$matchTables.'\./', 'log_inner.', $orderBy);
-        $groupBy = preg_replace('/'.$matchTables.'\./', 'log_inner.', $groupBy);
-
-        $from = "(
-			SELECT
-				" . implode(",
-				", $neededFields) . "
-			FROM
-				$from
-			WHERE
-				$where
-			GROUP BY log_visit.idvisit
-				) AS log_inner";
-
-        $where = false;
-        $query = $this->buildSelectQuery($select, $from, $where, $orderBy, $groupBy);
-        return $query;
+        $segmentExpression = $this->segmentExpression;
+        $segmentQuery = new LogQueryBuilder($segmentExpression);
+        return $segmentQuery->getSelectQueryString($select, $from, $where, $bind, $groupBy, $orderBy, $limit);
     }
 
     /**
@@ -463,4 +255,5 @@ class Segment
     {
         return (string) $this->getString();
     }
+
 }
\ No newline at end of file
diff --git a/core/Segment/SegmentExpression.php b/core/Segment/SegmentExpression.php
new file mode 100644
index 0000000000..10cf0294e3
--- /dev/null
+++ b/core/Segment/SegmentExpression.php
@@ -0,0 +1,383 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Segment;
+
+use Exception;
+
+/**
+ *
+ */
+class SegmentExpression
+{
+    const AND_DELIMITER = ';';
+    const OR_DELIMITER = ',';
+
+    const MATCH_EQUAL = '==';
+    const MATCH_NOT_EQUAL = '!=';
+    const MATCH_GREATER_OR_EQUAL = '>=';
+    const MATCH_LESS_OR_EQUAL = '<=';
+    const MATCH_GREATER = '>';
+    const MATCH_LESS = '<';
+    const MATCH_CONTAINS = '=@';
+    const MATCH_DOES_NOT_CONTAIN = '!@';
+
+    // Note: you can't write this in the API, but access this feature
+    // via field!=        <- IS NOT NULL
+    // or via field==     <- IS NULL / empty
+    const MATCH_IS_NOT_NULL_NOR_EMPTY = '::NOT_NULL';
+    const MATCH_IS_NULL_OR_EMPTY = '::NULL';
+
+    // Special case, since we look up Page URLs/Page titles in a sub SQL query
+    const MATCH_ACTIONS_CONTAINS = 'IN';
+
+    const INDEX_BOOL_OPERATOR = 0;
+    const INDEX_OPERAND = 1;
+
+    function __construct($string)
+    {
+        $this->string = $string;
+        $this->tree = $this->parseTree();
+    }
+
+    public function isEmpty()
+    {
+        return count($this->tree) == 0;
+    }
+
+    protected $joins = array();
+    protected $valuesBind = array();
+    protected $parsedTree = array();
+    protected $tree = array();
+    protected $parsedSubExpressions = array();
+
+    /**
+     * Given the array of parsed filters containing, for each filter,
+     * the boolean operator (AND/OR) and the operand,
+     * Will return the array where the filters are in SQL representation
+     *
+     * @throws Exception
+     * @return array
+     */
+    public function parseSubExpressions()
+    {
+        $parsedSubExpressions = array();
+        foreach ($this->tree as $leaf) {
+            $operand = $leaf[self::INDEX_OPERAND];
+
+            $operand = urldecode($operand);
+
+            $operator = $leaf[self::INDEX_BOOL_OPERATOR];
+            $pattern = '/^(.+?)(' . self::MATCH_EQUAL . '|'
+                . self::MATCH_NOT_EQUAL . '|'
+                . self::MATCH_GREATER_OR_EQUAL . '|'
+                . self::MATCH_GREATER . '|'
+                . self::MATCH_LESS_OR_EQUAL . '|'
+                . self::MATCH_LESS . '|'
+                . self::MATCH_CONTAINS . '|'
+                . self::MATCH_DOES_NOT_CONTAIN
+                . '){1}(.*)/';
+            $match = preg_match($pattern, $operand, $matches);
+            if ($match == 0) {
+                throw new Exception('The segment \'' . $operand . '\' is not valid.');
+            }
+
+            $leftMember = $matches[1];
+            $operation  = $matches[2];
+            $valueRightMember = urldecode($matches[3]);
+
+            // is null / is not null
+            if ($valueRightMember === '') {
+                if ($operation == self::MATCH_NOT_EQUAL) {
+                    $operation = self::MATCH_IS_NOT_NULL_NOR_EMPTY;
+                } elseif ($operation == self::MATCH_EQUAL) {
+                    $operation = self::MATCH_IS_NULL_OR_EMPTY;
+                } else {
+                    throw new Exception('The segment \'' . $operand . '\' has no value specified. You can leave this value empty ' .
+                        'only when you use the operators: ' . self::MATCH_NOT_EQUAL . ' (is not) or ' . self::MATCH_EQUAL . ' (is)');
+                }
+            }
+
+            $parsedSubExpressions[] = array(
+                self::INDEX_BOOL_OPERATOR => $operator,
+                self::INDEX_OPERAND       => array(
+                    $leftMember,
+                    $operation,
+                    $valueRightMember,
+                ));
+        }
+        $this->parsedSubExpressions = $parsedSubExpressions;
+        return $parsedSubExpressions;
+    }
+
+    /**
+     * Set the given expression
+     * @param $parsedSubExpressions
+     */
+    public function setSubExpressionsAfterCleanup($parsedSubExpressions)
+    {
+        $this->parsedSubExpressions = $parsedSubExpressions;
+    }
+
+    /**
+     * @param array $availableTables
+     */
+    public function parseSubExpressionsIntoSqlExpressions(&$availableTables = array())
+    {
+        $sqlSubExpressions = array();
+        $this->valuesBind = array();
+        $this->joins = array();
+
+        foreach ($this->parsedSubExpressions as $leaf) {
+            $operator = $leaf[self::INDEX_BOOL_OPERATOR];
+            $operandDefinition = $leaf[self::INDEX_OPERAND];
+
+            $operand = $this->getSqlMatchFromDefinition($operandDefinition, $availableTables);
+
+            if ($operand[1] !== null) {
+                $this->valuesBind[] = $operand[1];
+            }
+
+            $operand = $operand[0];
+            $sqlSubExpressions[] = array(
+                self::INDEX_BOOL_OPERATOR => $operator,
+                self::INDEX_OPERAND       => $operand,
+            );
+        }
+
+        $this->tree = $sqlSubExpressions;
+    }
+
+    /**
+     * Given an array representing one filter operand ( left member , operation , right member)
+     * Will return an array containing
+     * - the SQL substring,
+     * - the values to bind to this substring
+     *
+     * @param array $def
+     * @param array $availableTables
+     * @throws Exception
+     * @return array
+     */
+    protected function getSqlMatchFromDefinition($def, &$availableTables)
+    {
+        $field     = $def[0];
+        $matchType = $def[1];
+        $value     = $def[2];
+
+        $alsoMatchNULLValues = false;
+        switch ($matchType) {
+            case self::MATCH_EQUAL:
+                $sqlMatch = '=';
+                break;
+            case self::MATCH_NOT_EQUAL:
+                $sqlMatch = '<>';
+                $alsoMatchNULLValues = true;
+                break;
+            case self::MATCH_GREATER:
+                $sqlMatch = '>';
+                break;
+            case self::MATCH_LESS:
+                $sqlMatch = '<';
+                break;
+            case self::MATCH_GREATER_OR_EQUAL:
+                $sqlMatch = '>=';
+                break;
+            case self::MATCH_LESS_OR_EQUAL:
+                $sqlMatch = '<=';
+                break;
+            case self::MATCH_CONTAINS:
+                $sqlMatch = 'LIKE';
+                $value    = '%' . $this->escapeLikeString($value) . '%';
+                break;
+            case self::MATCH_DOES_NOT_CONTAIN:
+                $sqlMatch = 'NOT LIKE';
+                $value    = '%' . $this->escapeLikeString($value) . '%';
+                $alsoMatchNULLValues = true;
+                break;
+
+            case self::MATCH_IS_NOT_NULL_NOR_EMPTY:
+                $sqlMatch = 'IS NOT NULL AND (' . $field . ' <> \'\' OR ' . $field . ' = 0)';
+                $value    = null;
+                break;
+
+            case self::MATCH_IS_NULL_OR_EMPTY:
+                $sqlMatch = 'IS NULL OR ' . $field . ' = \'\' ';
+                $value    = null;
+                break;
+
+            case self::MATCH_ACTIONS_CONTAINS:
+                // this match type is not accessible from the outside
+                // (it won't be matched in self::parseSubExpressions())
+                // it can be used internally to inject sub-expressions into the query.
+                // see Segment::getCleanedExpression()
+                $sqlMatch = 'IN (' . $value['SQL'] . ')';
+                $value    = $this->escapeLikeString($value['bind']);
+                break;
+            default:
+                throw new Exception("Filter contains the match type '" . $matchType . "' which is not supported");
+                break;
+        }
+
+        // We match NULL values when rows are excluded only when we are not doing a
+        $alsoMatchNULLValues = $alsoMatchNULLValues && !empty($value);
+
+        if ($matchType === self::MATCH_ACTIONS_CONTAINS
+            || is_null($value)
+        ) {
+            $sqlExpression = "( $field $sqlMatch )";
+        } else {
+            if ($alsoMatchNULLValues) {
+                $sqlExpression = "( $field IS NULL OR $field $sqlMatch ? )";
+            } else {
+                $sqlExpression = "$field $sqlMatch ?";
+            }
+        }
+
+        $this->checkFieldIsAvailable($field, $availableTables);
+
+        return array($sqlExpression, $value);
+    }
+
+    /**
+     * Check whether the field is available
+     * If not, add it to the available tables
+     *
+     * @param string $field
+     * @param array $availableTables
+     */
+    private function checkFieldIsAvailable($field, &$availableTables)
+    {
+        $fieldParts = explode('.', $field);
+
+        $table = count($fieldParts) == 2 ? $fieldParts[0] : false;
+
+        // remove sql functions from field name
+        // example: `HOUR(log_visit.visit_last_action_time)` gets `HOUR(log_visit` => remove `HOUR(`
+        $table = preg_replace('/^[A-Z_]+\(/', '', $table);
+        $tableExists = !$table || in_array($table, $availableTables);
+
+        if (!$tableExists) {
+            $availableTables[] = $table;
+        }
+    }
+
+    /**
+     * Escape the characters % and _ in the given string
+     * @param string $str
+     * @return string
+     */
+    private function escapeLikeString($str)
+    {
+        $str = str_replace("%", "\%", $str);
+        $str = str_replace("_", "\_", $str);
+        return $str;
+    }
+
+    /**
+     * Given a filter string,
+     * will parse it into an array where each row contains the boolean operator applied to it,
+     * and the operand
+     *
+     * @return array
+     */
+    protected function parseTree()
+    {
+        $string = $this->string;
+        if (empty($string)) {
+            return array();
+        }
+        $tree = array();
+        $i = 0;
+        $length = strlen($string);
+        $isBackslash = false;
+        $operand = '';
+        while ($i <= $length) {
+            $char = $string[$i];
+
+            $isAND = ($char == self::AND_DELIMITER);
+            $isOR = ($char == self::OR_DELIMITER);
+            $isEnd = ($length == $i + 1);
+
+            if ($isEnd) {
+                if ($isBackslash && ($isAND || $isOR)) {
+                    $operand = substr($operand, 0, -1);
+                }
+                $operand .= $char;
+                $tree[] = array(self::INDEX_BOOL_OPERATOR => '', self::INDEX_OPERAND => $operand);
+                break;
+            }
+
+            if ($isAND && !$isBackslash) {
+                $tree[] = array(self::INDEX_BOOL_OPERATOR => 'AND', self::INDEX_OPERAND => $operand);
+                $operand = '';
+            } elseif ($isOR && !$isBackslash) {
+                $tree[] = array(self::INDEX_BOOL_OPERATOR => 'OR', self::INDEX_OPERAND => $operand);
+                $operand = '';
+            } else {
+                if ($isBackslash && ($isAND || $isOR)) {
+                    $operand = substr($operand, 0, -1);
+                }
+                $operand .= $char;
+            }
+            $isBackslash = ($char == "\\");
+            $i++;
+        }
+        return $tree;
+    }
+
+    /**
+     * Given the array of parsed boolean logic, will return
+     * an array containing the full SQL string representing the filter,
+     * the needed joins and the values to bind to the query
+     *
+     * @throws Exception
+     * @return array SQL Query, Joins and Bind parameters
+     */
+    public function getSql()
+    {
+        if ($this->isEmpty()) {
+            throw new Exception("Invalid segment, please specify a valid segment.");
+        }
+        $sql = '';
+        $subExpression = false;
+        foreach ($this->tree as $expression) {
+            $operator = $expression[self::INDEX_BOOL_OPERATOR];
+            $operand = $expression[self::INDEX_OPERAND];
+
+            if ($operator == 'OR'
+                && !$subExpression
+            ) {
+                $sql .= ' (';
+                $subExpression = true;
+            } else {
+                $sql .= ' ';
+            }
+
+            $sql .= $operand;
+
+            if ($operator == 'AND'
+                && $subExpression
+            ) {
+                $sql .= ')';
+                $subExpression = false;
+            }
+
+            $sql .= " $operator";
+        }
+        if ($subExpression) {
+            $sql .= ')';
+        }
+        return array(
+            'where' => $sql,
+            'bind'  => $this->valuesBind,
+            'join'  => implode(' ', $this->joins)
+        );
+    }
+}
diff --git a/core/SegmentExpression.php b/core/SegmentExpression.php
deleted file mode 100644
index cbd2a3eb9e..0000000000
--- a/core/SegmentExpression.php
+++ /dev/null
@@ -1,378 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-
-namespace Piwik;
-
-use Exception;
-
-/**
- *
- */
-class SegmentExpression
-{
-    const AND_DELIMITER = ';';
-    const OR_DELIMITER = ',';
-
-    const MATCH_EQUAL = '==';
-    const MATCH_NOT_EQUAL = '!=';
-    const MATCH_GREATER_OR_EQUAL = '>=';
-    const MATCH_LESS_OR_EQUAL = '<=';
-    const MATCH_GREATER = '>';
-    const MATCH_LESS = '<';
-    const MATCH_CONTAINS = '=@';
-    const MATCH_DOES_NOT_CONTAIN = '!@';
-
-    // Note: you can't write this in the API, but access this feature
-    // via field!=        <- IS NOT NULL
-    // or via field==     <- IS NULL / empty
-    const MATCH_IS_NOT_NULL_NOR_EMPTY = '::NOT_NULL';
-    const MATCH_IS_NULL_OR_EMPTY = '::NULL';
-
-    // Special case, since we look up Page URLs/Page titles in a sub SQL query
-    const MATCH_ACTIONS_CONTAINS = 'IN';
-
-    const INDEX_BOOL_OPERATOR = 0;
-    const INDEX_OPERAND = 1;
-
-    function __construct($string)
-    {
-        $this->string = $string;
-        $this->tree = $this->parseTree();
-    }
-
-    protected $joins = array();
-    protected $valuesBind = array();
-    protected $parsedTree = array();
-    protected $tree = array();
-    protected $parsedSubExpressions = array();
-
-    /**
-     * Given the array of parsed filters containing, for each filter,
-     * the boolean operator (AND/OR) and the operand,
-     * Will return the array where the filters are in SQL representation
-     *
-     * @throws Exception
-     * @return array
-     */
-    public function parseSubExpressions()
-    {
-        $parsedSubExpressions = array();
-        foreach ($this->tree as $leaf) {
-            $operand = $leaf[self::INDEX_OPERAND];
-
-            $operand = urldecode($operand);
-
-            $operator = $leaf[self::INDEX_BOOL_OPERATOR];
-            $pattern = '/^(.+?)(' . self::MATCH_EQUAL . '|'
-                . self::MATCH_NOT_EQUAL . '|'
-                . self::MATCH_GREATER_OR_EQUAL . '|'
-                . self::MATCH_GREATER . '|'
-                . self::MATCH_LESS_OR_EQUAL . '|'
-                . self::MATCH_LESS . '|'
-                . self::MATCH_CONTAINS . '|'
-                . self::MATCH_DOES_NOT_CONTAIN
-                . '){1}(.*)/';
-            $match = preg_match($pattern, $operand, $matches);
-            if ($match == 0) {
-                throw new Exception('The segment \'' . $operand . '\' is not valid.');
-            }
-
-            $leftMember = $matches[1];
-            $operation  = $matches[2];
-            $valueRightMember = urldecode($matches[3]);
-
-            // is null / is not null
-            if ($valueRightMember === '') {
-                if ($operation == self::MATCH_NOT_EQUAL) {
-                    $operation = self::MATCH_IS_NOT_NULL_NOR_EMPTY;
-                } elseif ($operation == self::MATCH_EQUAL) {
-                    $operation = self::MATCH_IS_NULL_OR_EMPTY;
-                } else {
-                    throw new Exception('The segment \'' . $operand . '\' has no value specified. You can leave this value empty ' .
-                        'only when you use the operators: ' . self::MATCH_NOT_EQUAL . ' (is not) or ' . self::MATCH_EQUAL . ' (is)');
-                }
-            }
-
-            $parsedSubExpressions[] = array(
-                self::INDEX_BOOL_OPERATOR => $operator,
-                self::INDEX_OPERAND       => array(
-                    $leftMember,
-                    $operation,
-                    $valueRightMember,
-                ));
-        }
-        $this->parsedSubExpressions = $parsedSubExpressions;
-        return $parsedSubExpressions;
-    }
-
-    /**
-     * Set the given expression
-     * @param $parsedSubExpressions
-     */
-    public function setSubExpressionsAfterCleanup($parsedSubExpressions)
-    {
-        $this->parsedSubExpressions = $parsedSubExpressions;
-    }
-
-    /**
-     * @param array $availableTables
-     */
-    public function parseSubExpressionsIntoSqlExpressions(&$availableTables = array())
-    {
-        $sqlSubExpressions = array();
-        $this->valuesBind = array();
-        $this->joins = array();
-
-        foreach ($this->parsedSubExpressions as $leaf) {
-            $operator = $leaf[self::INDEX_BOOL_OPERATOR];
-            $operandDefinition = $leaf[self::INDEX_OPERAND];
-
-            $operand = $this->getSqlMatchFromDefinition($operandDefinition, $availableTables);
-
-            if ($operand[1] !== null) {
-                $this->valuesBind[] = $operand[1];
-            }
-
-            $operand = $operand[0];
-            $sqlSubExpressions[] = array(
-                self::INDEX_BOOL_OPERATOR => $operator,
-                self::INDEX_OPERAND       => $operand,
-            );
-        }
-
-        $this->tree = $sqlSubExpressions;
-    }
-
-    /**
-     * Given an array representing one filter operand ( left member , operation , right member)
-     * Will return an array containing
-     * - the SQL substring,
-     * - the values to bind to this substring
-     *
-     * @param array $def
-     * @param array $availableTables
-     * @throws Exception
-     * @return array
-     */
-    protected function getSqlMatchFromDefinition($def, &$availableTables)
-    {
-        $field     = $def[0];
-        $matchType = $def[1];
-        $value     = $def[2];
-
-        $alsoMatchNULLValues = false;
-        switch ($matchType) {
-            case self::MATCH_EQUAL:
-                $sqlMatch = '=';
-                break;
-            case self::MATCH_NOT_EQUAL:
-                $sqlMatch = '<>';
-                $alsoMatchNULLValues = true;
-                break;
-            case self::MATCH_GREATER:
-                $sqlMatch = '>';
-                break;
-            case self::MATCH_LESS:
-                $sqlMatch = '<';
-                break;
-            case self::MATCH_GREATER_OR_EQUAL:
-                $sqlMatch = '>=';
-                break;
-            case self::MATCH_LESS_OR_EQUAL:
-                $sqlMatch = '<=';
-                break;
-            case self::MATCH_CONTAINS:
-                $sqlMatch = 'LIKE';
-                $value    = '%' . $this->escapeLikeString($value) . '%';
-                break;
-            case self::MATCH_DOES_NOT_CONTAIN:
-                $sqlMatch = 'NOT LIKE';
-                $value    = '%' . $this->escapeLikeString($value) . '%';
-                $alsoMatchNULLValues = true;
-                break;
-
-            case self::MATCH_IS_NOT_NULL_NOR_EMPTY:
-                $sqlMatch = 'IS NOT NULL AND (' . $field . ' <> \'\' OR ' . $field . ' = 0)';
-                $value    = null;
-                break;
-
-            case self::MATCH_IS_NULL_OR_EMPTY:
-                $sqlMatch = 'IS NULL OR ' . $field . ' = \'\' ';
-                $value    = null;
-                break;
-
-            case self::MATCH_ACTIONS_CONTAINS:
-                // this match type is not accessible from the outside
-                // (it won't be matched in self::parseSubExpressions())
-                // it can be used internally to inject sub-expressions into the query.
-                // see Segment::getCleanedExpression()
-                $sqlMatch = 'IN (' . $value['SQL'] . ')';
-                $value    = $this->escapeLikeString($value['bind']);
-                break;
-            default:
-                throw new Exception("Filter contains the match type '" . $matchType . "' which is not supported");
-                break;
-        }
-
-        // We match NULL values when rows are excluded only when we are not doing a
-        $alsoMatchNULLValues = $alsoMatchNULLValues && !empty($value);
-
-        if ($matchType === self::MATCH_ACTIONS_CONTAINS
-            || is_null($value)
-        ) {
-            $sqlExpression = "( $field $sqlMatch )";
-        } else {
-            if ($alsoMatchNULLValues) {
-                $sqlExpression = "( $field IS NULL OR $field $sqlMatch ? )";
-            } else {
-                $sqlExpression = "$field $sqlMatch ?";
-            }
-        }
-
-        $this->checkFieldIsAvailable($field, $availableTables);
-
-        return array($sqlExpression, $value);
-    }
-
-    /**
-     * Check whether the field is available
-     * If not, add it to the available tables
-     *
-     * @param string $field
-     * @param array $availableTables
-     */
-    private function checkFieldIsAvailable($field, &$availableTables)
-    {
-        $fieldParts = explode('.', $field);
-
-        $table = count($fieldParts) == 2 ? $fieldParts[0] : false;
-
-        // remove sql functions from field name
-        // example: `HOUR(log_visit.visit_last_action_time)` gets `HOUR(log_visit` => remove `HOUR(`
-        $table = preg_replace('/^[A-Z_]+\(/', '', $table);
-        $tableExists = !$table || in_array($table, $availableTables);
-
-        if (!$tableExists) {
-            $availableTables[] = $table;
-        }
-    }
-
-    /**
-     * Escape the characters % and _ in the given string
-     * @param string $str
-     * @return string
-     */
-    private function escapeLikeString($str)
-    {
-        $str = str_replace("%", "\%", $str);
-        $str = str_replace("_", "\_", $str);
-        return $str;
-    }
-
-    /**
-     * Given a filter string,
-     * will parse it into an array where each row contains the boolean operator applied to it,
-     * and the operand
-     *
-     * @return array
-     */
-    protected function parseTree()
-    {
-        $string = $this->string;
-        if (empty($string)) {
-            return array();
-        }
-        $tree = array();
-        $i = 0;
-        $length = strlen($string);
-        $isBackslash = false;
-        $operand = '';
-        while ($i <= $length) {
-            $char = $string[$i];
-
-            $isAND = ($char == self::AND_DELIMITER);
-            $isOR = ($char == self::OR_DELIMITER);
-            $isEnd = ($length == $i + 1);
-
-            if ($isEnd) {
-                if ($isBackslash && ($isAND || $isOR)) {
-                    $operand = substr($operand, 0, -1);
-                }
-                $operand .= $char;
-                $tree[] = array(self::INDEX_BOOL_OPERATOR => '', self::INDEX_OPERAND => $operand);
-                break;
-            }
-
-            if ($isAND && !$isBackslash) {
-                $tree[] = array(self::INDEX_BOOL_OPERATOR => 'AND', self::INDEX_OPERAND => $operand);
-                $operand = '';
-            } elseif ($isOR && !$isBackslash) {
-                $tree[] = array(self::INDEX_BOOL_OPERATOR => 'OR', self::INDEX_OPERAND => $operand);
-                $operand = '';
-            } else {
-                if ($isBackslash && ($isAND || $isOR)) {
-                    $operand = substr($operand, 0, -1);
-                }
-                $operand .= $char;
-            }
-            $isBackslash = ($char == "\\");
-            $i++;
-        }
-        return $tree;
-    }
-
-    /**
-     * Given the array of parsed boolean logic, will return
-     * an array containing the full SQL string representing the filter,
-     * the needed joins and the values to bind to the query
-     *
-     * @throws Exception
-     * @return array SQL Query, Joins and Bind parameters
-     */
-    public function getSql()
-    {
-        if (count($this->tree) == 0) {
-            throw new Exception("Invalid segment, please specify a valid segment.");
-        }
-        $sql = '';
-        $subExpression = false;
-        foreach ($this->tree as $expression) {
-            $operator = $expression[self::INDEX_BOOL_OPERATOR];
-            $operand = $expression[self::INDEX_OPERAND];
-
-            if ($operator == 'OR'
-                && !$subExpression
-            ) {
-                $sql .= ' (';
-                $subExpression = true;
-            } else {
-                $sql .= ' ';
-            }
-
-            $sql .= $operand;
-
-            if ($operator == 'AND'
-                && $subExpression
-            ) {
-                $sql .= ')';
-                $subExpression = false;
-            }
-
-            $sql .= " $operator";
-        }
-        if ($subExpression) {
-            $sql .= ')';
-        }
-        return array(
-            'where' => $sql,
-            'bind'  => $this->valuesBind,
-            'join'  => implode(' ', $this->joins)
-        );
-    }
-}
diff --git a/core/Session/SessionNamespace.php b/core/Session/SessionNamespace.php
index 74b11e0ce8..90a46625ff 100644
--- a/core/Session/SessionNamespace.php
+++ b/core/Session/SessionNamespace.php
@@ -9,6 +9,7 @@
 namespace Piwik\Session;
 
 use Piwik\Common;
+use Piwik\Session;
 use Zend_Session_Namespace;
 
 /**
@@ -28,6 +29,8 @@ class SessionNamespace extends Zend_Session_Namespace
             return;
         }
 
+        Session::start();
+
         parent::__construct($namespace, $singleInstance);
     }
 }
diff --git a/core/Settings/Manager.php b/core/Settings/Manager.php
index bbe696792b..f3862989e1 100644
--- a/core/Settings/Manager.php
+++ b/core/Settings/Manager.php
@@ -102,22 +102,57 @@ class Manager
         return $settingsForUser;
     }
 
-    public static function hasPluginSettingsForCurrentUser($pluginName)
+    public static function hasSystemPluginSettingsForCurrentUser($pluginName)
     {
-        $pluginNames = array_keys(static::getPluginSettingsForCurrentUser());
+        $pluginNames = static::getPluginNamesHavingSystemSettings();
 
         return in_array($pluginName, $pluginNames);
     }
 
     /**
-     * Detects whether there are settings for activated plugins available that the current user can change.
+     * Detects whether there are user settings for activated plugins available that the current user can change.
      *
      * @return bool
      */
-    public static function hasPluginsSettingsForCurrentUser()
+    public static function hasUserPluginsSettingsForCurrentUser()
     {
         $settings = static::getPluginSettingsForCurrentUser();
 
+        foreach ($settings as $setting) {
+            foreach ($setting->getSettingsForCurrentUser() as $set) {
+                if ($set instanceof UserSetting) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    public static function getPluginNamesHavingSystemSettings()
+    {
+        $settings = static::getPluginSettingsForCurrentUser();
+        $plugins  = array();
+
+        foreach ($settings as $pluginName => $setting) {
+            foreach ($setting->getSettingsForCurrentUser() as $set) {
+                if ($set instanceof SystemSetting) {
+                    $plugins[] = $pluginName;
+                }
+            }
+        }
+
+        return array_unique($plugins);
+    }
+    /**
+     * Detects whether there are system settings for activated plugins available that the current user can change.
+     *
+     * @return bool
+     */
+    public static function hasSystemPluginsSettingsForCurrentUser()
+    {
+        $settings = static::getPluginNamesHavingSystemSettings();
+
         return !empty($settings);
     }
 
diff --git a/core/Settings/Storage/StaticStorage.php b/core/Settings/Storage/StaticStorage.php
new file mode 100644
index 0000000000..ada437fa1c
--- /dev/null
+++ b/core/Settings/Storage/StaticStorage.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Settings\Storage;
+use Piwik\Settings\Storage;
+
+/**
+ * Static / temporary storage where a value will never be persisted meaning it will use the default value
+ * for each request until configured differently. Useful for tests.
+ *
+ * @api
+ */
+class StaticStorage extends Storage
+{
+
+    protected function loadSettings()
+    {
+        return array();
+    }
+
+    /**
+     * Saves (persists) the current setting values in the database.
+     */
+    public function save()
+    {
+    }
+
+}
diff --git a/core/SettingsPiwik.php b/core/SettingsPiwik.php
index 1291c7fe13..6a30ddfecb 100644
--- a/core/SettingsPiwik.php
+++ b/core/SettingsPiwik.php
@@ -9,7 +9,7 @@
 namespace Piwik;
 
 use Exception;
-use Piwik\Container\StaticContainer;
+use Piwik\Cache as PiwikCache;
 
 /**
  * Contains helper methods that can be used to get common Piwik settings.
@@ -18,6 +18,7 @@ use Piwik\Container\StaticContainer;
 class SettingsPiwik
 {
     const OPTION_PIWIK_URL = 'piwikUrl';
+
     /**
      * Get salt from [General] section
      *
@@ -43,56 +44,54 @@ class SettingsPiwik
     }
 
     /**
-     * @see getKnownSegmentsToArchive
-     *
-     * @var array
-     */
-    public static $cachedKnownSegmentsToArchive = null;
-
-    /**
      * Returns every stored segment to pre-process for each site during cron archiving.
      *
      * @return array The list of stored segments that apply to all sites.
      */
     public static function getKnownSegmentsToArchive()
     {
-        if (self::$cachedKnownSegmentsToArchive === null) {
-            $segments = Config::getInstance()->Segments;
-            $segmentsToProcess = isset($segments['Segments']) ? $segments['Segments'] : array();
-
-            /**
-             * Triggered during the cron archiving process to collect segments that
-             * should be pre-processed for all websites. The archiving process will be launched
-             * for each of these segments when archiving data.
-             *
-             * This event can be used to add segments to be pre-processed. If your plugin depends
-             * on data from a specific segment, this event could be used to provide enhanced
-             * performance.
-             *
-             * _Note: If you just want to add a segment that is managed by the user, use the
-             * SegmentEditor API._
-             *
-             * **Example**
-             *
-             *     Piwik::addAction('Segments.getKnownSegmentsToArchiveAllSites', function (&$segments) {
-             *         $segments[] = 'country=jp;city=Tokyo';
-             *     });
-             *
-             * @param array &$segmentsToProcess List of segment definitions, eg,
-             *
-             *                                      array(
-             *                                          'browserCode=ff;resolution=800x600',
-             *                                          'country=jp;city=Tokyo'
-             *                                      )
-             *
-             *                                  Add segments to this array in your event handler.
-             */
-            Piwik::postEvent('Segments.getKnownSegmentsToArchiveAllSites', array(&$segmentsToProcess));
-
-            self::$cachedKnownSegmentsToArchive = array_unique($segmentsToProcess);
+        $cacheId = 'KnownSegmentsToArchive';
+        $cache   = PiwikCache::getTransientCache();
+        if ($cache->contains($cacheId)) {
+            return $cache->fetch($cacheId);
         }
 
-        return self::$cachedKnownSegmentsToArchive;
+        $segments = Config::getInstance()->Segments;
+        $segmentsToProcess = isset($segments['Segments']) ? $segments['Segments'] : array();
+
+        /**
+         * Triggered during the cron archiving process to collect segments that
+         * should be pre-processed for all websites. The archiving process will be launched
+         * for each of these segments when archiving data.
+         *
+         * This event can be used to add segments to be pre-processed. If your plugin depends
+         * on data from a specific segment, this event could be used to provide enhanced
+         * performance.
+         *
+         * _Note: If you just want to add a segment that is managed by the user, use the
+         * SegmentEditor API._
+         *
+         * **Example**
+         *
+         *     Piwik::addAction('Segments.getKnownSegmentsToArchiveAllSites', function (&$segments) {
+         *         $segments[] = 'country=jp;city=Tokyo';
+         *     });
+         *
+         * @param array &$segmentsToProcess List of segment definitions, eg,
+         *
+         *                                      array(
+         *                                          'browserCode=ff;resolution=800x600',
+         *                                          'country=jp;city=Tokyo'
+         *                                      )
+         *
+         *                                  Add segments to this array in your event handler.
+         */
+        Piwik::postEvent('Segments.getKnownSegmentsToArchiveAllSites', array(&$segmentsToProcess));
+
+        $segmentsToProcess = array_unique($segmentsToProcess);
+
+        $cache->save($cacheId, $segmentsToProcess);
+        return $segmentsToProcess;
     }
 
     /**
@@ -104,8 +103,13 @@ class SettingsPiwik
      */
     public static function getKnownSegmentsToArchiveForSite($idSite)
     {
-        $segments = array();
+        $cacheId = 'KnownSegmentsToArchiveForSite' . $idSite;
+        $cache   = PiwikCache::getTransientCache();
+        if ($cache->contains($cacheId)) {
+            return $cache->fetch($cacheId);
+        }
 
+        $segments = array();
         /**
          * Triggered during the cron archiving process to collect segments that
          * should be pre-processed for one specific site. The archiving process will be launched
@@ -133,6 +137,11 @@ class SettingsPiwik
          * @param int $idSite The ID of the site to get segments for.
          */
         Piwik::postEvent('Segments.getKnownSegmentsToArchiveForSite', array(&$segments, $idSite));
+
+        $segments = array_unique($segments);
+
+        $cache->save($cacheId, $segments);
+
         return $segments;
     }
 
@@ -319,7 +328,12 @@ class SettingsPiwik
         // this will match when Piwik is installed and favicon has been customised
         $expectedString = 'misc/user/';
 
-        $expectedStringNotFound = strpos($fetched, $expectedString) === false && strpos($fetched, $expectedStringAlt) === false;
+        // see checkPiwikIsNotInstalled()
+        $expectedStringAlreadyInstalled = 'piwik-is-already-installed';
+
+        $expectedStringNotFound = strpos($fetched, $expectedString) === false
+                                && strpos($fetched, $expectedStringAlt) === false
+                                && strpos($fetched, $expectedStringAlreadyInstalled) === false;
 
         $hasError = false !== strpos($fetched, PAGE_TITLE_WHEN_ERROR);
 
@@ -429,4 +443,14 @@ class SettingsPiwik
         return Config::getInstance()->General['force_ssl'] == 1;
     }
 
+    /**
+     * Note: this config settig is also checked in the InterSites plugin
+     *
+     * @return bool
+     */
+    public static function isSameFingerprintAcrossWebsites()
+    {
+        return (bool)Config::getInstance()->Tracker['enable_fingerprinting_across_websites'];
+    }
+
 }
diff --git a/core/SettingsServer.php b/core/SettingsServer.php
index fc9d5f6bc1..3f6fbb8878 100644
--- a/core/SettingsServer.php
+++ b/core/SettingsServer.php
@@ -41,6 +41,22 @@ class SettingsServer
     }
 
     /**
+     * Mark the current request as a Tracker API request
+     */
+    public static function setIsTrackerApiRequest()
+    {
+        $GLOBALS['PIWIK_TRACKER_MODE'] = true;
+    }
+
+    /**
+     * Set the current request is not a tracker API request
+     */
+    public static function setIsNotTrackerApiRequest()
+    {
+        $GLOBALS['PIWIK_TRACKER_MODE'] = false;
+    }
+
+    /**
      * Returns `true` if running on Microsoft IIS 7 (or above), `false` if otherwise.
      *
      * @return bool
diff --git a/core/Site.php b/core/Site.php
index deefbd4911..1a828fce47 100644
--- a/core/Site.php
+++ b/core/Site.php
@@ -133,7 +133,12 @@ class Site
     public static function setSitesFromArray($sites)
     {
         foreach ($sites as $site) {
-            self::setSite($site['idsite'], $site);
+            $idSite = null;
+            if (!empty($site['idsite'])) {
+                $idSite = $site['idsite'];
+            }
+
+            self::setSite($idSite, $site);
         }
     }
 
@@ -231,8 +236,17 @@ class Site
      */
     protected function get($name)
     {
+        if (!isset(self::$infoSites[$this->id])) {
+            $site = API::getInstance()->getSiteFromId($this->id);
+
+            if (empty($site)) {
+                throw new UnexpectedWebsiteFoundException('The requested website id = ' . (int)$this->id . ' couldn\'t be found');
+            }
+
+            self::setSite($this->id, $site);
+        }
         if (!isset(self::$infoSites[$this->id][$name])) {
-            throw new Exception('The requested website id = ' . (int)$this->id . ' (or its property ' . $name . ') couldn\'t be found');
+            throw new Exception("The property $name could not be found on the website ID " . (int)$this->id);
         }
         return self::$infoSites[$this->id][$name];
     }
diff --git a/core/TaskScheduler.php b/core/TaskScheduler.php
index 8fd9069389..46968ad361 100644
--- a/core/TaskScheduler.php
+++ b/core/TaskScheduler.php
@@ -9,8 +9,9 @@
 
 namespace Piwik;
 
-use Exception;
-use Piwik\Plugin\Manager as PluginManager;
+use Piwik\Container\StaticContainer;
+use Piwik\Scheduler\Scheduler;
+use Piwik\Scheduler\Task;
 
 // When set to true, all scheduled tasks will be triggered in all requests (careful!)
 //define('DEBUG_FORCE_SCHEDULED_TASKS', true);
@@ -19,25 +20,24 @@ use Piwik\Plugin\Manager as PluginManager;
  * Manages scheduled task execution.
  *
  * A scheduled task is a callback that should be executed every so often (such as daily,
- * weekly, monthly, etc.). They are registered with **TaskScheduler** through the
- * {@hook TaskScheduler.getScheduledTasks} event.
+ * weekly, monthly, etc.). They are registered by extending {@link \Piwik\Plugin\Tasks}.
  *
- * Tasks are executed when the cron core:archive command is executed.
+ * Tasks are executed when the `core:archive` command is executed.
  *
  * ### Examples
  *
  * **Scheduling a task**
  *
- *     // event handler for TaskScheduler.getScheduledTasks event
- *     public function getScheduledTasks(&$tasks)
+ *     class Tasks extends \Piwik\Plugin\Tasks
  *     {
- *         $tasks[] = new ScheduledTask(
- *             'Piwik\Plugins\CorePluginsAdmin\MarketplaceApiClient',
- *             'clearAllCacheEntries',
- *             null,
- *             ScheduledTime::factory('daily'),
- *             ScheduledTask::LOWEST_PRIORITY
- *         );
+ *         public function schedule()
+ *         {
+ *             $this->hourly('myTask');  // myTask() will be executed once every hour
+ *         }
+ *         public function myTask()
+ *         {
+ *             // do something
+ *         }
  *     }
  *
  * **Executing all pending tasks**
@@ -49,21 +49,11 @@ use Piwik\Plugin\Manager as PluginManager;
  *
  *     echo "Executed task '$task1Name'. Task output:\n$task1Output";
  *
- * @method static \Piwik\TaskScheduler getInstance()
+ * @deprecated Use Piwik\Scheduler\Scheduler instead
+ * @see \Piwik\Scheduler\Scheduler
  */
-class TaskScheduler extends Singleton
+class TaskScheduler
 {
-    const GET_TASKS_EVENT  = 'TaskScheduler.getScheduledTasks';
-
-    private $isRunning = false;
-
-    private $timetable = null;
-
-    public function __construct()
-    {
-        $this->timetable = new ScheduledTaskTimetable();
-    }
-
     /**
      * Executes tasks that are scheduled to run, then reschedules them.
      *
@@ -79,79 +69,7 @@ class TaskScheduler extends Singleton
      */
     public static function runTasks()
     {
-        return self::getInstance()->doRunTasks();
-    }
-
-    // for backwards compatibility
-    private function collectTasksRegisteredViaEvent()
-    {
-        $tasks = array();
-
-        /**
-         * @ignore
-         * @deprecated
-         */
-        Piwik::postEvent(self::GET_TASKS_EVENT, array(&$tasks));
-
-        return $tasks;
-    }
-
-    private function getScheduledTasks()
-    {
-        /** @var \Piwik\ScheduledTask[] $tasks */
-        $tasks = $this->collectTasksRegisteredViaEvent();
-
-        /** @var \Piwik\Plugin\Tasks[] $pluginTasks */
-        $pluginTasks = PluginManager::getInstance()->findComponents('Tasks', 'Piwik\\Plugin\\Tasks');
-        foreach ($pluginTasks as $pluginTask) {
-
-            $pluginTask->schedule();
-
-            foreach ($pluginTask->getScheduledTasks() as $task) {
-                $tasks[] = $task;
-            }
-        }
-
-        return $tasks;
-    }
-
-    private function doRunTasks()
-    {
-        $tasks = $this->getScheduledTasks();
-
-        // remove from timetable tasks that are not active anymore
-        $this->timetable->removeInactiveTasks($tasks);
-
-        // for every priority level, starting with the highest and concluding with the lowest
-        $executionResults = array();
-        for ($priority = ScheduledTask::HIGHEST_PRIORITY;
-             $priority <= ScheduledTask::LOWEST_PRIORITY;
-             ++$priority) {
-            // loop through each task
-            foreach ($tasks as $task) {
-                // if the task does not have the current priority level, don't execute it yet
-                if ($task->getPriority() != $priority) {
-                    continue;
-                }
-
-                $taskName = $task->getName();
-                $shouldExecuteTask = $this->timetable->shouldExecuteTask($taskName);
-
-                if ($this->timetable->taskShouldBeRescheduled($taskName)) {
-                    $this->timetable->rescheduleTask($task);
-                }
-
-                if ($shouldExecuteTask) {
-                    $this->isRunning = true;
-                    $message = self::executeTask($task);
-                    $this->isRunning = false;
-
-                    $executionResults[] = array('task' => $taskName, 'output' => $message);
-                }
-            }
-        }
-
-        return $executionResults;
+        return self::getInstance()->run();
     }
 
     /**
@@ -160,12 +78,12 @@ class TaskScheduler extends Singleton
      * Call this method if your task's scheduled time has changed due to, for example, an option that
      * was changed.
      *
-     * @param ScheduledTask $task Describes the scheduled task being rescheduled.
+     * @param Task $task Describes the scheduled task being rescheduled.
      * @api
      */
-    public static function rescheduleTask(ScheduledTask $task)
+    public static function rescheduleTask(Task $task)
     {
-        self::getInstance()->timetable->rescheduleTask($task);
+        self::getInstance()->rescheduleTask($task);
     }
 
     /**
@@ -175,7 +93,7 @@ class TaskScheduler extends Singleton
      */
     public static function isTaskBeingExecuted()
     {
-        return self::getInstance()->isRunning;
+        return self::getInstance()->isRunningTask();
     }
 
     /**
@@ -189,25 +107,14 @@ class TaskScheduler extends Singleton
      */
     public static function getScheduledTimeForMethod($className, $methodName, $methodParameter = null)
     {
-        return self::getInstance()->timetable->getScheduledTimeForMethod($className, $methodName, $methodParameter);
+        return self::getInstance()->getScheduledTimeForMethod($className, $methodName, $methodParameter);
     }
 
     /**
-     * Executes the given taks
-     *
-     * @param ScheduledTask $task
-     * @return string
+     * @return Scheduler
      */
-    private static function executeTask($task)
+    private static function getInstance()
     {
-        try {
-            $timer = new Timer();
-            call_user_func(array($task->getObjectInstance(), $task->getMethodName()), $task->getMethodParameter());
-            $message = $timer->__toString();
-        } catch (Exception $e) {
-            $message = 'ERROR: ' . $e->getMessage();
-        }
-
-        return $message;
+        return StaticContainer::getContainer()->get('Piwik\Scheduler\Scheduler');
     }
 }
diff --git a/core/Tracker.php b/core/Tracker.php
index d6b2d9236f..5bf6a9b4e1 100644
--- a/core/Tracker.php
+++ b/core/Tracker.php
@@ -9,17 +9,16 @@
 namespace Piwik;
 
 use Exception;
-use Piwik\Exception\InvalidRequestParameterException;
-use Piwik\Exception\UnexpectedWebsiteFoundException;
+use Piwik\Plugins\BulkTracking\Tracker\Requests;
 use Piwik\Plugins\PrivacyManager\Config as PrivacyManagerConfig;
-use Piwik\Plugins\SitesManager\SiteUrls;
-use Piwik\Tracker\Cache;
+use Piwik\Tracker\Db as TrackerDb;
 use Piwik\Tracker\Db\DbException;
-use Piwik\Tracker\Db\Mysqli;
-use Piwik\Tracker\Db\Pdo\Mysql;
+use Piwik\Tracker\Handler;
 use Piwik\Tracker\Request;
+use Piwik\Tracker\RequestSet;
+use Piwik\Tracker\TrackerConfig;
 use Piwik\Tracker\Visit;
-use Piwik\Tracker\VisitInterface;
+use Piwik\Plugin\Manager as PluginManager;
 
 /**
  * Class used by the logging script piwik.php called by the javascript tag.
@@ -27,363 +26,131 @@ use Piwik\Tracker\VisitInterface;
  * saves information in the cookie, etc.
  *
  * We try to include as little files as possible (no dependency on 3rd party modules).
- *
  */
 class Tracker
 {
-    protected $stateValid = self::STATE_NOTHING_TO_NOTICE;
     /**
      * @var Db
      */
-    protected static $db = null;
-
-    const STATE_NOTHING_TO_NOTICE = 1;
-    const STATE_LOGGING_DISABLE = 10;
-    const STATE_EMPTY_REQUEST = 11;
-    const STATE_NOSCRIPT_REQUEST = 13;
+    private static $db = null;
 
     // We use hex ID that are 16 chars in length, ie. 64 bits IDs
     const LENGTH_HEX_ID_STRING = 16;
     const LENGTH_BINARY_ID = 8;
 
-    protected static $pluginsNotToLoad = array();
-    protected static $pluginsToLoad = array();
-
-    /**
-     * The set of visits to track.
-     *
-     * @var array
-     */
-    private $requests = array();
-
-    /**
-     * The token auth supplied with a bulk visits POST.
-     *
-     * @var string
-     */
-    private $tokenAuth = null;
-
-    /**
-     * Whether we're currently using bulk tracking or not.
-     *
-     * @var bool
-     */
-    private $usingBulkTracking = false;
+    public static $initTrackerMode = false;
 
-    /**
-     * The number of requests that have been successfully logged.
-     *
-     * @var int
-     */
     private $countOfLoggedRequests = 0;
+    protected $isInstalled = null;
 
-    protected function outputAccessControlHeaders()
-    {
-        $requestMethod = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : 'GET';
-        if ($requestMethod !== 'GET') {
-            $origin = isset($_SERVER['HTTP_ORIGIN']) ? $_SERVER['HTTP_ORIGIN'] : '*';
-            Common::sendHeader('Access-Control-Allow-Origin: ' . $origin);
-            Common::sendHeader('Access-Control-Allow-Credentials: true');
-        }
-    }
-
-    public function clear()
+    public function isDebugModeEnabled()
     {
-        $this->stateValid = self::STATE_NOTHING_TO_NOTICE;
+        return array_key_exists('PIWIK_TRACKER_DEBUG', $GLOBALS) && $GLOBALS['PIWIK_TRACKER_DEBUG'] === true;
     }
 
-    /**
-     * Do not load the specified plugins (used during testing, to disable Provider plugin)
-     * @param array $plugins
-     */
-    public static function setPluginsNotToLoad($plugins)
+    public function shouldRecordStatistics()
     {
-        self::$pluginsNotToLoad = $plugins;
-    }
+        $record = TrackerConfig::getConfigValue('record_statistics') != 0;
 
-    /**
-     * Get list of plugins to not load
-     *
-     * @return array
-     */
-    public static function getPluginsNotToLoad()
-    {
-        return self::$pluginsNotToLoad;
-    }
+        if (!$record) {
+            Common::printDebug('Tracking is disabled in the config.ini.php via record_statistics=0');
+        }
 
-    /**
-     * Update Tracker config
-     *
-     * @param string $name Setting name
-     * @param mixed $value Value
-     */
-    private static function updateTrackerConfig($name, $value)
-    {
-        $section = Config::getInstance()->Tracker;
-        $section[$name] = $value;
-        Config::getInstance()->Tracker = $section;
+        return $record && $this->isInstalled();
     }
 
-    protected function initRequests($args)
+    public static function loadTrackerEnvironment()
     {
-        $rawData = self::getRawBulkRequest();
-        if (!empty($rawData)) {
-            $this->usingBulkTracking = strpos($rawData, '"requests"') || strpos($rawData, "'requests'");
-            if ($this->usingBulkTracking) {
-                return $this->authenticateBulkTrackingRequests($rawData);
-            }
+        SettingsServer::setIsTrackerApiRequest();
+        try {
+            $debug = (bool)TrackerConfig::getConfigValue('debug');
+        } catch(Exception $e) {
+            $debug = false;
         }
-
-        // Not using bulk tracking
-        $this->requests = $args ? $args : (!empty($_GET) || !empty($_POST) ? array($_GET + $_POST) : array());
+        $GLOBALS['PIWIK_TRACKER_DEBUG'] = $debug;
+        PluginManager::getInstance()->loadTrackerPlugins();
     }
 
-    private static function getRequestsArrayFromBulkRequest($rawData)
+    private function init()
     {
-        $rawData = trim($rawData);
-        $rawData = Common::sanitizeLineBreaks($rawData);
+        $this->handleFatalErrors();
 
-        // POST data can be array of string URLs or array of arrays w/ visit info
-        $jsonData = json_decode($rawData, $assoc = true);
+        \Piwik\FrontController::createConfigObject();
 
-        $tokenAuth = Common::getRequestVar('token_auth', false, 'string', $jsonData);
+        if ($this->isDebugModeEnabled()) {
+            ErrorHandler::registerErrorHandler();
+            ExceptionHandler::setUp();
 
-        $requests = array();
-        if (isset($jsonData['requests'])) {
-            $requests = $jsonData['requests'];
+            Common::printDebug("Debug enabled - Input parameters: ");
+            Common::printDebug(var_export($_GET, true));
         }
-
-        return array($requests, $tokenAuth);
-    }
-
-    private function isBulkTrackingRequireTokenAuth()
-    {
-        return !empty(Config::getInstance()->Tracker['bulk_requests_require_authentication']);
     }
 
-    private function authenticateBulkTrackingRequests($rawData)
+    public function isInstalled()
     {
-        list($this->requests, $tokenAuth) = $this->getRequestsArrayFromBulkRequest($rawData);
-
-        $bulkTrackingRequireTokenAuth = $this->isBulkTrackingRequireTokenAuth();
-        if ($bulkTrackingRequireTokenAuth) {
-            if (empty($tokenAuth)) {
-                throw new Exception("token_auth must be specified when using Bulk Tracking Import. "
-                    . " See <a href='http://developer.piwik.org/api-reference/tracking-api'>Tracking Doc</a>");
-            }
+        if (is_null($this->isInstalled)) {
+            $this->isInstalled = SettingsPiwik::isPiwikInstalled();
         }
 
-        if (!empty($this->requests)) {
-            foreach ($this->requests as &$request) {
-                // if a string is sent, we assume its a URL and try to parse it
-                if (is_string($request)) {
-                    $params = array();
-
-                    $url = @parse_url($request);
-                    if (!empty($url)) {
-                        @parse_str($url['query'], $params);
-                        $request = $params;
-                    }
-                }
-
-                $requestObj = new Request($request, $tokenAuth);
-                $this->loadTrackerPlugins($requestObj);
-
-                if ($bulkTrackingRequireTokenAuth
-                    && !$requestObj->isAuthenticated()
-                ) {
-                    throw new Exception(sprintf("token_auth specified does not have Admin permission for idsite=%s", $requestObj->getIdSite()));
-                }
-                $request = $requestObj;
-            }
-        }
-
-        return $tokenAuth;
+        return $this->isInstalled;
     }
 
-    /**
-     * Main - tracks the visit/action
-     *
-     * @param array $args Optional Request Array
-     */
-    public function main($args = null)
+    public function main(Handler $handler, RequestSet $requestSet)
     {
-        if (!SettingsPiwik::isPiwikInstalled()) {
-            return $this->handleEmptyRequest();
-        }
         try {
-            $tokenAuth = $this->initRequests($args);
-        } catch (Exception $ex) {
-            $this->exitWithException($ex, true);
-        }
-
-        $this->initOutputBuffer();
-
-        if (!empty($this->requests)) {
-            $this->beginTransaction();
-
-            try {
-                foreach ($this->requests as $params) {
-                    $isAuthenticated = $this->trackRequest($params, $tokenAuth);
-                }
-                $this->runScheduledTasksIfAllowed($isAuthenticated);
-                $this->commitTransaction();
-            } catch (DbException $e) {
-                Common::printDebug($e->getMessage());
-                $this->rollbackTransaction();
-            }
-
-        } else {
-            $this->handleEmptyRequest();
+            $this->init();
+            $handler->init($this, $requestSet);
+            $this->track($handler, $requestSet);
+        } catch (Exception $e) {
+            $handler->onException($this, $requestSet, $e);
         }
 
         Piwik::postEvent('Tracker.end');
+        $response = $handler->finish($this, $requestSet);
 
-        $this->end();
+        $this->disconnectDatabase();
 
-        $this->flushOutputBuffer();
-
-        $this->performRedirectToUrlIfSet();
-    }
-
-    protected function initOutputBuffer()
-    {
-        ob_start();
-    }
-
-    protected function flushOutputBuffer()
-    {
-        ob_end_flush();
-    }
-
-    protected function getOutputBuffer()
-    {
-        return ob_get_contents();
+        return $response;
     }
 
-    protected function beginTransaction()
+    public function track(Handler $handler, RequestSet $requestSet)
     {
-        $this->transactionId = null;
-        if (!$this->shouldUseTransactions()) {
+        if (!$this->shouldRecordStatistics()) {
             return;
         }
-        $this->transactionId = self::getDatabase()->beginTransaction();
-    }
 
-    protected function commitTransaction()
-    {
-        if (empty($this->transactionId)) {
-            return;
-        }
-        self::getDatabase()->commit($this->transactionId);
-    }
+        $requestSet->initRequestsAndTokenAuth();
 
-    protected function rollbackTransaction()
-    {
-        if (empty($this->transactionId)) {
-            return;
+        if ($requestSet->hasRequests()) {
+            $handler->onStartTrackRequests($this, $requestSet);
+            $handler->process($this, $requestSet);
+            $handler->onAllRequestsTracked($this, $requestSet);
         }
-        self::getDatabase()->rollback($this->transactionId);
     }
 
     /**
-     * @return bool
-     */
-    protected function shouldUseTransactions()
-    {
-        $isBulkRequest = count($this->requests) > 1;
-        return $isBulkRequest && $this->isTransactionSupported();
-    }
-
-    /**
-     * @return bool
-     */
-    protected function isTransactionSupported()
-    {
-        return (bool)Config::getInstance()->Tracker['bulk_requests_use_transaction'];
-    }
-
-    protected function shouldRunScheduledTasks()
-    {
-        // don't run scheduled tasks in CLI mode from Tracker, this is the case
-        // where we bulk load logs & don't want to lose time with tasks
-        return !Common::isPhpCliMode()
-        && $this->getState() != self::STATE_LOGGING_DISABLE;
-    }
-
-    /**
-     * Tracker requests will automatically trigger the Scheduled tasks.
-     * This is useful for users who don't setup the cron,
-     * but still want daily/weekly/monthly PDF reports emailed automatically.
-     *
-     * This is similar to calling the API CoreAdminHome.runScheduledTasks
+     * @param Request $request
+     * @return array
      */
-    protected static function runScheduledTasks()
+    public function trackRequest(Request $request)
     {
-        $now = time();
-
-        // Currently, there are no hourly tasks. When there are some,
-        // this could be too aggressive minimum interval (some hours would be skipped in case of low traffic)
-        $minimumInterval = Config::getInstance()->Tracker['scheduled_tasks_min_interval'];
+        if ($request->isEmptyRequest()) {
+            Common::printDebug("The request is empty");
+        } else {
+            $this->loadTrackerPlugins();
 
-        // If the user disabled browser archiving, he has already setup a cron
-        // To avoid parallel requests triggering the Scheduled Tasks,
-        // Get last time tasks started executing
-        $cache = Cache::getCacheGeneral();
+            Common::printDebug("Current datetime: " . date("Y-m-d H:i:s", $request->getCurrentTimestamp()));
 
-        if ($minimumInterval <= 0
-            || empty($cache['isBrowserTriggerEnabled'])
-        ) {
-            Common::printDebug("-> Scheduled tasks not running in Tracker: Browser archiving is disabled.");
-            return;
+            $visit = Visit\Factory::make();
+            $visit->setRequest($request);
+            $visit->handle();
         }
 
-        $nextRunTime = $cache['lastTrackerCronRun'] + $minimumInterval;
-
-        if ((defined('DEBUG_FORCE_SCHEDULED_TASKS') && DEBUG_FORCE_SCHEDULED_TASKS)
-            || $cache['lastTrackerCronRun'] === false
-            || $nextRunTime < $now
-        ) {
-            $cache['lastTrackerCronRun'] = $now;
-            Cache::setCacheGeneral($cache);
-            self::initCorePiwikInTrackerMode();
-            Option::set('lastTrackerCronRun', $cache['lastTrackerCronRun']);
-            Common::printDebug('-> Scheduled Tasks: Starting...');
-
-            // save current user privilege and temporarily assume Super User privilege
-            $isSuperUser = Piwik::hasUserSuperUserAccess();
-
-            // Scheduled tasks assume Super User is running
-            Piwik::setUserHasSuperUserAccess();
-
-            // While each plugins should ensure that necessary languages are loaded,
-            // we ensure English translations at least are loaded
-            Translate::loadEnglishTranslation();
-
-            ob_start();
-            CronArchive::$url = SettingsPiwik::getPiwikUrl();
-            $cronArchive = new CronArchive();
-            $cronArchive->runScheduledTasksInTrackerMode();
-
-            $resultTasks = ob_get_contents();
-            ob_clean();
-
-            // restore original user privilege
-            Piwik::setUserHasSuperUserAccess($isSuperUser);
-
-            foreach (explode('</pre>', $resultTasks) as $resultTask) {
-                Common::printDebug(str_replace('<pre>', '', $resultTask));
-            }
-
-            Common::printDebug('Finished Scheduled Tasks.');
-        } else {
-            Common::printDebug("-> Scheduled tasks not triggered.");
-        }
-        Common::printDebug("Next run will be from: " . date('Y-m-d H:i:s', $nextRunTime) . ' UTC');
+        // increment successfully logged request count. make sure to do this after try-catch,
+        // since an excluded visit is considered 'successfully logged'
+        ++$this->countOfLoggedRequests;
     }
 
-    public static $initTrackerMode = false;
-
     /**
      * Used to initialize core Piwik components on a piwik.php request
      * Eg. when cache is missed and we will be calling some APIs to generate cache
@@ -405,356 +172,67 @@ class Tracker
                 Db::createDatabaseObject();
             }
 
-            \Piwik\Plugin\Manager::getInstance()->loadCorePluginsDuringTracker();
+            PluginManager::getInstance()->loadCorePluginsDuringTracker();
         }
     }
 
-    /**
-     * Echos an error message & other information, then exits.
-     *
-     * @param Exception $e
-     * @param bool $authenticated
-     * @param int  $statusCode eg 500
-     */
-    protected function exitWithException($e, $authenticated = false, $statusCode = 500)
+    public function getCountOfLoggedRequests()
     {
-        if ($this->hasRedirectUrl()) {
-            $this->performRedirectToUrlIfSet();
-            exit;
-        }
-
-        Common::sendResponseCode($statusCode);
-        error_log(sprintf("Error in Piwik (tracker): %s", str_replace("\n", " ", $this->getMessageFromException($e))));
-
-        if ($this->usingBulkTracking) {
-            // when doing bulk tracking we return JSON so the caller will know how many succeeded
-            $result = array(
-                'status' => 'error',
-                'tracked' => $this->countOfLoggedRequests
-            );
-            // send error when in debug mode or when authenticated (which happens when doing log importing,
-            if ((isset($GLOBALS['PIWIK_TRACKER_DEBUG']) && $GLOBALS['PIWIK_TRACKER_DEBUG'])
-                || $authenticated
-            ) {
-                $result['message'] = $this->getMessageFromException($e);
-            }
-            Common::sendHeader('Content-Type: application/json');
-            echo json_encode($result);
-            die(1);
-            exit;
-        }
-
-        if (isset($GLOBALS['PIWIK_TRACKER_DEBUG']) && $GLOBALS['PIWIK_TRACKER_DEBUG']) {
-            Common::sendHeader('Content-Type: text/html; charset=utf-8');
-            $trailer = '<span style="color: #888888">Backtrace:<br /><pre>' . $e->getTraceAsString() . '</pre></span>';
-            $headerPage = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Morpheus/templates/simpleLayoutHeader.tpl');
-            $footerPage = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Morpheus/templates/simpleLayoutFooter.tpl');
-            $headerPage = str_replace('{$HTML_TITLE}', 'Piwik &rsaquo; Error', $headerPage);
-
-            echo $headerPage . '<p>' . $this->getMessageFromException($e) . '</p>' . $trailer . $footerPage;
-        } // If not debug, but running authenticated (eg. during log import) then we display raw errors
-        elseif ($authenticated) {
-            Common::sendHeader('Content-Type: text/html; charset=utf-8');
-            echo $this->getMessageFromException($e);
-        } else {
-            $this->sendResponse();
-        }
-
-        die(1);
-        exit;
+        return $this->countOfLoggedRequests;
     }
 
-    /**
-     * Returns the date in the "Y-m-d H:i:s" PHP format
-     *
-     * @param int $timestamp
-     * @return string
-     */
-    public static function getDatetimeFromTimestamp($timestamp)
+    public function setCountOfLoggedRequests($numLoggedRequests)
     {
-        return date("Y-m-d H:i:s", $timestamp);
+        $this->countOfLoggedRequests = $numLoggedRequests;
     }
 
-    /**
-     * Initialization
-     * @param Request $request
-     */
-    protected function init(Request $request)
+    public function hasLoggedRequests()
     {
-        $this->loadTrackerPlugins($request);
-        $this->handleDisabledTracker();
-        $this->handleEmptyRequest($request);
+        return 0 !== $this->countOfLoggedRequests;
     }
 
     /**
-     * Cleanup
+     * @deprecated since 2.10.0 use {@link Date::getDatetimeFromTimestamp()} instead
      */
-    protected function end()
-    {
-        if ($this->usingBulkTracking) {
-            $result = array(
-                'status' => 'success',
-                'tracked' => $this->countOfLoggedRequests
-            );
-
-            $this->outputAccessControlHeaders();
-
-            Common::sendHeader('Content-Type: application/json');
-            echo json_encode($result);
-            exit;
-        }
-        switch ($this->getState()) {
-            case self::STATE_LOGGING_DISABLE:
-                $this->sendResponse();
-                Common::printDebug("Logging disabled, display transparent logo");
-                break;
-
-            case self::STATE_EMPTY_REQUEST:
-                Common::printDebug("Empty request => Piwik page");
-                echo "<a href='/'>Piwik</a> is a free/libre web <a href='http://piwik.org'>analytics</a> that lets you keep control of your data.";
-                break;
-
-            case self::STATE_NOSCRIPT_REQUEST:
-            case self::STATE_NOTHING_TO_NOTICE:
-            default:
-                $this->sendResponse();
-                Common::printDebug("Nothing to notice => default behaviour");
-                break;
-        }
-        Common::printDebug("End of the page.");
-
-        if ($GLOBALS['PIWIK_TRACKER_DEBUG'] === true) {
-            if (isset(self::$db)) {
-                self::$db->recordProfiling();
-                Profiler::displayDbTrackerProfile(self::$db);
-            }
-        }
-
-        self::disconnectDatabase();
-    }
-
-    /**
-     * Factory to create database objects
-     *
-     * @param array $configDb Database configuration
-     * @throws Exception
-     * @return \Piwik\Tracker\Db\Mysqli|\Piwik\Tracker\Db\Pdo\Mysql
-     */
-    public static function factory($configDb)
+    public static function getDatetimeFromTimestamp($timestamp)
     {
-        /**
-         * Triggered before a connection to the database is established by the Tracker.
-         *
-         * This event can be used to change the database connection settings used by the Tracker.
-         *
-         * @param array $dbInfos Reference to an array containing database connection info,
-         *                       including:
-         *
-         *                       - **host**: The host name or IP address to the MySQL database.
-         *                       - **username**: The username to use when connecting to the
-         *                                       database.
-         *                       - **password**: The password to use when connecting to the
-         *                                       database.
-         *                       - **dbname**: The name of the Piwik MySQL database.
-         *                       - **port**: The MySQL database port to use.
-         *                       - **adapter**: either `'PDO\MYSQL'` or `'MYSQLI'`
-         *                       - **type**: The MySQL engine to use, for instance 'InnoDB'
-         */
-        Piwik::postEvent('Tracker.getDatabaseConfig', array(&$configDb));
-
-        switch ($configDb['adapter']) {
-            case 'PDO\MYSQL':
-            case 'PDO_MYSQL': // old format pre Piwik 2
-                require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Db/Pdo/Mysql.php';
-                return new Mysql($configDb);
-
-            case 'MYSQLI':
-                require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Db/Mysqli.php';
-                return new Mysqli($configDb);
-        }
-
-        throw new Exception('Unsupported database adapter ' . $configDb['adapter']);
+        return Date::getDatetimeFromTimestamp($timestamp);
     }
 
-    public static function connectPiwikTrackerDb()
+    public function isDatabaseConnected()
     {
-        $db = null;
-        $configDb = Config::getInstance()->database;
-
-        if (!isset($configDb['port'])) {
-            // before 0.2.4 there is no port specified in config file
-            $configDb['port'] = '3306';
-        }
-
-        $db = Tracker::factory($configDb);
-        $db->connect();
-
-        return $db;
+        return !is_null(self::$db);
     }
 
-    protected static function connectDatabaseIfNotConnected()
+    public static function getDatabase()
     {
-        if (!is_null(self::$db)) {
-            return;
-        }
-
-        try {
-            self::$db = self::connectPiwikTrackerDb();
-        } catch (Exception $e) {
-            throw new DbException($e->getMessage(), $e->getCode());
+        if (is_null(self::$db)) {
+            try {
+                self::$db = TrackerDb::connectPiwikTrackerDb();
+            } catch (Exception $e) {
+                throw new DbException($e->getMessage(), $e->getCode());
+            }
         }
-    }
 
-    /**
-     * @return Db
-     */
-    public static function getDatabase()
-    {
-        self::connectDatabaseIfNotConnected();
         return self::$db;
     }
 
-    public static function disconnectDatabase()
+    protected function disconnectDatabase()
     {
-        if (isset(self::$db)) {
+        if ($this->isDatabaseConnected()) { // note: I think we do this only for the tests
             self::$db->disconnect();
             self::$db = null;
         }
     }
 
-    /**
-     * Returns the Tracker_Visit object.
-     * This method can be overwritten to use a different Tracker_Visit object
-     *
-     * @throws Exception
-     * @return \Piwik\Tracker\Visit
-     */
-    protected function getNewVisitObject()
-    {
-        $visit = null;
-
-        /**
-         * Triggered before a new **visit tracking object** is created. Subscribers to this
-         * event can force the use of a custom visit tracking object that extends from
-         * {@link Piwik\Tracker\VisitInterface}.
-         *
-         * @param \Piwik\Tracker\VisitInterface &$visit Initialized to null, but can be set to
-         *                                              a new visit object. If it isn't modified
-         *                                              Piwik uses the default class.
-         */
-        Piwik::postEvent('Tracker.makeNewVisitObject', array(&$visit));
-
-        if (is_null($visit)) {
-            $visit = new Visit();
-        } elseif (!($visit instanceof VisitInterface)) {
-            throw new Exception("The Visit object set in the plugin must implement VisitInterface");
-        }
-        return $visit;
-    }
-
-    private function sendResponse()
-    {
-        if (isset($GLOBALS['PIWIK_TRACKER_DEBUG'])
-            && $GLOBALS['PIWIK_TRACKER_DEBUG']
-        ) {
-            return;
-        }
-
-        if (strlen($this->getOutputBuffer()) > 0) {
-            // If there was an error during tracker, return so errors can be flushed
-            return;
-        }
-
-        $this->outputAccessControlHeaders();
-
-        $request = $_GET + $_POST;
-
-        if (array_key_exists('send_image', $request) && $request['send_image'] === '0') {
-            Common::sendResponseCode(204);
-
-            return;
-        }
-
-        $this->outputTransparentGif();
-    }
-
-    protected function outputTransparentGif ()
-    {
-        $transGifBase64 = "R0lGODlhAQABAIAAAAAAAAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==";
-        Common::sendHeader('Content-Type: image/gif');
-
-        print(base64_decode($transGifBase64));
-    }
-
-    protected function isVisitValid()
-    {
-        return $this->stateValid !== self::STATE_LOGGING_DISABLE
-        && $this->stateValid !== self::STATE_EMPTY_REQUEST;
-    }
-
-    protected function getState()
-    {
-        return $this->stateValid;
-    }
-
-    protected function setState($value)
-    {
-        $this->stateValid = $value;
-    }
-
-    protected function loadTrackerPlugins(Request $request)
-    {
-        // Adding &dp=1 will disable the provider plugin, if token_auth is used (used to speed up bulk imports)
-        $disableProvider = $request->getParam('dp');
-        if (!empty($disableProvider)) {
-            Tracker::setPluginsNotToLoad(array('Provider'));
-        }
-
-        try {
-            $pluginsTracker = \Piwik\Plugin\Manager::getInstance()->loadTrackerPlugins();
-            Common::printDebug("Loading plugins: { " . implode(", ", $pluginsTracker) . " }");
-        } catch (Exception $e) {
-            Common::printDebug("ERROR: " . $e->getMessage());
-        }
-    }
-
-    protected function handleEmptyRequest(Request $request = null)
-    {
-        if (is_null($request)) {
-            $request = new Request($_GET + $_POST);
-        }
-        $countParameters = $request->getParamsCount();
-        if ($countParameters == 0) {
-            $this->setState(self::STATE_EMPTY_REQUEST);
-        }
-        if ($countParameters == 1) {
-            $this->setState(self::STATE_NOSCRIPT_REQUEST);
-        }
-    }
-
-    protected function handleDisabledTracker()
-    {
-        $saveStats = Config::getInstance()->Tracker['record_statistics'];
-        if ($saveStats == 0) {
-            $this->setState(self::STATE_LOGGING_DISABLE);
-        }
-    }
-
-    protected function getTokenAuth()
-    {
-        if (!is_null($this->tokenAuth)) {
-            return $this->tokenAuth;
-        }
-
-        return Common::getRequestVar('token_auth', false);
-    }
-
     public static function setTestEnvironment($args = null, $requestMethod = null)
     {
         if (is_null($args)) {
-            $postData = self::getRequestsArrayFromBulkRequest(self::getRawBulkRequest());
-            $args = $_GET + $postData;
+            $requests = new Requests();
+            $args     = $requests->getRequestsArrayFromBulkRequest($requests->getRawBulkRequest());
+            $args = $_GET + $args;
         }
+
         if (is_null($requestMethod) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
             $requestMethod = $_SERVER['REQUEST_METHOD'];
         } else if (is_null($requestMethod)) {
@@ -762,17 +240,22 @@ class Tracker
         }
 
         // Do not run scheduled tasks during tests
-        self::updateTrackerConfig('scheduled_tasks_min_interval', 0);
+        TrackerConfig::setConfigValue('scheduled_tasks_min_interval', 0);
 
         // if nothing found in _GET/_POST and we're doing a POST, assume bulk request. in which case,
         // we have to bypass authentication
         if (empty($args) && $requestMethod == 'POST') {
-            self::updateTrackerConfig('tracking_requests_require_authentication', 0);
+            TrackerConfig::setConfigValue('tracking_requests_require_authentication', 0);
+        }
+
+        // Tests can force the use of 3rd party cookie for ID visitor
+        if (Common::getRequestVar('forceEnableFingerprintingAcrossWebsites', false, null, $args) == 1) {
+            TrackerConfig::setConfigValue('enable_fingerprinting_across_websites', 1);
         }
 
         // Tests can force the use of 3rd party cookie for ID visitor
         if (Common::getRequestVar('forceUseThirdPartyCookie', false, null, $args) == 1) {
-            self::updateTrackerConfig('use_third_party_id_cookie', 1);
+            TrackerConfig::setConfigValue('use_third_party_id_cookie', 1);
         }
 
         // Tests using window_look_back_for_visitor
@@ -780,13 +263,13 @@ class Tracker
             // also look for this in bulk requests (see fake_logs_replay.log)
             || strpos(json_encode($args, true), '"forceLargeWindowLookBackForVisitor":"1"') !== false
         ) {
-            self::updateTrackerConfig('window_look_back_for_visitor', 2678400);
+            TrackerConfig::setConfigValue('window_look_back_for_visitor', 2678400);
         }
 
         // Tests can force the enabling of IP anonymization
         if (Common::getRequestVar('forceIpAnonymization', false, null, $args) == 1) {
 
-            self::connectDatabaseIfNotConnected();
+            self::getDatabase(); // make sure db is initialized
 
             $privacyConfig = new PrivacyManagerConfig();
             $privacyConfig->ipAddressMaskLength = 2;
@@ -797,155 +280,27 @@ class Tracker
         $pluginsDisabled = array('Provider');
 
         // Disable provider plugin, because it is so slow to do many reverse ip lookups
-        self::setPluginsNotToLoad($pluginsDisabled);
-    }
-
-    /**
-     * Gets the error message to output when a tracking request fails.
-     *
-     * @param Exception $e
-     * @return string
-     */
-    private function getMessageFromException($e)
-    {
-        // Note: duplicated from FormDatabaseSetup.isAccessDenied
-        // Avoid leaking the username/db name when access denied
-        if ($e->getCode() == 1044 || $e->getCode() == 42000) {
-            return "Error while connecting to the Piwik database - please check your credentials in config/config.ini.php file";
-        }
-        if(Common::isPhpCliMode()) {
-            return $e->getMessage() . "\n" . $e->getTraceAsString();
-        }
-        return $e->getMessage();
+        PluginManager::getInstance()->setTrackerPluginsNotToLoad($pluginsDisabled);
     }
 
-    /**
-     * @param $params
-     * @param $tokenAuth
-     * @return array
-     */
-    protected function trackRequest($params, $tokenAuth)
+    protected function loadTrackerPlugins()
     {
-        if ($params instanceof Request) {
-            $request = $params;
-        } else {
-            $request = new Request($params, $tokenAuth);
-        }
-
-        $this->init($request);
-
-        $isAuthenticated = $request->isAuthenticated();
-
         try {
-            if ($this->isVisitValid()) {
-                Common::printDebug("Current datetime: " . date("Y-m-d H:i:s", $request->getCurrentTimestamp()));
-
-                $visit = $this->getNewVisitObject();
-                $visit->setRequest($request);
-                $visit->handle();
-            } else {
-                Common::printDebug("The request is invalid: empty request, or maybe tracking is disabled in the config.ini.php via record_statistics=0");
-            }
-        } catch (UnexpectedWebsiteFoundException $e) {
-            Common::printDebug("Exception: " . $e->getMessage());
-            $this->exitWithException($e, $isAuthenticated, 400);
-        } catch (InvalidRequestParameterException $e) {
-            Common::printDebug("Exception: " . $e->getMessage());
-            $this->exitWithException($e, $isAuthenticated, 400);
-        } catch (DbException $e) {
-            Common::printDebug("Exception: " . $e->getMessage());
-            $this->exitWithException($e, $isAuthenticated);
+            $pluginManager  = PluginManager::getInstance();
+            $pluginsTracker = $pluginManager->loadTrackerPlugins();
+            Common::printDebug("Loading plugins: { " . implode(", ", $pluginsTracker) . " }");
         } catch (Exception $e) {
-            $this->exitWithException($e, $isAuthenticated);
+            Common::printDebug("ERROR: " . $e->getMessage());
         }
-        $this->clear();
-
-        // increment successfully logged request count. make sure to do this after try-catch,
-        // since an excluded visit is considered 'successfully logged'
-        ++$this->countOfLoggedRequests;
-        return $isAuthenticated;
     }
 
-    protected function runScheduledTasksIfAllowed($isAuthenticated)
+    private function handleFatalErrors()
     {
-        // Do not run schedule task if we are importing logs
-        // or doing custom tracking (as it could slow down)
-        try {
-            if (!$isAuthenticated
-                && $this->shouldRunScheduledTasks()
-            ) {
-                self::runScheduledTasks();
+        register_shutdown_function(function () {
+            $lastError = error_get_last();
+            if (!empty($lastError) && $lastError['type'] == E_ERROR) {
+                Common::sendResponseCode(500);
             }
-        } catch (Exception $e) {
-            $this->exitWithException($e);
-        }
+        });
     }
-
-    /**
-     * @return string
-     */
-    protected static function getRawBulkRequest()
-    {
-        return file_get_contents("php://input");
-    }
-
-    private function getRedirectUrl()
-    {
-        return Common::getRequestVar('redirecturl', false, 'string');
-    }
-
-    private function hasRedirectUrl()
-    {
-        $redirectUrl = $this->getRedirectUrl();
-
-        return !empty($redirectUrl);
-    }
-
-    private function performRedirectToUrlIfSet()
-    {
-        if (!$this->hasRedirectUrl()) {
-            return;
-        }
-
-        if (empty($this->requests)) {
-            return;
-        }
-
-        $redirectUrl = $this->getRedirectUrl();
-        $host        = Url::getHostFromUrl($redirectUrl);
-
-        if (empty($host)) {
-            return;
-        }
-
-        $urls     = new SiteUrls();
-        $siteUrls = $urls->getAllCachedSiteUrls();
-        $siteIds  = $this->getAllSiteIdsWithinRequest();
-
-        foreach ($siteIds as $siteId) {
-            if (empty($siteUrls[$siteId])) {
-                continue;
-            }
-
-            if (Url::isHostInUrls($host, $siteUrls[$siteId])) {
-                Url::redirectToUrl($redirectUrl);
-            }
-        }
-    }
-
-    private function getAllSiteIdsWithinRequest()
-    {
-        if (empty($this->requests)) {
-            return array();
-        }
-
-        $siteIds = array();
-
-        foreach ($this->requests as $request) {
-            $siteIds[] = (int) $request['idsite'];
-        }
-
-        return array_unique($siteIds);
-    }
-
 }
diff --git a/core/Tracker/Cache.php b/core/Tracker/Cache.php
index b8f0413c63..22b57a9cc2 100644
--- a/core/Tracker/Cache.php
+++ b/core/Tracker/Cache.php
@@ -10,7 +10,7 @@ namespace Piwik\Tracker;
 
 use Piwik\Access;
 use Piwik\ArchiveProcessor\Rules;
-use Piwik\CacheFile;
+use Piwik\Cache as PiwikCache;
 use Piwik\Common;
 use Piwik\Config;
 use Piwik\Option;
@@ -23,19 +23,29 @@ use Piwik\Tracker;
  */
 class Cache
 {
+    private static $cacheIdGeneral = 'general';
+
     /**
      * Public for tests only
-     * @var CacheFile
+     * @var \Piwik\Cache\Lazy
      */
-    public static $trackerCache = null;
+    public static $cache;
 
-    protected static function getInstance()
+    /**
+     * @return \Piwik\Cache\Lazy
+     */
+    private static function getCache()
     {
-        if (is_null(self::$trackerCache)) {
-            $ttl = Config::getInstance()->Tracker['tracker_cache_file_ttl'];
-            self::$trackerCache = new CacheFile('tracker', $ttl);
+        if (is_null(self::$cache)) {
+            self::$cache = PiwikCache::getLazyCache();
         }
-        return self::$trackerCache;
+
+        return self::$cache;
+    }
+
+    private static function getTtl()
+    {
+        return Config::getInstance()->Tracker['tracker_cache_file_ttl'];
     }
 
     /**
@@ -50,13 +60,14 @@ class Cache
             return array();
         }
 
-        $idSite = (int)$idSite;
+        $idSite = (int) $idSite;
         if ($idSite <= 0) {
             return array();
         }
 
-        $cache        = self::getInstance();
-        $cacheContent = $cache->get($idSite);
+        $cache = self::getCache();
+        $cacheId = $idSite;
+        $cacheContent = $cache->fetch($cacheId);
 
         if (false !== $cacheContent) {
             return $cacheContent;
@@ -91,7 +102,7 @@ class Cache
         // if nothing is returned from the plugins, we don't save the content
         // this is not expected: all websites are expected to have at least one URL
         if (!empty($content)) {
-            $cache->set($idSite, $content);
+            $cache->save($cacheId, $content, self::getTtl());
         }
 
         return $content;
@@ -102,7 +113,7 @@ class Cache
      */
     public static function clearCacheGeneral()
     {
-        self::getInstance()->delete('general');
+        self::getCache()->delete(self::$cacheIdGeneral);
     }
 
     /**
@@ -113,10 +124,8 @@ class Cache
      */
     public static function getCacheGeneral()
     {
-        $cache   = self::getInstance();
-        $cacheId = 'general';
-
-        $cacheContent = $cache->get($cacheId);
+        $cache = self::getCache();
+        $cacheContent = $cache->fetch(self::$cacheIdGeneral);
 
         if (false !== $cacheContent) {
             return $cacheContent;
@@ -162,11 +171,9 @@ class Cache
      */
     public static function setCacheGeneral($value)
     {
-        $cache   = self::getInstance();
-        $cacheId = 'general';
-        $cache->set($cacheId, $value);
+        $cache = self::getCache();
 
-        return true;
+        return $cache->save(self::$cacheIdGeneral, $value, self::getTtl());
     }
 
     /**
@@ -193,8 +200,7 @@ class Cache
      */
     public static function deleteCacheWebsiteAttributes($idSite)
     {
-        $idSite = (int)$idSite;
-        self::getInstance()->delete($idSite);
+        self::getCache()->delete((int) $idSite);
     }
 
     /**
@@ -202,6 +208,6 @@ class Cache
      */
     public static function deleteTrackerCache()
     {
-        self::getInstance()->deleteAll();
+        self::getCache()->flushAll();
     }
 }
diff --git a/core/Tracker/Db.php b/core/Tracker/Db.php
index 0c419d8f6e..e5ec25f57f 100644
--- a/core/Tracker/Db.php
+++ b/core/Tracker/Db.php
@@ -11,8 +11,13 @@ namespace Piwik\Tracker;
 use Exception;
 use PDOStatement;
 use Piwik\Common;
+use Piwik\Config;
+use Piwik\Piwik;
 use Piwik\Timer;
+use Piwik\Tracker;
 use Piwik\Tracker\Db\DbException;
+use Piwik\Tracker\Db\Mysqli;
+use Piwik\Tracker\Db\Pdo\Mysql;
 
 /**
  * Simple database wrapper.
@@ -226,4 +231,63 @@ abstract class Db
      * @return bool  True if error number matches; false otherwise
      */
     abstract public function isErrNo($e, $errno);
+
+    /**
+     * Factory to create database objects
+     *
+     * @param array $configDb Database configuration
+     * @throws Exception
+     * @return \Piwik\Tracker\Db\Mysqli|\Piwik\Tracker\Db\Pdo\Mysql
+     */
+    public static function factory($configDb)
+    {
+        /**
+         * Triggered before a connection to the database is established by the Tracker.
+         *
+         * This event can be used to change the database connection settings used by the Tracker.
+         *
+         * @param array $dbInfos Reference to an array containing database connection info,
+         *                       including:
+         *
+         *                       - **host**: The host name or IP address to the MySQL database.
+         *                       - **username**: The username to use when connecting to the
+         *                                       database.
+         *                       - **password**: The password to use when connecting to the
+         *                                       database.
+         *                       - **dbname**: The name of the Piwik MySQL database.
+         *                       - **port**: The MySQL database port to use.
+         *                       - **adapter**: either `'PDO\MYSQL'` or `'MYSQLI'`
+         *                       - **type**: The MySQL engine to use, for instance 'InnoDB'
+         */
+        Piwik::postEvent('Tracker.getDatabaseConfig', array(&$configDb));
+
+        switch ($configDb['adapter']) {
+            case 'PDO\MYSQL':
+            case 'PDO_MYSQL': // old format pre Piwik 2
+                require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Db/Pdo/Mysql.php';
+                return new Mysql($configDb);
+
+            case 'MYSQLI':
+                require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Db/Mysqli.php';
+                return new Mysqli($configDb);
+        }
+
+        throw new Exception('Unsupported database adapter ' . $configDb['adapter']);
+    }
+
+    public static function connectPiwikTrackerDb()
+    {
+        $db = null;
+        $configDb = Config::getInstance()->database;
+
+        if (!isset($configDb['port'])) {
+            // before 0.2.4 there is no port specified in config file
+            $configDb['port'] = '3306';
+        }
+
+        $db = self::factory($configDb);
+        $db->connect();
+
+        return $db;
+    }
 }
diff --git a/core/Tracker/Db/Mysqli.php b/core/Tracker/Db/Mysqli.php
index 9452551683..e1922e11e5 100644
--- a/core/Tracker/Db/Mysqli.php
+++ b/core/Tracker/Db/Mysqli.php
@@ -291,11 +291,11 @@ class Mysqli extends Db
      */
     public function beginTransaction()
     {
-        if (!$this->activeTransaction === false ) {
+        if (!$this->activeTransaction === false) {
             return;
         }
 
-        if ( $this->connection->autocommit(false) ) {
+        if ( $this->connection->autocommit(false)) {
             $this->activeTransaction = uniqid();
             return $this->activeTransaction;
         }
@@ -309,15 +309,17 @@ class Mysqli extends Db
      */
     public function commit($xid)
     {
-        if ($this->activeTransaction !=  $xid || $this->activeTransaction === false  ) {
+        if ($this->activeTransaction != $xid || $this->activeTransaction === false) {
 
             return;
         }
+
         $this->activeTransaction = false;
 
         if (!$this->connection->commit() ) {
             throw new DbException("Commit failed");
         }
+
         $this->connection->autocommit(true);
     }
 
@@ -329,14 +331,16 @@ class Mysqli extends Db
      */
     public function rollBack($xid)
     {
-        if ($this->activeTransaction !=  $xid || $this->activeTransaction === false  ) {
+        if ($this->activeTransaction != $xid || $this->activeTransaction === false) {
             return;
         }
+
         $this->activeTransaction = false;
 
         if (!$this->connection->rollback() ) {
             throw new DbException("Rollback failed");
         }
+
         $this->connection->autocommit(true);
     }
 }
diff --git a/core/Tracker/Db/Pdo/Mysql.php b/core/Tracker/Db/Pdo/Mysql.php
index 1cb72c11a6..4d6094b478 100644
--- a/core/Tracker/Db/Pdo/Mysql.php
+++ b/core/Tracker/Db/Pdo/Mysql.php
@@ -270,12 +270,13 @@ class Mysql extends Db
      */
     public function commit($xid)
     {
-        if ($this->activeTransaction != $xid || $this->activeTransaction === false ) {
+        if ($this->activeTransaction != $xid || $this->activeTransaction === false) {
             return;
         }
+
         $this->activeTransaction = false;
 
-        if (!$this->connection->commit() ) {
+        if (!$this->connection->commit()) {
             throw new DbException("Commit failed");
         }
     }
@@ -288,12 +289,13 @@ class Mysql extends Db
      */
     public function rollBack($xid)
     {
-        if ($this->activeTransaction != $xid || $this->activeTransaction === false ) {
+        if ($this->activeTransaction != $xid || $this->activeTransaction === false) {
             return;
         }
+
         $this->activeTransaction = false;
 
-        if (!$this->connection->rollBack() ) {
+        if (!$this->connection->rollBack()) {
             throw new DbException("Rollback failed");
         }
     }
diff --git a/core/Tracker/GoalManager.php b/core/Tracker/GoalManager.php
index 0d4bd2bfcb..913522696a 100644
--- a/core/Tracker/GoalManager.php
+++ b/core/Tracker/GoalManager.php
@@ -10,6 +10,7 @@ namespace Piwik\Tracker;
 
 use Exception;
 use Piwik\Common;
+use Piwik\Date;
 use Piwik\Piwik;
 use Piwik\Plugin\Dimension\ConversionDimension;
 use Piwik\Plugin\Dimension\VisitDimension;
@@ -837,7 +838,7 @@ class GoalManager
         $goal = array(
             'idvisit'     => $visitorInformation['idvisit'],
             'idvisitor'   => $visitorInformation['idvisitor'],
-            'server_time' => Tracker::getDatetimeFromTimestamp($visitorInformation['visit_last_action_time'])
+            'server_time' => Date::getDatetimeFromTimestamp($visitorInformation['visit_last_action_time'])
         );
 
         $visitDimensions = VisitDimension::getAllDimensions();
diff --git a/core/Tracker/Handler.php b/core/Tracker/Handler.php
new file mode 100644
index 0000000000..3970b910d1
--- /dev/null
+++ b/core/Tracker/Handler.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Tracker;
+
+use Piwik\Common;
+use Piwik\Exception\InvalidRequestParameterException;
+use Piwik\Exception\UnexpectedWebsiteFoundException;
+use Piwik\Tracker;
+use Exception;
+use Piwik\Url;
+
+class Handler
+{
+    /**
+     * @var Response
+     */
+    private $response;
+
+    /**
+     * @var ScheduledTasksRunner
+     */
+    private $tasksRunner;
+
+    public function __construct()
+    {
+        $this->setResponse(new Response());
+    }
+
+    public function setResponse($response)
+    {
+        $this->response = $response;
+    }
+
+    public function init(Tracker $tracker, RequestSet $requestSet)
+    {
+        $this->response->init($tracker);
+    }
+
+    public function process(Tracker $tracker, RequestSet $requestSet)
+    {
+        foreach ($requestSet->getRequests() as $request) {
+            $tracker->trackRequest($request);
+        }
+    }
+
+    public function onStartTrackRequests(Tracker $tracker, RequestSet $requestSet)
+    {
+    }
+
+    public function onAllRequestsTracked(Tracker $tracker, RequestSet $requestSet)
+    {
+        $tasks = $this->getScheduledTasksRunner();
+        if ($tasks->shouldRun($tracker)) {
+            $tasks->runScheduledTasks();
+        }
+    }
+
+    private function getScheduledTasksRunner()
+    {
+        if (is_null($this->tasksRunner)) {
+            $this->tasksRunner = new ScheduledTasksRunner();
+        }
+
+        return $this->tasksRunner;
+    }
+
+    /**
+     * @internal
+     */
+    public function setScheduledTasksRunner(ScheduledTasksRunner $runner)
+    {
+        $this->tasksRunner = $runner;
+    }
+
+    public function onException(Tracker $tracker, RequestSet $requestSet, Exception $e)
+    {
+        Common::printDebug("Exception: " . $e->getMessage());
+
+        $statusCode = 500;
+        if ($e instanceof UnexpectedWebsiteFoundException) {
+            $statusCode = 400;
+        } elseif ($e instanceof InvalidRequestParameterException) {
+            $statusCode = 400;
+        }
+
+        $this->response->outputException($tracker, $e, $statusCode);
+        $this->redirectIfNeeded($requestSet);
+    }
+
+    public function finish(Tracker $tracker, RequestSet $requestSet)
+    {
+        $this->response->outputResponse($tracker);
+        $this->redirectIfNeeded($requestSet);
+        return $this->response->getOutput();
+    }
+
+    public function getResponse()
+    {
+        return $this->response;
+    }
+
+    protected function redirectIfNeeded(RequestSet $requestSet)
+    {
+        $redirectUrl = $requestSet->shouldPerformRedirectToUrl();
+
+        if (!empty($redirectUrl)) {
+            Url::redirectToUrl($redirectUrl);
+        }
+    }
+
+}
diff --git a/core/Tracker/Handler/Factory.php b/core/Tracker/Handler/Factory.php
new file mode 100644
index 0000000000..c15def0fe4
--- /dev/null
+++ b/core/Tracker/Handler/Factory.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Tracker\Handler;
+
+use Exception;
+use Piwik\Piwik;
+use Piwik\Tracker\Handler;
+
+class Factory
+{
+    public static function make()
+    {
+        $handler = null;
+
+        /**
+         * Triggered before a new **handler tracking object** is created. Subscribers to this
+         * event can force the use of a custom handler tracking object that extends from
+         * {@link Piwik\Tracker\Handler} and customize any tracking behavior.
+         *
+         * @param \Piwik\Tracker\Handler &$handler Initialized to null, but can be set to
+         *                                         a new handler object. If it isn't modified
+         *                                         Piwik uses the default class.
+         * @ignore This event is not public yet as the Handler API is not really stable yet
+         */
+        Piwik::postEvent('Tracker.newHandler', array(&$handler));
+
+        if (is_null($handler)) {
+            $handler = new Handler();
+        } elseif (!($handler instanceof Handler)) {
+            throw new Exception("The Handler object set in the plugin must be an instance of Piwik\\Tracker\\Handler");
+        }
+
+        return $handler;
+    }
+
+}
diff --git a/core/Tracker/Model.php b/core/Tracker/Model.php
index 090cd8be59..e40f845e00 100644
--- a/core/Tracker/Model.php
+++ b/core/Tracker/Model.php
@@ -9,10 +9,8 @@
 namespace Piwik\Tracker;
 
 use Exception;
-use PDOStatement;
 use Piwik\Common;
 use Piwik\Tracker;
-use Piwik\Tracker\Db\DbException;
 
 class Model
 {
@@ -142,8 +140,32 @@ class Model
         Common::printDebug($bind);
     }
 
+    /**
+     * Inserts a new action into the log_action table. If there is an existing action that was inserted
+     * due to another request pre-empting this one, the newly inserted action is deleted.
+     *
+     * @param string $name
+     * @param int $type
+     * @param int $urlPrefix
+     * @return int The ID of the action (can be for an existing action or new action).
+     */
     public function createNewIdAction($name, $type, $urlPrefix)
     {
+        $newActionId = $this->insertNewAction($name, $type, $urlPrefix);
+
+        $realFirstActionId = $this->getIdActionMatchingNameAndType($name, $type);
+
+        // if the inserted action ID is not the same as the queried action ID, then that means we inserted
+        // a duplicate, so remove it now
+        if ($realFirstActionId != $newActionId) {
+            $this->deleteDuplicateAction($newActionId);
+        }
+
+        return $realFirstActionId;
+    }
+
+    private function insertNewAction($name, $type, $urlPrefix)
+    {
         $table = Common::prefixTable('log_action');
         $sql   = "INSERT INTO $table (name, hash, type, url_prefix) VALUES (?,CRC32(?),?,?)";
 
@@ -157,8 +179,11 @@ class Model
 
     private function getSqlSelectActionId()
     {
+        // it is possible for multiple actions to exist in the DB (due to rare concurrency issues), so the ORDER BY and
+        // LIMIT are important
         $sql = "SELECT idaction, type, name FROM " . Common::prefixTable('log_action')
-            . "  WHERE ( hash = CRC32(?) AND name = ? AND type = ? ) ";
+            . "  WHERE " . $this->getSqlConditionToMatchSingleAction() . " "
+            . "ORDER BY idaction ASC LIMIT 1";
 
         return $sql;
     }
@@ -173,9 +198,16 @@ class Model
         return $idAction;
     }
 
+    /**
+     * Returns the IDs for multiple actions based on name + type values.
+     *
+     * @param array $actionsNameAndType Array like `array( array('name' => '...', 'type' => 1), ... )`
+     * @return array|false Array of DB rows w/ columns: **idaction**, **type**, **name**.
+     */
     public function getIdsAction($actionsNameAndType)
     {
-        $sql  = $this->getSqlSelectActionId();
+        $sql = "SELECT MIN(idaction) as idaction, type, name FROM " . Common::prefixTable('log_action')
+             . " WHERE";
         $bind = array();
 
         $i = 0;
@@ -187,15 +219,19 @@ class Model
             }
 
             if ($i > 0) {
-                $sql .= " OR ( hash = CRC32(?) AND name = ? AND type = ? ) ";
+                $sql .= " OR";
             }
 
+            $sql .= " " . $this->getSqlConditionToMatchSingleAction() . " ";
+
             $bind[] = $name;
             $bind[] = $name;
             $bind[] = $actionNameType['type'];
             $i++;
         }
 
+        $sql .= " GROUP BY type, hash, name";
+
         // Case URL & Title are empty
         if (empty($bind)) {
             return false;
@@ -375,9 +411,21 @@ class Model
         return array($updateParts, $sqlBind);
     }
 
+    private function deleteDuplicateAction($newActionId)
+    {
+        $sql = "DELETE FROM " . Common::prefixTable('log_action') . " WHERE idaction = ?";
+
+        $db = $this->getDb();
+        $db->query($sql, array($newActionId));
+    }
+
     private function getDb()
     {
         return Tracker::getDatabase();
     }
 
+    private function getSqlConditionToMatchSingleAction()
+    {
+        return "( hash = CRC32(?) AND name = ? AND type = ? )";
+    }
 }
diff --git a/core/Tracker/PageUrl.php b/core/Tracker/PageUrl.php
index ae55b48aac..bbd98882cd 100644
--- a/core/Tracker/PageUrl.php
+++ b/core/Tracker/PageUrl.php
@@ -11,6 +11,7 @@ namespace Piwik\Tracker;
 
 use Piwik\Common;
 use Piwik\Config;
+use Piwik\Piwik;
 use Piwik\UrlHelper;
 
 class PageUrl
@@ -86,14 +87,22 @@ class PageUrl
         $website = Cache::getCacheWebsiteAttributes($idSite);
         $excludedParameters = self::getExcludedParametersFromWebsite($website);
 
-        if (!empty($excludedParameters)) {
-            Common::printDebug('Excluding parameters "' . implode(',', $excludedParameters) . '" from URL');
-        }
-
         $parametersToExclude = array_merge($excludedParameters,
                                            self::$queryParametersToExclude,
                                            $campaignTrackingParameters);
 
+        /**
+         * Triggered before setting the action url in Piwik\Tracker\Action so plugins can register
+         * parameters to be excluded from the tracking URL (e.g. campaign parameters).
+         *
+         * @param array &$parametersToExclude An array of parameters to exclude from the tracking url.
+         */
+		Piwik::postEvent('Tracker.PageUrl.getQueryParametersToExclude', array(&$parametersToExclude));
+
+		if (!empty($parametersToExclude)) {
+			Common::printDebug('Excluding parameters "' . implode(',', $parametersToExclude) . '" from URL');
+		}
+
         $parametersToExclude = array_map('strtolower', $parametersToExclude);
         return $parametersToExclude;
     }
@@ -110,7 +119,7 @@ class PageUrl
     public static function shouldRemoveURLFragmentFor($idSite)
     {
         $websiteAttributes = Cache::getCacheWebsiteAttributes($idSite);
-        return !$websiteAttributes['keep_url_fragment'];
+        return empty($websiteAttributes['keep_url_fragment']);
     }
 
     /**
@@ -157,7 +166,7 @@ class PageUrl
         }
 
         if (!empty($parsedUrl['host'])) {
-            $parsedUrl['host'] = mb_strtolower($parsedUrl['host'], 'UTF-8');
+            $parsedUrl['host'] = Common::mb_strtolower($parsedUrl['host'], 'UTF-8');
         }
 
         if (!empty($parsedUrl['fragment'])) {
@@ -219,7 +228,8 @@ class PageUrl
     {
         if (is_string($value)) {
             $decoded = urldecode($value);
-            if (@mb_check_encoding($decoded, $encoding)) {
+            if (function_exists('mb_check_encoding')
+                && @mb_check_encoding($decoded, $encoding)) {
                 $value = urlencode(mb_convert_encoding($decoded, 'UTF-8', $encoding));
             }
         }
@@ -256,13 +266,18 @@ class PageUrl
      */
     public static function reencodeParameters(&$queryParameters, $encoding = false)
     {
-        // if query params are encoded w/ non-utf8 characters (due to browser bug or whatever),
-        // encode to UTF-8.
-        if (false !== $encoding
-            && 'utf-8' != strtolower($encoding)
-            && function_exists('mb_check_encoding')
-        ) {
-            $queryParameters = PageUrl::reencodeParametersArray($queryParameters, $encoding);
+        if (function_exists('mb_check_encoding')) {
+            // if query params are encoded w/ non-utf8 characters (due to browser bug or whatever),
+            // encode to UTF-8.
+            if (strtolower($encoding) != 'utf-8'
+                && $encoding != false
+            ) {
+                Common::printDebug("Encoding page URL query parameters to $encoding.");
+
+                $queryParameters = PageUrl::reencodeParametersArray($queryParameters, $encoding);
+            }
+        } else {
+            Common::printDebug("Page charset supplied in tracking request, but mbstring extension is not available.");
         }
 
         return $queryParameters;
@@ -349,5 +364,15 @@ class PageUrl
 
         return array();
     }
-}
 
+    public static function urldecodeValidUtf8($value)
+    {
+        $value = urldecode($value);
+        if (function_exists('mb_check_encoding')
+            && !@mb_check_encoding($value, 'utf-8')
+        ) {
+            return urlencode($value);
+        }
+        return $value;
+    }
+}
\ No newline at end of file
diff --git a/core/Tracker/Request.php b/core/Tracker/Request.php
index 8853800fa6..23f01a555b 100644
--- a/core/Tracker/Request.php
+++ b/core/Tracker/Request.php
@@ -11,6 +11,7 @@ namespace Piwik\Tracker;
 use Exception;
 use Piwik\Common;
 use Piwik\Config;
+use Piwik\Container\StaticContainer;
 use Piwik\Cookie;
 use Piwik\Exception\InvalidRequestParameterException;
 use Piwik\Exception\UnexpectedWebsiteFoundException;
@@ -18,7 +19,6 @@ use Piwik\IP;
 use Piwik\Network\IPUtils;
 use Piwik\Piwik;
 use Piwik\Plugins\CustomVariables\CustomVariables;
-use Piwik\Registry;
 use Piwik\Tracker;
 
 /**
@@ -31,8 +31,10 @@ class Request
      * @var array
      */
     protected $params;
+    protected $rawParams;
 
     protected $isAuthenticated = null;
+    private $isEmptyRequest = false;
 
     protected $tokenAuth;
 
@@ -50,16 +52,19 @@ class Request
             $params = array();
         }
         $this->params = $params;
+        $this->rawParams = $params;
         $this->tokenAuth = $tokenAuth;
         $this->timestamp = time();
+        $this->isEmptyRequest = empty($params);
 
         // When the 'url' and referrer url parameter are not given, we might be in the 'Simple Image Tracker' mode.
         // The URL can default to the Referrer, which will be in this case
         // the URL of the page containing the Simple Image beacon
         if (empty($this->params['urlref'])
             && empty($this->params['url'])
+            && array_key_exists('HTTP_REFERER', $_SERVER)
         ) {
-            $url = @$_SERVER['HTTP_REFERER'];
+            $url = $_SERVER['HTTP_REFERER'];
             if (!empty($url)) {
                 $this->params['url'] = $url;
             }
@@ -67,6 +72,21 @@ class Request
     }
 
     /**
+     * Get the params that were originally passed to the instance. These params do not contain any params that were added
+     * within this object.
+     * @return array
+     */
+    public function getRawParams()
+    {
+        return $this->rawParams;
+    }
+
+    public function getTokenAuth()
+    {
+        return $this->tokenAuth;
+    }
+
+    /**
      * @return bool
      */
     public function isAuthenticated()
@@ -82,21 +102,27 @@ class Request
      * This method allows to set custom IP + server time + visitor ID, when using Tracking API.
      * These two attributes can be only set by the Super User (passing token_auth).
      */
-    protected function authenticateTrackingApi($tokenAuthFromBulkRequest)
+    protected function authenticateTrackingApi($tokenAuth)
     {
-        $shouldAuthenticate = Config::getInstance()->Tracker['tracking_requests_require_authentication'];
+        $shouldAuthenticate = TrackerConfig::getConfigValue('tracking_requests_require_authentication');
+
         if ($shouldAuthenticate) {
-            $tokenAuth = $tokenAuthFromBulkRequest ? $tokenAuthFromBulkRequest : Common::getRequestVar('token_auth', false, 'string', $this->params);
+
+            if (empty($tokenAuth)) {
+                $tokenAuth = Common::getRequestVar('token_auth', false, 'string', $this->params);
+            }
+
             try {
                 $idSite = $this->getIdSite();
-                $this->isAuthenticated = $this->authenticateSuperUserOrAdmin($tokenAuth, $idSite);
+                $this->isAuthenticated = self::authenticateSuperUserOrAdmin($tokenAuth, $idSite);
             } catch (Exception $e) {
                 $this->isAuthenticated = false;
             }
-            if (!$this->isAuthenticated) {
-                return;
+
+            if ($this->isAuthenticated) {
+                Common::printDebug("token_auth is authenticated!");
             }
-            Common::printDebug("token_auth is authenticated!");
+
         } else {
             $this->isAuthenticated = true;
             Common::printDebug("token_auth authentication not required");
@@ -112,7 +138,7 @@ class Request
         Piwik::postEvent('Request.initAuthenticationObject');
 
         /** @var \Piwik\Auth $auth */
-        $auth = Registry::get('auth');
+        $auth = StaticContainer::get('Piwik\Auth');
         $auth->setTokenAuth($tokenAuth);
         $auth->setLogin(null);
         $access = $auth->authenticate();
@@ -124,10 +150,12 @@ class Request
         // Now checking the list of admin token_auth cached in the Tracker config file
         if (!empty($idSite) && $idSite > 0) {
             $website = Cache::getCacheWebsiteAttributes($idSite);
+
             if (array_key_exists('admin_token_auth', $website) && in_array($tokenAuth, $website['admin_token_auth'])) {
                 return true;
             }
         }
+
         Common::printDebug("WARNING! token_auth = $tokenAuth is not valid, Super User / Admin was NOT authenticated");
 
         return false;
@@ -139,11 +167,13 @@ class Request
     public function getDaysSinceFirstVisit()
     {
         $cookieFirstVisitTimestamp = $this->getParam('_idts');
+
         if (!$this->isTimestampValid($cookieFirstVisitTimestamp)) {
             $cookieFirstVisitTimestamp = $this->getCurrentTimestamp();
         }
 
         $daysSinceFirstVisit = round(($this->getCurrentTimestamp() - $cookieFirstVisitTimestamp) / 86400, $precision = 0);
+
         if ($daysSinceFirstVisit < 0) {
             $daysSinceFirstVisit = 0;
         }
@@ -324,21 +354,31 @@ class Request
     public function getCurrentTimestamp()
     {
         $cdt = $this->getCustomTimestamp();
-        if(!empty($cdt)) {
+
+        if (!empty($cdt)) {
             return $cdt;
         }
+
         return $this->timestamp;
     }
 
+    public function setCurrentTimestamp($timestamp)
+    {
+        $this->timestamp = $timestamp;
+    }
+
     protected function getCustomTimestamp()
     {
         $cdt = $this->getParam('cdt');
+
         if (empty($cdt)) {
             return false;
         }
+
         if (!is_numeric($cdt)) {
             $cdt = strtotime($cdt);
         }
+
         if (!$this->isTimestampValid($cdt, $this->timestamp)) {
             Common::printDebug(sprintf("Datetime %s is not valid", date("Y-m-d H:i:m", $cdt)));
             return false;
@@ -347,6 +387,7 @@ class Request
         // If timestamp in the past, token_auth is required
         $timeFromNow = $this->timestamp - $cdt;
         $isTimestampRecent = $timeFromNow < self::CUSTOM_TIMESTAMP_DOES_NOT_REQUIRE_TOKENAUTH_WHEN_NEWER_THAN;
+
         if (!$isTimestampRecent) {
             if(!$this->isAuthenticated()) {
                 Common::printDebug(sprintf("Custom timestamp is %s seconds old, requires &token_auth...", $timeFromNow));
@@ -354,6 +395,7 @@ class Request
                 return false;
             }
         }
+
         return $cdt;
     }
 
@@ -366,9 +408,10 @@ class Request
      */
     protected function isTimestampValid($time, $now = null)
     {
-        if(empty($now)) {
+        if (empty($now)) {
             $now = $this->getCurrentTimestamp();
         }
+
         return $time <= $now
             && $time > $now - 10 * 365 * 86400;
     }
@@ -400,10 +443,29 @@ class Request
 
     public function getUserAgent()
     {
-        $default = @$_SERVER['HTTP_USER_AGENT'];
-        return Common::getRequestVar('ua', is_null($default) ? false : $default, 'string', $this->params);
+        $default = false;
+
+        if (array_key_exists('HTTP_USER_AGENT', $_SERVER)) {
+            $default = $_SERVER['HTTP_USER_AGENT'];
+        }
+
+        return Common::getRequestVar('ua', $default, 'string', $this->params);
     }
 
+    public function getCustomVariablesInVisitScope()
+    {
+        return $this->getCustomVariables('visit');
+    }
+
+    public function getCustomVariablesInPageScope()
+    {
+        return $this->getCustomVariables('page');
+    }
+
+    /**
+     * @deprecated since Piwik 2.10.0. Use Request::getCustomVariablesInPageScope() or Request::getCustomVariablesInVisitScope() instead.
+     * When we "remove" this method we will only set visibility to "private" and pass $parameter = _cvar|cvar as an argument instead of $scope
+     */
     public function getCustomVariables($scope)
     {
         if ($scope == 'visit') {
@@ -412,16 +474,19 @@ class Request
             $parameter = 'cvar';
         }
 
-        $customVar = Common::unsanitizeInputValues(Common::getRequestVar($parameter, '', 'json', $this->params));
+        $cvar      = Common::getRequestVar($parameter, '', 'json', $this->params);
+        $customVar = Common::unsanitizeInputValues($cvar);
 
         if (!is_array($customVar)) {
             return array();
         }
 
         $customVariables = array();
-        $maxCustomVars = CustomVariables::getMaxCustomVariables();
+        $maxCustomVars   = CustomVariables::getMaxCustomVariables();
+
         foreach ($customVar as $id => $keyValue) {
             $id = (int)$id;
+
             if ($id < 1
                 || $id > $maxCustomVars
                 || count($keyValue) != 2
@@ -437,10 +502,8 @@ class Request
             // We keep in the URL when Custom Variable have empty names
             // and values, as it means they can be deleted server side
 
-            $key   = self::truncateCustomVariable($keyValue[0]);
-            $value = self::truncateCustomVariable($keyValue[1]);
-            $customVariables['custom_var_k' . $id] = $key;
-            $customVariables['custom_var_v' . $id] = $value;
+            $customVariables['custom_var_k' . $id] = self::truncateCustomVariable($keyValue[0]);
+            $customVariables['custom_var_v' . $id] = self::truncateCustomVariable($keyValue[1]);
         }
 
         return $customVariables;
@@ -485,17 +548,17 @@ class Request
 
     protected function getCookieName()
     {
-        return Config::getInstance()->Tracker['cookie_name'];
+        return TrackerConfig::getConfigValue('cookie_name');
     }
 
     protected function getCookieExpire()
     {
-        return $this->getCurrentTimestamp() + Config::getInstance()->Tracker['cookie_expire'];
+        return $this->getCurrentTimestamp() + TrackerConfig::getConfigValue('cookie_expire');
     }
 
     protected function getCookiePath()
     {
-        return Config::getInstance()->Tracker['cookie_path'];
+        return TrackerConfig::getConfigValue('cookie_path');
     }
 
     /**
@@ -594,9 +657,9 @@ class Request
         return $plugins;
     }
 
-    public function getParamsCount()
+    public function isEmptyRequest()
     {
-        return count($this->params);
+        return $this->isEmptyRequest;
     }
 
     const GENERATION_TIME_MS_MAXIMUM = 3600000; // 1 hour
@@ -637,18 +700,19 @@ class Request
      * @return mixed|string
      * @throws Exception
      */
-    private function getIpString()
+    public function getIpString()
     {
         $cip = $this->getParam('cip');
 
-        if(empty($cip)) {
+        if (empty($cip)) {
             return IP::getIpFromHeader();
         }
 
-        if(!$this->isAuthenticated()) {
+        if (!$this->isAuthenticated()) {
             Common::printDebug("WARN: Tracker API 'cip' was used with invalid token_auth");
             return IP::getIpFromHeader();
         }
+
         return $cip;
     }
 }
diff --git a/core/Tracker/RequestSet.php b/core/Tracker/RequestSet.php
new file mode 100644
index 0000000000..4d8771dc79
--- /dev/null
+++ b/core/Tracker/RequestSet.php
@@ -0,0 +1,258 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Tracker;
+
+use Piwik\Common;
+use Piwik\Piwik;
+use Piwik\Plugins\SitesManager\SiteUrls;
+use Piwik\Url;
+
+class RequestSet
+{
+    /**
+     * The set of visits to track.
+     *
+     * @var Request[]
+     */
+    private $requests = null;
+
+    /**
+     * The token auth supplied with a bulk visits POST.
+     *
+     * @var string
+     */
+    private $tokenAuth = null;
+
+    private $env = array();
+
+    public function setRequests($requests)
+    {
+        $this->requests = array();
+
+        foreach ($requests as $request) {
+
+            if (empty($request) && !is_array($request)) {
+                continue;
+            }
+
+            if (!$request instanceof Request) {
+                $request = new Request($request, $this->getTokenAuth());
+            }
+
+            $this->requests[] = $request;
+        }
+    }
+
+    public function setTokenAuth($tokenAuth)
+    {
+        $this->tokenAuth = $tokenAuth;
+    }
+
+    public function getNumberOfRequests()
+    {
+        if (is_array($this->requests)) {
+            return count($this->requests);
+        }
+
+        return 0;
+    }
+
+    public function getRequests()
+    {
+        if (!$this->areRequestsInitialized()) {
+            return array();
+        }
+
+        return $this->requests;
+    }
+
+    public function getTokenAuth()
+    {
+        if (!is_null($this->tokenAuth)) {
+            return $this->tokenAuth;
+        }
+
+        return Common::getRequestVar('token_auth', false);
+    }
+
+    private function areRequestsInitialized()
+    {
+        return !is_null($this->requests);
+    }
+
+    public function initRequestsAndTokenAuth()
+    {
+        if ($this->areRequestsInitialized()) {
+            return;
+        }
+
+        /**
+         * Triggered when detecting tracking requests. A plugin can use this event to set
+         * requests that should be tracked by calling the {@link RequestSet::setRequests()} method.
+         * For example the BulkTracking plugin uses this event to detect tracking requests and auth token based on
+         * a sent JSON instead of default $_GET+$_POST. It would allow you for example to track requests based on
+         * XML or you could import tracking requests stored in a file.
+         *
+         * @param \Piwik\Tracker\RequestSet &$requestSet  Call {@link setRequests()} to initialize requests and
+         *                                                {@link setTokenAuth()} to set a detected auth token.
+         *
+         * @ignore This event is not public yet as the RequestSet API is not really stable yet
+         */
+        Piwik::postEvent('Tracker.initRequestSet', array($this));
+
+        if (!$this->areRequestsInitialized()) {
+            $this->requests = array();
+
+            if (!empty($_GET) || !empty($_POST)) {
+                $this->setRequests(array($_GET + $_POST));
+            }
+        }
+    }
+
+    public function hasRequests()
+    {
+        return !empty($this->requests);
+    }
+
+    protected function getRedirectUrl()
+    {
+        return Common::getRequestVar('redirecturl', false, 'string');
+    }
+
+    protected function hasRedirectUrl()
+    {
+        $redirectUrl = $this->getRedirectUrl();
+
+        return !empty($redirectUrl);
+    }
+
+    protected function getAllSiteIdsWithinRequest()
+    {
+        if (empty($this->requests)) {
+            return array();
+        }
+
+        $siteIds = array();
+        foreach ($this->requests as $request) {
+            $siteIds[] = (int) $request->getIdSite();
+        }
+
+        return array_values(array_unique($siteIds));
+    }
+
+    // TODO maybe move to reponse? or somewhere else? not sure where!
+    public function shouldPerformRedirectToUrl()
+    {
+        if (!$this->hasRedirectUrl()) {
+            return false;
+        }
+
+        if (!$this->hasRequests()) {
+            return false;
+        }
+
+        $redirectUrl = $this->getRedirectUrl();
+        $host        = Url::getHostFromUrl($redirectUrl);
+
+        if (empty($host)) {
+            return false;
+        }
+
+        $urls     = new SiteUrls();
+        $siteUrls = $urls->getAllCachedSiteUrls();
+        $siteIds  = $this->getAllSiteIdsWithinRequest();
+
+        foreach ($siteIds as $siteId) {
+            if (empty($siteUrls[$siteId])) {
+                $siteUrls[$siteId] = array();
+            }
+
+            if (Url::isHostInUrls($host, $siteUrls[$siteId])) {
+                return $redirectUrl;
+            }
+        }
+
+        return false;
+    }
+
+    public function getState()
+    {
+        $requests = array(
+            'requests'  => array(),
+            'env'       => $this->getEnvironment(),
+            'tokenAuth' => $this->getTokenAuth(),
+            'time'      => time()
+        );
+
+        foreach ($this->getRequests() as $request) {
+            $requests['requests'][] = $request->getRawParams();
+        }
+
+        return $requests;
+    }
+
+    public function restoreState($state)
+    {
+        $backupEnv = $this->getCurrentEnvironment();
+
+        $this->setEnvironment($state['env']);
+        $this->setTokenAuth($state['tokenAuth']);
+
+        $this->restoreEnvironment();
+        $this->setRequests($state['requests']);
+
+        foreach ($this->getRequests() as $request) {
+            $request->setCurrentTimestamp($state['time']);
+        }
+
+        $this->resetEnvironment($backupEnv);
+    }
+
+    public function rememberEnvironment()
+    {
+        $this->setEnvironment($this->getEnvironment());
+    }
+
+    public function setEnvironment($env)
+    {
+        $this->env = $env;
+    }
+
+    protected function getEnvironment()
+    {
+        if (!empty($this->env)) {
+            return $this->env;
+        }
+
+        return $this->getCurrentEnvironment();
+    }
+
+    public function restoreEnvironment()
+    {
+        if (empty($this->env)) {
+            return;
+        }
+
+        $this->resetEnvironment($this->env);
+    }
+
+    private function resetEnvironment($env)
+    {
+        $_SERVER = $env['server'];
+    }
+
+    private function getCurrentEnvironment()
+    {
+        return array(
+            'server' => $_SERVER
+        );
+    }
+
+
+}
diff --git a/core/Tracker/Response.php b/core/Tracker/Response.php
new file mode 100644
index 0000000000..5258d65cd2
--- /dev/null
+++ b/core/Tracker/Response.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Tracker;
+
+use Exception;
+use Piwik\Common;
+use Piwik\Profiler;
+use Piwik\Timer;
+use Piwik\Tracker;
+use Piwik\Tracker\Db as TrackerDb;
+
+class Response
+{
+    private $timer;
+
+    private $content;
+
+    public function init(Tracker $tracker)
+    {
+        ob_start(); // we use ob_start only because of Common::printDebug, we should actually not really use ob_start
+
+        if ($tracker->isDebugModeEnabled()) {
+            $this->timer = new Timer();
+
+            TrackerDb::enableProfiling();
+        }
+    }
+
+    public function getOutput()
+    {
+        $this->outputAccessControlHeaders();
+
+        if (is_null($this->content) && ob_get_level() > 0) {
+            $this->content = ob_get_clean();
+        }
+
+        return $this->content;
+    }
+
+    /**
+     * Echos an error message & other information, then exits.
+     *
+     * @param Tracker $tracker
+     * @param Exception $e
+     * @param int  $statusCode eg 500
+     */
+    public function outputException(Tracker $tracker, Exception $e, $statusCode)
+    {
+        Common::sendResponseCode($statusCode);
+        $this->logExceptionToErrorLog($e);
+
+        if ($tracker->isDebugModeEnabled()) {
+            Common::sendHeader('Content-Type: text/html; charset=utf-8');
+            $trailer = '<span style="color: #888888">Backtrace:<br /><pre>' . $e->getTraceAsString() . '</pre></span>';
+            $headerPage = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Morpheus/templates/simpleLayoutHeader.tpl');
+            $footerPage = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Morpheus/templates/simpleLayoutFooter.tpl');
+            $headerPage = str_replace('{$HTML_TITLE}', 'Piwik &rsaquo; Error', $headerPage);
+
+            echo $headerPage . '<p>' . $this->getMessageFromException($e) . '</p>' . $trailer . $footerPage;
+        } else {
+            $this->outputApiResponse($tracker);
+        }
+    }
+
+    public function outputResponse(Tracker $tracker)
+    {
+        if (!$tracker->shouldRecordStatistics()) {
+            $this->outputApiResponse($tracker);
+            Common::printDebug("Logging disabled, display transparent logo");
+        } elseif (!$tracker->hasLoggedRequests()) {
+            Common::printDebug("Empty request => Piwik page");
+            echo "<a href='/'>Piwik</a> is a free/libre web <a href='http://piwik.org'>analytics</a> that lets you keep control of your data.";
+        } else {
+            $this->outputApiResponse($tracker);
+            Common::printDebug("Nothing to notice => default behaviour");
+        }
+
+        Common::printDebug("End of the page.");
+
+        if ($tracker->isDebugModeEnabled()
+            && $tracker->isDatabaseConnected()
+            && TrackerDb::isProfilingEnabled()) {
+            $db = Tracker::getDatabase();
+            $db->recordProfiling();
+            Profiler::displayDbTrackerProfile($db);
+        }
+
+        if ($tracker->isDebugModeEnabled()) {
+            Common::printDebug($_COOKIE);
+            Common::printDebug((string)$this->timer);
+        }
+    }
+
+    private function outputAccessControlHeaders()
+    {
+        $requestMethod = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : 'GET';
+
+        if ($requestMethod !== 'GET') {
+            $origin = isset($_SERVER['HTTP_ORIGIN']) ? $_SERVER['HTTP_ORIGIN'] : '*';
+            Common::sendHeader('Access-Control-Allow-Origin: ' . $origin);
+            Common::sendHeader('Access-Control-Allow-Credentials: true');
+        }
+    }
+
+    private function getOutputBuffer()
+    {
+        return ob_get_contents();
+    }
+
+    protected function hasAlreadyPrintedOutput()
+    {
+        return strlen($this->getOutputBuffer()) > 0;
+    }
+
+    private function outputApiResponse(Tracker $tracker)
+    {
+        if ($tracker->isDebugModeEnabled()) {
+            return;
+        }
+
+        if ($this->hasAlreadyPrintedOutput()) {
+            return;
+        }
+
+        $request = $_GET + $_POST;
+
+        if (array_key_exists('send_image', $request) && $request['send_image'] === '0') {
+            Common::sendResponseCode(204);
+            return;
+        }
+
+        $this->outputTransparentGif();
+    }
+
+    private function outputTransparentGif ()
+    {
+        $transGifBase64 = "R0lGODlhAQABAIAAAAAAAAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==";
+        Common::sendHeader('Content-Type: image/gif');
+
+        echo base64_decode($transGifBase64);
+    }
+
+    /**
+     * Gets the error message to output when a tracking request fails.
+     *
+     * @param Exception $e
+     * @return string
+     */
+    protected function getMessageFromException($e)
+    {
+        // Note: duplicated from FormDatabaseSetup.isAccessDenied
+        // Avoid leaking the username/db name when access denied
+        if ($e->getCode() == 1044 || $e->getCode() == 42000) {
+            return "Error while connecting to the Piwik database - please check your credentials in config/config.ini.php file";
+        }
+
+        if (Common::isPhpCliMode()) {
+            return $e->getMessage() . "\n" . $e->getTraceAsString();
+        }
+
+        return $e->getMessage();
+    }
+
+    protected function logExceptionToErrorLog(Exception $e)
+    {
+        error_log(sprintf("Error in Piwik (tracker): %s", str_replace("\n", " ", $this->getMessageFromException($e))));
+    }
+
+}
diff --git a/core/Tracker/ScheduledTasksRunner.php b/core/Tracker/ScheduledTasksRunner.php
new file mode 100644
index 0000000000..2a4683a4cb
--- /dev/null
+++ b/core/Tracker/ScheduledTasksRunner.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Tracker;
+
+
+use Piwik\Common;
+use Piwik\Config;
+use Piwik\CronArchive;
+use Piwik\Option;
+use Piwik\Piwik;
+use Piwik\SettingsPiwik;
+use Piwik\Tracker;
+use Piwik\Translate;
+
+class ScheduledTasksRunner
+{
+
+    public function shouldRun(Tracker $tracker)
+    {
+        if (Common::isPhpCliMode()) {
+            // don't run scheduled tasks in CLI mode from Tracker, this is the case
+            // where we bulk load logs & don't want to lose time with tasks
+            return false;
+        }
+
+        return $tracker->shouldRecordStatistics();
+    }
+
+    /**
+     * Tracker requests will automatically trigger the Scheduled tasks.
+     * This is useful for users who don't setup the cron,
+     * but still want daily/weekly/monthly PDF reports emailed automatically.
+     *
+     * This is similar to calling the API CoreAdminHome.runScheduledTasks
+     */
+    public function runScheduledTasks()
+    {
+        $now = time();
+
+        // Currently, there are no hourly tasks. When there are some,
+        // this could be too aggressive minimum interval (some hours would be skipped in case of low traffic)
+        $minimumInterval = TrackerConfig::getConfigValue('scheduled_tasks_min_interval');
+
+        // If the user disabled browser archiving, he has already setup a cron
+        // To avoid parallel requests triggering the Scheduled Tasks,
+        // Get last time tasks started executing
+        $cache = Cache::getCacheGeneral();
+
+        if ($minimumInterval <= 0
+            || empty($cache['isBrowserTriggerEnabled'])
+        ) {
+            Common::printDebug("-> Scheduled tasks not running in Tracker: Browser archiving is disabled.");
+            return;
+        }
+
+        $nextRunTime = $cache['lastTrackerCronRun'] + $minimumInterval;
+
+        if ((defined('DEBUG_FORCE_SCHEDULED_TASKS') && DEBUG_FORCE_SCHEDULED_TASKS)
+            || $cache['lastTrackerCronRun'] === false
+            || $nextRunTime < $now
+        ) {
+            $cache['lastTrackerCronRun'] = $now;
+            Cache::setCacheGeneral($cache);
+            Tracker::initCorePiwikInTrackerMode();
+            Option::set('lastTrackerCronRun', $cache['lastTrackerCronRun']);
+            Common::printDebug('-> Scheduled Tasks: Starting...');
+
+            // save current user privilege and temporarily assume Super User privilege
+            $isSuperUser = Piwik::hasUserSuperUserAccess();
+
+            // Scheduled tasks assume Super User is running
+            Piwik::setUserHasSuperUserAccess();
+
+            ob_start();
+            CronArchive::$url = SettingsPiwik::getPiwikUrl();
+            $cronArchive = new CronArchive();
+            $cronArchive->runScheduledTasksInTrackerMode();
+
+            $resultTasks = ob_get_contents();
+            ob_clean();
+
+            // restore original user privilege
+            Piwik::setUserHasSuperUserAccess($isSuperUser);
+
+            foreach (explode('</pre>', $resultTasks) as $resultTask) {
+                Common::printDebug(str_replace('<pre>', '', $resultTask));
+            }
+
+            Common::printDebug('Finished Scheduled Tasks.');
+        } else {
+            Common::printDebug("-> Scheduled tasks not triggered.");
+        }
+
+        Common::printDebug("Next run will be from: " . date('Y-m-d H:i:s', $nextRunTime) . ' UTC');
+    }
+}
diff --git a/core/Tracker/Settings.php b/core/Tracker/Settings.php
index 836d03650a..9b3fd7b2e5 100644
--- a/core/Tracker/Settings.php
+++ b/core/Tracker/Settings.php
@@ -8,6 +8,7 @@
  */
 namespace Piwik\Tracker;
 
+use Piwik\Config;
 use Piwik\Tracker;
 use Piwik\DeviceDetectorFactory;
 use Piwik\SettingsPiwik;
@@ -16,10 +17,11 @@ class Settings
 {
     const OS_BOT = 'BOT';
 
-    function __construct(Request $request, $ip)
+    function __construct(Request $request, $ip, $isSameFingerprintsAcrossWebsites)
     {
         $this->request   = $request;
         $this->ipAddress = $ip;
+        $this->isSameFingerprintsAcrossWebsites = $isSameFingerprintsAcrossWebsites;
         $this->configId  = null;
     }
 
@@ -78,7 +80,9 @@ class Settings
     }
 
     /**
-     * Returns a 64-bit hash of all the configuration settings
+     * Returns a 64-bit hash that attemps to identify a user.
+     * Maintaining some privacy by default, eg. prevents the merging of several Piwik serve together for matching across instances..
+     *
      * @param $os
      * @param $browserName
      * @param $browserVersion
@@ -110,8 +114,13 @@ class Settings
             . $browserLang
             . $salt;
 
+        if(!$this->isSameFingerprintsAcrossWebsites) {
+            $configString .= $this->request->getIdSite();
+        }
+
         $hash = md5($configString, $raw_output = true);
 
         return substr($hash, 0, Tracker::LENGTH_BINARY_ID);
     }
+
 }
\ No newline at end of file
diff --git a/core/Tracker/SettingsStorage.php b/core/Tracker/SettingsStorage.php
index 6c54b1b993..7ffb3de872 100644
--- a/core/Tracker/SettingsStorage.php
+++ b/core/Tracker/SettingsStorage.php
@@ -11,33 +11,24 @@ namespace Piwik\Tracker;
 
 use Piwik\Settings\Storage;
 use Piwik\Tracker;
+use Piwik\Cache as PiwikCache;
 
 /**
  * Loads settings from tracker cache instead of database. If not yet present in tracker cache will cache it.
  */
 class SettingsStorage extends Storage
 {
-
     protected function loadSettings()
     {
-        $trackerCache = Cache::getCacheGeneral();
-        $settings = null;
-
-        if (array_key_exists('settingsStorage', $trackerCache)) {
-            $allSettings = $trackerCache['settingsStorage'];
+        $cacheId = $this->getOptionKey();
+        $cache = $this->getCache();
 
-            if (is_array($allSettings) && array_key_exists($this->getOptionKey(), $allSettings)) {
-                $settings = $allSettings[$this->getOptionKey()];
-            }
+        if ($cache->contains($cacheId)) {
+            $settings = $cache->fetch($cacheId);
         } else {
-            $trackerCache['settingsStorage'] = array();
-        }
-
-        if (is_null($settings)) {
             $settings = parent::loadSettings();
 
-            $trackerCache['settingsStorage'][$this->getOptionKey()] = $settings;
-            Cache::setCacheGeneral($trackerCache);
+            $cache->save($cacheId, $settings);
         }
 
         return $settings;
@@ -49,9 +40,20 @@ class SettingsStorage extends Storage
         self::clearCache();
     }
 
+    private function getCache()
+    {
+        return self::buildCache($this->getOptionKey());
+    }
+
     public static function clearCache()
     {
-        Cache::clearCacheGeneral();
+        Cache::deleteTrackerCache();
+        self::buildCache()->flushAll();
+    }
+
+    private static function buildCache()
+    {
+        return PiwikCache::getEagerCache();
     }
 
 }
diff --git a/core/Tracker/TableLogAction.php b/core/Tracker/TableLogAction.php
index 709936f2a5..fe620035d7 100644
--- a/core/Tracker/TableLogAction.php
+++ b/core/Tracker/TableLogAction.php
@@ -10,7 +10,7 @@
 namespace Piwik\Tracker;
 
 use Piwik\Common;
-use Piwik\SegmentExpression;
+use Piwik\Segment\SegmentExpression;
 use Piwik\Tracker;
 
 /**
diff --git a/core/Tracker/TrackerConfig.php b/core/Tracker/TrackerConfig.php
new file mode 100644
index 0000000000..537dc8f0c9
--- /dev/null
+++ b/core/Tracker/TrackerConfig.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Tracker;
+
+use Piwik\Config;
+use Piwik\Tracker;
+
+class TrackerConfig
+{
+    /**
+     * Update Tracker config
+     *
+     * @param string $name Setting name
+     * @param mixed $value Value
+     */
+    public static function setConfigValue($name, $value)
+    {
+        $section = self::getConfig();
+        $section[$name] = $value;
+        Config::getInstance()->Tracker = $section;
+    }
+
+    public static function getConfigValue($name)
+    {
+        $config = self::getConfig();
+        return $config[$name];
+    }
+
+    private static function getConfig()
+    {
+        return Config::getInstance()->Tracker;
+    }
+}
diff --git a/core/Tracker/Visit.php b/core/Tracker/Visit.php
index 9dee4196b7..e5dbc69ef6 100644
--- a/core/Tracker/Visit.php
+++ b/core/Tracker/Visit.php
@@ -11,9 +11,13 @@ namespace Piwik\Tracker;
 
 use Piwik\Common;
 use Piwik\Config;
+use Piwik\DataAccess\ArchiveInvalidator;
+use Piwik\Date;
+use Piwik\Exception\UnexpectedWebsiteFoundException;
 use Piwik\Network\IPUtils;
 use Piwik\Piwik;
 use Piwik\Plugin\Dimension\VisitDimension;
+use Piwik\SettingsPiwik;
 use Piwik\Tracker;
 
 /**
@@ -152,11 +156,7 @@ class Visit implements VisitInterface
 
         $this->visitorInfo = $visitor->getVisitorInfo();
 
-        $isLastActionInTheSameVisit = $this->isLastActionInTheSameVisit($visitor);
-
-        if (!$isLastActionInTheSameVisit) {
-            Common::printDebug("Visitor detected, but last action was more than 30 minutes ago...");
-        }
+        $isNewVisit = $this->isVisitNew($visitor, $action);
 
         // Known visit when:
         // ( - the visitor has the Piwik cookie with the idcookie ID used by Piwik to match the visitor
@@ -165,9 +165,7 @@ class Visit implements VisitInterface
         // )
         // AND
         // - the last page view for this visitor was less than 30 minutes ago @see isLastActionInTheSameVisit()
-        if ($visitor->isVisitorKnown()
-            && $isLastActionInTheSameVisit
-        ) {
+        if (!$isNewVisit) {
             $idReferrerActionUrl  = $this->visitorInfo['visit_exit_idaction_url'];
             $idReferrerActionName = $this->visitorInfo['visit_exit_idaction_name'];
 
@@ -203,9 +201,7 @@ class Visit implements VisitInterface
         // - the visitor has the Piwik cookie but the last action was performed more than 30 min ago @see isLastActionInTheSameVisit()
         // - the visitor doesn't have the Piwik cookie, and couldn't be matched in @see recognizeTheVisitor()
         // - the visitor does have the Piwik cookie but the idcookie and idvisit found in the cookie didn't match to any existing visit in the DB
-        if (!$visitor->isVisitorKnown()
-            || !$isLastActionInTheSameVisit
-        ) {
+        if ($isNewVisit) {
             $this->handleNewVisit($visitor, $action, $visitIsConverted);
             if (!is_null($action)) {
                 $action->record($visitor, 0, 0);
@@ -226,6 +222,8 @@ class Visit implements VisitInterface
         }
         unset($this->goalManager);
         unset($action);
+
+        $this->markArchivedReportsAsInvalidIfArchiveAlreadyFinished();
     }
 
     /**
@@ -386,7 +384,7 @@ class Visit implements VisitInterface
     protected function getSettingsObject()
     {
         if (is_null($this->userSettings)) {
-            $this->userSettings = new Settings( $this->request, $this->getVisitorIp() );
+            $this->userSettings = new Settings( $this->request, $this->getVisitorIp(), SettingsPiwik::isSameFingerprintAcrossWebsites());
         }
 
         return $this->userSettings;
@@ -405,6 +403,33 @@ class Visit implements VisitInterface
             && ($lastActionTime > ($this->request->getCurrentTimestamp() - Config::getInstance()->Tracker['visit_standard_length']));
     }
 
+    /**
+     * Returns true if the last action was not today.
+     * @param Visitor $visitor
+     * @return bool
+     */
+    private function wasLastActionNotToday(Visitor $visitor)
+    {
+        $lastActionTime = $visitor->getVisitorColumn('visit_last_action_time');
+
+        if (empty($lastActionTime)) {
+            return false;
+        }
+
+        $idSite   = $this->request->getIdSite();
+        $timezone = $this->getTimezoneForSite($idSite);
+
+        if (empty($timezone)) {
+            throw new UnexpectedWebsiteFoundException('An unexpected website was found, check idSite in the request');
+        }
+
+        $date = Date::factory((int) $lastActionTime, $timezone);
+        $now  = $this->request->getCurrentTimestamp();
+        $now  = Date::factory((int) $now, $timezone);
+
+        return $date->toString() !== $now->toString();
+    }
+
     // is the referrer host any of the registered URLs for this website?
     public static function isHostKnownAliasHost($urlHost, $idSite)
     {
@@ -427,7 +452,7 @@ class Visit implements VisitInterface
 
     private static function toCanonicalHost($host)
     {
-        $hostLower = mb_strtolower($host, 'UTF-8');
+        $hostLower = Common::mb_strtolower($host, 'UTF-8');
         return str_replace('www.', '', $hostLower);
     }
 
@@ -547,6 +572,16 @@ class Visit implements VisitInterface
         return $valuesToUpdate;
     }
 
+    private function triggerPredicateHookOnDimensions($dimensions, $hook, Visitor $visitor, Action $action = null)
+    {
+        foreach ($dimensions as $dimension) {
+            if ($dimension->$hook($this->request, $visitor, $action)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     protected function getAllVisitDimensions()
     {
         $dimensions = VisitDimension::getAllDimensions();
@@ -595,4 +630,73 @@ class Visit implements VisitInterface
     {
         return $this->getModel()->createVisit($visit);
     }
+
+    /**
+     * Determines if the tracker if the current action should be treated as the start of a new visit or
+     * an action in an existing visit.
+     *
+     * @param Visitor $visitor The current visit/visitor information.
+     * @param Action|null $action The current action being tracked.
+     * @return bool
+     */
+    public function isVisitNew(Visitor $visitor, Action $action = null)
+    {
+        if (!$visitor->isVisitorKnown()) {
+            return true;
+        }
+
+        $isLastActionInTheSameVisit = $this->isLastActionInTheSameVisit($visitor);
+
+        if (!$isLastActionInTheSameVisit) {
+            Common::printDebug("Visitor detected, but last action was more than 30 minutes ago...");
+
+            return true;
+        }
+
+        $wasLastActionYesterday = $this->wasLastActionNotToday($visitor);
+        if ($wasLastActionYesterday) {
+            Common::printDebug("Visitor detected, but last action was yesterday...");
+
+            return true;
+        }
+
+        $shouldForceNewVisit = $this->triggerPredicateHookOnDimensions($this->getAllVisitDimensions(), 'shouldForceNewVisit', $visitor, $action);
+        if ($shouldForceNewVisit) {
+            return true;
+        }
+
+        return false;
+    }
+
+    private function markArchivedReportsAsInvalidIfArchiveAlreadyFinished()
+    {
+        $idSite = (int) $this->request->getIdSite();
+        $time   = $this->request->getCurrentTimestamp();
+
+        $timezone = $this->getTimezoneForSite($idSite);
+
+        if (!isset($timezone)) {
+            return;
+        }
+
+        $date = Date::factory((int) $time, $timezone);
+
+        if (!$date->isToday()) { // we don't have to handle in case date is in future as it is not allowed by tracker
+            $invalidReport = new ArchiveInvalidator();
+            $invalidReport->rememberToInvalidateArchivedReportsLater($idSite, $date);
+        }
+    }
+
+    private function getTimezoneForSite($idSite)
+    {
+        try {
+            $site = Cache::getCacheWebsiteAttributes($idSite);
+        } catch (UnexpectedWebsiteFoundException $e) {
+            return;
+        }
+
+        if (!empty($site['timezone'])) {
+            return $site['timezone'];
+        }
+    }
 }
diff --git a/core/Tracker/Visit/Factory.php b/core/Tracker/Visit/Factory.php
new file mode 100644
index 0000000000..71362dddea
--- /dev/null
+++ b/core/Tracker/Visit/Factory.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Tracker\Visit;
+use Piwik\Piwik;
+use Piwik\Tracker\Visit;
+use Piwik\Tracker\VisitInterface;
+use Exception;
+
+class Factory
+{
+    /**
+     * Returns the Tracker_Visit object.
+     * This method can be overwritten to use a different Tracker_Visit object
+     *
+     * @throws Exception
+     * @return \Piwik\Tracker\Visit
+     */
+    public static function make()
+    {
+        $visit = null;
+
+        /**
+         * Triggered before a new **visit tracking object** is created. Subscribers to this
+         * event can force the use of a custom visit tracking object that extends from
+         * {@link Piwik\Tracker\VisitInterface}.
+         *
+         * @param \Piwik\Tracker\VisitInterface &$visit Initialized to null, but can be set to
+         *                                              a new visit object. If it isn't modified
+         *                                              Piwik uses the default class.
+         */
+        Piwik::postEvent('Tracker.makeNewVisitObject', array(&$visit));
+
+        if (is_null($visit)) {
+            $visit = new Visit();
+        } elseif (!($visit instanceof VisitInterface)) {
+            throw new Exception("The Visit object set in the plugin must implement VisitInterface");
+        }
+
+        return $visit;
+    }
+}
diff --git a/core/Tracker/VisitExcluded.php b/core/Tracker/VisitExcluded.php
index ca481218cb..f3d8d0cab2 100644
--- a/core/Tracker/VisitExcluded.php
+++ b/core/Tracker/VisitExcluded.php
@@ -167,8 +167,17 @@ class VisitExcluded
     {
         return array(
             // Google
-            '66.249.0.0/16',
-            '64.233.172.0/24',
+            '216.239.32.0/19',
+            '64.233.160.0/19',
+            '66.249.80.0/20',
+            '72.14.192.0/18',
+            '209.85.128.0/17',
+            '66.102.0.0/20',
+            '74.125.0.0/16',
+            '64.18.0.0/20',
+            '207.126.144.0/20',
+            '173.194.0.0/16',
+
             // Live/Bing/MSN
             '64.4.0.0/18',
             '65.52.0.0/14',
@@ -180,6 +189,7 @@ class VisitExcluded
             '207.68.192.0/20',
             '131.253.26.0/20',
             '131.253.24.0/20',
+
             // Yahoo
             '72.30.198.0/20',
             '72.30.196.0/20',
@@ -261,6 +271,7 @@ class VisitExcluded
         $referrerUrl = $this->request->getParam('urlref');
 
         foreach($spamHosts as $spamHost) {
+            $spamHost = trim($spamHost);
             if ( strpos($referrerUrl, $spamHost) !== false) {
                 Common::printDebug('Referrer URL is a known spam: ' . $spamHost);
                 return true;
diff --git a/core/Translate.php b/core/Translate.php
index c29d0f0339..5b46a2e71a 100644
--- a/core/Translate.php
+++ b/core/Translate.php
@@ -9,14 +9,16 @@
 namespace Piwik;
 
 use Exception;
+use Piwik\Container\StaticContainer;
+use Piwik\Plugin\Manager;
+use Piwik\Translation\Translator;
 
 /**
+ * @deprecated Use Piwik\Translation\Translator instead.
+ * @see \Piwik\Translation\Translator
  */
 class Translate
 {
-    private static $languageToLoad = null;
-    private static $loadedLanguage = false;
-
     /**
      * Clean a string that may contain HTML special chars, single/double quotes, HTML entities, leading/trailing whitespace
      *
@@ -28,25 +30,27 @@ class Translate
         return html_entity_decode(trim($s), ENT_QUOTES, 'UTF-8');
     }
 
+    /**
+     * @deprecated
+     */
     public static function loadEnglishTranslation()
     {
-        self::loadCoreTranslationFile('en');
+        self::loadAllTranslations();
     }
 
+    /**
+     * @deprecated
+     */
     public static function unloadEnglishTranslation()
     {
-        $GLOBALS['Piwik_translations'] = array();
+        self::reset();
     }
 
+    /**
+     * @deprecated
+     */
     public static function reloadLanguage($language = false)
     {
-        if (empty($language)) {
-            $language = self::getLanguageToLoad();
-        }
-        self::unloadEnglishTranslation();
-        self::loadEnglishTranslation();
-        self::loadCoreTranslation($language);
-        \Piwik\Plugin\Manager::getInstance()->loadPluginTranslations($language);
     }
 
     /**
@@ -57,41 +61,14 @@ class Translate
      */
     public static function loadCoreTranslation($language = false)
     {
-        if (empty($language)) {
-            $language = self::getLanguageToLoad();
-        }
-        if (self::$loadedLanguage == $language) {
-            return;
-        }
-        self::loadCoreTranslationFile($language);
-    }
-
-    private static function loadCoreTranslationFile($language)
-    {
-        if (empty($language)) {
-            return;
-        }
-        $path = PIWIK_INCLUDE_PATH . '/lang/' . $language . '.json';
-        if (!Filesystem::isValidFilename($language) || !is_readable($path)) {
-            throw new Exception(Piwik::translate('General_ExceptionLanguageFileNotFound', array($language)));
-        }
-        $data = file_get_contents($path);
-        $translations = json_decode($data, true);
-        self::mergeTranslationArray($translations);
-        self::setLocale();
-        self::$loadedLanguage = $language;
+        self::getTranslator()->addDirectory(PIWIK_INCLUDE_PATH . '/lang');
     }
 
+    /**
+     * @deprecated
+     */
     public static function mergeTranslationArray($translation)
     {
-        if (!isset($GLOBALS['Piwik_translations'])) {
-            $GLOBALS['Piwik_translations'] = array();
-        }
-        if (empty($translation)) {
-            return;
-        }
-        // we could check that no string overlap here
-        $GLOBALS['Piwik_translations'] = array_replace_recursive($GLOBALS['Piwik_translations'], $translation);
     }
 
     /**
@@ -100,46 +77,13 @@ class Translate
      */
     public static function getLanguageToLoad()
     {
-        if (is_null(self::$languageToLoad)) {
-            $lang = Common::getRequestVar('language', '', 'string');
-
-            /**
-             * Triggered when the current user's language is requested.
-             *
-             * By default the current language is determined by the **language** query
-             * parameter. Plugins can override this logic by subscribing to this event.
-             *
-             * **Example**
-             *
-             *     public function getLanguage(&$lang)
-             *     {
-             *         $client = new My3rdPartyAPIClient();
-             *         $thirdPartyLang = $client->getLanguageForUser(Piwik::getCurrentUserLogin());
-             *
-             *         if (!empty($thirdPartyLang)) {
-             *             $lang = $thirdPartyLang;
-             *         }
-             *     }
-             *
-             * @param string &$lang The language that should be used for the current user. Will be
-             *                      initialized to the value of the **language** query parameter.
-             */
-            Piwik::postEvent('User.getLanguage', array(&$lang));
-
-            self::$languageToLoad = $lang;
-        }
-
-        return self::$languageToLoad;
+        return self::getTranslator()->getCurrentLanguage();
     }
 
     /** Reset the cached language to load. Used in tests. */
     public static function reset()
     {
-        self::$languageToLoad = null;
-    }
-
-    private static function isALanguageLoaded() {
-        return !empty($GLOBALS['Piwik_translations']);
+        self::getTranslator()->reset();
     }
 
     /**
@@ -148,16 +92,12 @@ class Translate
      */
     public static function getLanguageLoaded()
     {
-        if (!self::isALanguageLoaded()) {
-            return null;
-        }
-
-        return self::$loadedLanguage;
+        return self::getTranslator()->getCurrentLanguage();
     }
 
     public static function getLanguageDefault()
     {
-        return Config::getInstance()->General['default_language'];
+        return self::getTranslator()->getDefaultLanguage();
     }
 
     /**
@@ -165,77 +105,25 @@ class Translate
      */
     public static function getJavascriptTranslations()
     {
-        $translations = & $GLOBALS['Piwik_translations'];
-
-        $clientSideTranslations = array();
-        foreach (self::getClientSideTranslationKeys() as $key) {
-            list($plugin, $stringName) = explode("_", $key, 2);
-            $clientSideTranslations[$key] = $translations[$plugin][$stringName];
-        }
-
-        $js = 'var translations = ' . json_encode($clientSideTranslations) . ';';
-        $js .= "\n" . 'if (typeof(piwik_translations) == \'undefined\') { var piwik_translations = new Object; }' .
-            'for(var i in translations) { piwik_translations[i] = translations[i];} ';
-        return $js;
+        return self::getTranslator()->getJavascriptTranslations();
     }
 
-    /**
-     * Returns the list of client side translations by key. These translations will be outputted
-     * to the translation JavaScript.
-     */
-    private static function getClientSideTranslationKeys()
+    public static function findTranslationKeyForTranslation($translation)
     {
-        $result = array();
-
-        /**
-         * Triggered before generating the JavaScript code that allows i18n strings to be used
-         * in the browser.
-         *
-         * Plugins should subscribe to this event to specify which translations
-         * should be available to JavaScript.
-         *
-         * Event handlers should add whole translation keys, ie, keys that include the plugin name.
-         *
-         * **Example**
-         *
-         *     public function getClientSideTranslationKeys(&$result)
-         *     {
-         *         $result[] = "MyPlugin_MyTranslation";
-         *     }
-         *
-         * @param array &$result The whole list of client side translation keys.
-         */
-        Piwik::postEvent('Translate.getClientSideTranslationKeys', array(&$result));
-
-        $result = array_unique($result);
-
-        return $result;
+        return self::getTranslator()->findTranslationKeyForTranslation($translation);
     }
 
     /**
-     * Set locale
-     *
-     * @see http://php.net/setlocale
+     * @return Translator
      */
-    private static function setLocale()
+    private static function getTranslator()
     {
-        $locale = $GLOBALS['Piwik_translations']['General']['Locale'];
-        $locale_variant = str_replace('UTF-8', 'UTF8', $locale);
-        setlocale(LC_ALL, $locale, $locale_variant);
-        setlocale(LC_CTYPE, '');
+        return StaticContainer::get('Piwik\Translation\Translator');
     }
 
-    public static function findTranslationKeyForTranslation($translation)
+    public static function loadAllTranslations()
     {
-        if (empty($GLOBALS['Piwik_translations'])) {
-            return;
-        }
-
-        foreach ($GLOBALS['Piwik_translations'] as $key => $translations) {
-            $possibleKey = array_search($translation, $translations);
-            if (!empty($possibleKey)) {
-                return $key . '_' . $possibleKey;
-            }
-        }
+        self::loadCoreTranslation();
+        Manager::getInstance()->loadPluginTranslations();
     }
 }
diff --git a/core/Translate/Filter/ByBaseTranslations.php b/core/Translate/Filter/ByBaseTranslations.php
deleted file mode 100644
index 8a2e095d95..0000000000
--- a/core/Translate/Filter/ByBaseTranslations.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-
-namespace Piwik\Translate\Filter;
-
-/**
- */
-class ByBaseTranslations extends FilterAbstract
-{
-    protected $baseTranslations = array();
-
-    /**
-     * Sets base translations
-     *
-     * @param array $baseTranslations
-     */
-    public function __construct($baseTranslations = array())
-    {
-        $this->baseTranslations = $baseTranslations;
-    }
-
-    /**
-     * Removes all translations that aren't present in the base translations set in constructor
-     *
-     * @param  array $translations
-     *
-     * @return array   filtered translations
-     */
-    public function filter($translations)
-    {
-        $cleanedTranslations = array();
-
-        foreach ($translations as $pluginName => $pluginTranslations) {
-
-            if (empty($this->baseTranslations[$pluginName])) {
-                $this->filteredData[$pluginName] = $pluginTranslations;
-                continue;
-            }
-
-            foreach ($pluginTranslations as $key => $translation) {
-                if (isset($this->baseTranslations[$pluginName][$key])) {
-                    $cleanedTranslations[$pluginName][$key] = $translation;
-                }
-            }
-
-            if (!empty($cleanedTranslations[$pluginName])) {
-                $diff = array_diff($translations[$pluginName], $cleanedTranslations[$pluginName]);
-            } else {
-                $diff = $translations[$pluginName];
-            }
-            if (!empty($diff)) {
-                $this->filteredData[$pluginName] = $diff;
-            }
-        }
-
-        return $cleanedTranslations;
-    }
-}
diff --git a/core/Translate/Filter/ByParameterCount.php b/core/Translate/Filter/ByParameterCount.php
deleted file mode 100644
index 357ab5ba33..0000000000
--- a/core/Translate/Filter/ByParameterCount.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-
-namespace Piwik\Translate\Filter;
-
-/**
- */
-class ByParameterCount extends FilterAbstract
-{
-    protected $baseTranslations = array();
-
-    /**
-     * Sets base translations
-     *
-     * @param array $baseTranslations
-     */
-    public function __construct($baseTranslations = array())
-    {
-        $this->baseTranslations = $baseTranslations;
-    }
-
-    /**
-     * Removes all translations where the placeholder parameter count differs to base translation
-     *
-     * @param  array $translations
-     *
-     * @return array   filtered translations
-     */
-    public function filter($translations)
-    {
-        $cleanedTranslations = array();
-
-        foreach ($translations as $pluginName => $pluginTranslations) {
-
-            foreach ($pluginTranslations as $key => $translation) {
-
-                if (isset($this->baseTranslations[$pluginName][$key])) {
-                    $baseTranslation = $this->baseTranslations[$pluginName][$key];
-                } else {
-                    // english string was deleted, do not error
-                    continue;
-                }
-
-                // ensure that translated strings have the same number of %s as the english source strings
-                $baseCount = $this->_getParametersCountToReplace($baseTranslation);
-                $translationCount = $this->_getParametersCountToReplace($translation);
-
-                if ($baseCount != $translationCount) {
-
-                    $this->filteredData[$pluginName][$key] = $translation;
-                    continue;
-                }
-
-                $cleanedTranslations[$pluginName][$key] = $translation;
-            }
-        }
-
-        return $cleanedTranslations;
-    }
-
-    /**
-     * Counts the placeholder parameters n given string
-     *
-     * @param string $string
-     * @return array
-     */
-    protected function _getParametersCountToReplace($string)
-    {
-        $sprintfParameters = array('%s', '%1$s', '%2$s', '%3$s', '%4$s', '%5$s', '%6$s', '%7$s', '%8$s', '%9$s');
-        $count = array();
-        foreach ($sprintfParameters as $parameter) {
-
-            $placeholderCount = substr_count($string, $parameter);
-            if ($placeholderCount > 0) {
-
-                $count[$parameter] = $placeholderCount;
-            }
-        }
-        return $count;
-    }
-}
diff --git a/core/Translate/Filter/EmptyTranslations.php b/core/Translate/Filter/EmptyTranslations.php
deleted file mode 100644
index 75e3e6536f..0000000000
--- a/core/Translate/Filter/EmptyTranslations.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-
-namespace Piwik\Translate\Filter;
-
-/**
- */
-class EmptyTranslations extends FilterAbstract
-{
-    /**
-     * Removes all empty translations
-     *
-     * @param array $translations
-     *
-     * @return array   filtered translations
-     */
-    public function filter($translations)
-    {
-        $translationsBefore = $translations;
-
-        foreach ($translations as $plugin => &$pluginTranslations) {
-
-            $pluginTranslations = array_filter($pluginTranslations, function ($value) {
-                return !empty($value) && '' != trim($value);
-            });
-
-            $diff = array_diff($translationsBefore[$plugin], $pluginTranslations);
-            if (!empty($diff)) {
-                $this->filteredData[$plugin] = $diff;
-            }
-        }
-
-        // remove plugins without translations
-        $translations = array_filter($translations, function ($value) {
-            return !empty($value) && count($value);
-        });
-
-        return $translations;
-    }
-}
diff --git a/core/Translate/Filter/EncodedEntities.php b/core/Translate/Filter/EncodedEntities.php
deleted file mode 100644
index b7e3d6a54e..0000000000
--- a/core/Translate/Filter/EncodedEntities.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-
-namespace Piwik\Translate\Filter;
-
-use Piwik\Translate;
-
-/**
- */
-class EncodedEntities extends FilterAbstract
-{
-    /**
-     * Decodes all encoded entities in the given translations
-     *
-     * @param array $translations
-     *
-     * @return array   filtered translations
-     */
-    public function filter($translations)
-    {
-        foreach ($translations as $pluginName => $pluginTranslations) {
-            foreach ($pluginTranslations as $key => $translation) {
-
-                // remove encoded entities
-                $decoded = Translate::clean($translation);
-                if ($translation != $decoded) {
-                    $this->filteredData[$pluginName][$key] = $translation;
-                    $translations[$pluginName][$key] = $decoded;
-                    continue;
-                }
-
-            }
-        }
-
-        return $translations;
-    }
-}
diff --git a/core/Translate/Filter/FilterAbstract.php b/core/Translate/Filter/FilterAbstract.php
deleted file mode 100644
index 4e7ecc064d..0000000000
--- a/core/Translate/Filter/FilterAbstract.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-
-namespace Piwik\Translate\Filter;
-
-/**
- */
-abstract class FilterAbstract
-{
-    protected $filteredData = array();
-
-    /**
-     * Filter the given translations
-     *
-     * @param array $translations
-     *
-     * @return array   filtered translations
-     */
-    abstract public function filter($translations);
-
-    /**
-     * Returnes the data filtered out by the filter
-     *
-     * @return array
-     */
-    public function getFilteredData()
-    {
-        return $this->filteredData;
-    }
-}
diff --git a/core/Translate/Filter/UnnecassaryWhitespaces.php b/core/Translate/Filter/UnnecassaryWhitespaces.php
deleted file mode 100644
index 61211fc8ab..0000000000
--- a/core/Translate/Filter/UnnecassaryWhitespaces.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-
-namespace Piwik\Translate\Filter;
-
-/**
- */
-class UnnecassaryWhitespaces extends FilterAbstract
-{
-    protected $baseTranslations = array();
-
-    /**
-     * Sets base translations
-     *
-     * @param array $baseTranslations
-     */
-    public function __construct($baseTranslations = array())
-    {
-        $this->baseTranslations = $baseTranslations;
-    }
-
-    /**
-     * Removes all unnecassary whitespaces and newlines from the given translations
-     *
-     * @param array $translations
-     *
-     * @return array   filtered translations
-     */
-    public function filter($translations)
-    {
-        foreach ($translations as $pluginName => $pluginTranslations) {
-            foreach ($pluginTranslations as $key => $translation) {
-
-                $baseTranslation = '';
-                if (isset($this->baseTranslations[$pluginName][$key])) {
-                    $baseTranslation = $this->baseTranslations[$pluginName][$key];
-                }
-
-                // remove excessive line breaks (and leading/trailing whitespace) from translations
-                $stringNoLineBreak = trim($translation);
-                $stringNoLineBreak = str_replace("\r", "", $stringNoLineBreak); # remove useless carrige renturns
-                $stringNoLineBreak = preg_replace('/(\n[ ]+)/', "\n", $stringNoLineBreak); # remove useless white spaces after line breaks
-                $stringNoLineBreak = preg_replace('/([\n]{2,})/', "\n\n", $stringNoLineBreak); # remove excessive line breaks
-                if (empty($baseTranslation) || !substr_count($baseTranslation, "\n")) {
-                    $stringNoLineBreak = preg_replace("/[\n]+/", " ", $stringNoLineBreak); # remove all line breaks if english string doesn't contain any
-                }
-                $stringNoLineBreak = preg_replace('/([ ]{2,})/', " ", $stringNoLineBreak); # remove excessive white spaces again as there might be any now, after removing line breaks
-                if ($translation !== $stringNoLineBreak) {
-                    $this->filteredData[$pluginName][$key] = $translation;
-                    $translations[$pluginName][$key] = $stringNoLineBreak;
-                    continue;
-                }
-            }
-        }
-
-        return $translations;
-    }
-}
diff --git a/core/Translate/Validate/CoreTranslations.php b/core/Translate/Validate/CoreTranslations.php
deleted file mode 100644
index bb52dc1ec8..0000000000
--- a/core/Translate/Validate/CoreTranslations.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-
-namespace Piwik\Translate\Validate;
-
-use Piwik\Common;
-
-/**
- */
-class CoreTranslations extends ValidateAbstract
-{
-    /**
-     * Error States
-     */
-    const ERRORSTATE_LOCALEREQUIRED = 'Locale required';
-    const ERRORSTATE_TRANSLATORINFOREQUIRED = 'Translator info required';
-    const ERRORSTATE_TRANSLATOREMAILREQUIRED = 'Translator email required';
-    const ERRORSTATE_LAYOUTDIRECTIONINVALID = 'Layout direction must be rtl or ltr';
-    const ERRORSTATE_LOCALEINVALID = 'Locale is invalid';
-    const ERRORSTATE_LOCALEINVALIDLANGUAGE = 'Locale is invalid - invalid language code';
-    const ERRORSTATE_LOCALEINVALIDCOUNTRY = 'Locale is invalid - invalid country code';
-
-    protected $baseTranslations = array();
-
-    /**
-     * Sets base translations
-     *
-     * @param array $baseTranslations
-     */
-    public function __construct($baseTranslations = array())
-    {
-        $this->baseTranslations = $baseTranslations;
-    }
-
-    /**
-     * Validates the given translations
-     *  * There need to be more than 250 translations presen
-     *  * Locale, TranslatorName and TranslatorEmail needs to be set in plugin General
-     *  * LayoutDirection needs to be ltr or rtl if present
-     *  * Locale must be valid (format, language & country)
-     *
-     * @param array $translations
-     *
-     * @return boolean
-     */
-    public function isValid($translations)
-    {
-        $this->message = null;
-
-        if (empty($translations['General']['Locale'])) {
-            $this->message = self::ERRORSTATE_LOCALEREQUIRED;
-            return false;
-        }
-
-        if (empty($translations['General']['TranslatorName'])) {
-            $this->message = self::ERRORSTATE_TRANSLATORINFOREQUIRED;
-            return false;
-        }
-
-        if (empty($translations['General']['TranslatorEmail'])) {
-            $this->message = self::ERRORSTATE_TRANSLATOREMAILREQUIRED;
-            return false;
-        }
-
-        if (!empty($translations['General']['LayoutDirection']) &&
-            !in_array($translations['General']['LayoutDirection'], array('ltr', 'rtl'))
-        ) {
-            $this->message = self::ERRORSTATE_LAYOUTDIRECTIONINVALID;
-            return false;
-        }
-
-        $allLanguages = Common::getLanguagesList();
-        $allCountries = Common::getCountriesList();
-
-        if (!preg_match('/^([a-z]{2})_([A-Z]{2})\.UTF-8$/', $translations['General']['Locale'], $matches)) {
-            $this->message = self::ERRORSTATE_LOCALEINVALID;
-            return false;
-        } else if (!array_key_exists($matches[1], $allLanguages)) {
-            $this->message = self::ERRORSTATE_LOCALEINVALIDLANGUAGE;
-            return false;
-        } else if (!array_key_exists(strtolower($matches[2]), $allCountries)) {
-            $this->message = self::ERRORSTATE_LOCALEINVALIDCOUNTRY;
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/core/Translate/Validate/NoScripts.php b/core/Translate/Validate/NoScripts.php
deleted file mode 100644
index e7f032ff55..0000000000
--- a/core/Translate/Validate/NoScripts.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-
-namespace Piwik\Translate\Validate;
-
-/**
- */
-class NoScripts extends ValidateAbstract
-{
-    /**
-     * Validates the given translations
-     *  * No script like parts should be present in any part of the translations
-     *
-     * @param array $translations
-     *
-     * @return boolean
-     */
-    public function isValid($translations)
-    {
-        $this->message = null;
-
-        // check if any translation contains restricted script tags
-        $serializedStrings = serialize($translations);
-        $invalids = array("<script", 'document.', 'javascript:', 'src=', 'background=', 'onload=');
-
-        foreach ($invalids as $invalid) {
-            if (stripos($serializedStrings, $invalid) !== false) {
-                $this->message = 'script tags restricted for language files';
-                return false;
-            }
-        }
-
-        return true;
-    }
-}
diff --git a/core/Translate/Validate/ValidateAbstract.php b/core/Translate/Validate/ValidateAbstract.php
deleted file mode 100644
index c732d31d25..0000000000
--- a/core/Translate/Validate/ValidateAbstract.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-
-namespace Piwik\Translate\Validate;
-
-/**
- */
-abstract class ValidateAbstract
-{
-    protected $message = null;
-
-    /**
-     * Returns if the given translations are valid
-     *
-     * @param array $translations
-     *
-     * @return boolean
-     */
-    abstract public function isValid($translations);
-
-    /**
-     * Returns an array of messages that explain why the most recent isValid()
-     * call returned false.
-     *
-     * @return array
-     */
-    public function getMessage()
-    {
-        return $this->message;
-    }
-}
diff --git a/core/Translate/Writer.php b/core/Translate/Writer.php
deleted file mode 100644
index 9ace61b74b..0000000000
--- a/core/Translate/Writer.php
+++ /dev/null
@@ -1,385 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- *
- */
-namespace Piwik\Translate;
-
-use Exception;
-use Piwik\Container\StaticContainer;
-use Piwik\Filesystem;
-use Piwik\Piwik;
-use Piwik\Translate\Filter\FilterAbstract;
-use Piwik\Translate\Validate\ValidateAbstract;
-
-/**
- * Writes clean translations to file
- *
- */
-class Writer
-{
-    /**
-     * current language to write files for
-     *
-     * @var string
-     */
-    protected $language = '';
-
-    /**
-     * Name of a plugin (if set in contructor)
-     *
-     * @var string|null
-     */
-    protected $pluginName = null;
-
-    /**
-     * translations to write to file
-     *
-     * @var array
-     */
-    protected $translations = array();
-
-    /**
-     * Validators to check translations with
-     *
-     * @var ValidateAbstract[]
-     */
-    protected $validators = array();
-
-    /**
-     * Message why validation failed
-     *
-     * @var string|null
-     */
-    protected $validationMessage = null;
-
-    /**
-     * Filters to to apply to translations
-     *
-     * @var FilterAbstract[]
-     */
-    protected $filters = array();
-
-    /**
-     * Messages which filter changed the data
-     *
-     * @var array
-     */
-    protected $filterMessages = array();
-
-    const UNFILTERED = 'unfiltered';
-    const FILTERED   = 'filtered';
-
-    protected $currentState = self::UNFILTERED;
-
-    /**
-     * If $pluginName is given, Writer will be initialized for the given plugin if it exists
-     * Otherwise it will be initialized for core translations
-     *
-     * @param string $language ISO 639-1 alpha-2 language code
-     * @param string $pluginName optional plugin name
-     * @throws \Exception
-     */
-    public function __construct($language, $pluginName = null)
-    {
-        $this->setLanguage($language);
-
-        if (!empty($pluginName)) {
-            $installedPlugins = \Piwik\Plugin\Manager::getInstance()->readPluginsDirectory();
-
-            if (!in_array($pluginName, $installedPlugins)) {
-
-                throw new Exception(Piwik::translate('General_ExceptionLanguageFileNotFound', array($pluginName)));
-            }
-
-            $this->pluginName = $pluginName;
-        }
-    }
-
-    /**
-     * @param string $language ISO 639-1 alpha-2 language code
-     *
-     * @throws \Exception
-     */
-    public function setLanguage($language)
-    {
-        if (!preg_match('/^([a-z]{2,3}(-[a-z]{2,3})?)$/i', $language)) {
-            throw new Exception(Piwik::translate('General_ExceptionLanguageFileNotFound', array($language)));
-        }
-
-        $this->language = strtolower($language);
-    }
-
-    /**
-     * @return string ISO 639-1 alpha-2 language code
-     */
-    public function getLanguage()
-    {
-        return $this->language;
-    }
-
-    /**
-     * Returns if there are translations available or not
-     * @return bool
-     */
-    public function hasTranslations()
-    {
-        return !empty($this->translations);
-    }
-
-    /**
-     * Set the translations to write (and cleans them)
-     *
-     * @param $translations
-     */
-    public function setTranslations($translations)
-    {
-        $this->currentState = self::UNFILTERED;
-        $this->translations = $translations;
-        $this->applyFilters();
-    }
-
-    /**
-     * Get translations from file
-     *
-     * @param  string $lang ISO 639-1 alpha-2 language code
-     * @throws Exception
-     * @return array   Array of translations ( plugin => ( key => translated string ) )
-     */
-    public function getTranslations($lang)
-    {
-        $path = $this->getTranslationPathBaseDirectory('lang', $lang);
-
-        if (!is_readable($path)) {
-            return array();
-        }
-
-        $data = file_get_contents($path);
-        $translations = json_decode($data, true);
-
-        return $translations;
-    }
-
-    /**
-     * Returns the temporary path for translations
-     *
-     * @return string
-     */
-    public function getTemporaryTranslationPath()
-    {
-        return $this->getTranslationPathBaseDirectory('tmp');
-    }
-
-    /**
-     * Returns the path to translation files
-     *
-     * @return string
-     */
-    public function getTranslationPath()
-    {
-        return $this->getTranslationPathBaseDirectory('lang');
-    }
-
-    /**
-     * Get translation file path based on given params
-     *
-     * @param string $base Optional base directory (either 'lang' or 'tmp')
-     * @param string|null $lang forced language
-     * @throws \Exception
-     * @return string path
-     */
-    protected function getTranslationPathBaseDirectory($base, $lang = null)
-    {
-        if (empty($lang)) {
-            $lang = $this->getLanguage();
-        }
-
-        if (!empty($this->pluginName)) {
-
-            if ($base == 'tmp') {
-                return sprintf('%s/plugins/%s/lang/%s.json', StaticContainer::getContainer()->get('path.tmp'), $this->pluginName, $lang);
-            } else {
-                return sprintf('%s/plugins/%s/lang/%s.json', PIWIK_INCLUDE_PATH, $this->pluginName, $lang);
-            }
-        }
-
-        return sprintf('%s/%s/%s.json', PIWIK_INCLUDE_PATH, $base, $lang);
-    }
-
-    /**
-     * Converts translations to a string that can be written to a file
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        /*
-         * Use JSON_UNESCAPED_UNICODE and JSON_PRETTY_PRINT for PHP >= 5.4
-         */
-        $options = 0;
-        if (defined('JSON_UNESCAPED_UNICODE')) {
-            $options |= JSON_UNESCAPED_UNICODE;
-        }
-        if (defined('JSON_PRETTY_PRINT')) {
-            $options |= JSON_PRETTY_PRINT;
-        }
-
-        return json_encode($this->translations, $options);
-    }
-
-    /**
-     * Save translations to file; translations should already be cleaned.
-     *
-     * @throws \Exception
-     * @return bool|int  False if failure, or number of bytes written
-     */
-    public function save()
-    {
-        $this->applyFilters();
-
-        if (!$this->hasTranslations() || !$this->isValid()) {
-            throw new Exception('unable to save empty or invalid translations');
-        }
-
-        $path = $this->getTranslationPath();
-
-        Filesystem::mkdir(dirname($path));
-
-        return file_put_contents($path, $this->__toString());
-    }
-
-    /**
-     * Save translations to  temporary file; translations should already be cleansed.
-     *
-     * @throws \Exception
-     * @return bool|int False if failure, or number of bytes written
-     */
-    public function saveTemporary()
-    {
-        $this->applyFilters();
-
-        if (!$this->hasTranslations() || !$this->isValid()) {
-            throw new Exception('unable to save empty or invalid translations');
-        }
-
-        $path = $this->getTemporaryTranslationPath();
-
-        Filesystem::mkdir(dirname($path));
-
-        return file_put_contents($path, $this->__toString());
-    }
-
-    /**
-     * Adds an validator to check before saving
-     *
-     * @param ValidateAbstract $validator
-     */
-    public function addValidator(ValidateAbstract $validator)
-    {
-        $this->validators[] = $validator;
-    }
-
-    /**
-     * Returns if translations are valid to save or not
-     *
-     * @return bool
-     */
-    public function isValid()
-    {
-        $this->applyFilters();
-
-        $this->validationMessage = null;
-
-        foreach ($this->validators as $validator) {
-            if (!$validator->isValid($this->translations)) {
-                $this->validationMessage = $validator->getMessage();
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns last validation message
-     *
-     * @return null|string
-     */
-    public function getValidationMessage()
-    {
-        return $this->validationMessage;
-    }
-
-    /**
-     * Returns if the were translations removed while cleaning
-     *
-     * @return bool
-     */
-    public function wasFiltered()
-    {
-        return !empty($this->filterMessages);
-    }
-
-    /**
-     * Returns the cleaning errors
-     *
-     * @return array
-     */
-    public function getFilterMessages()
-    {
-        return $this->filterMessages;
-    }
-
-    /**
-     * @param FilterAbstract $filter
-     */
-    public function addFilter(FilterAbstract $filter)
-    {
-        $this->filters[] = $filter;
-    }
-
-    /**
-     * @throws \Exception
-     *
-     * @return bool   error state
-     */
-    protected function applyFilters()
-    {
-        // skip if already cleaned
-        if ($this->currentState == self::FILTERED) {
-            return $this->wasFiltered();
-        }
-
-        $this->filterMessages = array();
-
-        // skip if not translations available
-        if (!$this->hasTranslations()) {
-            $this->currentState = self::FILTERED;
-            return false;
-        }
-
-        $cleanedTranslations = $this->translations;
-
-        foreach ($this->filters as $filter) {
-
-            $cleanedTranslations = $filter->filter($cleanedTranslations);
-            $filteredData = $filter->getFilteredData();
-            if (!empty($filteredData)) {
-                $this->filterMessages[] = get_class($filter) . " changed: " . var_export($filteredData, 1);
-            }
-        }
-
-        $this->currentState = self::FILTERED;
-
-        if ($cleanedTranslations != $this->translations) {
-            $this->filterMessages[] = 'translations have been cleaned';
-        }
-
-        $this->translations = $cleanedTranslations;
-        return $this->wasFiltered();
-    }
-}
diff --git a/core/Translation/Loader/DevelopmentLoader.php b/core/Translation/Loader/DevelopmentLoader.php
new file mode 100644
index 0000000000..a75af4bd2e
--- /dev/null
+++ b/core/Translation/Loader/DevelopmentLoader.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Translation\Loader;
+
+/**
+ * Loads a pseudo-language for developers where translation are equal to translation ids.
+ */
+class DevelopmentLoader implements LoaderInterface
+{
+    const LANGUAGE_ID = 'dev';
+
+    /**
+     * Decorated loader.
+     *
+     * @var LoaderInterface
+     */
+    private $loader;
+
+    /**
+     * @var string
+     */
+    private $fallbackLanguage = 'en';
+
+    /**
+     * @param LoaderInterface $loader Decorate another loader to add the pseudo-language.
+     */
+    public function __construct(LoaderInterface $loader)
+    {
+        $this->loader = $loader;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function load($language, array $directories)
+    {
+        if ($language !== self::LANGUAGE_ID) {
+            return $this->loader->load($language, $directories);
+        }
+
+        return $this->getDevelopmentTranslations($directories);
+    }
+
+    private function getDevelopmentTranslations(array $directories)
+    {
+        $fallbackTranslations = $this->loader->load($this->fallbackLanguage, $directories);
+
+        $translations = array();
+
+        foreach ($fallbackTranslations as $section => $sectionFallbackTranslations) {
+            $translationIds = array_keys($sectionFallbackTranslations);
+            $sectionTranslations = $this->prefixTranslationsWithSection($section, $translationIds);
+
+            $translations[$section] = array_combine($translationIds, $sectionTranslations);
+        }
+
+        return $translations;
+    }
+
+    private function prefixTranslationsWithSection($section, $translationIds)
+    {
+        return array_map(function ($translation) use ($section) {
+            return $section . '_' . $translation;
+        }, $translationIds);
+    }
+}
diff --git a/core/Translation/Loader/JsonFileLoader.php b/core/Translation/Loader/JsonFileLoader.php
new file mode 100644
index 0000000000..f80b940528
--- /dev/null
+++ b/core/Translation/Loader/JsonFileLoader.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Translation\Loader;
+
+use Exception;
+use Piwik\Common;
+
+/**
+ * Loads translations from JSON files.
+ */
+class JsonFileLoader implements LoaderInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function load($language, array $directories)
+    {
+        if (empty($language)) {
+            return array();
+        }
+
+        $translations = array();
+
+        foreach ($directories as $directory) {
+            $filename = $directory . '/' . $language . '.json';
+
+            if (! file_exists($filename)) {
+                continue;
+            }
+
+            $translations = array_replace_recursive(
+                $translations,
+                $this->loadFile($filename)
+            );
+        }
+
+        return $translations;
+    }
+
+    private function loadFile($filename)
+    {
+        $data = file_get_contents($filename);
+        $translations = json_decode($data, true);
+
+        if (is_null($translations) && Common::hasJsonErrorOccurred()) {
+            throw new \Exception(sprintf(
+                'Not able to load translation file %s: %s',
+                $filename,
+                Common::getLastJsonError()
+            ));
+        }
+
+        if (!is_array($translations)) {
+            return array();
+        }
+
+        return $translations;
+    }
+}
diff --git a/core/Translation/Loader/LoaderCache.php b/core/Translation/Loader/LoaderCache.php
new file mode 100644
index 0000000000..5448e1aef4
--- /dev/null
+++ b/core/Translation/Loader/LoaderCache.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Translation\Loader;
+
+use Piwik\Cache;
+
+/**
+ * Caches the translations loaded by another loader.
+ */
+class LoaderCache implements LoaderInterface
+{
+    /**
+     * @var LoaderInterface
+     */
+    private $loader;
+
+    /**
+     * @var Cache\Lazy
+     */
+    private $cache;
+
+    public function __construct(LoaderInterface $loader, Cache\Lazy $cache)
+    {
+        $this->loader = $loader;
+        $this->cache = $cache;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function load($language, array $directories)
+    {
+        if (empty($language)) {
+            return array();
+        }
+
+        $cacheKey = $this->getCacheKey($language, $directories);
+
+        $translations = $this->cache->fetch($cacheKey);
+
+        if (empty($translations) || !is_array($translations)) {
+            $translations = $this->loader->load($language, $directories);
+
+            $this->cache->save($cacheKey, $translations, 43200); // ttl=12hours
+        }
+
+        return $translations;
+    }
+
+    private function getCacheKey($language, array $directories)
+    {
+        $cacheKey = 'Translations-' . $language . '-';
+
+        // in case loaded plugins change (ie Tests vs Tracker vs UI etc)
+        $cacheKey .= sha1(implode('', $directories));
+
+        return $cacheKey;
+    }
+}
diff --git a/core/Translation/Loader/LoaderInterface.php b/core/Translation/Loader/LoaderInterface.php
new file mode 100644
index 0000000000..9aae71d45b
--- /dev/null
+++ b/core/Translation/Loader/LoaderInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Translation\Loader;
+
+/**
+ * Loads translations.
+ */
+interface LoaderInterface
+{
+    /**
+     * @param string $language
+     * @param mixed[] $directories Directories containing translation files.
+     * @throws \Exception The translation file was not found
+     * @return string[] Translations.
+     */
+    public function load($language, array $directories);
+}
diff --git a/core/Translation/Translator.php b/core/Translation/Translator.php
new file mode 100644
index 0000000000..dda946ccd9
--- /dev/null
+++ b/core/Translation/Translator.php
@@ -0,0 +1,255 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Translation;
+
+use Piwik\Config;
+use Piwik\Piwik;
+use Piwik\Plugin;
+use Piwik\Translation\Loader\LoaderInterface;
+
+/**
+ * Translates messages.
+ *
+ * @api
+ */
+class Translator
+{
+    /**
+     * Contains the translated messages, indexed by the language name.
+     *
+     * @var array
+     */
+    private $translations = array();
+
+    /**
+     * @var string
+     */
+    private $currentLanguage;
+
+    /**
+     * @var string
+     */
+    private $fallback = 'en';
+
+    /**
+     * Directories containing the translations to load.
+     *
+     * @var string[]
+     */
+    private $directories = array();
+
+    /**
+     * @var LoaderInterface
+     */
+    private $loader;
+
+    public function __construct(LoaderInterface $loader, array $directories = null)
+    {
+        $this->loader = $loader;
+        $this->currentLanguage = $this->getDefaultLanguage();
+
+        if ($directories === null) {
+            // TODO should be moved out of this class
+            $directories = array(PIWIK_INCLUDE_PATH . '/lang');
+        }
+        $this->directories = $directories;
+    }
+
+    /**
+     * Returns an internationalized string using a translation ID. If a translation
+     * cannot be found for the ID, the ID is returned.
+     *
+     * @param string $translationId Translation ID, eg, `General_Date`.
+     * @param array|string|int $args `sprintf` arguments to be applied to the internationalized
+     *                               string.
+     * @param string|null $language Optionally force the language.
+     * @return string The translated string or `$translationId`.
+     * @api
+     */
+    public function translate($translationId, $args = array(), $language = null)
+    {
+        $args = is_array($args) ? $args : array($args);
+
+        if (strpos($translationId, "_") !== false) {
+            list($plugin, $key) = explode("_", $translationId, 2);
+            $language = is_string($language) ? $language : $this->currentLanguage;
+
+            $translationId = $this->getTranslation($translationId, $language, $plugin, $key);
+        }
+
+        if (count($args) == 0) {
+            return $translationId;
+        }
+        return vsprintf($translationId, $args);
+    }
+
+    /**
+     * @return string
+     */
+    public function getCurrentLanguage()
+    {
+        return $this->currentLanguage;
+    }
+
+    /**
+     * @param string $language
+     */
+    public function setCurrentLanguage($language)
+    {
+        if (!$language) {
+            $language = $this->getDefaultLanguage();
+        }
+
+        $this->currentLanguage = $language;
+    }
+
+    /**
+     * @return string The default configured language.
+     */
+    public function getDefaultLanguage()
+    {
+        return Config::getInstance()->General['default_language'];
+    }
+
+    /**
+     * Generate javascript translations array
+     */
+    public function getJavascriptTranslations()
+    {
+        $clientSideTranslations = array();
+        foreach ($this->getClientSideTranslationKeys() as $id) {
+            list($plugin, $key) = explode('_', $id, 2);
+            $clientSideTranslations[$id] = $this->getTranslation($id, $this->currentLanguage, $plugin, $key);
+        }
+
+        $js = 'var translations = ' . json_encode($clientSideTranslations) . ';';
+        $js .= "\n" . 'if (typeof(piwik_translations) == \'undefined\') { var piwik_translations = new Object; }' .
+            'for(var i in translations) { piwik_translations[i] = translations[i];} ';
+        return $js;
+    }
+
+    /**
+     * Returns the list of client side translations by key. These translations will be outputted
+     * to the translation JavaScript.
+     */
+    private function getClientSideTranslationKeys()
+    {
+        $result = array();
+
+        /**
+         * Triggered before generating the JavaScript code that allows i18n strings to be used
+         * in the browser.
+         *
+         * Plugins should subscribe to this event to specify which translations
+         * should be available to JavaScript.
+         *
+         * Event handlers should add whole translation keys, ie, keys that include the plugin name.
+         *
+         * **Example**
+         *
+         *     public function getClientSideTranslationKeys(&$result)
+         *     {
+         *         $result[] = "MyPlugin_MyTranslation";
+         *     }
+         *
+         * @param array &$result The whole list of client side translation keys.
+         */
+        Piwik::postEvent('Translate.getClientSideTranslationKeys', array(&$result));
+
+        $result = array_unique($result);
+
+        return $result;
+    }
+
+    /**
+     * Add a directory containing translations.
+     *
+     * @param string $directory
+     */
+    public function addDirectory($directory)
+    {
+        if (isset($this->directories[$directory])) {
+            return;
+        }
+        // index by name to avoid duplicates
+        $this->directories[$directory] = $directory;
+
+        // clear currently loaded translations to force reloading them
+        $this->translations = array();
+    }
+
+    /**
+     * Should be used by tests only, and this method should eventually be removed.
+     */
+    public function reset()
+    {
+        $this->currentLanguage = $this->getDefaultLanguage();
+        $this->directories = array();
+        $this->translations = array();
+    }
+
+    /**
+     * @param string $translation
+     * @return null|string
+     */
+    public function findTranslationKeyForTranslation($translation)
+    {
+        foreach ($this->getAllTranslations() as $key => $translations) {
+            $possibleKey = array_search($translation, $translations);
+            if (!empty($possibleKey)) {
+                return $key . '_' . $possibleKey;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns all the translation messages loaded.
+     *
+     * @return array
+     */
+    public function getAllTranslations()
+    {
+        $this->loadTranslations($this->currentLanguage);
+
+        if (!isset($this->translations[$this->currentLanguage])) {
+            return array();
+        }
+
+        return $this->translations[$this->currentLanguage];
+    }
+
+    private function getTranslation($id, $lang, $plugin, $key)
+    {
+        $this->loadTranslations($lang);
+
+        if (isset($this->translations[$lang][$plugin])
+            && isset($this->translations[$lang][$plugin][$key])
+        ) {
+            return $this->translations[$lang][$plugin][$key];
+        }
+
+        // fallback
+        if ($lang !== $this->fallback) {
+            return $this->getTranslation($id, $this->fallback, $plugin, $key);
+        }
+
+        return $id;
+    }
+
+    private function loadTranslations($language)
+    {
+        if (empty($language) || isset($this->translations[$language])) {
+            return;
+        }
+
+        $this->translations[$language] = $this->loader->load($language, $this->directories);
+    }
+}
diff --git a/core/Twig.php b/core/Twig.php
index 1127d47a60..c60b430d50 100755
--- a/core/Twig.php
+++ b/core/Twig.php
@@ -12,7 +12,6 @@ use Exception;
 use Piwik\Container\StaticContainer;
 use Piwik\DataTable\Filter\SafeDecodeLabel;
 use Piwik\Metrics\Formatter;
-use Piwik\Translate;
 use Piwik\View\RenderTokenParser;
 use Piwik\Visualization\Sparkline;
 use Twig_Environment;
@@ -21,6 +20,7 @@ use Twig_Loader_Chain;
 use Twig_Loader_Filesystem;
 use Twig_SimpleFilter;
 use Twig_SimpleFunction;
+use Twig_SimpleTest;
 
 /**
  * Twig class
@@ -65,7 +65,7 @@ class Twig
         $chainLoader = new Twig_Loader_Chain($loaders);
 
         // Create new Twig Environment and set cache dir
-        $templatesCompiledPath = StaticContainer::getContainer()->get('path.tmp') . '/templates_c';
+        $templatesCompiledPath = StaticContainer::get('path.tmp') . '/templates_c';
 
         $this->twig = new Twig_Environment($chainLoader,
             array(
@@ -97,6 +97,19 @@ class Twig
         $this->addFunction_getJavascriptTranslations();
 
         $this->twig->addTokenParser(new RenderTokenParser());
+
+        $this->addTest_false();
+    }
+
+    private function addTest_false()
+    {
+        $test = new Twig_SimpleTest(
+            'false',
+            function ($value) {
+                return false === $value;
+            }
+        );
+        $this->twig->addTest($test);
     }
 
     protected function addFunction_getJavascriptTranslations()
diff --git a/core/Updater.php b/core/Updater.php
index 692034d5e9..c9872d3481 100644
--- a/core/Updater.php
+++ b/core/Updater.php
@@ -8,6 +8,7 @@
  */
 namespace Piwik;
 use Piwik\Columns\Updater as ColumnUpdater;
+use Piwik\Exception\DatabaseSchemaIsNewerThanCodebaseException;
 
 /**
  * Load and execute all relevant, incremental update scripts for Piwik core and plugins, and bump the component version numbers for completed updates.
@@ -95,6 +96,26 @@ class Updater
         return 'version_' . $name;
     }
 
+
+    /**
+     * This method ensures that Piwik Platform cannot be running when using a NEWER database
+     */
+    public static function throwIfPiwikVersionIsOlderThanDBSchema()
+    {
+        $dbSchemaVersion = self::getCurrentRecordedComponentVersion('core');
+        $current = Version::VERSION;
+        if(-1 === version_compare($current, $dbSchemaVersion)) {
+            $messages = array(
+                Piwik::translate('General_ExceptionDatabaseVersionNewerThanCodebase', array($current, $dbSchemaVersion)),
+                Piwik::translate('General_ExceptionDatabaseVersionNewerThanCodebaseWait'),
+                // we cannot fill in the Super User emails as we are failing before Authentication was ready
+                Piwik::translate('General_ExceptionContactSupportGeneric', array('', ''))
+            );
+            throw new DatabaseSchemaIsNewerThanCodebaseException(implode(" ", $messages));
+        }
+    }
+
+
     /**
      * Returns a list of components (core | plugin) that need to run through the upgrade process.
      *
diff --git a/core/Updates.php b/core/Updates.php
index b410effd21..85e7e589ab 100644
--- a/core/Updates.php
+++ b/core/Updates.php
@@ -56,7 +56,6 @@ abstract class Updates
     static function enableMaintenanceMode()
     {
         $config = Config::getInstance();
-        $config->init();
 
         $tracker = $config->Tracker;
         $tracker['record_statistics'] = 0;
@@ -75,7 +74,6 @@ abstract class Updates
     static function disableMaintenanceMode()
     {
         $config = Config::getInstance();
-        $config->init();
 
         $tracker = $config->Tracker;
         $tracker['record_statistics'] = 1;
@@ -91,7 +89,6 @@ abstract class Updates
     public static function deletePluginFromConfigFile($pluginToDelete)
     {
         $config = Config::getInstance();
-        $config->init();
         if (isset($config->Plugins['Plugins'])) {
             $plugins = $config->Plugins['Plugins'];
             if (($key = array_search($pluginToDelete, $plugins)) !== false) {
diff --git a/core/Updates/2.10.0-b1.php b/core/Updates/2.10.0-b1.php
deleted file mode 100644
index e342788b09..0000000000
--- a/core/Updates/2.10.0-b1.php
+++ /dev/null
@@ -1,257 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-
-namespace Piwik\Updates;
-
-use Piwik\Common;
-use Piwik\DataAccess\ArchiveTableCreator;
-use Piwik\DataTable;
-use Piwik\Db;
-use Piwik\Updater;
-use Piwik\Updates;
-use DeviceDetector\Parser\Client\Browser AS BrowserParser;
-use Piwik\Plugins\Dashboard\Model AS DashboardModel;
-
-/**
- * This Update script will update all browser and os archives of UserSettings and DevicesDetection plugin
- *
- * In the future only DevicesDetection will handle browser and os archives, so we try to rename all existing archives
- * of UserSettings plugin to their corresponding archive name in DevicesDetection plugin:
- * - *UserSettings_browser* will now be *DevicesDetection_browserVersions*
- * - *UserSettings_os* will now be *DevicesDetection_osVersions*
- *
- * Unlike DevicesDetection plugin, the UserSettings plugin did not store archives holding the os and browser data without
- * their version number. The "version-less" reports were always generated out of the "version-containing" archives .
- * For big archives (month/year) that ment that some of the data was truncated, due to the datatable entry limit.
- * To avoid that data loss / inaccuracy in the future, DevicesDetection plugin will also store archives without the version.
- * For data archived after DevicesDetection plugin was enabled, those archive already exist. As we are removing the
- * UserSettings reports, we need to move the existing old data to the new archives, which means we need to build up
- * those archives, where they do not exist.
- *
- * NOTE: Some archives might not contain "all" data.
- * That might have happened directly after the day DevicesDetection plugin was enabled. For the days before, there were
- * no archives calculated. So week/month/year archives will only contain data for the days, where archives were generated
- * To find a date after which it is safe to use DevicesDetection archives we need to find the first day-archive that
- * contains DevicesDetection data. Day archives will always contain full data, but week/month/year archives may not.
- * So we need to recreate those week/month/year archives.
- */
-class Updates_2_10_0_b1 extends Updates
-{
-
-    static function getSql()
-    {
-        $sqls = array('# ATTENTION: This update script will execute some more SQL queries than that below as it is necessary to rebuilt some archives #' => false);
-
-        // update scheduled reports to use new plugin
-        $reportsToReplace = array(
-            'UserSettings_getBrowserVersion' => 'DevicesDetection_getBrowserVersions',
-            'UserSettings_getBrowser' => 'DevicesDetection_getBrowsers',
-            'UserSettings_getOSFamily' => 'DevicesDetection_getOsFamilies',
-            'UserSettings_getOS' => 'DevicesDetection_getOsVersions',
-            'UserSettings_getMobileVsDesktop' => 'DevicesDetection_getType',
-            'UserSettings_getBrowserType' => 'DevicesDetection_getBrowserEngines',
-            'UserSettings_getWideScreen' => 'UserSettings_getScreenType',
-        );
-
-        foreach ($reportsToReplace as $old => $new) {
-            $sqls["UPDATE " . Common::prefixTable('report') . " SET reports = REPLACE(reports, '".$old."', '".$new."')"] = false;
-        }
-
-        // update dashboard to use new widgets
-        $oldWidgets = array(
-            array('module' => 'UserSettings', 'action' => 'getBrowserVersion', 'params' => array()),
-            array('module' => 'UserSettings', 'action' => 'getBrowser', 'params' => array()),
-            array('module' => 'UserSettings', 'action' => 'getOSFamily', 'params' => array()),
-            array('module' => 'UserSettings', 'action' => 'getOS', 'params' => array()),
-            array('module' => 'UserSettings', 'action' => 'getMobileVsDesktop', 'params' => array()),
-            array('module' => 'UserSettings', 'action' => 'getBrowserType', 'params' => array()),
-            array('module' => 'UserSettings', 'action' => 'getWideScreen', 'params' => array()),
-        );
-
-        $newWidgets = array(
-            array('module' => 'DevicesDetection', 'action' => 'getBrowserVersions', 'params' => array()),
-            array('module' => 'DevicesDetection', 'action' => 'getBrowsers', 'params' => array()),
-            array('module' => 'DevicesDetection', 'action' => 'getOsFamilies', 'params' => array()),
-            array('module' => 'DevicesDetection', 'action' => 'getOsVersions', 'params' => array()),
-            array('module' => 'DevicesDetection', 'action' => 'getType', 'params' => array()),
-            array('module' => 'DevicesDetection', 'action' => 'getBrowserEngines', 'params' => array()),
-            array('module' => 'UserSettings', 'action' => 'getScreenType', 'params' => array()),
-        );
-
-        $allDashboards = Db::get()->fetchAll(sprintf("SELECT * FROM %s", Common::prefixTable('user_dashboard')));
-
-        foreach($allDashboards AS $dashboard) {
-
-            $dashboardLayout = json_decode($dashboard['layout']);
-
-            $dashboardLayout = DashboardModel::replaceDashboardWidgets($dashboardLayout, $oldWidgets, $newWidgets);
-
-            $newLayout = json_encode($dashboardLayout);
-            if ($newLayout != $dashboard['layout']) {
-                $sqls["UPDATE " . Common::prefixTable('user_dashboard') . " SET layout = '".addslashes($newLayout)."' WHERE iddashboard = ".$dashboard['iddashboard']] = false;
-            }
-        }
-
-        return $sqls;
-    }
-
-    static function update()
-    {
-        Updater::updateDatabase(__FILE__, self::getSql());
-
-        // DeviceDetection upgrade in beta1 timed out on demo #6750
-//        $archiveBlobTables = self::getAllArchiveBlobTables();
-//
-//        foreach ($archiveBlobTables as $table) {
-//            self::updateBrowserArchives($table);
-//            self::updateOsArchives($table);
-//        }
-    }
-
-    /**
-     * Returns all available archive blob tables
-     *
-     * @return array
-     */
-    public static function getAllArchiveBlobTables()
-    {
-        static $archiveBlobTables;
-
-        if (empty($archiveBlobTables)) {
-
-            $archiveTables = ArchiveTableCreator::getTablesArchivesInstalled();
-
-            $archiveBlobTables = array_filter($archiveTables, function($name) {
-                return ArchiveTableCreator::getTypeFromTableName($name) == ArchiveTableCreator::BLOB_TABLE;
-            });
-
-            // sort tables so we have them in order of their date
-            rsort($archiveBlobTables);
-        }
-
-        return (array) $archiveBlobTables;
-    }
-
-    /**
-     * Find the first day on which DevicesDetection archives were generated
-     *
-     * @return int    Timestamp
-     */
-    public static function getFirstDayOfArchivedDeviceDetectorData()
-    {
-        static $deviceDetectionBlobAvailableDate;
-
-        if (empty($deviceDetectionBlobAvailableDate)) {
-
-            $archiveBlobTables = self::getAllArchiveBlobTables();
-
-            $deviceDetectionBlobAvailableDate = null;
-            foreach ($archiveBlobTables as $table) {
-
-                // Look for all day archives and try to find that with the lowest date
-                $deviceDetectionBlobAvailableDate = Db::get()->fetchOne(sprintf("SELECT date1 FROM %s WHERE name = 'DevicesDetection_browserVersions' AND period = 1 ORDER BY date1 ASC LIMIT 1", $table));
-
-                if (!empty($deviceDetectionBlobAvailableDate)) {
-                    break;
-                }
-
-            }
-
-            $deviceDetectionBlobAvailableDate = strtotime($deviceDetectionBlobAvailableDate);
-        }
-
-        return $deviceDetectionBlobAvailableDate;
-    }
-
-    /**
-     * Updates all browser archives to new structure
-     * @param string $table
-     * @throws \Exception
-     */
-    public static function updateBrowserArchives($table)
-    {
-        // rename old UserSettings archives where no DeviceDetection archives exists
-        Db::exec(sprintf("UPDATE IGNORE %s SET name='DevicesDetection_browserVersions' WHERE name = 'UserSettings_browser'", $table));
-
-        /*
-         * check dates of remaining (non-day) archives with calculated safe date
-         * archives before or within that week/month/year of that date will be replaced
-         */
-        $oldBrowserBlobs = Db::get()->fetchAll(sprintf("SELECT * FROM %s WHERE name = 'UserSettings_browser' AND `period` > 1", $table));
-        foreach ($oldBrowserBlobs as $blob) {
-
-            // if start date of blob is before calculated date us old usersettings archive instead of already existing DevicesDetection archive
-            if (strtotime($blob['date1']) < self::getFirstDayOfArchivedDeviceDetectorData()) {
-
-                Db::get()->query(sprintf("DELETE FROM %s WHERE idarchive = ? AND name = ?", $table), array($blob['idarchive'], 'DevicesDetection_browserVersions'));
-                Db::get()->query(sprintf("UPDATE %s SET name = ? WHERE idarchive = ? AND name = ?", $table), array('DevicesDetection_browserVersions', $blob['idarchive'], 'UserSettings_browser'));
-            }
-        }
-
-        // rebuild archives without versions
-        $browserBlobs = Db::get()->fetchAll(sprintf("SELECT * FROM %s WHERE name = 'DevicesDetection_browserVersions'", $table));
-        foreach ($browserBlobs as $blob) {
-            self::createArchiveBlobWithoutVersions($blob, 'DevicesDetection_browsers', $table);
-        }
-    }
-
-    public static function updateOsArchives($table) {
-        Db::exec(sprintf("UPDATE IGNORE %s SET name='DevicesDetection_osVersions' WHERE name = 'UserSettings_os'", $table));
-
-        /*
-         * check dates of remaining (non-day) archives with calculated safe date
-         * archives before or within that week/month/year of that date will be replaced
-         */
-        $oldOsBlobs = Db::get()->fetchAll(sprintf("SELECT * FROM %s WHERE name = 'UserSettings_os' AND `period` > 1", $table));
-        foreach ($oldOsBlobs as $blob) {
-
-            // if start date of blob is before calculated date us old usersettings archive instead of already existing DevicesDetection archive
-            if (strtotime($blob['date1']) < self::getFirstDayOfArchivedDeviceDetectorData()) {
-
-                Db::get()->query(sprintf("DELETE FROM %s WHERE idarchive = ? AND name = ?", $table), array($blob['idarchive'], 'DevicesDetection_osVersions'));
-                Db::get()->query(sprintf("UPDATE %s SET name = ? WHERE idarchive = ? AND name = ?", $table), array('DevicesDetection_osVersions', $blob['idarchive'], 'UserSettings_os'));
-            }
-        }
-
-        // rebuild archives without versions
-        $osBlobs = Db::get()->fetchAll(sprintf("SELECT * FROM %s WHERE name = 'DevicesDetection_osVersions'", $table));
-        foreach ($osBlobs as $blob) {
-            self::createArchiveBlobWithoutVersions($blob, 'DevicesDetection_os', $table);
-        }
-    }
-
-    protected static function createArchiveBlobWithoutVersions($blob, $newName, $table)
-    {
-        $blob['value'] = @gzuncompress($blob['value']);
-
-        try {
-            $datatable = DataTable::fromSerializedArray($blob['value']);
-            $datatable->filter('GroupBy', array('label', function ($label) {
-                if (preg_match("/(.+) [0-9]+(?:\.[0-9]+)?$/", $label, $matches)) {
-                    return $matches[1]; // should match for browsers
-                }
-
-                if (strpos($label, ';')) {
-                    return substr($label, 0, 3); // should match for os
-                }
-
-                return $label;
-            }));
-
-            $newData = $datatable->getSerialized();
-
-            $blob['value'] = @gzcompress($newData[0]);
-            $blob['name'] = $newName;
-
-            Db::get()->query(sprintf('REPLACE INTO %s (`idarchive`, `name`, `idsite`, `date1`, `date2`, `period`, `ts_archived`, `value`) VALUES (?, ? , ?, ?, ?, ?, ?, ?)', $table), array_values($blob));
-        } catch (\Exception $e) {
-            // fail silently and simply skip the current record
-        }
-    }
-}
diff --git a/core/Updates/2.10.0-b10.php b/core/Updates/2.10.0-b10.php
new file mode 100644
index 0000000000..3628719ccd
--- /dev/null
+++ b/core/Updates/2.10.0-b10.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Updates;
+
+use Piwik\DataAccess\ArchiveTableCreator;
+use Piwik\Updater;
+use Piwik\Updates;
+
+class Updates_2_10_0_b10 extends Updates
+{
+
+    static function getSql()
+    {
+        $sqls = array();
+
+        $archiveTables = ArchiveTableCreator::getTablesArchivesInstalled();
+
+        $archiveBlobTables = array_filter($archiveTables, function($name) {
+            return ArchiveTableCreator::getTypeFromTableName($name) == ArchiveTableCreator::BLOB_TABLE;
+        });
+
+        foreach ($archiveBlobTables as $table) {
+
+            $sqls["UPDATE " . $table . " SET name = 'DevicePlugins_plugin' WHERE name = 'UserSettings_plugin'"] = false;
+        }
+
+        return $sqls;
+    }
+
+    static function update()
+    {
+        $pluginManager = \Piwik\Plugin\Manager::getInstance();
+
+        try {
+            $pluginManager->activatePlugin('DevicePlugins');
+        } catch(\Exception $e) {
+        }
+
+        Updater::updateDatabase(__FILE__, self::getSql());
+    }
+
+}
diff --git a/core/Updates/2.10.0-b4.php b/core/Updates/2.10.0-b4.php
new file mode 100644
index 0000000000..88cbaf4df4
--- /dev/null
+++ b/core/Updates/2.10.0-b4.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Updates;
+
+use Piwik\Updates;
+
+/**
+ * Update for version 2.10.0-b4.
+ */
+class Updates_2_10_0_b4 extends Updates
+{
+
+    static function update()
+    {
+        $pluginManager = \Piwik\Plugin\Manager::getInstance();
+
+        try {
+            $pluginManager->activatePlugin('BulkTracking');
+        } catch(\Exception $e) {
+        }
+    }
+}
diff --git a/core/Updates/2.10.0-b5.php b/core/Updates/2.10.0-b5.php
new file mode 100644
index 0000000000..1cbcb0e353
--- /dev/null
+++ b/core/Updates/2.10.0-b5.php
@@ -0,0 +1,215 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Updates;
+
+use Piwik\Common;
+use Piwik\DataAccess\ArchiveTableCreator;
+use Piwik\DataTable;
+use Piwik\Db;
+use Piwik\Updater;
+use Piwik\Updates;
+use DeviceDetector\Parser\Client\Browser AS BrowserParser;
+use Piwik\Plugins\Dashboard\Model AS DashboardModel;
+
+/**
+ * This Update script will update all browser and os archives of UserSettings and DevicesDetection plugin
+ *
+ * In the future only DevicesDetection will handle browser and os archives, so we try to rename all existing archives
+ * of UserSettings plugin to their corresponding archive name in DevicesDetection plugin:
+ * - *UserSettings_browser* will now be *DevicesDetection_browserVersions*
+ * - *UserSettings_os* will now be *DevicesDetection_osVersions*
+ *
+ * Unlike DevicesDetection plugin, the UserSettings plugin did not store archives holding the os and browser data without
+ * their version number. The "version-less" reports were always generated out of the "version-containing" archives .
+ * For big archives (month/year) that ment that some of the data was truncated, due to the datatable entry limit.
+ * To avoid that data loss / inaccuracy in the future, DevicesDetection plugin will also store archives without the version.
+ * For data archived after DevicesDetection plugin was enabled, those archive already exist. As we are removing the
+ * UserSettings reports, there is a fallback in DevicesDetection API to build the report out of the datatable with versions.
+ *
+ * NOTE: Some archives might not contain "all" data.
+ * That might have happened directly after the day DevicesDetection plugin was enabled. For the days before, there were
+ * no archives calculated. So week/month/year archives will only contain data for the days, where archives were generated
+ * To find a date after which it is safe to use DevicesDetection archives we need to find the first day-archive that
+ * contains DevicesDetection data. Day archives will always contain full data, but week/month/year archives may not.
+ * So we need to recreate those week/month/year archives.
+ */
+class Updates_2_10_0_b5 extends Updates
+{
+
+    static function getSql()
+    {
+        $sqls = array('# ATTENTION: This update script will execute some more SQL queries than that below as it is necessary to rebuilt some archives #' => false);
+
+        // update scheduled reports to use new plugin
+        $reportsToReplace = array(
+            'UserSettings_getBrowserVersion' => 'DevicesDetection_getBrowserVersions',
+            'UserSettings_getBrowser' => 'DevicesDetection_getBrowsers',
+            'UserSettings_getOSFamily' => 'DevicesDetection_getOsFamilies',
+            'UserSettings_getOS' => 'DevicesDetection_getOsVersions',
+            'UserSettings_getMobileVsDesktop' => 'DevicesDetection_getType',
+            'UserSettings_getBrowserType' => 'DevicesDetection_getBrowserEngines',
+            'UserSettings_getWideScreen' => 'UserSettings_getScreenType',
+        );
+
+        foreach ($reportsToReplace as $old => $new) {
+            $sqls["UPDATE " . Common::prefixTable('report') . " SET reports = REPLACE(reports, '".$old."', '".$new."')"] = false;
+        }
+
+        // update dashboard to use new widgets
+        $oldWidgets = array(
+            array('module' => 'UserSettings', 'action' => 'getBrowserVersion', 'params' => array()),
+            array('module' => 'UserSettings', 'action' => 'getBrowser', 'params' => array()),
+            array('module' => 'UserSettings', 'action' => 'getOSFamily', 'params' => array()),
+            array('module' => 'UserSettings', 'action' => 'getOS', 'params' => array()),
+            array('module' => 'UserSettings', 'action' => 'getMobileVsDesktop', 'params' => array()),
+            array('module' => 'UserSettings', 'action' => 'getBrowserType', 'params' => array()),
+            array('module' => 'UserSettings', 'action' => 'getWideScreen', 'params' => array()),
+        );
+
+        $newWidgets = array(
+            array('module' => 'DevicesDetection', 'action' => 'getBrowserVersions', 'params' => array()),
+            array('module' => 'DevicesDetection', 'action' => 'getBrowsers', 'params' => array()),
+            array('module' => 'DevicesDetection', 'action' => 'getOsFamilies', 'params' => array()),
+            array('module' => 'DevicesDetection', 'action' => 'getOsVersions', 'params' => array()),
+            array('module' => 'DevicesDetection', 'action' => 'getType', 'params' => array()),
+            array('module' => 'DevicesDetection', 'action' => 'getBrowserEngines', 'params' => array()),
+            array('module' => 'UserSettings', 'action' => 'getScreenType', 'params' => array()),
+        );
+
+        $allDashboards = Db::get()->fetchAll(sprintf("SELECT * FROM %s", Common::prefixTable('user_dashboard')));
+
+        foreach($allDashboards AS $dashboard) {
+
+            $dashboardLayout = json_decode($dashboard['layout']);
+
+            $dashboardLayout = DashboardModel::replaceDashboardWidgets($dashboardLayout, $oldWidgets, $newWidgets);
+
+            $newLayout = json_encode($dashboardLayout);
+            if ($newLayout != $dashboard['layout']) {
+                $sqls["UPDATE " . Common::prefixTable('user_dashboard') . " SET layout = '".addslashes($newLayout)."' WHERE iddashboard = ".$dashboard['iddashboard']] = false;
+            }
+        }
+
+        return $sqls;
+    }
+
+    static function update()
+    {
+        Updater::updateDatabase(__FILE__, self::getSql());
+
+        // DeviceDetection upgrade in beta1 timed out on demo #6750
+        $archiveBlobTables = self::getAllArchiveBlobTables();
+
+        foreach ($archiveBlobTables as $table) {
+            self::updateBrowserArchives($table);
+            self::updateOsArchives($table);
+        }
+    }
+
+    /**
+     * Returns all available archive blob tables
+     *
+     * @return array
+     */
+    public static function getAllArchiveBlobTables()
+    {
+        static $archiveBlobTables;
+
+        if (empty($archiveBlobTables)) {
+
+            $archiveTables = ArchiveTableCreator::getTablesArchivesInstalled();
+
+            $archiveBlobTables = array_filter($archiveTables, function($name) {
+                return ArchiveTableCreator::getTypeFromTableName($name) == ArchiveTableCreator::BLOB_TABLE;
+            });
+
+            // sort tables so we have them in order of their date
+            rsort($archiveBlobTables);
+        }
+
+        return (array) $archiveBlobTables;
+    }
+
+    /**
+     * Find the first day on which DevicesDetection archives were generated
+     *
+     * @return int    Timestamp
+     */
+    public static function getFirstDayOfArchivedDeviceDetectorData()
+    {
+        static $deviceDetectionBlobAvailableDate;
+
+        if (empty($deviceDetectionBlobAvailableDate)) {
+
+            $archiveBlobTables = self::getAllArchiveBlobTables();
+
+            $deviceDetectionBlobAvailableDate = null;
+            foreach ($archiveBlobTables as $table) {
+
+                // Look for all day archives and try to find that with the lowest date
+                $deviceDetectionBlobAvailableDate = Db::get()->fetchOne(sprintf("SELECT date1 FROM %s WHERE name = 'DevicesDetection_browserVersions' AND period = 1 ORDER BY date1 ASC LIMIT 1", $table));
+
+                if (!empty($deviceDetectionBlobAvailableDate)) {
+                    break;
+                }
+
+            }
+
+            $deviceDetectionBlobAvailableDate = strtotime($deviceDetectionBlobAvailableDate);
+        }
+
+        return $deviceDetectionBlobAvailableDate;
+    }
+
+    /**
+     * Updates all browser archives to new structure
+     * @param string $table
+     * @throws \Exception
+     */
+    public static function updateBrowserArchives($table)
+    {
+        // rename old UserSettings archives where no DeviceDetection archives exists
+        Db::exec(sprintf("UPDATE IGNORE %s SET name='DevicesDetection_browserVersions' WHERE name = 'UserSettings_browser'", $table));
+
+        /*
+         * check dates of remaining (non-day) archives with calculated safe date
+         * archives before or within that week/month/year of that date will be replaced
+         */
+        $oldBrowserBlobs = Db::get()->fetchAll(sprintf("SELECT * FROM %s WHERE name = 'UserSettings_browser' AND `period` > 1", $table));
+        foreach ($oldBrowserBlobs as $blob) {
+
+            // if start date of blob is before calculated date us old usersettings archive instead of already existing DevicesDetection archive
+            if (strtotime($blob['date1']) < self::getFirstDayOfArchivedDeviceDetectorData()) {
+
+                Db::get()->query(sprintf("DELETE FROM %s WHERE idarchive = ? AND name = ?", $table), array($blob['idarchive'], 'DevicesDetection_browserVersions'));
+                Db::get()->query(sprintf("UPDATE %s SET name = ? WHERE idarchive = ? AND name = ?", $table), array('DevicesDetection_browserVersions', $blob['idarchive'], 'UserSettings_browser'));
+            }
+        }
+    }
+
+    public static function updateOsArchives($table) {
+        Db::exec(sprintf("UPDATE IGNORE %s SET name='DevicesDetection_osVersions' WHERE name = 'UserSettings_os'", $table));
+
+        /*
+         * check dates of remaining (non-day) archives with calculated safe date
+         * archives before or within that week/month/year of that date will be replaced
+         */
+        $oldOsBlobs = Db::get()->fetchAll(sprintf("SELECT * FROM %s WHERE name = 'UserSettings_os' AND `period` > 1", $table));
+        foreach ($oldOsBlobs as $blob) {
+
+            // if start date of blob is before calculated date us old usersettings archive instead of already existing DevicesDetection archive
+            if (strtotime($blob['date1']) < self::getFirstDayOfArchivedDeviceDetectorData()) {
+
+                Db::get()->query(sprintf("DELETE FROM %s WHERE idarchive = ? AND name = ?", $table), array($blob['idarchive'], 'DevicesDetection_osVersions'));
+                Db::get()->query(sprintf("UPDATE %s SET name = ? WHERE idarchive = ? AND name = ?", $table), array('DevicesDetection_osVersions', $blob['idarchive'], 'UserSettings_os'));
+            }
+        }
+    }
+}
diff --git a/core/Updates/2.10.0-b7.php b/core/Updates/2.10.0-b7.php
new file mode 100644
index 0000000000..a44117fc81
--- /dev/null
+++ b/core/Updates/2.10.0-b7.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Updates;
+
+use Piwik\DataAccess\ArchiveTableCreator;
+use Piwik\Updater;
+use Piwik\Updates;
+
+class Updates_2_10_0_b7 extends Updates
+{
+
+    static function getSql()
+    {
+        $sqls = array();
+
+        $archiveTables = ArchiveTableCreator::getTablesArchivesInstalled();
+
+        $archiveBlobTables = array_filter($archiveTables, function($name) {
+            return ArchiveTableCreator::getTypeFromTableName($name) == ArchiveTableCreator::BLOB_TABLE;
+        });
+
+        foreach ($archiveBlobTables as $table) {
+
+            $sqls["UPDATE " . $table . " SET name = 'Resolution_resolution' WHERE name = 'UserSettings_resolution'"] = false;
+            $sqls["UPDATE " . $table . " SET name = 'Resolution_configuration' WHERE name = 'UserSettings_configuration'"] = false;
+        }
+
+        return $sqls;
+    }
+
+    static function update()
+    {
+        Updater::updateDatabase(__FILE__, self::getSql());
+    }
+
+}
diff --git a/core/Updates/2.10.0-b8.php b/core/Updates/2.10.0-b8.php
new file mode 100644
index 0000000000..17705f8143
--- /dev/null
+++ b/core/Updates/2.10.0-b8.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Updates;
+
+use Piwik\Updates;
+
+class Updates_2_10_0_b8 extends Updates
+{
+    static function update()
+    {
+        $pluginManager = \Piwik\Plugin\Manager::getInstance();
+
+        try {
+            $pluginManager->activatePlugin('Resolution');
+        } catch(\Exception $e) {
+        }
+    }
+
+}
diff --git a/core/Updates/2.11.0-b2.php b/core/Updates/2.11.0-b2.php
new file mode 100644
index 0000000000..ce0c7b2533
--- /dev/null
+++ b/core/Updates/2.11.0-b2.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Updates;
+
+use Piwik\Common;
+use Piwik\Db;
+use Piwik\Piwik;
+use Piwik\Updater;
+use Piwik\Updates;
+use Piwik\Plugins\Dashboard\Model AS DashboardModel;
+
+/**
+ * Update for version 2.11.0-b2.
+ */
+class Updates_2_11_0_b2 extends Updates
+{
+
+    static function getSql()
+    {
+        $sqls = array();
+
+        // update dashboard to use new ecommerce widgets, they were moved from goals plugin to ecommerce
+        $oldWidgets = array(
+            array('module' => 'Goals', 'action' => 'getEcommerceLog',  'params' => array()),
+            array('module' => 'Goals', 'action' => 'widgetGoalReport', 'params' => array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER)),
+        );
+
+        $newWidgets = array(
+            array('module' => 'Ecommerce', 'action' => 'getEcommerceLog',  'params' => array()),
+            array('module' => 'Ecommerce', 'action' => 'widgetGoalReport', 'params' => array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER)),
+        );
+
+        $allDashboards = Db::get()->fetchAll(sprintf("SELECT * FROM %s", Common::prefixTable('user_dashboard')));
+
+        foreach($allDashboards AS $dashboard) {
+
+            $dashboardLayout = json_decode($dashboard['layout']);
+            $dashboardLayout = DashboardModel::replaceDashboardWidgets($dashboardLayout, $oldWidgets, $newWidgets);
+
+            $newLayout = json_encode($dashboardLayout);
+            if ($newLayout != $dashboard['layout']) {
+                $sqls["UPDATE " . Common::prefixTable('user_dashboard') . " SET layout = '".addslashes($newLayout)."' WHERE iddashboard = ".$dashboard['iddashboard']] = false;
+            }
+        }
+
+        return $sqls;
+    }
+
+    static function update()
+    {
+        $pluginManager = \Piwik\Plugin\Manager::getInstance();
+
+        try {
+            $pluginManager->activatePlugin('Ecommerce');
+        } catch(\Exception $e) {
+        }
+
+        Updater::updateDatabase(__FILE__, self::getSql());
+    }
+}
diff --git a/core/Updates/2.11.0-b4.php b/core/Updates/2.11.0-b4.php
new file mode 100644
index 0000000000..00dc1b23ee
--- /dev/null
+++ b/core/Updates/2.11.0-b4.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Updates;
+
+use Piwik\DataAccess\ArchiveTableCreator;
+use Piwik\Updater;
+use Piwik\Updates;
+
+class Updates_2_11_0_b4 extends Updates
+{
+
+    static function getSql()
+    {
+        $sqls = array();
+
+        $archiveTables = ArchiveTableCreator::getTablesArchivesInstalled();
+
+        $archiveBlobTables = array_filter($archiveTables, function($name) {
+            return ArchiveTableCreator::getTypeFromTableName($name) == ArchiveTableCreator::BLOB_TABLE;
+        });
+
+        foreach ($archiveBlobTables as $table) {
+
+            $sqls["UPDATE " . $table . " SET name = 'UserLanguage_language' WHERE name = 'UserSettings_language'"] = false;
+        }
+
+        return $sqls;
+    }
+
+    static function update()
+    {
+        $pluginManager = \Piwik\Plugin\Manager::getInstance();
+
+        try {
+            $pluginManager->activatePlugin('UserLanguage');
+        } catch(\Exception $e) {
+        }
+
+        Updater::updateDatabase(__FILE__, self::getSql());
+    }
+
+}
diff --git a/core/Updates/2.11.0-b5.php b/core/Updates/2.11.0-b5.php
new file mode 100644
index 0000000000..1a75fd9f88
--- /dev/null
+++ b/core/Updates/2.11.0-b5.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Updates;
+
+use Piwik\Plugin\Manager;
+use Piwik\Updates;
+
+class Updates_2_11_0_b5 extends Updates
+{
+    static function update()
+    {
+        try {
+            Manager::getInstance()->activatePlugin('Monolog');
+        } catch (\Exception $e) {
+        }
+    }
+}
diff --git a/core/Updates/2.11.1-b4.php b/core/Updates/2.11.1-b4.php
new file mode 100644
index 0000000000..7777f10f89
--- /dev/null
+++ b/core/Updates/2.11.1-b4.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Updates;
+
+use Piwik\Config;
+use Piwik\Development;
+use Piwik\Updates;
+
+class Updates_2_11_1_b4 extends Updates
+{
+    /**
+     * Here you can define any action that should be performed during the update. For instance executing SQL statements,
+     * renaming config entries, updating files, etc.
+     */
+    static function update()
+    {
+        if (!Development::isEnabled()) {
+            return;
+        }
+
+        $config  = Config::getInstance();
+        $dbTests = $config->database_tests;
+
+        if ($dbTests['username'] === '@USERNAME@') {
+            $dbTests['username'] = 'root';
+        }
+
+        $config->database_tests = $dbTests;
+
+        $config->forceSave();
+    }
+}
diff --git a/core/Url.php b/core/Url.php
index d57276d5a5..04131c9827 100644
--- a/core/Url.php
+++ b/core/Url.php
@@ -28,7 +28,7 @@ use Piwik\Session;
  *     public function myControllerAction()
  *     {
  *         $url = Url::getCurrentQueryStringWithParametersModified(array(
- *             'module' => 'UserSettings',
+ *             'module' => 'DevicesDetection',
  *             'action' => 'index'
  *         ));
  *         Url::redirectToUrl($url);
@@ -466,6 +466,22 @@ class Url
         self::redirectToUrl(self::getCurrentUrlWithoutQueryString());
     }
 
+    private static function redirectToUrlNoExit($url)
+    {
+        if (UrlHelper::isLookLikeUrl($url)
+            || strpos($url, 'index.php') === 0
+        ) {
+            Common::sendResponseCode(302);
+            Common::sendHeader("Location: $url");
+        } else {
+            echo "Invalid URL to redirect to.";
+        }
+
+        if (Common::isPhpCliMode()) {
+            throw new Exception("If you were using a browser, Piwik would redirect you to this URL: $url \n\n");
+        }
+    }
+
     /**
      * Redirects the user to the specified URL.
      *
@@ -480,17 +496,8 @@ class Url
         // but it is not always called fast enough
         Session::close();
 
-        if (UrlHelper::isLookLikeUrl($url)
-            || strpos($url, 'index.php') === 0
-        ) {
-            Common::sendHeader("Location: $url");
-        } else {
-            echo "Invalid URL to redirect to.";
-        }
+        self::redirectToUrlNoExit($url);
 
-        if (Common::isPhpCliMode()) {
-            throw new Exception("If you were using a browser, Piwik would redirect you to this URL: $url \n\n");
-        }
         exit;
     }
 
diff --git a/core/UrlHelper.php b/core/UrlHelper.php
index 5efba99996..a0bc340bbd 100644
--- a/core/UrlHelper.php
+++ b/core/UrlHelper.php
@@ -8,6 +8,9 @@
  */
 namespace Piwik;
 
+use Piwik\Container\StaticContainer;
+use Piwik\Intl\Data\Provider\RegionDataProvider;
+
 /**
  * Contains less commonly needed URL helper methods.
  *
@@ -72,7 +75,9 @@ class UrlHelper
     {
         static $countries;
         if (!isset($countries)) {
-            $countries = implode('|', array_keys(Common::getCountriesList(true)));
+            /** @var RegionDataProvider $regionDataProvider */
+            $regionDataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\RegionDataProvider');
+            $countries = implode('|', array_keys($regionDataProvider->getCountryList(true)));
         }
 
         return preg_replace(
@@ -411,6 +416,7 @@ class UrlHelper
                             || strpos($query, sprintf('?%s=', $variableName)) !== false
 
                             // search engines with no keyword
+                            || $searchEngineName == 'Ixquick'
                             || $searchEngineName == 'Google Images'
                             || $searchEngineName == 'DuckDuckGo')
                     ) {
diff --git a/core/Version.php b/core/Version.php
index 0600fe25f3..5831690419 100644
--- a/core/Version.php
+++ b/core/Version.php
@@ -20,5 +20,21 @@ final class Version
      * The current Piwik version.
      * @var string
      */
-    const VERSION = '2.10.0-b2';
+    const VERSION = '2.11.2';
+
+    public function isStableVersion($version)
+    {
+        return (bool) preg_match('/^(\d+)\.(\d+)\.(\d+)$/', $version);
+    }
+
+    public function isVersionNumber($version)
+    {
+        return $this->isStableVersion($version) || $this->isNonStableVersion($version);
+    }
+
+    private function isNonStableVersion($version)
+    {
+        return (bool) preg_match('/^(\d+)\.(\d+)\.(\d+)-.{1,4}(\d+)$/', $version);
+    }
+
 }
diff --git a/core/View.php b/core/View.php
index 6200a23113..423aaeb278 100644
--- a/core/View.php
+++ b/core/View.php
@@ -221,6 +221,7 @@ class View implements ViewInterface
             $this->url = Common::sanitizeInputValue(Url::getCurrentUrl());
             $this->token_auth = Piwik::getCurrentUserTokenAuth();
             $this->userHasSomeAdminAccess = Piwik::isUserHasSomeAdminAccess();
+            $this->userIsAnonymous = Piwik::isUserIsAnonymous();
             $this->userIsSuperUser = Piwik::hasUserSuperUserAccess();
             $this->latest_version_available = UpdateCheck::isNewestVersionAvailable();
             $this->disableLink = Common::getRequestVar('disableLink', 0, 'int');
@@ -232,18 +233,11 @@ class View implements ViewInterface
             $user = APIUsersManager::getInstance()->getUser($this->userLogin);
             $this->userAlias = $user['alias'];
         } catch (Exception $e) {
-            Log::verbose($e);
+            Log::debug($e);
 
             // can fail, for example at installation (no plugin loaded yet)
         }
 
-        try {
-            $this->totalTimeGeneration = Registry::get('timer')->getTime();
-            $this->totalNumberOfQueries = Profiler::getQueryCount();
-        } catch (Exception $e) {
-            $this->totalNumberOfQueries = 0;
-        }
-
         ProxyHttp::overrideCacheControlHeaders('no-store');
 
         Common::sendHeader('Content-Type: ' . $this->contentType);
@@ -371,9 +365,17 @@ class View implements ViewInterface
      * @ignore
      */
     public static function clearCompiledTemplates()
-    {
+    {        
         $twig = new Twig();
-        $twig->getTwigEnvironment()->clearTemplateCache();
+        $environment = $twig->getTwigEnvironment();
+        $environment->clearTemplateCache();
+
+        $cacheDirectory = $environment->getCache();
+        if (!empty($cacheDirectory)
+            && is_dir($cacheDirectory)
+        ) {
+            $environment->clearCacheFiles();
+        }
     }
 
     /**
diff --git a/core/ViewDataTable/Config.php b/core/ViewDataTable/Config.php
index 1706e4b15f..220a253518 100644
--- a/core/ViewDataTable/Config.php
+++ b/core/ViewDataTable/Config.php
@@ -586,7 +586,7 @@ class Config
      * references the one that is currently being displayed, it will not be added to the related
      * report list.
      *
-     * @param string $relatedReport The plugin and method of the report, eg, `'UserSettings.getBrowser'`.
+     * @param string $relatedReport The plugin and method of the report, eg, `'DevicesDetection.getBrowsers'`.
      * @param string $title The report's display name, eg, `'Browsers'`.
      * @param array $queryParams Any extra query parameters to set in releated report's URL, eg,
      *                           `array('idGoal' => 'ecommerceOrder')`.
@@ -620,8 +620,8 @@ class Config
      *                              titles, eg,
      *                              ```
      *                              array(
-     *                                  'UserSettings.getBrowser' => 'Browsers',
-     *                                  'UserSettings.getConfiguration' => 'Configurations'
+     *                                  'DevicesDetection.getBrowsers' => 'Browsers',
+     *                                  'Resolution.getConfiguration' => 'Configurations'
      *                              )
      *                              ```
      */
diff --git a/core/ViewDataTable/Factory.php b/core/ViewDataTable/Factory.php
index 9ac90a1723..a5de6b3f06 100644
--- a/core/ViewDataTable/Factory.php
+++ b/core/ViewDataTable/Factory.php
@@ -80,7 +80,7 @@ class Factory
      *                                 If nothing is configured for the report and `null` is supplied for this
      *                                 argument, **table** is used.
      * @param bool|false|string $apiAction The API method for the report that will be displayed, eg,
-     *                               `'UserSettings.getBrowser'`.
+     *                               `'DevicesDetection.getBrowsers'`.
      * @param bool|false|string $controllerAction The controller name and action dedicated to displaying the report. This
      *                                       action is used when reloading reports or changing the report visualization.
      *                                       Defaulted to `$apiAction` if `false` is supplied.
@@ -95,11 +95,9 @@ class Factory
             $controllerAction = $apiAction;
         }
 
-        $defaultViewType = self::getDefaultViewTypeForReport($apiAction);
+        $report = self::getReport($apiAction);
 
-        if (!$forceDefault && !empty($defaultViewType)) {
-            $defaultType = $defaultViewType;
-        }
+        $defaultViewType = self::getDefaultViewTypeForReport($report, $apiAction);
 
         $isWidget = Common::getRequestVar('widget', '0', 'string');
 
@@ -110,18 +108,34 @@ class Factory
             $params = Manager::getViewDataTableParameters($login, $controllerAction);
         }
 
-        $savedViewDataTable = false;
-        if (!empty($params['viewDataTable'])) {
-            $savedViewDataTable = $params['viewDataTable'];
+        if (!self::isDefaultViewTypeForReportFixed($report)) {
+            $savedViewDataTable = false;
+            if (!empty($params['viewDataTable'])) {
+                $savedViewDataTable = $params['viewDataTable'];
+            }
+
+            // order of default viewDataTables' priority is: function specified default, saved default, configured default for report
+            //   function specified default is preferred
+            // -> force default == true : defaultType ?: saved ?: defaultView
+            // -> force default == false : saved ?: defaultType ?: defaultView
+            if ($forceDefault) {
+                $defaultType = $defaultType ?: $savedViewDataTable ?: $defaultViewType;
+            } else {
+                $defaultType = $savedViewDataTable ?: $defaultType ?: $defaultViewType;
+            }
+
+            $type = Common::getRequestVar('viewDataTable', $defaultType, 'string');
+
+            // Common::getRequestVar removes backslashes from the defaultValue in case magic quotes are enabled.
+            // therefore do not pass this as a default value to getRequestVar()
+            if ('' === $type) {
+                $type = $defaultType ?: HtmlTable::ID;
+            }
+        } else {
+            $type = $defaultViewType;
         }
 
-        $type = Common::getRequestVar('viewDataTable', $savedViewDataTable, 'string');
-
-        // Common::getRequestVar removes backslashes from the defaultValue in case magic quotes are enabled.
-        // therefore do not pass this as a default value to getRequestVar()
-        if ('' === $type) {
-            $type = $defaultType ? : HtmlTable::ID;
-        }
+        $params['viewDataTable'] = $type;
 
         $visualizations = Manager::getAvailableViewDataTables();
 
@@ -145,13 +159,27 @@ class Factory
     }
 
     /**
-     * Returns the default viewDataTable ID to use when determining which visualization to use.
+     * Return the report object for the given apiAction
+     * @param $apiAction
+     * @return null|Report
      */
-    private static function getDefaultViewTypeForReport($apiAction)
+    private static function getReport($apiAction)
     {
         list($module, $action) = explode('.', $apiAction);
         $report = Report::factory($module, $action);
+        return $report;
+    }
 
+    /**
+     * Returns the default viewDataTable ID to use when determining which visualization to use.
+     *
+     * @param Report $report
+     * @param string $apiAction
+     *
+     * @return bool|string
+     */
+    private static function getDefaultViewTypeForReport($report, $apiAction)
+    {
         if (!empty($report) && $report->isEnabled()) {
             return $report->getDefaultTypeViewDataTable();
         }
@@ -161,6 +189,21 @@ class Factory
     }
 
     /**
+     * Returns if the default viewDataTable ID to use is fixed.
+     *
+     * @param Report $report
+     * @return bool
+     */
+    private static function isDefaultViewTypeForReportFixed($report)
+    {
+        if (!empty($report) && $report->isEnabled()) {
+            return $report->alwaysUseDefaultViewDataTable();
+        }
+
+        return false;
+    }
+
+    /**
      * Returns a list of default viewDataTables ID to use when determining which visualization to use for multiple
      * reports.
      */
diff --git a/core/ViewDataTable/Manager.php b/core/ViewDataTable/Manager.php
index 5d05650657..aff1774368 100644
--- a/core/ViewDataTable/Manager.php
+++ b/core/ViewDataTable/Manager.php
@@ -8,6 +8,7 @@
  */
 namespace Piwik\ViewDataTable;
 
+use Piwik\Cache;
 use Piwik\Common;
 use Piwik\Option;
 use Piwik\Piwik;
@@ -63,6 +64,14 @@ class Manager
      */
     public static function getAvailableViewDataTables()
     {
+        $cache = Cache::getTransientCache();
+        $cacheId = 'ViewDataTable.getAvailableViewDataTables';
+        $dataTables = $cache->fetch($cacheId);
+
+        if (!empty($dataTables)) {
+            return $dataTables;
+        }
+
         $klassToExtend = '\\Piwik\\Plugin\\ViewDataTable';
 
         /** @var string[] $visualizations */
@@ -107,6 +116,8 @@ class Manager
             $result[$vizId] = $viz;
         }
 
+        $cache->save($cacheId, $result);
+
         return $result;
     }
 
diff --git a/core/WidgetsList.php b/core/WidgetsList.php
index 943dfceb68..e91a0f2b38 100644
--- a/core/WidgetsList.php
+++ b/core/WidgetsList.php
@@ -8,7 +8,7 @@
  */
 namespace Piwik;
 
-use Piwik\Cache\PluginAwareStaticCache;
+use Piwik\Cache as PiwikCache;
 use Piwik\Plugin\Report;
 use Piwik\Plugin\Widgets;
 
@@ -63,9 +63,11 @@ class WidgetsList extends Singleton
      */
     public static function get()
     {
-        $cache = self::getCacheForCompleteList();
-        if (!self::$listCacheToBeInvalidated && $cache->has()) {
-            return $cache->get();
+        $cache   = self::getCacheForCompleteList();
+        $cacheId = self::getCacheId();
+
+        if (!self::$listCacheToBeInvalidated && $cache->contains($cacheId)) {
+            return $cache->fetch($cacheId);
         }
 
         self::addWidgets();
@@ -83,7 +85,7 @@ class WidgetsList extends Singleton
             $widgets[$category] = $v;
         }
 
-        $cache->set($widgets);
+        $cache->save($cacheId, $widgets);
         self::$listCacheToBeInvalidated = false;
 
         return $widgets;
@@ -136,7 +138,7 @@ class WidgetsList extends Singleton
             'VisitsSummary_VisitsSummary',
             'Live!',
             'General_Visitors',
-            'UserSettings_VisitorSettings',
+            'General_VisitorSettings',
             'DevicesDetection_DevicesDetection',
             'General_Actions',
             'Events_Events',
@@ -270,11 +272,16 @@ class WidgetsList extends Singleton
     {
         self::$widgets    = array();
         self::$hookCalled = false;
-        self::getCacheForCompleteList()->clear();
+        self::getCacheForCompleteList()->delete(self::getCacheId());
+    }
+
+    private static function getCacheId()
+    {
+        return CacheId::pluginAware('WidgetsList');
     }
 
     private static function getCacheForCompleteList()
     {
-        return new PluginAwareStaticCache('WidgetsList');
+        return PiwikCache::getTransientCache();
     }
 }
diff --git a/core/bootstrap.php b/core/bootstrap.php
new file mode 100644
index 0000000000..ddb23c6016
--- /dev/null
+++ b/core/bootstrap.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Bootstraps the Piwik application.
+ *
+ * This file cannot be a class because it needs to be compatible with PHP 4.
+ */
+
+if (!defined('PIWIK_USER_PATH')) {
+    define('PIWIK_USER_PATH', PIWIK_DOCUMENT_ROOT);
+}
+
+error_reporting(E_ALL | E_NOTICE);
+@ini_set('display_errors', defined('PIWIK_DISPLAY_ERRORS') ? PIWIK_DISPLAY_ERRORS : @ini_get('display_errors'));
+@ini_set('xdebug.show_exception_trace', 0);
+@ini_set('magic_quotes_runtime', 0);
+
+// NOTE: the code above must be PHP 4 compatible
+require_once PIWIK_INCLUDE_PATH . '/core/testMinimumPhpVersion.php';
+
+session_cache_limiter('nocache');
+@date_default_timezone_set('UTC');
+
+disableEaccelerator();
+
+require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php';
+
+// Composer autoloader
+if (file_exists(PIWIK_INCLUDE_PATH . '/vendor/autoload.php')) {
+    $path = PIWIK_INCLUDE_PATH . '/vendor/autoload.php'; // Piwik is the main project
+} else {
+    $path = PIWIK_INCLUDE_PATH . '/../../autoload.php'; // Piwik is installed as a dependency
+}
+require_once $path;
+
+/**
+ * Eaccelerator does not support closures and is known to be not comptabile with Piwik. Therefore we are disabling
+ * it automatically. At this point it looks like Eaccelerator is no longer under development and the bug has not
+ * been fixed within a year.
+ *
+ * @link https://github.com/piwik/piwik/issues/4439#comment:8
+ * @link https://github.com/eaccelerator/eaccelerator/issues/12
+ */
+function disableEaccelerator()
+{
+    $isEacceleratorUsed = ini_get('eaccelerator.enable');
+    if (!empty($isEacceleratorUsed)) {
+        @ini_set('eaccelerator.enable', 0);
+    }
+}
diff --git a/core/dispatch.php b/core/dispatch.php
index 7f04a15664..c63f2f76b4 100644
--- a/core/dispatch.php
+++ b/core/dispatch.php
@@ -8,17 +8,12 @@
  * @package Piwik
  */
 
-use Piwik\Error;
+use Piwik\ErrorHandler;
 use Piwik\ExceptionHandler;
 use Piwik\FrontController;
-use Piwik\Plugin\ControllerAdmin as PluginControllerAdmin;
-
-PluginControllerAdmin::disableEacceleratorIfEnabled();
 
 if (!defined('PIWIK_ENABLE_ERROR_HANDLER') || PIWIK_ENABLE_ERROR_HANDLER) {
-    require_once PIWIK_INCLUDE_PATH . '/core/Error.php';
-    Error::setErrorHandler();
-    require_once PIWIK_INCLUDE_PATH . '/core/ExceptionHandler.php';
+    ErrorHandler::registerErrorHandler();
     ExceptionHandler::setUp();
 }
 
@@ -35,16 +30,10 @@ if (PIWIK_ENABLE_DISPATCH) {
         $controller->init();
         $response = $controller->dispatch();
 
-        if (is_array($response)) {
-            var_export($response);
-        } elseif (!is_null($response)) {
+        if (!is_null($response)) {
             echo $response;
         }
     } catch (Exception $ex) {
-        $response = $controller->getErrorResponse($ex);
-
-        echo $response;
-
-        exit(1);
+        ExceptionHandler::dieWithHtmlErrorPage($ex);
     }
 }
\ No newline at end of file
diff --git a/index.php b/index.php
index e142d64ea0..ebef3bda37 100644
--- a/index.php
+++ b/index.php
@@ -8,39 +8,20 @@
  * @package Piwik
  */
 
-if(!defined('PIWIK_DOCUMENT_ROOT')) {
+if (!defined('PIWIK_DOCUMENT_ROOT')) {
     define('PIWIK_DOCUMENT_ROOT', dirname(__FILE__) == '/' ? '' : dirname(__FILE__));
 }
 if (file_exists(PIWIK_DOCUMENT_ROOT . '/bootstrap.php')) {
     require_once PIWIK_DOCUMENT_ROOT . '/bootstrap.php';
 }
-
-error_reporting(E_ALL | E_NOTICE);
-@ini_set('display_errors', defined('PIWIK_DISPLAY_ERRORS') ? PIWIK_DISPLAY_ERRORS : @ini_get('display_errors'));
-@ini_set('xdebug.show_exception_trace', 0);
-@ini_set('magic_quotes_runtime', 0);
-
-if (!defined('PIWIK_USER_PATH')) {
-    define('PIWIK_USER_PATH', PIWIK_DOCUMENT_ROOT);
-}
 if (!defined('PIWIK_INCLUDE_PATH')) {
     define('PIWIK_INCLUDE_PATH', PIWIK_DOCUMENT_ROOT);
 }
 
-require_once PIWIK_INCLUDE_PATH . '/core/testMinimumPhpVersion.php';
-
-// NOTE: the code above this comment must be PHP4 compatible
-
-require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php';
-
-session_cache_limiter('nocache');
-@date_default_timezone_set('UTC');
-
-require_once PIWIK_INCLUDE_PATH . '/core/Loader.php';
-\Piwik\Loader::init();
+require_once PIWIK_INCLUDE_PATH . '/core/bootstrap.php';
 
-if(!defined('PIWIK_PRINT_ERROR_BACKTRACE')) {
+if (!defined('PIWIK_PRINT_ERROR_BACKTRACE')) {
     define('PIWIK_PRINT_ERROR_BACKTRACE', false);
 }
 
-require_once PIWIK_INCLUDE_PATH . '/core/dispatch.php';
\ No newline at end of file
+require_once PIWIK_INCLUDE_PATH . '/core/dispatch.php';
diff --git a/js/piwik.js b/js/piwik.js
index 98f22d7f8a..27413028ff 100644
--- a/js/piwik.js
+++ b/js/piwik.js
@@ -8,6 +8,8 @@
  * @license http://piwik.org/free-software/bsd/ BSD-3 Clause (also in js/LICENSE.txt)
  * @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
  */
+// NOTE: if you change this above Piwik comment block, you must also change `$byteStart` in js/tracker.php
+
 // Refer to README.md for build instructions when minifying this file for distribution.
 
 /*
@@ -408,7 +410,7 @@ if (typeof JSON2 !== 'object') {
     exec,
     res, width, height, devicePixelRatio,
     pdf, qt, realp, wma, dir, fla, java, gears, ag,
-    hook, getHook, getVisitorId, getVisitorInfo, setUserId, getUserId, setSiteId, setTrackerUrl, appendToTrackingUrl, getRequest, addPlugin,
+    hook, getHook, getVisitorId, getVisitorInfo, setUserId, getUserId, setSiteId, getSiteId, setTrackerUrl, getTrackerUrl, appendToTrackingUrl, getRequest, addPlugin,
     getAttributionInfo, getAttributionCampaignName, getAttributionCampaignKeyword,
     getAttributionReferrerTimestamp, getAttributionReferrerUrl,
     setCustomData, getCustomData,
@@ -424,7 +426,7 @@ if (typeof JSON2 !== 'object') {
     setVisitorCookieTimeout, setSessionCookieTimeout, setReferralCookieTimeout,
     setConversionAttributionFirstReferrer,
     disablePerformanceTracking, setGenerationTimeMs,
-    doNotTrack, setDoNotTrack, msDoNotTrack,
+    doNotTrack, setDoNotTrack, msDoNotTrack, getValuesFromVisitorIdCookie,
     addListener, enableLinkTracking, enableJSErrorTracking, setLinkTrackingTimer,
     setHeartBeatTimer, killFrame, redirectFile, setCountPreRendered,
     trackGoal, trackLink, trackPageView, trackSiteSearch, trackEvent,
@@ -455,7 +457,9 @@ if (typeof JSON2 !== 'object') {
     trackVisibleContentImpressions, isTrackOnlyVisibleContentEnabled, port, isUrlToCurrentDomain,
     isNodeAuthorizedToTriggerInteraction, replaceHrefIfInternalLink, getConfigDownloadExtensions, disableLinkTracking,
     substr, setAnyAttribute, wasContentTargetAttrReplaced, max, abs, childNodes, compareDocumentPosition, body,
-    getConfigVisitorCookieTimeout, getRemainingVisitorCookieTimeout
+    getConfigVisitorCookieTimeout, getRemainingVisitorCookieTimeout,
+    newVisitor, uuid, createTs, visitCount, currentVisitTs, lastVisitTs, lastEcommerceOrderTs
+
  */
 /*global _paq:true */
 /*members push */
@@ -2114,7 +2118,7 @@ if (typeof Piwik !== 'object') {
          *
          * See: Tracker.setTrackerUrl() and Tracker.setSiteId()
          */
-        function Tracker(trackerUrl, siteId, uuid) {
+        function Tracker(trackerUrl, siteId) {
 
             /************************************************************
              * Private members
@@ -2131,8 +2135,8 @@ if (typeof Piwik !== 'object') {
                 // Current URL and Referrer URL
                 locationArray = urlFixup(documentAlias.domain, windowAlias.location.href, getReferrer()),
                 domainAlias = domainFixup(locationArray[0]),
-                locationHrefAlias = locationArray[1],
-                configReferrerUrl = locationArray[2],
+                locationHrefAlias = decodeWrapper(locationArray[1]),
+                configReferrerUrl = decodeWrapper(locationArray[2]),
 
                 enableJSErrorTracking = false,
 
@@ -2161,6 +2165,9 @@ if (typeof Piwik !== 'object') {
                 // User ID
                 configUserId = '',
 
+                // Visitor UUID
+                visitorUUID = '',
+
                 // Document URL
                 configCustomUrl,
 
@@ -2291,10 +2298,7 @@ if (typeof Piwik !== 'object') {
                 hash = sha1,
 
                 // Domain hash value
-                domainHash,
-
-                // Visitor UUID
-                visitorUUID = uuid;
+                domainHash;
 
             /*
              * Set cookie value
@@ -2627,73 +2631,129 @@ if (typeof Piwik !== 'object') {
             function loadVisitorIdCookie() {
                 var now = new Date(),
                     nowTs = Math.round(now.getTime() / 1000),
-                    id = getCookie(getCookieName('id')),
-                    tmpContainer;
+                    visitorIdCookieName = getCookieName('id'),
+                    id = getCookie(visitorIdCookieName),
+                    cookieValue,
+                    uuid;
 
                 if (id) {
-                    tmpContainer = id.split('.');
+                    cookieValue = id.split('.');
 
                     // returning visitor flag
-                    tmpContainer.unshift('0');
+                    cookieValue.unshift('0');
 
-                } else {
-                    // uuid - generate a pseudo-unique ID to fingerprint this user;
-                    // note: this isn't a RFC4122-compliant UUID
-                    if (!visitorUUID) {
-                        visitorUUID = hash(
-                            (navigatorAlias.userAgent || '') +
-                            (navigatorAlias.platform || '') +
-                            JSON2.stringify(browserFeatures) +
-                            now.getTime() +
-                            Math.random()
-                        ).slice(0, 16); // 16 hexits = 64 bits
+                    if(visitorUUID.length) {
+                        cookieValue[1] = visitorUUID;
                     }
+                    return cookieValue;
+                }
+
+                // uuid - generate a pseudo-unique ID to fingerprint this user;
+                // note: this isn't a RFC4122-compliant UUID
+                if (visitorUUID.length) {
+                    uuid = visitorUUID;
+                } else {
+                    uuid = hash(
+                        (navigatorAlias.userAgent || '') +
+                        (navigatorAlias.platform || '') +
+                        JSON2.stringify(browserFeatures) +
+                        now.getTime() +
+                        Math.random()
+                    ).slice(0, 16); // 16 hexits = 64 bits
+                }
+
+                cookieValue = [
+                    // new visitor
+                    '1',
+
+                    // uuid
+                    uuid,
+
+                    // creation timestamp - seconds since Unix epoch
+                    nowTs,
+
+                    // visitCount - 0 = no previous visit
+                    0,
 
-                    tmpContainer = [
-                        // new visitor
-                        '1',
+                    // current visit timestamp
+                    nowTs,
 
-                        // uuid
-                        visitorUUID,
+                    // last visit timestamp - blank = no previous visit
+                    '',
 
-                        // creation timestamp - seconds since Unix epoch
-                        nowTs,
+                    // last ecommerce order timestamp
+                    ''
+                ];
 
-                        // visitCount - 0 = no previous visit
-                        0,
+                return cookieValue;
+            }
 
-                        // current visit timestamp
-                        nowTs,
 
-                        // last visit timestamp - blank = no previous visit
-                        '',
+            /**
+             * Loads the Visitor ID cookie and returns a named array of values
+             */
+            function getValuesFromVisitorIdCookie() {
+                var cookieVisitorIdValue = loadVisitorIdCookie(),
+                    newVisitor = cookieVisitorIdValue[0],
+                    uuid = cookieVisitorIdValue[1],
+                    createTs = cookieVisitorIdValue[2],
+                    visitCount = cookieVisitorIdValue[3],
+                    currentVisitTs = cookieVisitorIdValue[4],
+                    lastVisitTs = cookieVisitorIdValue[5];
 
-                        // last ecommerce order timestamp
-                        ''
-                    ];
+                // case migrating from pre-1.5 cookies
+                if (!isDefined(cookieVisitorIdValue[6])) {
+                    cookieVisitorIdValue[6] = "";
                 }
 
-                return tmpContainer;
+                var lastEcommerceOrderTs = cookieVisitorIdValue[6];
+
+                return {
+                    newVisitor: newVisitor,
+                    uuid: uuid,
+                    createTs: createTs,
+                    visitCount: visitCount,
+                    currentVisitTs: currentVisitTs,
+                    lastVisitTs: lastVisitTs,
+                    lastEcommerceOrderTs: lastEcommerceOrderTs
+                };
             }
 
+
             function getRemainingVisitorCookieTimeout() {
                 var now = new Date(),
                     nowTs = now.getTime(),
-                    visitorInfo = loadVisitorIdCookie();
+                    cookieCreatedTs = getValuesFromVisitorIdCookie().createTs;
 
-                var createTs = parseInt(visitorInfo[2], 10);
+                var createTs = parseInt(cookieCreatedTs, 10);
                 var originalTimeout = (createTs * 1000) + configVisitorCookieTimeout - nowTs;
                 return originalTimeout;
             }
 
             /*
-             * Sets the Visitor ID cookie: either the first time loadVisitorIdCookie is called
-             * or when there is a new visit or a new page view
+             * Sets the Visitor ID cookie
              */
-            function setVisitorIdCookie(uuid, createTs, visitCount, nowTs, lastVisitTs, lastEcommerceOrderTs) {
-                var timeout = getRemainingVisitorCookieTimeout();
+            function setVisitorIdCookie(visitorIdCookieValues) {
+                if(!configTrackerSiteId) {
+                    // when called before Site ID was set
+                    return;
+                }
+
+                var now = new Date(),
+                    nowTs = Math.round(now.getTime() / 1000);
+
+                if(!isDefined(visitorIdCookieValues)) {
+                    visitorIdCookieValues = getValuesFromVisitorIdCookie();
+                }
 
-                setCookie(getCookieName('id'), uuid + '.' + createTs + '.' + visitCount + '.' + nowTs + '.' + lastVisitTs + '.' + lastEcommerceOrderTs, timeout, configCookiePath, configCookieDomain);
+                var cookieValue = visitorIdCookieValues.uuid + '.' +
+                    visitorIdCookieValues.createTs + '.' +
+                    visitorIdCookieValues.visitCount + '.' +
+                    nowTs + '.' +
+                    visitorIdCookieValues.lastVisitTs + '.' +
+                    visitorIdCookieValues.lastEcommerceOrderTs;
+
+                setCookie(getCookieName('id'), cookieValue, getRemainingVisitorCookieTimeout(), configCookiePath, configCookieDomain);
             }
 
             /*
@@ -2743,6 +2803,11 @@ if (typeof Piwik !== 'object') {
                 configCookiesDisabled = savedConfigCookiesDisabled;
             }
 
+            function setSiteId(siteId) {
+                configTrackerSiteId = siteId;
+                setVisitorIdCookie();
+            }
+
             function sortObjectByKeys(value) {
                 if (!value || !isObject(value)) {
                     return;
@@ -2771,6 +2836,13 @@ if (typeof Piwik !== 'object') {
             }
 
             /**
+             * Creates the session cookie
+             */
+            function setSessionCookie() {
+                setCookie(getCookieName('ses'), '*', configSessionCookieTimeout, configCookiePath, configCookieDomain);
+            }
+
+            /**
              * Returns the URL to call piwik.php,
              * with the standard parameters (plugins, resolution, url, referrer, etc.).
              * Sends the pageview and browser settings with every request in case of race conditions.
@@ -2779,24 +2851,16 @@ if (typeof Piwik !== 'object') {
                 var i,
                     now = new Date(),
                     nowTs = Math.round(now.getTime() / 1000),
-                    newVisitor,
-                    uuid,
-                    visitCount,
-                    createTs,
-                    currentVisitTs,
-                    lastVisitTs,
-                    lastEcommerceOrderTs,
                     referralTs,
                     referralUrl,
                     referralUrlMaxLength = 1024,
                     currentReferrerHostName,
                     originalReferrerHostName,
                     customVariablesCopy = customVariables,
-                    sesname = getCookieName('ses'),
-                    refname = getCookieName('ref'),
-                    cvarname = getCookieName('cvar'),
-                    id = loadVisitorIdCookie(),
-                    ses = getCookie(sesname),
+                    cookieSessionName = getCookieName('ses'),
+                    cookieReferrerName = getCookieName('ref'),
+                    cookieCustomVariablesName = getCookieName('cvar'),
+                    cookieSessionValue = getCookie(cookieSessionName),
                     attributionCookie = loadReferrerAttributionCookie(),
                     currentUrl = configCustomUrl || locationHrefAlias,
                     campaignNameDetected,
@@ -2810,19 +2874,7 @@ if (typeof Piwik !== 'object') {
                     return '';
                 }
 
-                newVisitor = id[0];
-                uuid = id[1];
-                createTs = id[2];
-                visitCount = id[3];
-                currentVisitTs = id[4];
-                lastVisitTs = id[5];
-                // case migrating from pre-1.5 cookies
-                if (!isDefined(id[6])) {
-                    id[6] = "";
-                }
-
-                lastEcommerceOrderTs = id[6];
-
+                var cookieVisitorIdValues = getValuesFromVisitorIdCookie();
                 if (!isDefined(currentEcommerceOrderTs)) {
                     currentEcommerceOrderTs = "";
                 }
@@ -2841,17 +2893,17 @@ if (typeof Piwik !== 'object') {
                 referralTs = attributionCookie[2];
                 referralUrl = attributionCookie[3];
 
-                if (!ses) {
+                if (!cookieSessionValue) {
                     // cookie 'ses' was not found: we consider this the start of a 'session'
 
                     // here we make sure that if 'ses' cookie is deleted few times within the visit
                     // and so this code path is triggered many times for one visit,
                     // we only increase visitCount once per Visit window (default 30min)
                     var visitDuration = configSessionCookieTimeout / 1000;
-                    if (!lastVisitTs
-                            || (nowTs - lastVisitTs) > visitDuration) {
-                        visitCount++;
-                        lastVisitTs = currentVisitTs;
+                    if (!cookieVisitorIdValues.lastVisitTs
+                        || (nowTs - cookieVisitorIdValues.lastVisitTs) > visitDuration) {
+                        cookieVisitorIdValues.visitCount++;
+                        cookieVisitorIdValues.lastVisitTs = cookieVisitorIdValues.currentVisitTs;
                     }
 
 
@@ -2860,7 +2912,7 @@ if (typeof Piwik !== 'object') {
                     // Or if it was set but we must attribute to the most recent one
                     // Note: we are working on the currentUrl before purify() since we can parse the campaign parameters in the hash tag
                     if (!configConversionAttributionFirstReferrer
-                            || !campaignNameDetected.length) {
+                        || !campaignNameDetected.length) {
                         for (i in configCampaignNameParameters) {
                             if (Object.prototype.hasOwnProperty.call(configCampaignNameParameters, i)) {
                                 campaignNameDetected = getParameter(currentUrl, configCampaignNameParameters[i]);
@@ -2888,16 +2940,16 @@ if (typeof Piwik !== 'object') {
                     originalReferrerHostName = referralUrl.length ? getHostName(referralUrl) : '';
 
                     if (currentReferrerHostName.length && // there is a referrer
-                            !isSiteHostName(currentReferrerHostName) && // domain is not the current domain
-                            (!configConversionAttributionFirstReferrer || // attribute to last known referrer
-                            !originalReferrerHostName.length || // previously empty
-                            isSiteHostName(originalReferrerHostName))) { // previously set but in current domain
+                        !isSiteHostName(currentReferrerHostName) && // domain is not the current domain
+                        (!configConversionAttributionFirstReferrer || // attribute to last known referrer
+                        !originalReferrerHostName.length || // previously empty
+                        isSiteHostName(originalReferrerHostName))) { // previously set but in current domain
                         referralUrl = configReferrerUrl;
                     }
 
                     // Set the referral cookie if we have either a Referrer URL, or detected a Campaign (or both)
                     if (referralUrl.length
-                            || campaignNameDetected.length) {
+                        || campaignNameDetected.length) {
                         referralTs = nowTs;
                         attributionCookie = [
                             campaignNameDetected,
@@ -2906,27 +2958,28 @@ if (typeof Piwik !== 'object') {
                             purify(referralUrl.slice(0, referralUrlMaxLength))
                         ];
 
-                        setCookie(refname, JSON2.stringify(attributionCookie), configReferralCookieTimeout, configCookiePath, configCookieDomain);
+                        setCookie(cookieReferrerName, JSON2.stringify(attributionCookie), configReferralCookieTimeout, configCookiePath, configCookieDomain);
                     }
                 }
+
                 // build out the rest of the request
                 request += '&idsite=' + configTrackerSiteId +
-                    '&rec=1' +
-                    '&r=' + String(Math.random()).slice(2, 8) + // keep the string to a minimum
-                    '&h=' + now.getHours() + '&m=' + now.getMinutes() + '&s=' + now.getSeconds() +
-                    '&url=' + encodeWrapper(purify(currentUrl)) +
-                    (configReferrerUrl.length ? '&urlref=' + encodeWrapper(purify(configReferrerUrl)) : '') +
-                    (configUserId.length ? '&uid=' + encodeWrapper(configUserId) : '') +
-                    '&_id=' + uuid + '&_idts=' + createTs + '&_idvc=' + visitCount +
-                    '&_idn=' + newVisitor + // currently unused
-                    (campaignNameDetected.length ? '&_rcn=' + encodeWrapper(campaignNameDetected) : '') +
-                    (campaignKeywordDetected.length ? '&_rck=' + encodeWrapper(campaignKeywordDetected) : '') +
-                    '&_refts=' + referralTs +
-                    '&_viewts=' + lastVisitTs +
-                    (String(lastEcommerceOrderTs).length ? '&_ects=' + lastEcommerceOrderTs : '') +
-                    (String(referralUrl).length ? '&_ref=' + encodeWrapper(purify(referralUrl.slice(0, referralUrlMaxLength))) : '') +
-                    (charSet ? '&cs=' + encodeWrapper(charSet) : '') +
-                    '&send_image=0';
+                '&rec=1' +
+                '&r=' + String(Math.random()).slice(2, 8) + // keep the string to a minimum
+                '&h=' + now.getHours() + '&m=' + now.getMinutes() + '&s=' + now.getSeconds() +
+                '&url=' + encodeWrapper(purify(currentUrl)) +
+                (configReferrerUrl.length ? '&urlref=' + encodeWrapper(purify(configReferrerUrl)) : '') +
+                ((configUserId && configUserId.length) ? '&uid=' + encodeWrapper(configUserId) : '') +
+                '&_id=' + cookieVisitorIdValues.uuid + '&_idts=' + cookieVisitorIdValues.createTs + '&_idvc=' + cookieVisitorIdValues.visitCount +
+                '&_idn=' + cookieVisitorIdValues.newVisitor + // currently unused
+                (campaignNameDetected.length ? '&_rcn=' + encodeWrapper(campaignNameDetected) : '') +
+                (campaignKeywordDetected.length ? '&_rck=' + encodeWrapper(campaignKeywordDetected) : '') +
+                '&_refts=' + referralTs +
+                '&_viewts=' + cookieVisitorIdValues.lastVisitTs +
+                (String(cookieVisitorIdValues.lastEcommerceOrderTs).length ? '&_ects=' + cookieVisitorIdValues.lastEcommerceOrderTs : '') +
+                (String(referralUrl).length ? '&_ref=' + encodeWrapper(purify(referralUrl.slice(0, referralUrlMaxLength))) : '') +
+                (charSet ? '&cs=' + encodeWrapper(charSet) : '') +
+                '&send_image=0';
 
                 // browser features
                 for (i in browserFeatures) {
@@ -2951,7 +3004,7 @@ if (typeof Piwik !== 'object') {
                     return '';
                 }
 
-                var sortedCustomVarPage  = sortObjectByKeys(customVariablesPage);
+                var sortedCustomVarPage = sortObjectByKeys(customVariablesPage);
                 var sortedCustomVarEvent = sortObjectByKeys(customVariablesEvent);
 
                 request += appendCustomVariablesToRequest(sortedCustomVarPage, 'cvar');
@@ -2971,7 +3024,7 @@ if (typeof Piwik !== 'object') {
                     }
 
                     if (configStoreCustomVariablesInCookie) {
-                        setCookie(cvarname, JSON2.stringify(customVariables), configSessionCookieTimeout, configCookiePath, configCookieDomain);
+                        setCookie(cookieCustomVariablesName, JSON2.stringify(customVariables), configSessionCookieTimeout, configCookiePath, configCookieDomain);
                     }
                 }
 
@@ -2980,14 +3033,15 @@ if (typeof Piwik !== 'object') {
                     if (configPerformanceGenerationTime) {
                         request += '&gt_ms=' + configPerformanceGenerationTime;
                     } else if (performanceAlias && performanceAlias.timing
-                            && performanceAlias.timing.requestStart && performanceAlias.timing.responseEnd) {
+                        && performanceAlias.timing.requestStart && performanceAlias.timing.responseEnd) {
                         request += '&gt_ms=' + (performanceAlias.timing.responseEnd - performanceAlias.timing.requestStart);
                     }
                 }
 
                 // update cookies
-                setVisitorIdCookie(uuid, createTs, visitCount, nowTs, lastVisitTs, isDefined(currentEcommerceOrderTs) && String(currentEcommerceOrderTs).length ? currentEcommerceOrderTs : lastEcommerceOrderTs);
-                setCookie(sesname, '*', configSessionCookieTimeout, configCookiePath, configCookieDomain);
+                cookieVisitorIdValues.lastEcommerceOrderTs = isDefined(currentEcommerceOrderTs) && String(currentEcommerceOrderTs).length ? currentEcommerceOrderTs : cookieVisitorIdValues.lastEcommerceOrderTs;
+                setVisitorIdCookie(cookieVisitorIdValues);
+                setSessionCookie();
 
                 // tracker plugin hook
                 request += executePluginMethod(pluginMethod);
@@ -3844,6 +3898,8 @@ if (typeof Piwik !== 'object') {
                     }
                 }
             }
+
+
             function enableTrackOnlyVisibleContent (checkOnSroll, timeIntervalInMs, tracker) {
 
                 if (isTrackOnlyVisibleContentEnabled) {
@@ -4004,6 +4060,7 @@ if (typeof Piwik !== 'object') {
              */
             detectBrowserFeatures();
             updateDomainHash();
+            setVisitorIdCookie();
 
 /*<DEBUG>*/
             /*
@@ -4060,9 +4117,6 @@ if (typeof Piwik !== 'object') {
                 getTrackedContentImpressions: function () {
                     return trackedContentImpressions;
                 },
-                getTrackerUrl: function () {
-                    return configTrackerUrl;
-                },
                 clearEnableTrackOnlyVisibleContent: function () {
                     isTrackOnlyVisibleContentEnabled = false;
                 },
@@ -4082,7 +4136,7 @@ if (typeof Piwik !== 'object') {
                  * @return string Visitor ID in hexits (or null, if not yet known)
                  */
                 getVisitorId: function () {
-                    return (loadVisitorIdCookie())[1];
+                    return getValuesFromVisitorIdCookie().uuid;
                 },
 
                 /**
@@ -4091,6 +4145,8 @@ if (typeof Piwik !== 'object') {
                  * @return array
                  */
                 getVisitorInfo: function () {
+                    // Note: in a new method, we could return also return getValuesFromVisitorIdCookie()
+                    //       which returns named parameters rather than returning integer indexed array
                     return loadVisitorIdCookie();
                 },
 
@@ -4155,13 +4211,32 @@ if (typeof Piwik !== 'object') {
                     configTrackerUrl = trackerUrl;
                 },
 
+
+                /**
+                 * Returns the Piwik server URL
+                 * @returns string
+                 */
+                getTrackerUrl: function () {
+                    return configTrackerUrl;
+                },
+
+
+                /**
+                 * Returns the site ID
+                 *
+                 * @returns int
+                 */
+                getSiteId: function() {
+                    return configTrackerSiteId;
+                },
+
                 /**
                  * Specify the site ID
                  *
                  * @param int|string siteId
                  */
                 setSiteId: function (siteId) {
-                    configTrackerSiteId = siteId;
+                    setSiteId(siteId);
                 },
 
                 /**
@@ -4171,6 +4246,7 @@ if (typeof Piwik !== 'object') {
                  */
                 setUserId: function (userId) {
                     configUserId = userId;
+                    visitorUUID = hash(configUserId).substr(0, 16);
                 },
 
                 /**
@@ -5147,7 +5223,7 @@ if (typeof Piwik !== 'object') {
 
         asyncTracker = new Tracker();
 
-        var applyFirst = {setTrackerUrl: 1, setAPIUrl: 1, setSiteId: 1, disableCookies: 1, enableLinkTracking: 1};
+        var applyFirst = {setTrackerUrl: 1, setAPIUrl: 1, setUserId: 1, setSiteId: 1, disableCookies: 1, enableLinkTracking: 1};
         var methodName;
 
         // find the call to setTrackerUrl or setSiteid (if any) and call them first
@@ -5160,7 +5236,7 @@ if (typeof Piwik !== 'object') {
 
                 if (applyFirst[methodName] > 1) {
                     if (console !== undefined && console && console.error) {
-                        console.error('The method ' + methodName + ' is registered more than once in "_paq" variable. Only the last call has an effect. Please have a look at the multiple Piwik trackers documentation: http://developer.piwik.org/api-reference/tracking-javascript#multiple-piwik-trackers');
+                        console.error('The method ' + methodName + ' is registered more than once in "_paq" variable. Only the last call has an effect. Please have a look at the multiple Piwik trackers documentation: http://developer.piwik.org/guides/tracking-javascript-guide#multiple-piwik-trackers');
                     }
                 }
 
@@ -5201,7 +5277,13 @@ if (typeof Piwik !== 'object') {
              * @return Tracker
              */
             getTracker: function (piwikUrl, siteId) {
-                return new Tracker(piwikUrl, siteId, asyncTracker.getVisitorId());
+                if(!isDefined(siteId)) {
+                    siteId = this.getAsyncTracker().getSiteId();
+                }
+                if(!isDefined(piwikUrl)) {
+                    piwikUrl = this.getAsyncTracker().getTrackerUrl();
+                }
+                return new Tracker(piwikUrl, siteId);
             },
 
             /**
diff --git a/js/tracker.php b/js/tracker.php
index ac85498cb9..b3191f9c49 100644
--- a/js/tracker.php
+++ b/js/tracker.php
@@ -27,8 +27,14 @@ define('PIWIK_DOCUMENT_ROOT', '..');
 define('PIWIK_USER_PATH', '..');
 
 require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php';
-require_once PIWIK_INCLUDE_PATH . '/core/Loader.php';
-\Piwik\Loader::init();
+
+// Composer autoloader
+if (file_exists(PIWIK_INCLUDE_PATH . '/vendor/autoload.php')) {
+    $path = PIWIK_INCLUDE_PATH . '/vendor/autoload.php'; // Piwik is the main project
+} else {
+    $path = PIWIK_INCLUDE_PATH . '/../../autoload.php'; // Piwik is installed as a dependency
+}
+require $path;
 
 $file = '../piwik.js';
 
diff --git a/lang/am.json b/lang/am.json
index 2487e0f825..71588db3d8 100644
--- a/lang/am.json
+++ b/lang/am.json
@@ -113,6 +113,7 @@
         "VBarGraph": "አቀባዊ አሞሌ ግራፍ",
         "View": "ትእይታ",
         "Visitors": "ጎብኝዎች",
+        "VisitorSettings": "የጎበኚዎች ቅንብሮች",
         "Warning": "ማስጠንቀቂያ",
         "Website": "ድር ጣቢያ",
         "Widgets": "Widgets",
diff --git a/lang/ar.json b/lang/ar.json
index 97fbff997a..67ea382819 100644
--- a/lang/ar.json
+++ b/lang/ar.json
@@ -116,7 +116,6 @@
         "FileIntegrityWarningExplanation": "فشل فحص سلامة الملفات وتم تسجيل بعض الأخطاء. يحدث هذا غالباً نتيجة الرفع الناقص أو الخاطئ لبعض ملفات Piwik. يتوجب عليك إعادة رفع ملفات Piwik في وضع BINARY ثم إعادة تحديث هذه الصفحة حتى تنتهي هذه الأخطاء.",
         "ForExampleShort": "مثال:",
         "FromReferrer": "من",
-        "GeneralSettings": "الإعدادات العامة",
         "GiveUsYourFeedback": "أخبرنا عن رأيك!",
         "GoTo": "اذهب إلى %s",
         "GraphHelp": "لمزيد من المعلومات حول عرض الرسومات البيانية في Piwik.",
@@ -269,6 +268,7 @@
         "VisitorID": "معرف الزائر",
         "VisitorIP": "عنوان IP للزائر",
         "Visitors": "الزوار",
+        "VisitorSettings": "إعدادات الزوار",
         "VisitType": "نوع الزائر",
         "Warning": "تنبيه",
         "WarningFileIntegrityNoManifest": "لم يمكن إجراء فحص سلامة الملفات بسبب فقد ملف manifest.inc.php.",
diff --git a/lang/be.json b/lang/be.json
index f8a17a4809..d94b105a7b 100644
--- a/lang/be.json
+++ b/lang/be.json
@@ -141,7 +141,6 @@
         "First": "Першы",
         "ForExampleShort": "напр.",
         "FromReferrer": "ад",
-        "GeneralSettings": "Агульныя наладкі",
         "GiveUsYourFeedback": "Дайце нам водгук!",
         "Goal": "Мэта",
         "GoTo": "Перайсці да %s",
@@ -307,6 +306,7 @@
         "VisitorID": "ID наведвальніка",
         "VisitorIP": "IP наведвальніка",
         "Visitors": "Наведвальнікі",
+        "VisitorSettings": "Налады карыстача",
         "VisitsWith": "Наведванняў з %s",
         "VisitType": "Тып наведвальніка",
         "VisitTypeExample": "Напрыклад, каб выбраць усіх наведвальнікаў, якія вяртаюцца на вэб-сайт, у тым ліку і тых, хто купіў нешта ў сваіх папярэдніх візітах, API-запыт будзе змяшчаць %s",
diff --git a/lang/bg.json b/lang/bg.json
index 91a68c22b7..504d4e8885 100644
--- a/lang/bg.json
+++ b/lang/bg.json
@@ -1,7 +1,4 @@
 {
-    "DoNotTrack": {
-        "PluginDescription": "Игнориране на посещенията с X-Do-Not-Track или заглавие DNT."
-    },
     "General": {
         "AbandonedCarts": "Отказани колички",
         "AboutPiwikX": "За Piwik %s",
@@ -178,7 +175,6 @@
         "Forums": "Форуми",
         "FromReferrer": "от",
         "GeneralInformation": "Обща информация",
-        "GeneralSettings": "Основни настройки",
         "GetStarted": "Как да започнем",
         "GiveUsYourFeedback": "Обратна връзка",
         "Goal": "Цел",
@@ -408,6 +404,7 @@
         "VisitorID": "ID на посетител",
         "VisitorIP": "IP на посетител",
         "Visitors": "Посетители",
+        "VisitorSettings": "Настройки на посетителя",
         "VisitsWith": "Посещения с %s",
         "VisitType": "Тип на посетител",
         "VisitTypeExample": "Например, ако изберете всички посетители, които са се завърнали на сайта, включително тези, които са купили нещо при предишните посещения, API заявката ще съдържа %s",
diff --git a/lang/bn.json b/lang/bn.json
index 9b980b96e0..6ec028348a 100644
--- a/lang/bn.json
+++ b/lang/bn.json
@@ -28,7 +28,6 @@
         "First": "প্রথম",
         "FromReferrer": "থেকে",
         "GeneralInformation": "সাধারণ তথ্য",
-        "GeneralSettings": "সাধারণ সেটিংসমূহ",
         "Goal": "লক্ষ্য",
         "Help": "সাহায্য",
         "Language": "ভাষা",
diff --git a/lang/bs.json b/lang/bs.json
index 4f53133d59..8fa75f263e 100644
--- a/lang/bs.json
+++ b/lang/bs.json
@@ -149,7 +149,6 @@
         "ForExampleShort": "npr.",
         "FromReferrer": "iz",
         "GeneralInformation": "Generalne informacije",
-        "GeneralSettings": "Generalne postavke",
         "GiveUsYourFeedback": "Recite nam sta mislite!",
         "Goal": "Cilj",
         "GoTo": "Idi u %s",
diff --git a/lang/ca.json b/lang/ca.json
index 29ca7868f5..759cae5d79 100644
--- a/lang/ca.json
+++ b/lang/ca.json
@@ -163,7 +163,6 @@
         "ForExampleShort": "p.ex.",
         "FromReferrer": "de",
         "GeneralInformation": "Informació General",
-        "GeneralSettings": "Paràmetres generals",
         "GetStarted": "Comenceu",
         "GiveUsYourFeedback": "Què penseu del Piwik?",
         "Goal": "Objectiu",
@@ -363,6 +362,7 @@
         "VisitorID": "ID del visitant",
         "VisitorIP": "Ip del visitant",
         "Visitors": "Visitants",
+        "VisitorSettings": "Configuració del visitant",
         "VisitsWith": "Visites amb %s",
         "VisitType": "Tipus de visitant",
         "VisitTypeExample": "Per exemple, per seleccionar tots els visitants que han retornat al lloc web, incloent els que han comprat alguna cosa en anteriors visites, la petició de l'API tindria %s",
diff --git a/lang/cs.json b/lang/cs.json
index 722df7a1a3..039e5b55f2 100644
--- a/lang/cs.json
+++ b/lang/cs.json
@@ -1,7 +1,4 @@
 {
-    "DoNotTrack": {
-        "PluginDescription": "Ignoruje návštěvy s hlavičkamy X-Do-Not-Track nebo DNT."
-    },
     "General": {
         "AbandonedCarts": "Neobjednané košíky",
         "AboutPiwikX": "O Piwiku %s",
@@ -148,7 +145,10 @@
         "EvolutionSummaryGeneric": "%1$s v %2$s srovnáno s %3$s v %4$s. Vývin: %5$s",
         "ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "Uživatel musí být super uživatel nebo uživatel %s.",
         "ExceptionConfigurationFileNotFound": "Konfigurační soubor {%s} nebyl nalezen",
+        "ExceptionContactSupportGeneric": "Pokud problém přetrvá, %skontaktujte pro pomoc vašeho Piwik administrátora%s.",
         "ExceptionDatabaseVersion": "Vaše %1$s verze je %2$s ale Piwik vyžaduje minimálně %3$s.",
+        "ExceptionDatabaseVersionNewerThanCodebase": "Kód Piwiku je z verze %1$s, ale bylo zjištěno, že databáze byla již aktualizována na verzi %2$s.",
+        "ExceptionDatabaseVersionNewerThanCodebaseWait": "Vaši administrátoři možná pracují na aktualizaci. Zkuste to, prosím, za pár minut.",
         "ExceptionFileIntegrity": "Test integrity selhal: %s",
         "ExceptionFilesizeMismatch": "Nesouhlasí velikost souboru: %1$s (očekávaná délka: %2$s, nalezeno: %3$s)",
         "ExceptionIncompatibleClientServerVersions": "Vaše %1$s verze klienta je %2$s tato je ale nekompatibilní se serverem %3$s.",
@@ -185,8 +185,8 @@
         "ForExampleShort": "např.",
         "Forums": "Fóra",
         "FromReferrer": "z",
+        "General": "Obecné",
         "GeneralInformation": "Obecné informace",
-        "GeneralSettings": "Obecná nastavení",
         "GetStarted": "Začít",
         "GiveUsYourFeedback": "Dejte nám zpětnou vazbu!",
         "Goal": "Cíl",
@@ -426,6 +426,7 @@
         "VisitorID": "ID návštěvníka",
         "VisitorIP": "IP návštěvníka",
         "Visitors": "Návštěvníci",
+        "VisitorSettings": "Nastavení návštěvníků",
         "VisitsWith": "Návštěv s %s",
         "VisitType": "Typ návštěvníka",
         "VisitTypeExample": "Například pro výběr všech návštěvníků, kteří se vrátili na stránky včetně těch, co si v předcchozích návštěvách něco koupili, by API požadavek obsahoval %s",
@@ -441,6 +442,7 @@
         "WeeklyReport": "Týdně",
         "WeeklyReports": "Tydenní hlášení",
         "WellDone": "Výborně!",
+        "Widget": "Widget",
         "Widgets": "Widgety",
         "XComparedToY": "%1$s ve srovnání s %2$s",
         "XFromY": "%1$s z %2$s",
diff --git a/lang/cy.json b/lang/cy.json
index 4e0a6126b2..1d843000e2 100644
--- a/lang/cy.json
+++ b/lang/cy.json
@@ -119,7 +119,6 @@
         "First": "Cyntaf",
         "ForExampleShort": "ee.",
         "FromReferrer": "oddiwrth",
-        "GeneralSettings": "Gosodiadau Cyffredinol",
         "GiveUsYourFeedback": "Gyrrwch Adborth!",
         "GoTo": "Ewch i %s",
         "GraphHelp": "Mwy o wybodaeth am ddangos graffiau yn Piwik.",
diff --git a/lang/da.json b/lang/da.json
index 817201fcf5..8729e3619e 100644
--- a/lang/da.json
+++ b/lang/da.json
@@ -1,7 +1,4 @@
 {
-    "DoNotTrack": {
-        "PluginDescription": "Ignorer besøg med X-Do-Not-Track eller DNT header."
-    },
     "General": {
         "AbandonedCarts": "Afbrudte Ordrer",
         "AboutPiwikX": "Om Piwik %s",
@@ -149,6 +146,8 @@
         "ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "Brugeren skal være enten en superbruger eller brugeren '%s' selv.",
         "ExceptionConfigurationFileNotFound": "Konfigurationsfilen (%s) blev ikke fundet.",
         "ExceptionDatabaseVersion": "%1$s version er %2$s, men Piwik behøver mindst version %3$s.",
+        "ExceptionDatabaseVersionNewerThanCodebase": "Piwik kodebase kører den gamle version %1$s, og Piwik databasen er allerede blevet opgraderet til den nyere version %2$s.",
+        "ExceptionDatabaseVersionNewerThanCodebaseWait": "Måske er Piwik administratoren i øjeblikket ved at færdigbehandle opgraderingsprocessen. Prøv igen om et par minutter.",
         "ExceptionFileIntegrity": "Integritetstjek mislykkedes: %s",
         "ExceptionFilesizeMismatch": "Fil størrelse passer ikke: %1$s (forventet længde: %2$s, fundet: %3$s)",
         "ExceptionIncompatibleClientServerVersions": "%1$s klient version er %2$s, som er uforenelig med server version %3$s.",
@@ -185,8 +184,8 @@
         "ForExampleShort": "fx.",
         "Forums": "Forum",
         "FromReferrer": "fra",
+        "General": "Generelt",
         "GeneralInformation": "General Information",
-        "GeneralSettings": "Generelle indstillinger",
         "GetStarted": "Kom i gang",
         "GiveUsYourFeedback": "Tilbagemelding!",
         "Goal": "Mål",
@@ -426,6 +425,7 @@
         "VisitorID": "Besøgendes ID",
         "VisitorIP": "Besøgendes IP",
         "Visitors": "Besøgende",
+        "VisitorSettings": "Besøgendes indstillinger",
         "VisitsWith": "Besøg med %s",
         "VisitType": "Besøgstype",
         "VisitTypeExample": "F. eks., for at vælge alle besøgende, som er vendt tilbage til hjemmesiden, herunder dem, der har købt noget i deres tidligere besøg, vil API-anmodningen indeholde %s",
diff --git a/lang/de.json b/lang/de.json
index 7949377357..b2a033e2ec 100644
--- a/lang/de.json
+++ b/lang/de.json
@@ -1,7 +1,4 @@
 {
-    "DoNotTrack": {
-        "PluginDescription": "Besuche mit X-Do-Not-Track oder DNT Header ignorieren."
-    },
     "General": {
         "AbandonedCarts": "Verlassene Warenkörbe",
         "AboutPiwikX": "Über Piwik %s",
@@ -34,12 +31,12 @@
         "ChooseWebsite": "Webseite wählen",
         "Clear": "Zurücksetzen",
         "ClickHere": "Klicken Sie hier für mehr Informationen.",
-        "ClickToChangePeriod": "Klicke erneut um den Zeitraum zu ändern.",
+        "ClickToChangePeriod": "Klicke erneut, um den Zeitraum zu ändern.",
         "Close": "Schließen",
         "ColumnActionsPerVisit": "Aktionen pro Besuch",
         "ColumnActionsPerVisitDocumentation": "Die durchschnittliche Anzahl der Aktionen (Seitenaufrufe, Downloads, ausgehende Verweise oder interne Suchen), die während der Besuche durchgeführt wurden.",
         "ColumnAverageGenerationTime": "Durchschnittliche Generierungszeit",
-        "ColumnAverageGenerationTimeDocumentation": "Die durchschnittliche Zeit die zur Generierung der Seite benötigt wurde. Diese Metrik beinhaltet die Zeit die der Server für die Generierung benötigte sowie die Zeit die der Besucher benötigte um die Antwort vom Server herunterzuladen. Eine niedrigere 'durchschnittliche Generierungszeit' bedeutet eine schnellere Webseite für Ihre Besucher!",
+        "ColumnAverageGenerationTimeDocumentation": "Die durchschnittliche Zeit, die zur Generierung der Seite benötigt wurde. Diese Metrik beinhaltet die Zeit, die der Server für die Generierung benötigte, sowie die Zeit, die der Besucher benötigte, um die Antwort vom Server herunterzuladen. Eine niedrigere 'durchschnittliche Generierungszeit' bedeutet eine schnellere Webseite für Ihre Besucher!",
         "ColumnAverageTimeOnPage": "Durchschnittszeit pro Seite",
         "ColumnAverageTimeOnPageDocumentation": "Die durchschnittliche Besuchdauer einer Seite (nur die einzelne Seite, nicht die gesamte Webseite)",
         "ColumnAvgTimeOnSite": "Durchschnittszeit auf der Webseite",
@@ -50,7 +47,7 @@
         "ColumnBounces": "Absprünge",
         "ColumnBouncesDocumentation": "Anzahl der Besuche, die auf dieser Seite begannen und endeten. D.h. der Besucher verließ die Webseite nach dem Aufruf dieser einen Seite wieder.",
         "ColumnConversionRate": "Konversionsrate",
-        "ColumnConversionRateDocumentation": "Prozentsatz der Besucher, die ein Zeil erreicht haben.",
+        "ColumnConversionRateDocumentation": "Prozentsatz der Besucher, die ein Ziel erreicht haben.",
         "ColumnDestinationPage": "Zielseite",
         "ColumnEntrances": "Eingänge",
         "ColumnEntrancesDocumentation": "Anzahl der Besuche, die auf dieser Seite begonnen haben.",
@@ -132,23 +129,26 @@
         "Download": "Download",
         "DownloadFail_FileExists": "Die Datei %s existiert bereits!",
         "DownloadFail_FileExistsContinue": "Es wurde versucht den Download von %s fortzusetzen, allerdings existiert bereits eine komplett heruntergeladene Datei!",
-        "DownloadFail_HttpRequestFail": "Konnte die Datei nicht herunterladen! Möglicherweise ist die Webseite von der Sie herunterladen möchten nicht einsatzbereit. Sie können es später noch einmal probieren oder die Datei selbständig herunterladen.",
+        "DownloadFail_HttpRequestFail": "Konnte die Datei nicht herunterladen! Möglicherweise ist die Webseite, von der Sie herunterladen möchten, nicht einsatzbereit. Sie können es später noch einmal probieren oder die Datei selbständig herunterladen.",
         "DownloadFullVersion": "%1$sLaden%2$s Sie jetzt die Vollversion! Siehe %3$s",
         "DownloadPleaseRemoveExisting": "Soll diese ersetzt werden, muss die existierende Datei gelöscht werden.",
         "Downloads": "Downloads",
         "EcommerceOrders": "Ecommerce Bestellungen",
         "EcommerceVisitStatusDesc": "Ecommerce Status am Ende des Besuchs",
-        "EcommerceVisitStatusEg": "Um z.B. alle Besuche auszuwählen, die eine Bestellung aufgegeben haben, würde die API-Anfrage Folgendes beinhalten: %s",
+        "EcommerceVisitStatusEg": "Um z.B. alle Besuche auszuwählen, die eine Bestellung aufgegeben haben, würde die API-Anfrage folgendes beinhalten: %s",
         "Edit": "Ändern",
         "EncryptedSmtpTransport": "Geben Sie hier die von Ihrem SMTP-Server benötigte Verschlüsselung ein.",
         "EnglishLanguageName": "German",
         "Error": "Fehler",
-        "ErrorRequest": "Oops… während der Anfrage ist ein Problem aufgetreten. Möglicherweise war der Server temporär überlastet, oder eventuell haben Sie einen Bericht mit zu vielen Daten angefordert. Bitte noch einmal versuchen. Wenn dieser Fehler wiederholt auftritt %skontaktieren Sie bitte Ihren Piwik Administrator%s um Unterstützung zu erhalten.",
+        "ErrorRequest": "Oops… während der Anfrage ist ein Problem aufgetreten. Möglicherweise war der Server temporär überlastet, oder eventuell haben Sie einen Bericht mit zu vielen Daten angefordert. Bitte noch einmal versuchen. Wenn dieser Fehler wiederholt auftritt %skontaktieren Sie bitte Ihren Piwik Administrator%s, um Unterstützung zu erhalten.",
         "EvolutionOverPeriod": "Entwicklung über den Zeitraum",
         "EvolutionSummaryGeneric": "%1$s in %2$s verglichen mit %3$s in %4$s. Entwicklung: %5$s",
         "ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "Der Benutzer muss entweder ein Hauptadministrator sein oder der Benutzer '%s'.",
         "ExceptionConfigurationFileNotFound": "Die Konfigurationsdatei {%s} wurde nicht gefunden.",
+        "ExceptionContactSupportGeneric": "Falls dieses Problem weiterhin besteht, %skontaktieren Sie bitte Ihren Piwik Administrator%s für Unterstützung.",
         "ExceptionDatabaseVersion": "Ihre %1$s-Version ist %2$s, aber Piwik benötigt mindestens %3$s",
+        "ExceptionDatabaseVersionNewerThanCodebase": "Ihre Piwik Codebase läuft auf der alten Version %1$s und wir haben erkannt, dass Ihre Piwik Datenbank bereits auf die neuere Version %2$s aktualisiert wurde.",
+        "ExceptionDatabaseVersionNewerThanCodebaseWait": "Möglicherweise sind die Piwik Administratoren gerade daran, den Aktualisierungsprozess abzuschliessen. Bitte versuchen Sie es in ein paar Minuten noch einmal.",
         "ExceptionFileIntegrity": "Integritätsprüfung fehlgeschlagen: %s",
         "ExceptionFilesizeMismatch": "Unterschiedliche Dateigröße: %1$s (erwartete Größe: %2$s, gefunden: %3$s)",
         "ExceptionIncompatibleClientServerVersions": "Ihre %1$s-Client Version ist %2$s, die aber mit der Server-Version %3$s inkompatibel ist.",
@@ -168,7 +168,7 @@
         "ExceptionPrivilege": "Sie können auf die Ressource nicht zugreifen, da Sie dafür mindestens %s Rechte benötigen.",
         "ExceptionPrivilegeAccessWebsite": "Sie können auf diese Ressource nicht zugreifen, da es mindestens %s-Rechte für die Webseiten-ID %d benötigt.",
         "ExceptionPrivilegeAtLeastOneWebsite": "Sie können auf diese Ressource nicht zugreifen, da eine %s Berechtigung für mindestens eine Webseite benötigt wird.",
-        "ExceptionReportNotEnabled": "Der gesuchte Bericht ist nicht aktiviert. Das bedeutet normalerweise entweder dass das Plugin welches den Bericht definiert deaktiviert ist oder Sie haben nicht die benötigten Berechtigungen um diesen Bericht einzusehen.",
+        "ExceptionReportNotEnabled": "Der gesuchte Bericht ist nicht aktiviert. Das bedeutet normalerweise entweder, dass das Plugin, welches den Bericht definiert, deaktiviert ist oder Sie haben nicht die benötigten Berechtigungen, um diesen Bericht einzusehen.",
         "ExceptionReportNotFound": "Der gesuchte Bericht existiert nicht.",
         "ExceptionUnableToStartSession": "Starten einer Session nicht möglich.",
         "ExceptionUndeletableFile": "Kann %s nicht löschen.",
@@ -185,8 +185,8 @@
         "ForExampleShort": "z.B.",
         "Forums": "Forum",
         "FromReferrer": "von",
+        "General": "Allgemein",
         "GeneralInformation": "Allgemeine Information",
-        "GeneralSettings": "Allgemeine Einstellungen",
         "GetStarted": "Jetzt beginnen",
         "GiveUsYourFeedback": "Feedback geben!",
         "Goal": "Ziel",
@@ -194,11 +194,11 @@
         "GraphHelp": "Mehr Informationen über die Darstellung von Graphen in Piwik.",
         "HelloUser": "Hallo, %s!",
         "Help": "Hilfe",
-        "HelpTranslatePiwik": "Möchten Sie uns %1$shelfen die Übersetzungen von Piwik zu verbessern%2$s?",
+        "HelpTranslatePiwik": "Möchten Sie uns %1$shelfen, die Übersetzungen von Piwik zu verbessern%2$s?",
         "Hide": "verbergen",
         "HoursMinutes": "%1$s Stunden %2$s Minuten",
         "Id": "Id",
-        "IfArchivingIsFastYouCanSetupCronRunMoreOften": "Wenn der Archivierungsprozess nicht zu viel Zeit in Anspruch nimmt, können Sie den Cronjob so konfigurieren, dass die Archivierung häufiger gemacht wird.",
+        "IfArchivingIsFastYouCanSetupCronRunMoreOften": "Wenn der Archivierungsprozess nicht zu viel Zeit in Anspruch nimmt, können Sie den Cronjob so konfigurieren, dass die Archivierung häufiger durchgeführt wird.",
         "InfoFor": "Informationen über %s",
         "Installed": "Installiert",
         "InvalidDateRange": "Ungültiger Zeitraum. Bitte versuchen Sie es erneut",
@@ -389,7 +389,7 @@
         "SmtpServerAddress": "SMTP-Server-Adresse",
         "SmtpUsername": "SMTP-Benutzername",
         "Source": "Quelle",
-        "StatisticsAreNotRecorded": "Das Besuchertracking von Piwik ist derzeit deaktiviert! Reaktivieren Sie das Tracking indem Sie in der Datei config\/config.ini.php record_statistics = 1 setzen.",
+        "StatisticsAreNotRecorded": "Das Besuchertracking von Piwik ist derzeit deaktiviert! Reaktivieren Sie das Tracking, indem Sie in der Datei config\/config.ini.php record_statistics = 1 setzen.",
         "Subtotal": "Zwischensumme",
         "Summary": "Zusammenfassung",
         "Table": "Tabelle",
@@ -426,6 +426,7 @@
         "VisitorID": "ID des Besuchers",
         "VisitorIP": "IP des Besuchers",
         "Visitors": "Besucher",
+        "VisitorSettings": "Besuchereinstellungen",
         "VisitsWith": "Besuche mit %s",
         "VisitType": "Art des Besuchers",
         "VisitTypeExample": "Um beispielsweise alle wiederkehrenden Besucher abzufragen, die Bestellungen getätigt haben, muss der API Aufruf folgendes enthalten: %s",
@@ -435,12 +436,13 @@
         "WarningFileIntegrityNoMd5file": "Durch die fehlende md5_file() Funktion konnte die Integritätsprüfung nicht durchgeführt werden.",
         "WarningPasswordStored": "%sWarnung:%s Dieses Passwort wird in der Konfigurationsdatei gespeichert und ist so für jeden sichtbar, der auf diese Datei Zugriff hat.",
         "WarningPhpVersionXIsTooOld": "Die von Ihnen eingesetzte PHP Version %s hat das Ende der Lebensdauer (EOL) erreicht. Es wird dringend angeraten, ein Update auf eine aktuelle Version durchzuführen, da der Einsatz dieser Version zu Sicherheitsrisiken und Fehlern führen kann, welche in neueren PHP Versionen korrigiert wurden.",
-        "WarningPiwikWillStopSupportingPHPVersion": "Piwik wird die Unterstützung für diese PHP Version im %s einstellen. Aktualisieren Sie ihre PHP Version bevor es zu spät ist!",
+        "WarningPiwikWillStopSupportingPHPVersion": "Piwik wird die Unterstützung für diese PHP Version im %s einstellen. Aktualisieren Sie ihre PHP Version, bevor es zu spät ist!",
         "Website": "Webseite",
         "Weekly": "Wöchentlich",
         "WeeklyReport": "wöchentlich",
         "WeeklyReports": "Wöchentliche Berichte",
         "WellDone": "Gut gemacht!",
+        "Widget": "Widget",
         "Widgets": "Widgets",
         "XComparedToY": "%1$s verglichen mit %2$s",
         "XFromY": "%1$s von %2$s",
@@ -464,8 +466,8 @@
         "AddPiwikDemo": "Piwik Demo hinzufügen",
         "Advanced": "Erweitert",
         "AnonymousAccess": "Anonymer Zugriff",
-        "AnonymousTracking": "Anonymes aufzeichnen",
-        "AskForAnonymousTrackingPermission": "Falls aktiviert sendet Piwik Mobile anonyme Nutzungsdaten an piwik.org. Die Sammlung dieser Daten hilft den Piwik Mobile Entwicklern besser zu verstehen wie diese Applikation genutzt wird. Folgende Informationen werden gesendet: Menüs und Einstellungen, Betriebssystemname und Version und angezeigte Fehler in Piwik Mobile. Es werden KEINE Analytischen Daten aufgezeichnet. Die Anonymen Daten werden niemals der Öffentlichkeit zugänglich gemacht. Anonyme Nutzungsdatenerfassung kann jederzeit in den Einstellungen wieder aktiviert bzw. deaktiviert werden.",
+        "AnonymousTracking": "Anonymes Aufzeichnen",
+        "AskForAnonymousTrackingPermission": "Falls aktiviert sendet Piwik Mobile anonyme Nutzungsdaten an piwik.org. Die Sammlung dieser Daten hilft den Piwik Mobile Entwicklern besser zu verstehen, wie diese Applikation genutzt wird. Folgende Informationen werden gesendet: Menüs und Einstellungen, Betriebssystemname und Version und angezeigte Fehler in Piwik Mobile. Es werden KEINE analytischen Daten aufgezeichnet. Die snonymen Daten werden niemals der Öffentlichkeit zugänglich gemacht. Anonyme Nutzungsdatenerfassung kann jederzeit in den Einstellungen wieder aktiviert bzw. deaktiviert werden.",
         "ChooseHttpTimeout": "Wählen Sie einen Wert für den HTTP Timeout",
         "ChooseMetric": "Wähle Metrik",
         "ChooseReport": "Wählen Sie einen Bericht",
@@ -476,25 +478,25 @@
         "EnableGraphsLabel": "Graphen anzeigen",
         "EvolutionGraph": "Historischer Graph",
         "HelpUsToImprovePiwikMobile": "Anonyme Nutzungsdaten in Piwik Mobile aktivieren?",
-        "HowtoDeleteAnAccount": "Drücken Sie lange um einen Account zu entfernen.",
-        "HowtoDeleteAnAccountOniOS": "Von rechts nach links wischen um einen Account zu löschen",
+        "HowtoDeleteAnAccount": "Drücken Sie lange, um einen Account zu entfernen.",
+        "HowtoDeleteAnAccountOniOS": "Von rechts nach links wischen, um einen Account zu löschen",
         "HowtoLoginAnonymous": "Benutzername und Passwort leer lassen für anonymes anmelden",
         "HttpIsNotSecureWarning": "Bei der Verwendung von HTTP wird ihr Piwik Authorisierungstoken (token_auth) im Klartext übertragen. Aus diesem Grund empfehlen wir HTTPS für eine sichere Übertragung von Daten über das Internet. Möchten Sie forfahren?",
         "HttpTimeout": "HTTP Timeout",
         "IgnoreSslError": "Ignoriere SSL Fehler",
-        "IncompatiblePiwikVersion": "The Piwik Version die Sie verwenden ist nicht mit Piwik Mobile 2 kompatibel. Aktualisieren Sie Ihre Piwik Installation oder verwenden Sie alternativ Piwik Mobile 1.",
+        "IncompatiblePiwikVersion": "The Piwik Version, die Sie verwenden, ist nicht mit Piwik Mobile 2 kompatibel. Aktualisieren Sie Ihre Piwik Installation oder verwenden Sie alternativ Piwik Mobile 1.",
         "LastUpdated": "Letzte Aktualisierung: %s",
         "LoadingReport": "Lade %s",
         "LoginCredentials": "Zugangsdaten",
-        "LoginToPiwikToChangeSettings": "Melden Sie sich in Piwik an um Webseiten und User zu erstellen und zu aktualisieren oder um allgemeine Einstellungen wie \"Bericht, der standardmäßig geladen wird\" zu ändern.",
+        "LoginToPiwikToChangeSettings": "Melden Sie sich in Piwik an, um Webseiten und User zu erstellen und zu aktualisieren oder um allgemeine Einstellungen wie \"Bericht, der standardmäßig geladen wird\" zu ändern.",
         "LoginUseHttps": "Benutze HTTPS",
         "MultiChartLabel": "Multisite Graphen anzeigen",
         "NavigationBack": "Zurück",
         "NetworkError": "Netzwerkfehler",
-        "NetworkErrorWithStatusCode": "Folgender Fehler trat auf \"%s\". Die Anfrage gab den Status \"%s\" zurück. URL war \"%s\". Bitte die eingegebene URL überprüfen und die Fehlerlog Dateien auf dem Server überprüfen um mehr Informationen zu diesem Fehler und wie er zu beheben ist zu erfahren.",
+        "NetworkErrorWithStatusCode": "Folgender Fehler trat auf \"%s\". Die Anfrage gab den Status \"%s\" zurück. URL war \"%s\". Bitte die eingegebene URL überprüfen und die Fehlerlog Dateien auf dem Server überprüfen, um mehr Informationen zu diesem Fehler und wie er zu beheben ist, zu erfahren.",
         "NetworkErrorWithStatusCodeShort": "Netzwerkfehler %s",
         "NetworkNotReachable": "Netzwerk ist nicht erreichbar",
-        "NoAccountIsSelected": "Kein Zugang ausgewählt. Fügen Sie einen neuen Account hinzu wenn Sie keinen konfiguriert haben.",
+        "NoAccountIsSelected": "Kein Zugang ausgewählt. Fügen Sie einen neuen Account hinzu, wenn Sie keinen konfiguriert haben.",
         "NoDataShort": "Keine Daten",
         "NoPiwikAccount": "Kein Piwik Account?",
         "NoReportsShort": "Keine Berichte",
@@ -503,17 +505,17 @@
         "NoWebsiteFound": "Webseite nicht gefunden",
         "NoWebsitesShort": "Keine Webseiten",
         "PossibleSslError": "Möglicher SSL Zertifikat Fehler",
-        "PossibleSslErrorExplanation": "Ein Fehler ist aufgetreten welcher durch ein invalides oder selbst signiertes SSL Zertifikat verursacht sein könnte: \"%s\". Die Anmeldung könnte funktionieren indem die Validierung des SSL Zertifikat ignoriert wird aber es ist weniger sicher. Die Einstellung kann jederzeit nachträglich geändert werden.",
+        "PossibleSslErrorExplanation": "Ein Fehler ist aufgetreten, welcher durch ein invalides oder selbst signiertes SSL Zertifikat verursacht sein könnte: \"%s\". Die Anmeldung könnte funktionieren, indem die Validierung des SSL Zertifikat ignoriert wird, aber es ist weniger sicher. Die Einstellung kann jederzeit nachträglich geändert werden.",
         "PullDownToRefresh": "Zum Aktualisieren herunterziehen...",
         "RatingDontRemindMe": "Bitte nicht daran erinnern",
         "RatingNotNow": "Nicht jetzt",
         "RatingNow": "OK, ich bewerte es jetzt",
-        "RatingPleaseRateUs": "Piwik Mobile App ist Freie Software, wir würden es sehr zu schätzen wissen, wenn Sie 1 Minute Ihrer wertvollen Zeit opfern würden um diese App im %s zu bewerten. Falls Sie Vorschläge für neue Features haben oder Fehler melden möchten, bitte kontaktieren Sie %s",
+        "RatingPleaseRateUs": "Piwik Mobile App ist Freie Software, wir würden es sehr zu schätzen wissen, wenn Sie 1 Minute Ihrer wertvollen Zeit opfern würden, um diese App im %s zu bewerten. Falls Sie Vorschläge für neue Features haben oder Fehler melden möchten, bitte kontaktieren Sie %s",
         "ReleaseToRefresh": "Zum Aktualisieren loslassen...",
         "Reloading": "Wird neu geladen...",
         "RequestTimedOutShort": "Netzwerk Zeitüberschreitung",
         "RestrictedCompatibility": "Eingeschränkte Kompatibilität",
-        "RestrictedCompatibilityExplanation": "Die Piwik Version %s die Sie verwenden wird nicht vollständig von Piwik Mobile 2 unterstützt. Es könnten Bugs auftreten. Wir empfehlen Piwik auf die neueste Version zu aktualisieren oder Piwik Mobile 1 zu verwenden.",
+        "RestrictedCompatibilityExplanation": "Die Piwik Version %s, die Sie verwenden, wird nicht vollständig von Piwik Mobile 2 unterstützt. Es könnten Bugs auftreten. Wir empfehlen Piwik auf die neueste Version zu aktualisieren oder Piwik Mobile 1 zu verwenden.",
         "SaveSuccessError": "Piwik URL oder Benutzername-\/Passwort-Kombination ist falsch.",
         "SearchWebsite": "Webseiten durchsuchen",
         "ShowAll": "Alle anzeigen",
@@ -529,10 +531,10 @@
     },
     "RowEvolution": {
         "AvailableMetrics": "Verfügbare Metriken",
-        "CompareDocumentation": "Klicken Sie auf den Link unten und öffnen Sie dieses Popup für eine andere Zeile aus der selben Tabelle um mehrere Einträge zu vergleichen.<br \/>Verwenden Sie Shift-Klick um die Zeile für den Vergleich zu markieren ohne dieses Popup zu öffnen.",
+        "CompareDocumentation": "Klicken Sie auf den Link unten und öffnen Sie dieses Popup für eine andere Zeile aus der selben Tabelle, um mehrere Einträge zu vergleichen.<br \/>Verwenden Sie Shift-Klick, um die Zeile für den Vergleich zu markieren, ohne dieses Popup zu öffnen.",
         "CompareRows": "Vergleiche Einträge",
         "ComparingRecords": "Vergleiche %s Zeilen",
-        "Documentation": "Klicken Sie auf die Metriken um sie im großen Entwicklungs-Graphen zu sehen. Verwenden Sie Shift-Klick um mehrere Metriken gleichzeitig zu sehen.",
+        "Documentation": "Klicken Sie auf die Metriken, um sie im großen Entwicklungs-Graphen zu sehen. Verwenden Sie Shift-Klick, um mehrere Metriken gleichzeitig zu sehen.",
         "MetricBetweenText": "zwischen %s und %s",
         "MetricChangeText": "%s über den Zeitraum",
         "MetricMinMax": "%1$s bewegte sich während dem Zeitraum zwischen %2$s und %3$s",
diff --git a/lang/dev.json b/lang/dev.json
new file mode 100644
index 0000000000..a7346e864a
--- /dev/null
+++ b/lang/dev.json
@@ -0,0 +1,6 @@
+{
+    "General": {
+        "OriginalLanguageName": "Development",
+        "EnglishLanguageName": "Development"
+    }
+}
diff --git a/lang/el.json b/lang/el.json
index e37bcaad98..f5a5cb0af6 100644
--- a/lang/el.json
+++ b/lang/el.json
@@ -1,7 +1,4 @@
 {
-    "DoNotTrack": {
-        "PluginDescription": "Αγνοήστε τις επισκέψεις με X-Do-Not-Track ή DNT κεφαλίδα."
-    },
     "General": {
         "AbandonedCarts": "Εγκαταλειμμένα Καλάθια Αγορών",
         "AboutPiwikX": "Σχετικά με το Piwik %s",
@@ -22,14 +19,14 @@
         "AveragePrice": "Μέση τιμή",
         "AverageQuantity": "Μέση Ποσότητα",
         "BackToPiwik": "Επιστροφή στο Piwik",
-        "Broken": "Κατεστραμένο",
+        "Broken": "Κατεστραμμένο",
         "BrokenDownReportDocumentation": "Έχει διασπαστεί σε πολλές αναφορές, που προβάλλονται σε μικροδιαγράμματα στο κάτω μέρος της σελίδας. Μπορείτε να μεγεθύνετε τα διαγράμματα πατώντας στην αναφορά που θέλετε να δείτε.",
         "Cancel": "Άκυρο",
         "CannotUnzipFile": "Αδύνατη η αποσυμπίεση αρχείου %1$s: %2$s",
         "ChangePassword": "Αλλαγή κωδικού",
         "ChangeTagCloudView": "Σημειώστε ότι μπορείτε να δείτε την αναφορά με άλλους τρόπους εκτός από σύννεφο ετικετών. Χρησιμοποιήστε τα κουμπί στο κάτω μέρος της αναφοράς για αυτό.",
         "ChooseDate": "Επιλογή ημερομηνίας",
-        "ChooseLanguage": "Επιλογή γλώσσα",
+        "ChooseLanguage": "Επιλογή γλώσσας",
         "ChoosePeriod": "Επιλογή περιόδου",
         "ChooseWebsite": "Επιλογή ιστοσελίδας",
         "Clear": "Καθαρισμός",
@@ -75,7 +72,7 @@
         "ColumnPageviewsDocumentation": "Οι επισκέψεις αυτής της σελίδας.",
         "ColumnPercentageVisits": "% Επισκέψεις",
         "ColumnRevenue": "Πρόσοδος",
-        "ColumnSumVisitLength": "Συνολικός δαπανηθής χρόνος επισκεπτών (σε δευτερόλεπτα)",
+        "ColumnSumVisitLength": "Συνολικός δαπανηθείς χρόνος επισκεπτών (σε δευτερόλεπτα)",
         "ColumnTotalPageviews": "Συνολικές Προβολές Σελίδων",
         "ColumnUniqueEntrances": "Μοναδικές είσοδοι",
         "ColumnUniqueExits": "Μοναδικές έξοδοι",
@@ -147,8 +144,11 @@
         "EvolutionOverPeriod": "Εξέλιξη εντός της περιόδου",
         "EvolutionSummaryGeneric": "%1$s στο %2$s σε σύγκριση με το %3$s στο %4$s. Εξέλιξη: %5$s",
         "ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "Ο χρήστης πρέπει να είναι είτε Υπερ-Χρήστης είτε ο ίδιος ο χρήστης '%s'.",
-        "ExceptionConfigurationFileNotFound": "Το αρχείο ρυθμίσεων (%s) δεν βρέθηκε.",
+        "ExceptionConfigurationFileNotFound": "Δεν βρέθηκε το αρχείο ρυθμίσεων {%s} ή δεν ήταν δυνατή η ανάγνωσή του.",
+        "ExceptionContactSupportGeneric": "Αν συνεχίζετε να αντιμετωπίζετε αυτό το πρόβλημα, %sεπικοινωνήστε με τον διαχειριστή του Piwik σας%s για βοήθεια.",
         "ExceptionDatabaseVersion": "Η έκδοσή %1$s είναι %2$s αλλά το Piwik απαιτεί τουλάχιστον %3$s.",
+        "ExceptionDatabaseVersionNewerThanCodebase": "Ο κώδικας του Piwik εκτελεί την παλιότερη έκδοση %1$s και εντοπίστηκε ότι η βάση δεδομένων του Piwik έχει ήδη αναβαθμιστεί στην νεότερη έκδοση %2$s.",
+        "ExceptionDatabaseVersionNewerThanCodebaseWait": "Είναι πιθανόν οι διαχειριστές του Piwik να τελειώνουν τη διαδικασία αναβάθμισης. Παρακαλούμε δοκιμάστε πάλι αργότερα σε λίγα λεπτά.",
         "ExceptionFileIntegrity": "Ο έλεγχος ακεραιότητας απέτυχε: %s",
         "ExceptionFilesizeMismatch": "Αταίριαστο μέγεθος αρχείου: %1$s (αναμενόμενο: %2$s, βρέθηκε: %3$s)",
         "ExceptionIncompatibleClientServerVersions": "Η έκδοση πελάτη σας %1$s είναι %2$s η οποία είναι ασύμβατη με την έκδοση διακομιστή %3$s.",
@@ -172,7 +172,7 @@
         "ExceptionReportNotFound": "Δεν υπάρχει η ζητούμενη αναφορά.",
         "ExceptionUnableToStartSession": "Αδύνατη η έναρξη της συνεδρίας.",
         "ExceptionUndeletableFile": "Αδύνατη η διαγραφή του %s",
-        "ExceptionUnreadableFileDisabledMethod": "Το αρχείο ρυθμίσεων (%s) δεν μπορεί να αναγνωστεί. Ο διακομιστής σας μπορεί να απενεργοποίησε το %s.",
+        "ExceptionUnreadableFileDisabledMethod": "Δεν είναι δυνατή η ανάγνωση του αρχείου ρυθμίσεων {%s} δεν μπορεί να αναγνωστεί. Ο διακομιστής σας μπορεί να απενεργοποίησε το %s.",
         "ExceptionWidgetNotFound": "Το ζητούμενο γραφικό συστατικό δεν υπάρχει.",
         "ExpandDataTableFooter": "Αλλάξτε την οπτική εμφάνιση ή διευθετήστε την αναφορά",
         "Export": "Εξαγωγή",
@@ -185,8 +185,8 @@
         "ForExampleShort": "π.χ.",
         "Forums": "Φόρουμ",
         "FromReferrer": "από",
+        "General": "Γενικά",
         "GeneralInformation": "Γενικές Πληροφορίες",
-        "GeneralSettings": "Γενικές Ρυθμίσεις",
         "GetStarted": "Ξεκινήστε",
         "GiveUsYourFeedback": "Έχετε παρατηρήσεις;",
         "Goal": "Στόχος",
@@ -207,7 +207,7 @@
         "JsTrackingTag": "Κώδικας Παρακολούθησης JavaScript",
         "Language": "Γλώσσα",
         "LastDays": "Τελευταίες %s ημέρες (με τη σημερινή)",
-        "LastDaysShort": "Τελευτείες %s ημέρες",
+        "LastDaysShort": "Τελευταίες %s ημέρες",
         "LayoutDirection": "ltr",
         "LearnMore": "%1$sμάθετε περισσότερα%2$s",
         "Live": "Σε πραγματικό χρόνο",
@@ -426,6 +426,7 @@
         "VisitorID": "Κωδικός Επισκέπτη",
         "VisitorIP": "IP Επισκέπτη",
         "Visitors": "Επισκέπτες",
+        "VisitorSettings": "Ρυθμίσεις επισκέπτη",
         "VisitsWith": "Επισκέψεις με %s",
         "VisitType": "Τύπος Επισκέπτη",
         "VisitTypeExample": "Για παράδειγμα, για να επιλέξετε όλους τους επισκέπτες που έχουν επιστρέψει στην ιστοσελίδα και να περιλάβετε αυτούς που έχουν αγοράσει κάτι στις προηγούμενες επισκέψεις, το αίτημα API θα περιέχει %s",
@@ -441,6 +442,7 @@
         "WeeklyReport": "εβδομαδιαία",
         "WeeklyReports": "Εβδομαδιαίες αναφορές",
         "WellDone": "Συγχαρητήρια!",
+        "Widget": "Γραφικό Συστατικό",
         "Widgets": "Μικροεφαρμογές",
         "XComparedToY": "Το %1$s σε σύγκριση με το %2$s",
         "XFromY": "%1$s από %2$s",
@@ -465,7 +467,7 @@
         "Advanced": "Για προχωρημένους",
         "AnonymousAccess": "Ανώνυμη πρόσβαση",
         "AnonymousTracking": "Ανώνυμη καταγραφή",
-        "AskForAnonymousTrackingPermission": "Όταν ενεργοποιηθεί, το Κινητό Piwik θα στέλνει δεδομένα ανώνυμης χρήσης στο piwik.org. Η πρόθεση είναι να χρησιμοποιηθούν αυτά τα δεδομένα ώστε να βοηθήσει τους δημιουργους του Κινητού Piwik ώστε να κατανοήσουν καλυτερα τη χρήση του. Οι πληροφορίες που στέλνονται είναι: μενού και ρυθμίσεις, όνομα λειτουργικού και έκδοση, εμφανιζόμενα σφάλματα. ΔΕΝ θα καταγράψουμε κανένα από τα δεδομένα στατιστικών σας. Αυτά τα ανώνυμα δεδομένα δεν θα δημοσιευτούν ποτέ. Μπορείτε να ενεργοποιήσετε\/απενεργοποιήσετε την ανώνυμη καταγραφή στις Ρυθμίσεις οποτεδήποτε.",
+        "AskForAnonymousTrackingPermission": "Όταν ενεργοποιηθεί, το Κινητό Piwik θα στέλνει δεδομένα ανώνυμης χρήσης στο piwik.org. Η πρόθεση είναι να χρησιμοποιηθούν αυτά τα δεδομένα ώστε να βοηθήσει τους δημιουργούς του Κινητού Piwik ώστε να κατανοήσουν καλύτερα την χρήση του. Οι πληροφορίες που στέλνονται είναι: μενού και ρυθμίσεις, όνομα λειτουργικού και έκδοση, εμφανιζόμενα σφάλματα. ΔΕΝ θα καταγράψουμε κανένα από τα δεδομένα στατιστικών σας. Αυτά τα ανώνυμα δεδομένα δεν θα δημοσιευτούν ποτέ. Μπορείτε να ενεργοποιήσετε\/απενεργοποιήσετε την ανώνυμη καταγραφή στις Ρυθμίσεις οποτεδήποτε.",
         "ChooseHttpTimeout": "Επιλέξτε τιμή χρόνου λήξης HTTP",
         "ChooseMetric": "Επιλογή Μέτρησης",
         "ChooseReport": "Επιλέξτε μια αναφορά",
@@ -500,7 +502,7 @@
         "NoReportsShort": "Δεν υπάρχουν αναφορές",
         "NoVisitorFound": "Δεν βρέθηκε επισκέπτης",
         "NoVisitorsShort": "Δεν υπάρχουν επισκέπτες",
-        "NoWebsiteFound": "Δεν βρέθηκε ιστσσελίδα",
+        "NoWebsiteFound": "Δεν βρέθηκε ιστοσελίδα",
         "NoWebsitesShort": "Δεν υπάρχουν ιστότοποι",
         "PossibleSslError": "Πιθανό σφάλμα πιστοποιητικού SSL",
         "PossibleSslErrorExplanation": "Υπήρξε σφάλμα που μπορεί να προήλθε από μη έγκυρο ή υπογεγραμμένο από την ίδια οντότητα πιστοποιητικό: \"%s\". Η είσοδος μπορεί να δουλέψει για εσάς αν αγνοήστε την επαλήθευση SSL, αλλά είναι λιγότερο ασφαλής. Μπορείτε να αλλάξετε ανά πάσα στιγμή την επιλογή για την επαλήθευση SSL στις ρυθμίσεις.",
@@ -508,7 +510,7 @@
         "RatingDontRemindMe": "Χωρίς υπενθύμιση",
         "RatingNotNow": "Όχι τώρα",
         "RatingNow": "Εντάξει, θα το βαθμολογήσω τώρα",
-        "RatingPleaseRateUs": "Η εφαρμογή του Piwik για κινητά είναι Δωρεάν Λογισμικό. Θα το εκτιμούσαμε αν ρίχνατε 1 λεπτό για να αξιολογήσετε την εφαρμογή στο %s. Αν έχετε προτάσεις για νέα χαρακτηρστικά ή αναφορές για σφάλματα, επικοινωνήστε στο %s",
+        "RatingPleaseRateUs": "Η εφαρμογή του Piwik για κινητά είναι Ελεύθερο Λογισμικό. Θα το εκτιμούσαμε αν είχατε 1 λεπτό για να αξιολογήσετε την εφαρμογή στο %s. Αν έχετε προτάσεις για νέα χαρακτηριστικά ή αναφορές για σφάλματα, επικοινωνήστε στο %s",
         "ReleaseToRefresh": "Απελευθερώστε το για ανανέωση...",
         "Reloading": "Επαναφόρτωση...",
         "RequestTimedOutShort": "Σφάλμα Λήξης Χρόνου Δικτύου",
@@ -521,11 +523,11 @@
         "StaticGraph": "Διάγραμμα Επισκόπησης",
         "TopVisitedWebsites": "κορυφαίοι σε επισκεψιμότητα ιστοτόποι",
         "TryIt": "Δοκιμάστε το!",
-        "UseSearchBarHint": "Μόνο οι πρώτες %s ιστοσελίδες εμφανίζονται εδώ. Χρησιμοποιήστε τη γραμμή αναζήτησης για να έχετε πρόσβαση στις άλλες ιστσεολίδες σας.",
+        "UseSearchBarHint": "Μόνο οι πρώτες %s ιστοσελίδες εμφανίζονται εδώ. Χρησιμοποιήστε την γραμμή αναζήτησης για να έχετε πρόσβαση στις άλλες ιστοσελίδες σας.",
         "ValidateSslCertificate": "Επαλήθευση του πιστοποιητικού SSL",
         "VerifyAccount": "Πιστοποίηση λογαριασμού",
-        "VerifyLoginData": "Σιγουρευτείται ότι συνδυασμός ονόματος χρήστη και κωδικού είναι σωστά.",
-        "YouAreOffline": "Συγνώμη, είστε εκτός σύνδεσης"
+        "VerifyLoginData": "Βεβαιωθείτε ότι ο συνδυασμός ονόματος χρήστη και συνθηματικού είναι σωστός.",
+        "YouAreOffline": "Συγγνώμη, είστε εκτός σύνδεσης αυτή την στιγμή"
     },
     "RowEvolution": {
         "AvailableMetrics": "Διαθέσιμες μετρήσεις",
diff --git a/lang/en.json b/lang/en.json
index de10952b1b..c4e01d25a7 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -1,7 +1,4 @@
 {
-    "DoNotTrack": {
-        "PluginDescription": "Ignore visits with X-Do-Not-Track or DNT header."
-    },
     "General": {
         "AbandonedCarts": "Abandoned Carts",
         "AboutPiwikX": "About Piwik %s",
@@ -124,7 +121,7 @@
         "Discount": "Discount",
         "DisplaySimpleTable": "Display simple table",
         "DisplayTableWithGoalMetrics": "Display a table with Goals metrics",
-        "DisplayTableWithMoreMetrics": "Display a table with more metrics",
+        "DisplayTableWithMoreMetrics": "Display a table with Visitor engagement metrics",
         "Documentation": "Documentation",
         "Donate": "Donate",
         "Done": "Done",
@@ -145,9 +142,12 @@
         "ErrorRequest": "Oops\u2026 there was a problem during the request. Maybe the server had a temporary issue, or maybe you requested a report with too much data. Please try again. If this error occurs repeatedly please %scontact your Piwik administrator%s for assistance.",
         "EvolutionOverPeriod": "Evolution over the period",
         "EvolutionSummaryGeneric": "%1$s in %2$s compared to %3$s in %4$s. Evolution: %5$s",
+        "ExceptionContactSupportGeneric": "If you still have this issue please %scontact your Piwik administrator%s for assistance. ",
         "ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "The user has to be either a Super User or the user '%s' itself.",
         "ExceptionConfigurationFileNotFound": "The configuration file {%s} has not been found or could not be read.",
         "ExceptionDatabaseVersion": "Your %1$s version is %2$s but Piwik requires at least %3$s.",
+        "ExceptionDatabaseVersionNewerThanCodebase": "Your Piwik codebase is running the old version %1$s and we have detected that your Piwik Database has already been upgraded to the newer version %2$s.",
+        "ExceptionDatabaseVersionNewerThanCodebaseWait": "Maybe your Piwik administrators are currently finishing the upgrade process. Please try again in a few minutes.",
         "ExceptionFileIntegrity": "Integrity check failed: %s",
         "ExceptionFilesizeMismatch": "File size mismatch: %1$s (expected length: %2$s, found: %3$s)",
         "ExceptionIncompatibleClientServerVersions": "Your %1$s client version is %2$s which is incompatible with server version %3$s.",
@@ -185,7 +185,7 @@
         "Forums": "Forums",
         "FromReferrer": "from",
         "GeneralInformation": "General Information",
-        "GeneralSettings": "General Settings",
+        "General": "General",
         "GetStarted": "Get started",
         "GiveUsYourFeedback": "Give us Feedback!",
         "Goal": "Goal",
@@ -427,6 +427,7 @@
         "VisitorIP": "Visitor IP",
         "Visitors": "Visitors",
         "VisitsWith": "Visits with %s",
+        "VisitorSettings": "Visitor Settings",
         "VisitType": "Visitor type",
         "VisitTypeExample": "For example, to select all visitors who have returned to the website, including those who have bought something in their previous visits, the API request would contain %s",
         "Warning": "Warning",
@@ -442,6 +443,7 @@
         "WeeklyReports": "Weekly reports",
         "WellDone": "Well done!",
         "Widgets": "Widgets",
+	"Widget": "Widget",
         "XComparedToY": "%1$s compared to %2$s",
         "XFromY": "%1$s from %2$s",
         "YearlyReport": "yearly",
@@ -541,4 +543,4 @@
         "PickAnotherRow": "Pick another row to compare",
         "PickARow": "Pick a row to compare"
     }
-}
\ No newline at end of file
+}
diff --git a/lang/es.json b/lang/es.json
index 20adcc359c..2b5eb113df 100644
--- a/lang/es.json
+++ b/lang/es.json
@@ -1,7 +1,4 @@
 {
-    "DoNotTrack": {
-        "PluginDescription": "Ignorar visitas con el Header X-Do-Not-Track o DNT."
-    },
     "General": {
         "AbandonedCarts": "Carros Abandonados",
         "AboutPiwikX": "Acerca de Piwik %s",
@@ -181,7 +178,6 @@
         "Forums": "Foros",
         "FromReferrer": "desde",
         "GeneralInformation": "Información General",
-        "GeneralSettings": "Configuración General",
         "GetStarted": "Comenzar",
         "GiveUsYourFeedback": "¡Envíanos tus comentarios!",
         "Goal": "Objetivo",
@@ -418,6 +414,7 @@
         "VisitorID": "ID del visitante",
         "VisitorIP": "IP del visitante",
         "Visitors": "Visitantes",
+        "VisitorSettings": "Configuración de visitantes",
         "VisitsWith": "Visitas con %s",
         "VisitType": "Tipo de visitante",
         "VisitTypeExample": "Por ejemplo, para seleccionar todos los visitantes que han vuelto al sitio web, incluyendo a aquellos que han comprado algo en sus anteriores visitas, la solicitud de la API debe contener %s",
diff --git a/lang/et.json b/lang/et.json
index 7c124bb435..183ff88c04 100644
--- a/lang/et.json
+++ b/lang/et.json
@@ -1,7 +1,4 @@
 {
-    "DoNotTrack": {
-        "PluginDescription": "Ignoreeri külastusi, millel on brauseris seatud X-Do-Not-Track või DNT parameeter."
-    },
     "General": {
         "AbandonedCarts": "Hüljatud ostukorvid",
         "AboutPiwikX": "Lisainfo Piwik %s",
@@ -125,7 +122,6 @@
         "Forums": "Foorumid",
         "FromReferrer": "tuli",
         "GeneralInformation": "Üldine info",
-        "GeneralSettings": "Üldised seaded",
         "GetStarted": "Alusta kasutamist",
         "GiveUsYourFeedback": "Tagasiside!",
         "Goal": "Eesmärk",
@@ -346,6 +342,7 @@
         "VisitorID": "Külastaja ID",
         "VisitorIP": "Külastaja IP",
         "Visitors": "Külastajad",
+        "VisitorSettings": "Külastajate seaded",
         "VisitsWith": "Külastused koos %s",
         "VisitType": "Külalise tüüp",
         "Warning": "Hoiatus",
diff --git a/lang/eu.json b/lang/eu.json
index 34fca7e151..79703933f0 100644
--- a/lang/eu.json
+++ b/lang/eu.json
@@ -77,7 +77,6 @@
         "ExportAsImage": "Esportatu irudi gisa",
         "ExportThisReport": "Esportatu datu multzoa beste formatutan",
         "ForExampleShort": "adib.",
-        "GeneralSettings": "Ezarpen orokorrak",
         "GiveUsYourFeedback": "Emaiguzu zure iritzia!",
         "GoTo": "Joan %s(e)ra",
         "GraphHelp": "Piwik-en grafikoak bistaratzeko informazio gehiago.",
@@ -185,6 +184,7 @@
         "View": "Ikusi",
         "VisitDuration": "B.b.ko bisiten iraupena (segundotan)",
         "Visitors": "Bisitariak",
+        "VisitorSettings": "Bisitariaren ezarpenak",
         "Warning": "Abisua",
         "Website": "Webgunea",
         "Weekly": "Astero",
diff --git a/lang/fa.json b/lang/fa.json
index 5d3c13a95d..6d17f98a92 100644
--- a/lang/fa.json
+++ b/lang/fa.json
@@ -1,7 +1,4 @@
 {
-    "DoNotTrack": {
-        "PluginDescription": "اشتباه است با X-Do-Not-Track با DNT در هدر."
-    },
     "General": {
         "AbandonedCarts": "رها چرخ دستی",
         "AboutPiwikX": "درباره ی Piwik %s",
@@ -168,7 +165,6 @@
         "Forums": "فرم ها",
         "FromReferrer": "از",
         "GeneralInformation": "اطلاعات اصلی",
-        "GeneralSettings": "تنضیمات اصلی",
         "GetStarted": "شروع کنید",
         "GiveUsYourFeedback": "ارسال بازخورد به ما",
         "Goal": "هدف",
@@ -398,6 +394,7 @@
         "VisitorID": "آی دی بازدید کننده",
         "VisitorIP": "آی پی بازدید کننده",
         "Visitors": "بازدید کننده ها",
+        "VisitorSettings": "تنظیمات بازدید کننده",
         "VisitsWith": "بازدید ها با %s",
         "VisitType": "نوع بازدید کننده",
         "VisitTypeExample": "به عنوان مثال، برای انتخاب تمام بازدید کنندگان که به وب سایت،از جمله کسانی که چیزی در بازدیدکننده داشته است گذشته خود را خریداری بازگردانده، درخواست API حاوی %s",
diff --git a/lang/fi.json b/lang/fi.json
index a1418bb5d9..ad45a83d53 100644
--- a/lang/fi.json
+++ b/lang/fi.json
@@ -1,7 +1,4 @@
 {
-    "DoNotTrack": {
-        "PluginDescription": "Jätä huomiotta käynnit ylätunnisteilla X-Do-Not-Track tai DNT."
-    },
     "General": {
         "AbandonedCarts": "Hylätyt ostoskorit",
         "AboutPiwikX": "Tietoja Piwikistä %s",
@@ -183,7 +180,6 @@
         "Forums": "Foorumit",
         "FromReferrer": "mistä",
         "GeneralInformation": "Yleistä tietoa",
-        "GeneralSettings": "Yleiset asetukset",
         "GetStarted": "Aloita",
         "GiveUsYourFeedback": "Anna palautetta!",
         "Goal": "Tavoite",
@@ -420,6 +416,7 @@
         "VisitorID": "Kävijän ID",
         "VisitorIP": "Kävijän IP",
         "Visitors": "Kävijät",
+        "VisitorSettings": "Kävijöiden asetukset",
         "VisitsWith": "Käynnit %s:n kanssa",
         "VisitType": "Kävijän tyyppi",
         "VisitTypeExample": "Voit esimerkiksi valita kaikki kävijät jotka palasivat sivulle ja ostivat edellisellä käynnillä. Esimerkki pyynnöstä on %s",
diff --git a/lang/fr.json b/lang/fr.json
index 982d7d02b1..2fac86173e 100644
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -1,7 +1,4 @@
 {
-    "DoNotTrack": {
-        "PluginDescription": "Ignorer les visites avec l'entête X-Do-Not-Track ou DNT."
-    },
     "General": {
         "AbandonedCarts": "Paniers abandonnés",
         "AboutPiwikX": "À propos de Piwik %s",
@@ -143,7 +140,7 @@
         "EncryptedSmtpTransport": "Entrez la couche de chiffrement requise par votre serveur SMTP.",
         "EnglishLanguageName": "French",
         "Error": "Erreur",
-        "ErrorRequest": "Oups... Il y a eu un problème pendant le traitement de la requête. Peut être que le serveur a eu un soucis temporaire, ou peut être que vous avez demandé un rapport avec trop de données. Veuillez réssayer. Si cette erreur se répète veuillez %scontacter voter administrateur Piwik%s pour obtenir de l'aide.",
+        "ErrorRequest": "Oups... Il y a eu un problème pendant le traitement de la requête. Peut être que le serveur a eu un soucis temporaire, ou peut être que vous avez demandé un rapport avec trop de données. Veuillez réssayer. Si cette erreur se répète veuillez %scontacter votre administrateur Piwik%s pour obtenir de l'aide.",
         "EvolutionOverPeriod": "Évolution sur la période",
         "EvolutionSummaryGeneric": "%1$s en %2$s comparé à %3$s en %4$s. Evolution: %5$s",
         "ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "L'utilisateur doit être un Super Utilisateur ou l'utilisateur \"%s\" lui-même.",
@@ -185,8 +182,8 @@
         "ForExampleShort": "ex.",
         "Forums": "Forums",
         "FromReferrer": "de",
+        "General": "Général",
         "GeneralInformation": "Informations Générales",
-        "GeneralSettings": "Paramètres généraux",
         "GetStarted": "Pour bien commencer",
         "GiveUsYourFeedback": "Envoyez-nous vos commentaires !",
         "Goal": "Objectif",
@@ -426,6 +423,7 @@
         "VisitorID": "ID du visiteur",
         "VisitorIP": "IP du visiteur",
         "Visitors": "Visiteurs",
+        "VisitorSettings": "Paramètres visiteur",
         "VisitsWith": "Visites avec %s",
         "VisitType": "Type du visiteur",
         "VisitTypeExample": "Par exemple, pour sélectionner tous les visiteurs qui sont retournés sur le site web, en incluant ceux qui ont acheté quelque chose lors de leur dernière visite, la requête à l'API contiendrait %s",
diff --git a/lang/gl.json b/lang/gl.json
index 2e9baa3d37..4fb3aadab1 100644
--- a/lang/gl.json
+++ b/lang/gl.json
@@ -62,7 +62,6 @@
         "ExportAsImage": "Exportar como Imaxe",
         "ExportThisReport": "Exportar datos noutros formatos",
         "ForExampleShort": "ex.",
-        "GeneralSettings": "Configuración Xeral",
         "GiveUsYourFeedback": "Contacte con Nos",
         "GoTo": "Ir a %s",
         "HelloUser": "Ola, %s!",
diff --git a/lang/he.json b/lang/he.json
index d9ef60cb13..d4c1584e4f 100644
--- a/lang/he.json
+++ b/lang/he.json
@@ -105,7 +105,6 @@
         "FileIntegrityWarningExplanation": "בדיקת תקינות קבצים נכשלה ודיווחה על מספר שגיאות. ייתכן וזה נגרם עקב העלאה חלקית או כושלת של קבצי המערכת. יש להעלות את הקבצים מחדש במצב BINARY ולרענן את העמוד עד שלא יוצגו שגיאות.",
         "First": "ראשון",
         "ForExampleShort": "לדוגמה",
-        "GeneralSettings": "הגדרות כלליות",
         "GiveUsYourFeedback": "העברת משוב למפתחים!",
         "Goal": "יעד",
         "GoTo": "עבור ל%s",
diff --git a/lang/hi.json b/lang/hi.json
index 34b7fbc4f6..6abf8cbe5f 100644
--- a/lang/hi.json
+++ b/lang/hi.json
@@ -1,7 +1,4 @@
 {
-    "DoNotTrack": {
-        "PluginDescription": "\"Do Not Track or DNT\" शीर्षक के साथ यात्राओं पर ध्यान न दें."
-    },
     "General": {
         "AbandonedCarts": "परित्यक्त गाड़ियां",
         "AboutPiwikX": "%s Piwik के बारे में",
@@ -176,7 +173,6 @@
         "Forums": "फ़ड़",
         "FromReferrer": "से",
         "GeneralInformation": "सामान्य सूचना",
-        "GeneralSettings": "सामान्य व्यवस्था",
         "GetStarted": "शुरू हो जाओ",
         "GiveUsYourFeedback": "हमें प्रतिक्रिया दे!",
         "Goal": "लक्ष्य",
@@ -402,6 +398,7 @@
         "VisitorID": "आगंतुक आईडी",
         "VisitorIP": "आगंतुक आईपी",
         "Visitors": "आगंतुकों",
+        "VisitorSettings": "आगंतुक सेटिंग्स",
         "VisitsWith": "%s साथ दौरा",
         "VisitType": "आगंतुक के प्रकार",
         "VisitTypeExample": "उदाहरण के लिए, अपने पिछले दौरों में कुछ खरीदा है जो उन सहित, वेबसाइट पर लौट आए हैं, जो सभी आगंतुकों का चयन करने के लिए, एपीआई अनुरोध %s शामिल होगा",
diff --git a/lang/hr.json b/lang/hr.json
index 9015a02efc..ea57e4e315 100644
--- a/lang/hr.json
+++ b/lang/hr.json
@@ -125,7 +125,6 @@
         "First": "Početak",
         "ForExampleShort": "npr.",
         "FromReferrer": "od",
-        "GeneralSettings": "Opće postavke",
         "GiveUsYourFeedback": "Pošaljite nam povratne informacije!",
         "Goal": "Cilj",
         "GoTo": "Idi na %s",
@@ -275,6 +274,7 @@
         "VisitorID": "Oznaka posjetitelja",
         "VisitorIP": "IP adresa posjetitelja",
         "Visitors": "Posjetitelji",
+        "VisitorSettings": "Postavke posjetitelja",
         "VisitsWith": "Posjete sa %s",
         "VisitType": "Vrsta posjetitelja",
         "VisitTypeExample": "Na primjer, za biranje svih posjetitelja koji su se vratili na stranicu, uključujući i one koji su pri prošloj posjeti nešto i kupili, API zahtjev treba sadržavati %s",
diff --git a/lang/hu.json b/lang/hu.json
index f27130ab47..4fba3cc1ef 100644
--- a/lang/hu.json
+++ b/lang/hu.json
@@ -137,7 +137,6 @@
         "First": "Első",
         "ForExampleShort": "pl.",
         "FromReferrer": "tól",
-        "GeneralSettings": "Általános beállítások",
         "GiveUsYourFeedback": "Visszajelzés küldése",
         "Goal": "Cél",
         "GoTo": "Tovább ide: %s",
@@ -293,6 +292,7 @@
         "VisitorID": "Látogatóazonosító",
         "VisitorIP": "Látogató IP-címe",
         "Visitors": "Látogatók",
+        "VisitorSettings": "Látogatók adatai",
         "VisitsWith": "Látogatások ezzel: %s",
         "VisitType": "Látogató típusa",
         "VisitTypeExample": "Például azoknak a látogatóknak a kiválasztására, akik visszatértek a weboldalra, köztük azok, akik vásároltak valamit a korábbi látogatásaik során, az API lekérés ezt tartalmazná: %s",
diff --git a/lang/id.json b/lang/id.json
index 0a009ef35a..410fb5b412 100644
--- a/lang/id.json
+++ b/lang/id.json
@@ -1,7 +1,4 @@
 {
-    "DoNotTrack": {
-        "PluginDescription": "Abaikan kunjungan dengan kepala Jangan-Lacak \"X-Do-Not-Track\" atau \"DNT\"."
-    },
     "General": {
         "AbandonedCarts": "Keranjang Terabaikan",
         "AboutPiwikX": "Tentang Piwik %s",
@@ -173,7 +170,6 @@
         "ForExampleShort": "misalnya",
         "FromReferrer": "dari",
         "GeneralInformation": "Informasi Umum",
-        "GeneralSettings": "Pengaturan Umum",
         "GetStarted": "Memulai",
         "GiveUsYourFeedback": "Beri UmpanBalik!",
         "Goal": "Tujuan",
@@ -395,6 +391,7 @@
         "VisitorID": "ID pengunjung",
         "VisitorIP": "IP pengujung",
         "Visitors": "Pengunjung",
+        "VisitorSettings": "Pengaturan Pengunjung",
         "VisitsWith": "Kunjungan dengan %s",
         "VisitType": "Jenis pengunjung",
         "VisitTypeExample": "Sebagai contoh, untuk memilih semua pengunjung yang telah kembali ke situs, termasuk yang telah membeli sesuatu saat kunjungan sebelumnya, permintaan API akan mengandung %s",
diff --git a/lang/is.json b/lang/is.json
index a0dba60635..adbb5478ec 100644
--- a/lang/is.json
+++ b/lang/is.json
@@ -75,7 +75,6 @@
         "ExportAsImage": "Flytja út sem mynd",
         "ExportThisReport": "Flytja þetta gagnasett út á öðrum sniðum",
         "ForExampleShort": "t.d.",
-        "GeneralSettings": "Almennar stillingar",
         "GiveUsYourFeedback": "Sendu okkur athugasemdir!",
         "GoTo": "Fara í %s",
         "GraphHelp": "Nánari upplýsingar um birtingu grafa í Piwik.",
@@ -192,6 +191,7 @@
         "View": "Sýn",
         "VisitDuration": "Meðallengd heimsókna(í sekúndum)",
         "Visitors": "Gestir",
+        "VisitorSettings": "Stillingar gesta",
         "Warning": "Aðvörun",
         "WarningPasswordStored": "%sVarist:%s Þetta lykilorð mun vera vistað í stillingar skrá sem er sýnileg öllum sem hafa næga aðgangsheimild.",
         "Website": "Vefur",
diff --git a/lang/it.json b/lang/it.json
index 695694fb10..a4ec98cfa7 100644
--- a/lang/it.json
+++ b/lang/it.json
@@ -1,7 +1,4 @@
 {
-    "DoNotTrack": {
-        "PluginDescription": "Ignora le visite con l'header X-Do-Not-Track o DNT."
-    },
     "General": {
         "AbandonedCarts": "Ordini abbandonati",
         "AboutPiwikX": "Informazioni su Piwik %s",
@@ -148,7 +145,10 @@
         "EvolutionSummaryGeneric": "%1$s in %2$s confrontato con %3$s in %4$s. Evoluzione: %5$s",
         "ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "L'utente deve essere un Super User o l'utente '%s' stesso.",
         "ExceptionConfigurationFileNotFound": "Il file di configurazione {%s} non è stato trovato.",
+        "ExceptionContactSupportGeneric": "Se hai ancora questo problema %scontatta il tuo amministratore di Piwik%s per assistenza.",
         "ExceptionDatabaseVersion": "La tua %1$s versione è %2$s ma Piwik ha bisogno di almeno %3$s.",
+        "ExceptionDatabaseVersionNewerThanCodebase": "Il tuo codice di Piwik è quello della vecchia versione %1$s mentre abbiamo rilevato che il database di Piwik è già stato aggiornato alla nuova versione %2$s.",
+        "ExceptionDatabaseVersionNewerThanCodebaseWait": "Può darsi che i tuoi amministratori di Piwik al momento stiano terminando il processo di aggiornamento. Prova ancora tra qualche minuto.",
         "ExceptionFileIntegrity": "Test di integrità fallito: %s",
         "ExceptionFilesizeMismatch": "Discordanza di dimensione file: %1$s (dimensione attesa: %2$s, trovata: %3$s)",
         "ExceptionIncompatibleClientServerVersions": "La tua %1$s versione del client è %2$s la quale non è compatibile con la versione del server %3$s.",
@@ -185,8 +185,8 @@
         "ForExampleShort": "es.",
         "Forums": "Forums",
         "FromReferrer": "da",
+        "General": "Generale",
         "GeneralInformation": "Informazioni generali",
-        "GeneralSettings": "Impostazioni Generali",
         "GetStarted": "Inizia",
         "GiveUsYourFeedback": "Suggerimenti?",
         "Goal": "Goal",
@@ -426,6 +426,7 @@
         "VisitorID": "ID visitatore",
         "VisitorIP": "IP visitatore",
         "Visitors": "Visitatori",
+        "VisitorSettings": "Impostazioni visitatori",
         "VisitsWith": "Visite con %s",
         "VisitType": "Tipo di visitatore",
         "VisitTypeExample": "Ad esempio, per selezionare tutti i visitatori che sono ritornati al sito Web, compresi quelli che hanno comprato qualcosa nella loro precedenti visite, la richiesta di API conterrebbe %s",
@@ -441,6 +442,7 @@
         "WeeklyReport": "settimanale",
         "WeeklyReports": "Reports settimanali",
         "WellDone": "Ben fatto!",
+        "Widget": "Widget",
         "Widgets": "Widgets",
         "XComparedToY": "%1$s confrontato con %2$s",
         "XFromY": "%1$s da %2$s",
diff --git a/lang/ja.json b/lang/ja.json
index 41232b3de6..9bc21b65d3 100644
--- a/lang/ja.json
+++ b/lang/ja.json
@@ -1,7 +1,4 @@
 {
-    "DoNotTrack": {
-        "PluginDescription": "X-Do-Not-Track または DNT ヘッダーでの訪問を無視します。"
-    },
     "General": {
         "AbandonedCarts": "放棄された買い物かご",
         "AboutPiwikX": "Piwik %s について",
@@ -186,7 +183,6 @@
         "Forums": "フォーラム",
         "FromReferrer": "から",
         "GeneralInformation": "全般の設定",
-        "GeneralSettings": "全般の設定",
         "GetStarted": "始めましょう",
         "GiveUsYourFeedback": "フィードバックをお願いします！",
         "Goal": "目標",
@@ -426,6 +422,7 @@
         "VisitorID": "ビジターID",
         "VisitorIP": "ビジターIP",
         "Visitors": "ビジター",
+        "VisitorSettings": "ビジターの環境",
         "VisitsWith": "%s のビジット",
         "VisitType": "ビジター種類",
         "VisitTypeExample": "例えば、前回のビジットで何かを購入した訪問者を含む、全てのリピーターを選択するためのAPIリクエストは %s を含むものとなります。",
diff --git a/lang/ka.json b/lang/ka.json
index ebeddbd084..c273bec0fe 100644
--- a/lang/ka.json
+++ b/lang/ka.json
@@ -95,7 +95,6 @@
         "ExportThisReport": "გააკეთეთ მონაცემთა ამ ნაკრების ექსპორტი სხვა ფორმატებში",
         "FileIntegrityWarningExplanation": "ფაილის მთლიანობის შემოწმება ჩაიშალა და შეცდომების შესახებ გაიგზავნა რეპორტი. სავარაუდოდ, ამის მიზეზია Piwik ფაილების არასრულად ან უშედეგოდ ატვირთვა. ხელმეორედ უნდა ატვირთოთ Piwik–ის ყველა ფაილი BINARY რეჟიმში და განაახლოთ ეს გვერდი იქამდე, სანამ შეცდომის შეტყობინებები არ შეწყდება.",
         "ForExampleShort": "მაგ.",
-        "GeneralSettings": "ძირითადი პარამეტრები",
         "GiveUsYourFeedback": "გამოგვეხმაურეთ!",
         "GoTo": "გადადი %s",
         "GraphHelp": "დამატებითი ინფორმაცია Piwik პროგრამაში გრაფიკების ჩვენების შესახებ.",
@@ -215,6 +214,7 @@
         "View": "დათვალიერება",
         "VisitDuration": "ვიზიტის საშუალო ხანგრძლივობა (წამებში)",
         "Visitors": "ვიზიტორები",
+        "VisitorSettings": "ვიზიტორის პარამეტრები",
         "Warning": "გაფრთხილება",
         "WarningFileIntegrityNoManifest": "ფაილის მთლიანობის შემოწმება ვერ განხორციელდება, რადგან manifest.inc.php ფაილი არ არსებობს.",
         "WarningFileIntegrityNoMd5file": "ფაილის მთლიანობის შემოწმება ვერ დასრულდება, რადგან md5_file() ფუნქცია არ არსებობს.",
diff --git a/lang/ko.json b/lang/ko.json
index ea88aa5746..5a7e41454f 100644
--- a/lang/ko.json
+++ b/lang/ko.json
@@ -164,7 +164,6 @@
         "ForExampleShort": "예:",
         "FromReferrer": "소스",
         "GeneralInformation": "일반 정보",
-        "GeneralSettings": "일반 설정",
         "GetStarted": "시작하기",
         "GiveUsYourFeedback": "피드백을 주세요!",
         "Goal": "목표",
@@ -369,6 +368,7 @@
         "VisitorID": "방문자 ID",
         "VisitorIP": "방문자 IP",
         "Visitors": "방문",
+        "VisitorSettings": "방문자 설정",
         "VisitsWith": "%s의 방문",
         "VisitType": "방문자 유형",
         "VisitTypeExample": "예를 들어, 이전 방문에서 무언가를 구입한 방문자를 포함한 모든 리피터를 선택하기 위한 API 요청 %s를 포함합니다.",
diff --git a/lang/lt.json b/lang/lt.json
index 84c60f01a6..40e3b96a99 100644
--- a/lang/lt.json
+++ b/lang/lt.json
@@ -115,7 +115,6 @@
         "First": "Pirmas",
         "ForExampleShort": "pvz.",
         "FromReferrer": "nuo",
-        "GeneralSettings": "Pagrindiniai nustatymai",
         "GiveUsYourFeedback": "Jūsų atsiliepimai!",
         "Goal": "Uždavinys",
         "GoTo": "Eiti į %s",
@@ -262,6 +261,7 @@
         "VisitorID": "Lankytojo ID",
         "VisitorIP": "Lankytojo IP",
         "Visitors": "Lankytojai",
+        "VisitorSettings": "Lankytojų nustatymai",
         "VisitType": "Lankytojo tipas",
         "Warning": "Įspėjimas",
         "WarningFileIntegrityNoManifest": "Failo vientisumo patikra negali būti atlikta dėl nesamo manifest.inc.php failo.",
diff --git a/lang/lv.json b/lang/lv.json
index 96f4ae57ad..4a0d1f7a10 100644
--- a/lang/lv.json
+++ b/lang/lv.json
@@ -125,7 +125,6 @@
         "First": "Pirmais",
         "ForExampleShort": "piemēram,",
         "FromReferrer": "no",
-        "GeneralSettings": "Vispārīgie iestatījumi",
         "GiveUsYourFeedback": "Rakstiet mums atsauksmes!",
         "Goal": "Mērķis",
         "GoTo": "Iet uz %s",
@@ -292,6 +291,7 @@
         "VisitorID": "Apmeklētāja ID",
         "VisitorIP": "Apmeklētāja IP",
         "Visitors": "Apmeklētāji",
+        "VisitorSettings": "Apmeklētāju iestatījumi",
         "VisitsWith": "Apmeklējumi ar %s",
         "VisitType": "Apmeklētāja tips",
         "VisitTypeExample": "Piemēram, lai izvēlētos visus apmeklētājus, kas atgriezušies vietnē (ieskaitot tos, kas veikuši pasūtījumu kādā no iepriekšējiem apmeklējumiem), API pieprasījumam būtu jāsatur %s",
diff --git a/lang/nb.json b/lang/nb.json
index 9f6fe3d4cc..f318814ad5 100644
--- a/lang/nb.json
+++ b/lang/nb.json
@@ -21,6 +21,7 @@
         "ChooseLanguage": "Velg språk",
         "ChoosePeriod": "Velg periode",
         "ChooseWebsite": "Velg nettsted",
+        "Clear": "Tøm",
         "ClickHere": "Klikk her for mer informasjon.",
         "ClickToChangePeriod": "Klikk igjen for å endre periode.",
         "Close": "Lukk",
@@ -40,6 +41,7 @@
         "ColumnMaxActions": "Maksimalt antall handlinger under ett besøk",
         "ColumnNbActions": "Handlinger",
         "ColumnNbUniqVisitors": "Unike besøkende",
+        "ColumnNbUsers": "Brukere",
         "ColumnNbVisits": "Besøk",
         "ColumnPageviews": "Sidevisninger",
         "ColumnPercentageVisits": "% besøk",
@@ -118,8 +120,8 @@
         "ForExampleShort": "f.eks.",
         "Forums": "Forum",
         "FromReferrer": "fra",
+        "General": "Generelt",
         "GeneralInformation": "Generell informasjon",
-        "GeneralSettings": "Generelle innstillinger",
         "GetStarted": "Kom i gang",
         "GiveUsYourFeedback": "Gi oss tilbakemeldinger!",
         "Goal": "Mål",
@@ -140,6 +142,7 @@
         "LastDays": "Siste %s dager (inkludert i dag)",
         "LastDaysShort": "Siste %s dager",
         "LayoutDirection": "ltr",
+        "LearnMore": "%1$slær mer%2$s",
         "Loading": "Laster ...",
         "LoadingData": "Laster data ...",
         "LoadingPopover": "Laster %s...",
@@ -177,6 +180,7 @@
         "MultiSitesSummary": "Alle nettsteder",
         "Name": "Navn",
         "NbActions": "Antall handlinger",
+        "NbSearches": "Antall interne søk",
         "NDays": "%s dager",
         "Never": "Aldri",
         "NewUpdatePiwikX": "Ny utgave: Piwik %s",
@@ -187,11 +191,13 @@
         "NoDataForGraph": "Ingen data for denne grafen.",
         "NoDataForTagCloud": "Ingen data for denne merkelappskyen.",
         "NotDefined": "%s ikke definert",
+        "Note": "Notat",
         "NotInstalled": "Ikke installert",
         "NotRecommended": "(anbefales ikke)",
         "NotValid": "%s er ikke gyldig",
         "NSeconds": "%s sekund",
         "NumberOfVisits": "Antall besøk",
+        "NUsers": "%s brukere",
         "NVisits": "%s besøk",
         "Ok": "Ok",
         "OneAction": "1 handling",
@@ -242,10 +248,12 @@
         "RelatedReports": "Relaterte rapporter",
         "Remove": "Fjern",
         "Report": "Rapport",
+        "ReportRatioTooltip": "'%1$s' representerer %2$s av %3$s %4$s med %5$s.",
         "Reports": "Rapporter",
         "RequestTimedOut": "En dataforespørsel til %s fikk tidsavbrudd. Prøv igjen.",
         "Required": "%s påkrevd",
         "ReturningVisitor": "Tilbakevendende besøkende",
+        "ReturningVisitorAllVisits": "Vis alle besøk",
         "Rows": "Rader",
         "RowsToDisplay": "Rader for visning",
         "Save": "Lagre",
@@ -290,8 +298,10 @@
         "TagCloud": "Merkelappsky",
         "Tax": "Skatt",
         "TimeAgo": "%s siden",
+        "TimeOnPage": "Tid på side",
         "Today": "I dag",
         "Total": "Totalt",
+        "TotalRatioTooltip": "Dette er %1$s av alle %2$s %3$s.",
         "TotalVisitsPageviewsRevenue": "(Totalt: %s besøk, %s sidevisninger, %s inntekter)",
         "TranslatorEmail": "hans@nordhaug.priv.no",
         "TranslatorName": "Hans Fredrik Nordhaug",
@@ -308,6 +318,7 @@
         "VisitDuration": "Gj. besøksvarighet (i sekunder)",
         "VisitorIP": "IP for besøkende",
         "Visitors": "Besøkende",
+        "VisitorSettings": "Besøkendes innstillinger",
         "VisitType": "Type besøkende",
         "Warning": "Advarsel",
         "WarningFileIntegrityNoManifest": "Klarte ikke utføre integritetskontroll av filer fordi manifest.inc.php mangler.",
@@ -346,6 +357,7 @@
         "EnableGraphsLabel": "Vis grafer",
         "EvolutionGraph": "Historisk graf",
         "HttpTimeout": "HTTP-tidsavbrudd",
+        "IgnoreSslError": "Ignorer SSL-feil",
         "LastUpdated": "Sist oppdatert: %s",
         "LoadingReport": "Laster %s",
         "LoginCredentials": "Påloggingsinformasjon",
@@ -357,6 +369,8 @@
         "NoDataShort": "Ingen data",
         "NoPiwikAccount": "Ingen Piwik-konto?",
         "NoReportsShort": "Ingen rapporter",
+        "NoWebsiteFound": "Ingen nettside funnet",
+        "NoWebsitesShort": "Ingen nettsteder",
         "PullDownToRefresh": "Trekk ned for å oppdatere...",
         "RatingNotNow": "Ikke nå",
         "ReleaseToRefresh": "Slipp for å oppdatere...",
diff --git a/lang/nl.json b/lang/nl.json
index 4ac4995266..11731f5d72 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -1,7 +1,4 @@
 {
-    "DoNotTrack": {
-        "PluginDescription": "Negeer bezoeken met X-Do-Not-Track of DNT header."
-    },
     "General": {
         "AbandonedCarts": "Niet afgeronde bestellingen",
         "AboutPiwikX": "Over Piwik %s",
@@ -181,8 +178,8 @@
         "ForExampleShort": "bijv.",
         "Forums": "Forums",
         "FromReferrer": "van",
+        "General": "Algemeen",
         "GeneralInformation": "Algemene informatie",
-        "GeneralSettings": "Algemene instellingen",
         "GetStarted": "Aan de slag",
         "GiveUsYourFeedback": "Geef ons commentaar",
         "Goal": "Doel",
@@ -419,6 +416,7 @@
         "VisitorID": "Bezoekers ID",
         "VisitorIP": "Bezoekers IP",
         "Visitors": "Bezoekers",
+        "VisitorSettings": "Bezoekers Instellingen",
         "VisitsWith": "Bezoeken met %s",
         "VisitType": "Type bezoeker",
         "VisitTypeExample": "Om bijvoorbeeld het aantal terugkerende bezoekers (inclusief die bezoekers die iets gekocht hebben) te selecteren moet de API %s bevatten",
@@ -467,10 +465,11 @@
         "EvolutionGraph": "Historische grafieken",
         "HelpUsToImprovePiwikMobile": "Wilt u anonieme registratie van gebruiksgegevens inschakelen in Piwik Mobile?",
         "HowtoDeleteAnAccount": "Lang drukken om een account te verwijderen.",
-        "HowtoDeleteAnAccountOniOS": "Veeg naar links naar rechts om een ​​account te verwijderen",
+        "HowtoDeleteAnAccountOniOS": "Veeg naar links om een ​​account te verwijderen",
         "HowtoLoginAnonymous": "Laat gebruikersnaam en wachtwoord leeg voor anonieme login.",
         "HttpIsNotSecureWarning": "Uw Piwik autorisatie token (token_auth) wordt verzonden in gewone tekst als u 'HTTP'. Om deze reden adviseren wij HTTPS voor een veilig transport van gegevens via het internet. Wilt u doorgaan?",
         "HttpTimeout": "HTTP-Time-out",
+        "IgnoreSslError": "SLL Fout Negeren",
         "IncompatiblePiwikVersion": "De Piwik versie die u gebruikt is incompatibel met Piwik Mobile 2. Update uw Piwik installatie en probeer opnieuw of installeer Piwik Mobile 1.",
         "LastUpdated": "Laatste update: %s",
         "LoadingReport": "Bezig met laden van %s",
@@ -509,6 +508,7 @@
         "TopVisitedWebsites": "Top bezochte websites",
         "TryIt": "Probeer het!",
         "UseSearchBarHint": "Alleen de eerste %s websites worden hier weergegeven. Gebruik de zoekbalk om uw andere websites te openen.",
+        "ValidateSslCertificate": "Valideer SSL Certificaat",
         "VerifyAccount": "verifiëren Account",
         "VerifyLoginData": "Zorg dat je gebruikersnaam en wachtwoord combinatie goed zijn.",
         "YouAreOffline": "Sorry, u bent momenteel offline"
diff --git a/lang/nn.json b/lang/nn.json
index 0424562b85..cba964da26 100644
--- a/lang/nn.json
+++ b/lang/nn.json
@@ -142,7 +142,6 @@
         "ForExampleShort": "t.d.",
         "FromReferrer": "frå",
         "GeneralInformation": "Generell informasjon",
-        "GeneralSettings": "Generelle innstillingar",
         "GiveUsYourFeedback": "Gje attendemelding!",
         "Goal": "Mål",
         "GoTo": "Gå til %s",
@@ -314,6 +313,7 @@
         "VisitorID": "Vitjar-ID",
         "VisitorIP": "Vitjar-IP",
         "Visitors": "Vitjarar",
+        "VisitorSettings": "Vitjarinnstillingar",
         "VisitsWith": "Vitjingar med %s",
         "VisitType": "Vitjar-type",
         "VisitTypeExample": "Døme: For å velja alle vitjarar som kjem attende til vevstaden, inkludert dei som har kjøpt noko førre gong, vil API-førespurnaden innehalde %s",
diff --git a/lang/pl.json b/lang/pl.json
index a603d572e9..23bb79bc42 100644
--- a/lang/pl.json
+++ b/lang/pl.json
@@ -172,7 +172,6 @@
         "Forums": "Forum",
         "FromReferrer": "z",
         "GeneralInformation": "Ogólne informacje",
-        "GeneralSettings": "Konfiguracja podstawowa",
         "GetStarted": "Zacznij",
         "GiveUsYourFeedback": "Zdaj relację!",
         "Goal": "Cel",
@@ -225,6 +224,8 @@
         "Matches": "Pasuje",
         "MediumToHighTrafficItIsRecommendedTo": "Dla serwisów o średnim natężeniu ruchu, zaleca się przetwarzanie raportowania dziennego najwyżej do pół godziny (%s sekund) lub co godzinę (%s sekund).",
         "Metadata": "Metadata",
+        "Metric": "Metryka",
+        "Metrics": "Metryki",
         "MetricsToPlot": "Dane do porównania",
         "MinutesSeconds": "%1$s min %2$ss",
         "Mobile": "Przenośny",
@@ -399,6 +400,7 @@
         "VisitorID": "ID oglądającego",
         "VisitorIP": "IP oglądającego",
         "Visitors": "Oglądający",
+        "VisitorSettings": "Konfiguracje użytkownika",
         "VisitsWith": "Odwiedzin z %s",
         "VisitType": "Typ oglądającego",
         "VisitTypeExample": "Przykładowo, aby wybrać wszystkich odwiedzających, którzy powrócili na serwis, włączając tych, którzy zakupili coś podczas poprzednich wizyt, zapytanie API będzie zawierać %s",
@@ -435,12 +437,14 @@
         "AddPiwikDemo": "Dodaj Piwik Demo",
         "Advanced": "Zaawansowane",
         "AnonymousAccess": "Dostęp anonimowy",
+        "ChooseMetric": "Wybierz metrykę",
         "ChooseReport": "Wybierz raport",
         "ChooseSegment": "Wybierz segment",
         "ConfirmRemoveAccount": "Czy chcesz usunąć to konto?",
         "DefaultReportDate": "Data raportu",
         "EmailUs": "Wyślij nam wiadomośc email",
         "EnableGraphsLabel": "Wyświetlanie wykresów",
+        "HowtoDeleteAnAccount": "Naciśnij i przytrzymaj by usunac konto.",
         "IgnoreSslError": "Ignoruj błąd SSL",
         "LastUpdated": "Ostatnia aktualizacja: %s",
         "LoadingReport": "Ładowanie %s",
@@ -459,6 +463,7 @@
         "NoVisitorsShort": "Brak odwiedzających",
         "NoWebsiteFound": "Nie znaleziono strony",
         "NoWebsitesShort": "Brak stron",
+        "PossibleSslError": "Możliwy błąd certyfikatu SSL",
         "RatingDontRemindMe": "Nie przypominaj mi",
         "RatingNotNow": "Nie teraz",
         "Reloading": "Przeładowanie...",
diff --git a/lang/pt-br.json b/lang/pt-br.json
index 3f52a19951..6882289d54 100644
--- a/lang/pt-br.json
+++ b/lang/pt-br.json
@@ -1,7 +1,4 @@
 {
-    "DoNotTrack": {
-        "PluginDescription": "Ignorar visitas com X-Do-Not-Track ou cabeçalho DNT."
-    },
     "General": {
         "AbandonedCarts": "Compras abandonadas",
         "AboutPiwikX": "Sobre o Piwik %s",
@@ -177,7 +174,6 @@
         "Forums": "Fórum",
         "FromReferrer": "origem",
         "GeneralInformation": "Informações Gerais",
-        "GeneralSettings": "Configurações Gerais",
         "GetStarted": "Começar",
         "GiveUsYourFeedback": "Dê o seu feedback!",
         "Goal": "Objetivo",
@@ -406,6 +402,7 @@
         "VisitorID": "Visitante ID",
         "VisitorIP": "IP do Visitante",
         "Visitors": "Visitantes",
+        "VisitorSettings": "Configurações dos visitantes",
         "VisitsWith": "Visitas com %s",
         "VisitType": "Tipo do Visitante",
         "VisitTypeExample": "Por exemplo, para selecionar todos os visitantes que voltaram para o site, incluindo aqueles que compraram algo em suas visitas anteriores, a requisição a API deve conter %s",
diff --git a/lang/pt.json b/lang/pt.json
index 2aa1966fd7..8644570d88 100644
--- a/lang/pt.json
+++ b/lang/pt.json
@@ -141,7 +141,6 @@
         "First": "Primeiro",
         "ForExampleShort": "ex.",
         "FromReferrer": "de",
-        "GeneralSettings": "Definições Gerais",
         "GiveUsYourFeedback": "Dê-nos a sua opinião!",
         "Goal": "Objectivo",
         "GoTo": "Ir para %s",
@@ -307,6 +306,7 @@
         "VisitorID": "ID do Visitante",
         "VisitorIP": "IP do Visitante",
         "Visitors": "Visitantes",
+        "VisitorSettings": "Definições do Visitante",
         "VisitsWith": "Visitas com %s",
         "VisitType": "Tipo de Visitante",
         "VisitTypeExample": "Por exemplo, para selecionar todos os visitantes que voltaram ao website, incluindo aqueles que compraram algo nas visitas anteriores, o pedido API contem %s",
diff --git a/lang/ro.json b/lang/ro.json
index cb4b8adff6..eefcb672f6 100644
--- a/lang/ro.json
+++ b/lang/ro.json
@@ -1,7 +1,4 @@
 {
-    "DoNotTrack": {
-        "PluginDescription": "Ignora vizitele cu headerul X-Do-Not-Track sau DNT."
-    },
     "General": {
         "AbandonedCarts": "Cosuri abandonate",
         "AboutPiwikX": "Despre Piwik %s",
@@ -179,7 +176,6 @@
         "Forums": "Forumuri",
         "FromReferrer": "de la",
         "GeneralInformation": "Informaţii Generale",
-        "GeneralSettings": "Setări generale",
         "GetStarted": "Incepe",
         "GiveUsYourFeedback": "Trimite sesizarii!",
         "Goal": "Ţintă",
@@ -415,6 +411,7 @@
         "VisitorID": "ID vizitator",
         "VisitorIP": "IP vizitator",
         "Visitors": "Vizitatori",
+        "VisitorSettings": "Setări vizitatori",
         "VisitsWith": "Vizite cu %s",
         "VisitType": "Tip vizitator",
         "VisitTypeExample": "De exemplu, pentru a selecta toti vizitatorii care s-au intors pe site, inclusiv cei care au cumparat in trecut, cererea catre API ar include %s",
diff --git a/lang/ru.json b/lang/ru.json
index 3cc4177dc2..397809fa90 100644
--- a/lang/ru.json
+++ b/lang/ru.json
@@ -1,7 +1,4 @@
 {
-    "DoNotTrack": {
-        "PluginDescription": "Игнорирование посетителей с HTTP-заголовком X-Do-Not-Track или DNT header"
-    },
     "General": {
         "AbandonedCarts": "Нереализованные покупки",
         "AboutPiwikX": "О Piwik %s",
@@ -11,7 +8,7 @@
         "AfterEntry": "После захода сюда",
         "All": "Все",
         "AllowPiwikArchivingToTriggerBrowser": "Архивировать данные веб-аналитики и формировать отчеты при входе в систему через браузер",
-        "AllWebsitesDashboard": "Сводная статистика для всех сайтов",
+        "AllWebsitesDashboard": "Статистика всех сайтов",
         "And": "и",
         "API": "API-функции",
         "ApplyDateRange": "Применить период",
@@ -32,6 +29,7 @@
         "ChooseLanguage": "Выбрать язык",
         "ChoosePeriod": "Выбрать период",
         "ChooseWebsite": "Выбрать сайт",
+        "Clear": "Очистить",
         "ClickHere": "Нажмите здесь, чтобы узнать больше",
         "ClickToChangePeriod": "Нажмите еще раз, чтобы изменить период.",
         "Close": "Закрыть",
@@ -65,6 +63,7 @@
         "ColumnNbActionsDocumentation": "Количество действий, выполненных вашими пользователями. К событиям относятся просмотры страниц, загрузки и внешние ссылки.",
         "ColumnNbUniqVisitors": "Уникальные посетители",
         "ColumnNbUniqVisitorsDocumentation": "Число неповторяющихся посетителей на вашем сайте. Каждый пользователь засчитывается один раз, даже если он посещает сайт несколько раз в день.",
+        "ColumnNbUsers": "Пользователи",
         "ColumnNbVisits": "Посещения",
         "ColumnNbVisitsDocumentation": "Если посетитель посещает ваш сайт впервые или после 30 минут с момента последнего посещения, такое посещение будет записано как новое.",
         "ColumnPageBounceRateDocumentation": "Процент посещений, которые начались на этой странице и сразу же закончились (посетитель ушел на другой сайт или закрыл вкладку).",
@@ -141,6 +140,7 @@
         "EnglishLanguageName": "Russian",
         "Error": "Ошибка",
         "EvolutionOverPeriod": "Эволюция за период",
+        "ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "Пользователь должен быть либо суперпользователем, либо пользователем '%s'.",
         "ExceptionConfigurationFileNotFound": "Конфигурационный файл {%s} не может быть найден.",
         "ExceptionDatabaseVersion": "Версия вашего %1$s - %2$s, но Piwik требует хотя бы %3$s.",
         "ExceptionFileIntegrity": "Проверка целостности не удалась: %s",
@@ -175,9 +175,9 @@
         "First": "Первый",
         "ForExampleShort": "напр.,",
         "Forums": "Форумы",
-        "FromReferrer": "из (от)",
+        "FromReferrer": "источник",
+        "General": "Основное",
         "GeneralInformation": "Общая информация",
-        "GeneralSettings": "Общие настройки",
         "GetStarted": "Приступить",
         "GiveUsYourFeedback": "Обратная связь",
         "Goal": "Достижение",
@@ -263,6 +263,7 @@
         "NotValid": "%s неверный",
         "NSeconds": "%s сек",
         "NumberOfVisits": "Количество посещений",
+        "NUsers": "%s пользователей",
         "NVisits": "%s посещений",
         "Ok": "ОК",
         "OneAction": "1 действие",
@@ -298,6 +299,7 @@
         "Password": "Пароль",
         "Period": "Период",
         "Piechart": "Круговая диаграмма",
+        "PiwikIsACollaborativeProjectYouCanContributeAndDonate": "%1$sPiwik%2$s является совместным проектом, представленный вам %7$sкомандой Piwik%8$s, а также многими другими разработчиками по всему миру. Если вы поклонник Piwik, вы можете помочь: %3$sУзнайте, как принять участие в Piwik%4$s, или %5$sпожертвуйте сейчас%6$s, чтобы помочь финансировать Piwik 3.0!",
         "PiwikXIsAvailablePleaseUpdateNow": "Piwik %1$s доступен для скачивания. %2$s Пожалуйста, обновитесь!%3$s (см. %4$s изменения%5$s).",
         "PleaseSpecifyValue": "Пожалуйста, определите значение для '%s'.",
         "PleaseUpdatePiwik": "Пожалуйста, обновите систему Веб-аналитики",
@@ -387,11 +389,12 @@
         "TransitionsRowActionTooltip": "Посмотрите, что посетители делали до и после просмотра этой страницы",
         "TransitionsRowActionTooltipTitle": "Открыть переходы",
         "TranslatorEmail": "ademaro@ya.ru, i@codax.ru, heyheyftw@gmail.com, onix@onix.name, taktip@gmail.com, djsoldier@mail.ru",
-        "TranslatorName": "Ademaro, <a href=\"http:\/\/codax.ru\">Важенин Илья (компания Codax)<\/a>, Nelde Maxim, Andrey, Vadim Nekhai",
+        "TranslatorName": "Ademaro, <a href=\"http:\/\/jokerintertactive.ru\/\">Joker Interactive<\/a>, <a href=\"http:\/\/codax.ru\/\">Важенин Илья (компания Codax)<\/a>, Nelde Maxim, Andrey, Vadim Nekhai",
         "UniquePurchases": "Уникальные покупки",
         "Unknown": "Неизвестно",
         "Upload": "Закачать",
         "UsePlusMinusIconsDocumentation": "Используйте иконки плюс и минус слева для навигации",
+        "UserId": "ID пользователя",
         "Username": "Имя пользователя",
         "UseSMTPServerForEmail": "Использовать SMTP сервер для e-mail",
         "Value": "Значение",
@@ -407,6 +410,7 @@
         "VisitorID": "ID посетителя",
         "VisitorIP": "IP посетителя",
         "Visitors": "Посетители",
+        "VisitorSettings": "Настройки посетителей",
         "VisitsWith": "Посещения с %s",
         "VisitType": "Тип посетителя",
         "VisitTypeExample": "Например, чтобы выбрать всех посетителей, которые вернулисть на сайт, включая тех, кто уже купил что-то в свои предыдущие визиты, API-запрос будет содержать: %s",
@@ -415,11 +419,13 @@
         "WarningFileIntegrityNoManifestDeployingFromGit": "Если вы делаете деплой Piwik из Git, это сообщение является нормальным.",
         "WarningFileIntegrityNoMd5file": "Проверка целостности не может быть проведена из-за отсутствия функции md5_file().",
         "WarningPasswordStored": "%sВнимание:%s Этот пароль будет сохранен в конфигурационном файле на сервере в незашифрованном виде, и будет виден любому, кто имеет доступ к файловой системе сервера.",
+        "WarningPiwikWillStopSupportingPHPVersion": "Piwik будет прекращать поддержку этой версии PHP в %s. Обновите версию PHP пока не слишком поздно!",
         "Website": "Сайт",
         "Weekly": "Еженедельно",
         "WeeklyReport": "еженедельно",
         "WeeklyReports": "Еженедельные отчеты",
         "WellDone": "Отлично!",
+        "Widget": "Виджет",
         "Widgets": "Виджеты",
         "YearlyReport": "ежегодно",
         "YearlyReports": "Ежегодные отчеты",
@@ -446,14 +452,16 @@
         "ChooseHttpTimeout": "Выберите значение HTTP timeout",
         "ChooseMetric": "Выберите показатель",
         "ChooseReport": "Выберите отчет",
+        "ChooseSegment": "Выберите сегмент",
         "ConfirmRemoveAccount": "Вы хотите удалить этот акаунт?",
         "DefaultReportDate": "Дата отчета",
         "EmailUs": "Отправьте нам email",
         "EnableGraphsLabel": "Отображать графики",
+        "EvolutionGraph": "Исторический график",
         "HelpUsToImprovePiwikMobile": "Вы желаете включить анонимное отслеживание в Piwik Mobile?",
         "HowtoDeleteAnAccountOniOS": "Проведите слева направа, чтобы удалить аккаунт",
         "HowtoLoginAnonymous": "Оставьте имя пользователя и пароль пустым для анонимного входа",
-        "HttpIsNotSecureWarning": "Ваш авторизационный ключ в Piwik(token_auth) отправляется в незащищенном виде, если вы используете 'HTTP'. Поэтому мы рекомендуем HTTPS для безопасности передачи информации по интернету. Желаете продолжить?",
+        "HttpIsNotSecureWarning": "Ваш авторизационный ключ в Piwik (token_auth) отправляется в незащищенном виде, если вы используете \"HTTP\". Поэтому мы рекомендуем HTTPS для безопасности передачи информации по интернету. Желаете продолжить?",
         "HttpTimeout": "HTTP Timeout",
         "LastUpdated": "Последнее обновление: %s",
         "LoadingReport": "Загрузка %s",
@@ -462,7 +470,7 @@
         "MultiChartLabel": "Отображать тонкие графики (нити)",
         "NavigationBack": "Назад",
         "NetworkError": "Ошибка сети",
-        "NetworkErrorWithStatusCode": "Проищошла ошибка '%s'. Запрос вернул статус: '%s'. URL была - '%s'. Пожалуйста, проверьте введенную URL и лог ошибок на сервере для более детальной информации по ошибке и ее решения.",
+        "NetworkErrorWithStatusCode": "Произошла ошибка \"%s\". Запрос вернул статус: \"%s\". URL был: \"%s\". Пожалуйста, проверьте введенный URL и лог ошибок на сервере для более детальной информации по ошибке и способам её решения.",
         "NetworkErrorWithStatusCodeShort": "Ошибка сети %s",
         "NetworkNotReachable": "Сеть недоступна",
         "NoDataShort": "Нет данных",
diff --git a/lang/sk.json b/lang/sk.json
index a3a18af2ee..50cfdc1ba5 100644
--- a/lang/sk.json
+++ b/lang/sk.json
@@ -160,7 +160,6 @@
         "ForExampleShort": "napr.",
         "FromReferrer": "z",
         "GeneralInformation": "Všeobecné informácie",
-        "GeneralSettings": "Všeobecné nastavenia",
         "GiveUsYourFeedback": "Spätná reakcia!",
         "Goal": "Cieľ",
         "GoTo": "Prejsť na %s",
@@ -371,6 +370,7 @@
         "VisitorID": "ID návštevníka",
         "VisitorIP": "IP návštevníka",
         "Visitors": "Návštevníci",
+        "VisitorSettings": "Nastavenia návštevníkov",
         "VisitsWith": "Návštevy s %s",
         "VisitType": "Typ návštevníka",
         "VisitTypeExample": "Napríklad: Pre výber všetkých návštevníkov, ktorí sa vrátili na webovú stránku, vrátane tých, ktorí niečo nakúpili počas prechádzajúcej návštevy by API požiadavka obsahovala %s",
diff --git a/lang/sl.json b/lang/sl.json
index cd0921fc87..1621bf562c 100644
--- a/lang/sl.json
+++ b/lang/sl.json
@@ -155,7 +155,6 @@
         "ForExampleShort": "npr.",
         "FromReferrer": "od",
         "GeneralInformation": "Splošne informacije",
-        "GeneralSettings": "Splošne Nastavitve",
         "GiveUsYourFeedback": "Podajte nam Povratno Informacijo!",
         "Goal": "Cilj",
         "GoTo": "Pojdi na %s",
@@ -343,6 +342,7 @@
         "VisitorID": "ID Obiskovalca",
         "VisitorIP": "Obiskovalčev IP",
         "Visitors": "Obiskovalci",
+        "VisitorSettings": "Nastavitve obiskovalcev",
         "VisitsWith": "Obiski z\/s %s",
         "VisitType": "Vrsta obiskovalca",
         "VisitTypeExample": "Na primer, če želite zbrati vse obiskovalce, ki so se vrnili na spletno stran, vključno s tistimi, ki so v prejšnjih obiskih kaj kupili, bi API zahteva vsebovala %s",
diff --git a/lang/sq.json b/lang/sq.json
index 3562c619d9..76522687c6 100644
--- a/lang/sq.json
+++ b/lang/sq.json
@@ -143,7 +143,6 @@
         "First": "I pari",
         "ForExampleShort": "p.sh.",
         "FromReferrer": "prej",
-        "GeneralSettings": "Rregullime të Përgjithshme",
         "GiveUsYourFeedback": "Na jepni Përshtypjet!",
         "Goal": "Objektiv",
         "GoTo": "Shko te %s",
@@ -310,6 +309,7 @@
         "VisitorID": "ID vizitori",
         "VisitorIP": "IP vizitori",
         "Visitors": "Vizitorë",
+        "VisitorSettings": "Rregullimet për Vizitor",
         "VisitsWith": "Vizita me %s",
         "VisitType": "Lloj vizitori",
         "VisitTypeExample": "Për shembull, për përzgjedhjen e krejt vizitorëve që janë rikthyer te site-i web, përfshi ata që kanë blerë diçka gjatë vizitash të mëparshme, kërkesa API do të duhej të përmbante %s",
diff --git a/lang/sr.json b/lang/sr.json
index a3cc8552d0..bec72cb881 100644
--- a/lang/sr.json
+++ b/lang/sr.json
@@ -1,7 +1,4 @@
 {
-    "DoNotTrack": {
-        "PluginDescription": "Ignoriši posete sa zaglavljima X-Do-Not-Track i DNT."
-    },
     "General": {
         "AbandonedCarts": "Napuštene korpe",
         "AboutPiwikX": "O programu Piwik %s",
@@ -183,7 +180,6 @@
         "Forums": "Forumi",
         "FromReferrer": "od",
         "GeneralInformation": "Opšte informacije",
-        "GeneralSettings": "Opšta podešavanja",
         "GetStarted": "Da počnemo",
         "GiveUsYourFeedback": "Vaši utisci",
         "Goal": "Cilj",
@@ -419,6 +415,7 @@
         "VisitorID": "ID posetioca",
         "VisitorIP": "IP adresa posetioca",
         "Visitors": "Posetioci",
+        "VisitorSettings": "Parametri posetilaca",
         "VisitsWith": "Posete sa %s",
         "VisitType": "Tip posetioca",
         "VisitTypeExample": "Na primer, kako biste obeležili sve posetioce koji su se vratili na sajt, uključujući i one koji su već nešto kupili, API zahtev bi sadržao %s",
diff --git a/lang/sv.json b/lang/sv.json
index 95e78d6553..b7f80badf8 100644
--- a/lang/sv.json
+++ b/lang/sv.json
@@ -1,7 +1,4 @@
 {
-    "DoNotTrack": {
-        "PluginDescription": "Ignorera besök med X-Do-Not-Track eller DNT-huvud."
-    },
     "General": {
         "AbandonedCarts": "Övergivna varukorgar",
         "AboutPiwikX": "Om Piwik %s",
@@ -32,6 +29,7 @@
         "ChooseLanguage": "Välj språk",
         "ChoosePeriod": "Välj period",
         "ChooseWebsite": "Välj webbplats",
+        "Clear": "Rensa",
         "ClickHere": "Klicka här för mer information.",
         "ClickToChangePeriod": "Klicka igen för att byta period.",
         "Close": "Stäng",
@@ -65,6 +63,7 @@
         "ColumnNbActionsDocumentation": "Antalet händelser som utförts av besökarna. Händelser kan vara sidvisningar, webbplatssökningar, nedladdningar eller utlänkar.",
         "ColumnNbUniqVisitors": "Unika besökare",
         "ColumnNbUniqVisitorsDocumentation": "Antalet unika besökare som kommer till din webbplats. Varje användare räknas endast en gång, även om han besöker webbplatsen flera gånger om dagen.",
+        "ColumnNbUsers": "Användare",
         "ColumnNbVisits": "Besök",
         "ColumnNbVisitsDocumentation": "Om en besökare kommer till din webbplats för första gången eller om han besöker en sida efter mer än 30 minuter från den senaste sidvisningen, så kommer detta att registreras som ett nytt besök.",
         "ColumnPageBounceRateDocumentation": "Andelen besök som startade på denna sida och lämnade webbplatsen direkt.",
@@ -180,7 +179,6 @@
         "Forums": "Forum",
         "FromReferrer": "från",
         "GeneralInformation": "Allmän information",
-        "GeneralSettings": "Allmänna inställningar",
         "GetStarted": "Kom igång",
         "GiveUsYourFeedback": "Lämna din feedback!",
         "Goal": "Mål",
@@ -416,6 +414,7 @@
         "VisitorID": "Besöks-id",
         "VisitorIP": "Besökarens IP",
         "Visitors": "Besökare",
+        "VisitorSettings": "Besökarinställningar",
         "VisitsWith": "Besök med %s",
         "VisitType": "Besökstyp",
         "VisitTypeExample": "Till exempel, för att markera alla besökare som har återvänt till webbplatsen, inklusive de som har köpt något i sina tidigare besök, så skulle API-begäran innehålla %s",
diff --git a/lang/ta.json b/lang/ta.json
index ce7a0be733..8350de504f 100644
--- a/lang/ta.json
+++ b/lang/ta.json
@@ -78,7 +78,6 @@
         "First": "முதல்",
         "ForExampleShort": "எ.கா",
         "FromReferrer": "இருந்து",
-        "GeneralSettings": "பொது அமைப்புக்கள்",
         "GiveUsYourFeedback": "எங்களுக்கு பின்னூட்டம் வழங்குங்கள்",
         "GoTo": "%s க்கு போக",
         "Help": "உதவி",
diff --git a/lang/te.json b/lang/te.json
index 99fd8180d3..6d439c8bc9 100644
--- a/lang/te.json
+++ b/lang/te.json
@@ -58,7 +58,6 @@
         "First": "మొదటి",
         "ForExampleShort": "ఉదా.",
         "GeneralInformation": "సాధారణ సమాచారం",
-        "GeneralSettings": "సాధారణ అమరికలు",
         "GiveUsYourFeedback": "మీ సూచనలనూ సలహాలనూ తెలియజేయండి!",
         "GoTo": "%sకి వెళ్ళండి",
         "HelloUser": "హలో, %s!",
@@ -157,6 +156,7 @@
         "Username": "వాడుకరి పేరు",
         "Value": "విలువ",
         "Visitors": "సందర్శకులు",
+        "VisitorSettings": "సందర్శకుల అమరికలు",
         "Warning": "హెచ్చరిక",
         "Website": "వెబ్‌సైటు",
         "Widgets": "విడ్జెట్లు",
diff --git a/lang/th.json b/lang/th.json
index 50a001803d..2379a79d3d 100644
--- a/lang/th.json
+++ b/lang/th.json
@@ -151,7 +151,6 @@
         "ForExampleShort": "ต.ย.",
         "FromReferrer": "จาก",
         "GeneralInformation": "ข้อมูลทั่วไป",
-        "GeneralSettings": "ตั้งค่าทั่วไป",
         "GiveUsYourFeedback": "ส่งคำติชมถึงเรา",
         "Goal": "เป้าหมาย",
         "GoTo": "ไปยัง %s",
@@ -336,6 +335,7 @@
         "VisitorID": "ID ของผู้เข้าชม",
         "VisitorIP": "IP ของเข้าชม",
         "Visitors": "ผู้เข้าชม",
+        "VisitorSettings": "การตั้งค่าของผู้เข้าชม",
         "VisitsWith": "%s เข้าชม",
         "VisitType": "รูปแบบผู้เข้าชม",
         "VisitTypeExample": "ตัวอย่างเช่น การเลือกผู้เข้าชมทั้งหมดที่มีส่งกลับไปยังเว็บไซต์ รวมทั้งผู้ที่ได้ซื้อบางสิ่งบางอย่างในการเข้าชมก่อนหน้านี้ของพวกเขาที่ขอ API จะมี %s",
diff --git a/lang/tl.json b/lang/tl.json
index fffcf0e8d3..f40a00e6f5 100644
--- a/lang/tl.json
+++ b/lang/tl.json
@@ -1,7 +1,4 @@
 {
-    "DoNotTrack": {
-        "PluginDescription": "Huwag pansinin ang mga pagbisita sa X-Do-Hindi-Track o DNT header."
-    },
     "General": {
         "AbandonedCarts": "inabandunang Cart",
         "AboutPiwikX": "ungkol sa Piwik %s",
@@ -176,7 +173,6 @@
         "Forums": "Mga Forum",
         "FromReferrer": "mula",
         "GeneralInformation": "Pangkalahatang Impormasyon",
-        "GeneralSettings": "Pangkalahatang mga Setting",
         "GetStarted": "Magsimula",
         "GiveUsYourFeedback": "Bigyan kami ng Feedback!",
         "Goal": "Layunin",
@@ -357,6 +353,7 @@
         "TranslatorName": "<a href=\"http:\/\/levante.se\/\">Levante.se<\/a>",
         "View": "Tingnan",
         "Visitors": "Mga Bisita",
+        "VisitorSettings": "Mga Setting ng bisita",
         "Website": "Website",
         "XFromY": "%1$s mula %2$s",
         "Yesterday": "ontem"
diff --git a/lang/tr.json b/lang/tr.json
index 84236dea37..b1ae4e6068 100644
--- a/lang/tr.json
+++ b/lang/tr.json
@@ -135,7 +135,6 @@
         "Forums": "Forum",
         "FromReferrer": "şuradan",
         "GeneralInformation": "Genel Bilgiler",
-        "GeneralSettings": "Genel Ayarlar",
         "GetStarted": "Başla",
         "GiveUsYourFeedback": "Geri Bildirim Verin!",
         "Goal": "Hedef",
@@ -337,6 +336,7 @@
         "VisitorID": "Ziyaretçi ID",
         "VisitorIP": "Ziyaretçi IP",
         "Visitors": "Ziyaretçiler",
+        "VisitorSettings": "Ziyaretçi Ayarlari",
         "VisitsWith": "%s ile Ziyaretler",
         "VisitType": "Ziyaretçi Türü",
         "Warning": "Uyarı",
diff --git a/lang/uk.json b/lang/uk.json
index 16dbbe3375..ba79594bca 100644
--- a/lang/uk.json
+++ b/lang/uk.json
@@ -96,7 +96,6 @@
         "ExportThisReport": "Експортувати цей набір даних в інші формати",
         "FileIntegrityWarningExplanation": "Перевірка цілісності файлу визначила пошкоджені файли. Можливо це відбулося через часткове завантаження або розриви зв’язку підчас завантаження файлів Piwik на сервер. Перезавантажте всі файли Piwik в двійковому режимі (BINARY mode) та обновіть цю сторінку щоб повторити перевірку.",
         "ForExampleShort": "пр.",
-        "GeneralSettings": "Загальні налаштування",
         "GiveUsYourFeedback": "Надішліть нам відгук!",
         "GoTo": "Перейти до %s",
         "GraphHelp": "Дізнатися більше інформації про відображення графіків в Piwik",
@@ -215,6 +214,7 @@
         "VBarGraph": "Гістограма",
         "VisitDuration": "Середня тривалість відвідування (в секундах)",
         "Visitors": "Відвідувачі",
+        "VisitorSettings": "Налаштування відвідувача",
         "Warning": "Застереження",
         "WarningFileIntegrityNoManifest": "Перевірка цілісності файлу не може бути виконана через відсутність manifest.inc.php",
         "WarningFileIntegrityNoMd5file": "Перевірка цілісності файлу не може бути виконана через відсутність функції md5_file().",
diff --git a/lang/vi.json b/lang/vi.json
index 38688e128a..cf26fe99b8 100644
--- a/lang/vi.json
+++ b/lang/vi.json
@@ -1,7 +1,4 @@
 {
-    "DoNotTrack": {
-        "PluginDescription": "Bỏ qua việc thăm với X-Do-Not-Track hay tiêu đề DNT"
-    },
     "General": {
         "AbandonedCarts": "giỏ hàng bị bỏ quên",
         "AboutPiwikX": "Về Piwik %s",
@@ -177,7 +174,6 @@
         "Forums": "Các diễn đàn",
         "FromReferrer": "Mẫu",
         "GeneralInformation": "Thông tin chung",
-        "GeneralSettings": "Cài đặt chung",
         "GetStarted": "Bắt đầu",
         "GiveUsYourFeedback": "Thông tin phản hồi cho chúng tôi!",
         "Goal": "Chỉ tiêu",
@@ -405,6 +401,7 @@
         "VisitorID": "ID khách truy cập",
         "VisitorIP": "IP khách truy cập",
         "Visitors": "Các khách truy cập",
+        "VisitorSettings": "Thiết lập khách truy cập",
         "VisitsWith": "Các khách truy cập với %s",
         "VisitType": "kiểu khách truy cập",
         "VisitTypeExample": "Lấy ví dụ, để chọn tất cả những người truy cập đã quay lại website, bao gồm cả những người đã mua thứ gì đó trong những lượt truy cập trước, yêu cầu API có thể chứa %s",
diff --git a/lang/zh-cn.json b/lang/zh-cn.json
index eb28e6b70a..f2a3c20f79 100644
--- a/lang/zh-cn.json
+++ b/lang/zh-cn.json
@@ -1,7 +1,4 @@
 {
-    "DoNotTrack": {
-        "PluginDescription": "忽略带 X-Do-Not-Track 或者 DNT 头的访问。"
-    },
     "General": {
         "AbandonedCarts": "丢弃的购物车",
         "AboutPiwikX": "关于 Piwik %s",
@@ -177,7 +174,6 @@
         "Forums": "论坛",
         "FromReferrer": "来自",
         "GeneralInformation": "通用信息",
-        "GeneralSettings": "一般设置",
         "GetStarted": "开始",
         "GiveUsYourFeedback": "意见反馈！",
         "Goal": "目标",
@@ -406,6 +402,7 @@
         "VisitorID": "访客 ID",
         "VisitorIP": "访客 IP",
         "Visitors": "访客分析",
+        "VisitorSettings": "访客设置",
         "VisitsWith": "有%s的访客",
         "VisitType": "访客类型",
         "VisitTypeExample": "例如，要选择所有回头访客，包括那些以前购买过产品的，API 请求需要包含 %s",
diff --git a/lang/zh-tw.json b/lang/zh-tw.json
index a3786affde..7d324bce6d 100644
--- a/lang/zh-tw.json
+++ b/lang/zh-tw.json
@@ -102,7 +102,6 @@
         "Faq": "FAQ",
         "FileIntegrityWarningExplanation": "檔案完整性檢查錯誤且回報了一些問題。這大多是因為上傳了部分或錯誤的 Piwik 檔案所致。你應該使用 BINARY 模式重新上傳所有的 Piwik 檔案然後重新整理此頁面直到它沒有顯示任何錯誤。",
         "ForExampleShort": "例如",
-        "GeneralSettings": "一般設定",
         "GiveUsYourFeedback": "給我們反饋意見！",
         "Goal": "目標",
         "GoTo": "前往 %s",
@@ -236,6 +235,7 @@
         "View": "檢視",
         "VisitDuration": "平均訪問時間（以秒為單位）",
         "Visitors": "訪客",
+        "VisitorSettings": "造訪者設定值",
         "Warning": "警告",
         "WarningFileIntegrityNoManifest": "缺少 manifest.inc.php 所以檔案完整性檢查無法執行。",
         "WarningFileIntegrityNoMd5file": "缺少 md5_file() 函式所以檔案完整性檢查無法玩成。",
diff --git a/libs/PiwikTracker b/libs/PiwikTracker
new file mode 160000
+Subproject be8e96bdfcbc6360729de449b4a9d2c93d99791
diff --git a/libs/PiwikTracker/LICENSE.txt b/libs/PiwikTracker/LICENSE.txt
deleted file mode 100644
index 4f0e551f78..0000000000
--- a/libs/PiwikTracker/LICENSE.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright 2010  Matthieu Aubry 
-All rights reserved. 
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are 
-met: 
-
-* Redistributions of source code must retain the above copyright 
-  notice, this list of conditions and the following disclaimer. 
-
-* Redistributions in binary form must reproduce the above copyright 
-  notice, this list of conditions and the following disclaimer in the 
-  documentation and/or other materials provided with the distribution. 
-
-* Neither the name of Matthieu Aubry nor the names of its contributors 
-  may be used to endorse or promote products derived from this 
-  software without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
diff --git a/libs/PiwikTracker/PiwikTracker.php b/libs/PiwikTracker/PiwikTracker.php
deleted file mode 100644
index c998e1913d..0000000000
--- a/libs/PiwikTracker/PiwikTracker.php
+++ /dev/null
@@ -1,1761 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * Client to record visits, page views, Goals, Ecommerce activity (product views, add to carts, Ecommerce orders) in a Piwik server.
- * This is a PHP Version of the piwik.js standard Tracking API.
- * For more information, see http://piwik.org/docs/tracking-api/
- *
- * This class requires:
- *  - json extension (json_decode, json_encode)
- *  - CURL or STREAM extensions (to issue the http request to Piwik)
- *
- * @license released under BSD License http://www.opensource.org/licenses/bsd-license.php
- * @link http://piwik.org/docs/tracking-api/
- *
- * @category Piwik
- * @package PiwikTracker
- */
-
-/**
- * PiwikTracker implements the Piwik Tracking Web API.
- *
- * The PHP Tracking Client provides all features of the Javascript Tracker, such as Ecommerce Tracking, Custom Variable, Event tracking and more.
- * Functions are named the same as the Javascript functions.
- *
- * See introduction docs at: {@link http://piwik.org/docs/tracking-api/}
- *
- * ### Example: using the PHP PiwikTracker class
- *
- * The following code snippet is an advanced example of how to track a Page View using the Tracking API PHP client.
- *
- *      $t = new PiwikTracker( $idSite = 1, 'http://example.org/piwik/');
- *
- *      // Optional function calls
- *      $t->setUserAgent( "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB) Firefox/3.6.6");
- *      $t->setBrowserLanguage('fr');
- *      $t->setLocalTime( '12:34:06' );
- *      $t->setResolution( 1024, 768 );
- *      $t->setBrowserHasCookies(true);
- *      $t->setPlugins($flash = true, $java = true, $director = false);
- *
- *      // set a Custom Variable called 'Gender'
- *      $t->setCustomVariable( 1, 'gender', 'male' );
- *
- *      // If you want to force the visitor IP, or force the server date time to a date in the past,
- *      // it is required to authenticate the Tracking request by calling setTokenAuth
- *      // You can pass the Super User token_auth or any user with 'admin' privilege on the website $idSite
- *      $t->setTokenAuth( $token_auth );
- *      $t->setIp( "134.10.22.1" );
- *      $t->setForceVisitDateTime( '2011-04-05 23:55:02' );
- *
- *      // if you wanted to force to record the page view or conversion to a specific User ID
- *      // $t->setUserId( "username@example.org" );
- *      // Mandatory: set the URL being tracked
- *      $t->setUrl( $url = 'http://example.org/store/list-category-toys/' );
- *
- *      // Finally, track the page view with a Custom Page Title
- *      // In the standard JS API, the content of the <title> tag would be set as the page title
- *      $t->doTrackPageView('This is the page title');
- *
- * ### Example: tracking Ecommerce interactions
- *
- * Here is an example showing how to track Ecommerce interactions on your website, using the PHP Tracking API.
- * Usually, Ecommerce tracking is done using standard Javascript code,
- * but it is very common to record Ecommerce interactions after the fact
- * (for example, when payment is done with Paypal and user doesn't come back on the website after purchase).
- * For more information about Ecommerce tracking in Piwik, check out the documentation: Tracking Ecommerce in Piwik.
- *
- *      $t = new PiwikTracker( $idSite = 1, 'http://example.org/piwik/');
- *
- *      // Force IP to the actual visitor IP
- *      $t->setTokenAuth( $token_auth );
- *      $t->setIp( "134.10.22.1" );
- *
- *      // Example 1: on a Product page, track an "Ecommerce Product view"
- *      $t->setUrl( $url = 'http://www.mystore.com/Endurance-Shackletons-Legendary-Antarctic-Expedition' );
- *      $t->setEcommerceView($sku = 'SKU0011', $name = 'Endurance - Shackleton', $category = 'Books');
- *      $t->doTrackPageView( 'Endurance Shackletons Legendary Antarctic Expedition - Mystore.com');
- *
- *      // Example 2: Tracking Ecommerce Cart containing 2 products
- *      $t->addEcommerceItem($sku = 'SKU0011', $name = 'Endurance - Shackleton' , $category = 'Books', $price = 17, $quantity = 1);
- *      // Note that when setting a product category, you can specify an array of up to 5 categories to track for this product
- *      $t->addEcommerceItem($sku = 'SKU0321', $name = 'Amélie' , $categories = array('DVD Foreign','Best sellers','Our pick'), $price = 25, $quantity = 1);
- *      $t->doTrackEcommerceCartUpdate($grandTotal = 42);
- *
- *      // Example 3: Tracking Ecommerce Order
- *      $t->addEcommerceItem($sku = 'SKU0011', $name = 'Endurance - Shackleton' , $category = 'Books', $price = 17, $quantity = 1);
- *      $t->addEcommerceItem($sku = 'SKU0321', $name = 'Amélie' , $categories = array('DVD Foreign','Best sellers','Our pick'), $price = 25, $quantity = 1);
- *      $t->doTrackEcommerceOrder($orderId = 'B000111387', $grandTotal = 55.5, $subTotal = 42, $tax = 8, $shipping = 5.5, $discount = 10);
- *
- * ### Note: authenticating with the token_auth
- *
- * To set the visitor IP, or the date and time of the visit, or to force to record the visit (or page, or goal conversion) to a specific Visitor ID,
- * you must call setTokenAuth( $token_auth ). The token_auth must be either the Super User token_auth,
- * or the token_auth of any user with 'admin' permission for the website you are recording data against.
- *
- * @package PiwikTracker
- * @api
- */
-class PiwikTracker
-{
-    /**
-     * Piwik base URL, for example http://example.org/piwik/
-     * Must be set before using the class by calling
-     *  PiwikTracker::$URL = 'http://yourwebsite.org/piwik/';
-     *
-     * @var string
-     */
-    static public $URL = '';
-
-    /**
-     * API Version
-     *
-     * @ignore
-     * @var int
-     */
-    const VERSION = 1;
-
-    /**
-     * @ignore
-     */
-    public $DEBUG_APPEND_URL = '';
-
-    /**
-     * Visitor ID length
-     *
-     * @ignore
-     */
-    const LENGTH_VISITOR_ID = 16;
-
-    /**
-     * Charset
-     * @see setPageCharset
-     * @ignore
-     */
-    const DEFAULT_CHARSET_PARAMETER_VALUES = 'utf-8';
-
-    /**
-     * See piwik.js
-     */
-    const FIRST_PARTY_COOKIES_PREFIX = '_pk_';
-
-    /**
-     * Ecommerce item page view tracking stores item's metadata in these Custom Variables slots.
-     */
-    const CVAR_INDEX_ECOMMERCE_ITEM_PRICE = 2;
-    const CVAR_INDEX_ECOMMERCE_ITEM_SKU = 3;
-    const CVAR_INDEX_ECOMMERCE_ITEM_NAME = 4;
-    const CVAR_INDEX_ECOMMERCE_ITEM_CATEGORY = 5;
-
-    const DEFAULT_COOKIE_PATH = '/';
-
-    /**
-     * Builds a PiwikTracker object, used to track visits, pages and Goal conversions
-     * for a specific website, by using the Piwik Tracking API.
-     *
-     * @param int $idSite Id site to be tracked
-     * @param string $apiUrl "http://example.org/piwik/" or "http://piwik.example.org/"
-     *                         If set, will overwrite PiwikTracker::$URL
-     */
-    function __construct($idSite, $apiUrl = '')
-    {
-        $this->userAgent = false;
-        $this->localHour = false;
-        $this->localMinute = false;
-        $this->localSecond = false;
-        $this->hasCookies = false;
-        $this->plugins = false;
-        $this->pageCustomVar = false;
-        $this->eventCustomVar = false;
-        $this->customData = false;
-        $this->forcedDatetime = false;
-        $this->forcedNewVisit = false;
-        $this->token_auth = false;
-        $this->attributionInfo = false;
-        $this->ecommerceLastOrderTimestamp = false;
-        $this->ecommerceItems = array();
-        $this->generationTime = false;
-
-        $this->idSite = $idSite;
-        $this->urlReferrer = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : false;
-        $this->pageCharset = self::DEFAULT_CHARSET_PARAMETER_VALUES;
-        $this->pageUrl = self::getCurrentUrl();
-        $this->ip = !empty($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : false;
-        $this->acceptLanguage = !empty($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : false;
-        $this->userAgent = !empty($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : false;
-        if (!empty($apiUrl)) {
-            self::$URL = $apiUrl;
-        }
-
-        // Life of the visitor cookie (in sec)
-        $this->configVisitorCookieTimeout = 33955200; // 13 months (365 + 28 days)
-        // Life of the session cookie (in sec)
-        $this->configSessionCookieTimeout = 1800; // 30 minutes
-        // Life of the session cookie (in sec)
-        $this->configReferralCookieTimeout = 15768000; // 6 months
-
-        // Visitor Ids in order
-        $this->userId = false;
-        $this->forcedVisitorId = false;
-        $this->cookieVisitorId = false;
-        $this->randomVisitorId = false;
-
-        $this->setNewVisitorId();
-
-        $this->configCookiesDisabled = false;
-        $this->configCookiePath = self::DEFAULT_COOKIE_PATH;
-        $this->configCookieDomain = '';
-
-        $this->currentTs = time();
-        $this->createTs = $this->currentTs;
-        $this->visitCount = 0;
-        $this->currentVisitTs = false;
-        $this->lastVisitTs = false;
-        $this->lastEcommerceOrderTs = false;
-
-        // Allow debug while blocking the request
-        $this->requestTimeout = 600;
-        $this->doBulkRequests = false;
-        $this->storedTrackingActions = array();
-
-        $this->sendImageResponse = true;
-
-        $this->visitorCustomVar = $this->getCustomVariablesFromCookie();
-    }
-
-    /**
-     * By default, Piwik expects utf-8 encoded values, for example
-     * for the page URL parameter values, Page Title, etc.
-     * It is recommended to only send UTF-8 data to Piwik.
-     * If required though, you can also specify another charset using this function.
-     *
-     * @param string $charset
-     */
-    public function setPageCharset($charset = '')
-    {
-        $this->pageCharset = $charset;
-    }
-
-    /**
-     * Sets the current URL being tracked
-     *
-     * @param string $url Raw URL (not URL encoded)
-     */
-    public function setUrl($url)
-    {
-        $this->pageUrl = $url;
-    }
-
-    /**
-     * Sets the URL referrer used to track Referrers details for new visits.
-     *
-     * @param string $url Raw URL (not URL encoded)
-     */
-    public function setUrlReferrer($url)
-    {
-        $this->urlReferrer = $url;
-    }
-
-    /**
-     * Sets the time that generating the document on the server side took.
-     *
-     * @param int $timeMs Generation time in ms
-     */
-    public function setGenerationTime($timeMs)
-    {
-        $this->generationTime = $timeMs;
-    }
-
-    /**
-     * @deprecated
-     * @ignore
-     */
-    public function setUrlReferer($url)
-    {
-        $this->setUrlReferrer($url);
-    }
-
-    /**
-     * Sets the attribution information to the visit, so that subsequent Goal conversions are
-     * properly attributed to the right Referrer URL, timestamp, Campaign Name & Keyword.
-     *
-     * This must be a JSON encoded string that would typically be fetched from the JS API:
-     * piwikTracker.getAttributionInfo() and that you have JSON encoded via JSON2.stringify()
-     *
-     * If you call enableCookies() then these referral attribution values will be set
-     * to the 'ref' first party cookie storing referral information.
-     *
-     * @param string $jsonEncoded JSON encoded array containing Attribution info
-     * @throws Exception
-     * @see function getAttributionInfo() in https://github.com/piwik/piwik/blob/master/js/piwik.js
-     */
-    public function setAttributionInfo($jsonEncoded)
-    {
-        $decoded = json_decode($jsonEncoded, $assoc = true);
-        if (!is_array($decoded)) {
-            throw new Exception("setAttributionInfo() is expecting a JSON encoded string, $jsonEncoded given");
-        }
-        $this->attributionInfo = $decoded;
-    }
-
-    /**
-     * Sets Visit Custom Variable.
-     * See http://piwik.org/docs/custom-variables/
-     *
-     * @param int $id Custom variable slot ID from 1-5
-     * @param string $name Custom variable name
-     * @param string $value Custom variable value
-     * @param string $scope Custom variable scope. Possible values: visit, page, event
-     * @throws Exception
-     */
-    public function setCustomVariable($id, $name, $value, $scope = 'visit')
-    {
-        if (!is_int($id)) {
-            throw new Exception("Parameter id to setCustomVariable should be an integer");
-        }
-        if ($scope == 'page') {
-            $this->pageCustomVar[$id] = array($name, $value);
-        } elseif($scope == 'event') {
-            $this->eventCustomVar[$id] = array($name, $value);
-        } elseif ($scope == 'visit') {
-            $this->visitorCustomVar[$id] = array($name, $value);
-        } else {
-            throw new Exception("Invalid 'scope' parameter value");
-        }
-    }
-
-    /**
-     * Returns the currently assigned Custom Variable.
-     *
-     * If scope is 'visit', it will attempt to read the value set in the first party cookie created by Piwik Tracker ($_COOKIE array).
-     *
-     * @param int $id Custom Variable integer index to fetch from cookie. Should be a value from 1 to 5
-     * @param string $scope Custom variable scope. Possible values: visit, page, event
-     *
-     * @throws Exception
-     * @return mixed An array with this format: array( 0 => CustomVariableName, 1 => CustomVariableValue ) or false
-     * @see Piwik.js getCustomVariable()
-     */
-    public function getCustomVariable($id, $scope = 'visit')
-    {
-        if ($scope == 'page') {
-            return isset($this->pageCustomVar[$id]) ? $this->pageCustomVar[$id] : false;
-        } elseif ($scope == 'event') {
-            return  isset($this->eventCustomVar[$id]) ? $this->eventCustomVar[$id] : false;
-        } else if ($scope != 'visit') {
-            throw new Exception("Invalid 'scope' parameter value");
-        }
-        if (!empty($this->visitorCustomVar[$id])) {
-            return $this->visitorCustomVar[$id];
-        }
-        $cookieDecoded = $this->getCustomVariablesFromCookie();
-        if (!is_int($id)) {
-            throw new Exception("Parameter to getCustomVariable should be an integer");
-        }
-        if (!is_array($cookieDecoded)
-            || !isset($cookieDecoded[$id])
-            || !is_array($cookieDecoded[$id])
-            || count($cookieDecoded[$id]) != 2
-        ) {
-            return false;
-        }
-        return $cookieDecoded[$id];
-    }
-
-    /**
-     * Clears any Custom Variable that may be have been set.
-     *
-     * This can be useful when you have enabled bulk requests,
-     * and you wish to clear Custom Variables of 'visit' scope.
-     */
-    public function clearCustomVariables()
-    {
-        $this->visitorCustomVar = array();
-        $this->pageCustomVar = array();
-        $this->eventCustomVar = array();
-    }
-
-
-    /**
-     * Sets the current visitor ID to a random new one.
-     */
-    public function setNewVisitorId()
-    {
-        $this->randomVisitorId = substr(md5(uniqid(rand(), true)), 0, self::LENGTH_VISITOR_ID);
-        $this->userId = false;
-        $this->forcedVisitorId = false;
-        $this->cookieVisitorId = false;
-    }
-
-    /**
-     * Sets the current site ID.
-     *
-     * @param int $idSite
-     */
-    public function setIdSite($idSite)
-    {
-        $this->idSite = $idSite;
-    }
-
-    /**
-     * Sets the Browser language. Used to guess visitor countries when GeoIP is not enabled
-     *
-     * @param string $acceptLanguage For example "fr-fr"
-     */
-    public function setBrowserLanguage($acceptLanguage)
-    {
-        $this->acceptLanguage = $acceptLanguage;
-    }
-
-    /**
-     * Sets the user agent, used to detect OS and browser.
-     * If this function is not called, the User Agent will default to the current user agent.
-     *
-     * @param string $userAgent
-     */
-    public function setUserAgent($userAgent)
-    {
-        $this->userAgent = $userAgent;
-    }
-
-    /**
-     * Sets the country of the visitor. If not used, Piwik will try to find the country
-     * using either the visitor's IP address or language.
-     *
-     * Allowed only for Admin/Super User, must be used along with setTokenAuth().
-     * @param string $country
-     */
-    public function setCountry($country)
-    {
-        $this->country = $country;
-    }
-
-    /**
-     * Sets the region of the visitor. If not used, Piwik may try to find the region
-     * using the visitor's IP address (if configured to do so).
-     *
-     * Allowed only for Admin/Super User, must be used along with setTokenAuth().
-     * @param string $region
-     */
-    public function setRegion($region)
-    {
-        $this->region = $region;
-    }
-
-    /**
-     * Sets the city of the visitor. If not used, Piwik may try to find the city
-     * using the visitor's IP address (if configured to do so).
-     *
-     * Allowed only for Admin/Super User, must be used along with setTokenAuth().
-     * @param string $city
-     */
-    public function setCity($city)
-    {
-        $this->city = $city;
-    }
-
-    /**
-     * Sets the latitude of the visitor. If not used, Piwik may try to find the visitor's
-     * latitude using the visitor's IP address (if configured to do so).
-     *
-     * Allowed only for Admin/Super User, must be used along with setTokenAuth().
-     * @param float $lat
-     */
-    public function setLatitude($lat)
-    {
-        $this->lat = $lat;
-    }
-
-    /**
-     * Sets the longitude of the visitor. If not used, Piwik may try to find the visitor's
-     * longitude using the visitor's IP address (if configured to do so).
-     *
-     * Allowed only for Admin/Super User, must be used along with setTokenAuth().
-     * @param float $long
-     */
-    public function setLongitude($long)
-    {
-        $this->long = $long;
-    }
-
-    /**
-     * Enables the bulk request feature. When used, each tracking action is stored until the
-     * doBulkTrack method is called. This method will send all tracking data at once.
-     *
-     */
-    public function enableBulkTracking()
-    {
-        $this->doBulkRequests = true;
-    }
-
-    /**
-     * Enable Cookie Creation - this will cause a first party VisitorId cookie to be set when the VisitorId is set or reset
-     *
-     * @param string $domain (optional) Set first-party cookie domain. Accepted values: example.com, *.example.com (same as .example.com) or subdomain.example.com
-     * @param string $path (optional) Set first-party cookie path
-     */
-    public function enableCookies( $domain = '', $path = '/' )
-    {
-        $this->configCookiesDisabled = false;
-        $this->configCookieDomain = self::domainFixup($domain);
-        $this->configCookiePath = $path;
-    }
-
-    /**
-     * If image response is disabled Piwik will respond with a HTTP 204 header instead of responding with a gif.
-     */
-    public function disableSendImageResponse()
-    {
-        $this->sendImageResponse = false;
-    }
-
-    /**
-     * Fix-up domain
-     */
-    static protected function domainFixup($domain)
-    {
-        $dl = strlen($domain) - 1;
-        // remove trailing '.'
-        if ($domain{$dl} === '.') {
-            $domain = substr($domain, 0, $dl);
-        }
-        // remove leading '*'
-        if (substr($domain, 0, 2) === '*.') {
-            $domain = substr($domain, 1);
-        }
-        return $domain;
-    }
-
-    /**
-     * Get cookie name with prefix and domain hash
-     */
-    protected function getCookieName($cookieName) {
-        // NOTE: If the cookie name is changed, we must also update the method in piwik.js with the same name.
-        $hash = substr( sha1( ($this->configCookieDomain == '' ? self::getCurrentHost() : $this->configCookieDomain)  . $this->configCookiePath ), 0, 4);
-        return self::FIRST_PARTY_COOKIES_PREFIX . $cookieName . '.' . $this->idSite . '.' . $hash;
-    }
-
-    /**
-     * Tracks a page view
-     *
-     * @param string $documentTitle Page title as it will appear in the Actions > Page titles report
-     * @return mixed Response string or true if using bulk requests.
-     */
-    public function doTrackPageView($documentTitle)
-    {
-        $url = $this->getUrlTrackPageView($documentTitle);
-        return $this->sendRequest($url);
-    }
-
-    /**
-     * Tracks an event
-     *
-     * @param string $category The Event Category (Videos, Music, Games...)
-     * @param string $action The Event's Action (Play, Pause, Duration, Add Playlist, Downloaded, Clicked...)
-     * @param string $name (optional) The Event's object Name (a particular Movie name, or Song name, or File name...)
-     * @param float $value (optional) The Event's value
-     * @return mixed Response string or true if using bulk requests.
-     */
-    public function doTrackEvent($category, $action, $name = false, $value = false)
-    {
-        $url = $this->getUrlTrackEvent($category, $action, $name, $value);
-        return $this->sendRequest($url);
-    }
-
-    /**
-     * Tracks a content impression
-     *
-     * @param string $contentName The name of the content. For instance 'Ad Foo Bar'
-     * @param string $contentPiece The actual content. For instance the path to an image, video, audio, any text
-     * @param string|false $contentTarget (optional) The target of the content. For instance the URL of a landing page.
-     * @return mixed Response string or true if using bulk requests.
-     */
-    public function doTrackContentImpression($contentName, $contentPiece = 'Unknown', $contentTarget = false)
-    {
-        $url = $this->getUrlTrackContentImpression($contentName, $contentPiece, $contentTarget);
-        return $this->sendRequest($url);
-    }
-
-    /**
-     * Tracks a content interaction. Make sure you have tracked a content impression using the same content name and
-     * content piece, otherwise it will not count. To do so you should call the method doTrackContentImpression();
-     *
-     * @param string $interaction The name of the interaction with the content. For instance a 'click'
-     * @param string $contentName The name of the content. For instance 'Ad Foo Bar'
-     * @param string $contentPiece The actual content. For instance the path to an image, video, audio, any text
-     * @param string|false $contentTarget (optional) The target the content leading to when an interaction occurs. For instance the URL of a landing page.
-     * @return mixed Response string or true if using bulk requests.
-     */
-    public function doTrackContentInteraction($interaction, $contentName, $contentPiece = 'Unknown', $contentTarget = false)
-    {
-        $url = $this->getUrlTrackContentInteraction($interaction, $contentName, $contentPiece, $contentTarget);
-        return $this->sendRequest($url);
-    }
-
-    /**
-     * Tracks an internal Site Search query, and optionally tracks the Search Category, and Search results Count.
-     * These are used to populate reports in Actions > Site Search.
-     *
-     * @param string $keyword Searched query on the site
-     * @param string $category (optional) Search engine category if applicable
-     * @param bool|int $countResults (optional) results displayed on the search result page. Used to track "zero result" keywords.
-     *
-     * @return mixed Response or true if using bulk requests.
-     */
-    public function doTrackSiteSearch($keyword, $category = '', $countResults = false)
-    {
-        $url = $this->getUrlTrackSiteSearch($keyword, $category, $countResults);
-        return $this->sendRequest($url);
-    }
-
-    /**
-     * Records a Goal conversion
-     *
-     * @param int $idGoal Id Goal to record a conversion
-     * @param float $revenue Revenue for this conversion
-     * @return mixed Response or true if using bulk request
-     */
-    public function doTrackGoal($idGoal, $revenue = 0.0)
-    {
-        $url = $this->getUrlTrackGoal($idGoal, $revenue);
-        return $this->sendRequest($url);
-    }
-
-    /**
-     * Tracks a download or outlink
-     *
-     * @param string $actionUrl URL of the download or outlink
-     * @param string $actionType Type of the action: 'download' or 'link'
-     * @return mixed Response or true if using bulk request
-     */
-    public function doTrackAction($actionUrl, $actionType)
-    {
-        // Referrer could be udpated to be the current URL temporarily (to mimic JS behavior)
-        $url = $this->getUrlTrackAction($actionUrl, $actionType);
-        return $this->sendRequest($url);
-    }
-
-    /**
-     * Adds an item in the Ecommerce order.
-     *
-     * This should be called before doTrackEcommerceOrder(), or before doTrackEcommerceCartUpdate().
-     * This function can be called for all individual products in the cart (or order).
-     * SKU parameter is mandatory. Other parameters are optional (set to false if value not known).
-     * Ecommerce items added via this function are automatically cleared when doTrackEcommerceOrder() or getUrlTrackEcommerceOrder() is called.
-     *
-     * @param string $sku (required) SKU, Product identifier
-     * @param string $name (optional) Product name
-     * @param string|array $category (optional) Product category, or array of product categories (up to 5 categories can be specified for a given product)
-     * @param float|int $price (optional) Individual product price (supports integer and decimal prices)
-     * @param int $quantity (optional) Product quantity. If not specified, will default to 1 in the Reports
-     * @throws Exception
-     */
-    public function addEcommerceItem($sku, $name = '', $category = '', $price = 0.0, $quantity = 1)
-    {
-        if (empty($sku)) {
-            throw new Exception("You must specify a SKU for the Ecommerce item");
-        }
-
-        $price = $this->forceDotAsSeparatorForDecimalPoint($price);
-
-        $this->ecommerceItems[$sku] = array($sku, $name, $category, $price, $quantity);
-    }
-
-    /**
-     * Tracks a Cart Update (add item, remove item, update item).
-     *
-     * On every Cart update, you must call addEcommerceItem() for each item (product) in the cart,
-     * including the items that haven't been updated since the last cart update.
-     * Items which were in the previous cart and are not sent in later Cart updates will be deleted from the cart (in the database).
-     *
-     * @param float $grandTotal Cart grandTotal (typically the sum of all items' prices)
-     * @return mixed Response or true if using bulk request
-     */
-    public function doTrackEcommerceCartUpdate($grandTotal)
-    {
-        $url = $this->getUrlTrackEcommerceCartUpdate($grandTotal);
-        return $this->sendRequest($url);
-    }
-
-    /**
-     * Sends all stored tracking actions at once. Only has an effect if bulk tracking is enabled.
-     *
-     * To enable bulk tracking, call enableBulkTracking().
-     *
-     * @throws Exception
-     * @return string Response
-     */
-    public function doBulkTrack()
-    {
-        if (empty($this->storedTrackingActions)) {
-            throw new Exception("Error:  you must call the function doTrackPageView or doTrackGoal from this class, before calling this method doBulkTrack()");
-        }
-
-        $data = array('requests' => $this->storedTrackingActions);
-
-        // token_auth is not required by default, except if bulk_requests_require_authentication=1
-        if(!empty($this->token_auth)) {
-            $data['token_auth'] = $this->token_auth;
-        }
-
-        $postData = json_encode($data);
-        $response = $this->sendRequest($this->getBaseUrl(), 'POST', $postData, $force = true);
-
-        $this->storedTrackingActions = array();
-
-        return $response;
-    }
-
-    /**
-     * Tracks an Ecommerce order.
-     *
-     * If the Ecommerce order contains items (products), you must call first the addEcommerceItem() for each item in the order.
-     * All revenues (grandTotal, subTotal, tax, shipping, discount) will be individually summed and reported in Piwik reports.
-     * Only the parameters $orderId and $grandTotal are required.
-     *
-     * @param string|int $orderId (required) Unique Order ID.
-     *                This will be used to count this order only once in the event the order page is reloaded several times.
-     *                orderId must be unique for each transaction, even on different days, or the transaction will not be recorded by Piwik.
-     * @param float $grandTotal (required) Grand Total revenue of the transaction (including tax, shipping, etc.)
-     * @param float $subTotal (optional) Sub total amount, typically the sum of items prices for all items in this order (before Tax and Shipping costs are applied)
-     * @param float $tax (optional) Tax amount for this order
-     * @param float $shipping (optional) Shipping amount for this order
-     * @param float $discount (optional) Discounted amount in this order
-     * @return mixed Response or true if using bulk request
-     */
-    public function doTrackEcommerceOrder($orderId, $grandTotal, $subTotal = 0.0, $tax = 0.0, $shipping = 0.0, $discount = 0.0)
-    {
-        $url = $this->getUrlTrackEcommerceOrder($orderId, $grandTotal, $subTotal, $tax, $shipping, $discount);
-        return $this->sendRequest($url);
-    }
-
-    /**
-     * Sets the current page view as an item (product) page view, or an Ecommerce Category page view.
-     *
-     * This must be called before doTrackPageView() on this product/category page.
-     * It will set 3 custom variables of scope "page" with the SKU, Name and Category for this page view.
-     * Note: Custom Variables of scope "page" slots 3, 4 and 5 will be used.
-     *
-     * On a category page, you may set the parameter $category only and set the other parameters to false.
-     *
-     * Tracking Product/Category page views will allow Piwik to report on Product & Categories
-     * conversion rates (Conversion rate = Ecommerce orders containing this product or category / Visits to the product or category)
-     *
-     * @param string $sku Product SKU being viewed
-     * @param string $name Product Name being viewed
-     * @param string|array $category Category being viewed. On a Product page, this is the product's category.
-     *                                You can also specify an array of up to 5 categories for a given page view.
-     * @param float $price Specify the price at which the item was displayed
-     */
-    public function setEcommerceView($sku = '', $name = '', $category = '', $price = 0.0)
-    {
-        if (!empty($category)) {
-            if (is_array($category)) {
-                $category = json_encode($category);
-            }
-        } else {
-            $category = "";
-        }
-        $this->pageCustomVar[self::CVAR_INDEX_ECOMMERCE_ITEM_CATEGORY] = array('_pkc', $category);
-
-        if (!empty($price)) {
-            $price = (float) $price;
-            $price = $this->forceDotAsSeparatorForDecimalPoint($price);
-            $this->pageCustomVar[self::CVAR_INDEX_ECOMMERCE_ITEM_PRICE] = array('_pkp', $price);
-        }
-
-        // On a category page, do not record "Product name not defined"
-        if (empty($sku) && empty($name)) {
-            return;
-        }
-        if (!empty($sku)) {
-            $this->pageCustomVar[self::CVAR_INDEX_ECOMMERCE_ITEM_SKU] = array('_pks', $sku);
-        }
-        if (empty($name)) {
-            $name = "";
-        }
-        $this->pageCustomVar[self::CVAR_INDEX_ECOMMERCE_ITEM_NAME] = array('_pkn', $name);
-    }
-
-    /**
-     * Force the separator for decimal point to be a dot. See https://github.com/piwik/piwik/issues/6435
-     * If for instance a German locale is used it would be a comma otherwise.
-     *
-     * @param  float|string $value
-     * @return string
-     */
-    private function forceDotAsSeparatorForDecimalPoint($value)
-    {
-        if (null === $value || false === $value) {
-            return $value;
-        }
-
-        return str_replace(',', '.', $value);
-    }
-
-    /**
-     * Returns URL used to track Ecommerce Cart updates
-     * Calling this function will reinitializes the property ecommerceItems to empty array
-     * so items will have to be added again via addEcommerceItem()
-     * @ignore
-     */
-    public function getUrlTrackEcommerceCartUpdate($grandTotal)
-    {
-        $url = $this->getUrlTrackEcommerce($grandTotal);
-        return $url;
-    }
-
-    /**
-     * Returns URL used to track Ecommerce Orders
-     * Calling this function will reinitializes the property ecommerceItems to empty array
-     * so items will have to be added again via addEcommerceItem()
-     * @ignore
-     */
-    public function getUrlTrackEcommerceOrder($orderId, $grandTotal, $subTotal = 0.0, $tax = 0.0, $shipping = 0.0, $discount = 0.0)
-    {
-        if (empty($orderId)) {
-            throw new Exception("You must specifiy an orderId for the Ecommerce order");
-        }
-        $url = $this->getUrlTrackEcommerce($grandTotal, $subTotal, $tax, $shipping, $discount);
-        $url .= '&ec_id=' . urlencode($orderId);
-        $this->ecommerceLastOrderTimestamp = $this->getTimestamp();
-        return $url;
-    }
-
-    /**
-     * Returns URL used to track Ecommerce orders
-     * Calling this function will reinitializes the property ecommerceItems to empty array
-     * so items will have to be added again via addEcommerceItem()
-     * @ignore
-     */
-    protected function getUrlTrackEcommerce($grandTotal, $subTotal = 0.0, $tax = 0.0, $shipping = 0.0, $discount = 0.0)
-    {
-        if (!is_numeric($grandTotal)) {
-            throw new Exception("You must specifiy a grandTotal for the Ecommerce order (or Cart update)");
-        }
-
-        $url = $this->getRequest($this->idSite);
-        $url .= '&idgoal=0';
-        if (!empty($grandTotal)) {
-            $grandTotal = $this->forceDotAsSeparatorForDecimalPoint($grandTotal);
-            $url .= '&revenue=' . $grandTotal;
-        }
-        if (!empty($subTotal)) {
-            $subTotal = $this->forceDotAsSeparatorForDecimalPoint($subTotal);
-            $url .= '&ec_st=' . $subTotal;
-        }
-        if (!empty($tax)) {
-            $tax  = $this->forceDotAsSeparatorForDecimalPoint($tax);
-            $url .= '&ec_tx=' . $tax;
-        }
-        if (!empty($shipping)) {
-            $shipping = $this->forceDotAsSeparatorForDecimalPoint($shipping);
-            $url .= '&ec_sh=' . $shipping;
-        }
-        if (!empty($discount)) {
-            $discount = $this->forceDotAsSeparatorForDecimalPoint($discount);
-            $url .= '&ec_dt=' . $discount;
-        }
-        if (!empty($this->ecommerceItems)) {
-            // Removing the SKU index in the array before JSON encoding
-            $items = array();
-            foreach ($this->ecommerceItems as $item) {
-                $items[] = $item;
-            }
-            $url .= '&ec_items=' . urlencode(json_encode($items));
-        }
-        $this->ecommerceItems = array();
-        return $url;
-    }
-
-    /**
-     * Builds URL to track a page view.
-     *
-     * @see doTrackPageView()
-     * @param string $documentTitle Page view name as it will appear in Piwik reports
-     * @return string URL to piwik.php with all parameters set to track the pageview
-     */
-    public function getUrlTrackPageView($documentTitle = '')
-    {
-        $url = $this->getRequest($this->idSite);
-        if (strlen($documentTitle) > 0) {
-            $url .= '&action_name=' . urlencode($documentTitle);
-        }
-        return $url;
-    }
-
-    /**
-     * Builds URL to track a custom event.
-     *
-     * @see doTrackEvent()
-     * @param string $category The Event Category (Videos, Music, Games...)
-     * @param string $action The Event's Action (Play, Pause, Duration, Add Playlist, Downloaded, Clicked...)
-     * @param string $name (optional) The Event's object Name (a particular Movie name, or Song name, or File name...)
-     * @param float $value (optional) The Event's value
-     * @return string URL to piwik.php with all parameters set to track the pageview
-     */
-    public function getUrlTrackEvent($category, $action, $name = false, $value = false)
-    {
-        $url = $this->getRequest($this->idSite);
-        if(strlen($category) == 0) {
-            throw new Exception("You must specify an Event Category name (Music, Videos, Games...).");
-        }
-        if(strlen($action) == 0) {
-            throw new Exception("You must specify an Event action (click, view, add...).");
-        }
-
-        $url .= '&e_c=' . urlencode($category);
-        $url .= '&e_a=' . urlencode($action);
-
-        if(strlen($name) > 0) {
-            $url .= '&e_n=' . urlencode($name);
-        }
-        if(strlen($value) > 0) {
-            $value = $this->forceDotAsSeparatorForDecimalPoint($value);
-            $url  .= '&e_v=' . $value;
-        }
-        return $url;
-    }
-
-    /**
-     * Builds URL to track a content impression.
-     *
-     * @see doTrackContentImpression()
-     * @param string $contentName The name of the content. For instance 'Ad Foo Bar'
-     * @param string $contentPiece The actual content. For instance the path to an image, video, audio, any text
-     * @param string|false $contentTarget (optional) The target of the content. For instance the URL of a landing page.
-     * @throws Exception In case $contentName is empty
-     * @return string URL to piwik.php with all parameters set to track the pageview
-     */
-    public function getUrlTrackContentImpression($contentName, $contentPiece, $contentTarget)
-    {
-        $url = $this->getRequest($this->idSite);
-
-        if (strlen($contentName) == 0) {
-            throw new Exception("You must specify a content name");
-        }
-
-        $url .= '&c_n=' . urlencode($contentName);
-
-        if (!empty($contentPiece) && strlen($contentPiece) > 0) {
-            $url .= '&c_p=' . urlencode($contentPiece);
-        }
-        if (!empty($contentTarget) && strlen($contentTarget) > 0) {
-            $url .= '&c_t=' . urlencode($contentTarget);
-        }
-
-        return $url;
-    }
-
-    /**
-     * Builds URL to track a content impression.
-     *
-     * @see doTrackContentInteraction()
-     * @param string $interaction The name of the interaction with the content. For instance a 'click'
-     * @param string $contentName The name of the content. For instance 'Ad Foo Bar'
-     * @param string $contentPiece The actual content. For instance the path to an image, video, audio, any text
-     * @param string|false $contentTarget (optional) The target the content leading to when an interaction occurs. For instance the URL of a landing page.
-     * @throws Exception In case $interaction or $contentName is empty
-     * @return string URL to piwik.php with all parameters set to track the pageview
-     */
-    public function getUrlTrackContentInteraction($interaction, $contentName, $contentPiece, $contentTarget)
-    {
-        $url = $this->getRequest($this->idSite);
-
-        if (strlen($interaction) == 0) {
-            throw new Exception("You must specify a name for the interaction");
-        }
-
-        if (strlen($contentName) == 0) {
-            throw new Exception("You must specify a content name");
-        }
-
-        $url .= '&c_i=' . urlencode($interaction);
-        $url .= '&c_n=' . urlencode($contentName);
-
-        if (!empty($contentPiece) && strlen($contentPiece) > 0) {
-            $url .= '&c_p=' . urlencode($contentPiece);
-        }
-        if (!empty($contentTarget) && strlen($contentTarget) > 0) {
-            $url .= '&c_t=' . urlencode($contentTarget);
-        }
-
-        return $url;
-    }
-
-    /**
-     * Builds URL to track a site search.
-     *
-     * @see doTrackSiteSearch()
-     * @param string $keyword
-     * @param string $category
-     * @param int $countResults
-     * @return string
-     */
-    public function getUrlTrackSiteSearch($keyword, $category, $countResults)
-    {
-        $url = $this->getRequest($this->idSite);
-        $url .= '&search=' . urlencode($keyword);
-        if (strlen($category) > 0) {
-            $url .= '&search_cat=' . urlencode($category);
-        }
-        if (!empty($countResults) || $countResults === 0) {
-            $url .= '&search_count=' . (int)$countResults;
-        }
-        return $url;
-    }
-
-    /**
-     * Builds URL to track a goal with idGoal and revenue.
-     *
-     * @see doTrackGoal()
-     * @param int $idGoal Id Goal to record a conversion
-     * @param float $revenue Revenue for this conversion
-     * @return string URL to piwik.php with all parameters set to track the goal conversion
-     */
-    public function getUrlTrackGoal($idGoal, $revenue = 0.0)
-    {
-        $url = $this->getRequest($this->idSite);
-        $url .= '&idgoal=' . $idGoal;
-        if (!empty($revenue)) {
-            $revenue = $this->forceDotAsSeparatorForDecimalPoint($revenue);
-            $url    .= '&revenue=' . $revenue;
-        }
-        return $url;
-    }
-
-    /**
-     * Builds URL to track a new action.
-     *
-     * @see doTrackAction()
-     * @param string $actionUrl URL of the download or outlink
-     * @param string $actionType Type of the action: 'download' or 'link'
-     * @return string URL to piwik.php with all parameters set to track an action
-     */
-    public function getUrlTrackAction($actionUrl, $actionType)
-    {
-        $url = $this->getRequest($this->idSite);
-        $url .= '&' . $actionType . '=' . $actionUrl;
-        return $url;
-    }
-
-    /**
-     * Overrides server date and time for the tracking requests.
-     * By default Piwik will track requests for the "current datetime" but this function allows you
-     * to track visits in the past. All times are in UTC.
-     *
-     * Allowed only for Super User, must be used along with setTokenAuth()
-     * @see setTokenAuth()
-     * @param string $dateTime Date with the format 'Y-m-d H:i:s', or a UNIX timestamp
-     */
-    public function setForceVisitDateTime($dateTime)
-    {
-        $this->forcedDatetime = $dateTime;
-    }
-
-    /**
-     * Forces Piwik to create a new visit for the tracking request.
-     *
-     * By default, Piwik will create a new visit if the last request by this user was more than 30 minutes ago.
-     * If you call setForceNewVisit() before calling doTrack*, then a new visit will be created for this request.
-     *
-     */
-    public function setForceNewVisit()
-    {
-        $this->forcedNewVisit = true;
-    }
-
-    /**
-     * Overrides IP address
-     *
-     * Allowed only for Super User, must be used along with setTokenAuth()
-     * @see setTokenAuth()
-     * @param string $ip IP string, eg. 130.54.2.1
-     */
-    public function setIp($ip)
-    {
-        $this->ip = $ip;
-    }
-
-    /**
-     * Force the action to be recorded for a specific User. The User ID is a string representing a given user in your system.
-     *
-     * A User ID can be a username, UUID or an email address, or any number or string that uniquely identifies a user or client.
-     *
-     * @param string $userId  Any user ID string (eg. email address, ID, username). Must be non empty. Set to false to de-assign a user id previously set.
-     * @throws Exception
-     */
-    public function setUserId($userId)
-    {
-        if($userId === false) {
-            $this->setNewVisitorId();
-            return;
-        }
-        if($userId === '') {
-            throw new Exception("User ID cannot be empty.");
-        }
-        $this->userId = $userId;
-    }
-
-    /**
-     * Hash function used internally by Piwik to hash a User ID into the Visitor ID.
-     *
-     * Note: matches implementation of Tracker\Request->getUserIdHashed()
-     *
-     * @param $id
-     * @return string
-     */
-    static public function getUserIdHashed($id)
-    {
-        return substr( sha1( $id ), 0, 16);
-    }
-
-    /**
-     * Forces the requests to be recorded for the specified Visitor ID.
-     * Note: it is recommended to use ->setUserId($userId); instead.
-     *
-     * Rather than letting Piwik attribute the user with a heuristic based on IP and other user fingeprinting attributes,
-     * force the action to be recorded for a particular visitor.
-     *
-     * If you use both setVisitorId and setUserId, setUserId will take precedence.
-     * If not set, the visitor ID will be fetched from the 1st party cookie, or will be set to a random UUID.
-     *
-     * @deprecated We recommend to use  ->setUserId($userId).
-     * @param string $visitorId 16 hexadecimal characters visitor ID, eg. "33c31e01394bdc63"
-     * @throws Exception
-     */
-    public function setVisitorId($visitorId)
-    {
-        $hexChars = '01234567890abcdefABCDEF';
-        if (strlen($visitorId) != self::LENGTH_VISITOR_ID
-            || strspn($visitorId, $hexChars) !== strlen($visitorId)
-        ) {
-            throw new Exception("setVisitorId() expects a "
-                . self::LENGTH_VISITOR_ID
-                . " characters hexadecimal string (containing only the following: "
-                . $hexChars
-                . ")");
-        }
-        $this->forcedVisitorId = $visitorId;
-    }
-
-    /**
-     * If the user initiating the request has the Piwik first party cookie,
-     * this function will try and return the ID parsed from this first party cookie (found in $_COOKIE).
-     *
-     * If you call this function from a server, where the call is triggered by a cron or script
-     * not initiated by the actual visitor being tracked, then it will return
-     * the random Visitor ID that was assigned to this visit object.
-     *
-     * This can be used if you wish to record more visits, actions or goals for this visitor ID later on.
-     *
-     * @return string 16 hex chars visitor ID string
-     */
-    public function getVisitorId()
-    {
-        if (!empty($this->userId)) {
-            return $this->getUserIdHashed($this->userId);
-        }
-        if (!empty($this->forcedVisitorId)) {
-            return $this->forcedVisitorId;
-        }
-        if ($this->loadVisitorIdCookie()) {
-            return $this->cookieVisitorId;
-        }
-        return $this->randomVisitorId;
-    }
-
-
-    /**
-     * Returns the User ID string, which may have been set via:
-     *     $v->setUserId('username@example.org');
-     *
-     * @return bool
-     */
-    public function getUserId()
-    {
-        return $this->userId;
-    }
-
-    /**
-     * Loads values from the VisitorId Cookie
-     *
-     * @return bool True if cookie exists and is valid, False otherwise
-     */
-    protected function loadVisitorIdCookie()
-    {
-        $idCookie = $this->getCookieMatchingName('id');
-        if ($idCookie === false) {
-            return false;
-        }
-        $parts = explode('.', $idCookie);
-        if (strlen($parts[0]) != self::LENGTH_VISITOR_ID) {
-            return false;
-        }
-        $this->cookieVisitorId = $parts[0]; // provides backward compatibility since getVisitorId() didn't change any existing VisitorId value
-        $this->createTs = $parts[1];
-        $this->visitCount = (int)$parts[2];
-        $this->currentVisitTs = $parts[3];
-        $this->lastVisitTs = $parts[4];
-        if(isset($parts[5])) {
-            $this->lastEcommerceOrderTs = $parts[5];
-        }
-        return true;
-    }
-
-    /**
-     * Deletes all first party cookies from the client
-     */
-    public function deleteCookies()
-    {
-        $expire = $this->currentTs - 86400;
-        $cookies = array('id', 'ses', 'cvar', 'ref');
-        foreach($cookies as $cookie) {
-            $this->setCookie($cookie, '', $expire);
-        }
-    }
-
-    /**
-     * Returns the currently assigned Attribution Information stored in a first party cookie.
-     *
-     * This function will only work if the user is initiating the current request, and his cookies
-     * can be read by PHP from the $_COOKIE array.
-     *
-     * @return string JSON Encoded string containing the Referrer information for Goal conversion attribution.
-     *                Will return false if the cookie could not be found
-     * @see Piwik.js getAttributionInfo()
-     */
-    public function getAttributionInfo()
-    {
-        if(!empty($this->attributionInfo)) {
-            return json_encode($this->attributionInfo);
-        }
-        return $this->getCookieMatchingName('ref');
-    }
-
-    /**
-     * Some Tracking API functionnality requires express authentication, using either the
-     * Super User token_auth, or a user with 'admin' access to the website.
-     *
-     * The following features require access:
-     * - force the visitor IP
-     * - force the date & time of the tracking requests rather than track for the current datetime
-     *
-     * @param string $token_auth token_auth 32 chars token_auth string
-     */
-    public function setTokenAuth($token_auth)
-    {
-        $this->token_auth = $token_auth;
-    }
-
-    /**
-     * Sets local visitor time
-     *
-     * @param string $time HH:MM:SS format
-     */
-    public function setLocalTime($time)
-    {
-        list($hour, $minute, $second) = explode(':', $time);
-        $this->localHour = (int)$hour;
-        $this->localMinute = (int)$minute;
-        $this->localSecond = (int)$second;
-    }
-
-    /**
-     * Sets user resolution width and height.
-     *
-     * @param int $width
-     * @param int $height
-     */
-    public function setResolution($width, $height)
-    {
-        $this->width = $width;
-        $this->height = $height;
-    }
-
-    /**
-     * Sets if the browser supports cookies
-     * This is reported in "List of plugins" report in Piwik.
-     *
-     * @param bool $bool
-     */
-    public function setBrowserHasCookies($bool)
-    {
-        $this->hasCookies = $bool;
-    }
-
-    /**
-     * Will append a custom string at the end of the Tracking request.
-     * @param string $string
-     */
-    public function setDebugStringAppend($string)
-    {
-        $this->DEBUG_APPEND_URL = '&' . $string;
-    }
-
-    /**
-     * Sets visitor browser supported plugins
-     *
-     * @param bool $flash
-     * @param bool $java
-     * @param bool $director
-     * @param bool $quickTime
-     * @param bool $realPlayer
-     * @param bool $pdf
-     * @param bool $windowsMedia
-     * @param bool $gears
-     * @param bool $silverlight
-     */
-    public function setPlugins($flash = false, $java = false, $director = false, $quickTime = false, $realPlayer = false, $pdf = false, $windowsMedia = false, $gears = false, $silverlight = false)
-    {
-        $this->plugins =
-            '&fla=' . (int)$flash .
-                '&java=' . (int)$java .
-                '&dir=' . (int)$director .
-                '&qt=' . (int)$quickTime .
-                '&realp=' . (int)$realPlayer .
-                '&pdf=' . (int)$pdf .
-                '&wma=' . (int)$windowsMedia .
-                '&gears=' . (int)$gears .
-                '&ag=' . (int)$silverlight;
-    }
-
-    /**
-     * By default, PiwikTracker will read first party cookies
-     * from the request and write updated cookies in the response (using setrawcookie).
-     * This can be disabled by calling this function.
-     */
-    public function disableCookieSupport()
-    {
-        $this->configCookiesDisabled = true;
-    }
-
-    /**
-     * Returns the maximum number of seconds the tracker will spend waiting for a response
-     * from Piwik. Defaults to 600 seconds.
-     */
-    public function getRequestTimeout()
-    {
-        return $this->requestTimeout;
-    }
-
-    /**
-     * Sets the maximum number of seconds that the tracker will spend waiting for a response
-     * from Piwik.
-     *
-     * @param int $timeout
-     * @throws Exception
-     */
-    public function setRequestTimeout($timeout)
-    {
-        if (!is_int($timeout) || $timeout < 0) {
-            throw new Exception("Invalid value supplied for request timeout: $timeout");
-        }
-
-        $this->requestTimeout = $timeout;
-    }
-
-    /**
-     * Used in tests to output useful error messages.
-     *
-     * @ignore
-     */
-    static public $DEBUG_LAST_REQUESTED_URL = false;
-
-    /**
-     * @ignore
-     */
-    protected function sendRequest($url, $method = 'GET', $data = null, $force = false)
-    {
-        self::$DEBUG_LAST_REQUESTED_URL = $url;
-
-        // if doing a bulk request, store the url
-        if ($this->doBulkRequests && !$force) {
-            $this->storedTrackingActions[]
-                = $url
-                . (!empty($this->userAgent) ? ('&ua=' . urlencode($this->userAgent)) : '')
-                . (!empty($this->acceptLanguage) ? ('&lang=' . urlencode($this->acceptLanguage)) : '');
-
-            // Clear custom variables so they don't get copied over to other users in the bulk request
-            $this->clearCustomVariables();
-            $this->userAgent = false;
-            $this->acceptLanguage = false;
-            return true;
-        }
-
-        if (function_exists('curl_init')) {
-            $options = array(
-                CURLOPT_URL            => $url,
-                CURLOPT_USERAGENT      => $this->userAgent,
-                CURLOPT_HEADER         => true,
-                CURLOPT_TIMEOUT        => $this->requestTimeout,
-                CURLOPT_RETURNTRANSFER => true,
-                CURLOPT_HTTPHEADER     => array(
-                    'Accept-Language: ' . $this->acceptLanguage
-                ));
-
-            switch ($method) {
-                case 'POST':
-                    $options[CURLOPT_POST] = TRUE;
-                    break;
-                default:
-                    break;
-            }
-
-            // only supports JSON data
-            if (!empty($data)) {
-                $options[CURLOPT_HTTPHEADER][] = 'Content-Type: application/json';
-                $options[CURLOPT_HTTPHEADER][] = 'Expect:';
-                $options[CURLOPT_POSTFIELDS] = $data;
-            }
-
-            $ch = curl_init();
-            curl_setopt_array($ch, $options);
-            ob_start();
-            $response = @curl_exec($ch);
-            ob_end_clean();
-            $content = '';
-            if (!empty($response)) {
-                list($header, $content) = explode("\r\n\r\n", $response, $limitCount = 2);
-            }
-        } else if (function_exists('stream_context_create')) {
-            $stream_options = array(
-                'http' => array(
-                    'method'     => $method,
-                    'user_agent' => $this->userAgent,
-                    'header'     => "Accept-Language: " . $this->acceptLanguage . "\r\n",
-                    'timeout'    => $this->requestTimeout, // PHP 5.2.1
-                )
-            );
-
-            // only supports JSON data
-            if (!empty($data)) {
-                $stream_options['http']['header'] .= "Content-Type: application/json \r\n";
-                $stream_options['http']['content'] = $data;
-            }
-            $ctx = stream_context_create($stream_options);
-            $response = file_get_contents($url, 0, $ctx);
-            $content = $response;
-        }
-        return $content;
-    }
-
-    /**
-     * Returns current timestamp, or forced timestamp/datetime if it was set
-     * @return string|int
-     */
-    protected function getTimestamp()
-    {
-        return !empty($this->forcedDatetime)
-            ? strtotime($this->forcedDatetime)
-            : time();
-    }
-
-    /**
-     * Returns the base URL for the piwik server.
-     */
-    protected function getBaseUrl()
-    {
-        if (empty(self::$URL)) {
-            throw new Exception('You must first set the Piwik Tracker URL by calling PiwikTracker::$URL = \'http://your-website.org/piwik/\';');
-        }
-        if (strpos(self::$URL, '/piwik.php') === false
-            && strpos(self::$URL, '/proxy-piwik.php') === false
-        ) {
-            self::$URL .= '/piwik.php';
-        }
-        return self::$URL;
-    }
-
-    /**
-     * @ignore
-     */
-    protected function getRequest($idSite)
-    {
-        $this->setFirstPartyCookies();
-
-        $url = $this->getBaseUrl() .
-            '?idsite=' . $idSite .
-            '&rec=1' .
-            '&apiv=' . self::VERSION .
-            '&r=' . substr(strval(mt_rand()), 2, 6) .
-
-            // XDEBUG_SESSIONS_START and KEY are related to the PHP Debugger, this can be ignored in other languages
-            (!empty($_GET['XDEBUG_SESSION_START']) ? '&XDEBUG_SESSION_START=' . @urlencode($_GET['XDEBUG_SESSION_START']) : '') .
-            (!empty($_GET['KEY']) ? '&KEY=' . @urlencode($_GET['KEY']) : '') .
-
-            // Only allowed for Super User, token_auth required,
-            (!empty($this->ip) ? '&cip=' . $this->ip : '') .
-            (!empty($this->userId) ? '&uid=' . urlencode($this->userId) : '') .
-            (!empty($this->forcedDatetime) ? '&cdt=' . urlencode($this->forcedDatetime) : '') .
-            (!empty($this->forcedNewVisit) ? '&new_visit=1' : '') .
-            ((!empty($this->token_auth) && !$this->doBulkRequests) ? '&token_auth=' . urlencode($this->token_auth) : '') .
-
-            // Values collected from cookie
-            '&_idts=' . $this->createTs .
-            '&_idvc=' . $this->visitCount .
-            (!empty($this->lastVisitTs) ? '&_viewts=' . $this->lastVisitTs : '' ) .
-            (!empty($this->lastEcommerceOrderTs) ? '&_ects=' . $this->lastEcommerceOrderTs : '' ) .
-
-            // These parameters are set by the JS, but optional when using API
-            (!empty($this->plugins) ? $this->plugins : '') .
-            (($this->localHour !== false && $this->localMinute !== false && $this->localSecond !== false) ? '&h=' . $this->localHour . '&m=' . $this->localMinute . '&s=' . $this->localSecond : '') .
-            (!empty($this->width) && !empty($this->height) ? '&res=' . $this->width . 'x' . $this->height : '') .
-            (!empty($this->hasCookies) ? '&cookie=' . $this->hasCookies : '') .
-            (!empty($this->ecommerceLastOrderTimestamp) ? '&_ects=' . urlencode($this->ecommerceLastOrderTimestamp) : '') .
-
-            // Various important attributes
-            (!empty($this->customData) ? '&data=' . $this->customData : '') .
-            (!empty($this->visitorCustomVar) ? '&_cvar=' . urlencode(json_encode($this->visitorCustomVar)) : '') .
-            (!empty($this->pageCustomVar) ? '&cvar=' . urlencode(json_encode($this->pageCustomVar)) : '') .
-            (!empty($this->eventCustomVar) ? '&e_cvar=' . urlencode(json_encode($this->eventCustomVar)) : '') .
-            (!empty($this->generationTime) ? '&gt_ms=' . ((int)$this->generationTime) : '') .
-            (!empty($this->forcedVisitorId) ? '&cid=' . $this->forcedVisitorId : '&_id=' . $this->getVisitorId()) .
-
-            // URL parameters
-            '&url=' . urlencode($this->pageUrl) .
-            '&urlref=' . urlencode($this->urlReferrer) .
-            ((!empty($this->pageCharset) && $this->pageCharset != self::DEFAULT_CHARSET_PARAMETER_VALUES) ? '&cs=' . $this->pageCharset : '') .
-
-            // Attribution information, so that Goal conversions are attributed to the right referrer or campaign
-            // Campaign name
-            (!empty($this->attributionInfo[0]) ? '&_rcn=' . urlencode($this->attributionInfo[0]) : '') .
-            // Campaign keyword
-            (!empty($this->attributionInfo[1]) ? '&_rck=' . urlencode($this->attributionInfo[1]) : '') .
-            // Timestamp at which the referrer was set
-            (!empty($this->attributionInfo[2]) ? '&_refts=' . $this->attributionInfo[2] : '') .
-            // Referrer URL
-            (!empty($this->attributionInfo[3]) ? '&_ref=' . urlencode($this->attributionInfo[3]) : '') .
-
-            // custom location info
-            (!empty($this->country) ? '&country=' . urlencode($this->country) : '') .
-            (!empty($this->region) ? '&region=' . urlencode($this->region) : '') .
-            (!empty($this->city) ? '&city=' . urlencode($this->city) : '') .
-            (!empty($this->lat) ? '&lat=' . urlencode($this->lat) : '') .
-            (!empty($this->long) ? '&long=' . urlencode($this->long) : '') .
-            (!$this->sendImageResponse ? '&send_image=0' : '') .
-
-            // DEBUG
-            $this->DEBUG_APPEND_URL;
-
-
-        // Reset page level custom variables after this page view
-        $this->pageCustomVar = array();
-        $this->eventCustomVar = array();
-
-        // force new visit only once, user must call again setForceNewVisit()
-        $this->forcedNewVisit = false;
-
-        return $url;
-    }
-
-
-    /**
-     * Returns a first party cookie which name contains $name
-     *
-     * @param string $name
-     * @return string String value of cookie, or false if not found
-     * @ignore
-     */
-    protected function getCookieMatchingName($name)
-    {
-        if($this->configCookiesDisabled) {
-            return false;
-        }
-        $name = $this->getCookieName($name);
-
-        // Piwik cookie names use dots separators in piwik.js,
-        // but PHP Replaces . with _ http://www.php.net/manual/en/language.variables.predefined.php#72571
-        $name = str_replace('.', '_', $name);
-        foreach ($_COOKIE as $cookieName => $cookieValue) {
-            if (strpos($cookieName, $name) !== false) {
-                return $cookieValue;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * If current URL is "http://example.org/dir1/dir2/index.php?param1=value1&param2=value2"
-     * will return "/dir1/dir2/index.php"
-     *
-     * @return string
-     * @ignore
-     */
-    static protected function getCurrentScriptName()
-    {
-        $url = '';
-        if (!empty($_SERVER['PATH_INFO'])) {
-            $url = $_SERVER['PATH_INFO'];
-        } else if (!empty($_SERVER['REQUEST_URI'])) {
-            if (($pos = strpos($_SERVER['REQUEST_URI'], '?')) !== false) {
-                $url = substr($_SERVER['REQUEST_URI'], 0, $pos);
-            } else {
-                $url = $_SERVER['REQUEST_URI'];
-            }
-        }
-        if (empty($url)) {
-            $url = $_SERVER['SCRIPT_NAME'];
-        }
-
-        if ($url[0] !== '/') {
-            $url = '/' . $url;
-        }
-        return $url;
-    }
-
-    /**
-     * If the current URL is 'http://example.org/dir1/dir2/index.php?param1=value1&param2=value2"
-     * will return 'http'
-     *
-     * @return string 'https' or 'http'
-     * @ignore
-     */
-    static protected function getCurrentScheme()
-    {
-        if (isset($_SERVER['HTTPS'])
-            && ($_SERVER['HTTPS'] == 'on' || $_SERVER['HTTPS'] === true)
-        ) {
-            return 'https';
-        }
-        return 'http';
-    }
-
-    /**
-     * If current URL is "http://example.org/dir1/dir2/index.php?param1=value1&param2=value2"
-     * will return "http://example.org"
-     *
-     * @return string
-     * @ignore
-     */
-    static protected function getCurrentHost()
-    {
-        if (isset($_SERVER['HTTP_HOST'])) {
-            return $_SERVER['HTTP_HOST'];
-        }
-        return 'unknown';
-    }
-
-    /**
-     * If current URL is "http://example.org/dir1/dir2/index.php?param1=value1&param2=value2"
-     * will return "?param1=value1&param2=value2"
-     *
-     * @return string
-     * @ignore
-     */
-    static protected function getCurrentQueryString()
-    {
-        $url = '';
-        if (isset($_SERVER['QUERY_STRING'])
-            && !empty($_SERVER['QUERY_STRING'])
-        ) {
-            $url .= '?' . $_SERVER['QUERY_STRING'];
-        }
-        return $url;
-    }
-
-    /**
-     * Returns the current full URL (scheme, host, path and query string.
-     *
-     * @return string
-     * @ignore
-     */
-    static protected function getCurrentUrl()
-    {
-        return self::getCurrentScheme() . '://'
-            . self::getCurrentHost()
-            . self::getCurrentScriptName()
-            . self::getCurrentQueryString();
-    }
-
-    /**
-     * Sets the first party cookies as would the piwik.js
-     * All cookies are supported: 'id' and 'ses' and 'ref' and 'cvar' cookies.
-     */
-    protected function setFirstPartyCookies()
-    {
-        if ($this->configCookiesDisabled) {
-            return;
-        }
-
-        if (empty($this->cookieVisitorId)) {
-            $this->loadVisitorIdCookie();
-        }
-
-        // Set the 'ref' cookie
-        $attributionInfo = $this->getAttributionInfo();
-        if(!empty($attributionInfo)) {
-            $this->setCookie('ref', $attributionInfo, $this->configReferralCookieTimeout);
-        }
-
-        // Set the 'ses' cookie
-        $this->setCookie('ses', '*', $this->configSessionCookieTimeout);
-
-        // Set the 'id' cookie
-        $visitCount = $this->visitCount + 1;
-        $cookieValue = $this->getVisitorId() . '.' . $this->createTs . '.' . $visitCount . '.' . $this->currentTs . '.' . $this->lastVisitTs . '.' . $this->lastEcommerceOrderTs;
-        $this->setCookie('id', $cookieValue, $this->configVisitorCookieTimeout);
-
-        // Set the 'cvar' cookie
-        $this->setCookie('cvar', json_encode($this->visitorCustomVar), $this->configSessionCookieTimeout);
-
-    }
-
-    /**
-     * Sets a first party cookie to the client to improve dual JS-PHP tracking.
-     *
-     * This replicates the piwik.js tracker algorithms for consistency and better accuracy.
-     *
-     * @param $cookieName
-     * @param $cookieValue
-     * @param $cookieTTL
-     */
-    protected function setCookie($cookieName, $cookieValue, $cookieTTL)
-    {
-        $cookieExpire = $this->currentTs + $cookieTTL;
-        if(!headers_sent()) {
-            setcookie($this->getCookieName($cookieName), $cookieValue, $cookieExpire, $this->configCookiePath, $this->configCookieDomain);
-        }
-    }
-
-    /**
-     * @return bool|mixed
-     */
-    protected function getCustomVariablesFromCookie()
-    {
-        $cookie = $this->getCookieMatchingName('cvar');
-        if (!$cookie) {
-            return false;
-        }
-        return json_decode($cookie, $assoc = true);
-    }
-}
-
-/**
- * Helper function to quickly generate the URL to track a page view.
- *
- * @param $idSite
- * @param string $documentTitle
- * @return string
- */
-function Piwik_getUrlTrackPageView($idSite, $documentTitle = '')
-{
-    $tracker = new PiwikTracker($idSite);
-    return $tracker->getUrlTrackPageView($documentTitle);
-}
-
-/**
- * Helper function to quickly generate the URL to track a goal.
- *
- * @param $idSite
- * @param $idGoal
- * @param float $revenue
- * @return string
- */
-function Piwik_getUrlTrackGoal($idSite, $idGoal, $revenue = 0.0)
-{
-    $tracker = new PiwikTracker($idSite);
-    return $tracker->getUrlTrackGoal($idGoal, $revenue);
-}
-
diff --git a/libs/README.md b/libs/README.md
index 8d7c7d8e6e..333df17ceb 100644
--- a/libs/README.md
+++ b/libs/README.md
@@ -31,3 +31,4 @@ third-party libraries:
    - strip require_once (to support autoloading)
    - in r3694, fix ZF-10888 and ZF-10835
    - ZF-10871 - undefined variables when socket support disabled
+   - fix #6980 ("Array to string conversion") in `Zend/Session/Exception.php`
diff --git a/libs/Zend/Session/Exception.php b/libs/Zend/Session/Exception.php
index 3269e12ce9..7152792aab 100644
--- a/libs/Zend/Session/Exception.php
+++ b/libs/Zend/Session/Exception.php
@@ -55,7 +55,7 @@ class Zend_Session_Exception extends Zend_Exception
      */
     static public function handleSessionStartError($errno, $errstr, $errfile, $errline, $errcontext)
     {
-        self::$sessionStartError = $errfile . '(Line:' . $errline . '): Error #' . $errno . ' ' . $errstr . ' ' . $errcontext;
+        self::$sessionStartError = $errfile . '(Line:' . $errline . '): Error #' . $errno . ' ' . $errstr;
     }
 
     /**
@@ -68,7 +68,7 @@ class Zend_Session_Exception extends Zend_Exception
      */
     static public function handleSilentWriteClose($errno, $errstr, $errfile, $errline, $errcontext)
     {
-        self::$sessionStartError .= PHP_EOL . $errfile . '(Line:' . $errline . '): Error #' . $errno . ' ' . $errstr . ' ' . $errcontext;
+        self::$sessionStartError .= PHP_EOL . $errfile . '(Line:' . $errline . '): Error #' . $errno . ' ' . $errstr;
     }
 }
 
diff --git a/libs/bower_components/angular-animate/.bower.json b/libs/bower_components/angular-animate/.bower.json
index bd1be862d9..7a01c31da9 100644
--- a/libs/bower_components/angular-animate/.bower.json
+++ b/libs/bower_components/angular-animate/.bower.json
@@ -1,16 +1,17 @@
 {
   "name": "angular-animate",
-  "version": "1.2.26",
+  "version": "1.2.28",
   "main": "./angular-animate.js",
+  "ignore": [],
   "dependencies": {
-    "angular": "1.2.26"
+    "angular": "1.2.28"
   },
   "homepage": "https://github.com/angular/bower-angular-animate",
-  "_release": "1.2.26",
+  "_release": "1.2.28",
   "_resolution": {
     "type": "version",
-    "tag": "v1.2.26",
-    "commit": "453c5ac3ad0beb28e8296655c2e4079b5e0f31da"
+    "tag": "v1.2.28",
+    "commit": "a42cca9915517f26d639471b5f622dc086161fe0"
   },
   "_source": "git://github.com/angular/bower-angular-animate.git",
   "_target": "~1.2.0",
diff --git a/libs/bower_components/angular-animate/README.md b/libs/bower_components/angular-animate/README.md
index de4c61b895..930b5dcc59 100644
--- a/libs/bower_components/angular-animate/README.md
+++ b/libs/bower_components/angular-animate/README.md
@@ -1,24 +1,47 @@
-# bower-angular-animate
+# packaged angular-animate
 
-This repo is for distribution on `bower`. The source for this module is in the
+This repo is for distribution on `npm` and `bower`. The source for this module is in the
 [main AngularJS repo](https://github.com/angular/angular.js/tree/master/src/ngAnimate).
 Please file issues and pull requests against that repo.
 
 ## Install
 
-Install with `bower`:
+You can install this package either with `npm` or with `bower`.
+
+### npm
 
 ```shell
-bower install angular-animate
+npm install angular-animate
 ```
 
 Add a `<script>` to your `index.html`:
 
 ```html
+<script src="/node_modules/angular-animate/angular-animate.js"></script>
+```
+
+Then add `ngAnimate` as a dependency for your app:
+
+```javascript
+angular.module('myApp', ['ngAnimate']);
+```
+
+Note that this package is not in CommonJS format, so doing `require('angular-animate')` will
+return `undefined`.
+
+### bower
+
+```shell
+bower install angular-animate
+```
+
+Then add a `<script>` to your `index.html`:
+
+```html
 <script src="/bower_components/angular-animate/angular-animate.js"></script>
 ```
 
-And add `ngAnimate` as a dependency for your app:
+Then add `ngAnimate` as a dependency for your app:
 
 ```javascript
 angular.module('myApp', ['ngAnimate']);
diff --git a/libs/bower_components/angular-animate/angular-animate.js b/libs/bower_components/angular-animate/angular-animate.js
index a2eda2fb94..f602fccf9f 100644
--- a/libs/bower_components/angular-animate/angular-animate.js
+++ b/libs/bower_components/angular-animate/angular-animate.js
@@ -1,5 +1,5 @@
 /**
- * @license AngularJS v1.2.26
+ * @license AngularJS v1.2.28
  * (c) 2010-2014 Google, Inc. http://angularjs.org
  * License: MIT
  */
@@ -1162,6 +1162,16 @@ angular.module('ngAnimate', ['ng'])
       var parentCounter = 0;
       var animationReflowQueue = [];
       var cancelAnimationReflow;
+      function clearCacheAfterReflow() {
+        if (!cancelAnimationReflow) {
+          cancelAnimationReflow = $$animateReflow(function() {
+            animationReflowQueue = [];
+            cancelAnimationReflow = null;
+            lookupCache = {};
+          });
+        }
+      }
+
       function afterReflow(element, callback) {
         if(cancelAnimationReflow) {
           cancelAnimationReflow();
@@ -1530,7 +1540,8 @@ angular.module('ngAnimate', ['ng'])
         //cancellation function then it means that there is no animation
         //to perform at all
         var preReflowCancellation = animateBefore(animationEvent, element, className);
-        if(!preReflowCancellation) {
+        if (!preReflowCancellation) {
+          clearCacheAfterReflow();
           animationComplete();
           return;
         }
@@ -1605,6 +1616,7 @@ angular.module('ngAnimate', ['ng'])
             });
             return cancellationMethod;
           }
+          clearCacheAfterReflow();
           animationCompleted();
         },
 
@@ -1629,6 +1641,7 @@ angular.module('ngAnimate', ['ng'])
             });
             return cancellationMethod;
           }
+          clearCacheAfterReflow();
           animationCompleted();
         },
 
diff --git a/libs/bower_components/angular-animate/angular-animate.min.js b/libs/bower_components/angular-animate/angular-animate.min.js
index 1054ea29e3..42d8557ed2 100644
--- a/libs/bower_components/angular-animate/angular-animate.min.js
+++ b/libs/bower_components/angular-animate/angular-animate.min.js
@@ -1,28 +1,28 @@
 /*
- AngularJS v1.2.26
+ AngularJS v1.2.28
  (c) 2010-2014 Google, Inc. http://angularjs.org
  License: MIT
 */
-(function(F,e,O){'use strict';e.module("ngAnimate",["ng"]).directive("ngAnimateChildren",function(){return function(G,s,g){g=g.ngAnimateChildren;e.isString(g)&&0===g.length?s.data("$$ngAnimateChildren",!0):G.$watch(g,function(e){s.data("$$ngAnimateChildren",!!e)})}}).factory("$$animateReflow",["$$rAF","$document",function(e,s){return function(g){return e(function(){g()})}}]).config(["$provide","$animateProvider",function(G,s){function g(e){for(var g=0;g<e.length;g++){var l=e[g];if(l.nodeType==aa)return l}}
-function B(l){return e.element(g(l))}var m=e.noop,u=e.forEach,P=s.$$selectors,aa=1,l="$$ngAnimateState",V="$$ngAnimateChildren",J="ng-animate",n={running:!0};G.decorator("$animate",["$delegate","$injector","$sniffer","$rootElement","$$asyncCallback","$rootScope","$document",function(z,F,$,R,E,H,O){function K(a){var b=a.data(l)||{};b.running=!0;a.data(l,b)}function L(a){if(a){var b=[],c={};a=a.substr(1).split(".");($.transitions||$.animations)&&b.push(F.get(P[""]));for(var d=0;d<a.length;d++){var f=
-a[d],e=P[f];e&&!c[f]&&(b.push(F.get(e)),c[f]=!0)}return b}}function G(a,b,c){function d(a,b){var c=a[b],d=a["before"+b.charAt(0).toUpperCase()+b.substr(1)];if(c||d)return"leave"==b&&(d=c,c=null),n.push({event:b,fn:c}),h.push({event:b,fn:d}),!0}function f(b,d,e){var f=[];u(b,function(a){a.fn&&f.push(a)});var g=0;u(f,function(b,l){var C=function(){a:{if(d){(d[l]||m)();if(++g<f.length)break a;d=null}e()}};switch(b.event){case "setClass":d.push(b.fn(a,A,k,C));break;case "addClass":d.push(b.fn(a,A||c,
-C));break;case "removeClass":d.push(b.fn(a,k||c,C));break;default:d.push(b.fn(a,C))}});d&&0===d.length&&e()}var g=a[0];if(g){var l="setClass"==b,p=l||"addClass"==b||"removeClass"==b,A,k;e.isArray(c)&&(A=c[0],k=c[1],c=A+" "+k);var x=a.attr("class")+" "+c;if(M(x)){var t=m,w=[],h=[],q=m,y=[],n=[],x=(" "+x).replace(/\s+/g,".");u(L(x),function(a){!d(a,b)&&l&&(d(a,"addClass"),d(a,"removeClass"))});return{node:g,event:b,className:c,isClassBased:p,isSetClassOperation:l,before:function(a){t=a;f(h,w,function(){t=
-m;a()})},after:function(a){q=a;f(n,y,function(){q=m;a()})},cancel:function(){w&&(u(w,function(a){(a||m)(!0)}),t(!0));y&&(u(y,function(a){(a||m)(!0)}),q(!0))}}}}}function r(a,b,c,d,f,g,n){function p(d){var e="$animate:"+d;q&&(q[e]&&0<q[e].length)&&E(function(){c.triggerHandler(e,{event:a,className:b})})}function A(){p("before")}function m(){p("after")}function x(){p("close");n&&E(function(){n()})}function t(){t.hasBeenRun||(t.hasBeenRun=!0,g())}function w(){if(!w.hasBeenRun){w.hasBeenRun=!0;var d=
-c.data(l);d&&(h&&h.isClassBased?k(c,b):(E(function(){var d=c.data(l)||{};r==d.index&&k(c,b,a)}),c.data(l,d)));x()}}var h=G(c,a,b);if(h){b=h.className;var q=e.element._data(h.node),q=q&&q.events;d||(d=f?f.parent():c.parent());var y=c.data(l)||{};f=y.active||{};var z=y.totalActive||0,C=y.last,D;h.isClassBased&&(D=y.running||y.disabled||C&&!C.isClassBased);if(D||N(c,d))t(),A(),m(),w();else{d=!1;if(0<z){D=[];if(h.isClassBased)"setClass"==C.event?(D.push(C),k(c,b)):f[b]&&(v=f[b],v.event==a?d=!0:(D.push(v),
-k(c,b)));else if("leave"==a&&f["ng-leave"])d=!0;else{for(var v in f)D.push(f[v]),k(c,v);f={};z=0}0<D.length&&u(D,function(a){a.cancel()})}!h.isClassBased||(h.isSetClassOperation||d)||(d="addClass"==a==c.hasClass(b));if(d)t(),A(),m(),x();else{if("leave"==a)c.one("$destroy",function(a){a=e.element(this);var b=a.data(l);b&&(b=b.active["ng-leave"])&&(b.cancel(),k(a,"ng-leave"))});c.addClass(J);var r=Y++;z++;f[b]=h;c.data(l,{last:h,active:f,index:r,totalActive:z});A();h.before(function(d){var e=c.data(l);
-d=d||!e||!e.active[b]||h.isClassBased&&e.active[b].event!=a;t();!0===d?w():(m(),h.after(w))})}}}else t(),A(),m(),w()}function T(a){if(a=g(a))a=e.isFunction(a.getElementsByClassName)?a.getElementsByClassName(J):a.querySelectorAll("."+J),u(a,function(a){a=e.element(a);(a=a.data(l))&&a.active&&u(a.active,function(a){a.cancel()})})}function k(a,b){if(g(a)==g(R))n.disabled||(n.running=!1,n.structural=!1);else if(b){var c=a.data(l)||{},d=!0===b;!d&&(c.active&&c.active[b])&&(c.totalActive--,delete c.active[b]);
-if(d||!c.totalActive)a.removeClass(J),a.removeData(l)}}function N(a,b){if(n.disabled)return!0;if(g(a)==g(R))return n.running;var c,d,f;do{if(0===b.length)break;var m=g(b)==g(R),k=m?n:b.data(l)||{};if(k.disabled)return!0;m&&(f=!0);!1!==c&&(m=b.data(V),e.isDefined(m)&&(c=m));d=d||k.running||k.last&&!k.last.isClassBased}while(b=b.parent());return!f||!c&&d}var Y=0;R.data(l,n);H.$$postDigest(function(){H.$$postDigest(function(){n.running=!1})});var Q=s.classNameFilter(),M=Q?function(a){return Q.test(a)}:
-function(){return!0};return{enter:function(a,b,c,d){a=e.element(a);b=b&&e.element(b);c=c&&e.element(c);K(a);z.enter(a,b,c);H.$$postDigest(function(){a=B(a);r("enter","ng-enter",a,b,c,m,d)})},leave:function(a,b){a=e.element(a);T(a);K(a);H.$$postDigest(function(){r("leave","ng-leave",B(a),null,null,function(){z.leave(a)},b)})},move:function(a,b,c,d){a=e.element(a);b=b&&e.element(b);c=c&&e.element(c);T(a);K(a);z.move(a,b,c);H.$$postDigest(function(){a=B(a);r("move","ng-move",a,b,c,m,d)})},addClass:function(a,
-b,c){a=e.element(a);a=B(a);r("addClass",b,a,null,null,function(){z.addClass(a,b)},c)},removeClass:function(a,b,c){a=e.element(a);a=B(a);r("removeClass",b,a,null,null,function(){z.removeClass(a,b)},c)},setClass:function(a,b,c,d){a=e.element(a);a=B(a);r("setClass",[b,c],a,null,null,function(){z.setClass(a,b,c)},d)},enabled:function(a,b){switch(arguments.length){case 2:if(a)k(b);else{var c=b.data(l)||{};c.disabled=!0;b.data(l,c)}break;case 1:n.disabled=!a;break;default:a=!n.disabled}return!!a}}}]);s.register("",
-["$window","$sniffer","$timeout","$$animateReflow",function(l,n,s,B){function E(a,U){S&&S();W.push(U);S=B(function(){u(W,function(a){a()});W=[];S=null;v={}})}function H(a,U){var b=g(a);a=e.element(b);Z.push(a);b=Date.now()+U;b<=da||(s.cancel(ca),da=b,ca=s(function(){G(Z);Z=[]},U,!1))}function G(a){u(a,function(a){(a=a.data(q))&&(a.closeAnimationFn||m)()})}function K(a,b){var c=b?v[b]:null;if(!c){var d=0,e=0,f=0,g=0,m,k,h,q;u(a,function(a){if(a.nodeType==aa){a=l.getComputedStyle(a)||{};h=a[I+P];d=
-Math.max(L(h),d);q=a[I+x];m=a[I+t];e=Math.max(L(m),e);k=a[p+t];g=Math.max(L(k),g);var b=L(a[p+P]);0<b&&(b*=parseInt(a[p+w],10)||1);f=Math.max(b,f)}});c={total:0,transitionPropertyStyle:q,transitionDurationStyle:h,transitionDelayStyle:m,transitionDelay:e,transitionDuration:d,animationDelayStyle:k,animationDelay:g,animationDuration:f};b&&(v[b]=c)}return c}function L(a){var b=0;a=e.isString(a)?a.split(/\s*,\s*/):[];u(a,function(a){b=Math.max(parseFloat(a)||0,b)});return b}function J(a){var b=a.parent(),
-c=b.data(h);c||(b.data(h,++ba),c=ba);return c+"-"+g(a).getAttribute("class")}function r(a,b,c,d){var e=J(b),f=e+" "+c,l=v[f]?++v[f].total:0,k={};if(0<l){var h=c+"-stagger",k=e+" "+h;(e=!v[k])&&b.addClass(h);k=K(b,k);e&&b.removeClass(h)}d=d||function(a){return a()};b.addClass(c);var h=b.data(q)||{},n=d(function(){return K(b,f)});d=n.transitionDuration;e=n.animationDuration;if(0===d&&0===e)return b.removeClass(c),!1;b.data(q,{running:h.running||0,itemIndex:l,stagger:k,timings:n,closeAnimationFn:m});
-a=0<h.running||"setClass"==a;0<d&&T(b,c,a);0<e&&(0<k.animationDelay&&0===k.animationDuration)&&(g(b).style[p]="none 0s");return!0}function T(a,b,c){"ng-enter"!=b&&("ng-move"!=b&&"ng-leave"!=b)&&c?a.addClass(y):g(a).style[I+x]="none"}function k(a,b){var c=I+x,d=g(a);d.style[c]&&0<d.style[c].length&&(d.style[c]="");a.removeClass(y)}function N(a){var b=p;a=g(a);a.style[b]&&0<a.style[b].length&&(a.style[b]="")}function Y(a,b,d,e){function k(a){b.off(x,l);b.removeClass(m);c(b,d);a=g(b);for(var e in s)a.style.removeProperty(s[e])}
-function l(a){a.stopPropagation();var b=a.originalEvent||a;a=b.$manualTimeStamp||b.timeStamp||Date.now();b=parseFloat(b.elapsedTime.toFixed(V));Math.max(a-z,0)>=y&&b>=v&&e()}var h=g(b);a=b.data(q);if(-1!=h.getAttribute("class").indexOf(d)&&a){var m="";u(d.split(" "),function(a,b){m+=(0<b?" ":"")+a+"-active"});var n=a.stagger,p=a.timings,t=a.itemIndex,v=Math.max(p.transitionDuration,p.animationDuration),w=Math.max(p.transitionDelay,p.animationDelay),y=w*D,z=Date.now(),x=A+" "+X,r="",s=[];if(0<p.transitionDuration){var B=
-p.transitionPropertyStyle;-1==B.indexOf("all")&&(r+=f+"transition-property: "+B+";",r+=f+"transition-duration: "+p.transitionDurationStyle+";",s.push(f+"transition-property"),s.push(f+"transition-duration"))}0<t&&(0<n.transitionDelay&&0===n.transitionDuration&&(r+=f+"transition-delay: "+Q(p.transitionDelayStyle,n.transitionDelay,t)+"; ",s.push(f+"transition-delay")),0<n.animationDelay&&0===n.animationDuration&&(r+=f+"animation-delay: "+Q(p.animationDelayStyle,n.animationDelay,t)+"; ",s.push(f+"animation-delay")));
-0<s.length&&(p=h.getAttribute("style")||"",h.setAttribute("style",p+"; "+r));b.on(x,l);b.addClass(m);a.closeAnimationFn=function(){k();e()};h=(t*(Math.max(n.animationDelay,n.transitionDelay)||0)+(w+v)*C)*D;a.running++;H(b,h);return k}e()}function Q(a,b,c){var d="";u(a.split(","),function(a,e){d+=(0<e?",":"")+(c*b+parseInt(a,10))+"s"});return d}function M(a,b,d,e){if(r(a,b,d,e))return function(a){a&&c(b,d)}}function a(a,b,d,e){if(b.data(q))return Y(a,b,d,e);c(b,d);e()}function b(b,c,d,e){var f=M(b,
-c,d);if(f){var g=f;E(c,function(){k(c,d);N(c);g=a(b,c,d,e)});return function(a){(g||m)(a)}}e()}function c(a,b){a.removeClass(b);var c=a.data(q);c&&(c.running&&c.running--,c.running&&0!==c.running||a.removeData(q))}function d(a,b){var c="";a=e.isArray(a)?a:a.split(/\s+/);u(a,function(a,d){a&&0<a.length&&(c+=(0<d?" ":"")+a+b)});return c}var f="",I,X,p,A;F.ontransitionend===O&&F.onwebkittransitionend!==O?(f="-webkit-",I="WebkitTransition",X="webkitTransitionEnd transitionend"):(I="transition",X="transitionend");
-F.onanimationend===O&&F.onwebkitanimationend!==O?(f="-webkit-",p="WebkitAnimation",A="webkitAnimationEnd animationend"):(p="animation",A="animationend");var P="Duration",x="Property",t="Delay",w="IterationCount",h="$$ngAnimateKey",q="$$ngAnimateCSS3Data",y="ng-animate-block-transitions",V=3,C=1.5,D=1E3,v={},ba=0,W=[],S,ca=null,da=0,Z=[];return{enter:function(a,c){return b("enter",a,"ng-enter",c)},leave:function(a,c){return b("leave",a,"ng-leave",c)},move:function(a,c){return b("move",a,"ng-move",
-c)},beforeSetClass:function(a,b,c,e){var f=d(c,"-remove")+" "+d(b,"-add"),g=M("setClass",a,f,function(d){var e=a.attr("class");a.removeClass(c);a.addClass(b);d=d();a.attr("class",e);return d});if(g)return E(a,function(){k(a,f);N(a);e()}),g;e()},beforeAddClass:function(a,b,c){var e=M("addClass",a,d(b,"-add"),function(c){a.addClass(b);c=c();a.removeClass(b);return c});if(e)return E(a,function(){k(a,b);N(a);c()}),e;c()},setClass:function(b,c,e,f){e=d(e,"-remove");c=d(c,"-add");return a("setClass",b,
-e+" "+c,f)},addClass:function(b,c,e){return a("addClass",b,d(c,"-add"),e)},beforeRemoveClass:function(a,b,c){var e=M("removeClass",a,d(b,"-remove"),function(c){var d=a.attr("class");a.removeClass(b);c=c();a.attr("class",d);return c});if(e)return E(a,function(){k(a,b);N(a);c()}),e;c()},removeClass:function(b,c,e){return a("removeClass",b,d(c,"-remove"),e)}}}])}])})(window,window.angular);
+(function(G,d,P){'use strict';d.module("ngAnimate",["ng"]).directive("ngAnimateChildren",function(){return function(H,z,e){e=e.ngAnimateChildren;d.isString(e)&&0===e.length?z.data("$$ngAnimateChildren",!0):H.$watch(e,function(d){z.data("$$ngAnimateChildren",!!d)})}}).factory("$$animateReflow",["$$rAF","$document",function(d,z){return function(e){return d(function(){e()})}}]).config(["$provide","$animateProvider",function(H,z){function e(d){for(var e=0;e<d.length;e++){var g=d[e];if(g.nodeType==ba)return g}}
+function E(g){return d.element(e(g))}var q=d.noop,w=d.forEach,Q=z.$$selectors,ba=1,g="$$ngAnimateState",ga="$$ngAnimateChildren",I="ng-animate",h={running:!0};H.decorator("$animate",["$delegate","$injector","$sniffer","$rootElement","$$asyncCallback","$rootScope","$document",function(y,G,aa,J,K,k,P){function R(a){var b=a.data(g)||{};b.running=!0;a.data(g,b)}function ha(a){if(a){var b=[],c={};a=a.substr(1).split(".");(aa.transitions||aa.animations)&&b.push(G.get(Q[""]));for(var f=0;f<a.length;f++){var d=
+a[f],e=Q[d];e&&!c[d]&&(b.push(G.get(e)),c[d]=!0)}return b}}function M(a,b,c){function f(a,b){var c=a[b],d=a["before"+b.charAt(0).toUpperCase()+b.substr(1)];if(c||d)return"leave"==b&&(d=c,c=null),S.push({event:b,fn:c}),n.push({event:b,fn:d}),!0}function e(b,d,f){var g=[];w(b,function(a){a.fn&&g.push(a)});var r=0;w(g,function(b,e){var C=function(){a:{if(d){(d[e]||q)();if(++r<g.length)break a;d=null}f()}};switch(b.event){case "setClass":d.push(b.fn(a,l,A,C));break;case "addClass":d.push(b.fn(a,l||c,
+C));break;case "removeClass":d.push(b.fn(a,A||c,C));break;default:d.push(b.fn(a,C))}});d&&0===d.length&&f()}var g=a[0];if(g){var p="setClass"==b,h=p||"addClass"==b||"removeClass"==b,l,A;d.isArray(c)&&(l=c[0],A=c[1],c=l+" "+A);var k=a.attr("class")+" "+c;if(U(k)){var t=q,v=[],n=[],x=q,u=[],S=[],k=(" "+k).replace(/\s+/g,".");w(ha(k),function(a){!f(a,b)&&p&&(f(a,"addClass"),f(a,"removeClass"))});return{node:g,event:b,className:c,isClassBased:h,isSetClassOperation:p,before:function(a){t=a;e(n,v,function(){t=
+q;a()})},after:function(a){x=a;e(S,u,function(){x=q;a()})},cancel:function(){v&&(w(v,function(a){(a||q)(!0)}),t(!0));u&&(w(u,function(a){(a||q)(!0)}),x(!0))}}}}}function F(a,b,c,f,e,m,p){function k(d){var e="$animate:"+d;x&&(x[e]&&0<x[e].length)&&K(function(){c.triggerHandler(e,{event:a,className:b})})}function l(){k("before")}function A(){k("after")}function q(){k("close");p&&K(function(){p()})}function t(){t.hasBeenRun||(t.hasBeenRun=!0,m())}function v(){if(!v.hasBeenRun){v.hasBeenRun=!0;var e=
+c.data(g);e&&(n&&n.isClassBased?B(c,b):(K(function(){var e=c.data(g)||{};s==e.index&&B(c,b,a)}),c.data(g,e)));q()}}var n=M(c,a,b);if(n){b=n.className;var x=d.element._data(n.node),x=x&&x.events;f||(f=e?e.parent():c.parent());var u=c.data(g)||{};e=u.active||{};var h=u.totalActive||0,C=u.last,D;n.isClassBased&&(D=u.running||u.disabled||C&&!C.isClassBased);if(D||N(c,f))t(),l(),A(),v();else{f=!1;if(0<h){D=[];if(n.isClassBased)"setClass"==C.event?(D.push(C),B(c,b)):e[b]&&(y=e[b],y.event==a?f=!0:(D.push(y),
+B(c,b)));else if("leave"==a&&e["ng-leave"])f=!0;else{for(var y in e)D.push(e[y]),B(c,y);e={};h=0}0<D.length&&w(D,function(a){a.cancel()})}!n.isClassBased||(n.isSetClassOperation||f)||(f="addClass"==a==c.hasClass(b));if(f)t(),l(),A(),q();else{if("leave"==a)c.one("$destroy",function(a){a=d.element(this);var b=a.data(g);b&&(b=b.active["ng-leave"])&&(b.cancel(),B(a,"ng-leave"))});c.addClass(I);var s=O++;h++;e[b]=n;c.data(g,{last:n,active:e,index:s,totalActive:h});l();n.before(function(e){var d=c.data(g);
+e=e||!d||!d.active[b]||n.isClassBased&&d.active[b].event!=a;t();!0===e?v():(A(),n.after(v))})}}}else t(),l(),A(),v()}function V(a){if(a=e(a))a=d.isFunction(a.getElementsByClassName)?a.getElementsByClassName(I):a.querySelectorAll("."+I),w(a,function(a){a=d.element(a);(a=a.data(g))&&a.active&&w(a.active,function(a){a.cancel()})})}function B(a,b){if(e(a)==e(J))h.disabled||(h.running=!1,h.structural=!1);else if(b){var c=a.data(g)||{},d=!0===b;!d&&(c.active&&c.active[b])&&(c.totalActive--,delete c.active[b]);
+if(d||!c.totalActive)a.removeClass(I),a.removeData(g)}}function N(a,b){if(h.disabled)return!0;if(e(a)==e(J))return h.running;var c,f,k;do{if(0===b.length)break;var m=e(b)==e(J),p=m?h:b.data(g)||{};if(p.disabled)return!0;m&&(k=!0);!1!==c&&(m=b.data(ga),d.isDefined(m)&&(c=m));f=f||p.running||p.last&&!p.last.isClassBased}while(b=b.parent());return!k||!c&&f}var O=0;J.data(g,h);k.$$postDigest(function(){k.$$postDigest(function(){h.running=!1})});var W=z.classNameFilter(),U=W?function(a){return W.test(a)}:
+function(){return!0};return{enter:function(a,b,c,e){a=d.element(a);b=b&&d.element(b);c=c&&d.element(c);R(a);y.enter(a,b,c);k.$$postDigest(function(){a=E(a);F("enter","ng-enter",a,b,c,q,e)})},leave:function(a,b){a=d.element(a);V(a);R(a);k.$$postDigest(function(){F("leave","ng-leave",E(a),null,null,function(){y.leave(a)},b)})},move:function(a,b,c,e){a=d.element(a);b=b&&d.element(b);c=c&&d.element(c);V(a);R(a);y.move(a,b,c);k.$$postDigest(function(){a=E(a);F("move","ng-move",a,b,c,q,e)})},addClass:function(a,
+b,c){a=d.element(a);a=E(a);F("addClass",b,a,null,null,function(){y.addClass(a,b)},c)},removeClass:function(a,b,c){a=d.element(a);a=E(a);F("removeClass",b,a,null,null,function(){y.removeClass(a,b)},c)},setClass:function(a,b,c,e){a=d.element(a);a=E(a);F("setClass",[b,c],a,null,null,function(){y.setClass(a,b,c)},e)},enabled:function(a,b){switch(arguments.length){case 2:if(a)B(b);else{var c=b.data(g)||{};c.disabled=!0;b.data(g,c)}break;case 1:h.disabled=!a;break;default:a=!h.disabled}return!!a}}}]);z.register("",
+["$window","$sniffer","$timeout","$$animateReflow",function(g,h,z,J){function K(){L||(L=J(function(){T=[];L=null;s={}}))}function k(a,X){L&&L();T.push(X);L=J(function(){w(T,function(a){a()});T=[];L=null;s={}})}function E(a,X){var b=e(a);a=d.element(b);Y.push(a);b=Date.now()+X;b<=fa||(z.cancel(ea),fa=b,ea=z(function(){R(Y);Y=[]},X,!1))}function R(a){w(a,function(a){(a=a.data(u))&&(a.closeAnimationFn||q)()})}function I(a,b){var c=b?s[b]:null;if(!c){var e=0,d=0,f=0,k=0,h,Z,$,m;w(a,function(a){if(a.nodeType==
+ba){a=g.getComputedStyle(a)||{};$=a[p+Q];e=Math.max(M($),e);m=a[p+t];h=a[p+v];d=Math.max(M(h),d);Z=a[l+v];k=Math.max(M(Z),k);var b=M(a[l+Q]);0<b&&(b*=parseInt(a[l+n],10)||1);f=Math.max(b,f)}});c={total:0,transitionPropertyStyle:m,transitionDurationStyle:$,transitionDelayStyle:h,transitionDelay:d,transitionDuration:e,animationDelayStyle:Z,animationDelay:k,animationDuration:f};b&&(s[b]=c)}return c}function M(a){var b=0;a=d.isString(a)?a.split(/\s*,\s*/):[];w(a,function(a){b=Math.max(parseFloat(a)||
+0,b)});return b}function F(a){var b=a.parent(),c=b.data(x);c||(b.data(x,++da),c=da);return c+"-"+e(a).getAttribute("class")}function V(a,b,c,d){var f=F(b),g=f+" "+c,k=s[g]?++s[g].total:0,h={};if(0<k){var m=c+"-stagger",h=f+" "+m;(f=!s[h])&&b.addClass(m);h=I(b,h);f&&b.removeClass(m)}d=d||function(a){return a()};b.addClass(c);var m=b.data(u)||{},n=d(function(){return I(b,g)});d=n.transitionDuration;f=n.animationDuration;if(0===d&&0===f)return b.removeClass(c),!1;b.data(u,{running:m.running||0,itemIndex:k,
+stagger:h,timings:n,closeAnimationFn:q});a=0<m.running||"setClass"==a;0<d&&B(b,c,a);0<f&&(0<h.animationDelay&&0===h.animationDuration)&&(e(b).style[l]="none 0s");return!0}function B(a,b,c){"ng-enter"!=b&&("ng-move"!=b&&"ng-leave"!=b)&&c?a.addClass(S):e(a).style[p+t]="none"}function N(a,b){var c=p+t,d=e(a);d.style[c]&&0<d.style[c].length&&(d.style[c]="");a.removeClass(S)}function O(a){var b=l;a=e(a);a.style[b]&&0<a.style[b].length&&(a.style[b]="")}function W(a,b,c,d){function g(a){b.off(z,h);b.removeClass(n);
+f(b,c);a=e(b);for(var d in s)a.style.removeProperty(s[d])}function h(a){a.stopPropagation();var b=a.originalEvent||a;a=b.$manualTimeStamp||b.timeStamp||Date.now();b=parseFloat(b.elapsedTime.toFixed(C));Math.max(a-y,0)>=x&&b>=t&&d()}var k=e(b);a=b.data(u);if(-1!=k.getAttribute("class").indexOf(c)&&a){var n="";w(c.split(" "),function(a,b){n+=(0<b?" ":"")+a+"-active"});var p=a.stagger,l=a.timings,q=a.itemIndex,t=Math.max(l.transitionDuration,l.animationDuration),v=Math.max(l.transitionDelay,l.animationDelay),
+x=v*ca,y=Date.now(),z=A+" "+H,r="",s=[];if(0<l.transitionDuration){var B=l.transitionPropertyStyle;-1==B.indexOf("all")&&(r+=m+"transition-property: "+B+";",r+=m+"transition-duration: "+l.transitionDurationStyle+";",s.push(m+"transition-property"),s.push(m+"transition-duration"))}0<q&&(0<p.transitionDelay&&0===p.transitionDuration&&(r+=m+"transition-delay: "+U(l.transitionDelayStyle,p.transitionDelay,q)+"; ",s.push(m+"transition-delay")),0<p.animationDelay&&0===p.animationDuration&&(r+=m+"animation-delay: "+
+U(l.animationDelayStyle,p.animationDelay,q)+"; ",s.push(m+"animation-delay")));0<s.length&&(l=k.getAttribute("style")||"",k.setAttribute("style",l+"; "+r));b.on(z,h);b.addClass(n);a.closeAnimationFn=function(){g();d()};k=(q*(Math.max(p.animationDelay,p.transitionDelay)||0)+(v+t)*D)*ca;a.running++;E(b,k);return g}d()}function U(a,b,c){var d="";w(a.split(","),function(a,e){d+=(0<e?",":"")+(c*b+parseInt(a,10))+"s"});return d}function a(a,b,c,d){if(V(a,b,c,d))return function(a){a&&f(b,c)}}function b(a,
+b,c,d){if(b.data(u))return W(a,b,c,d);f(b,c);d()}function c(c,d,e,f){var g=a(c,d,e);if(g){var h=g;k(d,function(){N(d,e);O(d);h=b(c,d,e,f)});return function(a){(h||q)(a)}}K();f()}function f(a,b){a.removeClass(b);var c=a.data(u);c&&(c.running&&c.running--,c.running&&0!==c.running||a.removeData(u))}function r(a,b){var c="";a=d.isArray(a)?a:a.split(/\s+/);w(a,function(a,d){a&&0<a.length&&(c+=(0<d?" ":"")+a+b)});return c}var m="",p,H,l,A;G.ontransitionend===P&&G.onwebkittransitionend!==P?(m="-webkit-",
+p="WebkitTransition",H="webkitTransitionEnd transitionend"):(p="transition",H="transitionend");G.onanimationend===P&&G.onwebkitanimationend!==P?(m="-webkit-",l="WebkitAnimation",A="webkitAnimationEnd animationend"):(l="animation",A="animationend");var Q="Duration",t="Property",v="Delay",n="IterationCount",x="$$ngAnimateKey",u="$$ngAnimateCSS3Data",S="ng-animate-block-transitions",C=3,D=1.5,ca=1E3,s={},da=0,T=[],L,ea=null,fa=0,Y=[];return{enter:function(a,b){return c("enter",a,"ng-enter",b)},leave:function(a,
+b){return c("leave",a,"ng-leave",b)},move:function(a,b){return c("move",a,"ng-move",b)},beforeSetClass:function(b,c,d,e){var f=r(d,"-remove")+" "+r(c,"-add"),g=a("setClass",b,f,function(a){var e=b.attr("class");b.removeClass(d);b.addClass(c);a=a();b.attr("class",e);return a});if(g)return k(b,function(){N(b,f);O(b);e()}),g;K();e()},beforeAddClass:function(b,c,d){var e=a("addClass",b,r(c,"-add"),function(a){b.addClass(c);a=a();b.removeClass(c);return a});if(e)return k(b,function(){N(b,c);O(b);d()}),
+e;K();d()},setClass:function(a,c,d,e){d=r(d,"-remove");c=r(c,"-add");return b("setClass",a,d+" "+c,e)},addClass:function(a,c,d){return b("addClass",a,r(c,"-add"),d)},beforeRemoveClass:function(b,c,d){var e=a("removeClass",b,r(c,"-remove"),function(a){var d=b.attr("class");b.removeClass(c);a=a();b.attr("class",d);return a});if(e)return k(b,function(){N(b,c);O(b);d()}),e;d()},removeClass:function(a,c,d){return b("removeClass",a,r(c,"-remove"),d)}}}])}])})(window,window.angular);
 //# sourceMappingURL=angular-animate.min.js.map
diff --git a/libs/bower_components/angular-animate/angular-animate.min.js.map b/libs/bower_components/angular-animate/angular-animate.min.js.map
index f92a010c38..c79d4f55cd 100644
--- a/libs/bower_components/angular-animate/angular-animate.min.js.map
+++ b/libs/bower_components/angular-animate/angular-animate.min.js.map
@@ -2,7 +2,7 @@
 "version":3,
 "file":"angular-animate.min.js",
 "lineCount":27,
-"mappings":"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",
+"mappings":"A;;;;;aAKC,SAAQ,CAACA,CAAD,CAASC,CAAT,CAAkBC,CAAlB,CAA6B,CA0PtCD,CAAAE,OAAA,CAAe,WAAf,CAA4B,CAAC,IAAD,CAA5B,CAAAC,UAAA,CAgBa,mBAhBb,CAgBkC,QAAQ,EAAG,CAEzC,MAAO,SAAQ,CAACC,CAAD,CAAQC,CAAR,CAAiBC,CAAjB,CAAwB,CACjCC,CAAAA,CAAMD,CAAAE,kBACPR,EAAAS,SAAA,CAAiBF,CAAjB,CAAH,EAA2C,CAA3C,GAA4BA,CAAAG,OAA5B,CACEL,CAAAM,KAAA,CAJsBC,qBAItB,CAAkC,CAAA,CAAlC,CADF,CAGER,CAAAS,OAAA,CAAaN,CAAb,CAAkB,QAAQ,CAACO,CAAD,CAAQ,CAChCT,CAAAM,KAAA,CAPoBC,qBAOpB,CAAkC,CAAC,CAACE,CAApC,CADgC,CAAlC,CALmC,CAFE,CAhB7C,CAAAC,QAAA,CAkCW,iBAlCX,CAkC8B,CAAC,OAAD,CAAU,WAAV,CAAuB,QAAQ,CAACC,CAAD,CAAQC,CAAR,CAAmB,CAE5E,MAAO,SAAQ,CAACC,CAAD,CAAK,CAElB,MAAOF,EAAA,CAAM,QAAQ,EAAG,CAOtBE,CAAA,EAPsB,CAAjB,CAFW,CAFwD,CAAlD,CAlC9B,CAAAC,OAAA,CAkDU,CAAC,UAAD,CAAa,kBAAb,CAAiC,QAAQ,CAACC,CAAD,CAAWC,CAAX,CAA6B,CAW5EC,QAASA,EAAkB,CAACjB,CAAD,CAAU,CACnC,IAAI,IAAIkB,EAAI,CAAZ,CAAeA,CAAf,CAAmBlB,CAAAK,OAAnB,CAAmCa,CAAA,EAAnC,CAAwC,CACtC,IAAIC,EAAMnB,CAAA,CAAQkB,CAAR,CACV,IAAGC,CAAAC,SAAH,EAAmBC,EAAnB,CACE,MAAOF,EAH6B,CADL,CAXuC;AAwB5EG,QAASA,EAAwB,CAACtB,CAAD,CAAU,CACzC,MAAOL,EAAAK,QAAA,CAAgBiB,CAAA,CAAmBjB,CAAnB,CAAhB,CADkC,CAvB3C,IAAIuB,EAAO5B,CAAA4B,KAAX,CACIC,EAAU7B,CAAA6B,QADd,CAEIC,EAAYT,CAAAU,YAFhB,CAIIL,GAAe,CAJnB,CAKIM,EAAmB,kBALvB,CAMIpB,GAAsB,qBAN1B,CAOIqB,EAAwB,YAP5B,CAQIC,EAAmB,SAAU,CAAA,CAAV,CAuBvBd,EAAAe,UAAA,CAAmB,UAAnB,CAA+B,CAAC,WAAD,CAAc,WAAd,CAA2B,UAA3B,CAAuC,cAAvC,CAAuD,iBAAvD,CAA0E,YAA1E,CAAwF,WAAxF,CACP,QAAQ,CAACC,CAAD,CAAcC,CAAd,CAA2BC,EAA3B,CAAuCC,CAAvC,CAAuDC,CAAvD,CAA2EC,CAA3E,CAAyFxB,CAAzF,CAAoG,CAwBlIyB,QAASA,EAAsB,CAACrC,CAAD,CAAU,CACvC,IAAIM,EAAON,CAAAM,KAAA,CAAaqB,CAAb,CAAPrB,EAAyC,EAC7CA,EAAAgC,QAAA,CAAe,CAAA,CACftC,EAAAM,KAAA,CAAaqB,CAAb,CAA+BrB,CAA/B,CAHuC,CAMzCiC,QAASA,GAAM,CAACC,CAAD,CAAO,CACpB,GAAIA,CAAJ,CAAU,CAAA,IACJC,EAAU,EADN,CAEJC,EAAU,EACVC,EAAAA,CAAUH,CAAAI,OAAA,CAAY,CAAZ,CAAAC,MAAA,CAAqB,GAArB,CAUd,EAAIZ,EAAAa,YAAJ,EAA4Bb,EAAAc,WAA5B,GACEN,CAAAO,KAAA,CAAahB,CAAAiB,IAAA,CAAcxB,CAAA,CAAU,EAAV,CAAd,CAAb,CAGF,KAAI,IAAIP,EAAE,CAAV,CAAaA,CAAb,CAAiByB,CAAAtC,OAAjB,CAAiCa,CAAA,EAAjC,CAAsC,CAAA,IAChCgC;AAAQP,CAAA,CAAQzB,CAAR,CADwB,CAEhCiC,EAAsB1B,CAAA,CAAUyB,CAAV,CACvBC,EAAH,EAA2B,CAAAT,CAAA,CAAQQ,CAAR,CAA3B,GACET,CAAAO,KAAA,CAAahB,CAAAiB,IAAA,CAAcE,CAAd,CAAb,CACA,CAAAT,CAAA,CAAQQ,CAAR,CAAA,CAAiB,CAAA,CAFnB,CAHoC,CAQtC,MAAOT,EAzBC,CADU,CA8BtBW,QAASA,EAAe,CAACpD,CAAD,CAAUqD,CAAV,CAA0BC,CAA1B,CAAqC,CA0C3DC,QAASA,EAAiB,CAACC,CAAD,CAAmBC,CAAnB,CAA0B,CAClD,IAAIC,EAAUF,CAAA,CAAiBC,CAAjB,CAAd,CACIE,EAAWH,CAAA,CAAiB,QAAjB,CAA4BC,CAAAG,OAAA,CAAa,CAAb,CAAAC,YAAA,EAA5B,CAA4DJ,CAAAb,OAAA,CAAa,CAAb,CAA5D,CACf,IAAGc,CAAH,EAAcC,CAAd,CAYE,MAXY,OAWL,EAXJF,CAWI,GAVLE,CAEA,CAFWD,CAEX,CAAAA,CAAA,CAAU,IAQL,EANPI,CAAAd,KAAA,CAAW,OACDS,CADC,IACWC,CADX,CAAX,CAMO,CAHPK,CAAAf,KAAA,CAAY,OACFS,CADE,IACUE,CADV,CAAZ,CAGO,CAAA,CAAA,CAfyC,CAmBpDK,QAASA,EAAG,CAACC,CAAD,CAAMC,CAAN,CAAqBC,CAArB,CAAoC,CAC9C,IAAIpB,EAAa,EACjBvB,EAAA,CAAQyC,CAAR,CAAa,QAAQ,CAACG,CAAD,CAAY,CAC/BA,CAAAvD,GAAA,EAAgBkC,CAAAC,KAAA,CAAgBoB,CAAhB,CADe,CAAjC,CAIA,KAAIC,EAAQ,CAaZ7C,EAAA,CAAQuB,CAAR,CAAoB,QAAQ,CAACqB,CAAD,CAAYE,CAAZ,CAAmB,CAC7C,IAAIC,EAAWA,QAAQ,EAAG,CAbW,CAAA,CAAA,CACrC,GAAGL,CAAH,CAAkB,CACf,CAAAA,CAAA,CAYsBI,CAZtB,CAAA,EAAwB/C,CAAxB,GACD,IAAG,EAAE8C,CAAL,CAAatB,CAAA1C,OAAb,CAAgC,MAAA,CAChC6D,EAAA,CAAgB,IAHA,CAKlBC,CAAA,EANqC,CAaX,CAG1B,QAAOC,CAAAX,MAAP,EACE,KAAK,UAAL,CACES,CAAAlB,KAAA,CAAmBoB,CAAAvD,GAAA,CAAab,CAAb,CAAsBwE,CAAtB,CAAoCC,CAApC,CAAqDF,CAArD,CAAnB,CACA,MACF,MAAK,UAAL,CACEL,CAAAlB,KAAA,CAAmBoB,CAAAvD,GAAA,CAAab,CAAb,CAAsBwE,CAAtB,EAAsClB,CAAtC;AAAqDiB,CAArD,CAAnB,CACA,MACF,MAAK,aAAL,CACEL,CAAAlB,KAAA,CAAmBoB,CAAAvD,GAAA,CAAab,CAAb,CAAsByE,CAAtB,EAAyCnB,CAAzC,CAAqDiB,CAArD,CAAnB,CACA,MACF,SACEL,CAAAlB,KAAA,CAAmBoB,CAAAvD,GAAA,CAAab,CAAb,CAAsBuE,CAAtB,CAAnB,CAXJ,CAJ6C,CAA/C,CAoBGL,EAAH,EAA6C,CAA7C,GAAoBA,CAAA7D,OAApB,EACE8D,CAAA,EAxC4C,CA1DhD,IAAIO,EAAO1E,CAAA,CAAQ,CAAR,CACX,IAAI0E,CAAJ,CAAA,CAIA,IAAIC,EAAwC,UAAxCA,EAAsBtB,CAA1B,CACIuB,EAAeD,CAAfC,EACiC,UADjCA,EACevB,CADfuB,EAEiC,aAFjCA,EAEevB,CAHnB,CAKImB,CALJ,CAKkBC,CACf9E,EAAAkF,QAAA,CAAgBvB,CAAhB,CAAH,GACEkB,CAEA,CAFelB,CAAA,CAAU,CAAV,CAEf,CADAmB,CACA,CADkBnB,CAAA,CAAU,CAAV,CAClB,CAAAA,CAAA,CAAYkB,CAAZ,CAA2B,GAA3B,CAAiCC,CAHnC,CAOA,KAAI9B,EADmB3C,CAAA8E,KAAAC,CAAa,OAAbA,CACnBpC,CAA6B,GAA7BA,CAAmCW,CACvC,IAAI0B,CAAA,CAAsBrC,CAAtB,CAAJ,CAAA,CAtB2D,IA0BvDsC,EAAiB1D,CA1BsC,CA2BvD2D,EAAe,EA3BwC,CA4BvDnB,EAAS,EA5B8C,CA6BvDoB,EAAgB5D,CA7BuC,CA8BvD6D,EAAc,EA9ByC,CA+BvDtB,EAAQ,EA/B+C,CAiCvDuB,EAAmBC,CAAA,GAAAA,CAAM3C,CAAN2C,SAAA,CAAuB,MAAvB,CAA8B,GAA9B,CACvB9D,EAAA,CAAQe,EAAA,CAAO8C,CAAP,CAAR,CAAiC,QAAQ,CAAC7B,CAAD,CAAmB,CAC5C+B,CAAAhC,CAAAgC,CAAkB/B,CAAlB+B,CAAoClC,CAApCkC,CACd,EAAeZ,CAAf,GACEpB,CAAA,CAAkBC,CAAlB,CAAoC,UAApC,CACA,CAAAD,CAAA,CAAkBC,CAAlB,CAAoC,aAApC,CAFF,CAF0D,CAA5D,CAuEA,OAAO,MACEkB,CADF,OAEGrB,CAFH,WAGOC,CAHP,cAIUsB,CAJV,qBAKiBD,CALjB,QAMIZ,QAAQ,CAACI,CAAD,CAAgB,CAC/Bc,CAAA,CAAiBd,CACjBH,EAAA,CAAID,CAAJ,CAAYmB,CAAZ,CAA0B,QAAQ,EAAG,CACnCD,CAAA;AAAiB1D,CACjB4C,EAAA,EAFmC,CAArC,CAF+B,CAN5B,OAaGL,QAAQ,CAACK,CAAD,CAAgB,CAC9BgB,CAAA,CAAgBhB,CAChBH,EAAA,CAAIF,CAAJ,CAAWsB,CAAX,CAAwB,QAAQ,EAAG,CACjCD,CAAA,CAAgB5D,CAChB4C,EAAA,EAFiC,CAAnC,CAF8B,CAb3B,QAoBIqB,QAAQ,EAAG,CACfN,CAAH,GACE1D,CAAA,CAAQ0D,CAAR,CAAsB,QAAQ,CAACO,CAAD,CAAW,CACtC,CAAAA,CAAA,EAAYlE,CAAZ,EAAkB,CAAA,CAAlB,CADsC,CAAzC,CAGA,CAAA0D,CAAA,CAAe,CAAA,CAAf,CAJF,CAMGG,EAAH,GACE5D,CAAA,CAAQ4D,CAAR,CAAqB,QAAQ,CAACK,CAAD,CAAW,CACrC,CAAAA,CAAA,EAAYlE,CAAZ,EAAkB,CAAA,CAAlB,CADqC,CAAxC,CAGA,CAAA4D,CAAA,CAAc,CAAA,CAAd,CAJF,CAPkB,CApBf,CAnFP,CAlBA,CAJ2D,CA0a7DO,QAASA,EAAgB,CAACrC,CAAD,CAAiBC,CAAjB,CAA4BtD,CAA5B,CAAqC2F,CAArC,CAAoDC,CAApD,CAAkEC,CAAlE,CAAgFC,CAAhF,CAA8F,CA+IrHC,QAASA,EAAe,CAACC,CAAD,CAAiB,CACvC,IAAIC,EAAY,WAAZA,CAA0BD,CAC3BE,EAAH,GAAoBA,CAAA,CAAcD,CAAd,CAApB,EAAkF,CAAlF,CAAgDC,CAAA,CAAcD,CAAd,CAAA5F,OAAhD,GACE8B,CAAA,CAAgB,QAAQ,EAAG,CACzBnC,CAAAmG,eAAA,CAAuBF,CAAvB,CAAkC,OACxB5C,CADwB,WAEpBC,CAFoB,CAAlC,CADyB,CAA3B,CAHqC,CAYzC8C,QAASA,EAAuB,EAAG,CACjCL,CAAA,CAAgB,QAAhB,CADiC,CAInCM,QAASA,EAAsB,EAAG,CAChCN,CAAA,CAAgB,OAAhB,CADgC,CAIlCO,QAASA,EAAqB,EAAG,CAC/BP,CAAA,CAAgB,OAAhB,CACGD,EAAH,EACE3D,CAAA,CAAgB,QAAQ,EAAG,CACzB2D,CAAA,EADyB,CAA3B,CAH6B,CAWjCS,QAASA,EAAgB,EAAG,CACtBA,CAAAC,WAAJ,GACED,CAAAC,WACA,CAD8B,CAAA,CAC9B,CAAAX,CAAA,EAFF,CAD0B,CAO5BY,QAASA,EAAc,EAAG,CACxB,GAAG,CAACA,CAAAD,WAAJ,CAA+B,CAC7BC,CAAAD,WAAA,CAA4B,CAAA,CAC5B,KAAIlG;AAAON,CAAAM,KAAA,CAAaqB,CAAb,CACRrB,EAAH,GAKKoG,CAAH,EAAaA,CAAA9B,aAAb,CACE+B,CAAA,CAAQ3G,CAAR,CAAiBsD,CAAjB,CADF,EAGEnB,CAAA,CAAgB,QAAQ,EAAG,CACzB,IAAI7B,EAAON,CAAAM,KAAA,CAAaqB,CAAb,CAAPrB,EAAyC,EAC1CsG,EAAH,EAA0BtG,CAAAgE,MAA1B,EACEqC,CAAA,CAAQ3G,CAAR,CAAiBsD,CAAjB,CAA4BD,CAA5B,CAHuB,CAA3B,CAMA,CAAArD,CAAAM,KAAA,CAAaqB,CAAb,CAA+BrB,CAA/B,CATF,CALF,CAiBAgG,EAAA,EApB6B,CADP,CAnL1B,IAAII,EAAStD,CAAA,CAAgBpD,CAAhB,CAAyBqD,CAAzB,CAAyCC,CAAzC,CACb,IAAIoD,CAAJ,CAAA,CAQApD,CAAA,CAAYoD,CAAApD,UACZ,KAAI4C,EAAgBvG,CAAAK,QAAA6G,MAAA,CAAsBH,CAAAhC,KAAtB,CAApB,CACAwB,EAAgBA,CAAhBA,EAAiCA,CAAAY,OAE5BnB,EAAL,GACEA,CADF,CACkBC,CAAA,CAAeA,CAAAmB,OAAA,EAAf,CAAuC/G,CAAA+G,OAAA,EADzD,CAIA,KAAIC,EAAkBhH,CAAAM,KAAA,CAAaqB,CAAb,CAAlBqF,EAAoD,EACpDC,EAAAA,CAAwBD,CAAAE,OAAxBD,EAAiD,EACrD,KAAIE,EAAwBH,CAAAI,YAAxBD,EAAsD,CAA1D,CACIE,EAAwBL,CAAAM,KAD5B,CAKIC,CACAb,EAAA9B,aAAJ,GACE2C,CADF,CACmBP,CAAA1E,QADnB,EAEmB0E,CAAAQ,SAFnB,EAGoBH,CAHpB,EAGqC,CAACA,CAAAzC,aAHtC,CAUA,IAAI2C,CAAJ,EAAsBE,CAAA,CAAmBzH,CAAnB,CAA4B2F,CAA5B,CAAtB,CACEY,CAAA,EAGA,CAFAH,CAAA,EAEA,CADAC,CAAA,EACA,CAAAI,CAAA,EAJF,KAAA,CAQIiB,CAAAA,CAAgB,CAAA,CACpB,IAA2B,CAA3B,CAAGP,CAAH,CAA8B,CACxBQ,CAAAA,CAAqB,EACzB,IAAIjB,CAAA9B,aAAJ,CAYiC,UAA1B,EAAGyC,CAAA5D,MAAH,EACLkE,CAAA3E,KAAA,CAAwBqE,CAAxB,CACA,CAAAV,CAAA,CAAQ3G,CAAR,CAAiBsD,CAAjB,CAFK,EAIC2D,CAAA,CAAkB3D,CAAlB,CAJD,GAKDsE,CACJ,CADcX,CAAA,CAAkB3D,CAAlB,CACd,CAAGsE,CAAAnE,MAAH,EAAoBJ,CAApB,CACEqE,CADF,CACkB,CAAA,CADlB,EAGEC,CAAA3E,KAAA,CAAwB4E,CAAxB,CACA;AAAAjB,CAAA,CAAQ3G,CAAR,CAAiBsD,CAAjB,CAJF,CANK,CAZP,KACE,IAAqB,OAArB,EAAGD,CAAH,EAAgC4D,CAAA,CAAkB,UAAlB,CAAhC,CACES,CAAA,CAAgB,CAAA,CADlB,KAEO,CAEL,IAAIxE,IAAIA,CAAR,GAAiB+D,EAAjB,CACEU,CAAA3E,KAAA,CAAwBiE,CAAA,CAAkB/D,CAAlB,CAAxB,CACA,CAAAyD,CAAA,CAAQ3G,CAAR,CAAiBkD,CAAjB,CAEF+D,EAAA,CAAoB,EACpBE,EAAA,CAAwB,CAPnB,CAuBsB,CAA/B,CAAGQ,CAAAtH,OAAH,EACEmB,CAAA,CAAQmG,CAAR,CAA4B,QAAQ,CAACE,CAAD,CAAY,CAC9CA,CAAArC,OAAA,EAD8C,CAAhD,CA7B0B,CAmC3BZ,CAAA8B,CAAA9B,aAAH,GAA2B8B,CAAA/B,oBAA3B,EAA0D+C,CAA1D,IACEA,CADF,CACqC,UADrC,EACmBrE,CADnB,EACoDrD,CAAA8H,SAAA,CAAiBxE,CAAjB,CADpD,CAIA,IAAGoE,CAAH,CACEnB,CAAA,EAGA,CAFAH,CAAA,EAEA,CADAC,CAAA,EACA,CAAAC,CAAA,EAJF,KAAA,CAQA,GAAqB,OAArB,EAAGjD,CAAH,CAIErD,CAAA+H,IAAA,CAAY,UAAZ,CAAwB,QAAQ,CAACC,CAAD,CAAI,CAC9BhI,CAAAA,CAAUL,CAAAK,QAAA,CAAgB,IAAhB,CACd,KAAIiI,EAAQjI,CAAAM,KAAA,CAAaqB,CAAb,CACTsG,EAAH,GACMC,CADN,CAC6BD,CAAAf,OAAA,CAAa,UAAb,CAD7B,IAGIgB,CAAA1C,OAAA,EACA,CAAAmB,CAAA,CAAQ3G,CAAR,CAAiB,UAAjB,CAJJ,CAHkC,CAApC,CAeFA,EAAAmI,SAAA,CAAiBvG,CAAjB,CAEA,KAAIgF,EAAsBwB,CAAA,EAC1BjB,EAAA,EACAF,EAAA,CAAkB3D,CAAlB,CAAA,CAA+BoD,CAE/B1G,EAAAM,KAAA,CAAaqB,CAAb,CAA+B,MACtB+E,CADsB,QAEpBO,CAFoB,OAGrBL,CAHqB,aAIfO,CAJe,CAA/B,CASAf,EAAA,EACAM,EAAA3C,OAAA,CAAc,QAAQ,CAACsE,CAAD,CAAY,CAChC,IAAI/H,EAAON,CAAAM,KAAA,CAAaqB,CAAb,CACX0G;CAAA,CAAYA,CAAZ,EACc,CAAC/H,CADf,EACuB,CAACA,CAAA4G,OAAA,CAAY5D,CAAZ,CADxB,EAEeoD,CAAA9B,aAFf,EAEsCtE,CAAA4G,OAAA,CAAY5D,CAAZ,CAAAG,MAFtC,EAEsEJ,CAEtEkD,EAAA,EACiB,EAAA,CAAjB,GAAG8B,CAAH,CACE5B,CAAA,EADF,EAGEJ,CAAA,EACA,CAAAK,CAAA5C,MAAA,CAAa2C,CAAb,CAJF,CAPgC,CAAlC,CA3CA,CAhDA,CAlCA,CAAA,IACEF,EAAA,EAGA,CAFAH,CAAA,EAEA,CADAC,CAAA,EACA,CAAAI,CAAA,EAPmH,CA+MvH6B,QAASA,EAAqB,CAACtI,CAAD,CAAU,CAEtC,GADI0E,CACJ,CADWzD,CAAA,CAAmBjB,CAAnB,CACX,CACMuI,CAGJ,CAHY5I,CAAA6I,WAAA,CAAmB9D,CAAA+D,uBAAnB,CAAA,CACV/D,CAAA+D,uBAAA,CAA4B7G,CAA5B,CADU,CAEV8C,CAAAgE,iBAAA,CAAsB,GAAtB,CAA4B9G,CAA5B,CACF,CAAAJ,CAAA,CAAQ+G,CAAR,CAAe,QAAQ,CAACvI,CAAD,CAAU,CAC/BA,CAAA,CAAUL,CAAAK,QAAA,CAAgBA,CAAhB,CAEV,EADIM,CACJ,CADWN,CAAAM,KAAA,CAAaqB,CAAb,CACX,GAAWrB,CAAA4G,OAAX,EACE1F,CAAA,CAAQlB,CAAA4G,OAAR,CAAqB,QAAQ,CAACR,CAAD,CAAS,CACpCA,CAAAlB,OAAA,EADoC,CAAtC,CAJ6B,CAAjC,CANoC,CAkBxCmB,QAASA,EAAO,CAAC3G,CAAD,CAAUsD,CAAV,CAAqB,CACnC,GA5sBKrC,CAAA,CA4sBgBjB,CA5sBhB,CA4sBL,EA5sBiCiB,CAAA,CA4sBHiB,CA5sBG,CA4sBjC,CACML,CAAA2F,SAAJ,GACE3F,CAAAS,QACA,CAD2B,CAAA,CAC3B,CAAAT,CAAA8G,WAAA,CAA8B,CAAA,CAFhC,CADF,KAKO,IAAGrF,CAAH,CAAc,CACnB,IAAIhD,EAAON,CAAAM,KAAA,CAAaqB,CAAb,CAAPrB,EAAyC,EAA7C,CAEIsI,EAAiC,CAAA,CAAjCA,GAAmBtF,CACnBsF,EAAAA,CAAJ,GAAwBtI,CAAA4G,OAAxB,EAAuC5G,CAAA4G,OAAA,CAAY5D,CAAZ,CAAvC,IACEhD,CAAA8G,YAAA,EACA,CAAA,OAAO9G,CAAA4G,OAAA,CAAY5D,CAAZ,CAFT,CAKA;GAAGsF,CAAH,EAAuB,CAACtI,CAAA8G,YAAxB,CACEpH,CAAA6I,YAAA,CAAoBjH,CAApB,CACA,CAAA5B,CAAA8I,WAAA,CAAmBnH,CAAnB,CAXiB,CANc,CAsBrC8F,QAASA,EAAkB,CAACzH,CAAD,CAAU2F,CAAV,CAAyB,CAClD,GAAI9D,CAAA2F,SAAJ,CACE,MAAO,CAAA,CAGT,IAtuBKvG,CAAA,CAsuBiBjB,CAtuBjB,CAsuBL,EAtuBiCiB,CAAA,CAsuBFiB,CAtuBE,CAsuBjC,CACE,MAAOL,EAAAS,QANyC,KAS9CyG,CAT8C,CASxBC,CATwB,CASAC,CAClD,GAAG,CAID,GAA6B,CAA7B,GAAItD,CAAAtF,OAAJ,CAAgC,KAEhC,KAAI6I,EAjvBDjI,CAAA,CAivB4B0E,CAjvB5B,CAivBCuD,EAjvB2BjI,CAAA,CAivBeiB,CAjvBf,CAivB/B,CACI+F,EAAQiB,CAAA,CAASrH,CAAT,CAA6B8D,CAAArF,KAAA,CAAmBqB,CAAnB,CAA7B,EAAqE,EACjF,IAAIsG,CAAAT,SAAJ,CACE,MAAO,CAAA,CAKL0B,EAAJ,GACED,CADF,CACc,CAAA,CADd,CAM6B,EAAA,CAA7B,GAAIF,CAAJ,GACMI,CACJ,CAD0BxD,CAAArF,KAAA,CAAmBC,EAAnB,CAC1B,CAAGZ,CAAAyJ,UAAA,CAAkBD,CAAlB,CAAH,GACEJ,CADF,CACyBI,CADzB,CAFF,CAOAH,EAAA,CAAyBA,CAAzB,EACyBf,CAAA3F,QADzB,EAE0B2F,CAAAX,KAF1B,EAEwC,CAACW,CAAAX,KAAA1C,aA7BxC,CAAH,MA+BMe,CA/BN,CA+BsBA,CAAAoB,OAAA,EA/BtB,CAiCA,OAAO,CAACkC,CAAR,EAAsB,CAACF,CAAvB,EAA+CC,CA3CG,CA3tBpD,IAAIZ,EAAyB,CAC7BlG,EAAA5B,KAAA,CAAkBqB,CAAlB,CAAoCE,CAApC,CAQAO,EAAAiH,aAAA,CAAwB,QAAQ,EAAG,CACjCjH,CAAAiH,aAAA,CAAwB,QAAQ,EAAG,CACjCxH,CAAAS,QAAA,CAA2B,CAAA,CADM,CAAnC,CADiC,CAAnC,CAMA,KAAIgH,EAAkBtI,CAAAsI,gBAAA,EAAtB,CACItE,EAAyBsE,CACD,CAClB,QAAQ,CAAChG,CAAD,CAAY,CACpB,MAAOgG,EAAAC,KAAA,CAAqBjG,CAArB,CADa,CADF;AAAlB,QAAQ,EAAG,CAAE,MAAO,CAAA,CAAT,CA0MrB,OAAO,OA8BGkG,QAAQ,CAACxJ,CAAD,CAAU2F,CAAV,CAAyBC,CAAzB,CAAuCE,CAAvC,CAAqD,CACnE9F,CAAA,CAAUL,CAAAK,QAAA,CAAgBA,CAAhB,CACV2F,EAAA,CAA+BA,CAA/B,EAzQchG,CAAAK,QAAA,CAyQiB2F,CAzQjB,CA0QdC,EAAA,CAA8BA,CAA9B,EA1QcjG,CAAAK,QAAA,CA0QgB4F,CA1QhB,CA4QdvD,EAAA,CAAuBrC,CAAvB,CACA+B,EAAAyH,MAAA,CAAgBxJ,CAAhB,CAAyB2F,CAAzB,CAAwCC,CAAxC,CACAxD,EAAAiH,aAAA,CAAwB,QAAQ,EAAG,CACjCrJ,CAAA,CAAUsB,CAAA,CAAyBtB,CAAzB,CACV0F,EAAA,CAAiB,OAAjB,CAA0B,UAA1B,CAAsC1F,CAAtC,CAA+C2F,CAA/C,CAA8DC,CAA9D,CAA4ErE,CAA5E,CAAkFuE,CAAlF,CAFiC,CAAnC,CAPmE,CA9BhE,OAsEG2D,QAAQ,CAACzJ,CAAD,CAAU8F,CAAV,CAAwB,CACtC9F,CAAA,CAAUL,CAAAK,QAAA,CAAgBA,CAAhB,CACVsI,EAAA,CAAsBtI,CAAtB,CACAqC,EAAA,CAAuBrC,CAAvB,CACAoC,EAAAiH,aAAA,CAAwB,QAAQ,EAAG,CACjC3D,CAAA,CAAiB,OAAjB,CAA0B,UAA1B,CAAsCpE,CAAA,CAAyBtB,CAAzB,CAAtC,CAAyE,IAAzE,CAA+E,IAA/E,CAAqF,QAAQ,EAAG,CAC9F+B,CAAA0H,MAAA,CAAgBzJ,CAAhB,CAD8F,CAAhG,CAEG8F,CAFH,CADiC,CAAnC,CAJsC,CAtEnC,MA+GE4D,QAAQ,CAAC1J,CAAD,CAAU2F,CAAV,CAAyBC,CAAzB,CAAuCE,CAAvC,CAAqD,CAClE9F,CAAA,CAAUL,CAAAK,QAAA,CAAgBA,CAAhB,CACV2F,EAAA,CAA+BA,CAA/B,EA1VchG,CAAAK,QAAA,CA0ViB2F,CA1VjB,CA2VdC,EAAA,CAA8BA,CAA9B,EA3VcjG,CAAAK,QAAA,CA2VgB4F,CA3VhB,CA6Vd0C,EAAA,CAAsBtI,CAAtB,CACAqC,EAAA,CAAuBrC,CAAvB,CACA+B,EAAA2H,KAAA,CAAe1J,CAAf,CAAwB2F,CAAxB,CAAuCC,CAAvC,CACAxD,EAAAiH,aAAA,CAAwB,QAAQ,EAAG,CACjCrJ,CAAA,CAAUsB,CAAA,CAAyBtB,CAAzB,CACV0F,EAAA,CAAiB,MAAjB,CAAyB,SAAzB,CAAoC1F,CAApC,CAA6C2F,CAA7C,CAA4DC,CAA5D,CAA0ErE,CAA1E,CAAgFuE,CAAhF,CAFiC,CAAnC,CARkE,CA/G/D,UA0JMqC,QAAQ,CAACnI,CAAD;AAAUsD,CAAV,CAAqBwC,CAArB,CAAmC,CACpD9F,CAAA,CAAUL,CAAAK,QAAA,CAAgBA,CAAhB,CACVA,EAAA,CAAUsB,CAAA,CAAyBtB,CAAzB,CACV0F,EAAA,CAAiB,UAAjB,CAA6BpC,CAA7B,CAAwCtD,CAAxC,CAAiD,IAAjD,CAAuD,IAAvD,CAA6D,QAAQ,EAAG,CACtE+B,CAAAoG,SAAA,CAAmBnI,CAAnB,CAA4BsD,CAA5B,CADsE,CAAxE,CAEGwC,CAFH,CAHoD,CA1JjD,aA+LS+C,QAAQ,CAAC7I,CAAD,CAAUsD,CAAV,CAAqBwC,CAArB,CAAmC,CACvD9F,CAAA,CAAUL,CAAAK,QAAA,CAAgBA,CAAhB,CACVA,EAAA,CAAUsB,CAAA,CAAyBtB,CAAzB,CACV0F,EAAA,CAAiB,aAAjB,CAAgCpC,CAAhC,CAA2CtD,CAA3C,CAAoD,IAApD,CAA0D,IAA1D,CAAgE,QAAQ,EAAG,CACzE+B,CAAA8G,YAAA,CAAsB7I,CAAtB,CAA+BsD,CAA/B,CADyE,CAA3E,CAEGwC,CAFH,CAHuD,CA/LpD,UAqNM6D,QAAQ,CAAC3J,CAAD,CAAU4J,CAAV,CAAeC,CAAf,CAAuB/D,CAAvB,CAAqC,CACtD9F,CAAA,CAAUL,CAAAK,QAAA,CAAgBA,CAAhB,CACVA,EAAA,CAAUsB,CAAA,CAAyBtB,CAAzB,CACV0F,EAAA,CAAiB,UAAjB,CAA6B,CAACkE,CAAD,CAAMC,CAAN,CAA7B,CAA4C7J,CAA5C,CAAqD,IAArD,CAA2D,IAA3D,CAAiE,QAAQ,EAAG,CAC1E+B,CAAA4H,SAAA,CAAmB3J,CAAnB,CAA4B4J,CAA5B,CAAiCC,CAAjC,CAD0E,CAA5E,CAEG/D,CAFH,CAHsD,CArNnD,SA0OKgE,QAAQ,CAACrJ,CAAD,CAAQT,CAAR,CAAiB,CACjC,OAAO+J,SAAA1J,OAAP,EACE,KAAK,CAAL,CACE,GAAGI,CAAH,CACEkG,CAAA,CAAQ3G,CAAR,CADF,KAEO,CACL,IAAIM,EAAON,CAAAM,KAAA,CAAaqB,CAAb,CAAPrB,EAAyC,EAC7CA,EAAAkH,SAAA,CAAgB,CAAA,CAChBxH,EAAAM,KAAA,CAAaqB,CAAb,CAA+BrB,CAA/B,CAHK,CAKT,KAEA,MAAK,CAAL,CACEuB,CAAA2F,SAAA,CAA4B,CAAC/G,CAC/B,MAEA,SACEA,CAAA,CAAQ,CAACoB,CAAA2F,SAhBb,CAmBA,MAAO,CAAC,CAAC/G,CApBwB,CA1O9B,CA7N2H,CADrG,CAA/B,CA6wBAO,EAAAgJ,SAAA,CAA0B,EAA1B;AAA8B,CAAC,SAAD,CAAY,UAAZ,CAAwB,UAAxB,CAAoC,iBAApC,CACP,QAAQ,CAACC,CAAD,CAAYhI,CAAZ,CAAwBiI,CAAxB,CAAoCC,CAApC,CAAqD,CA6ClFC,QAASA,EAAqB,EAAG,CAC1BC,CAAL,GACEA,CADF,CAC0BF,CAAA,CAAgB,QAAQ,EAAG,CACjDG,CAAA,CAAuB,EACvBD,EAAA,CAAwB,IACxBE,EAAA,CAAc,EAHmC,CAA3B,CAD1B,CAD+B,CAUjCC,QAASA,EAAW,CAACxK,CAAD,CAAUyK,CAAV,CAAoB,CACnCJ,CAAH,EACEA,CAAA,EAEFC,EAAAtH,KAAA,CAA0ByH,CAA1B,CACAJ,EAAA,CAAwBF,CAAA,CAAgB,QAAQ,EAAG,CACjD3I,CAAA,CAAQ8I,CAAR,CAA8B,QAAQ,CAACzJ,CAAD,CAAK,CACzCA,CAAA,EADyC,CAA3C,CAIAyJ,EAAA,CAAuB,EACvBD,EAAA,CAAwB,IACxBE,EAAA,CAAc,EAPmC,CAA3B,CALc,CAmBxCG,QAASA,EAAqB,CAAC1K,CAAD,CAAU2K,CAAV,CAAqB,CACjD,IAAIjG,EAAOzD,CAAA,CAAmBjB,CAAnB,CACXA,EAAA,CAAUL,CAAAK,QAAA,CAAgB0E,CAAhB,CAIVkG,EAAA5H,KAAA,CAA2BhD,CAA3B,CAII6K,EAAAA,CAAkBC,IAAAC,IAAA,EAAlBF,CAA+BF,CAChCE,EAAH,EAAsBG,EAAtB,GAIAd,CAAA1E,OAAA,CAAgByF,EAAhB,CAGA,CADAD,EACA,CADmBH,CACnB,CAAAI,EAAA,CAAef,CAAA,CAAS,QAAQ,EAAG,CACjCgB,CAAA,CAAmBN,CAAnB,CACAA,EAAA,CAAwB,EAFS,CAApB,CAGZD,CAHY,CAGD,CAAA,CAHC,CAPf,CAXiD,CAwBnDO,QAASA,EAAkB,CAACC,CAAD,CAAW,CACpC3J,CAAA,CAAQ2J,CAAR,CAAkB,QAAQ,CAACnL,CAAD,CAAU,CAElC,CADIoL,CACJ,CADkBpL,CAAAM,KAAA,CAAa+K,CAAb,CAClB,GACG,CAAAD,CAAAE,iBAAA,EAAgC/J,CAAhC,GAH+B,CAApC,CADoC,CAStCgK,QAASA,EAA0B,CAACvL,CAAD,CAAUwL,CAAV,CAAoB,CACrD,IAAIlL,EAAOkL,CAAA,CAAWjB,CAAA,CAAYiB,CAAZ,CAAX,CAAmC,IAC9C,IAAG,CAAClL,CAAJ,CAAU,CACR,IAAImL,EAAqB,CAAzB,CACIC,EAAkB,CADtB,CAEIC,EAAoB,CAFxB,CAGIC,EAAiB,CAHrB,CAIIC,CAJJ,CAKIC,CALJ,CAMIC,CANJ,CAOIC,CAGJxK,EAAA,CAAQxB,CAAR,CAAiB,QAAQ,CAACA,CAAD,CAAU,CACjC,GAAIA,CAAAoB,SAAJ;AAAwBC,EAAxB,CAAsC,CAChC4K,CAAAA,CAAgBhC,CAAAiC,iBAAA,CAAyBlM,CAAzB,CAAhBiM,EAAqD,EAEzDF,EAAA,CAA0BE,CAAA,CAAcE,CAAd,CAAgCC,CAAhC,CAE1BX,EAAA,CAAqBY,IAAAC,IAAA,CAASC,CAAA,CAAaR,CAAb,CAAT,CAAgDN,CAAhD,CAErBO,EAAA,CAA0BC,CAAA,CAAcE,CAAd,CAAgCK,CAAhC,CAE1BX,EAAA,CAAuBI,CAAA,CAAcE,CAAd,CAAgCM,CAAhC,CAEvBf,EAAA,CAAmBW,IAAAC,IAAA,CAASC,CAAA,CAAaV,CAAb,CAAT,CAA6CH,CAA7C,CAEnBI,EAAA,CAAsBG,CAAA,CAAcS,CAAd,CAA+BD,CAA/B,CAEtBb,EAAA,CAAmBS,IAAAC,IAAA,CAASC,CAAA,CAAaT,CAAb,CAAT,CAA4CF,CAA5C,CAEnB,KAAIe,EAAaJ,CAAA,CAAaN,CAAA,CAAcS,CAAd,CAA+BN,CAA/B,CAAb,CAEF,EAAf,CAAGO,CAAH,GACEA,CADF,EACeC,QAAA,CAASX,CAAA,CAAcS,CAAd,CAA+BG,CAA/B,CAAT,CAAwE,EAAxE,CADf,EAC8F,CAD9F,CAIAlB,EAAA,CAAoBU,IAAAC,IAAA,CAASK,CAAT,CAAoBhB,CAApB,CAvBgB,CADL,CAAnC,CA2BArL,EAAA,CAAO,OACG,CADH,yBAEoB0L,CAFpB,yBAGoBD,CAHpB,sBAIiBF,CAJjB,iBAKYH,CALZ,oBAMeD,CANf,qBAOgBK,CAPhB,gBAQWF,CARX,mBAScD,CATd,CAWJH,EAAH,GACEjB,CAAA,CAAYiB,CAAZ,CADF,CAC0BlL,CAD1B,CAjDQ,CAqDV,MAAOA,EAvD8C,CA0DvDiM,QAASA,EAAY,CAACO,CAAD,CAAM,CACzB,IAAIC,EAAW,CACXC,EAAAA,CAASrN,CAAAS,SAAA,CAAiB0M,CAAjB,CAAA,CACXA,CAAAjK,MAAA,CAAU,SAAV,CADW,CAEX,EACFrB,EAAA,CAAQwL,CAAR,CAAgB,QAAQ,CAACvM,CAAD,CAAQ,CAC9BsM,CAAA,CAAWV,IAAAC,IAAA,CAASW,UAAA,CAAWxM,CAAX,CAAT;AAA8B,CAA9B,CAAiCsM,CAAjC,CADmB,CAAhC,CAGA,OAAOA,EARkB,CAW3BG,QAASA,EAAW,CAAClN,CAAD,CAAU,CAC5B,IAAI2F,EAAgB3F,CAAA+G,OAAA,EAApB,CACIoG,EAAWxH,CAAArF,KAAA,CAAmB8M,CAAnB,CACXD,EAAJ,GACExH,CAAArF,KAAA,CAAmB8M,CAAnB,CAA0C,EAAEC,EAA5C,CACA,CAAAF,CAAA,CAAWE,EAFb,CAIA,OAAOF,EAAP,CAAkB,GAAlB,CAAwBlM,CAAA,CAAmBjB,CAAnB,CAAAsN,aAAA,CAAyC,OAAzC,CAPI,CAU9BC,QAASA,EAAY,CAAClK,CAAD,CAAiBrD,CAAjB,CAA0BsD,CAA1B,CAAqCkK,CAArC,CAA2D,CAC9E,IAAIhC,EAAW0B,CAAA,CAAYlN,CAAZ,CAAf,CACIyN,EAAgBjC,CAAhBiC,CAA2B,GAA3BA,CAAiCnK,CADrC,CAEIoK,EAAYnD,CAAA,CAAYkD,CAAZ,CAAA,CAA6B,EAAElD,CAAA,CAAYkD,CAAZ,CAAAE,MAA/B,CAAkE,CAFlF,CAIIC,EAAU,EACd,IAAe,CAAf,CAAGF,CAAH,CAAkB,CAChB,IAAIG,EAAmBvK,CAAnBuK,CAA+B,UAAnC,CACIC,EAAkBtC,CAAlBsC,CAA6B,GAA7BA,CAAmCD,CAGvC,EAFIE,CAEJ,CAFmB,CAACxD,CAAA,CAAYuD,CAAZ,CAEpB,GAAgB9N,CAAAmI,SAAA,CAAiB0F,CAAjB,CAEhBD,EAAA,CAAUrC,CAAA,CAA2BvL,CAA3B,CAAoC8N,CAApC,CAEVC,EAAA,EAAgB/N,CAAA6I,YAAA,CAAoBgF,CAApB,CATA,CAclBL,CAAA,CAAuBA,CAAvB,EACuB,QAAQ,CAAC3M,CAAD,CAAK,CAAE,MAAOA,EAAA,EAAT,CAEpCb,EAAAmI,SAAA,CAAiB7E,CAAjB,CAEI0K,KAAAA,EAAahO,CAAAM,KAAA,CAAa+K,CAAb,CAAb2C,EAAsD,EAAtDA,CAEAC,EAAUT,CAAA,CAAqB,QAAQ,EAAG,CAC5C,MAAOjC,EAAA,CAA2BvL,CAA3B,CAAoCyN,CAApC,CADqC,CAAhC,CAIVhC,EAAAA,CAAqBwC,CAAAxC,mBACrBE,EAAAA,CAAoBsC,CAAAtC,kBACxB,IAA0B,CAA1B,GAAGF,CAAH,EAAqD,CAArD,GAA+BE,CAA/B,CAEE,MADA3L,EAAA6I,YAAA,CAAoBvF,CAApB,CACO,CAAA,CAAA,CAGTtD,EAAAM,KAAA,CAAa+K,CAAb,CAAsC,SAC1B2C,CAAA1L,QAD0B,EACJ,CADI,WAExBoL,CAFwB;QAG1BE,CAH0B,SAI1BK,CAJ0B,kBAKjB1M,CALiB,CAAtC,CAUI2M,EAAAA,CAA4C,CAA5CA,CAAuBF,CAAA1L,QAAvB4L,EAAmE,UAAnEA,EAAiD7K,CAC7B,EAAxB,CAAGoI,CAAH,EACE0C,CAAA,CAAiBnO,CAAjB,CAA0BsD,CAA1B,CAAqC4K,CAArC,CASqB,EAAvB,CAAGvC,CAAH,GAAqD,CAArD,CAA4BiC,CAAAhC,eAA5B,EAAwF,CAAxF,GAA0DgC,CAAAjC,kBAA1D,IAoBA1K,CAAA,CAnB0BjB,CAmB1B,CAAAoO,MAAA,CAAkC1B,CAAlC,CApBA,CAoBoD,SApBpD,CAIA,OAAO,CAAA,CA/DuE,CAsEhFyB,QAASA,EAAgB,CAACnO,CAAD,CAAUsD,CAAV,CAAqB+K,CAArB,CAAkC,CAHrC,UAIpB,EAAyB/K,CAAzB,GAJ+C,SAI/C,EAAyBA,CAAzB,EAJyE,UAIzE,EAAyBA,CAAzB,GAAwC+K,CAAxC,CAGErO,CAAAmI,SAAA,CAAiBmG,CAAjB,CAHF,CACErN,CAAA,CAAmBjB,CAAnB,CAAAoO,MAAA,CAAkCjC,CAAlC,CAAoDK,CAApD,CADF,CACsE,MAFb,CAY3D+B,QAASA,EAAkB,CAACvO,CAAD,CAAUsD,CAAV,CAAqB,CAC9C,IAAIkL,EAAOrC,CAAPqC,CAAyBhC,CAA7B,CACI9H,EAAOzD,CAAA,CAAmBjB,CAAnB,CACR0E,EAAA0J,MAAA,CAAWI,CAAX,CAAH,EAAiD,CAAjD,CAAuB9J,CAAA0J,MAAA,CAAWI,CAAX,CAAAnO,OAAvB,GACEqE,CAAA0J,MAAA,CAAWI,CAAX,CADF,CACqB,EADrB,CAGAxO,EAAA6I,YAAA,CAAoByF,CAApB,CAN8C,CAShDG,QAASA,EAAyB,CAACzO,CAAD,CAAU,CAC1C,IAAIwO,EAAO9B,CACPhI,EAAAA,CAAOzD,CAAA,CAAmBjB,CAAnB,CACR0E,EAAA0J,MAAA,CAAWI,CAAX,CAAH,EAAiD,CAAjD,CAAuB9J,CAAA0J,MAAA,CAAWI,CAAX,CAAAnO,OAAvB,GACEqE,CAAA0J,MAAA,CAAWI,CAAX,CADF,CACqB,EADrB,CAH0C,CAQ5CE,QAASA,EAAU,CAACrL,CAAD,CAAiBrD,CAAjB,CAA0BsD,CAA1B,CAAqCqL,CAArC,CAA8D,CA2E/EC,QAASA,EAAK,CAACvG,CAAD,CAAY,CACxBrI,CAAA6O,IAAA,CAAYC,CAAZ,CAAiCC,CAAjC,CACA/O,EAAA6I,YAAA,CAAoBmG,CAApB,CACAC;CAAA,CAAajP,CAAb,CAAsBsD,CAAtB,CACIoB,EAAAA,CAAOzD,CAAA,CAAmBjB,CAAnB,CACX,KAAKkB,IAAIA,CAAT,GAAcgO,EAAd,CACExK,CAAA0J,MAAAe,eAAA,CAA0BD,CAAA,CAAchO,CAAd,CAA1B,CANsB,CAU1B6N,QAASA,EAAmB,CAACtL,CAAD,CAAQ,CAClCA,CAAA2L,gBAAA,EACA,KAAIC,EAAK5L,CAAA6L,cAALD,EAA4B5L,CAC5B8L,EAAAA,CAAYF,CAAAG,iBAAZD,EAAmCF,CAAAE,UAAnCA,EAAmDzE,IAAAC,IAAA,EAInD0E,EAAAA,CAAcxC,UAAA,CAAWoC,CAAAI,YAAAC,QAAA,CAAuBC,CAAvB,CAAX,CASftD,KAAAC,IAAA,CAASiD,CAAT,CAAqBK,CAArB,CAAgC,CAAhC,CAAH,EAAyCC,CAAzC,EAAyDJ,CAAzD,EAAwEK,CAAxE,EACEnB,CAAA,EAjBgC,CApFpC,IAAIjK,EAAOzD,CAAA,CAAmBjB,CAAnB,CACPoL,EAAAA,CAAcpL,CAAAM,KAAA,CAAa+K,CAAb,CAClB,IAAqD,EAArD,EAAG3G,CAAA4I,aAAA,CAAkB,OAAlB,CAAAyC,QAAA,CAAmCzM,CAAnC,CAAH,EAA2D8H,CAA3D,CAAA,CAKA,IAAI4D,EAAkB,EACtBxN,EAAA,CAAQ8B,CAAAT,MAAA,CAAgB,GAAhB,CAAR,CAA8B,QAAQ,CAACK,CAAD,CAAQhC,CAAR,CAAW,CAC/C8N,CAAA,GAAwB,CAAJ,CAAA9N,CAAA,CAAQ,GAAR,CAAc,EAAlC,EAAwCgC,CAAxC,CAAgD,SADD,CAAjD,CAIA,KAAI0K,EAAUxC,CAAAwC,QAAd,CACIK,EAAU7C,CAAA6C,QADd,CAEIP,EAAYtC,CAAAsC,UAFhB,CAGIoC,EAAczD,IAAAC,IAAA,CAAS2B,CAAAxC,mBAAT,CAAqCwC,CAAAtC,kBAArC,CAHlB,CAIIqE,EAAW3D,IAAAC,IAAA,CAAS2B,CAAAvC,gBAAT,CAAkCuC,CAAArC,eAAlC,CAJf;AAKIiE,EAAeG,CAAfH,CAA0BI,EAL9B,CAOIL,EAAY9E,IAAAC,IAAA,EAPhB,CAQI+D,EAAsBoB,CAAtBpB,CAA2C,GAA3CA,CAAiDqB,CARrD,CAUI/B,EAAQ,EAVZ,CAUgBc,EAAgB,EAChC,IAAgC,CAAhC,CAAGjB,CAAAxC,mBAAH,CAAmC,CACjC,IAAI2E,EAAgBnC,CAAAjC,wBACgB,GAApC,EAAGoE,CAAAL,QAAA,CAAsB,KAAtB,CAAH,GACE3B,CAGA,EAHSiC,CAGT,CAHsB,uBAGtB,CAHgDD,CAGhD,CAHgE,GAGhE,CAFAhC,CAEA,EAFSiC,CAET,CAFsB,uBAEtB,CAFgDpC,CAAAlC,wBAEhD,CAFkF,GAElF,CADAmD,CAAAlM,KAAA,CAAmBqN,CAAnB,CAAgC,qBAAhC,CACA,CAAAnB,CAAAlM,KAAA,CAAmBqN,CAAnB,CAAgC,qBAAhC,CAJF,CAFiC,CAUpB,CAAf,CAAG3C,CAAH,GAC+B,CAO7B,CAPGE,CAAAlC,gBAOH,EAPiE,CAOjE,GAPkCkC,CAAAnC,mBAOlC,GALE2C,CAEA,EAFSiC,CAET,CAFsB,oBAEtB,CADSC,CAAA,CAFQrC,CAAApC,qBAER,CAAgC+B,CAAAlC,gBAAhC,CAAyDgC,CAAzD,CACT,CAD+E,IAC/E,CAAAwB,CAAAlM,KAAA,CAAmBqN,CAAnB,CAAgC,kBAAhC,CAGF,EAA4B,CAA5B,CAAGzC,CAAAhC,eAAH,EAA+D,CAA/D,GAAiCgC,CAAAjC,kBAAjC,GACEyC,CAEA,EAFSiC,CAET,CAFsB,mBAEtB;AADSC,CAAA,CAAoBrC,CAAAnC,oBAApB,CAAiD8B,CAAAhC,eAAjD,CAAyE8B,CAAzE,CACT,CAD+F,IAC/F,CAAAwB,CAAAlM,KAAA,CAAmBqN,CAAnB,CAAgC,iBAAhC,CAHF,CARF,CAe0B,EAA1B,CAAGnB,CAAA7O,OAAH,GAIMkQ,CACJ,CADe7L,CAAA4I,aAAA,CAAkB,OAAlB,CACf,EAD6C,EAC7C,CAAA5I,CAAA8L,aAAA,CAAkB,OAAlB,CAA2BD,CAA3B,CAAsC,IAAtC,CAA6CnC,CAA7C,CALF,CAQApO,EAAAyQ,GAAA,CAAW3B,CAAX,CAAgCC,CAAhC,CACA/O,EAAAmI,SAAA,CAAiB6G,CAAjB,CACA5D,EAAAE,iBAAA,CAA+BoF,QAAQ,EAAG,CACxC9B,CAAA,EACAD,EAAA,EAFwC,CAOtChE,EAAAA,EAFoB+C,CAEpB/C,EAFiC0B,IAAAC,IAAA,CAASsB,CAAAhC,eAAT,CAAiCgC,CAAAlC,gBAAjC,CAEjCf,EAF8F,CAE9FA,GADqBqF,CACrBrF,CADgCmF,CAChCnF,EAD+CgG,CAC/ChG,EAAoDsF,EAExD7E,EAAA9I,QAAA,EACAoI,EAAA,CAAsB1K,CAAtB,CAA+B2K,CAA/B,CACA,OAAOiE,EAnEP,CACED,CAAA,EAJ6E,CA2GjF2B,QAASA,EAAmB,CAACM,CAAD,CAAaC,CAAb,CAA2BvM,CAA3B,CAAkC,CAC5D,IAAI8J,EAAQ,EACZ5M,EAAA,CAAQoP,CAAA/N,MAAA,CAAiB,GAAjB,CAAR,CAA+B,QAAQ,CAAC3C,CAAD,CAAMgB,CAAN,CAAS,CAC9CkN,CAAA,GAAc,CAAJ,CAAAlN,CAAA,CAAQ,GAAR,CAAc,EAAxB,GACUoD,CADV,CACkBuM,CADlB,CACiCjE,QAAA,CAAS1M,CAAT,CAAc,EAAd,CADjC,EACsD,GAFR,CAAhD,CAIA,OAAOkO,EANqD,CAS9D0C,QAASA,EAAa,CAACzN,CAAD,CAAiBrD,CAAjB,CAA0BsD,CAA1B,CAAqCkK,CAArC,CAA2D,CAC/E,GAAGD,CAAA,CAAalK,CAAb,CAA6BrD,CAA7B,CAAsCsD,CAAtC,CAAiDkK,CAAjD,CAAH,CACE,MAAO,SAAQ,CAACnF,CAAD,CAAY,CACzBA,CAAA,EAAa4G,CAAA,CAAajP,CAAb,CAAsBsD,CAAtB,CADY,CAFkD,CAQjFyN,QAASA,EAAY,CAAC1N,CAAD;AAAiBrD,CAAjB,CAA0BsD,CAA1B,CAAqC0N,CAArC,CAA6D,CAChF,GAAGhR,CAAAM,KAAA,CAAa+K,CAAb,CAAH,CACE,MAAOqD,EAAA,CAAWrL,CAAX,CAA2BrD,CAA3B,CAAoCsD,CAApC,CAA+C0N,CAA/C,CAEP/B,EAAA,CAAajP,CAAb,CAAsBsD,CAAtB,CACA0N,EAAA,EAL8E,CASlFC,QAASA,EAAO,CAAC5N,CAAD,CAAiBrD,CAAjB,CAA0BsD,CAA1B,CAAqC4N,CAArC,CAAwD,CAItE,IAAIC,EAAwBL,CAAA,CAAczN,CAAd,CAA8BrD,CAA9B,CAAuCsD,CAAvC,CAC5B,IAAK6N,CAAL,CAAA,CAWA,IAAI3L,EAAS2L,CACb3G,EAAA,CAAYxK,CAAZ,CAAqB,QAAQ,EAAG,CAC9BuO,CAAA,CAAmBvO,CAAnB,CAA4BsD,CAA5B,CACAmL,EAAA,CAA0BzO,CAA1B,CAIAwF,EAAA,CAASuL,CAAA,CAAa1N,CAAb,CAA6BrD,CAA7B,CAAsCsD,CAAtC,CAAiD4N,CAAjD,CANqB,CAAhC,CASA,OAAO,SAAQ,CAAC7I,CAAD,CAAY,CACxB,CAAA7C,CAAA,EAAUjE,CAAV,EAAgB8G,CAAhB,CADwB,CArB3B,CACE+B,CAAA,EACA8G,EAAA,EAPoE,CA+BxEjC,QAASA,EAAY,CAACjP,CAAD,CAAUsD,CAAV,CAAqB,CACxCtD,CAAA6I,YAAA,CAAoBvF,CAApB,CACA,KAAIhD,EAAON,CAAAM,KAAA,CAAa+K,CAAb,CACR/K,EAAH,GACKA,CAAAgC,QAGH,EAFEhC,CAAAgC,QAAA,EAEF,CAAIhC,CAAAgC,QAAJ,EAAqC,CAArC,GAAoBhC,CAAAgC,QAApB,EACEtC,CAAA8I,WAAA,CAAmBuC,CAAnB,CALJ,CAHwC,CAuH1C+F,QAASA,EAAa,CAACzO,CAAD,CAAU0O,CAAV,CAAkB,CACtC,IAAI/N,EAAY,EAChBX,EAAA,CAAUhD,CAAAkF,QAAA,CAAgBlC,CAAhB,CAAA,CAA2BA,CAA3B,CAAqCA,CAAAE,MAAA,CAAc,KAAd,CAC/CrB,EAAA,CAAQmB,CAAR,CAAiB,QAAQ,CAACO,CAAD,CAAQhC,CAAR,CAAW,CAC/BgC,CAAH,EAA2B,CAA3B,CAAYA,CAAA7C,OAAZ,GACEiD,CADF,GACoB,CAAJ,CAAApC,CAAA,CAAQ,GAAR,CAAc,EAD9B,EACoCgC,CADpC,CAC4CmO,CAD5C,CADkC,CAApC,CAKA,OAAO/N,EAR+B,CAxjB0C,IAE9E+M,EAAa,EAFiE,CAE7DlE,CAF6D,CAE5CgE,CAF4C,CAEvBzD,CAFuB,CAEPwD,CAUvExQ,EAAA4R,gBAAJ,GAA+B1R,CAA/B,EAA4CF,CAAA6R,sBAA5C,GAA6E3R,CAA7E,EACEyQ,CAEA,CAFa,UAEb;AADAlE,CACA,CADkB,kBAClB,CAAAgE,CAAA,CAAsB,mCAHxB,GAKEhE,CACA,CADkB,YAClB,CAAAgE,CAAA,CAAsB,eANxB,CASIzQ,EAAA8R,eAAJ,GAA8B5R,CAA9B,EAA2CF,CAAA+R,qBAA3C,GAA2E7R,CAA3E,EACEyQ,CAEA,CAFa,UAEb,CADA3D,CACA,CADiB,iBACjB,CAAAwD,CAAA,CAAqB,iCAHvB,GAKExD,CACA,CADiB,WACjB,CAAAwD,CAAA,CAAqB,cANvB,CASA,KAAI9D,EAAe,UAAnB,CACII,EAAe,UADnB,CAEIC,EAAY,OAFhB,CAGII,EAAgC,gBAHpC,CAIIO,EAAwB,gBAJ5B,CAKI/B,EAA0B,qBAL9B,CAMIiD,EAA8B,8BANlC,CAOIqB,EAAkC,CAPtC,CAQIgB,EAAsB,GAR1B,CASIV,GAAa,GATjB,CAWI1F,EAAc,EAXlB,CAYI8C,GAAgB,CAZpB,CAaI/C,EAAuB,EAb3B,CAcID,CAdJ,CAyCIY,GAAe,IAzCnB,CA0CID,GAAmB,CA1CvB,CA2CIJ,EAAwB,EAqY5B,OAAO,OACGpB,QAAQ,CAACxJ,CAAD,CAAU0R,CAAV,CAA8B,CAC5C,MAAOT,EAAA,CAAQ,OAAR,CAAiBjR,CAAjB,CAA0B,UAA1B,CAAsC0R,CAAtC,CADqC,CADzC,OAKGjI,QAAQ,CAACzJ,CAAD;AAAU0R,CAAV,CAA8B,CAC5C,MAAOT,EAAA,CAAQ,OAAR,CAAiBjR,CAAjB,CAA0B,UAA1B,CAAsC0R,CAAtC,CADqC,CALzC,MASEhI,QAAQ,CAAC1J,CAAD,CAAU0R,CAAV,CAA8B,CAC3C,MAAOT,EAAA,CAAQ,MAAR,CAAgBjR,CAAhB,CAAyB,SAAzB,CAAoC0R,CAApC,CADoC,CATxC,gBAaYC,QAAQ,CAAC3R,CAAD,CAAU4J,CAAV,CAAeC,CAAf,CAAuB6H,CAAvB,CAA2C,CAClE,IAAIpO,EAAY8N,CAAA,CAAcvH,CAAd,CAAsB,SAAtB,CAAZvG,CAA+C,GAA/CA,CACY8N,CAAA,CAAcxH,CAAd,CAAmB,MAAnB,CADhB,CAEIgI,EAAqBd,CAAA,CAAc,UAAd,CAA0B9Q,CAA1B,CAAmCsD,CAAnC,CAA8C,QAAQ,CAACzC,CAAD,CAAK,CAKlF,IAAIqC,EAAQlD,CAAA8E,KAAA,CAAa,OAAb,CACZ9E,EAAA6I,YAAA,CAAoBgB,CAApB,CACA7J,EAAAmI,SAAA,CAAiByB,CAAjB,CACIqE,EAAAA,CAAUpN,CAAA,EACdb,EAAA8E,KAAA,CAAa,OAAb,CAAsB5B,CAAtB,CACA,OAAO+K,EAV2E,CAA3D,CAazB,IAAG2D,CAAH,CAME,MALApH,EAAA,CAAYxK,CAAZ,CAAqB,QAAQ,EAAG,CAC9BuO,CAAA,CAAmBvO,CAAnB,CAA4BsD,CAA5B,CACAmL,EAAA,CAA0BzO,CAA1B,CACA0R,EAAA,EAH8B,CAAhC,CAKOE,CAAAA,CAETxH,EAAA,EACAsH,EAAA,EAzBkE,CAb/D,gBAyCYG,QAAQ,CAAC7R,CAAD,CAAUsD,CAAV,CAAqBoO,CAArB,CAAyC,CAChE,IAAIE,EAAqBd,CAAA,CAAc,UAAd,CAA0B9Q,CAA1B,CAAmCoR,CAAA,CAAc9N,CAAd,CAAyB,MAAzB,CAAnC,CAAqE,QAAQ,CAACzC,CAAD,CAAK,CAMzGb,CAAAmI,SAAA,CAAiB7E,CAAjB,CACI2K,EAAAA,CAAUpN,CAAA,EACdb,EAAA6I,YAAA,CAAoBvF,CAApB,CACA,OAAO2K,EATkG,CAAlF,CAYzB,IAAG2D,CAAH,CAME,MALApH,EAAA,CAAYxK,CAAZ,CAAqB,QAAQ,EAAG,CAC9BuO,CAAA,CAAmBvO,CAAnB,CAA4BsD,CAA5B,CACAmL,EAAA,CAA0BzO,CAA1B,CACA0R,EAAA,EAH8B,CAAhC,CAKOE;AAAAA,CAETxH,EAAA,EACAsH,EAAA,EAtBgE,CAzC7D,UAkEM/H,QAAQ,CAAC3J,CAAD,CAAU4J,CAAV,CAAeC,CAAf,CAAuB6H,CAAvB,CAA2C,CAC5D7H,CAAA,CAASuH,CAAA,CAAcvH,CAAd,CAAsB,SAAtB,CACTD,EAAA,CAAMwH,CAAA,CAAcxH,CAAd,CAAmB,MAAnB,CAEN,OAAOmH,EAAA,CAAa,UAAb,CAAyB/Q,CAAzB,CADS6J,CACT,CADkB,GAClB,CADwBD,CACxB,CAA6C8H,CAA7C,CAJqD,CAlEzD,UAyEMvJ,QAAQ,CAACnI,CAAD,CAAUsD,CAAV,CAAqBoO,CAArB,CAAyC,CAC1D,MAAOX,EAAA,CAAa,UAAb,CAAyB/Q,CAAzB,CAAkCoR,CAAA,CAAc9N,CAAd,CAAyB,MAAzB,CAAlC,CAAoEoO,CAApE,CADmD,CAzEvD,mBA6EeI,QAAQ,CAAC9R,CAAD,CAAUsD,CAAV,CAAqBoO,CAArB,CAAyC,CACnE,IAAIE,EAAqBd,CAAA,CAAc,aAAd,CAA6B9Q,CAA7B,CAAsCoR,CAAA,CAAc9N,CAAd,CAAyB,SAAzB,CAAtC,CAA2E,QAAQ,CAACzC,CAAD,CAAK,CAK/G,IAAIqC,EAAQlD,CAAA8E,KAAA,CAAa,OAAb,CACZ9E,EAAA6I,YAAA,CAAoBvF,CAApB,CACI2K,EAAAA,CAAUpN,CAAA,EACdb,EAAA8E,KAAA,CAAa,OAAb,CAAsB5B,CAAtB,CACA,OAAO+K,EATwG,CAAxF,CAYzB,IAAG2D,CAAH,CAME,MALApH,EAAA,CAAYxK,CAAZ,CAAqB,QAAQ,EAAG,CAC9BuO,CAAA,CAAmBvO,CAAnB,CAA4BsD,CAA5B,CACAmL,EAAA,CAA0BzO,CAA1B,CACA0R,EAAA,EAH8B,CAAhC,CAKOE,CAAAA,CAETF,EAAA,EArBmE,CA7EhE,aAqGS7I,QAAQ,CAAC7I,CAAD,CAAUsD,CAAV,CAAqBoO,CAArB,CAAyC,CAC7D,MAAOX,EAAA,CAAa,aAAb,CAA4B/Q,CAA5B,CAAqCoR,CAAA,CAAc9N,CAAd,CAAyB,SAAzB,CAArC,CAA0EoO,CAA1E,CADsD,CArG1D,CA9c2E,CADtD,CAA9B,CA7yB4E,CAAtE,CAlDV,CA1PsC,CAArC,CAAA,CAgqDEhS,MAhqDF,CAgqDUA,MAAAC,QAhqDV;",
 "sources":["angular-animate.js"],
-"names":["window","angular","undefined","module","directive","scope","element","attrs","val","ngAnimateChildren","isString","length","data","NG_ANIMATE_CHILDREN","$watch","value","factory","$$rAF","$document","fn","config","$provide","$animateProvider","extractElementNode","i","elm","nodeType","ELEMENT_NODE","stripCommentsFromElement","noop","forEach","selectors","$$selectors","NG_ANIMATE_STATE","NG_ANIMATE_CLASS_NAME","rootAnimateState","decorator","$delegate","$injector","$sniffer","$rootElement","$$asyncCallback","$rootScope","blockElementAnimations","running","lookup","name","matches","flagMap","classes","substr","split","transitions","animations","push","get","klass","selectorFactoryName","animationRunner","animationEvent","className","registerAnimation","animationFactory","event","afterFn","beforeFn","charAt","toUpperCase","after","before","run","fns","cancellations","allCompleteFn","animation","count","index","progress","classNameAdd","classNameRemove","node","isSetClassOperation","isClassBased","isArray","attr","currentClassName","isAnimatableClassName","beforeComplete","beforeCancel","afterComplete","afterCancel","animationLookup","replace","created","cancel","cancelFn","performAnimation","parentElement","afterElement","domOperation","doneCallback","fireDOMCallback","animationPhase","eventName","elementEvents","triggerHandler","fireBeforeCallbackAsync","fireAfterCallbackAsync","fireDoneCallbackAsync","fireDOMOperation","hasBeenRun","closeAnimation","runner","cleanup","localAnimationCount","_data","events","parent","ngAnimateState","runningAnimations","active","totalActiveAnimations","totalActive","lastAnimation","last","skipAnimations","disabled","animationsDisabled","skipAnimation","animationsToCancel","current","operation","hasClass","one","e","state","activeLeaveAnimation","addClass","globalAnimationCounter","cancelled","cancelChildAnimations","nodes","isFunction","getElementsByClassName","querySelectorAll","structural","removeAnimations","removeClass","removeData","allowChildAnimations","parentRunningAnimation","hasParent","isRoot","animateChildrenFlag","isDefined","$$postDigest","classNameFilter","test","enter","leave","move","setClass","add","remove","enabled","arguments","register","$window","$timeout","$$animateReflow","afterReflow","callback","cancelAnimationReflow","animationReflowQueue","lookupCache","animationCloseHandler","totalTime","animationElementQueue","futureTimestamp","Date","now","closingTimestamp","closingTimer","closeAllAnimations","elements","elementData","NG_ANIMATE_CSS_DATA_KEY","closeAnimationFn","getElementAnimationDetails","cacheKey","transitionDuration","transitionDelay","animationDuration","animationDelay","transitionDelayStyle","animationDelayStyle","transitionDurationStyle","transitionPropertyStyle","elementStyles","getComputedStyle","TRANSITION_PROP","DURATION_KEY","Math","max","parseMaxTime","PROPERTY_KEY","DELAY_KEY","ANIMATION_PROP","aDuration","parseInt","ANIMATION_ITERATION_COUNT_KEY","str","maxValue","values","parseFloat","getCacheKey","parentID","NG_ANIMATE_PARENT_KEY","parentCounter","getAttribute","animateSetup","calculationDecorator","eventCacheKey","itemIndex","total","stagger","staggerClassName","staggerCacheKey","applyClasses","formerData","timings","isCurrentlyAnimating","blockTransitions","style","isAnimating","NG_ANIMATE_BLOCK_CLASS_NAME","unblockTransitions","prop","unblockKeyframeAnimations","animateRun","activeAnimationComplete","onEnd","off","css3AnimationEvents","onAnimationProgress","activeClassName","animateClose","appliedStyles","removeProperty","stopPropagation","ev","originalEvent","timeStamp","$manualTimeStamp","elapsedTime","toFixed","ELAPSED_TIME_MAX_DECIMAL_PLACES","startTime","maxDelayTime","maxDuration","indexOf","maxDelay","ONE_SECOND","ANIMATIONEND_EVENT","TRANSITIONEND_EVENT","propertyStyle","CSS_PREFIX","prepareStaggerDelay","oldStyle","setAttribute","on","elementData.closeAnimationFn","CLOSING_TIME_BUFFER","delayStyle","staggerDelay","animateBefore","animateAfter","afterAnimationComplete","animate","animationComplete","preReflowCancellation","suffixClasses","suffix","ontransitionend","onwebkittransitionend","onanimationend","onwebkitanimationend","animationCompleted","beforeSetClass","cancellationMethod","beforeAddClass","beforeRemoveClass"]
+"names":["window","angular","undefined","module","directive","scope","element","attrs","val","ngAnimateChildren","isString","length","data","NG_ANIMATE_CHILDREN","$watch","value","factory","$$rAF","$document","fn","config","$provide","$animateProvider","extractElementNode","i","elm","nodeType","ELEMENT_NODE","stripCommentsFromElement","noop","forEach","selectors","$$selectors","NG_ANIMATE_STATE","NG_ANIMATE_CLASS_NAME","rootAnimateState","decorator","$delegate","$injector","$sniffer","$rootElement","$$asyncCallback","$rootScope","blockElementAnimations","running","lookup","name","matches","flagMap","classes","substr","split","transitions","animations","push","get","klass","selectorFactoryName","animationRunner","animationEvent","className","registerAnimation","animationFactory","event","afterFn","beforeFn","charAt","toUpperCase","after","before","run","fns","cancellations","allCompleteFn","animation","count","index","progress","classNameAdd","classNameRemove","node","isSetClassOperation","isClassBased","isArray","attr","currentClassName","isAnimatableClassName","beforeComplete","beforeCancel","afterComplete","afterCancel","animationLookup","replace","created","cancel","cancelFn","performAnimation","parentElement","afterElement","domOperation","doneCallback","fireDOMCallback","animationPhase","eventName","elementEvents","triggerHandler","fireBeforeCallbackAsync","fireAfterCallbackAsync","fireDoneCallbackAsync","fireDOMOperation","hasBeenRun","closeAnimation","runner","cleanup","localAnimationCount","_data","events","parent","ngAnimateState","runningAnimations","active","totalActiveAnimations","totalActive","lastAnimation","last","skipAnimations","disabled","animationsDisabled","skipAnimation","animationsToCancel","current","operation","hasClass","one","e","state","activeLeaveAnimation","addClass","globalAnimationCounter","cancelled","cancelChildAnimations","nodes","isFunction","getElementsByClassName","querySelectorAll","structural","removeAnimations","removeClass","removeData","allowChildAnimations","parentRunningAnimation","hasParent","isRoot","animateChildrenFlag","isDefined","$$postDigest","classNameFilter","test","enter","leave","move","setClass","add","remove","enabled","arguments","register","$window","$timeout","$$animateReflow","clearCacheAfterReflow","cancelAnimationReflow","animationReflowQueue","lookupCache","afterReflow","callback","animationCloseHandler","totalTime","animationElementQueue","futureTimestamp","Date","now","closingTimestamp","closingTimer","closeAllAnimations","elements","elementData","NG_ANIMATE_CSS_DATA_KEY","closeAnimationFn","getElementAnimationDetails","cacheKey","transitionDuration","transitionDelay","animationDuration","animationDelay","transitionDelayStyle","animationDelayStyle","transitionDurationStyle","transitionPropertyStyle","elementStyles","getComputedStyle","TRANSITION_PROP","DURATION_KEY","Math","max","parseMaxTime","PROPERTY_KEY","DELAY_KEY","ANIMATION_PROP","aDuration","parseInt","ANIMATION_ITERATION_COUNT_KEY","str","maxValue","values","parseFloat","getCacheKey","parentID","NG_ANIMATE_PARENT_KEY","parentCounter","getAttribute","animateSetup","calculationDecorator","eventCacheKey","itemIndex","total","stagger","staggerClassName","staggerCacheKey","applyClasses","formerData","timings","isCurrentlyAnimating","blockTransitions","style","isAnimating","NG_ANIMATE_BLOCK_CLASS_NAME","unblockTransitions","prop","unblockKeyframeAnimations","animateRun","activeAnimationComplete","onEnd","off","css3AnimationEvents","onAnimationProgress","activeClassName","animateClose","appliedStyles","removeProperty","stopPropagation","ev","originalEvent","timeStamp","$manualTimeStamp","elapsedTime","toFixed","ELAPSED_TIME_MAX_DECIMAL_PLACES","startTime","maxDelayTime","maxDuration","indexOf","maxDelay","ONE_SECOND","ANIMATIONEND_EVENT","TRANSITIONEND_EVENT","propertyStyle","CSS_PREFIX","prepareStaggerDelay","oldStyle","setAttribute","on","elementData.closeAnimationFn","CLOSING_TIME_BUFFER","delayStyle","staggerDelay","animateBefore","animateAfter","afterAnimationComplete","animate","animationComplete","preReflowCancellation","suffixClasses","suffix","ontransitionend","onwebkittransitionend","onanimationend","onwebkitanimationend","animationCompleted","beforeSetClass","cancellationMethod","beforeAddClass","beforeRemoveClass"]
 }
diff --git a/libs/bower_components/angular-animate/bower.json b/libs/bower_components/angular-animate/bower.json
index 956bfd77e8..2cdde934a4 100644
--- a/libs/bower_components/angular-animate/bower.json
+++ b/libs/bower_components/angular-animate/bower.json
@@ -1,8 +1,9 @@
 {
   "name": "angular-animate",
-  "version": "1.2.26",
+  "version": "1.2.28",
   "main": "./angular-animate.js",
+  "ignore": [],
   "dependencies": {
-    "angular": "1.2.26"
+    "angular": "1.2.28"
   }
 }
diff --git a/libs/bower_components/angular-animate/package.json b/libs/bower_components/angular-animate/package.json
index 8e0559dabf..4f492a09fa 100644
--- a/libs/bower_components/angular-animate/package.json
+++ b/libs/bower_components/angular-animate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-animate",
-  "version": "",
+  "version": "1.2.28",
   "description": "AngularJS module for animations",
   "main": "angular-animate.js",
   "scripts": {
diff --git a/libs/bower_components/angular-cookies/.bower.json b/libs/bower_components/angular-cookies/.bower.json
index f79863da69..cd45423cce 100644
--- a/libs/bower_components/angular-cookies/.bower.json
+++ b/libs/bower_components/angular-cookies/.bower.json
@@ -1,16 +1,17 @@
 {
   "name": "angular-cookies",
-  "version": "1.2.26",
+  "version": "1.2.28",
   "main": "./angular-cookies.js",
+  "ignore": [],
   "dependencies": {
-    "angular": "1.2.26"
+    "angular": "1.2.28"
   },
   "homepage": "https://github.com/angular/bower-angular-cookies",
-  "_release": "1.2.26",
+  "_release": "1.2.28",
   "_resolution": {
     "type": "version",
-    "tag": "v1.2.26",
-    "commit": "0cefe0c4ca703bc8b137933ecdc36ace116ca270"
+    "tag": "v1.2.28",
+    "commit": "3bbaa39114fa18101a69ed368fb39bc2e1c2a78b"
   },
   "_source": "git://github.com/angular/bower-angular-cookies.git",
   "_target": "~1.2.0",
diff --git a/libs/bower_components/angular-cookies/README.md b/libs/bower_components/angular-cookies/README.md
index 77c71f4d8b..a1dc09bc5c 100644
--- a/libs/bower_components/angular-cookies/README.md
+++ b/libs/bower_components/angular-cookies/README.md
@@ -1,12 +1,35 @@
-# bower-angular-cookies
+# packaged angular-cookies
 
-This repo is for distribution on `bower`. The source for this module is in the
+This repo is for distribution on `npm` and `bower`. The source for this module is in the
 [main AngularJS repo](https://github.com/angular/angular.js/tree/master/src/ngCookies).
 Please file issues and pull requests against that repo.
 
 ## Install
 
-Install with `bower`:
+You can install this package either with `npm` or with `bower`.
+
+### npm
+
+```shell
+npm install angular-cookies
+```
+
+Add a `<script>` to your `index.html`:
+
+```html
+<script src="/node_modules/angular-cookies/angular-cookies.js"></script>
+```
+
+Then add `ngCookies` as a dependency for your app:
+
+```javascript
+angular.module('myApp', ['ngCookies']);
+```
+
+Note that this package is not in CommonJS format, so doing `require('angular-cookies')` will
+return `undefined`.
+
+### bower
 
 ```shell
 bower install angular-cookies
@@ -18,7 +41,7 @@ Add a `<script>` to your `index.html`:
 <script src="/bower_components/angular-cookies/angular-cookies.js"></script>
 ```
 
-And add `ngCookies` as a dependency for your app:
+Then add `ngCookies` as a dependency for your app:
 
 ```javascript
 angular.module('myApp', ['ngCookies']);
diff --git a/libs/bower_components/angular-cookies/angular-cookies.js b/libs/bower_components/angular-cookies/angular-cookies.js
index 3b80b0ba6c..22f00e5e8c 100644
--- a/libs/bower_components/angular-cookies/angular-cookies.js
+++ b/libs/bower_components/angular-cookies/angular-cookies.js
@@ -1,5 +1,5 @@
 /**
- * @license AngularJS v1.2.26
+ * @license AngularJS v1.2.28
  * (c) 2010-2014 Google, Inc. http://angularjs.org
  * License: MIT
  */
diff --git a/libs/bower_components/angular-cookies/angular-cookies.min.js b/libs/bower_components/angular-cookies/angular-cookies.min.js
index b4b39d40d6..abec0652dc 100644
--- a/libs/bower_components/angular-cookies/angular-cookies.min.js
+++ b/libs/bower_components/angular-cookies/angular-cookies.min.js
@@ -1,5 +1,5 @@
 /*
- AngularJS v1.2.26
+ AngularJS v1.2.28
  (c) 2010-2014 Google, Inc. http://angularjs.org
  License: MIT
 */
diff --git a/libs/bower_components/angular-cookies/bower.json b/libs/bower_components/angular-cookies/bower.json
index fcabebe381..aa202dc0c4 100644
--- a/libs/bower_components/angular-cookies/bower.json
+++ b/libs/bower_components/angular-cookies/bower.json
@@ -1,8 +1,9 @@
 {
   "name": "angular-cookies",
-  "version": "1.2.26",
+  "version": "1.2.28",
   "main": "./angular-cookies.js",
+  "ignore": [],
   "dependencies": {
-    "angular": "1.2.26"
+    "angular": "1.2.28"
   }
 }
diff --git a/libs/bower_components/angular-cookies/package.json b/libs/bower_components/angular-cookies/package.json
index 0985708b5e..84ea78c9cb 100644
--- a/libs/bower_components/angular-cookies/package.json
+++ b/libs/bower_components/angular-cookies/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-cookies",
-  "version": "",
+  "version": "1.2.28",
   "description": "AngularJS module for cookies",
   "main": "angular-cookies.js",
   "scripts": {
diff --git a/libs/bower_components/angular-mocks/.bower.json b/libs/bower_components/angular-mocks/.bower.json
index deeac2a2a7..94f5bbaab0 100644
--- a/libs/bower_components/angular-mocks/.bower.json
+++ b/libs/bower_components/angular-mocks/.bower.json
@@ -1,16 +1,17 @@
 {
   "name": "angular-mocks",
-  "version": "1.2.26",
+  "version": "1.2.28",
   "main": "./angular-mocks.js",
+  "ignore": [],
   "dependencies": {
-    "angular": "1.2.26"
+    "angular": "1.2.28"
   },
   "homepage": "https://github.com/angular/bower-angular-mocks",
-  "_release": "1.2.26",
+  "_release": "1.2.28",
   "_resolution": {
     "type": "version",
-    "tag": "v1.2.26",
-    "commit": "0eda339dd42aba2628586f39d4806bcfb57fd6f4"
+    "tag": "v1.2.28",
+    "commit": "6bb9b6fd3fdb2eba0f64dc615fa55c5f0050af75"
   },
   "_source": "git://github.com/angular/bower-angular-mocks.git",
   "_target": "~1.2.0",
diff --git a/libs/bower_components/angular-mocks/README.md b/libs/bower_components/angular-mocks/README.md
index 3448d28493..1604ef8804 100644
--- a/libs/bower_components/angular-mocks/README.md
+++ b/libs/bower_components/angular-mocks/README.md
@@ -1,21 +1,36 @@
-# bower-angular-mocks
+# packaged angular-mocks
 
-This repo is for distribution on `bower`. The source for this module is in the
+This repo is for distribution on `npm` and `bower`. The source for this module is in the
 [main AngularJS repo](https://github.com/angular/angular.js/tree/master/src/ngMock).
 Please file issues and pull requests against that repo.
 
 ## Install
 
-Install with `bower`:
+You can install this package either with `npm` or with `bower`.
+
+### npm
+
+```shell
+npm install angular-mocks
+```
+
+The mocks are then available at `node_modules/angular-mocks/angular-mocks.js`.
+
+Note that this package is not in CommonJS format, so doing `require('angular-mocks')` will
+return `undefined`.
+
+### bower
 
 ```shell
 bower install angular-mocks
 ```
 
+The mocks are then available at `bower_components/angular-mocks/angular-mocks.js`.
+
 ## Documentation
 
 Documentation is available on the
-[AngularJS docs site](http://docs.angularjs.org/guide/dev_guide.unit-testing).
+[AngularJS docs site](https://docs.angularjs.org/guide/unit-testing).
 
 ## License
 
diff --git a/libs/bower_components/angular-mocks/angular-mocks.js b/libs/bower_components/angular-mocks/angular-mocks.js
index 9aa09ecd54..de2a966ad9 100644
--- a/libs/bower_components/angular-mocks/angular-mocks.js
+++ b/libs/bower_components/angular-mocks/angular-mocks.js
@@ -1,5 +1,5 @@
 /**
- * @license AngularJS v1.2.26
+ * @license AngularJS v1.2.28
  * (c) 2010-2014 Google, Inc. http://angularjs.org
  * License: MIT
  */
@@ -1193,7 +1193,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {
    *   data string and returns true if the data is as expected.
    * @param {(Object|function(Object))=} headers HTTP headers or function that receives http header
    *   object and returns true if the headers match the current definition.
-   * @returns {requestHandler} Returns an object with `respond` method that controls how a matched
+   * @returns {requestHandler} Returns an object with a `respond` method that controls how a matched
    *   request is handled.
    *
    *  - respond –
@@ -1229,7 +1229,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {
    *
    * @param {string|RegExp} url HTTP url.
    * @param {(Object|function(Object))=} headers HTTP headers.
-   * @returns {requestHandler} Returns an object with `respond` method that control how a matched
+   * @returns {requestHandler} Returns an object with a `respond` method that controls how a matched
    * request is handled.
    */
 
@@ -1241,7 +1241,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {
    *
    * @param {string|RegExp} url HTTP url.
    * @param {(Object|function(Object))=} headers HTTP headers.
-   * @returns {requestHandler} Returns an object with `respond` method that control how a matched
+   * @returns {requestHandler} Returns an object with a `respond` method that controls how a matched
    * request is handled.
    */
 
@@ -1253,7 +1253,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {
    *
    * @param {string|RegExp} url HTTP url.
    * @param {(Object|function(Object))=} headers HTTP headers.
-   * @returns {requestHandler} Returns an object with `respond` method that control how a matched
+   * @returns {requestHandler} Returns an object with a `respond` method that controls how a matched
    * request is handled.
    */
 
@@ -1267,7 +1267,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {
    * @param {(string|RegExp|function(string))=} data HTTP request body or function that receives
    *   data string and returns true if the data is as expected.
    * @param {(Object|function(Object))=} headers HTTP headers.
-   * @returns {requestHandler} Returns an object with `respond` method that control how a matched
+   * @returns {requestHandler} Returns an object with a `respond` method that controls how a matched
    * request is handled.
    */
 
@@ -1281,7 +1281,21 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {
    * @param {(string|RegExp|function(string))=} data HTTP request body or function that receives
    *   data string and returns true if the data is as expected.
    * @param {(Object|function(Object))=} headers HTTP headers.
-   * @returns {requestHandler} Returns an object with `respond` method that control how a matched
+   * @returns {requestHandler} Returns an object with a `respond` method that controls how a matched
+   * request is handled.
+   */
+
+  /**
+   * @ngdoc method
+   * @name $httpBackend#whenPATCH
+   * @description
+   * Creates a new backend definition for PATCH requests.  For more info see `when()`.
+   *
+   * @param {string|RegExp} url HTTP url.
+   * @param {(string|RegExp|function(string))=} data HTTP request body or function that receives
+   *   data string and returns true if the data is as expected.
+   * @param {(Object|function(Object))=} headers HTTP headers.
+   * @returns {requestHandler} Returns an object with a `respond` method that controls how a matched
    * request is handled.
    */
 
@@ -1292,7 +1306,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {
    * Creates a new backend definition for JSONP requests. For more info see `when()`.
    *
    * @param {string|RegExp} url HTTP url.
-   * @returns {requestHandler} Returns an object with `respond` method that control how a matched
+   * @returns {requestHandler} Returns an object with a `respond` method that controls how a matched
    * request is handled.
    */
   createShortMethods('when');
@@ -1311,7 +1325,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {
    *  is in JSON format.
    * @param {(Object|function(Object))=} headers HTTP headers or function that receives http header
    *   object and returns true if the headers match the current expectation.
-   * @returns {requestHandler} Returns an object with `respond` method that control how a matched
+   * @returns {requestHandler} Returns an object with a `respond` method that controls how a matched
    *  request is handled.
    *
    *  - respond –
@@ -1340,7 +1354,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {
    *
    * @param {string|RegExp} url HTTP url.
    * @param {Object=} headers HTTP headers.
-   * @returns {requestHandler} Returns an object with `respond` method that control how a matched
+   * @returns {requestHandler} Returns an object with a `respond` method that controls how a matched
    * request is handled. See #expect for more info.
    */
 
@@ -1352,7 +1366,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {
    *
    * @param {string|RegExp} url HTTP url.
    * @param {Object=} headers HTTP headers.
-   * @returns {requestHandler} Returns an object with `respond` method that control how a matched
+   * @returns {requestHandler} Returns an object with a `respond` method that controls how a matched
    *   request is handled.
    */
 
@@ -1364,7 +1378,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {
    *
    * @param {string|RegExp} url HTTP url.
    * @param {Object=} headers HTTP headers.
-   * @returns {requestHandler} Returns an object with `respond` method that control how a matched
+   * @returns {requestHandler} Returns an object with a `respond` method that controls how a matched
    *   request is handled.
    */
 
@@ -1379,7 +1393,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {
    *  receives data string and returns true if the data is as expected, or Object if request body
    *  is in JSON format.
    * @param {Object=} headers HTTP headers.
-   * @returns {requestHandler} Returns an object with `respond` method that control how a matched
+   * @returns {requestHandler} Returns an object with a `respond` method that controls how a matched
    *   request is handled.
    */
 
@@ -1394,7 +1408,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {
    *  receives data string and returns true if the data is as expected, or Object if request body
    *  is in JSON format.
    * @param {Object=} headers HTTP headers.
-   * @returns {requestHandler} Returns an object with `respond` method that control how a matched
+   * @returns {requestHandler} Returns an object with a `respond` method that controls how a matched
    *   request is handled.
    */
 
@@ -1409,7 +1423,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {
    *  receives data string and returns true if the data is as expected, or Object if request body
    *  is in JSON format.
    * @param {Object=} headers HTTP headers.
-   * @returns {requestHandler} Returns an object with `respond` method that control how a matched
+   * @returns {requestHandler} Returns an object with a `respond` method that controls how a matched
    *   request is handled.
    */
 
@@ -1420,7 +1434,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {
    * Creates a new request expectation for JSONP requests. For more info see `expect()`.
    *
    * @param {string|RegExp} url HTTP url.
-   * @returns {requestHandler} Returns an object with `respond` method that control how a matched
+   * @returns {requestHandler} Returns an object with a `respond` method that controls how a matched
    *   request is handled.
    */
   createShortMethods('expect');
@@ -1513,7 +1527,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {
 
 
   function createShortMethods(prefix) {
-    angular.forEach(['GET', 'DELETE', 'JSONP'], function(method) {
+    angular.forEach(['GET', 'DELETE', 'JSONP', 'HEAD'], function(method) {
      $httpBackend[prefix + method] = function(url, headers) {
        return $httpBackend[prefix](method, url, undefined, headers);
      };
@@ -1556,7 +1570,9 @@ function MockHttpExpectation(method, url, data, headers) {
     if (angular.isUndefined(data)) return true;
     if (data && angular.isFunction(data.test)) return data.test(d);
     if (data && angular.isFunction(data)) return data(d);
-    if (data && !angular.isString(data)) return angular.equals(data, angular.fromJson(d));
+    if (data && !angular.isString(data)) {
+      return angular.equals(angular.fromJson(angular.toJson(data)), angular.fromJson(d));
+    }
     return data == d;
   };
 
diff --git a/libs/bower_components/angular-mocks/bower.json b/libs/bower_components/angular-mocks/bower.json
index 976fc7e43b..3ff4edcab1 100644
--- a/libs/bower_components/angular-mocks/bower.json
+++ b/libs/bower_components/angular-mocks/bower.json
@@ -1,8 +1,9 @@
 {
   "name": "angular-mocks",
-  "version": "1.2.26",
+  "version": "1.2.28",
   "main": "./angular-mocks.js",
+  "ignore": [],
   "dependencies": {
-    "angular": "1.2.26"
+    "angular": "1.2.28"
   }
 }
diff --git a/libs/bower_components/angular-mocks/package.json b/libs/bower_components/angular-mocks/package.json
index 19eea5cfe4..06fe12f6d5 100644
--- a/libs/bower_components/angular-mocks/package.json
+++ b/libs/bower_components/angular-mocks/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-mocks",
-  "version": "",
+  "version": "1.2.28",
   "description": "AngularJS mocks for testing",
   "main": "angular-mocks.js",
   "scripts": {
diff --git a/libs/bower_components/angular-sanitize/.bower.json b/libs/bower_components/angular-sanitize/.bower.json
index 79e65452fb..a594b10295 100644
--- a/libs/bower_components/angular-sanitize/.bower.json
+++ b/libs/bower_components/angular-sanitize/.bower.json
@@ -1,16 +1,17 @@
 {
   "name": "angular-sanitize",
-  "version": "1.2.26",
+  "version": "1.2.28",
   "main": "./angular-sanitize.js",
+  "ignore": [],
   "dependencies": {
-    "angular": "1.2.26"
+    "angular": "1.2.28"
   },
   "homepage": "https://github.com/angular/bower-angular-sanitize",
-  "_release": "1.2.26",
+  "_release": "1.2.28",
   "_resolution": {
     "type": "version",
-    "tag": "v1.2.26",
-    "commit": "738348ea8ec9e1153f938fff1427129cd76d6007"
+    "tag": "v1.2.28",
+    "commit": "d2f6ee551c1df7e412042d847302b37a058b82e2"
   },
   "_source": "git://github.com/angular/bower-angular-sanitize.git",
   "_target": "~1.2.0",
diff --git a/libs/bower_components/angular-sanitize/README.md b/libs/bower_components/angular-sanitize/README.md
index 585a235ede..6bc0a3013b 100644
--- a/libs/bower_components/angular-sanitize/README.md
+++ b/libs/bower_components/angular-sanitize/README.md
@@ -1,12 +1,35 @@
-# bower-angular-sanitize
+# packaged angular-sanitize
 
-This repo is for distribution on `bower`. The source for this module is in the
+This repo is for distribution on `npm` and `bower`. The source for this module is in the
 [main AngularJS repo](https://github.com/angular/angular.js/tree/master/src/ngSanitize).
 Please file issues and pull requests against that repo.
 
 ## Install
 
-Install with `bower`:
+You can install this package either with `npm` or with `bower`.
+
+### npm
+
+```shell
+npm install angular-sanitize
+```
+
+Add a `<script>` to your `index.html`:
+
+```html
+<script src="/node_modules/angular-sanitize/angular-sanitize.js"></script>
+```
+
+Then add `ngSanitize` as a dependency for your app:
+
+```javascript
+angular.module('myApp', ['ngSanitize']);
+```
+
+Note that this package is not in CommonJS format, so doing `require('angular-sanitize')` will
+return `undefined`.
+
+### bower
 
 ```shell
 bower install angular-sanitize
@@ -18,7 +41,7 @@ Add a `<script>` to your `index.html`:
 <script src="/bower_components/angular-sanitize/angular-sanitize.js"></script>
 ```
 
-And add `ngSanitize` as a dependency for your app:
+Then add `ngSanitize` as a dependency for your app:
 
 ```javascript
 angular.module('myApp', ['ngSanitize']);
diff --git a/libs/bower_components/angular-sanitize/angular-sanitize.js b/libs/bower_components/angular-sanitize/angular-sanitize.js
index 63903fcf96..831e5f2a30 100644
--- a/libs/bower_components/angular-sanitize/angular-sanitize.js
+++ b/libs/bower_components/angular-sanitize/angular-sanitize.js
@@ -1,5 +1,5 @@
 /**
- * @license AngularJS v1.2.26
+ * @license AngularJS v1.2.28
  * (c) 2010-2014 Google, Inc. http://angularjs.org
  * License: MIT
  */
@@ -634,9 +634,9 @@ angular.module('ngSanitize').filter('linky', ['$sanitize', function($sanitize) {
         html.push(target);
         html.push('" ');
       }
-      html.push('href="');
-      html.push(url);
-      html.push('">');
+      html.push('href="',
+                url.replace('"', '&quot;'),
+                '">');
       addText(text);
       html.push('</a>');
     }
diff --git a/libs/bower_components/angular-sanitize/angular-sanitize.min.js b/libs/bower_components/angular-sanitize/angular-sanitize.min.js
index cddf1e9236..57eade6f9f 100644
--- a/libs/bower_components/angular-sanitize/angular-sanitize.min.js
+++ b/libs/bower_components/angular-sanitize/angular-sanitize.min.js
@@ -1,15 +1,15 @@
 /*
- AngularJS v1.2.26
+ AngularJS v1.2.28
  (c) 2010-2014 Google, Inc. http://angularjs.org
  License: MIT
 */
-(function(q,g,r){'use strict';function F(a){var d=[];t(d,g.noop).chars(a);return d.join("")}function m(a){var d={};a=a.split(",");var c;for(c=0;c<a.length;c++)d[a[c]]=!0;return d}function G(a,d){function c(a,b,c,h){b=g.lowercase(b);if(u[b])for(;f.last()&&v[f.last()];)e("",f.last());w[b]&&f.last()==b&&e("",b);(h=x[b]||!!h)||f.push(b);var n={};c.replace(H,function(a,b,d,c,e){n[b]=s(d||c||e||"")});d.start&&d.start(b,n,h)}function e(a,b){var c=0,e;if(b=g.lowercase(b))for(c=f.length-1;0<=c&&f[c]!=b;c--);
-if(0<=c){for(e=f.length-1;e>=c;e--)d.end&&d.end(f[e]);f.length=c}}"string"!==typeof a&&(a=null===a||"undefined"===typeof a?"":""+a);var b,l,f=[],n=a,h;for(f.last=function(){return f[f.length-1]};a;){h="";l=!0;if(f.last()&&y[f.last()])a=a.replace(RegExp("(.*)<\\s*\\/\\s*"+f.last()+"[^>]*>","i"),function(a,b){b=b.replace(I,"$1").replace(J,"$1");d.chars&&d.chars(s(b));return""}),e("",f.last());else{if(0===a.indexOf("\x3c!--"))b=a.indexOf("--",4),0<=b&&a.lastIndexOf("--\x3e",b)===b&&(d.comment&&d.comment(a.substring(4,
-b)),a=a.substring(b+3),l=!1);else if(z.test(a)){if(b=a.match(z))a=a.replace(b[0],""),l=!1}else if(K.test(a)){if(b=a.match(A))a=a.substring(b[0].length),b[0].replace(A,e),l=!1}else L.test(a)&&((b=a.match(B))?(b[4]&&(a=a.substring(b[0].length),b[0].replace(B,c)),l=!1):(h+="<",a=a.substring(1)));l&&(b=a.indexOf("<"),h+=0>b?a:a.substring(0,b),a=0>b?"":a.substring(b),d.chars&&d.chars(s(h)))}if(a==n)throw M("badparse",a);n=a}e()}function s(a){if(!a)return"";var d=N.exec(a);a=d[1];var c=d[3];if(d=d[2])p.innerHTML=
-d.replace(/</g,"&lt;"),d="textContent"in p?p.textContent:p.innerText;return a+d+c}function C(a){return a.replace(/&/g,"&amp;").replace(O,function(a){var c=a.charCodeAt(0);a=a.charCodeAt(1);return"&#"+(1024*(c-55296)+(a-56320)+65536)+";"}).replace(P,function(a){return"&#"+a.charCodeAt(0)+";"}).replace(/</g,"&lt;").replace(/>/g,"&gt;")}function t(a,d){var c=!1,e=g.bind(a,a.push);return{start:function(a,l,f){a=g.lowercase(a);!c&&y[a]&&(c=a);c||!0!==D[a]||(e("<"),e(a),g.forEach(l,function(c,f){var k=
-g.lowercase(f),l="img"===a&&"src"===k||"background"===k;!0!==Q[k]||!0===E[k]&&!d(c,l)||(e(" "),e(f),e('="'),e(C(c)),e('"'))}),e(f?"/>":">"))},end:function(a){a=g.lowercase(a);c||!0!==D[a]||(e("</"),e(a),e(">"));a==c&&(c=!1)},chars:function(a){c||e(C(a))}}}var M=g.$$minErr("$sanitize"),B=/^<((?:[a-zA-Z])[\w:-]*)((?:\s+[\w:-]+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)\s*(>?)/,A=/^<\/\s*([\w:-]+)[^>]*>/,H=/([\w:-]+)(?:\s*=\s*(?:(?:"((?:[^"])*)")|(?:'((?:[^'])*)')|([^>\s]+)))?/g,L=/^</,
-K=/^<\//,I=/\x3c!--(.*?)--\x3e/g,z=/<!DOCTYPE([^>]*?)>/i,J=/<!\[CDATA\[(.*?)]]\x3e/g,O=/[\uD800-\uDBFF][\uDC00-\uDFFF]/g,P=/([^\#-~| |!])/g,x=m("area,br,col,hr,img,wbr");q=m("colgroup,dd,dt,li,p,tbody,td,tfoot,th,thead,tr");r=m("rp,rt");var w=g.extend({},r,q),u=g.extend({},q,m("address,article,aside,blockquote,caption,center,del,dir,div,dl,figure,figcaption,footer,h1,h2,h3,h4,h5,h6,header,hgroup,hr,ins,map,menu,nav,ol,pre,script,section,table,ul")),v=g.extend({},r,m("a,abbr,acronym,b,bdi,bdo,big,br,cite,code,del,dfn,em,font,i,img,ins,kbd,label,map,mark,q,ruby,rp,rt,s,samp,small,span,strike,strong,sub,sup,time,tt,u,var")),
-y=m("script,style"),D=g.extend({},x,u,v,w),E=m("background,cite,href,longdesc,src,usemap"),Q=g.extend({},E,m("abbr,align,alt,axis,bgcolor,border,cellpadding,cellspacing,class,clear,color,cols,colspan,compact,coords,dir,face,headers,height,hreflang,hspace,ismap,lang,language,nohref,nowrap,rel,rev,rows,rowspan,rules,scope,scrolling,shape,size,span,start,summary,target,title,type,valign,value,vspace,width")),p=document.createElement("pre"),N=/^(\s*)([\s\S]*?)(\s*)$/;g.module("ngSanitize",[]).provider("$sanitize",
-function(){this.$get=["$$sanitizeUri",function(a){return function(d){var c=[];G(d,t(c,function(c,b){return!/^unsafe/.test(a(c,b))}));return c.join("")}}]});g.module("ngSanitize").filter("linky",["$sanitize",function(a){var d=/((ftp|https?):\/\/|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>"]/,c=/^mailto:/;return function(e,b){function l(a){a&&k.push(F(a))}function f(a,c){k.push("<a ");g.isDefined(b)&&(k.push('target="'),k.push(b),k.push('" '));k.push('href="');k.push(a);k.push('">');l(c);k.push("</a>")}
-if(!e)return e;for(var n,h=e,k=[],m,p;n=h.match(d);)m=n[0],n[2]==n[3]&&(m="mailto:"+m),p=n.index,l(h.substr(0,p)),f(m,n[0].replace(c,"")),h=h.substring(p+n[0].length);l(h);return a(k.join(""))}}])})(window,window.angular);
+(function(q,g,r){'use strict';function F(a){var d=[];t(d,g.noop).chars(a);return d.join("")}function l(a){var d={};a=a.split(",");var c;for(c=0;c<a.length;c++)d[a[c]]=!0;return d}function G(a,d){function c(a,b,c,h){b=g.lowercase(b);if(u[b])for(;f.last()&&v[f.last()];)e("",f.last());w[b]&&f.last()==b&&e("",b);(h=x[b]||!!h)||f.push(b);var n={};c.replace(H,function(a,b,d,c,e){n[b]=s(d||c||e||"")});d.start&&d.start(b,n,h)}function e(a,b){var c=0,e;if(b=g.lowercase(b))for(c=f.length-1;0<=c&&f[c]!=b;c--);
+if(0<=c){for(e=f.length-1;e>=c;e--)d.end&&d.end(f[e]);f.length=c}}"string"!==typeof a&&(a=null===a||"undefined"===typeof a?"":""+a);var b,k,f=[],n=a,h;for(f.last=function(){return f[f.length-1]};a;){h="";k=!0;if(f.last()&&y[f.last()])a=a.replace(RegExp("(.*)<\\s*\\/\\s*"+f.last()+"[^>]*>","i"),function(a,b){b=b.replace(I,"$1").replace(J,"$1");d.chars&&d.chars(s(b));return""}),e("",f.last());else{if(0===a.indexOf("\x3c!--"))b=a.indexOf("--",4),0<=b&&a.lastIndexOf("--\x3e",b)===b&&(d.comment&&d.comment(a.substring(4,
+b)),a=a.substring(b+3),k=!1);else if(z.test(a)){if(b=a.match(z))a=a.replace(b[0],""),k=!1}else if(K.test(a)){if(b=a.match(A))a=a.substring(b[0].length),b[0].replace(A,e),k=!1}else L.test(a)&&((b=a.match(B))?(b[4]&&(a=a.substring(b[0].length),b[0].replace(B,c)),k=!1):(h+="<",a=a.substring(1)));k&&(b=a.indexOf("<"),h+=0>b?a:a.substring(0,b),a=0>b?"":a.substring(b),d.chars&&d.chars(s(h)))}if(a==n)throw M("badparse",a);n=a}e()}function s(a){if(!a)return"";var d=N.exec(a);a=d[1];var c=d[3];if(d=d[2])p.innerHTML=
+d.replace(/</g,"&lt;"),d="textContent"in p?p.textContent:p.innerText;return a+d+c}function C(a){return a.replace(/&/g,"&amp;").replace(O,function(a){var c=a.charCodeAt(0);a=a.charCodeAt(1);return"&#"+(1024*(c-55296)+(a-56320)+65536)+";"}).replace(P,function(a){return"&#"+a.charCodeAt(0)+";"}).replace(/</g,"&lt;").replace(/>/g,"&gt;")}function t(a,d){var c=!1,e=g.bind(a,a.push);return{start:function(a,k,f){a=g.lowercase(a);!c&&y[a]&&(c=a);c||!0!==D[a]||(e("<"),e(a),g.forEach(k,function(c,f){var m=
+g.lowercase(f),k="img"===a&&"src"===m||"background"===m;!0!==Q[m]||!0===E[m]&&!d(c,k)||(e(" "),e(f),e('="'),e(C(c)),e('"'))}),e(f?"/>":">"))},end:function(a){a=g.lowercase(a);c||!0!==D[a]||(e("</"),e(a),e(">"));a==c&&(c=!1)},chars:function(a){c||e(C(a))}}}var M=g.$$minErr("$sanitize"),B=/^<((?:[a-zA-Z])[\w:-]*)((?:\s+[\w:-]+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)\s*(>?)/,A=/^<\/\s*([\w:-]+)[^>]*>/,H=/([\w:-]+)(?:\s*=\s*(?:(?:"((?:[^"])*)")|(?:'((?:[^'])*)')|([^>\s]+)))?/g,L=/^</,
+K=/^<\//,I=/\x3c!--(.*?)--\x3e/g,z=/<!DOCTYPE([^>]*?)>/i,J=/<!\[CDATA\[(.*?)]]\x3e/g,O=/[\uD800-\uDBFF][\uDC00-\uDFFF]/g,P=/([^\#-~| |!])/g,x=l("area,br,col,hr,img,wbr");q=l("colgroup,dd,dt,li,p,tbody,td,tfoot,th,thead,tr");r=l("rp,rt");var w=g.extend({},r,q),u=g.extend({},q,l("address,article,aside,blockquote,caption,center,del,dir,div,dl,figure,figcaption,footer,h1,h2,h3,h4,h5,h6,header,hgroup,hr,ins,map,menu,nav,ol,pre,script,section,table,ul")),v=g.extend({},r,l("a,abbr,acronym,b,bdi,bdo,big,br,cite,code,del,dfn,em,font,i,img,ins,kbd,label,map,mark,q,ruby,rp,rt,s,samp,small,span,strike,strong,sub,sup,time,tt,u,var")),
+y=l("script,style"),D=g.extend({},x,u,v,w),E=l("background,cite,href,longdesc,src,usemap"),Q=g.extend({},E,l("abbr,align,alt,axis,bgcolor,border,cellpadding,cellspacing,class,clear,color,cols,colspan,compact,coords,dir,face,headers,height,hreflang,hspace,ismap,lang,language,nohref,nowrap,rel,rev,rows,rowspan,rules,scope,scrolling,shape,size,span,start,summary,target,title,type,valign,value,vspace,width")),p=document.createElement("pre"),N=/^(\s*)([\s\S]*?)(\s*)$/;g.module("ngSanitize",[]).provider("$sanitize",
+function(){this.$get=["$$sanitizeUri",function(a){return function(d){var c=[];G(d,t(c,function(c,b){return!/^unsafe/.test(a(c,b))}));return c.join("")}}]});g.module("ngSanitize").filter("linky",["$sanitize",function(a){var d=/((ftp|https?):\/\/|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>"]/,c=/^mailto:/;return function(e,b){function k(a){a&&m.push(F(a))}function f(a,c){m.push("<a ");g.isDefined(b)&&(m.push('target="'),m.push(b),m.push('" '));m.push('href="',a.replace('"',"&quot;"),'">');k(c);m.push("</a>")}
+if(!e)return e;for(var n,h=e,m=[],l,p;n=h.match(d);)l=n[0],n[2]==n[3]&&(l="mailto:"+l),p=n.index,k(h.substr(0,p)),f(l,n[0].replace(c,"")),h=h.substring(p+n[0].length);k(h);return a(m.join(""))}}])})(window,window.angular);
 //# sourceMappingURL=angular-sanitize.min.js.map
diff --git a/libs/bower_components/angular-sanitize/angular-sanitize.min.js.map b/libs/bower_components/angular-sanitize/angular-sanitize.min.js.map
index 2bc3236e3e..5baa1dfbc1 100644
--- a/libs/bower_components/angular-sanitize/angular-sanitize.min.js.map
+++ b/libs/bower_components/angular-sanitize/angular-sanitize.min.js.map
@@ -2,7 +2,7 @@
 "version":3,
 "file":"angular-sanitize.min.js",
 "lineCount":14,
-"mappings":"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",
+"mappings":"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",
 "sources":["angular-sanitize.js"],
 "names":["window","angular","undefined","sanitizeText","chars","buf","htmlSanitizeWriter","writer","noop","join","makeMap","str","obj","items","split","i","length","htmlParser","html","handler","parseStartTag","tag","tagName","rest","unary","lowercase","blockElements","stack","last","inlineElements","parseEndTag","optionalEndTagElements","voidElements","push","attrs","replace","ATTR_REGEXP","match","name","doubleQuotedValue","singleQuotedValue","unquotedValue","decodeEntities","start","pos","end","index","text","stack.last","specialElements","RegExp","all","COMMENT_REGEXP","CDATA_REGEXP","indexOf","lastIndexOf","comment","substring","DOCTYPE_REGEXP","test","BEGING_END_TAGE_REGEXP","END_TAG_REGEXP","BEGIN_TAG_REGEXP","START_TAG_REGEXP","$sanitizeMinErr","value","parts","spaceRe","exec","spaceBefore","spaceAfter","content","hiddenPre","innerHTML","textContent","innerText","encodeEntities","SURROGATE_PAIR_REGEXP","hi","charCodeAt","low","NON_ALPHANUMERIC_REGEXP","uriValidator","ignore","out","bind","validElements","forEach","key","lkey","isImage","validAttrs","uriAttrs","$$minErr","optionalEndTagBlockElements","optionalEndTagInlineElements","extend","document","createElement","module","provider","$SanitizeProvider","$get","$$sanitizeUri","uri","filter","$sanitize","LINKY_URL_REGEXP","MAILTO_REGEXP","target","addText","addLink","url","isDefined","raw","substr"]
 }
diff --git a/libs/bower_components/angular-sanitize/bower.json b/libs/bower_components/angular-sanitize/bower.json
index 48e5320588..8c4afc7e4a 100644
--- a/libs/bower_components/angular-sanitize/bower.json
+++ b/libs/bower_components/angular-sanitize/bower.json
@@ -1,8 +1,9 @@
 {
   "name": "angular-sanitize",
-  "version": "1.2.26",
+  "version": "1.2.28",
   "main": "./angular-sanitize.js",
+  "ignore": [],
   "dependencies": {
-    "angular": "1.2.26"
+    "angular": "1.2.28"
   }
 }
diff --git a/libs/bower_components/angular-sanitize/package.json b/libs/bower_components/angular-sanitize/package.json
new file mode 100644
index 0000000000..8242c27373
--- /dev/null
+++ b/libs/bower_components/angular-sanitize/package.json
@@ -0,0 +1,26 @@
+{
+  "name": "angular-sanitize",
+  "version": "1.2.28",
+  "description": "AngularJS module for sanitizing HTML",
+  "main": "angular-sanitize.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/angular/angular.js.git"
+  },
+  "keywords": [
+    "angular",
+    "framework",
+    "browser",
+    "html",
+    "client-side"
+  ],
+  "author": "Angular Core Team <angular-core+npm@google.com>",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/angular/angular.js/issues"
+  },
+  "homepage": "http://angularjs.org"
+}
diff --git a/libs/bower_components/angular/.bower.json b/libs/bower_components/angular/.bower.json
index 6278bf77b7..c467f9945b 100644
--- a/libs/bower_components/angular/.bower.json
+++ b/libs/bower_components/angular/.bower.json
@@ -1,14 +1,15 @@
 {
   "name": "angular",
-  "version": "1.2.26",
+  "version": "1.2.28",
   "main": "./angular.js",
+  "ignore": [],
   "dependencies": {},
   "homepage": "https://github.com/angular/bower-angular",
-  "_release": "1.2.26",
+  "_release": "1.2.28",
   "_resolution": {
     "type": "version",
-    "tag": "v1.2.26",
-    "commit": "7308d8d650b2b9948796035cbf6f3b175d45efe0"
+    "tag": "v1.2.28",
+    "commit": "d1369fe05d3a7d85961a2223292b67ee82b9f80a"
   },
   "_source": "git://github.com/angular/bower-angular.git",
   "_target": "~1.2.0",
diff --git a/libs/bower_components/angular/README.md b/libs/bower_components/angular/README.md
index fc0c09987e..897fb7f013 100644
--- a/libs/bower_components/angular/README.md
+++ b/libs/bower_components/angular/README.md
@@ -1,18 +1,37 @@
-# bower-angular
+# packaged angular
 
-This repo is for distribution on `bower`. The source for this module is in the
+This repo is for distribution on `npm` and `bower`. The source for this module is in the
 [main AngularJS repo](https://github.com/angular/angular.js).
 Please file issues and pull requests against that repo.
 
 ## Install
 
-Install with `bower`:
+You can install this package either with `npm` or with `bower`.
+
+### npm
+
+```shell
+npm install angular
+```
+
+Then add a `<script>` to your `index.html`:
+
+```html
+<script src="/node_modules/angular/angular.js"></script>
+```
+
+Note that this package is not in CommonJS format, so doing `require('angular')` will return `undefined`.
+If you're using [Browserify](https://github.com/substack/node-browserify), you can use
+[exposify](https://github.com/thlorenz/exposify) to have `require('angular')` return the `angular`
+global.
+
+### bower
 
 ```shell
 bower install angular
 ```
 
-Add a `<script>` to your `index.html`:
+Then add a `<script>` to your `index.html`:
 
 ```html
 <script src="/bower_components/angular/angular.js"></script>
diff --git a/libs/bower_components/angular/angular.js b/libs/bower_components/angular/angular.js
index 049cda8be3..ccf3b4bafe 100644
--- a/libs/bower_components/angular/angular.js
+++ b/libs/bower_components/angular/angular.js
@@ -1,5 +1,5 @@
 /**
- * @license AngularJS v1.2.26
+ * @license AngularJS v1.2.28
  * (c) 2010-2014 Google, Inc. http://angularjs.org
  * License: MIT
  */
@@ -68,7 +68,7 @@ function minErr(module) {
       return match;
     });
 
-    message = message + '\nhttp://errors.angularjs.org/1.2.26/' +
+    message = message + '\nhttp://errors.angularjs.org/1.2.28/' +
       (module ? module + '/' : '') + code;
     for (i = 2; i < arguments.length; i++) {
       message = message + (i == 2 ? '?' : '&') + 'p' + (i-2) + '=' +
@@ -234,8 +234,8 @@ if ('i' !== 'I'.toLowerCase()) {
 }
 
 
-var /** holds major version number for IE or NaN for real browsers */
-    msie,
+var
+    msie,             // holds major version number for IE, or NaN if UA is not IE.
     jqLite,           // delay binding since jQuery could be loaded after us.
     jQuery,           // delay binding
     slice             = [].slice,
@@ -1987,11 +1987,11 @@ function setupModuleLoader(window) {
  * - `codeName` – `{string}` – Code name of the release, such as "jiggling-armfat".
  */
 var version = {
-  full: '1.2.26',    // all of these placeholder strings will be replaced by grunt's
+  full: '1.2.28',    // all of these placeholder strings will be replaced by grunt's
   major: 1,    // package task
   minor: 2,
-  dot: 26,
-  codeName: 'captivating-disinterest'
+  dot: 28,
+  codeName: 'finnish-disembarkation'
 };
 
 
@@ -2158,7 +2158,7 @@ function publishExternalAPI(angular){
  * - [`children()`](http://api.jquery.com/children/) - Does not support selectors
  * - [`clone()`](http://api.jquery.com/clone/)
  * - [`contents()`](http://api.jquery.com/contents/)
- * - [`css()`](http://api.jquery.com/css/)
+ * - [`css()`](http://api.jquery.com/css/) - Only retrieves inline-styles, does not call `getComputedStyles()`
  * - [`data()`](http://api.jquery.com/data/)
  * - [`empty()`](http://api.jquery.com/empty/)
  * - [`eq()`](http://api.jquery.com/eq/)
@@ -3202,13 +3202,13 @@ HashMap.prototype = {
  * @kind function
  *
  * @description
- * Creates an injector function that can be used for retrieving services as well as for
+ * Creates an injector object that can be used for retrieving services as well as for
  * dependency injection (see {@link guide/di dependency injection}).
  *
 
  * @param {Array.<string|Function>} modules A list of module functions or their aliases. See
  *        {@link angular.module}. The `ng` module must be explicitly added.
- * @returns {function()} Injector function. See {@link auto.$injector $injector}.
+ * @returns {injector} Injector object. See {@link auto.$injector $injector}.
  *
  * @example
  * Typical usage
@@ -3296,7 +3296,6 @@ function annotate(fn) {
 /**
  * @ngdoc service
  * @name $injector
- * @kind function
  *
  * @description
  *
@@ -3311,7 +3310,7 @@ function annotate(fn) {
  *   expect($injector.get('$injector')).toBe($injector);
  *   expect($injector.invoke(function($injector){
  *     return $injector;
- *   }).toBe($injector);
+ *   })).toBe($injector);
  * ```
  *
  * # Injection Function Annotation
@@ -3378,8 +3377,8 @@ function annotate(fn) {
  * @description
  * Allows the user to query if the particular service exists.
  *
- * @param {string} Name of the service to query.
- * @returns {boolean} returns true if injector has given service.
+ * @param {string} name Name of the service to query.
+ * @returns {boolean} `true` if injector has given service.
  */
 
 /**
@@ -4044,6 +4043,19 @@ function $AnchorScrollProvider() {
 
   var autoScrollingEnabled = true;
 
+  /**
+   * @ngdoc method
+   * @name $anchorScrollProvider#disableAutoScrolling
+   *
+   * @description
+   * By default, {@link ng.$anchorScroll $anchorScroll()} will automatically detect changes to
+   * {@link ng.$location#hash $location.hash()} and scroll to the element matching the new hash.<br />
+   * Use this method to disable automatic scrolling.
+   *
+   * If automatic scrolling is disabled, one must explicitly call
+   * {@link ng.$anchorScroll $anchorScroll()} in order to scroll to the element related to the
+   * current hash.
+   */
   this.disableAutoScrolling = function() {
     autoScrollingEnabled = false;
   };
@@ -4348,6 +4360,8 @@ function $$AsyncCallbackProvider(){
   }];
 }
 
+/* global stripHash: true */
+
 /**
  * ! This is a private undocumented service !
  *
@@ -4472,7 +4486,7 @@ function Browser(window, document, $log, $sniffer) {
 
   var lastBrowserUrl = location.href,
       baseElement = document.find('base'),
-      newLocation = null;
+      reloadLocation = null;
 
   /**
    * @name $browser#url
@@ -4501,8 +4515,13 @@ function Browser(window, document, $log, $sniffer) {
     // setter
     if (url) {
       if (lastBrowserUrl == url) return;
+      var sameBase = lastBrowserUrl && stripHash(lastBrowserUrl) === stripHash(url);
       lastBrowserUrl = url;
-      if ($sniffer.history) {
+      // Don't use history API if only the hash changed
+      // due to a bug in IE10/IE11 which leads
+      // to not firing a `hashchange` nor `popstate` event
+      // in some cases (see #9143).
+      if (!sameBase && $sniffer.history) {
         if (replace) history.replaceState(null, '', url);
         else {
           history.pushState(null, '', url);
@@ -4510,7 +4529,9 @@ function Browser(window, document, $log, $sniffer) {
           baseElement.attr('href', baseElement.attr('href'));
         }
       } else {
-        newLocation = url;
+        if (!sameBase) {
+          reloadLocation = url;
+        }
         if (replace) {
           location.replace(url);
         } else {
@@ -4520,10 +4541,10 @@ function Browser(window, document, $log, $sniffer) {
       return self;
     // getter
     } else {
-      // - newLocation is a workaround for an IE7-9 issue with location.replace and location.href
-      //   methods not updating location.href synchronously.
+      // - reloadLocation is needed as browsers don't allow to read out
+      //   the new location.href if a reload happened.
       // - the replacement is a workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=407172
-      return newLocation || location.href.replace(/%27/g,"'");
+      return reloadLocation || location.href.replace(/%27/g,"'");
     }
   };
 
@@ -4531,7 +4552,6 @@ function Browser(window, document, $log, $sniffer) {
       urlChangeInit = false;
 
   function fireUrlChange() {
-    newLocation = null;
     if (lastBrowserUrl == self.url()) return;
 
     lastBrowserUrl = self.url();
@@ -5107,7 +5127,8 @@ function $CacheFactoryProvider() {
  * ```
  *
  * **Note:** the `script` tag containing the template does not need to be included in the `head` of
- * the document, but it must be below the `ng-app` definition.
+ * the document, but it must be a descendent of the {@link ng.$rootElement $rootElement} (IE,
+ * element with ng-app attribute), otherwise the template will be ignored.
  *
  * Adding via the $templateCache service:
  *
@@ -5392,8 +5413,13 @@ function $TemplateCacheProvider() {
  * scope. This makes it possible for the widget to have private state, and the transclusion to
  * be bound to the parent (pre-`isolate`) scope.
  *
- * * `true` - transclude the content of the directive.
- * * `'element'` - transclude the whole element including any directives defined at lower priority.
+ * There are two kinds of transclusion depending upon whether you want to transclude just the contents of the
+ * directive's element or the entire element:
+ *
+ * * `true` - transclude the content (i.e. the child nodes) of the directive's element.
+ * * `'element'` - transclude the whole of the directive's element including any directives on this
+ *   element that defined at a lower priority than this directive. When used, the `template`
+ *   property is ignored.
  *
  * <div class="alert alert-warning">
  * **Note:** When testing an element transclude directive you must not place the directive at the root of the
@@ -5785,6 +5811,21 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
     };
 
     Attributes.prototype = {
+      /**
+       * @ngdoc method
+       * @name $compile.directive.Attributes#$normalize
+       * @kind function
+       *
+       * @description
+       * Converts an attribute name (e.g. dash/colon/underscore-delimited string, optionally prefixed with `x-` or
+       * `data-`) to its normalized, camelCase form.
+       *
+       * Also there is special case for Moz prefix starting with upper case letter.
+       *
+       * For further information check out the guide on {@link guide/directive#matching-directives Matching Directives}
+       *
+       * @param {string} name Name to normalize
+       */
       $normalize: directiveNormalize,
 
 
@@ -7118,13 +7159,6 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 var PREFIX_REGEXP = /^(x[\:\-_]|data[\:\-_])/i;
 /**
  * Converts all accepted directives format into proper directive name.
- * All of these will become 'myDirective':
- *   my:Directive
- *   my-directive
- *   x-my-directive
- *   data-my:directive
- *
- * Also there is special case for Moz prefix starting with upper case letter.
  * @param name Name to normalize
  */
 function directiveNormalize(name) {
@@ -7510,9 +7544,18 @@ function $HttpProvider() {
   };
 
   /**
-   * Are ordered by request, i.e. they are applied in the same order as the
+   * @ngdoc property
+   * @name $httpProvider#interceptors
+   * @description
+   *
+   * Array containing service factories for all synchronous or asynchronous {@link ng.$http $http}
+   * pre-processing of request or postprocessing of responses.
+   *
+   * These service factories are ordered by request, i.e. they are applied in the same order as the
    * array, on request, but reverse order, on response.
-   */
+   *
+   * {@link ng.$http#interceptors Interceptors detailed info}
+   **/
   var interceptorFactories = this.interceptors = [];
 
   /**
@@ -7674,6 +7717,21 @@ function $HttpProvider() {
      * In addition, you can supply a `headers` property in the config object passed when
      * calling `$http(config)`, which overrides the defaults without changing them globally.
      *
+     * To explicitly remove a header automatically added via $httpProvider.defaults.headers on a per request basis,
+     * Use the `headers` property, setting the desired header to `undefined`. For example:
+     *
+     * ```js
+     * var req = {
+     *  method: 'POST',
+     *  url: 'http://example.com',
+     *  headers: {
+     *    'Content-Type': undefined
+     *  },
+     *  data: { test: 'test' },
+     * }
+     *
+     * $http(req).success(function(){...}).error(function(){...});
+     * ```
      *
      * # Transforming Requests and Responses
      *
@@ -8253,18 +8311,31 @@ function $HttpProvider() {
      * @param {Object=} config Optional configuration object
      * @returns {HttpPromise} Future object
      */
-    createShortMethodsWithData('post', 'put');
 
-        /**
-         * @ngdoc property
-         * @name $http#defaults
-         *
-         * @description
-         * Runtime equivalent of the `$httpProvider.defaults` property. Allows configuration of
-         * default headers, withCredentials as well as request and response transformations.
-         *
-         * See "Setting HTTP Headers" and "Transforming Requests and Responses" sections above.
-         */
+    /**
+     * @ngdoc method
+     * @name $http#patch
+     *
+     * @description
+     * Shortcut method to perform `PATCH` request.
+     *
+     * @param {string} url Relative or absolute URL specifying the destination of the request
+     * @param {*} data Request content
+     * @param {Object=} config Optional configuration object
+     * @returns {HttpPromise} Future object
+     */
+    createShortMethodsWithData('post', 'put', 'patch');
+
+    /**
+     * @ngdoc property
+     * @name $http#defaults
+     *
+     * @description
+     * Runtime equivalent of the `$httpProvider.defaults` property. Allows configuration of
+     * default headers, withCredentials as well as request and response transformations.
+     *
+     * See "Setting HTTP Headers" and "Transforming Requests and Responses" sections above.
+     */
     $http.defaults = defaults;
 
 
@@ -8950,33 +9021,33 @@ function $IntervalProvider() {
       *             // Don't start a new fight if we are already fighting
       *             if ( angular.isDefined(stop) ) return;
       *
-      *           stop = $interval(function() {
-      *             if ($scope.blood_1 > 0 && $scope.blood_2 > 0) {
-      *               $scope.blood_1 = $scope.blood_1 - 3;
-      *               $scope.blood_2 = $scope.blood_2 - 4;
-      *             } else {
-      *               $scope.stopFight();
+      *             stop = $interval(function() {
+      *               if ($scope.blood_1 > 0 && $scope.blood_2 > 0) {
+      *                 $scope.blood_1 = $scope.blood_1 - 3;
+      *                 $scope.blood_2 = $scope.blood_2 - 4;
+      *               } else {
+      *                 $scope.stopFight();
+      *               }
+      *             }, 100);
+      *           };
+      *
+      *           $scope.stopFight = function() {
+      *             if (angular.isDefined(stop)) {
+      *               $interval.cancel(stop);
+      *               stop = undefined;
       *             }
-      *           }, 100);
-      *         };
+      *           };
       *
-      *         $scope.stopFight = function() {
-      *           if (angular.isDefined(stop)) {
-      *             $interval.cancel(stop);
-      *             stop = undefined;
-      *           }
-      *         };
+      *           $scope.resetFight = function() {
+      *             $scope.blood_1 = 100;
+      *             $scope.blood_2 = 120;
+      *           };
       *
-      *         $scope.resetFight = function() {
-      *           $scope.blood_1 = 100;
-      *           $scope.blood_2 = 120;
-      *         };
-      *
-      *         $scope.$on('$destroy', function() {
-      *           // Make sure that the interval is destroyed too
-      *           $scope.stopFight();
-      *         });
-      *       }])
+      *           $scope.$on('$destroy', function() {
+      *             // Make sure that the interval is destroyed too
+      *             $scope.stopFight();
+      *           });
+      *         }])
       *       // Register the 'myCurrentTime' directive factory method.
       *       // We inject $interval and dateFilter service since the factory method is DI.
       *       .directive('myCurrentTime', ['$interval', 'dateFilter',
@@ -9278,21 +9349,26 @@ function LocationHtml5Url(appBase, basePrefix) {
     this.$$absUrl = appBaseNoFile + this.$$url.substr(1); // first char is always '/'
   };
 
-  this.$$rewrite = function(url) {
+  this.$$parseLinkUrl = function(url, relHref) {
     var appUrl, prevAppUrl;
+    var rewrittenUrl;
 
     if ( (appUrl = beginsWith(appBase, url)) !== undefined ) {
       prevAppUrl = appUrl;
       if ( (appUrl = beginsWith(basePrefix, appUrl)) !== undefined ) {
-        return appBaseNoFile + (beginsWith('/', appUrl) || appUrl);
+        rewrittenUrl = appBaseNoFile + (beginsWith('/', appUrl) || appUrl);
       } else {
-        return appBase + prevAppUrl;
+        rewrittenUrl = appBase + prevAppUrl;
       }
     } else if ( (appUrl = beginsWith(appBaseNoFile, url)) !== undefined ) {
-      return appBaseNoFile + appUrl;
+      rewrittenUrl = appBaseNoFile + appUrl;
     } else if (appBaseNoFile == url + '/') {
-      return appBaseNoFile;
+      rewrittenUrl = appBaseNoFile;
+    }
+    if (rewrittenUrl) {
+      this.$$parse(rewrittenUrl);
     }
+    return !!rewrittenUrl;
   };
 }
 
@@ -9382,10 +9458,12 @@ function LocationHashbangUrl(appBase, hashPrefix) {
     this.$$absUrl = appBase + (this.$$url ? hashPrefix + this.$$url : '');
   };
 
-  this.$$rewrite = function(url) {
+  this.$$parseLinkUrl = function(url, relHref) {
     if(stripHash(appBase) == stripHash(url)) {
-      return url;
+      this.$$parse(url);
+      return true;
     }
+    return false;
   };
 }
 
@@ -9405,16 +9483,21 @@ function LocationHashbangInHtml5Url(appBase, hashPrefix) {
 
   var appBaseNoFile = stripFile(appBase);
 
-  this.$$rewrite = function(url) {
+  this.$$parseLinkUrl = function(url, relHref) {
+    var rewrittenUrl;
     var appUrl;
 
     if ( appBase == stripHash(url) ) {
-      return url;
+      rewrittenUrl = url;
     } else if ( (appUrl = beginsWith(appBaseNoFile, url)) ) {
-      return appBase + hashPrefix + appUrl;
+      rewrittenUrl = appBase + hashPrefix + appUrl;
     } else if ( appBaseNoFile === url + '/') {
-      return appBaseNoFile;
+      rewrittenUrl = appBaseNoFile;
+    }
+    if (rewrittenUrl) {
+      this.$$parse(rewrittenUrl);
     }
+    return !!rewrittenUrl;
   };
 
   this.$$compose = function() {
@@ -9542,7 +9625,7 @@ LocationHashbangInHtml5Url.prototype =
    * @return {string} path
    */
   path: locationGetterSetter('$$path', function(path) {
-    path = path ? path.toString() : '';
+    path = path !== null ? path.toString() : '';
     return path.charAt(0) == '/' ? path : '/' + path;
   }),
 
@@ -9639,7 +9722,7 @@ LocationHashbangInHtml5Url.prototype =
    * @return {string} hash
    */
   hash: locationGetterSetter('$$hash', function(hash) {
-    return hash ? hash.toString() : '';
+    return hash !== null ? hash.toString() : '';
   }),
 
   /**
@@ -9787,7 +9870,7 @@ function $LocationProvider(){
       LocationMode = LocationHashbangUrl;
     }
     $location = new LocationMode(appBase, '#' + hashPrefix);
-    $location.$$parse($location.$$rewrite(initialUrl));
+    $location.$$parseLinkUrl(initialUrl, initialUrl);
 
     var IGNORE_URI_REGEXP = /^\s*(javascript|mailto):/i;
 
@@ -9806,6 +9889,9 @@ function $LocationProvider(){
       }
 
       var absHref = elm.prop('href');
+      // get the actual href attribute - see
+      // http://msdn.microsoft.com/en-us/library/ie/dd347148(v=vs.85).aspx
+      var relHref = elm.attr('href') || elm.attr('xlink:href');
 
       if (isObject(absHref) && absHref.toString() === '[object SVGAnimatedString]') {
         // SVGAnimatedString.animVal should be identical to SVGAnimatedString.baseVal, unless during
@@ -9816,50 +9902,18 @@ function $LocationProvider(){
       // Ignore when url is started with javascript: or mailto:
       if (IGNORE_URI_REGEXP.test(absHref)) return;
 
-      // Make relative links work in HTML5 mode for legacy browsers (or at least IE8 & 9)
-      // The href should be a regular url e.g. /link/somewhere or link/somewhere or ../somewhere or
-      // somewhere#anchor or http://example.com/somewhere
-      if (LocationMode === LocationHashbangInHtml5Url) {
-        // get the actual href attribute - see
-        // http://msdn.microsoft.com/en-us/library/ie/dd347148(v=vs.85).aspx
-        var href = elm.attr('href') || elm.attr('xlink:href');
-
-        if (href && href.indexOf('://') < 0) {         // Ignore absolute URLs
-          var prefix = '#' + hashPrefix;
-          if (href[0] == '/') {
-            // absolute path - replace old path
-            absHref = appBase + prefix + href;
-          } else if (href[0] == '#') {
-            // local anchor
-            absHref = appBase + prefix + ($location.path() || '/') + href;
-          } else {
-            // relative path - join with current path
-            var stack = $location.path().split("/"),
-              parts = href.split("/");
-            if (stack.length === 2 && !stack[1]) stack.length = 1;
-            for (var i=0; i<parts.length; i++) {
-              if (parts[i] == ".")
-                continue;
-              else if (parts[i] == "..")
-                stack.pop();
-              else if (parts[i].length)
-                stack.push(parts[i]);
-            }
-            absHref = appBase + prefix + stack.join('/');
-          }
-        }
-      }
-
-      var rewrittenUrl = $location.$$rewrite(absHref);
-
-      if (absHref && !elm.attr('target') && rewrittenUrl && !event.isDefaultPrevented()) {
-        event.preventDefault();
-        if (rewrittenUrl != $browser.url()) {
+      if (absHref && !elm.attr('target') && !event.isDefaultPrevented()) {
+        if ($location.$$parseLinkUrl(absHref, relHref)) {
+          // We do a preventDefault for all urls that are part of the angular application,
+          // in html5mode and also without, so that we are able to abort navigation without
+          // getting double entries in the location history.
+          event.preventDefault();
           // update location manually
-          $location.$$parse(rewrittenUrl);
-          $rootScope.$apply();
-          // hack to work around FF6 bug 684208 when scenario runner clicks on links
-          window.angular['ff-684208-preventDefault'] = true;
+          if ($location.absUrl() != $browser.url()) {
+            $rootScope.$apply();
+            // hack to work around FF6 bug 684208 when scenario runner clicks on links
+            window.angular['ff-684208-preventDefault'] = true;
+          }
         }
       }
     });
@@ -10089,7 +10143,7 @@ var promiseWarning;
 // Sandboxing Angular Expressions
 // ------------------------------
 // Angular expressions are generally considered safe because these expressions only have direct
-// access to $scope and locals. However, one can obtain the ability to execute arbitrary JS code by
+// access to `$scope` and locals. However, one can obtain the ability to execute arbitrary JS code by
 // obtaining a reference to native JS functions such as the Function constructor.
 //
 // As an example, consider the following Angular expression:
@@ -10098,7 +10152,7 @@ var promiseWarning;
 //
 // This sandboxing technique is not perfect and doesn't aim to be. The goal is to prevent exploits
 // against the expression language, but not to prevent exploits that were enabled by exposing
-// sensitive JavaScript or browser apis on Scope. Exposing such objects on a Scope is never a good
+// sensitive JavaScript or browser APIs on Scope. Exposing such objects on a Scope is never a good
 // practice and therefore we are not even trying to protect against interaction with an object
 // explicitly exposed in this way.
 //
@@ -10106,6 +10160,8 @@ var promiseWarning;
 // window or some DOM object that has a reference to window is published onto a Scope.
 // Similarly we prevent invocations of function known to be dangerous, as well as assignments to
 // native objects.
+//
+// See https://docs.angularjs.org/guide/security
 
 
 function ensureSafeMemberName(name, fullExpression) {
@@ -10842,7 +10898,7 @@ Parser.prototype = {
       ensureSafeObject(context, parser.text);
       ensureSafeFunction(fnPtr, parser.text);
 
-      // IE stupidity! (IE doesn't have apply for some native functions)
+      // IE doesn't have apply for some native functions
       var v = fnPtr.apply
             ? fnPtr.apply(context, args)
             : fnPtr(args[0], args[1], args[2], args[3], args[4]);
@@ -10956,7 +11012,12 @@ function setter(obj, path, setValue, fullExp, options) {
   return setValue;
 }
 
-var getterFnCache = {};
+var getterFnCacheDefault = {};
+var getterFnCacheExpensive = {};
+
+function isPossiblyDangerousMemberName(name) {
+  return name == 'constructor';
+}
 
 /**
  * Implementation of the "Black Hole" variant from:
@@ -10969,29 +11030,38 @@ function cspSafeGetterFn(key0, key1, key2, key3, key4, fullExp, options) {
   ensureSafeMemberName(key2, fullExp);
   ensureSafeMemberName(key3, fullExp);
   ensureSafeMemberName(key4, fullExp);
+  var eso = function(o) {
+    return ensureSafeObject(o, fullExp);
+  };
+  var expensiveChecks = options.expensiveChecks;
+  var eso0 = (expensiveChecks || isPossiblyDangerousMemberName(key0)) ? eso : identity;
+  var eso1 = (expensiveChecks || isPossiblyDangerousMemberName(key1)) ? eso : identity;
+  var eso2 = (expensiveChecks || isPossiblyDangerousMemberName(key2)) ? eso : identity;
+  var eso3 = (expensiveChecks || isPossiblyDangerousMemberName(key3)) ? eso : identity;
+  var eso4 = (expensiveChecks || isPossiblyDangerousMemberName(key4)) ? eso : identity;
 
   return !options.unwrapPromises
       ? function cspSafeGetter(scope, locals) {
           var pathVal = (locals && locals.hasOwnProperty(key0)) ? locals : scope;
 
           if (pathVal == null) return pathVal;
-          pathVal = pathVal[key0];
+          pathVal = eso0(pathVal[key0]);
 
           if (!key1) return pathVal;
           if (pathVal == null) return undefined;
-          pathVal = pathVal[key1];
+          pathVal = eso1(pathVal[key1]);
 
           if (!key2) return pathVal;
           if (pathVal == null) return undefined;
-          pathVal = pathVal[key2];
+          pathVal = eso2(pathVal[key2]);
 
           if (!key3) return pathVal;
           if (pathVal == null) return undefined;
-          pathVal = pathVal[key3];
+          pathVal = eso3(pathVal[key3]);
 
           if (!key4) return pathVal;
           if (pathVal == null) return undefined;
-          pathVal = pathVal[key4];
+          pathVal = eso4(pathVal[key4]);
 
           return pathVal;
         }
@@ -11001,73 +11071,81 @@ function cspSafeGetterFn(key0, key1, key2, key3, key4, fullExp, options) {
 
           if (pathVal == null) return pathVal;
 
-          pathVal = pathVal[key0];
+          pathVal = eso0(pathVal[key0]);
           if (pathVal && pathVal.then) {
             promiseWarning(fullExp);
             if (!("$$v" in pathVal)) {
               promise = pathVal;
               promise.$$v = undefined;
-              promise.then(function(val) { promise.$$v = val; });
+              promise.then(function(val) { promise.$$v = eso0(val); });
             }
-            pathVal = pathVal.$$v;
+            pathVal = eso0(pathVal.$$v);
           }
 
           if (!key1) return pathVal;
           if (pathVal == null) return undefined;
-          pathVal = pathVal[key1];
+          pathVal = eso1(pathVal[key1]);
           if (pathVal && pathVal.then) {
             promiseWarning(fullExp);
             if (!("$$v" in pathVal)) {
               promise = pathVal;
               promise.$$v = undefined;
-              promise.then(function(val) { promise.$$v = val; });
+              promise.then(function(val) { promise.$$v = eso1(val); });
             }
-            pathVal = pathVal.$$v;
+            pathVal = eso1(pathVal.$$v);
           }
 
           if (!key2) return pathVal;
           if (pathVal == null) return undefined;
-          pathVal = pathVal[key2];
+          pathVal = eso2(pathVal[key2]);
           if (pathVal && pathVal.then) {
             promiseWarning(fullExp);
             if (!("$$v" in pathVal)) {
               promise = pathVal;
               promise.$$v = undefined;
-              promise.then(function(val) { promise.$$v = val; });
+              promise.then(function(val) { promise.$$v = eso2(val); });
             }
-            pathVal = pathVal.$$v;
+            pathVal = eso2(pathVal.$$v);
           }
 
           if (!key3) return pathVal;
           if (pathVal == null) return undefined;
-          pathVal = pathVal[key3];
+          pathVal = eso3(pathVal[key3]);
           if (pathVal && pathVal.then) {
             promiseWarning(fullExp);
             if (!("$$v" in pathVal)) {
               promise = pathVal;
               promise.$$v = undefined;
-              promise.then(function(val) { promise.$$v = val; });
+              promise.then(function(val) { promise.$$v = eso3(val); });
             }
-            pathVal = pathVal.$$v;
+            pathVal = eso3(pathVal.$$v);
           }
 
           if (!key4) return pathVal;
           if (pathVal == null) return undefined;
-          pathVal = pathVal[key4];
+          pathVal = eso4(pathVal[key4]);
           if (pathVal && pathVal.then) {
             promiseWarning(fullExp);
             if (!("$$v" in pathVal)) {
               promise = pathVal;
               promise.$$v = undefined;
-              promise.then(function(val) { promise.$$v = val; });
+              promise.then(function(val) { promise.$$v = eso4(val); });
             }
-            pathVal = pathVal.$$v;
+            pathVal = eso4(pathVal.$$v);
           }
           return pathVal;
         };
 }
 
+function getterFnWithExtraArgs(fn, fullExpression) {
+  return function(s, l) {
+    return fn(s, l, promiseWarning, ensureSafeObject, fullExpression);
+  };
+}
+
 function getterFn(path, options, fullExp) {
+  var expensiveChecks = options.expensiveChecks;
+  var getterFnCache = (expensiveChecks ? getterFnCacheExpensive : getterFnCacheDefault);
   // Check whether the cache has this getter already.
   // We can use hasOwnProperty directly on the cache because we ensure,
   // see below, that the cache never stores a path called 'hasOwnProperty'
@@ -11099,35 +11177,48 @@ function getterFn(path, options, fullExp) {
     }
   } else {
     var code = 'var p;\n';
+    if (expensiveChecks) {
+      code += 's = eso(s, fe);\nl = eso(l, fe);\n';
+    }
+    var needsEnsureSafeObject = expensiveChecks;
     forEach(pathKeys, function(key, index) {
       ensureSafeMemberName(key, fullExp);
-      code += 'if(s == null) return undefined;\n' +
-              's='+ (index
+      var lookupJs = (index
                       // we simply dereference 's' on any .dot notation
                       ? 's'
                       // but if we are first then we check locals first, and if so read it first
-                      : '((k&&k.hasOwnProperty("' + key + '"))?k:s)') + '["' + key + '"]' + ';\n' +
-              (options.unwrapPromises
-                ? 'if (s && s.then) {\n' +
+                      : '((l&&l.hasOwnProperty("' + key + '"))?l:s)') + '["' + key + '"]';
+      var wrapWithEso = expensiveChecks || isPossiblyDangerousMemberName(key);
+      if (wrapWithEso) {
+        lookupJs = 'eso(' + lookupJs + ', fe)';
+        needsEnsureSafeObject = true;
+      }
+      code += 'if(s == null) return undefined;\n' +
+              's=' + lookupJs + ';\n';
+      if (options.unwrapPromises) {
+        code += 'if (s && s.then) {\n' +
                   ' pw("' + fullExp.replace(/(["\r\n])/g, '\\$1') + '");\n' +
                   ' if (!("$$v" in s)) {\n' +
                     ' p=s;\n' +
                     ' p.$$v = undefined;\n' +
-                    ' p.then(function(v) {p.$$v=v;});\n' +
+                    ' p.then(function(v) {p.$$v=' + (wrapWithEso ? 'eso(v)' : 'v') + ';});\n' +
                     '}\n' +
-                  ' s=s.$$v\n' +
-                '}\n'
-                : '');
+                  ' s=' + (wrapWithEso ? 'eso(s.$$v)' : 's.$$v') + '\n' +
+                '}\n';
+
+      }
     });
     code += 'return s;';
 
     /* jshint -W054 */
-    var evaledFnGetter = new Function('s', 'k', 'pw', code); // s=scope, k=locals, pw=promiseWarning
+    // s=scope, l=locals, pw=promiseWarning, eso=ensureSafeObject, fe=fullExpression
+    var evaledFnGetter = new Function('s', 'l', 'pw', 'eso', 'fe', code);
     /* jshint +W054 */
     evaledFnGetter.toString = valueFn(code);
-    fn = options.unwrapPromises ? function(scope, locals) {
-      return evaledFnGetter(scope, locals, promiseWarning);
-    } : evaledFnGetter;
+    if (needsEnsureSafeObject || options.unwrapPromises) {
+      evaledFnGetter = getterFnWithExtraArgs(evaledFnGetter, fullExp);
+    }
+    fn = evaledFnGetter;
   }
 
   // Only cache the value if it's not going to mess up the cache object
@@ -11191,12 +11282,14 @@ function getterFn(path, options, fullExp) {
  *  service.
  */
 function $ParseProvider() {
-  var cache = {};
+  var cacheDefault = {};
+  var cacheExpensive = {};
 
   var $parseOptions = {
     csp: false,
     unwrapPromises: false,
-    logPromiseWarnings: true
+    logPromiseWarnings: true,
+    expensiveChecks: false
   };
 
 
@@ -11283,6 +11376,12 @@ function $ParseProvider() {
 
   this.$get = ['$filter', '$sniffer', '$log', function($filter, $sniffer, $log) {
     $parseOptions.csp = $sniffer.csp;
+    var $parseOptionsExpensive = {
+      csp: $parseOptions.csp,
+      unwrapPromises: $parseOptions.unwrapPromises,
+      logPromiseWarnings: $parseOptions.logPromiseWarnings,
+      expensiveChecks: true
+    };
 
     promiseWarning = function promiseWarningFn(fullExp) {
       if (!$parseOptions.logPromiseWarnings || promiseWarningCache.hasOwnProperty(fullExp)) return;
@@ -11291,18 +11390,20 @@ function $ParseProvider() {
           'Automatic unwrapping of promises in Angular expressions is deprecated.');
     };
 
-    return function(exp) {
+    return function(exp, expensiveChecks) {
       var parsedExpression;
 
       switch (typeof exp) {
         case 'string':
 
+          var cache = (expensiveChecks ? cacheExpensive : cacheDefault);
           if (cache.hasOwnProperty(exp)) {
             return cache[exp];
           }
 
-          var lexer = new Lexer($parseOptions);
-          var parser = new Parser(lexer, $filter, $parseOptions);
+          var parseOptions = expensiveChecks ? $parseOptionsExpensive : $parseOptions;
+          var lexer = new Lexer(parseOptions);
+          var parser = new Parser(lexer, $filter, parseOptions);
           parsedExpression = parser.parse(exp);
 
           if (exp !== 'hasOwnProperty') {
@@ -11329,7 +11430,11 @@ function $ParseProvider() {
  * @requires $rootScope
  *
  * @description
- * A promise/deferred implementation inspired by [Kris Kowal's Q](https://github.com/kriskowal/q).
+ * A service that helps you run functions asynchronously, and use their return values (or exceptions)
+ * when they are done processing.
+ *
+ * This is an implementation of promises/deferred objects inspired by
+ * [Kris Kowal's Q](https://github.com/kriskowal/q).
  *
  * [The CommonJS Promise proposal](http://wiki.commonjs.org/wiki/Promises) describes a promise as an
  * interface for interacting with an object that represents the result of an action that is
@@ -11423,6 +11528,10 @@ function $ParseProvider() {
  *
  * - `catch(errorCallback)` – shorthand for `promise.then(null, errorCallback)`
  *
+ *   Because `catch` is a reserved word in JavaScript and reserved keywords are not supported as
+ *   property names by ES3, you'll need to invoke the method like `promise['catch'](callback)` or
+ *  `promise.then(null, errorCallback)` to make your code IE8 and Android 2.x compatible.
+ *
  * - `finally(callback)` – allows you to observe either the fulfillment or rejection of a promise,
  *   but to do so without modifying the final value. This is useful to release resources or do some
  *   clean-up that needs to be done whether the promise was rejected or resolved. See the [full
@@ -12854,8 +12963,11 @@ function $RootScopeProvider(){
 
         var self = this;
         return function() {
-          namedListeners[indexOf(namedListeners, listener)] = null;
-          decrementListenerCount(self, 1, name);
+          var indexOfListener = indexOf(namedListeners, listener);
+          if (indexOfListener !== -1) {
+            namedListeners[indexOfListener] = null;
+            decrementListenerCount(self, 1, name);
+          }
         };
       },
 
@@ -14796,17 +14908,17 @@ function filterFilter() {
     }
 
     var search = function(obj, text){
-      if (typeof text == 'string' && text.charAt(0) === '!') {
+      if (typeof text === 'string' && text.charAt(0) === '!') {
         return !search(obj, text.substr(1));
       }
       switch (typeof obj) {
-        case "boolean":
-        case "number":
-        case "string":
+        case 'boolean':
+        case 'number':
+        case 'string':
           return comparator(obj, text);
-        case "object":
+        case 'object':
           switch (typeof text) {
-            case "object":
+            case 'object':
               return comparator(obj, text);
             default:
               for ( var objKey in obj) {
@@ -14817,7 +14929,7 @@ function filterFilter() {
               break;
           }
           return false;
-        case "array":
+        case 'array':
           for ( var i = 0; i < obj.length; i++) {
             if (search(obj[i], text)) {
               return true;
@@ -14829,13 +14941,13 @@ function filterFilter() {
       }
     };
     switch (typeof expression) {
-      case "boolean":
-      case "number":
-      case "string":
+      case 'boolean':
+      case 'number':
+      case 'string':
         // Set up expression object and fall through
         expression = {$:expression};
         // jshint -W086
-      case "object":
+      case 'object':
         // jshint +W086
         for (var key in expression) {
           (function(path) {
@@ -15481,7 +15593,7 @@ function limitToFilter(){
  * correctly, make sure they are actually being saved as numbers and not strings.
  *
  * @param {Array} array The array to sort.
- * @param {function(*)|string|Array.<(function(*)|string)>} expression A predicate to be
+ * @param {function(*)|string|Array.<(function(*)|string)>=} expression A predicate to be
  *    used by the comparator to determine the order of elements.
  *
  *    Can be one of:
@@ -15494,10 +15606,13 @@ function limitToFilter(){
  *      is interpreted as a property name to be used in comparisons (for example `"special name"`
  *      to sort object by the value of their `special name` property). An expression can be
  *      optionally prefixed with `+` or `-` to control ascending or descending sort order
- *      (for example, `+name` or `-name`).
+ *      (for example, `+name` or `-name`). If no property is provided, (e.g. `'+'`) then the array
+ *      element itself is used to compare where sorting.
  *    - `Array`: An array of function or string predicates. The first predicate in the array
  *      is used for sorting, but when two items are equivalent, the next predicate is used.
  *
+ *    If the predicate is missing or empty then it defaults to `'+'`.
+ *
  * @param {boolean=} reverse Reverse the order of the array.
  * @returns {Array} Sorted copy of the source array.
  *
@@ -15586,8 +15701,8 @@ orderByFilter.$inject = ['$parse'];
 function orderByFilter($parse){
   return function(array, sortPredicate, reverseOrder) {
     if (!(isArrayLike(array))) return array;
-    if (!sortPredicate) return array;
     sortPredicate = isArray(sortPredicate) ? sortPredicate: [sortPredicate];
+    if (sortPredicate.length === 0) { sortPredicate = ['+']; }
     sortPredicate = map(sortPredicate, function(predicate){
       var descending = false, get = predicate || identity;
       if (isString(predicate)) {
@@ -15595,6 +15710,12 @@ function orderByFilter($parse){
           descending = predicate.charAt(0) == '-';
           predicate = predicate.substring(1);
         }
+        if ( predicate === '' ) {
+          // Effectively no predicate was passed so we compare identity
+          return reverseComparator(function(a,b) {
+            return compare(a, b);
+          }, descending);
+        }
         get = $parse(predicate);
         if (get.constant) {
           var key = get();
@@ -15607,9 +15728,7 @@ function orderByFilter($parse){
         return compare(get(a),get(b));
       }, descending);
     });
-    var arrayCopy = [];
-    for ( var i = 0; i < array.length; i++) { arrayCopy.push(array[i]); }
-    return arrayCopy.sort(reverseComparator(comparator, reverseOrder));
+    return slice.call(array).sort(reverseComparator(comparator, reverseOrder));
 
     function comparator(o1, o2){
       for ( var i = 0; i < sortPredicate.length; i++) {
@@ -15713,9 +15832,8 @@ var htmlAnchorDirective = valueFn({
  * make the link go to the wrong URL if the user clicks it before
  * Angular has a chance to replace the `{{hash}}` markup with its
  * value. Until Angular replaces the markup the link will be broken
- * and will most likely return a 404 error.
- *
- * The `ngHref` directive solves this problem.
+ * and will most likely return a 404 error. The `ngHref` directive
+ * solves this problem.
  *
  * The wrong way to write it:
  * ```html
@@ -17498,7 +17616,7 @@ var VALID_CLASS = 'ng-valid',
  *
  * We are using the {@link ng.service:$sce $sce} service here and include the {@link ngSanitize $sanitize}
  * module to automatically remove "bad" content like inline event listener (e.g. `<span onclick="...">`).
- * However, as we are using `$sce` the model can still decide to to provide unsafe content if it marks
+ * However, as we are using `$sce` the model can still decide to provide unsafe content if it marks
  * that content using the `$sce` service.
  *
  * <example name="NgModelController" module="customControl" deps="angular-sanitize.js">
@@ -17530,7 +17648,7 @@ var VALID_CLASS = 'ng-valid',
 
               // Listen for change events to enable binding
               element.on('blur keyup change', function() {
-                scope.$apply(read);
+                scope.$evalAsync(read);
               });
               read(); // initialize
 
@@ -17813,7 +17931,7 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
  *
  * For best practices on using `ngModel`, see:
  *
- *  - [https://github.com/angular/angular.js/wiki/Understanding-Scopes]
+ *  - [Understanding Scopes](https://github.com/angular/angular.js/wiki/Understanding-Scopes)
  *
  * For basic examples, how to use `ngModel`, see:
  *
@@ -18313,7 +18431,10 @@ var ngBindTemplateDirective = ['$interpolate', function($interpolate) {
  * element in a secure way.  By default, the innerHTML-ed content will be sanitized using the {@link
  * ngSanitize.$sanitize $sanitize} service.  To utilize this functionality, ensure that `$sanitize`
  * is available, for example, by including {@link ngSanitize} in your module's dependencies (not in
- * core Angular.)  You may also bypass sanitization for values you know are safe. To do so, bind to
+ * core Angular). In order to use {@link ngSanitize} in your module's dependencies, you need to
+ * include "angular-sanitize.js" in your application.
+ *
+ * You may also bypass sanitization for values you know are safe. To do so, bind to
  * an explicitly trusted value via {@link ng.$sce#trustAsHtml $sce.trustAsHtml}.  See the example
  * under {@link ng.$sce#Example Strict Contextual Escaping (SCE)}.
  *
@@ -19108,10 +19229,8 @@ var ngControllerDirective = [function() {
    </example>
  */
 /*
- * A directive that allows creation of custom onclick handlers that are defined as angular
- * expressions and are compiled and executed within the current scope.
- *
- * Events that are handled via these handler are always configured not to propagate further.
+ * A collection of directives that allows creation of custom event handlers that are defined as
+ * angular expressions and are compiled and executed within the current scope.
  */
 var ngEventDirectives = {};
 
@@ -19129,7 +19248,11 @@ forEach(
     ngEventDirectives[directiveName] = ['$parse', '$rootScope', function($parse, $rootScope) {
       return {
         compile: function($element, attr) {
-          var fn = $parse(attr[directiveName]);
+          // We expose the powerful $event object on the scope that provides access to the Window,
+          // etc. that isn't protected by the fast paths in $parse.  We explicitly request better
+          // checks at the cost of speed since event handler expressions are not executed as
+          // frequently as regular change detection.
+          var fn = $parse(attr[directiveName], /* expensiveChecks */ true);
           return function ngEventHandler(scope, element) {
             element.on(eventName, function(event) {
               var callback = function() {
@@ -19575,7 +19698,7 @@ forEach(
  * Note that when an element is removed using `ngIf` its scope is destroyed and a new scope
  * is created when the element is restored.  The scope created within `ngIf` inherits from
  * its parent scope using
- * [prototypal inheritance](https://github.com/angular/angular.js/wiki/The-Nuances-of-Scope-Prototypal-Inheritance).
+ * [prototypal inheritance](https://github.com/angular/angular.js/wiki/Understanding-Scopes#javascript-prototypal-inheritance).
  * An important implication of this is if `ngModel` is used within `ngIf` to bind to
  * a javascript primitive defined in the parent scope. In this case any modifications made to the
  * variable within the child scope will override (hide) the value in the parent scope.
@@ -19589,8 +19712,8 @@ forEach(
  * and `leave` effects.
  *
  * @animations
- * enter - happens just after the ngIf contents change and a new DOM element is created and injected into the ngIf container
- * leave - happens just before the ngIf contents are removed from the DOM
+ * enter - happens just after the `ngIf` contents change and a new DOM element is created and injected into the `ngIf` container
+ * leave - happens just before the `ngIf` contents are removed from the DOM
  *
  * @element ANY
  * @scope
@@ -21330,7 +21453,6 @@ var scriptDirective = ['$templateCache', function($templateCache) {
     compile: function(element, attr) {
       if (attr.type == 'text/ng-template') {
         var templateUrl = attr.id,
-            // IE is not consistent, in scripts we have to read .text but in other nodes we have to read .textContent
             text = element[0].text;
 
         $templateCache.put(templateUrl, text);
@@ -21890,6 +22012,7 @@ var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
                 lastElement = existingOption.element;
                 if (existingOption.label !== option.label) {
                   lastElement.text(existingOption.label = option.label);
+                  lastElement.prop('label', existingOption.label);
                 }
                 if (existingOption.id !== option.id) {
                   lastElement.val(existingOption.id = option.id);
@@ -21919,6 +22042,7 @@ var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
                       .val(option.id)
                       .prop('selected', option.selected)
                       .attr('selected', option.selected)
+                      .prop('label', option.label)
                       .text(option.label);
                 }
 
diff --git a/libs/bower_components/angular/angular.min.js b/libs/bower_components/angular/angular.min.js
index b9f64f462c..e4f66c18bc 100644
--- a/libs/bower_components/angular/angular.min.js
+++ b/libs/bower_components/angular/angular.min.js
@@ -1,216 +1,217 @@
 /*
- AngularJS v1.2.26
+ AngularJS v1.2.28
  (c) 2010-2014 Google, Inc. http://angularjs.org
  License: MIT
 */
-(function(W,X,t){'use strict';function C(b){return function(){var a=arguments[0],c,a="["+(b?b+":":"")+a+"] http://errors.angularjs.org/1.2.26/"+(b?b+"/":"")+a;for(c=1;c<arguments.length;c++)a=a+(1==c?"?":"&")+"p"+(c-1)+"="+encodeURIComponent("function"==typeof arguments[c]?arguments[c].toString().replace(/ \{[\s\S]*$/,""):"undefined"==typeof arguments[c]?"undefined":"string"!=typeof arguments[c]?JSON.stringify(arguments[c]):arguments[c]);return Error(a)}}function Pa(b){if(null==b||Ga(b))return!1;
-var a=b.length;return 1===b.nodeType&&a?!0:v(b)||J(b)||0===a||"number"===typeof a&&0<a&&a-1 in b}function r(b,a,c){var d;if(b)if(P(b))for(d in b)"prototype"==d||("length"==d||"name"==d||b.hasOwnProperty&&!b.hasOwnProperty(d))||a.call(c,b[d],d);else if(J(b)||Pa(b))for(d=0;d<b.length;d++)a.call(c,b[d],d);else if(b.forEach&&b.forEach!==r)b.forEach(a,c);else for(d in b)b.hasOwnProperty(d)&&a.call(c,b[d],d);return b}function Zb(b){var a=[],c;for(c in b)b.hasOwnProperty(c)&&a.push(c);return a.sort()}function Tc(b,
-a,c){for(var d=Zb(b),e=0;e<d.length;e++)a.call(c,b[d[e]],d[e]);return d}function $b(b){return function(a,c){b(c,a)}}function hb(){for(var b=ma.length,a;b;){b--;a=ma[b].charCodeAt(0);if(57==a)return ma[b]="A",ma.join("");if(90==a)ma[b]="0";else return ma[b]=String.fromCharCode(a+1),ma.join("")}ma.unshift("0");return ma.join("")}function ac(b,a){a?b.$$hashKey=a:delete b.$$hashKey}function D(b){var a=b.$$hashKey;r(arguments,function(a){a!==b&&r(a,function(a,c){b[c]=a})});ac(b,a);return b}function U(b){return parseInt(b,
-10)}function bc(b,a){return D(new (D(function(){},{prototype:b})),a)}function E(){}function Qa(b){return b}function ba(b){return function(){return b}}function x(b){return"undefined"===typeof b}function y(b){return"undefined"!==typeof b}function T(b){return null!=b&&"object"===typeof b}function v(b){return"string"===typeof b}function ib(b){return"number"===typeof b}function ta(b){return"[object Date]"===za.call(b)}function P(b){return"function"===typeof b}function jb(b){return"[object RegExp]"===za.call(b)}
-function Ga(b){return b&&b.document&&b.location&&b.alert&&b.setInterval}function Uc(b){return!(!b||!(b.nodeName||b.prop&&b.attr&&b.find))}function Vc(b,a,c){var d=[];r(b,function(b,f,g){d.push(a.call(c,b,f,g))});return d}function Ra(b,a){if(b.indexOf)return b.indexOf(a);for(var c=0;c<b.length;c++)if(a===b[c])return c;return-1}function Sa(b,a){var c=Ra(b,a);0<=c&&b.splice(c,1);return a}function Ha(b,a,c,d){if(Ga(b)||b&&b.$evalAsync&&b.$watch)throw Ta("cpws");if(a){if(b===a)throw Ta("cpi");c=c||[];
-d=d||[];if(T(b)){var e=Ra(c,b);if(-1!==e)return d[e];c.push(b);d.push(a)}if(J(b))for(var f=a.length=0;f<b.length;f++)e=Ha(b[f],null,c,d),T(b[f])&&(c.push(b[f]),d.push(e)),a.push(e);else{var g=a.$$hashKey;J(a)?a.length=0:r(a,function(b,c){delete a[c]});for(f in b)e=Ha(b[f],null,c,d),T(b[f])&&(c.push(b[f]),d.push(e)),a[f]=e;ac(a,g)}}else if(a=b)J(b)?a=Ha(b,[],c,d):ta(b)?a=new Date(b.getTime()):jb(b)?(a=RegExp(b.source,b.toString().match(/[^\/]*$/)[0]),a.lastIndex=b.lastIndex):T(b)&&(a=Ha(b,{},c,d));
-return a}function ha(b,a){if(J(b)){a=a||[];for(var c=0;c<b.length;c++)a[c]=b[c]}else if(T(b))for(c in a=a||{},b)!kb.call(b,c)||"$"===c.charAt(0)&&"$"===c.charAt(1)||(a[c]=b[c]);return a||b}function Aa(b,a){if(b===a)return!0;if(null===b||null===a)return!1;if(b!==b&&a!==a)return!0;var c=typeof b,d;if(c==typeof a&&"object"==c)if(J(b)){if(!J(a))return!1;if((c=b.length)==a.length){for(d=0;d<c;d++)if(!Aa(b[d],a[d]))return!1;return!0}}else{if(ta(b))return ta(a)?isNaN(b.getTime())&&isNaN(a.getTime())||b.getTime()===
-a.getTime():!1;if(jb(b)&&jb(a))return b.toString()==a.toString();if(b&&b.$evalAsync&&b.$watch||a&&a.$evalAsync&&a.$watch||Ga(b)||Ga(a)||J(a))return!1;c={};for(d in b)if("$"!==d.charAt(0)&&!P(b[d])){if(!Aa(b[d],a[d]))return!1;c[d]=!0}for(d in a)if(!c.hasOwnProperty(d)&&"$"!==d.charAt(0)&&a[d]!==t&&!P(a[d]))return!1;return!0}return!1}function Bb(b,a){var c=2<arguments.length?Ba.call(arguments,2):[];return!P(a)||a instanceof RegExp?a:c.length?function(){return arguments.length?a.apply(b,c.concat(Ba.call(arguments,
-0))):a.apply(b,c)}:function(){return arguments.length?a.apply(b,arguments):a.call(b)}}function Wc(b,a){var c=a;"string"===typeof b&&"$"===b.charAt(0)?c=t:Ga(a)?c="$WINDOW":a&&X===a?c="$DOCUMENT":a&&(a.$evalAsync&&a.$watch)&&(c="$SCOPE");return c}function na(b,a){return"undefined"===typeof b?t:JSON.stringify(b,Wc,a?"  ":null)}function cc(b){return v(b)?JSON.parse(b):b}function Ua(b){"function"===typeof b?b=!0:b&&0!==b.length?(b=K(""+b),b=!("f"==b||"0"==b||"false"==b||"no"==b||"n"==b||"[]"==b)):b=!1;
-return b}function ia(b){b=w(b).clone();try{b.empty()}catch(a){}var c=w("<div>").append(b).html();try{return 3===b[0].nodeType?K(c):c.match(/^(<[^>]+>)/)[1].replace(/^<([\w\-]+)/,function(a,b){return"<"+K(b)})}catch(d){return K(c)}}function dc(b){try{return decodeURIComponent(b)}catch(a){}}function ec(b){var a={},c,d;r((b||"").split("&"),function(b){b&&(c=b.replace(/\+/g,"%20").split("="),d=dc(c[0]),y(d)&&(b=y(c[1])?dc(c[1]):!0,kb.call(a,d)?J(a[d])?a[d].push(b):a[d]=[a[d],b]:a[d]=b))});return a}function Cb(b){var a=
-[];r(b,function(b,d){J(b)?r(b,function(b){a.push(Ca(d,!0)+(!0===b?"":"="+Ca(b,!0)))}):a.push(Ca(d,!0)+(!0===b?"":"="+Ca(b,!0)))});return a.length?a.join("&"):""}function lb(b){return Ca(b,!0).replace(/%26/gi,"&").replace(/%3D/gi,"=").replace(/%2B/gi,"+")}function Ca(b,a){return encodeURIComponent(b).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%20/g,a?"%20":"+")}function Xc(b,a){function c(a){a&&d.push(a)}var d=[b],e,f,g=["ng:app","ng-app","x-ng-app",
-"data-ng-app"],k=/\sng[:\-]app(:\s*([\w\d_]+);?)?\s/;r(g,function(a){g[a]=!0;c(X.getElementById(a));a=a.replace(":","\\:");b.querySelectorAll&&(r(b.querySelectorAll("."+a),c),r(b.querySelectorAll("."+a+"\\:"),c),r(b.querySelectorAll("["+a+"]"),c))});r(d,function(a){if(!e){var b=k.exec(" "+a.className+" ");b?(e=a,f=(b[2]||"").replace(/\s+/g,",")):r(a.attributes,function(b){!e&&g[b.name]&&(e=a,f=b.value)})}});e&&a(e,f?[f]:[])}function fc(b,a){var c=function(){b=w(b);if(b.injector()){var c=b[0]===X?
-"document":ia(b);throw Ta("btstrpd",c.replace(/</,"&lt;").replace(/>/,"&gt;"));}a=a||[];a.unshift(["$provide",function(a){a.value("$rootElement",b)}]);a.unshift("ng");c=gc(a);c.invoke(["$rootScope","$rootElement","$compile","$injector","$animate",function(a,b,c,d,e){a.$apply(function(){b.data("$injector",d);c(b)(a)})}]);return c},d=/^NG_DEFER_BOOTSTRAP!/;if(W&&!d.test(W.name))return c();W.name=W.name.replace(d,"");Va.resumeBootstrap=function(b){r(b,function(b){a.push(b)});c()}}function mb(b,a){a=
-a||"_";return b.replace(Yc,function(b,d){return(d?a:"")+b.toLowerCase()})}function Db(b,a,c){if(!b)throw Ta("areq",a||"?",c||"required");return b}function Wa(b,a,c){c&&J(b)&&(b=b[b.length-1]);Db(P(b),a,"not a function, got "+(b&&"object"===typeof b?b.constructor.name||"Object":typeof b));return b}function Da(b,a){if("hasOwnProperty"===b)throw Ta("badname",a);}function hc(b,a,c){if(!a)return b;a=a.split(".");for(var d,e=b,f=a.length,g=0;g<f;g++)d=a[g],b&&(b=(e=b)[d]);return!c&&P(b)?Bb(e,b):b}function Eb(b){var a=
-b[0];b=b[b.length-1];if(a===b)return w(a);var c=[a];do{a=a.nextSibling;if(!a)break;c.push(a)}while(a!==b);return w(c)}function Zc(b){var a=C("$injector"),c=C("ng");b=b.angular||(b.angular={});b.$$minErr=b.$$minErr||C;return b.module||(b.module=function(){var b={};return function(e,f,g){if("hasOwnProperty"===e)throw c("badname","module");f&&b.hasOwnProperty(e)&&(b[e]=null);return b[e]||(b[e]=function(){function b(a,d,e){return function(){c[e||"push"]([a,d,arguments]);return n}}if(!f)throw a("nomod",
+(function(W,X,u){'use strict';function z(b){return function(){var a=arguments[0],c,a="["+(b?b+":":"")+a+"] http://errors.angularjs.org/1.2.28/"+(b?b+"/":"")+a;for(c=1;c<arguments.length;c++)a=a+(1==c?"?":"&")+"p"+(c-1)+"="+encodeURIComponent("function"==typeof arguments[c]?arguments[c].toString().replace(/ \{[\s\S]*$/,""):"undefined"==typeof arguments[c]?"undefined":"string"!=typeof arguments[c]?JSON.stringify(arguments[c]):arguments[c]);return Error(a)}}function Sa(b){if(null==b||Ja(b))return!1;
+var a=b.length;return 1===b.nodeType&&a?!0:G(b)||L(b)||0===a||"number"===typeof a&&0<a&&a-1 in b}function r(b,a,c){var d;if(b)if(N(b))for(d in b)"prototype"==d||("length"==d||"name"==d||b.hasOwnProperty&&!b.hasOwnProperty(d))||a.call(c,b[d],d);else if(L(b)||Sa(b))for(d=0;d<b.length;d++)a.call(c,b[d],d);else if(b.forEach&&b.forEach!==r)b.forEach(a,c);else for(d in b)b.hasOwnProperty(d)&&a.call(c,b[d],d);return b}function Xb(b){var a=[],c;for(c in b)b.hasOwnProperty(c)&&a.push(c);return a.sort()}function Sc(b,
+a,c){for(var d=Xb(b),e=0;e<d.length;e++)a.call(c,b[d[e]],d[e]);return d}function Yb(b){return function(a,c){b(c,a)}}function ib(){for(var b=na.length,a;b;){b--;a=na[b].charCodeAt(0);if(57==a)return na[b]="A",na.join("");if(90==a)na[b]="0";else return na[b]=String.fromCharCode(a+1),na.join("")}na.unshift("0");return na.join("")}function Zb(b,a){a?b.$$hashKey=a:delete b.$$hashKey}function E(b){var a=b.$$hashKey;r(arguments,function(a){a!==b&&r(a,function(a,c){b[c]=a})});Zb(b,a);return b}function U(b){return parseInt(b,
+10)}function $b(b,a){return E(new (E(function(){},{prototype:b})),a)}function v(){}function ga(b){return b}function aa(b){return function(){return b}}function F(b){return"undefined"===typeof b}function D(b){return"undefined"!==typeof b}function T(b){return null!=b&&"object"===typeof b}function G(b){return"string"===typeof b}function jb(b){return"number"===typeof b}function va(b){return"[object Date]"===Ba.call(b)}function N(b){return"function"===typeof b}function kb(b){return"[object RegExp]"===Ba.call(b)}
+function Ja(b){return b&&b.document&&b.location&&b.alert&&b.setInterval}function Tc(b){return!(!b||!(b.nodeName||b.prop&&b.attr&&b.find))}function Uc(b,a,c){var d=[];r(b,function(b,f,g){d.push(a.call(c,b,f,g))});return d}function Ta(b,a){if(b.indexOf)return b.indexOf(a);for(var c=0;c<b.length;c++)if(a===b[c])return c;return-1}function Ua(b,a){var c=Ta(b,a);0<=c&&b.splice(c,1);return a}function Ka(b,a,c,d){if(Ja(b)||b&&b.$evalAsync&&b.$watch)throw Va("cpws");if(a){if(b===a)throw Va("cpi");c=c||[];
+d=d||[];if(T(b)){var e=Ta(c,b);if(-1!==e)return d[e];c.push(b);d.push(a)}if(L(b))for(var f=a.length=0;f<b.length;f++)e=Ka(b[f],null,c,d),T(b[f])&&(c.push(b[f]),d.push(e)),a.push(e);else{var g=a.$$hashKey;L(a)?a.length=0:r(a,function(b,c){delete a[c]});for(f in b)e=Ka(b[f],null,c,d),T(b[f])&&(c.push(b[f]),d.push(e)),a[f]=e;Zb(a,g)}}else if(a=b)L(b)?a=Ka(b,[],c,d):va(b)?a=new Date(b.getTime()):kb(b)?(a=RegExp(b.source,b.toString().match(/[^\/]*$/)[0]),a.lastIndex=b.lastIndex):T(b)&&(a=Ka(b,{},c,d));
+return a}function ha(b,a){if(L(b)){a=a||[];for(var c=0;c<b.length;c++)a[c]=b[c]}else if(T(b))for(c in a=a||{},b)!lb.call(b,c)||"$"===c.charAt(0)&&"$"===c.charAt(1)||(a[c]=b[c]);return a||b}function Ca(b,a){if(b===a)return!0;if(null===b||null===a)return!1;if(b!==b&&a!==a)return!0;var c=typeof b,d;if(c==typeof a&&"object"==c)if(L(b)){if(!L(a))return!1;if((c=b.length)==a.length){for(d=0;d<c;d++)if(!Ca(b[d],a[d]))return!1;return!0}}else{if(va(b))return va(a)?isNaN(b.getTime())&&isNaN(a.getTime())||b.getTime()===
+a.getTime():!1;if(kb(b)&&kb(a))return b.toString()==a.toString();if(b&&b.$evalAsync&&b.$watch||a&&a.$evalAsync&&a.$watch||Ja(b)||Ja(a)||L(a))return!1;c={};for(d in b)if("$"!==d.charAt(0)&&!N(b[d])){if(!Ca(b[d],a[d]))return!1;c[d]=!0}for(d in a)if(!c.hasOwnProperty(d)&&"$"!==d.charAt(0)&&a[d]!==u&&!N(a[d]))return!1;return!0}return!1}function Bb(b,a){var c=2<arguments.length?wa.call(arguments,2):[];return!N(a)||a instanceof RegExp?a:c.length?function(){return arguments.length?a.apply(b,c.concat(wa.call(arguments,
+0))):a.apply(b,c)}:function(){return arguments.length?a.apply(b,arguments):a.call(b)}}function Vc(b,a){var c=a;"string"===typeof b&&"$"===b.charAt(0)?c=u:Ja(a)?c="$WINDOW":a&&X===a?c="$DOCUMENT":a&&(a.$evalAsync&&a.$watch)&&(c="$SCOPE");return c}function oa(b,a){return"undefined"===typeof b?u:JSON.stringify(b,Vc,a?"  ":null)}function ac(b){return G(b)?JSON.parse(b):b}function Wa(b){"function"===typeof b?b=!0:b&&0!==b.length?(b=x(""+b),b=!("f"==b||"0"==b||"false"==b||"no"==b||"n"==b||"[]"==b)):b=!1;
+return b}function ia(b){b=A(b).clone();try{b.empty()}catch(a){}var c=A("<div>").append(b).html();try{return 3===b[0].nodeType?x(c):c.match(/^(<[^>]+>)/)[1].replace(/^<([\w\-]+)/,function(a,b){return"<"+x(b)})}catch(d){return x(c)}}function bc(b){try{return decodeURIComponent(b)}catch(a){}}function cc(b){var a={},c,d;r((b||"").split("&"),function(b){b&&(c=b.replace(/\+/g,"%20").split("="),d=bc(c[0]),D(d)&&(b=D(c[1])?bc(c[1]):!0,lb.call(a,d)?L(a[d])?a[d].push(b):a[d]=[a[d],b]:a[d]=b))});return a}function Cb(b){var a=
+[];r(b,function(b,d){L(b)?r(b,function(b){a.push(Da(d,!0)+(!0===b?"":"="+Da(b,!0)))}):a.push(Da(d,!0)+(!0===b?"":"="+Da(b,!0)))});return a.length?a.join("&"):""}function mb(b){return Da(b,!0).replace(/%26/gi,"&").replace(/%3D/gi,"=").replace(/%2B/gi,"+")}function Da(b,a){return encodeURIComponent(b).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%20/g,a?"%20":"+")}function Wc(b,a){function c(a){a&&d.push(a)}var d=[b],e,f,g=["ng:app","ng-app","x-ng-app",
+"data-ng-app"],h=/\sng[:\-]app(:\s*([\w\d_]+);?)?\s/;r(g,function(a){g[a]=!0;c(X.getElementById(a));a=a.replace(":","\\:");b.querySelectorAll&&(r(b.querySelectorAll("."+a),c),r(b.querySelectorAll("."+a+"\\:"),c),r(b.querySelectorAll("["+a+"]"),c))});r(d,function(a){if(!e){var b=h.exec(" "+a.className+" ");b?(e=a,f=(b[2]||"").replace(/\s+/g,",")):r(a.attributes,function(b){!e&&g[b.name]&&(e=a,f=b.value)})}});e&&a(e,f?[f]:[])}function dc(b,a){var c=function(){b=A(b);if(b.injector()){var c=b[0]===X?
+"document":ia(b);throw Va("btstrpd",c.replace(/</,"&lt;").replace(/>/,"&gt;"));}a=a||[];a.unshift(["$provide",function(a){a.value("$rootElement",b)}]);a.unshift("ng");c=ec(a);c.invoke(["$rootScope","$rootElement","$compile","$injector","$animate",function(a,b,c,d,e){a.$apply(function(){b.data("$injector",d);c(b)(a)})}]);return c},d=/^NG_DEFER_BOOTSTRAP!/;if(W&&!d.test(W.name))return c();W.name=W.name.replace(d,"");Xa.resumeBootstrap=function(b){r(b,function(b){a.push(b)});c()}}function nb(b,a){a=
+a||"_";return b.replace(Xc,function(b,d){return(d?a:"")+b.toLowerCase()})}function Db(b,a,c){if(!b)throw Va("areq",a||"?",c||"required");return b}function Ya(b,a,c){c&&L(b)&&(b=b[b.length-1]);Db(N(b),a,"not a function, got "+(b&&"object"===typeof b?b.constructor.name||"Object":typeof b));return b}function Ea(b,a){if("hasOwnProperty"===b)throw Va("badname",a);}function fc(b,a,c){if(!a)return b;a=a.split(".");for(var d,e=b,f=a.length,g=0;g<f;g++)d=a[g],b&&(b=(e=b)[d]);return!c&&N(b)?Bb(e,b):b}function Eb(b){var a=
+b[0];b=b[b.length-1];if(a===b)return A(a);var c=[a];do{a=a.nextSibling;if(!a)break;c.push(a)}while(a!==b);return A(c)}function Yc(b){var a=z("$injector"),c=z("ng");b=b.angular||(b.angular={});b.$$minErr=b.$$minErr||z;return b.module||(b.module=function(){var b={};return function(e,f,g){if("hasOwnProperty"===e)throw c("badname","module");f&&b.hasOwnProperty(e)&&(b[e]=null);return b[e]||(b[e]=function(){function b(a,d,e){return function(){c[e||"push"]([a,d,arguments]);return n}}if(!f)throw a("nomod",
 e);var c=[],d=[],l=b("$injector","invoke"),n={_invokeQueue:c,_runBlocks:d,requires:f,name:e,provider:b("$provide","provider"),factory:b("$provide","factory"),service:b("$provide","service"),value:b("$provide","value"),constant:b("$provide","constant","unshift"),animation:b("$animateProvider","register"),filter:b("$filterProvider","register"),controller:b("$controllerProvider","register"),directive:b("$compileProvider","directive"),config:l,run:function(a){d.push(a);return this}};g&&l(g);return n}())}}())}
-function $c(b){D(b,{bootstrap:fc,copy:Ha,extend:D,equals:Aa,element:w,forEach:r,injector:gc,noop:E,bind:Bb,toJson:na,fromJson:cc,identity:Qa,isUndefined:x,isDefined:y,isString:v,isFunction:P,isObject:T,isNumber:ib,isElement:Uc,isArray:J,version:ad,isDate:ta,lowercase:K,uppercase:Ia,callbacks:{counter:0},$$minErr:C,$$csp:Xa});Ya=Zc(W);try{Ya("ngLocale")}catch(a){Ya("ngLocale",[]).provider("$locale",bd)}Ya("ng",["ngLocale"],["$provide",function(a){a.provider({$$sanitizeUri:cd});a.provider("$compile",
-ic).directive({a:dd,input:jc,textarea:jc,form:ed,script:fd,select:gd,style:hd,option:id,ngBind:jd,ngBindHtml:kd,ngBindTemplate:ld,ngClass:md,ngClassEven:nd,ngClassOdd:od,ngCloak:pd,ngController:qd,ngForm:rd,ngHide:sd,ngIf:td,ngInclude:ud,ngInit:vd,ngNonBindable:wd,ngPluralize:xd,ngRepeat:yd,ngShow:zd,ngStyle:Ad,ngSwitch:Bd,ngSwitchWhen:Cd,ngSwitchDefault:Dd,ngOptions:Ed,ngTransclude:Fd,ngModel:Gd,ngList:Hd,ngChange:Id,required:kc,ngRequired:kc,ngValue:Jd}).directive({ngInclude:Kd}).directive(Fb).directive(lc);
-a.provider({$anchorScroll:Ld,$animate:Md,$browser:Nd,$cacheFactory:Od,$controller:Pd,$document:Qd,$exceptionHandler:Rd,$filter:mc,$interpolate:Sd,$interval:Td,$http:Ud,$httpBackend:Vd,$location:Wd,$log:Xd,$parse:Yd,$rootScope:Zd,$q:$d,$sce:ae,$sceDelegate:be,$sniffer:ce,$templateCache:de,$timeout:ee,$window:fe,$$rAF:ge,$$asyncCallback:he})}])}function Za(b){return b.replace(ie,function(a,b,d,e){return e?d.toUpperCase():d}).replace(je,"Moz$1")}function Gb(b,a,c,d){function e(b){var e=c&&b?[this.filter(b)]:
-[this],m=a,h,l,n,p,q,s;if(!d||null!=b)for(;e.length;)for(h=e.shift(),l=0,n=h.length;l<n;l++)for(p=w(h[l]),m?p.triggerHandler("$destroy"):m=!m,q=0,p=(s=p.children()).length;q<p;q++)e.push(Ea(s[q]));return f.apply(this,arguments)}var f=Ea.fn[b],f=f.$original||f;e.$original=f;Ea.fn[b]=e}function S(b){if(b instanceof S)return b;v(b)&&(b=aa(b));if(!(this instanceof S)){if(v(b)&&"<"!=b.charAt(0))throw Hb("nosel");return new S(b)}if(v(b)){var a=b;b=X;var c;if(c=ke.exec(a))b=[b.createElement(c[1])];else{var d=
-b,e;b=d.createDocumentFragment();c=[];if(Ib.test(a)){d=b.appendChild(d.createElement("div"));e=(le.exec(a)||["",""])[1].toLowerCase();e=ea[e]||ea._default;d.innerHTML="<div>&#160;</div>"+e[1]+a.replace(me,"<$1></$2>")+e[2];d.removeChild(d.firstChild);for(a=e[0];a--;)d=d.lastChild;a=0;for(e=d.childNodes.length;a<e;++a)c.push(d.childNodes[a]);d=b.firstChild;d.textContent=""}else c.push(d.createTextNode(a));b.textContent="";b.innerHTML="";b=c}Jb(this,b);w(X.createDocumentFragment()).append(this)}else Jb(this,
-b)}function Kb(b){return b.cloneNode(!0)}function Ja(b){Lb(b);var a=0;for(b=b.childNodes||[];a<b.length;a++)Ja(b[a])}function nc(b,a,c,d){if(y(d))throw Hb("offargs");var e=oa(b,"events");oa(b,"handle")&&(x(a)?r(e,function(a,c){$a(b,c,a);delete e[c]}):r(a.split(" "),function(a){x(c)?($a(b,a,e[a]),delete e[a]):Sa(e[a]||[],c)}))}function Lb(b,a){var c=b.ng339,d=ab[c];d&&(a?delete ab[c].data[a]:(d.handle&&(d.events.$destroy&&d.handle({},"$destroy"),nc(b)),delete ab[c],b.ng339=t))}function oa(b,a,c){var d=
-b.ng339,d=ab[d||-1];if(y(c))d||(b.ng339=d=++ne,d=ab[d]={}),d[a]=c;else return d&&d[a]}function Mb(b,a,c){var d=oa(b,"data"),e=y(c),f=!e&&y(a),g=f&&!T(a);d||g||oa(b,"data",d={});if(e)d[a]=c;else if(f){if(g)return d&&d[a];D(d,a)}else return d}function Nb(b,a){return b.getAttribute?-1<(" "+(b.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ").indexOf(" "+a+" "):!1}function nb(b,a){a&&b.setAttribute&&r(a.split(" "),function(a){b.setAttribute("class",aa((" "+(b.getAttribute("class")||"")+" ").replace(/[\n\t]/g,
-" ").replace(" "+aa(a)+" "," ")))})}function ob(b,a){if(a&&b.setAttribute){var c=(" "+(b.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ");r(a.split(" "),function(a){a=aa(a);-1===c.indexOf(" "+a+" ")&&(c+=a+" ")});b.setAttribute("class",aa(c))}}function Jb(b,a){if(a){a=a.nodeName||!y(a.length)||Ga(a)?[a]:a;for(var c=0;c<a.length;c++)b.push(a[c])}}function oc(b,a){return pb(b,"$"+(a||"ngController")+"Controller")}function pb(b,a,c){9==b.nodeType&&(b=b.documentElement);for(a=J(a)?a:[a];b;){for(var d=
-0,e=a.length;d<e;d++)if((c=w.data(b,a[d]))!==t)return c;b=b.parentNode||11===b.nodeType&&b.host}}function pc(b){for(var a=0,c=b.childNodes;a<c.length;a++)Ja(c[a]);for(;b.firstChild;)b.removeChild(b.firstChild)}function qc(b,a){var c=qb[a.toLowerCase()];return c&&rc[b.nodeName]&&c}function oe(b,a){var c=function(c,e){c.preventDefault||(c.preventDefault=function(){c.returnValue=!1});c.stopPropagation||(c.stopPropagation=function(){c.cancelBubble=!0});c.target||(c.target=c.srcElement||X);if(x(c.defaultPrevented)){var f=
-c.preventDefault;c.preventDefault=function(){c.defaultPrevented=!0;f.call(c)};c.defaultPrevented=!1}c.isDefaultPrevented=function(){return c.defaultPrevented||!1===c.returnValue};var g=ha(a[e||c.type]||[]);r(g,function(a){a.call(b,c)});8>=Q?(c.preventDefault=null,c.stopPropagation=null,c.isDefaultPrevented=null):(delete c.preventDefault,delete c.stopPropagation,delete c.isDefaultPrevented)};c.elem=b;return c}function Ka(b,a){var c=typeof b,d;"function"==c||"object"==c&&null!==b?"function"==typeof(d=
-b.$$hashKey)?d=b.$$hashKey():d===t&&(d=b.$$hashKey=(a||hb)()):d=b;return c+":"+d}function bb(b,a){if(a){var c=0;this.nextUid=function(){return++c}}r(b,this.put,this)}function sc(b){var a,c;"function"===typeof b?(a=b.$inject)||(a=[],b.length&&(c=b.toString().replace(pe,""),c=c.match(qe),r(c[1].split(re),function(b){b.replace(se,function(b,c,d){a.push(d)})})),b.$inject=a):J(b)?(c=b.length-1,Wa(b[c],"fn"),a=b.slice(0,c)):Wa(b,"fn",!0);return a}function gc(b){function a(a){return function(b,c){if(T(b))r(b,
-$b(a));else return a(b,c)}}function c(a,b){Da(a,"service");if(P(b)||J(b))b=n.instantiate(b);if(!b.$get)throw cb("pget",a);return l[a+k]=b}function d(a,b){return c(a,{$get:b})}function e(a){var b=[],c,d,f,k;r(a,function(a){if(!h.get(a)){h.put(a,!0);try{if(v(a))for(c=Ya(a),b=b.concat(e(c.requires)).concat(c._runBlocks),d=c._invokeQueue,f=0,k=d.length;f<k;f++){var g=d[f],m=n.get(g[0]);m[g[1]].apply(m,g[2])}else P(a)?b.push(n.invoke(a)):J(a)?b.push(n.invoke(a)):Wa(a,"module")}catch(l){throw J(a)&&(a=
-a[a.length-1]),l.message&&(l.stack&&-1==l.stack.indexOf(l.message))&&(l=l.message+"\n"+l.stack),cb("modulerr",a,l.stack||l.message||l);}}});return b}function f(a,b){function c(d){if(a.hasOwnProperty(d)){if(a[d]===g)throw cb("cdep",d+" <- "+m.join(" <- "));return a[d]}try{return m.unshift(d),a[d]=g,a[d]=b(d)}catch(e){throw a[d]===g&&delete a[d],e;}finally{m.shift()}}function d(a,b,e){var f=[],k=sc(a),g,m,h;m=0;for(g=k.length;m<g;m++){h=k[m];if("string"!==typeof h)throw cb("itkn",h);f.push(e&&e.hasOwnProperty(h)?
-e[h]:c(h))}J(a)&&(a=a[g]);return a.apply(b,f)}return{invoke:d,instantiate:function(a,b){var c=function(){},e;c.prototype=(J(a)?a[a.length-1]:a).prototype;c=new c;e=d(a,c,b);return T(e)||P(e)?e:c},get:c,annotate:sc,has:function(b){return l.hasOwnProperty(b+k)||a.hasOwnProperty(b)}}}var g={},k="Provider",m=[],h=new bb([],!0),l={$provide:{provider:a(c),factory:a(d),service:a(function(a,b){return d(a,["$injector",function(a){return a.instantiate(b)}])}),value:a(function(a,b){return d(a,ba(b))}),constant:a(function(a,
-b){Da(a,"constant");l[a]=b;p[a]=b}),decorator:function(a,b){var c=n.get(a+k),d=c.$get;c.$get=function(){var a=q.invoke(d,c);return q.invoke(b,null,{$delegate:a})}}}},n=l.$injector=f(l,function(){throw cb("unpr",m.join(" <- "));}),p={},q=p.$injector=f(p,function(a){a=n.get(a+k);return q.invoke(a.$get,a)});r(e(b),function(a){q.invoke(a||E)});return q}function Ld(){var b=!0;this.disableAutoScrolling=function(){b=!1};this.$get=["$window","$location","$rootScope",function(a,c,d){function e(a){var b=null;
-r(a,function(a){b||"a"!==K(a.nodeName)||(b=a)});return b}function f(){var b=c.hash(),d;b?(d=g.getElementById(b))?d.scrollIntoView():(d=e(g.getElementsByName(b)))?d.scrollIntoView():"top"===b&&a.scrollTo(0,0):a.scrollTo(0,0)}var g=a.document;b&&d.$watch(function(){return c.hash()},function(){d.$evalAsync(f)});return f}]}function he(){this.$get=["$$rAF","$timeout",function(b,a){return b.supported?function(a){return b(a)}:function(b){return a(b,0,!1)}}]}function te(b,a,c,d){function e(a){try{a.apply(null,
-Ba.call(arguments,1))}finally{if(s--,0===s)for(;F.length;)try{F.pop()()}catch(b){c.error(b)}}}function f(a,b){(function fa(){r(u,function(a){a()});A=b(fa,a)})()}function g(){z=null;N!=k.url()&&(N=k.url(),r(ca,function(a){a(k.url())}))}var k=this,m=a[0],h=b.location,l=b.history,n=b.setTimeout,p=b.clearTimeout,q={};k.isMock=!1;var s=0,F=[];k.$$completeOutstandingRequest=e;k.$$incOutstandingRequestCount=function(){s++};k.notifyWhenNoOutstandingRequests=function(a){r(u,function(a){a()});0===s?a():F.push(a)};
-var u=[],A;k.addPollFn=function(a){x(A)&&f(100,n);u.push(a);return a};var N=h.href,R=a.find("base"),z=null;k.url=function(a,c){h!==b.location&&(h=b.location);l!==b.history&&(l=b.history);if(a){if(N!=a)return N=a,d.history?c?l.replaceState(null,"",a):(l.pushState(null,"",a),R.attr("href",R.attr("href"))):(z=a,c?h.replace(a):h.href=a),k}else return z||h.href.replace(/%27/g,"'")};var ca=[],L=!1;k.onUrlChange=function(a){if(!L){if(d.history)w(b).on("popstate",g);if(d.hashchange)w(b).on("hashchange",g);
-else k.addPollFn(g);L=!0}ca.push(a);return a};k.$$checkUrlChange=g;k.baseHref=function(){var a=R.attr("href");return a?a.replace(/^(https?\:)?\/\/[^\/]*/,""):""};var O={},da="",B=k.baseHref();k.cookies=function(a,b){var d,e,f,k;if(a)b===t?m.cookie=escape(a)+"=;path="+B+";expires=Thu, 01 Jan 1970 00:00:00 GMT":v(b)&&(d=(m.cookie=escape(a)+"="+escape(b)+";path="+B).length+1,4096<d&&c.warn("Cookie '"+a+"' possibly not set or overflowed because it was too large ("+d+" > 4096 bytes)!"));else{if(m.cookie!==
-da)for(da=m.cookie,d=da.split("; "),O={},f=0;f<d.length;f++)e=d[f],k=e.indexOf("="),0<k&&(a=unescape(e.substring(0,k)),O[a]===t&&(O[a]=unescape(e.substring(k+1))));return O}};k.defer=function(a,b){var c;s++;c=n(function(){delete q[c];e(a)},b||0);q[c]=!0;return c};k.defer.cancel=function(a){return q[a]?(delete q[a],p(a),e(E),!0):!1}}function Nd(){this.$get=["$window","$log","$sniffer","$document",function(b,a,c,d){return new te(b,d,a,c)}]}function Od(){this.$get=function(){function b(b,d){function e(a){a!=
-n&&(p?p==a&&(p=a.n):p=a,f(a.n,a.p),f(a,n),n=a,n.n=null)}function f(a,b){a!=b&&(a&&(a.p=b),b&&(b.n=a))}if(b in a)throw C("$cacheFactory")("iid",b);var g=0,k=D({},d,{id:b}),m={},h=d&&d.capacity||Number.MAX_VALUE,l={},n=null,p=null;return a[b]={put:function(a,b){if(h<Number.MAX_VALUE){var c=l[a]||(l[a]={key:a});e(c)}if(!x(b))return a in m||g++,m[a]=b,g>h&&this.remove(p.key),b},get:function(a){if(h<Number.MAX_VALUE){var b=l[a];if(!b)return;e(b)}return m[a]},remove:function(a){if(h<Number.MAX_VALUE){var b=
-l[a];if(!b)return;b==n&&(n=b.p);b==p&&(p=b.n);f(b.n,b.p);delete l[a]}delete m[a];g--},removeAll:function(){m={};g=0;l={};n=p=null},destroy:function(){l=k=m=null;delete a[b]},info:function(){return D({},k,{size:g})}}}var a={};b.info=function(){var b={};r(a,function(a,e){b[e]=a.info()});return b};b.get=function(b){return a[b]};return b}}function de(){this.$get=["$cacheFactory",function(b){return b("templates")}]}function ic(b,a){var c={},d="Directive",e=/^\s*directive\:\s*([\d\w_\-]+)\s+(.*)$/,f=/(([\d\w_\-]+)(?:\:([^;]+))?;?)/,
-g=/^(on[a-z]+|formaction)$/;this.directive=function m(a,e){Da(a,"directive");v(a)?(Db(e,"directiveFactory"),c.hasOwnProperty(a)||(c[a]=[],b.factory(a+d,["$injector","$exceptionHandler",function(b,d){var e=[];r(c[a],function(c,f){try{var g=b.invoke(c);P(g)?g={compile:ba(g)}:!g.compile&&g.link&&(g.compile=ba(g.link));g.priority=g.priority||0;g.index=f;g.name=g.name||a;g.require=g.require||g.controller&&g.name;g.restrict=g.restrict||"A";e.push(g)}catch(m){d(m)}});return e}])),c[a].push(e)):r(a,$b(m));
-return this};this.aHrefSanitizationWhitelist=function(b){return y(b)?(a.aHrefSanitizationWhitelist(b),this):a.aHrefSanitizationWhitelist()};this.imgSrcSanitizationWhitelist=function(b){return y(b)?(a.imgSrcSanitizationWhitelist(b),this):a.imgSrcSanitizationWhitelist()};this.$get=["$injector","$interpolate","$exceptionHandler","$http","$templateCache","$parse","$controller","$rootScope","$document","$sce","$animate","$$sanitizeUri",function(a,b,l,n,p,q,s,F,u,A,N,R){function z(a,b,c,d,e){a instanceof
-w||(a=w(a));r(a,function(b,c){3==b.nodeType&&b.nodeValue.match(/\S+/)&&(a[c]=w(b).wrap("<span></span>").parent()[0])});var f=L(a,b,a,c,d,e);ca(a,"ng-scope");return function(b,c,d,e){Db(b,"scope");var g=c?La.clone.call(a):a;r(d,function(a,b){g.data("$"+b+"Controller",a)});d=0;for(var m=g.length;d<m;d++){var h=g[d].nodeType;1!==h&&9!==h||g.eq(d).data("$scope",b)}c&&c(g,b);f&&f(b,g,g,e);return g}}function ca(a,b){try{a.addClass(b)}catch(c){}}function L(a,b,c,d,e,f){function g(a,c,d,e){var f,h,l,q,n,
-p,s;f=c.length;var M=Array(f);for(q=0;q<f;q++)M[q]=c[q];p=q=0;for(n=m.length;q<n;p++)h=M[p],c=m[q++],f=m[q++],c?(c.scope?(l=a.$new(),w.data(h,"$scope",l)):l=a,s=c.transcludeOnThisElement?O(a,c.transclude,e):!c.templateOnThisElement&&e?e:!e&&b?O(a,b):null,c(f,l,h,d,s)):f&&f(a,h.childNodes,t,e)}for(var m=[],h,l,q,n,p=0;p<a.length;p++)h=new Ob,l=da(a[p],[],h,0===p?d:t,e),(f=l.length?H(l,a[p],h,b,c,null,[],[],f):null)&&f.scope&&ca(h.$$element,"ng-scope"),h=f&&f.terminal||!(q=a[p].childNodes)||!q.length?
-null:L(q,f?(f.transcludeOnThisElement||!f.templateOnThisElement)&&f.transclude:b),m.push(f,h),n=n||f||h,f=null;return n?g:null}function O(a,b,c){return function(d,e,f){var g=!1;d||(d=a.$new(),g=d.$$transcluded=!0);e=b(d,e,f,c);if(g)e.on("$destroy",function(){d.$destroy()});return e}}function da(a,b,c,d,g){var m=c.$attr,h;switch(a.nodeType){case 1:fa(b,pa(Ma(a).toLowerCase()),"E",d,g);for(var l,q,n,p=a.attributes,s=0,F=p&&p.length;s<F;s++){var A=!1,N=!1;l=p[s];if(!Q||8<=Q||l.specified){h=l.name;q=
-aa(l.value);l=pa(h);if(n=U.test(l))h=mb(l.substr(6),"-");var u=l.replace(/(Start|End)$/,"");l===u+"Start"&&(A=h,N=h.substr(0,h.length-5)+"end",h=h.substr(0,h.length-6));l=pa(h.toLowerCase());m[l]=h;if(n||!c.hasOwnProperty(l))c[l]=q,qc(a,l)&&(c[l]=!0);S(a,b,q,l);fa(b,l,"A",d,g,A,N)}}a=a.className;if(v(a)&&""!==a)for(;h=f.exec(a);)l=pa(h[2]),fa(b,l,"C",d,g)&&(c[l]=aa(h[3])),a=a.substr(h.index+h[0].length);break;case 3:K(b,a.nodeValue);break;case 8:try{if(h=e.exec(a.nodeValue))l=pa(h[1]),fa(b,l,"M",
-d,g)&&(c[l]=aa(h[2]))}catch(z){}}b.sort(x);return b}function B(a,b,c){var d=[],e=0;if(b&&a.hasAttribute&&a.hasAttribute(b)){do{if(!a)throw ja("uterdir",b,c);1==a.nodeType&&(a.hasAttribute(b)&&e++,a.hasAttribute(c)&&e--);d.push(a);a=a.nextSibling}while(0<e)}else d.push(a);return w(d)}function I(a,b,c){return function(d,e,f,g,h){e=B(e[0],b,c);return a(d,e,f,g,h)}}function H(a,c,d,e,f,g,m,n,p){function F(a,b,c,d){if(a){c&&(a=I(a,c,d));a.require=G.require;a.directiveName=C;if(L===G||G.$$isolateScope)a=
-tc(a,{isolateScope:!0});m.push(a)}if(b){c&&(b=I(b,c,d));b.require=G.require;b.directiveName=C;if(L===G||G.$$isolateScope)b=tc(b,{isolateScope:!0});n.push(b)}}function A(a,b,c,d){var e,f="data",g=!1;if(v(b)){for(;"^"==(e=b.charAt(0))||"?"==e;)b=b.substr(1),"^"==e&&(f="inheritedData"),g=g||"?"==e;e=null;d&&"data"===f&&(e=d[b]);e=e||c[f]("$"+b+"Controller");if(!e&&!g)throw ja("ctreq",b,a);}else J(b)&&(e=[],r(b,function(b){e.push(A(a,b,c,d))}));return e}function N(a,e,f,g,p){function F(a,b){var c;2>arguments.length&&
-(b=a,a=t);K&&(c=da);return p(a,b,c)}var u,M,z,O,I,B,da={},rb;u=c===f?d:ha(d,new Ob(w(f),d.$attr));M=u.$$element;if(L){var Na=/^\s*([@=&])(\??)\s*(\w*)\s*$/;B=e.$new(!0);!H||H!==L&&H!==L.$$originalDirective?M.data("$isolateScopeNoTemplate",B):M.data("$isolateScope",B);ca(M,"ng-isolate-scope");r(L.scope,function(a,c){var d=a.match(Na)||[],f=d[3]||c,g="?"==d[2],d=d[1],m,l,n,p;B.$$isolateBindings[c]=d+f;switch(d){case "@":u.$observe(f,function(a){B[c]=a});u.$$observers[f].$$scope=e;u[f]&&(B[c]=b(u[f])(e));
-break;case "=":if(g&&!u[f])break;l=q(u[f]);p=l.literal?Aa:function(a,b){return a===b||a!==a&&b!==b};n=l.assign||function(){m=B[c]=l(e);throw ja("nonassign",u[f],L.name);};m=B[c]=l(e);B.$watch(function(){var a=l(e);p(a,B[c])||(p(a,m)?n(e,a=B[c]):B[c]=a);return m=a},null,l.literal);break;case "&":l=q(u[f]);B[c]=function(a){return l(e,a)};break;default:throw ja("iscp",L.name,c,a);}})}rb=p&&F;R&&r(R,function(a){var b={$scope:a===L||a.$$isolateScope?B:e,$element:M,$attrs:u,$transclude:rb},c;I=a.controller;
-"@"==I&&(I=u[a.name]);c=s(I,b);da[a.name]=c;K||M.data("$"+a.name+"Controller",c);a.controllerAs&&(b.$scope[a.controllerAs]=c)});g=0;for(z=m.length;g<z;g++)try{O=m[g],O(O.isolateScope?B:e,M,u,O.require&&A(O.directiveName,O.require,M,da),rb)}catch(G){l(G,ia(M))}g=e;L&&(L.template||null===L.templateUrl)&&(g=B);a&&a(g,f.childNodes,t,p);for(g=n.length-1;0<=g;g--)try{O=n[g],O(O.isolateScope?B:e,M,u,O.require&&A(O.directiveName,O.require,M,da),rb)}catch(y){l(y,ia(M))}}p=p||{};for(var u=-Number.MAX_VALUE,
-O,R=p.controllerDirectives,L=p.newIsolateScopeDirective,H=p.templateDirective,fa=p.nonTlbTranscludeDirective,x=!1,D=!1,K=p.hasElementTranscludeDirective,Z=d.$$element=w(c),G,C,V,S=e,Q,Fa=0,qa=a.length;Fa<qa;Fa++){G=a[Fa];var U=G.$$start,Y=G.$$end;U&&(Z=B(c,U,Y));V=t;if(u>G.priority)break;if(V=G.scope)O=O||G,G.templateUrl||(db("new/isolated scope",L,G,Z),T(V)&&(L=G));C=G.name;!G.templateUrl&&G.controller&&(V=G.controller,R=R||{},db("'"+C+"' controller",R[C],G,Z),R[C]=G);if(V=G.transclude)x=!0,G.$$tlb||
-(db("transclusion",fa,G,Z),fa=G),"element"==V?(K=!0,u=G.priority,V=Z,Z=d.$$element=w(X.createComment(" "+C+": "+d[C]+" ")),c=Z[0],Na(f,Ba.call(V,0),c),S=z(V,e,u,g&&g.name,{nonTlbTranscludeDirective:fa})):(V=w(Kb(c)).contents(),Z.empty(),S=z(V,e));if(G.template)if(D=!0,db("template",H,G,Z),H=G,V=P(G.template)?G.template(Z,d):G.template,V=W(V),G.replace){g=G;V=Ib.test(V)?w(aa(V)):[];c=V[0];if(1!=V.length||1!==c.nodeType)throw ja("tplrt",C,"");Na(f,Z,c);qa={$attr:{}};V=da(c,[],qa);var $=a.splice(Fa+
-1,a.length-(Fa+1));L&&y(V);a=a.concat(V).concat($);E(d,qa);qa=a.length}else Z.html(V);if(G.templateUrl)D=!0,db("template",H,G,Z),H=G,G.replace&&(g=G),N=ue(a.splice(Fa,a.length-Fa),Z,d,f,x&&S,m,n,{controllerDirectives:R,newIsolateScopeDirective:L,templateDirective:H,nonTlbTranscludeDirective:fa}),qa=a.length;else if(G.compile)try{Q=G.compile(Z,d,S),P(Q)?F(null,Q,U,Y):Q&&F(Q.pre,Q.post,U,Y)}catch(ve){l(ve,ia(Z))}G.terminal&&(N.terminal=!0,u=Math.max(u,G.priority))}N.scope=O&&!0===O.scope;N.transcludeOnThisElement=
-x;N.templateOnThisElement=D;N.transclude=S;p.hasElementTranscludeDirective=K;return N}function y(a){for(var b=0,c=a.length;b<c;b++)a[b]=bc(a[b],{$$isolateScope:!0})}function fa(b,e,f,g,h,q,n){if(e===h)return null;h=null;if(c.hasOwnProperty(e)){var p;e=a.get(e+d);for(var s=0,u=e.length;s<u;s++)try{p=e[s],(g===t||g>p.priority)&&-1!=p.restrict.indexOf(f)&&(q&&(p=bc(p,{$$start:q,$$end:n})),b.push(p),h=p)}catch(F){l(F)}}return h}function E(a,b){var c=b.$attr,d=a.$attr,e=a.$$element;r(a,function(d,e){"$"!=
-e.charAt(0)&&(b[e]&&b[e]!==d&&(d+=("style"===e?";":" ")+b[e]),a.$set(e,d,!0,c[e]))});r(b,function(b,f){"class"==f?(ca(e,b),a["class"]=(a["class"]?a["class"]+" ":"")+b):"style"==f?(e.attr("style",e.attr("style")+";"+b),a.style=(a.style?a.style+";":"")+b):"$"==f.charAt(0)||a.hasOwnProperty(f)||(a[f]=b,d[f]=c[f])})}function ue(a,b,c,d,e,f,g,h){var m=[],l,q,s=b[0],u=a.shift(),F=D({},u,{templateUrl:null,transclude:null,replace:null,$$originalDirective:u}),N=P(u.templateUrl)?u.templateUrl(b,c):u.templateUrl;
-b.empty();n.get(A.getTrustedResourceUrl(N),{cache:p}).success(function(n){var p,A;n=W(n);if(u.replace){n=Ib.test(n)?w(aa(n)):[];p=n[0];if(1!=n.length||1!==p.nodeType)throw ja("tplrt",u.name,N);n={$attr:{}};Na(d,b,p);var z=da(p,[],n);T(u.scope)&&y(z);a=z.concat(a);E(c,n)}else p=s,b.html(n);a.unshift(F);l=H(a,p,c,e,b,u,f,g,h);r(d,function(a,c){a==p&&(d[c]=b[0])});for(q=L(b[0].childNodes,e);m.length;){n=m.shift();A=m.shift();var R=m.shift(),I=m.shift(),z=b[0];if(A!==s){var B=A.className;h.hasElementTranscludeDirective&&
-u.replace||(z=Kb(p));Na(R,w(A),z);ca(w(z),B)}A=l.transcludeOnThisElement?O(n,l.transclude,I):I;l(q,n,z,d,A)}m=null}).error(function(a,b,c,d){throw ja("tpload",d.url);});return function(a,b,c,d,e){a=e;m?(m.push(b),m.push(c),m.push(d),m.push(a)):(l.transcludeOnThisElement&&(a=O(b,l.transclude,e)),l(q,b,c,d,a))}}function x(a,b){var c=b.priority-a.priority;return 0!==c?c:a.name!==b.name?a.name<b.name?-1:1:a.index-b.index}function db(a,b,c,d){if(b)throw ja("multidir",b.name,c.name,a,ia(d));}function K(a,
-c){var d=b(c,!0);d&&a.push({priority:0,compile:function(a){var b=a.parent().length;b&&ca(a.parent(),"ng-binding");return function(a,c){var e=c.parent(),f=e.data("$binding")||[];f.push(d);e.data("$binding",f);b||ca(e,"ng-binding");a.$watch(d,function(a){c[0].nodeValue=a})}}})}function C(a,b){if("srcdoc"==b)return A.HTML;var c=Ma(a);if("xlinkHref"==b||"FORM"==c&&"action"==b||"IMG"!=c&&("src"==b||"ngSrc"==b))return A.RESOURCE_URL}function S(a,c,d,e){var f=b(d,!0);if(f){if("multiple"===e&&"SELECT"===
-Ma(a))throw ja("selmulti",ia(a));c.push({priority:100,compile:function(){return{pre:function(c,d,m){d=m.$$observers||(m.$$observers={});if(g.test(e))throw ja("nodomevents");if(f=b(m[e],!0,C(a,e)))m[e]=f(c),(d[e]||(d[e]=[])).$$inter=!0,(m.$$observers&&m.$$observers[e].$$scope||c).$watch(f,function(a,b){"class"===e&&a!=b?m.$updateClass(a,b):m.$set(e,a)})}}}})}}function Na(a,b,c){var d=b[0],e=b.length,f=d.parentNode,g,m;if(a)for(g=0,m=a.length;g<m;g++)if(a[g]==d){a[g++]=c;m=g+e-1;for(var h=a.length;g<
-h;g++,m++)m<h?a[g]=a[m]:delete a[g];a.length-=e-1;break}f&&f.replaceChild(c,d);a=X.createDocumentFragment();a.appendChild(d);c[w.expando]=d[w.expando];d=1;for(e=b.length;d<e;d++)f=b[d],w(f).remove(),a.appendChild(f),delete b[d];b[0]=c;b.length=1}function tc(a,b){return D(function(){return a.apply(null,arguments)},a,b)}var Ob=function(a,b){this.$$element=a;this.$attr=b||{}};Ob.prototype={$normalize:pa,$addClass:function(a){a&&0<a.length&&N.addClass(this.$$element,a)},$removeClass:function(a){a&&0<
-a.length&&N.removeClass(this.$$element,a)},$updateClass:function(a,b){var c=uc(a,b),d=uc(b,a);0===c.length?N.removeClass(this.$$element,d):0===d.length?N.addClass(this.$$element,c):N.setClass(this.$$element,c,d)},$set:function(a,b,c,d){var e=qc(this.$$element[0],a);e&&(this.$$element.prop(a,b),d=e);this[a]=b;d?this.$attr[a]=d:(d=this.$attr[a])||(this.$attr[a]=d=mb(a,"-"));e=Ma(this.$$element);if("A"===e&&"href"===a||"IMG"===e&&"src"===a)this[a]=b=R(b,"src"===a);!1!==c&&(null===b||b===t?this.$$element.removeAttr(d):
-this.$$element.attr(d,b));(c=this.$$observers)&&r(c[a],function(a){try{a(b)}catch(c){l(c)}})},$observe:function(a,b){var c=this,d=c.$$observers||(c.$$observers={}),e=d[a]||(d[a]=[]);e.push(b);F.$evalAsync(function(){e.$$inter||b(c[a])});return b}};var qa=b.startSymbol(),Z=b.endSymbol(),W="{{"==qa||"}}"==Z?Qa:function(a){return a.replace(/\{\{/g,qa).replace(/}}/g,Z)},U=/^ngAttr[A-Z]/;return z}]}function pa(b){return Za(b.replace(we,""))}function uc(b,a){var c="",d=b.split(/\s+/),e=a.split(/\s+/),f=
-0;a:for(;f<d.length;f++){for(var g=d[f],k=0;k<e.length;k++)if(g==e[k])continue a;c+=(0<c.length?" ":"")+g}return c}function Pd(){var b={},a=/^(\S+)(\s+as\s+(\w+))?$/;this.register=function(a,d){Da(a,"controller");T(a)?D(b,a):b[a]=d};this.$get=["$injector","$window",function(c,d){return function(e,f){var g,k,m;v(e)&&(g=e.match(a),k=g[1],m=g[3],e=b.hasOwnProperty(k)?b[k]:hc(f.$scope,k,!0)||hc(d,k,!0),Wa(e,k,!0));g=c.instantiate(e,f);if(m){if(!f||"object"!==typeof f.$scope)throw C("$controller")("noscp",
-k||e.name,m);f.$scope[m]=g}return g}}]}function Qd(){this.$get=["$window",function(b){return w(b.document)}]}function Rd(){this.$get=["$log",function(b){return function(a,c){b.error.apply(b,arguments)}}]}function vc(b){var a={},c,d,e;if(!b)return a;r(b.split("\n"),function(b){e=b.indexOf(":");c=K(aa(b.substr(0,e)));d=aa(b.substr(e+1));c&&(a[c]=a[c]?a[c]+", "+d:d)});return a}function wc(b){var a=T(b)?b:t;return function(c){a||(a=vc(b));return c?a[K(c)]||null:a}}function xc(b,a,c){if(P(c))return c(b,
-a);r(c,function(c){b=c(b,a)});return b}function Ud(){var b=/^\s*(\[|\{[^\{])/,a=/[\}\]]\s*$/,c=/^\)\]\}',?\n/,d={"Content-Type":"application/json;charset=utf-8"},e=this.defaults={transformResponse:[function(d){v(d)&&(d=d.replace(c,""),b.test(d)&&a.test(d)&&(d=cc(d)));return d}],transformRequest:[function(a){return T(a)&&"[object File]"!==za.call(a)&&"[object Blob]"!==za.call(a)?na(a):a}],headers:{common:{Accept:"application/json, text/plain, */*"},post:ha(d),put:ha(d),patch:ha(d)},xsrfCookieName:"XSRF-TOKEN",
-xsrfHeaderName:"X-XSRF-TOKEN"},f=this.interceptors=[],g=this.responseInterceptors=[];this.$get=["$httpBackend","$browser","$cacheFactory","$rootScope","$q","$injector",function(a,b,c,d,n,p){function q(a){function b(a){var d=D({},a,{data:xc(a.data,a.headers,c.transformResponse)});return 200<=a.status&&300>a.status?d:n.reject(d)}var c={method:"get",transformRequest:e.transformRequest,transformResponse:e.transformResponse},d=function(a){var b=e.headers,c=D({},a.headers),d,f,b=D({},b.common,b[K(a.method)]);
-a:for(d in b){a=K(d);for(f in c)if(K(f)===a)continue a;c[d]=b[d]}(function(a){var b;r(a,function(c,d){P(c)&&(b=c(),null!=b?a[d]=b:delete a[d])})})(c);return c}(a);D(c,a);c.headers=d;c.method=Ia(c.method);var f=[function(a){d=a.headers;var c=xc(a.data,wc(d),a.transformRequest);x(c)&&r(d,function(a,b){"content-type"===K(b)&&delete d[b]});x(a.withCredentials)&&!x(e.withCredentials)&&(a.withCredentials=e.withCredentials);return s(a,c,d).then(b,b)},t],g=n.when(c);for(r(A,function(a){(a.request||a.requestError)&&
-f.unshift(a.request,a.requestError);(a.response||a.responseError)&&f.push(a.response,a.responseError)});f.length;){a=f.shift();var m=f.shift(),g=g.then(a,m)}g.success=function(a){g.then(function(b){a(b.data,b.status,b.headers,c)});return g};g.error=function(a){g.then(null,function(b){a(b.data,b.status,b.headers,c)});return g};return g}function s(c,f,g){function h(a,b,c,e){I&&(200<=a&&300>a?I.put(w,[a,b,vc(c),e]):I.remove(w));p(b,a,c,e);d.$$phase||d.$apply()}function p(a,b,d,e){b=Math.max(b,0);(200<=
-b&&300>b?A.resolve:A.reject)({data:a,status:b,headers:wc(d),config:c,statusText:e})}function s(){var a=Ra(q.pendingRequests,c);-1!==a&&q.pendingRequests.splice(a,1)}var A=n.defer(),r=A.promise,I,H,w=F(c.url,c.params);q.pendingRequests.push(c);r.then(s,s);!c.cache&&!e.cache||(!1===c.cache||"GET"!==c.method&&"JSONP"!==c.method)||(I=T(c.cache)?c.cache:T(e.cache)?e.cache:u);if(I)if(H=I.get(w),y(H)){if(H&&P(H.then))return H.then(s,s),H;J(H)?p(H[1],H[0],ha(H[2]),H[3]):p(H,200,{},"OK")}else I.put(w,r);x(H)&&
-((H=Pb(c.url)?b.cookies()[c.xsrfCookieName||e.xsrfCookieName]:t)&&(g[c.xsrfHeaderName||e.xsrfHeaderName]=H),a(c.method,w,f,h,g,c.timeout,c.withCredentials,c.responseType));return r}function F(a,b){if(!b)return a;var c=[];Tc(b,function(a,b){null===a||x(a)||(J(a)||(a=[a]),r(a,function(a){T(a)&&(a=ta(a)?a.toISOString():na(a));c.push(Ca(b)+"="+Ca(a))}))});0<c.length&&(a+=(-1==a.indexOf("?")?"?":"&")+c.join("&"));return a}var u=c("$http"),A=[];r(f,function(a){A.unshift(v(a)?p.get(a):p.invoke(a))});r(g,
-function(a,b){var c=v(a)?p.get(a):p.invoke(a);A.splice(b,0,{response:function(a){return c(n.when(a))},responseError:function(a){return c(n.reject(a))}})});q.pendingRequests=[];(function(a){r(arguments,function(a){q[a]=function(b,c){return q(D(c||{},{method:a,url:b}))}})})("get","delete","head","jsonp");(function(a){r(arguments,function(a){q[a]=function(b,c,d){return q(D(d||{},{method:a,url:b,data:c}))}})})("post","put");q.defaults=e;return q}]}function xe(b){if(8>=Q&&(!b.match(/^(get|post|head|put|delete|options)$/i)||
-!W.XMLHttpRequest))return new W.ActiveXObject("Microsoft.XMLHTTP");if(W.XMLHttpRequest)return new W.XMLHttpRequest;throw C("$httpBackend")("noxhr");}function Vd(){this.$get=["$browser","$window","$document",function(b,a,c){return ye(b,xe,b.defer,a.angular.callbacks,c[0])}]}function ye(b,a,c,d,e){function f(a,b,c){var f=e.createElement("script"),g=null;f.type="text/javascript";f.src=a;f.async=!0;g=function(a){$a(f,"load",g);$a(f,"error",g);e.body.removeChild(f);f=null;var k=-1,s="unknown";a&&("load"!==
-a.type||d[b].called||(a={type:"error"}),s=a.type,k="error"===a.type?404:200);c&&c(k,s)};sb(f,"load",g);sb(f,"error",g);8>=Q&&(f.onreadystatechange=function(){v(f.readyState)&&/loaded|complete/.test(f.readyState)&&(f.onreadystatechange=null,g({type:"load"}))});e.body.appendChild(f);return g}var g=-1;return function(e,m,h,l,n,p,q,s){function F(){A=g;R&&R();z&&z.abort()}function u(a,d,e,f,g){L&&c.cancel(L);R=z=null;0===d&&(d=e?200:"file"==ua(m).protocol?404:0);a(1223===d?204:d,e,f,g||"");b.$$completeOutstandingRequest(E)}
-var A;b.$$incOutstandingRequestCount();m=m||b.url();if("jsonp"==K(e)){var N="_"+(d.counter++).toString(36);d[N]=function(a){d[N].data=a;d[N].called=!0};var R=f(m.replace("JSON_CALLBACK","angular.callbacks."+N),N,function(a,b){u(l,a,d[N].data,"",b);d[N]=E})}else{var z=a(e);z.open(e,m,!0);r(n,function(a,b){y(a)&&z.setRequestHeader(b,a)});z.onreadystatechange=function(){if(z&&4==z.readyState){var a=null,b=null,c="";A!==g&&(a=z.getAllResponseHeaders(),b="response"in z?z.response:z.responseText);A===g&&
-10>Q||(c=z.statusText);u(l,A||z.status,b,a,c)}};q&&(z.withCredentials=!0);if(s)try{z.responseType=s}catch(ca){if("json"!==s)throw ca;}z.send(h||null)}if(0<p)var L=c(F,p);else p&&P(p.then)&&p.then(F)}}function Sd(){var b="{{",a="}}";this.startSymbol=function(a){return a?(b=a,this):b};this.endSymbol=function(b){return b?(a=b,this):a};this.$get=["$parse","$exceptionHandler","$sce",function(c,d,e){function f(f,h,l){for(var n,p,q=0,s=[],F=f.length,u=!1,A=[];q<F;)-1!=(n=f.indexOf(b,q))&&-1!=(p=f.indexOf(a,
-n+g))?(q!=n&&s.push(f.substring(q,n)),s.push(q=c(u=f.substring(n+g,p))),q.exp=u,q=p+k,u=!0):(q!=F&&s.push(f.substring(q)),q=F);(F=s.length)||(s.push(""),F=1);if(l&&1<s.length)throw yc("noconcat",f);if(!h||u)return A.length=F,q=function(a){try{for(var b=0,c=F,g;b<c;b++){if("function"==typeof(g=s[b]))if(g=g(a),g=l?e.getTrusted(l,g):e.valueOf(g),null==g)g="";else switch(typeof g){case "string":break;case "number":g=""+g;break;default:g=na(g)}A[b]=g}return A.join("")}catch(k){a=yc("interr",f,k.toString()),
-d(a)}},q.exp=f,q.parts=s,q}var g=b.length,k=a.length;f.startSymbol=function(){return b};f.endSymbol=function(){return a};return f}]}function Td(){this.$get=["$rootScope","$window","$q",function(b,a,c){function d(d,g,k,m){var h=a.setInterval,l=a.clearInterval,n=c.defer(),p=n.promise,q=0,s=y(m)&&!m;k=y(k)?k:0;p.then(null,null,d);p.$$intervalId=h(function(){n.notify(q++);0<k&&q>=k&&(n.resolve(q),l(p.$$intervalId),delete e[p.$$intervalId]);s||b.$apply()},g);e[p.$$intervalId]=n;return p}var e={};d.cancel=
-function(b){return b&&b.$$intervalId in e?(e[b.$$intervalId].reject("canceled"),a.clearInterval(b.$$intervalId),delete e[b.$$intervalId],!0):!1};return d}]}function bd(){this.$get=function(){return{id:"en-us",NUMBER_FORMATS:{DECIMAL_SEP:".",GROUP_SEP:",",PATTERNS:[{minInt:1,minFrac:0,maxFrac:3,posPre:"",posSuf:"",negPre:"-",negSuf:"",gSize:3,lgSize:3},{minInt:1,minFrac:2,maxFrac:2,posPre:"\u00a4",posSuf:"",negPre:"(\u00a4",negSuf:")",gSize:3,lgSize:3}],CURRENCY_SYM:"$"},DATETIME_FORMATS:{MONTH:"January February March April May June July August September October November December".split(" "),
+function Zc(b){E(b,{bootstrap:dc,copy:Ka,extend:E,equals:Ca,element:A,forEach:r,injector:ec,noop:v,bind:Bb,toJson:oa,fromJson:ac,identity:ga,isUndefined:F,isDefined:D,isString:G,isFunction:N,isObject:T,isNumber:jb,isElement:Tc,isArray:L,version:$c,isDate:va,lowercase:x,uppercase:La,callbacks:{counter:0},$$minErr:z,$$csp:Za});$a=Yc(W);try{$a("ngLocale")}catch(a){$a("ngLocale",[]).provider("$locale",ad)}$a("ng",["ngLocale"],["$provide",function(a){a.provider({$$sanitizeUri:bd});a.provider("$compile",
+gc).directive({a:cd,input:hc,textarea:hc,form:dd,script:ed,select:fd,style:gd,option:hd,ngBind:id,ngBindHtml:jd,ngBindTemplate:kd,ngClass:ld,ngClassEven:md,ngClassOdd:nd,ngCloak:od,ngController:pd,ngForm:qd,ngHide:rd,ngIf:sd,ngInclude:td,ngInit:ud,ngNonBindable:vd,ngPluralize:wd,ngRepeat:xd,ngShow:yd,ngStyle:zd,ngSwitch:Ad,ngSwitchWhen:Bd,ngSwitchDefault:Cd,ngOptions:Dd,ngTransclude:Ed,ngModel:Fd,ngList:Gd,ngChange:Hd,required:ic,ngRequired:ic,ngValue:Id}).directive({ngInclude:Jd}).directive(Fb).directive(jc);
+a.provider({$anchorScroll:Kd,$animate:Ld,$browser:Md,$cacheFactory:Nd,$controller:Od,$document:Pd,$exceptionHandler:Qd,$filter:kc,$interpolate:Rd,$interval:Sd,$http:Td,$httpBackend:Ud,$location:Vd,$log:Wd,$parse:Xd,$rootScope:Yd,$q:Zd,$sce:$d,$sceDelegate:ae,$sniffer:be,$templateCache:ce,$timeout:de,$window:ee,$$rAF:fe,$$asyncCallback:ge})}])}function ab(b){return b.replace(he,function(a,b,d,e){return e?d.toUpperCase():d}).replace(ie,"Moz$1")}function Gb(b,a,c,d){function e(b){var e=c&&b?[this.filter(b)]:
+[this],k=a,m,l,n,q,p,s;if(!d||null!=b)for(;e.length;)for(m=e.shift(),l=0,n=m.length;l<n;l++)for(q=A(m[l]),k?q.triggerHandler("$destroy"):k=!k,p=0,q=(s=q.children()).length;p<q;p++)e.push(Fa(s[p]));return f.apply(this,arguments)}var f=Fa.fn[b],f=f.$original||f;e.$original=f;Fa.fn[b]=e}function S(b){if(b instanceof S)return b;G(b)&&(b=$(b));if(!(this instanceof S)){if(G(b)&&"<"!=b.charAt(0))throw Hb("nosel");return new S(b)}if(G(b)){var a=b;b=X;var c;if(c=je.exec(a))b=[b.createElement(c[1])];else{var d=
+b,e;b=d.createDocumentFragment();c=[];if(Ib.test(a)){d=b.appendChild(d.createElement("div"));e=(ke.exec(a)||["",""])[1].toLowerCase();e=da[e]||da._default;d.innerHTML="<div>&#160;</div>"+e[1]+a.replace(le,"<$1></$2>")+e[2];d.removeChild(d.firstChild);for(a=e[0];a--;)d=d.lastChild;a=0;for(e=d.childNodes.length;a<e;++a)c.push(d.childNodes[a]);d=b.firstChild;d.textContent=""}else c.push(d.createTextNode(a));b.textContent="";b.innerHTML="";b=c}Jb(this,b);A(X.createDocumentFragment()).append(this)}else Jb(this,
+b)}function Kb(b){return b.cloneNode(!0)}function Ma(b){Lb(b);var a=0;for(b=b.childNodes||[];a<b.length;a++)Ma(b[a])}function lc(b,a,c,d){if(D(d))throw Hb("offargs");var e=pa(b,"events");pa(b,"handle")&&(F(a)?r(e,function(a,c){bb(b,c,a);delete e[c]}):r(a.split(" "),function(a){F(c)?(bb(b,a,e[a]),delete e[a]):Ua(e[a]||[],c)}))}function Lb(b,a){var c=b.ng339,d=cb[c];d&&(a?delete cb[c].data[a]:(d.handle&&(d.events.$destroy&&d.handle({},"$destroy"),lc(b)),delete cb[c],b.ng339=u))}function pa(b,a,c){var d=
+b.ng339,d=cb[d||-1];if(D(c))d||(b.ng339=d=++me,d=cb[d]={}),d[a]=c;else return d&&d[a]}function Mb(b,a,c){var d=pa(b,"data"),e=D(c),f=!e&&D(a),g=f&&!T(a);d||g||pa(b,"data",d={});if(e)d[a]=c;else if(f){if(g)return d&&d[a];E(d,a)}else return d}function Nb(b,a){return b.getAttribute?-1<(" "+(b.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ").indexOf(" "+a+" "):!1}function ob(b,a){a&&b.setAttribute&&r(a.split(" "),function(a){b.setAttribute("class",$((" "+(b.getAttribute("class")||"")+" ").replace(/[\n\t]/g,
+" ").replace(" "+$(a)+" "," ")))})}function pb(b,a){if(a&&b.setAttribute){var c=(" "+(b.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ");r(a.split(" "),function(a){a=$(a);-1===c.indexOf(" "+a+" ")&&(c+=a+" ")});b.setAttribute("class",$(c))}}function Jb(b,a){if(a){a=a.nodeName||!D(a.length)||Ja(a)?[a]:a;for(var c=0;c<a.length;c++)b.push(a[c])}}function mc(b,a){return qb(b,"$"+(a||"ngController")+"Controller")}function qb(b,a,c){9==b.nodeType&&(b=b.documentElement);for(a=L(a)?a:[a];b;){for(var d=
+0,e=a.length;d<e;d++)if((c=A.data(b,a[d]))!==u)return c;b=b.parentNode||11===b.nodeType&&b.host}}function nc(b){for(var a=0,c=b.childNodes;a<c.length;a++)Ma(c[a]);for(;b.firstChild;)b.removeChild(b.firstChild)}function oc(b,a){var c=rb[a.toLowerCase()];return c&&pc[b.nodeName]&&c}function ne(b,a){var c=function(c,e){c.preventDefault||(c.preventDefault=function(){c.returnValue=!1});c.stopPropagation||(c.stopPropagation=function(){c.cancelBubble=!0});c.target||(c.target=c.srcElement||X);if(F(c.defaultPrevented)){var f=
+c.preventDefault;c.preventDefault=function(){c.defaultPrevented=!0;f.call(c)};c.defaultPrevented=!1}c.isDefaultPrevented=function(){return c.defaultPrevented||!1===c.returnValue};var g=ha(a[e||c.type]||[]);r(g,function(a){a.call(b,c)});8>=R?(c.preventDefault=null,c.stopPropagation=null,c.isDefaultPrevented=null):(delete c.preventDefault,delete c.stopPropagation,delete c.isDefaultPrevented)};c.elem=b;return c}function Na(b,a){var c=typeof b,d;"function"==c||"object"==c&&null!==b?"function"==typeof(d=
+b.$$hashKey)?d=b.$$hashKey():d===u&&(d=b.$$hashKey=(a||ib)()):d=b;return c+":"+d}function db(b,a){if(a){var c=0;this.nextUid=function(){return++c}}r(b,this.put,this)}function qc(b){var a,c;"function"===typeof b?(a=b.$inject)||(a=[],b.length&&(c=b.toString().replace(oe,""),c=c.match(pe),r(c[1].split(qe),function(b){b.replace(re,function(b,c,d){a.push(d)})})),b.$inject=a):L(b)?(c=b.length-1,Ya(b[c],"fn"),a=b.slice(0,c)):Ya(b,"fn",!0);return a}function ec(b){function a(a){return function(b,c){if(T(b))r(b,
+Yb(a));else return a(b,c)}}function c(a,b){Ea(a,"service");if(N(b)||L(b))b=n.instantiate(b);if(!b.$get)throw eb("pget",a);return l[a+h]=b}function d(a,b){return c(a,{$get:b})}function e(a){var b=[],c,d,f,h;r(a,function(a){if(!m.get(a)){m.put(a,!0);try{if(G(a))for(c=$a(a),b=b.concat(e(c.requires)).concat(c._runBlocks),d=c._invokeQueue,f=0,h=d.length;f<h;f++){var g=d[f],k=n.get(g[0]);k[g[1]].apply(k,g[2])}else N(a)?b.push(n.invoke(a)):L(a)?b.push(n.invoke(a)):Ya(a,"module")}catch(p){throw L(a)&&(a=
+a[a.length-1]),p.message&&(p.stack&&-1==p.stack.indexOf(p.message))&&(p=p.message+"\n"+p.stack),eb("modulerr",a,p.stack||p.message||p);}}});return b}function f(a,b){function c(d){if(a.hasOwnProperty(d)){if(a[d]===g)throw eb("cdep",d+" <- "+k.join(" <- "));return a[d]}try{return k.unshift(d),a[d]=g,a[d]=b(d)}catch(e){throw a[d]===g&&delete a[d],e;}finally{k.shift()}}function d(a,b,e){var f=[],h=qc(a),g,k,p;k=0;for(g=h.length;k<g;k++){p=h[k];if("string"!==typeof p)throw eb("itkn",p);f.push(e&&e.hasOwnProperty(p)?
+e[p]:c(p))}L(a)&&(a=a[g]);return a.apply(b,f)}return{invoke:d,instantiate:function(a,b){var c=function(){},e;c.prototype=(L(a)?a[a.length-1]:a).prototype;c=new c;e=d(a,c,b);return T(e)||N(e)?e:c},get:c,annotate:qc,has:function(b){return l.hasOwnProperty(b+h)||a.hasOwnProperty(b)}}}var g={},h="Provider",k=[],m=new db([],!0),l={$provide:{provider:a(c),factory:a(d),service:a(function(a,b){return d(a,["$injector",function(a){return a.instantiate(b)}])}),value:a(function(a,b){return d(a,aa(b))}),constant:a(function(a,
+b){Ea(a,"constant");l[a]=b;q[a]=b}),decorator:function(a,b){var c=n.get(a+h),d=c.$get;c.$get=function(){var a=p.invoke(d,c);return p.invoke(b,null,{$delegate:a})}}}},n=l.$injector=f(l,function(){throw eb("unpr",k.join(" <- "));}),q={},p=q.$injector=f(q,function(a){a=n.get(a+h);return p.invoke(a.$get,a)});r(e(b),function(a){p.invoke(a||v)});return p}function Kd(){var b=!0;this.disableAutoScrolling=function(){b=!1};this.$get=["$window","$location","$rootScope",function(a,c,d){function e(a){var b=null;
+r(a,function(a){b||"a"!==x(a.nodeName)||(b=a)});return b}function f(){var b=c.hash(),d;b?(d=g.getElementById(b))?d.scrollIntoView():(d=e(g.getElementsByName(b)))?d.scrollIntoView():"top"===b&&a.scrollTo(0,0):a.scrollTo(0,0)}var g=a.document;b&&d.$watch(function(){return c.hash()},function(){d.$evalAsync(f)});return f}]}function ge(){this.$get=["$$rAF","$timeout",function(b,a){return b.supported?function(a){return b(a)}:function(b){return a(b,0,!1)}}]}function se(b,a,c,d){function e(a){try{a.apply(null,
+wa.call(arguments,1))}finally{if(s--,0===s)for(;J.length;)try{J.pop()()}catch(b){c.error(b)}}}function f(a,b){(function ea(){r(w,function(a){a()});t=b(ea,a)})()}function g(){y!=h.url()&&(y=h.url(),r(ba,function(a){a(h.url())}))}var h=this,k=a[0],m=b.location,l=b.history,n=b.setTimeout,q=b.clearTimeout,p={};h.isMock=!1;var s=0,J=[];h.$$completeOutstandingRequest=e;h.$$incOutstandingRequestCount=function(){s++};h.notifyWhenNoOutstandingRequests=function(a){r(w,function(a){a()});0===s?a():J.push(a)};
+var w=[],t;h.addPollFn=function(a){F(t)&&f(100,n);w.push(a);return a};var y=m.href,K=a.find("base"),B=null;h.url=function(a,c){m!==b.location&&(m=b.location);l!==b.history&&(l=b.history);if(a){if(y!=a){var e=y&&Ga(y)===Ga(a);y=a;!e&&d.history?c?l.replaceState(null,"",a):(l.pushState(null,"",a),K.attr("href",K.attr("href"))):(e||(B=a),c?m.replace(a):m.href=a);return h}}else return B||m.href.replace(/%27/g,"'")};var ba=[],O=!1;h.onUrlChange=function(a){if(!O){if(d.history)A(b).on("popstate",g);if(d.hashchange)A(b).on("hashchange",
+g);else h.addPollFn(g);O=!0}ba.push(a);return a};h.$$checkUrlChange=g;h.baseHref=function(){var a=K.attr("href");return a?a.replace(/^(https?\:)?\/\/[^\/]*/,""):""};var M={},ca="",P=h.baseHref();h.cookies=function(a,b){var d,e,f,h;if(a)b===u?k.cookie=escape(a)+"=;path="+P+";expires=Thu, 01 Jan 1970 00:00:00 GMT":G(b)&&(d=(k.cookie=escape(a)+"="+escape(b)+";path="+P).length+1,4096<d&&c.warn("Cookie '"+a+"' possibly not set or overflowed because it was too large ("+d+" > 4096 bytes)!"));else{if(k.cookie!==
+ca)for(ca=k.cookie,d=ca.split("; "),M={},f=0;f<d.length;f++)e=d[f],h=e.indexOf("="),0<h&&(a=unescape(e.substring(0,h)),M[a]===u&&(M[a]=unescape(e.substring(h+1))));return M}};h.defer=function(a,b){var c;s++;c=n(function(){delete p[c];e(a)},b||0);p[c]=!0;return c};h.defer.cancel=function(a){return p[a]?(delete p[a],q(a),e(v),!0):!1}}function Md(){this.$get=["$window","$log","$sniffer","$document",function(b,a,c,d){return new se(b,d,a,c)}]}function Nd(){this.$get=function(){function b(b,d){function e(a){a!=
+n&&(q?q==a&&(q=a.n):q=a,f(a.n,a.p),f(a,n),n=a,n.n=null)}function f(a,b){a!=b&&(a&&(a.p=b),b&&(b.n=a))}if(b in a)throw z("$cacheFactory")("iid",b);var g=0,h=E({},d,{id:b}),k={},m=d&&d.capacity||Number.MAX_VALUE,l={},n=null,q=null;return a[b]={put:function(a,b){if(m<Number.MAX_VALUE){var c=l[a]||(l[a]={key:a});e(c)}if(!F(b))return a in k||g++,k[a]=b,g>m&&this.remove(q.key),b},get:function(a){if(m<Number.MAX_VALUE){var b=l[a];if(!b)return;e(b)}return k[a]},remove:function(a){if(m<Number.MAX_VALUE){var b=
+l[a];if(!b)return;b==n&&(n=b.p);b==q&&(q=b.n);f(b.n,b.p);delete l[a]}delete k[a];g--},removeAll:function(){k={};g=0;l={};n=q=null},destroy:function(){l=h=k=null;delete a[b]},info:function(){return E({},h,{size:g})}}}var a={};b.info=function(){var b={};r(a,function(a,e){b[e]=a.info()});return b};b.get=function(b){return a[b]};return b}}function ce(){this.$get=["$cacheFactory",function(b){return b("templates")}]}function gc(b,a){var c={},d="Directive",e=/^\s*directive\:\s*([\d\w_\-]+)\s+(.*)$/,f=/(([\d\w_\-]+)(?:\:([^;]+))?;?)/,
+g=/^(on[a-z]+|formaction)$/;this.directive=function k(a,e){Ea(a,"directive");G(a)?(Db(e,"directiveFactory"),c.hasOwnProperty(a)||(c[a]=[],b.factory(a+d,["$injector","$exceptionHandler",function(b,d){var e=[];r(c[a],function(c,f){try{var g=b.invoke(c);N(g)?g={compile:aa(g)}:!g.compile&&g.link&&(g.compile=aa(g.link));g.priority=g.priority||0;g.index=f;g.name=g.name||a;g.require=g.require||g.controller&&g.name;g.restrict=g.restrict||"A";e.push(g)}catch(k){d(k)}});return e}])),c[a].push(e)):r(a,Yb(k));
+return this};this.aHrefSanitizationWhitelist=function(b){return D(b)?(a.aHrefSanitizationWhitelist(b),this):a.aHrefSanitizationWhitelist()};this.imgSrcSanitizationWhitelist=function(b){return D(b)?(a.imgSrcSanitizationWhitelist(b),this):a.imgSrcSanitizationWhitelist()};this.$get=["$injector","$interpolate","$exceptionHandler","$http","$templateCache","$parse","$controller","$rootScope","$document","$sce","$animate","$$sanitizeUri",function(a,b,l,n,q,p,s,J,w,t,y,K){function B(a,b,c,d,e){a instanceof
+A||(a=A(a));r(a,function(b,c){3==b.nodeType&&b.nodeValue.match(/\S+/)&&(a[c]=A(b).wrap("<span></span>").parent()[0])});var f=O(a,b,a,c,d,e);ba(a,"ng-scope");return function(b,c,d,e){Db(b,"scope");var g=c?Oa.clone.call(a):a;r(d,function(a,b){g.data("$"+b+"Controller",a)});d=0;for(var k=g.length;d<k;d++){var p=g[d].nodeType;1!==p&&9!==p||g.eq(d).data("$scope",b)}c&&c(g,b);f&&f(b,g,g,e);return g}}function ba(a,b){try{a.addClass(b)}catch(c){}}function O(a,b,c,d,e,f){function g(a,c,d,e){var f,p,l,m,q,
+n,w;f=c.length;var s=Array(f);for(m=0;m<f;m++)s[m]=c[m];n=m=0;for(q=k.length;m<q;n++)p=s[n],c=k[m++],f=k[m++],c?(c.scope?(l=a.$new(),A.data(p,"$scope",l)):l=a,w=c.transcludeOnThisElement?M(a,c.transclude,e):!c.templateOnThisElement&&e?e:!e&&b?M(a,b):null,c(f,l,p,d,w)):f&&f(a,p.childNodes,u,e)}for(var k=[],p,l,m,q,n=0;n<a.length;n++)p=new Ob,l=ca(a[n],[],p,0===n?d:u,e),(f=l.length?I(l,a[n],p,b,c,null,[],[],f):null)&&f.scope&&ba(p.$$element,"ng-scope"),p=f&&f.terminal||!(m=a[n].childNodes)||!m.length?
+null:O(m,f?(f.transcludeOnThisElement||!f.templateOnThisElement)&&f.transclude:b),k.push(f,p),q=q||f||p,f=null;return q?g:null}function M(a,b,c){return function(d,e,f){var g=!1;d||(d=a.$new(),g=d.$$transcluded=!0);e=b(d,e,f,c);if(g)e.on("$destroy",function(){d.$destroy()});return e}}function ca(a,b,c,d,g){var k=c.$attr,p;switch(a.nodeType){case 1:ea(b,qa(Pa(a).toLowerCase()),"E",d,g);for(var l,m,q,n=a.attributes,w=0,s=n&&n.length;w<s;w++){var t=!1,J=!1;l=n[w];if(!R||8<=R||l.specified){p=l.name;m=
+$(l.value);l=qa(p);if(q=U.test(l))p=nb(l.substr(6),"-");var y=l.replace(/(Start|End)$/,"");l===y+"Start"&&(t=p,J=p.substr(0,p.length-5)+"end",p=p.substr(0,p.length-6));l=qa(p.toLowerCase());k[l]=p;if(q||!c.hasOwnProperty(l))c[l]=m,oc(a,l)&&(c[l]=!0);S(a,b,m,l);ea(b,l,"A",d,g,t,J)}}a=a.className;if(G(a)&&""!==a)for(;p=f.exec(a);)l=qa(p[2]),ea(b,l,"C",d,g)&&(c[l]=$(p[3])),a=a.substr(p.index+p[0].length);break;case 3:x(b,a.nodeValue);break;case 8:try{if(p=e.exec(a.nodeValue))l=qa(p[1]),ea(b,l,"M",d,
+g)&&(c[l]=$(p[2]))}catch(B){}}b.sort(F);return b}function P(a,b,c){var d=[],e=0;if(b&&a.hasAttribute&&a.hasAttribute(b)){do{if(!a)throw ja("uterdir",b,c);1==a.nodeType&&(a.hasAttribute(b)&&e++,a.hasAttribute(c)&&e--);d.push(a);a=a.nextSibling}while(0<e)}else d.push(a);return A(d)}function C(a,b,c){return function(d,e,f,g,k){e=P(e[0],b,c);return a(d,e,f,g,k)}}function I(a,c,d,e,f,g,k,q,n){function w(a,b,c,d){if(a){c&&(a=C(a,c,d));a.require=H.require;a.directiveName=z;if(K===H||H.$$isolateScope)a=rc(a,
+{isolateScope:!0});k.push(a)}if(b){c&&(b=C(b,c,d));b.require=H.require;b.directiveName=z;if(K===H||H.$$isolateScope)b=rc(b,{isolateScope:!0});q.push(b)}}function t(a,b,c,d){var e,f="data",g=!1;if(G(b)){for(;"^"==(e=b.charAt(0))||"?"==e;)b=b.substr(1),"^"==e&&(f="inheritedData"),g=g||"?"==e;e=null;d&&"data"===f&&(e=d[b]);e=e||c[f]("$"+b+"Controller");if(!e&&!g)throw ja("ctreq",b,a);}else L(b)&&(e=[],r(b,function(b){e.push(t(a,b,c,d))}));return e}function J(a,e,f,g,n){function w(a,b){var c;2>arguments.length&&
+(b=a,a=u);Ia&&(c=ca);return n(a,b,c)}var y,Q,B,M,C,P,ca={},ra;y=c===f?d:ha(d,new Ob(A(f),d.$attr));Q=y.$$element;if(K){var ue=/^\s*([@=&])(\??)\s*(\w*)\s*$/;P=e.$new(!0);!I||I!==K&&I!==K.$$originalDirective?Q.data("$isolateScopeNoTemplate",P):Q.data("$isolateScope",P);ba(Q,"ng-isolate-scope");r(K.scope,function(a,c){var d=a.match(ue)||[],f=d[3]||c,g="?"==d[2],d=d[1],k,l,n,q;P.$$isolateBindings[c]=d+f;switch(d){case "@":y.$observe(f,function(a){P[c]=a});y.$$observers[f].$$scope=e;y[f]&&(P[c]=b(y[f])(e));
+break;case "=":if(g&&!y[f])break;l=p(y[f]);q=l.literal?Ca:function(a,b){return a===b||a!==a&&b!==b};n=l.assign||function(){k=P[c]=l(e);throw ja("nonassign",y[f],K.name);};k=P[c]=l(e);P.$watch(function(){var a=l(e);q(a,P[c])||(q(a,k)?n(e,a=P[c]):P[c]=a);return k=a},null,l.literal);break;case "&":l=p(y[f]);P[c]=function(a){return l(e,a)};break;default:throw ja("iscp",K.name,c,a);}})}ra=n&&w;O&&r(O,function(a){var b={$scope:a===K||a.$$isolateScope?P:e,$element:Q,$attrs:y,$transclude:ra},c;C=a.controller;
+"@"==C&&(C=y[a.name]);c=s(C,b);ca[a.name]=c;Ia||Q.data("$"+a.name+"Controller",c);a.controllerAs&&(b.$scope[a.controllerAs]=c)});g=0;for(B=k.length;g<B;g++)try{M=k[g],M(M.isolateScope?P:e,Q,y,M.require&&t(M.directiveName,M.require,Q,ca),ra)}catch(H){l(H,ia(Q))}g=e;K&&(K.template||null===K.templateUrl)&&(g=P);a&&a(g,f.childNodes,u,n);for(g=q.length-1;0<=g;g--)try{M=q[g],M(M.isolateScope?P:e,Q,y,M.require&&t(M.directiveName,M.require,Q,ca),ra)}catch(D){l(D,ia(Q))}}n=n||{};for(var y=-Number.MAX_VALUE,
+M,O=n.controllerDirectives,K=n.newIsolateScopeDirective,I=n.templateDirective,ea=n.nonTlbTranscludeDirective,F=!1,E=!1,Ia=n.hasElementTranscludeDirective,x=d.$$element=A(c),H,z,V,S=e,R,Ha=0,sa=a.length;Ha<sa;Ha++){H=a[Ha];var U=H.$$start,Y=H.$$end;U&&(x=P(c,U,Y));V=u;if(y>H.priority)break;if(V=H.scope)M=M||H,H.templateUrl||(fb("new/isolated scope",K,H,x),T(V)&&(K=H));z=H.name;!H.templateUrl&&H.controller&&(V=H.controller,O=O||{},fb("'"+z+"' controller",O[z],H,x),O[z]=H);if(V=H.transclude)F=!0,H.$$tlb||
+(fb("transclusion",ea,H,x),ea=H),"element"==V?(Ia=!0,y=H.priority,V=x,x=d.$$element=A(X.createComment(" "+z+": "+d[z]+" ")),c=x[0],ra(f,wa.call(V,0),c),S=B(V,e,y,g&&g.name,{nonTlbTranscludeDirective:ea})):(V=A(Kb(c)).contents(),x.empty(),S=B(V,e));if(H.template)if(E=!0,fb("template",I,H,x),I=H,V=N(H.template)?H.template(x,d):H.template,V=W(V),H.replace){g=H;V=Ib.test(V)?A($(V)):[];c=V[0];if(1!=V.length||1!==c.nodeType)throw ja("tplrt",z,"");ra(f,x,c);sa={$attr:{}};V=ca(c,[],sa);var Z=a.splice(Ha+
+1,a.length-(Ha+1));K&&D(V);a=a.concat(V).concat(Z);v(d,sa);sa=a.length}else x.html(V);if(H.templateUrl)E=!0,fb("template",I,H,x),I=H,H.replace&&(g=H),J=te(a.splice(Ha,a.length-Ha),x,d,f,F&&S,k,q,{controllerDirectives:O,newIsolateScopeDirective:K,templateDirective:I,nonTlbTranscludeDirective:ea}),sa=a.length;else if(H.compile)try{R=H.compile(x,d,S),N(R)?w(null,R,U,Y):R&&w(R.pre,R.post,U,Y)}catch(ve){l(ve,ia(x))}H.terminal&&(J.terminal=!0,y=Math.max(y,H.priority))}J.scope=M&&!0===M.scope;J.transcludeOnThisElement=
+F;J.templateOnThisElement=E;J.transclude=S;n.hasElementTranscludeDirective=Ia;return J}function D(a){for(var b=0,c=a.length;b<c;b++)a[b]=$b(a[b],{$$isolateScope:!0})}function ea(b,e,f,g,p,m,n){if(e===p)return null;p=null;if(c.hasOwnProperty(e)){var q;e=a.get(e+d);for(var w=0,s=e.length;w<s;w++)try{q=e[w],(g===u||g>q.priority)&&-1!=q.restrict.indexOf(f)&&(m&&(q=$b(q,{$$start:m,$$end:n})),b.push(q),p=q)}catch(y){l(y)}}return p}function v(a,b){var c=b.$attr,d=a.$attr,e=a.$$element;r(a,function(d,e){"$"!=
+e.charAt(0)&&(b[e]&&b[e]!==d&&(d+=("style"===e?";":" ")+b[e]),a.$set(e,d,!0,c[e]))});r(b,function(b,f){"class"==f?(ba(e,b),a["class"]=(a["class"]?a["class"]+" ":"")+b):"style"==f?(e.attr("style",e.attr("style")+";"+b),a.style=(a.style?a.style+";":"")+b):"$"==f.charAt(0)||a.hasOwnProperty(f)||(a[f]=b,d[f]=c[f])})}function te(a,b,c,d,e,f,g,k){var p=[],l,m,w=b[0],s=a.shift(),y=E({},s,{templateUrl:null,transclude:null,replace:null,$$originalDirective:s}),J=N(s.templateUrl)?s.templateUrl(b,c):s.templateUrl;
+b.empty();n.get(t.getTrustedResourceUrl(J),{cache:q}).success(function(q){var n,t;q=W(q);if(s.replace){q=Ib.test(q)?A($(q)):[];n=q[0];if(1!=q.length||1!==n.nodeType)throw ja("tplrt",s.name,J);q={$attr:{}};ra(d,b,n);var B=ca(n,[],q);T(s.scope)&&D(B);a=B.concat(a);v(c,q)}else n=w,b.html(q);a.unshift(y);l=I(a,n,c,e,b,s,f,g,k);r(d,function(a,c){a==n&&(d[c]=b[0])});for(m=O(b[0].childNodes,e);p.length;){q=p.shift();t=p.shift();var K=p.shift(),C=p.shift(),B=b[0];if(t!==w){var P=t.className;k.hasElementTranscludeDirective&&
+s.replace||(B=Kb(n));ra(K,A(t),B);ba(A(B),P)}t=l.transcludeOnThisElement?M(q,l.transclude,C):C;l(m,q,B,d,t)}p=null}).error(function(a,b,c,d){throw ja("tpload",d.url);});return function(a,b,c,d,e){a=e;p?(p.push(b),p.push(c),p.push(d),p.push(a)):(l.transcludeOnThisElement&&(a=M(b,l.transclude,e)),l(m,b,c,d,a))}}function F(a,b){var c=b.priority-a.priority;return 0!==c?c:a.name!==b.name?a.name<b.name?-1:1:a.index-b.index}function fb(a,b,c,d){if(b)throw ja("multidir",b.name,c.name,a,ia(d));}function x(a,
+c){var d=b(c,!0);d&&a.push({priority:0,compile:function(a){var b=a.parent().length;b&&ba(a.parent(),"ng-binding");return function(a,c){var e=c.parent(),f=e.data("$binding")||[];f.push(d);e.data("$binding",f);b||ba(e,"ng-binding");a.$watch(d,function(a){c[0].nodeValue=a})}}})}function z(a,b){if("srcdoc"==b)return t.HTML;var c=Pa(a);if("xlinkHref"==b||"FORM"==c&&"action"==b||"IMG"!=c&&("src"==b||"ngSrc"==b))return t.RESOURCE_URL}function S(a,c,d,e){var f=b(d,!0);if(f){if("multiple"===e&&"SELECT"===
+Pa(a))throw ja("selmulti",ia(a));c.push({priority:100,compile:function(){return{pre:function(c,d,k){d=k.$$observers||(k.$$observers={});if(g.test(e))throw ja("nodomevents");if(f=b(k[e],!0,z(a,e)))k[e]=f(c),(d[e]||(d[e]=[])).$$inter=!0,(k.$$observers&&k.$$observers[e].$$scope||c).$watch(f,function(a,b){"class"===e&&a!=b?k.$updateClass(a,b):k.$set(e,a)})}}}})}}function ra(a,b,c){var d=b[0],e=b.length,f=d.parentNode,g,k;if(a)for(g=0,k=a.length;g<k;g++)if(a[g]==d){a[g++]=c;k=g+e-1;for(var p=a.length;g<
+p;g++,k++)k<p?a[g]=a[k]:delete a[g];a.length-=e-1;break}f&&f.replaceChild(c,d);a=X.createDocumentFragment();a.appendChild(d);c[A.expando]=d[A.expando];d=1;for(e=b.length;d<e;d++)f=b[d],A(f).remove(),a.appendChild(f),delete b[d];b[0]=c;b.length=1}function rc(a,b){return E(function(){return a.apply(null,arguments)},a,b)}var Ob=function(a,b){this.$$element=a;this.$attr=b||{}};Ob.prototype={$normalize:qa,$addClass:function(a){a&&0<a.length&&y.addClass(this.$$element,a)},$removeClass:function(a){a&&0<
+a.length&&y.removeClass(this.$$element,a)},$updateClass:function(a,b){var c=sc(a,b),d=sc(b,a);0===c.length?y.removeClass(this.$$element,d):0===d.length?y.addClass(this.$$element,c):y.setClass(this.$$element,c,d)},$set:function(a,b,c,d){var e=oc(this.$$element[0],a);e&&(this.$$element.prop(a,b),d=e);this[a]=b;d?this.$attr[a]=d:(d=this.$attr[a])||(this.$attr[a]=d=nb(a,"-"));e=Pa(this.$$element);if("A"===e&&"href"===a||"IMG"===e&&"src"===a)this[a]=b=K(b,"src"===a);!1!==c&&(null===b||b===u?this.$$element.removeAttr(d):
+this.$$element.attr(d,b));(c=this.$$observers)&&r(c[a],function(a){try{a(b)}catch(c){l(c)}})},$observe:function(a,b){var c=this,d=c.$$observers||(c.$$observers={}),e=d[a]||(d[a]=[]);e.push(b);J.$evalAsync(function(){e.$$inter||b(c[a])});return b}};var sa=b.startSymbol(),Ia=b.endSymbol(),W="{{"==sa||"}}"==Ia?ga:function(a){return a.replace(/\{\{/g,sa).replace(/}}/g,Ia)},U=/^ngAttr[A-Z]/;return B}]}function qa(b){return ab(b.replace(we,""))}function sc(b,a){var c="",d=b.split(/\s+/),e=a.split(/\s+/),
+f=0;a:for(;f<d.length;f++){for(var g=d[f],h=0;h<e.length;h++)if(g==e[h])continue a;c+=(0<c.length?" ":"")+g}return c}function Od(){var b={},a=/^(\S+)(\s+as\s+(\w+))?$/;this.register=function(a,d){Ea(a,"controller");T(a)?E(b,a):b[a]=d};this.$get=["$injector","$window",function(c,d){return function(e,f){var g,h,k;G(e)&&(g=e.match(a),h=g[1],k=g[3],e=b.hasOwnProperty(h)?b[h]:fc(f.$scope,h,!0)||fc(d,h,!0),Ya(e,h,!0));g=c.instantiate(e,f);if(k){if(!f||"object"!==typeof f.$scope)throw z("$controller")("noscp",
+h||e.name,k);f.$scope[k]=g}return g}}]}function Pd(){this.$get=["$window",function(b){return A(b.document)}]}function Qd(){this.$get=["$log",function(b){return function(a,c){b.error.apply(b,arguments)}}]}function tc(b){var a={},c,d,e;if(!b)return a;r(b.split("\n"),function(b){e=b.indexOf(":");c=x($(b.substr(0,e)));d=$(b.substr(e+1));c&&(a[c]=a[c]?a[c]+", "+d:d)});return a}function uc(b){var a=T(b)?b:u;return function(c){a||(a=tc(b));return c?a[x(c)]||null:a}}function vc(b,a,c){if(N(c))return c(b,
+a);r(c,function(c){b=c(b,a)});return b}function Td(){var b=/^\s*(\[|\{[^\{])/,a=/[\}\]]\s*$/,c=/^\)\]\}',?\n/,d={"Content-Type":"application/json;charset=utf-8"},e=this.defaults={transformResponse:[function(d){G(d)&&(d=d.replace(c,""),b.test(d)&&a.test(d)&&(d=ac(d)));return d}],transformRequest:[function(a){return T(a)&&"[object File]"!==Ba.call(a)&&"[object Blob]"!==Ba.call(a)?oa(a):a}],headers:{common:{Accept:"application/json, text/plain, */*"},post:ha(d),put:ha(d),patch:ha(d)},xsrfCookieName:"XSRF-TOKEN",
+xsrfHeaderName:"X-XSRF-TOKEN"},f=this.interceptors=[],g=this.responseInterceptors=[];this.$get=["$httpBackend","$browser","$cacheFactory","$rootScope","$q","$injector",function(a,b,c,d,n,q){function p(a){function b(a){var d=E({},a,{data:vc(a.data,a.headers,c.transformResponse)});return 200<=a.status&&300>a.status?d:n.reject(d)}var c={method:"get",transformRequest:e.transformRequest,transformResponse:e.transformResponse},d=function(a){var b=e.headers,c=E({},a.headers),d,f,b=E({},b.common,b[x(a.method)]);
+a:for(d in b){a=x(d);for(f in c)if(x(f)===a)continue a;c[d]=b[d]}(function(a){var b;r(a,function(c,d){N(c)&&(b=c(),null!=b?a[d]=b:delete a[d])})})(c);return c}(a);E(c,a);c.headers=d;c.method=La(c.method);var f=[function(a){d=a.headers;var c=vc(a.data,uc(d),a.transformRequest);F(c)&&r(d,function(a,b){"content-type"===x(b)&&delete d[b]});F(a.withCredentials)&&!F(e.withCredentials)&&(a.withCredentials=e.withCredentials);return s(a,c,d).then(b,b)},u],g=n.when(c);for(r(t,function(a){(a.request||a.requestError)&&
+f.unshift(a.request,a.requestError);(a.response||a.responseError)&&f.push(a.response,a.responseError)});f.length;){a=f.shift();var h=f.shift(),g=g.then(a,h)}g.success=function(a){g.then(function(b){a(b.data,b.status,b.headers,c)});return g};g.error=function(a){g.then(null,function(b){a(b.data,b.status,b.headers,c)});return g};return g}function s(c,f,g){function m(a,b,c,e){C&&(200<=a&&300>a?C.put(A,[a,b,tc(c),e]):C.remove(A));q(b,a,c,e);d.$$phase||d.$apply()}function q(a,b,d,e){b=Math.max(b,0);(200<=
+b&&300>b?t.resolve:t.reject)({data:a,status:b,headers:uc(d),config:c,statusText:e})}function s(){var a=Ta(p.pendingRequests,c);-1!==a&&p.pendingRequests.splice(a,1)}var t=n.defer(),r=t.promise,C,I,A=J(c.url,c.params);p.pendingRequests.push(c);r.then(s,s);!c.cache&&!e.cache||(!1===c.cache||"GET"!==c.method&&"JSONP"!==c.method)||(C=T(c.cache)?c.cache:T(e.cache)?e.cache:w);if(C)if(I=C.get(A),D(I)){if(I&&N(I.then))return I.then(s,s),I;L(I)?q(I[1],I[0],ha(I[2]),I[3]):q(I,200,{},"OK")}else C.put(A,r);F(I)&&
+((I=Pb(c.url)?b.cookies()[c.xsrfCookieName||e.xsrfCookieName]:u)&&(g[c.xsrfHeaderName||e.xsrfHeaderName]=I),a(c.method,A,f,m,g,c.timeout,c.withCredentials,c.responseType));return r}function J(a,b){if(!b)return a;var c=[];Sc(b,function(a,b){null===a||F(a)||(L(a)||(a=[a]),r(a,function(a){T(a)&&(a=va(a)?a.toISOString():oa(a));c.push(Da(b)+"="+Da(a))}))});0<c.length&&(a+=(-1==a.indexOf("?")?"?":"&")+c.join("&"));return a}var w=c("$http"),t=[];r(f,function(a){t.unshift(G(a)?q.get(a):q.invoke(a))});r(g,
+function(a,b){var c=G(a)?q.get(a):q.invoke(a);t.splice(b,0,{response:function(a){return c(n.when(a))},responseError:function(a){return c(n.reject(a))}})});p.pendingRequests=[];(function(a){r(arguments,function(a){p[a]=function(b,c){return p(E(c||{},{method:a,url:b}))}})})("get","delete","head","jsonp");(function(a){r(arguments,function(a){p[a]=function(b,c,d){return p(E(d||{},{method:a,url:b,data:c}))}})})("post","put","patch");p.defaults=e;return p}]}function xe(b){if(8>=R&&(!b.match(/^(get|post|head|put|delete|options)$/i)||
+!W.XMLHttpRequest))return new W.ActiveXObject("Microsoft.XMLHTTP");if(W.XMLHttpRequest)return new W.XMLHttpRequest;throw z("$httpBackend")("noxhr");}function Ud(){this.$get=["$browser","$window","$document",function(b,a,c){return ye(b,xe,b.defer,a.angular.callbacks,c[0])}]}function ye(b,a,c,d,e){function f(a,b,c){var f=e.createElement("script"),g=null;f.type="text/javascript";f.src=a;f.async=!0;g=function(a){bb(f,"load",g);bb(f,"error",g);e.body.removeChild(f);f=null;var h=-1,s="unknown";a&&("load"!==
+a.type||d[b].called||(a={type:"error"}),s=a.type,h="error"===a.type?404:200);c&&c(h,s)};sb(f,"load",g);sb(f,"error",g);8>=R&&(f.onreadystatechange=function(){G(f.readyState)&&/loaded|complete/.test(f.readyState)&&(f.onreadystatechange=null,g({type:"load"}))});e.body.appendChild(f);return g}var g=-1;return function(e,k,m,l,n,q,p,s){function J(){t=g;K&&K();B&&B.abort()}function w(a,d,e,f,g){O&&c.cancel(O);K=B=null;0===d&&(d=e?200:"file"==xa(k).protocol?404:0);a(1223===d?204:d,e,f,g||"");b.$$completeOutstandingRequest(v)}
+var t;b.$$incOutstandingRequestCount();k=k||b.url();if("jsonp"==x(e)){var y="_"+(d.counter++).toString(36);d[y]=function(a){d[y].data=a;d[y].called=!0};var K=f(k.replace("JSON_CALLBACK","angular.callbacks."+y),y,function(a,b){w(l,a,d[y].data,"",b);d[y]=v})}else{var B=a(e);B.open(e,k,!0);r(n,function(a,b){D(a)&&B.setRequestHeader(b,a)});B.onreadystatechange=function(){if(B&&4==B.readyState){var a=null,b=null,c="";t!==g&&(a=B.getAllResponseHeaders(),b="response"in B?B.response:B.responseText);t===g&&
+10>R||(c=B.statusText);w(l,t||B.status,b,a,c)}};p&&(B.withCredentials=!0);if(s)try{B.responseType=s}catch(ba){if("json"!==s)throw ba;}B.send(m||null)}if(0<q)var O=c(J,q);else q&&N(q.then)&&q.then(J)}}function Rd(){var b="{{",a="}}";this.startSymbol=function(a){return a?(b=a,this):b};this.endSymbol=function(b){return b?(a=b,this):a};this.$get=["$parse","$exceptionHandler","$sce",function(c,d,e){function f(f,m,l){for(var n,q,p=0,s=[],J=f.length,w=!1,t=[];p<J;)-1!=(n=f.indexOf(b,p))&&-1!=(q=f.indexOf(a,
+n+g))?(p!=n&&s.push(f.substring(p,n)),s.push(p=c(w=f.substring(n+g,q))),p.exp=w,p=q+h,w=!0):(p!=J&&s.push(f.substring(p)),p=J);(J=s.length)||(s.push(""),J=1);if(l&&1<s.length)throw wc("noconcat",f);if(!m||w)return t.length=J,p=function(a){try{for(var b=0,c=J,g;b<c;b++){if("function"==typeof(g=s[b]))if(g=g(a),g=l?e.getTrusted(l,g):e.valueOf(g),null==g)g="";else switch(typeof g){case "string":break;case "number":g=""+g;break;default:g=oa(g)}t[b]=g}return t.join("")}catch(h){a=wc("interr",f,h.toString()),
+d(a)}},p.exp=f,p.parts=s,p}var g=b.length,h=a.length;f.startSymbol=function(){return b};f.endSymbol=function(){return a};return f}]}function Sd(){this.$get=["$rootScope","$window","$q",function(b,a,c){function d(d,g,h,k){var m=a.setInterval,l=a.clearInterval,n=c.defer(),q=n.promise,p=0,s=D(k)&&!k;h=D(h)?h:0;q.then(null,null,d);q.$$intervalId=m(function(){n.notify(p++);0<h&&p>=h&&(n.resolve(p),l(q.$$intervalId),delete e[q.$$intervalId]);s||b.$apply()},g);e[q.$$intervalId]=n;return q}var e={};d.cancel=
+function(b){return b&&b.$$intervalId in e?(e[b.$$intervalId].reject("canceled"),a.clearInterval(b.$$intervalId),delete e[b.$$intervalId],!0):!1};return d}]}function ad(){this.$get=function(){return{id:"en-us",NUMBER_FORMATS:{DECIMAL_SEP:".",GROUP_SEP:",",PATTERNS:[{minInt:1,minFrac:0,maxFrac:3,posPre:"",posSuf:"",negPre:"-",negSuf:"",gSize:3,lgSize:3},{minInt:1,minFrac:2,maxFrac:2,posPre:"\u00a4",posSuf:"",negPre:"(\u00a4",negSuf:")",gSize:3,lgSize:3}],CURRENCY_SYM:"$"},DATETIME_FORMATS:{MONTH:"January February March April May June July August September October November December".split(" "),
 SHORTMONTH:"Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "),DAY:"Sunday Monday Tuesday Wednesday Thursday Friday Saturday".split(" "),SHORTDAY:"Sun Mon Tue Wed Thu Fri Sat".split(" "),AMPMS:["AM","PM"],medium:"MMM d, y h:mm:ss a","short":"M/d/yy h:mm a",fullDate:"EEEE, MMMM d, y",longDate:"MMMM d, y",mediumDate:"MMM d, y",shortDate:"M/d/yy",mediumTime:"h:mm:ss a",shortTime:"h:mm a"},pluralCat:function(b){return 1===b?"one":"other"}}}}function Qb(b){b=b.split("/");for(var a=b.length;a--;)b[a]=
-lb(b[a]);return b.join("/")}function zc(b,a,c){b=ua(b,c);a.$$protocol=b.protocol;a.$$host=b.hostname;a.$$port=U(b.port)||ze[b.protocol]||null}function Ac(b,a,c){var d="/"!==b.charAt(0);d&&(b="/"+b);b=ua(b,c);a.$$path=decodeURIComponent(d&&"/"===b.pathname.charAt(0)?b.pathname.substring(1):b.pathname);a.$$search=ec(b.search);a.$$hash=decodeURIComponent(b.hash);a.$$path&&"/"!=a.$$path.charAt(0)&&(a.$$path="/"+a.$$path)}function ra(b,a){if(0===a.indexOf(b))return a.substr(b.length)}function eb(b){var a=
-b.indexOf("#");return-1==a?b:b.substr(0,a)}function Rb(b){return b.substr(0,eb(b).lastIndexOf("/")+1)}function Bc(b,a){this.$$html5=!0;a=a||"";var c=Rb(b);zc(b,this,b);this.$$parse=function(a){var e=ra(c,a);if(!v(e))throw Sb("ipthprfx",a,c);Ac(e,this,b);this.$$path||(this.$$path="/");this.$$compose()};this.$$compose=function(){var a=Cb(this.$$search),b=this.$$hash?"#"+lb(this.$$hash):"";this.$$url=Qb(this.$$path)+(a?"?"+a:"")+b;this.$$absUrl=c+this.$$url.substr(1)};this.$$rewrite=function(d){var e;
-if((e=ra(b,d))!==t)return d=e,(e=ra(a,e))!==t?c+(ra("/",e)||e):b+d;if((e=ra(c,d))!==t)return c+e;if(c==d+"/")return c}}function Tb(b,a){var c=Rb(b);zc(b,this,b);this.$$parse=function(d){var e=ra(b,d)||ra(c,d),e="#"==e.charAt(0)?ra(a,e):this.$$html5?e:"";if(!v(e))throw Sb("ihshprfx",d,a);Ac(e,this,b);d=this.$$path;var f=/^\/[A-Z]:(\/.*)/;0===e.indexOf(b)&&(e=e.replace(b,""));f.exec(e)||(d=(e=f.exec(d))?e[1]:d);this.$$path=d;this.$$compose()};this.$$compose=function(){var c=Cb(this.$$search),e=this.$$hash?
-"#"+lb(this.$$hash):"";this.$$url=Qb(this.$$path)+(c?"?"+c:"")+e;this.$$absUrl=b+(this.$$url?a+this.$$url:"")};this.$$rewrite=function(a){if(eb(b)==eb(a))return a}}function Ub(b,a){this.$$html5=!0;Tb.apply(this,arguments);var c=Rb(b);this.$$rewrite=function(d){var e;if(b==eb(d))return d;if(e=ra(c,d))return b+a+e;if(c===d+"/")return c};this.$$compose=function(){var c=Cb(this.$$search),e=this.$$hash?"#"+lb(this.$$hash):"";this.$$url=Qb(this.$$path)+(c?"?"+c:"")+e;this.$$absUrl=b+a+this.$$url}}function tb(b){return function(){return this[b]}}
-function Cc(b,a){return function(c){if(x(c))return this[b];this[b]=a(c);this.$$compose();return this}}function Wd(){var b="",a=!1;this.hashPrefix=function(a){return y(a)?(b=a,this):b};this.html5Mode=function(b){return y(b)?(a=b,this):a};this.$get=["$rootScope","$browser","$sniffer","$rootElement",function(c,d,e,f){function g(a){c.$broadcast("$locationChangeSuccess",k.absUrl(),a)}var k,m,h=d.baseHref(),l=d.url(),n;a?(n=l.substring(0,l.indexOf("/",l.indexOf("//")+2))+(h||"/"),m=e.history?Bc:Ub):(n=
-eb(l),m=Tb);k=new m(n,"#"+b);k.$$parse(k.$$rewrite(l));var p=/^\s*(javascript|mailto):/i;f.on("click",function(a){if(!a.ctrlKey&&!a.metaKey&&2!=a.which){for(var e=w(a.target);"a"!==K(e[0].nodeName);)if(e[0]===f[0]||!(e=e.parent())[0])return;var g=e.prop("href");T(g)&&"[object SVGAnimatedString]"===g.toString()&&(g=ua(g.animVal).href);if(!p.test(g)){if(m===Ub){var h=e.attr("href")||e.attr("xlink:href");if(h&&0>h.indexOf("://"))if(g="#"+b,"/"==h[0])g=n+g+h;else if("#"==h[0])g=n+g+(k.path()||"/")+h;
-else{var l=k.path().split("/"),h=h.split("/");2!==l.length||l[1]||(l.length=1);for(var q=0;q<h.length;q++)"."!=h[q]&&(".."==h[q]?l.pop():h[q].length&&l.push(h[q]));g=n+g+l.join("/")}}l=k.$$rewrite(g);g&&(!e.attr("target")&&l&&!a.isDefaultPrevented())&&(a.preventDefault(),l!=d.url()&&(k.$$parse(l),c.$apply(),W.angular["ff-684208-preventDefault"]=!0))}}});k.absUrl()!=l&&d.url(k.absUrl(),!0);d.onUrlChange(function(a){k.absUrl()!=a&&(c.$evalAsync(function(){var b=k.absUrl();k.$$parse(a);c.$broadcast("$locationChangeStart",
-a,b).defaultPrevented?(k.$$parse(b),d.url(b)):g(b)}),c.$$phase||c.$digest())});var q=0;c.$watch(function(){var a=d.url(),b=k.$$replace;q&&a==k.absUrl()||(q++,c.$evalAsync(function(){c.$broadcast("$locationChangeStart",k.absUrl(),a).defaultPrevented?k.$$parse(a):(d.url(k.absUrl(),b),g(a))}));k.$$replace=!1;return q});return k}]}function Xd(){var b=!0,a=this;this.debugEnabled=function(a){return y(a)?(b=a,this):b};this.$get=["$window",function(c){function d(a){a instanceof Error&&(a.stack?a=a.message&&
--1===a.stack.indexOf(a.message)?"Error: "+a.message+"\n"+a.stack:a.stack:a.sourceURL&&(a=a.message+"\n"+a.sourceURL+":"+a.line));return a}function e(a){var b=c.console||{},e=b[a]||b.log||E;a=!1;try{a=!!e.apply}catch(m){}return a?function(){var a=[];r(arguments,function(b){a.push(d(b))});return e.apply(b,a)}:function(a,b){e(a,null==b?"":b)}}return{log:e("log"),info:e("info"),warn:e("warn"),error:e("error"),debug:function(){var c=e("debug");return function(){b&&c.apply(a,arguments)}}()}}]}function ka(b,
-a){if("__defineGetter__"===b||"__defineSetter__"===b||"__lookupGetter__"===b||"__lookupSetter__"===b||"__proto__"===b)throw la("isecfld",a);return b}function va(b,a){if(b){if(b.constructor===b)throw la("isecfn",a);if(b.document&&b.location&&b.alert&&b.setInterval)throw la("isecwindow",a);if(b.children&&(b.nodeName||b.prop&&b.attr&&b.find))throw la("isecdom",a);if(b===Object)throw la("isecobj",a);}return b}function ub(b,a,c,d,e){va(b,d);e=e||{};a=a.split(".");for(var f,g=0;1<a.length;g++){f=ka(a.shift(),
-d);var k=va(b[f],d);k||(k={},b[f]=k);b=k;b.then&&e.unwrapPromises&&(wa(d),"$$v"in b||function(a){a.then(function(b){a.$$v=b})}(b),b.$$v===t&&(b.$$v={}),b=b.$$v)}f=ka(a.shift(),d);va(b[f],d);return b[f]=c}function Dc(b,a,c,d,e,f,g){ka(b,f);ka(a,f);ka(c,f);ka(d,f);ka(e,f);return g.unwrapPromises?function(g,m){var h=m&&m.hasOwnProperty(b)?m:g,l;if(null==h)return h;(h=h[b])&&h.then&&(wa(f),"$$v"in h||(l=h,l.$$v=t,l.then(function(a){l.$$v=a})),h=h.$$v);if(!a)return h;if(null==h)return t;(h=h[a])&&h.then&&
-(wa(f),"$$v"in h||(l=h,l.$$v=t,l.then(function(a){l.$$v=a})),h=h.$$v);if(!c)return h;if(null==h)return t;(h=h[c])&&h.then&&(wa(f),"$$v"in h||(l=h,l.$$v=t,l.then(function(a){l.$$v=a})),h=h.$$v);if(!d)return h;if(null==h)return t;(h=h[d])&&h.then&&(wa(f),"$$v"in h||(l=h,l.$$v=t,l.then(function(a){l.$$v=a})),h=h.$$v);if(!e)return h;if(null==h)return t;(h=h[e])&&h.then&&(wa(f),"$$v"in h||(l=h,l.$$v=t,l.then(function(a){l.$$v=a})),h=h.$$v);return h}:function(f,g){var h=g&&g.hasOwnProperty(b)?g:f;if(null==
-h)return h;h=h[b];if(!a)return h;if(null==h)return t;h=h[a];if(!c)return h;if(null==h)return t;h=h[c];if(!d)return h;if(null==h)return t;h=h[d];return e?null==h?t:h=h[e]:h}}function Ec(b,a,c){if(Vb.hasOwnProperty(b))return Vb[b];var d=b.split("."),e=d.length,f;if(a.csp)f=6>e?Dc(d[0],d[1],d[2],d[3],d[4],c,a):function(b,f){var g=0,k;do k=Dc(d[g++],d[g++],d[g++],d[g++],d[g++],c,a)(b,f),f=t,b=k;while(g<e);return k};else{var g="var p;\n";r(d,function(b,d){ka(b,c);g+="if(s == null) return undefined;\ns="+
-(d?"s":'((k&&k.hasOwnProperty("'+b+'"))?k:s)')+'["'+b+'"];\n'+(a.unwrapPromises?'if (s && s.then) {\n pw("'+c.replace(/(["\r\n])/g,"\\$1")+'");\n if (!("$$v" in s)) {\n p=s;\n p.$$v = undefined;\n p.then(function(v) {p.$$v=v;});\n}\n s=s.$$v\n}\n':"")});var g=g+"return s;",k=new Function("s","k","pw",g);k.toString=ba(g);f=a.unwrapPromises?function(a,b){return k(a,b,wa)}:k}"hasOwnProperty"!==b&&(Vb[b]=f);return f}function Yd(){var b={},a={csp:!1,unwrapPromises:!1,logPromiseWarnings:!0};this.unwrapPromises=
-function(b){return y(b)?(a.unwrapPromises=!!b,this):a.unwrapPromises};this.logPromiseWarnings=function(b){return y(b)?(a.logPromiseWarnings=b,this):a.logPromiseWarnings};this.$get=["$filter","$sniffer","$log",function(c,d,e){a.csp=d.csp;wa=function(b){a.logPromiseWarnings&&!Fc.hasOwnProperty(b)&&(Fc[b]=!0,e.warn("[$parse] Promise found in the expression `"+b+"`. Automatic unwrapping of promises in Angular expressions is deprecated."))};return function(d){var e;switch(typeof d){case "string":if(b.hasOwnProperty(d))return b[d];
-e=new Wb(a);e=(new fb(e,c,a)).parse(d);"hasOwnProperty"!==d&&(b[d]=e);return e;case "function":return d;default:return E}}}]}function $d(){this.$get=["$rootScope","$exceptionHandler",function(b,a){return Ae(function(a){b.$evalAsync(a)},a)}]}function Ae(b,a){function c(a){return a}function d(a){return g(a)}var e=function(){var g=[],h,l;return l={resolve:function(a){if(g){var c=g;g=t;h=f(a);c.length&&b(function(){for(var a,b=0,d=c.length;b<d;b++)a=c[b],h.then(a[0],a[1],a[2])})}},reject:function(a){l.resolve(k(a))},
-notify:function(a){if(g){var c=g;g.length&&b(function(){for(var b,d=0,e=c.length;d<e;d++)b=c[d],b[2](a)})}},promise:{then:function(b,f,k){var l=e(),F=function(d){try{l.resolve((P(b)?b:c)(d))}catch(e){l.reject(e),a(e)}},u=function(b){try{l.resolve((P(f)?f:d)(b))}catch(c){l.reject(c),a(c)}},A=function(b){try{l.notify((P(k)?k:c)(b))}catch(d){a(d)}};g?g.push([F,u,A]):h.then(F,u,A);return l.promise},"catch":function(a){return this.then(null,a)},"finally":function(a){function b(a,c){var d=e();c?d.resolve(a):
-d.reject(a);return d.promise}function d(e,f){var g=null;try{g=(a||c)()}catch(k){return b(k,!1)}return g&&P(g.then)?g.then(function(){return b(e,f)},function(a){return b(a,!1)}):b(e,f)}return this.then(function(a){return d(a,!0)},function(a){return d(a,!1)})}}}},f=function(a){return a&&P(a.then)?a:{then:function(c){var d=e();b(function(){d.resolve(c(a))});return d.promise}}},g=function(a){var b=e();b.reject(a);return b.promise},k=function(c){return{then:function(f,g){var k=e();b(function(){try{k.resolve((P(g)?
-g:d)(c))}catch(b){k.reject(b),a(b)}});return k.promise}}};return{defer:e,reject:g,when:function(k,h,l,n){var p=e(),q,s=function(b){try{return(P(h)?h:c)(b)}catch(d){return a(d),g(d)}},F=function(b){try{return(P(l)?l:d)(b)}catch(c){return a(c),g(c)}},u=function(b){try{return(P(n)?n:c)(b)}catch(d){a(d)}};b(function(){f(k).then(function(a){q||(q=!0,p.resolve(f(a).then(s,F,u)))},function(a){q||(q=!0,p.resolve(F(a)))},function(a){q||p.notify(u(a))})});return p.promise},all:function(a){var b=e(),c=0,d=J(a)?
-[]:{};r(a,function(a,e){c++;f(a).then(function(a){d.hasOwnProperty(e)||(d[e]=a,--c||b.resolve(d))},function(a){d.hasOwnProperty(e)||b.reject(a)})});0===c&&b.resolve(d);return b.promise}}}function ge(){this.$get=["$window","$timeout",function(b,a){var c=b.requestAnimationFrame||b.webkitRequestAnimationFrame||b.mozRequestAnimationFrame,d=b.cancelAnimationFrame||b.webkitCancelAnimationFrame||b.mozCancelAnimationFrame||b.webkitCancelRequestAnimationFrame,e=!!c,f=e?function(a){var b=c(a);return function(){d(b)}}:
-function(b){var c=a(b,16.66,!1);return function(){a.cancel(c)}};f.supported=e;return f}]}function Zd(){var b=10,a=C("$rootScope"),c=null;this.digestTtl=function(a){arguments.length&&(b=a);return b};this.$get=["$injector","$exceptionHandler","$parse","$browser",function(d,e,f,g){function k(){this.$id=hb();this.$$phase=this.$parent=this.$$watchers=this.$$nextSibling=this.$$prevSibling=this.$$childHead=this.$$childTail=null;this["this"]=this.$root=this;this.$$destroyed=!1;this.$$asyncQueue=[];this.$$postDigestQueue=
-[];this.$$listeners={};this.$$listenerCount={};this.$$isolateBindings={}}function m(b){if(p.$$phase)throw a("inprog",p.$$phase);p.$$phase=b}function h(a,b){var c=f(a);Wa(c,b);return c}function l(a,b,c){do a.$$listenerCount[c]-=b,0===a.$$listenerCount[c]&&delete a.$$listenerCount[c];while(a=a.$parent)}function n(){}k.prototype={constructor:k,$new:function(a){a?(a=new k,a.$root=this.$root,a.$$asyncQueue=this.$$asyncQueue,a.$$postDigestQueue=this.$$postDigestQueue):(this.$$childScopeClass||(this.$$childScopeClass=
-function(){this.$$watchers=this.$$nextSibling=this.$$childHead=this.$$childTail=null;this.$$listeners={};this.$$listenerCount={};this.$id=hb();this.$$childScopeClass=null},this.$$childScopeClass.prototype=this),a=new this.$$childScopeClass);a["this"]=a;a.$parent=this;a.$$prevSibling=this.$$childTail;this.$$childHead?this.$$childTail=this.$$childTail.$$nextSibling=a:this.$$childHead=this.$$childTail=a;return a},$watch:function(a,b,d){var e=h(a,"watch"),f=this.$$watchers,g={fn:b,last:n,get:e,exp:a,
-eq:!!d};c=null;if(!P(b)){var k=h(b||E,"listener");g.fn=function(a,b,c){k(c)}}if("string"==typeof a&&e.constant){var l=g.fn;g.fn=function(a,b,c){l.call(this,a,b,c);Sa(f,g)}}f||(f=this.$$watchers=[]);f.unshift(g);return function(){Sa(f,g);c=null}},$watchCollection:function(a,b){var c=this,d,e,g,k=1<b.length,h=0,l=f(a),m=[],p={},n=!0,r=0;return this.$watch(function(){d=l(c);var a,b,f;if(T(d))if(Pa(d))for(e!==m&&(e=m,r=e.length=0,h++),a=d.length,r!==a&&(h++,e.length=r=a),b=0;b<a;b++)f=e[b]!==e[b]&&d[b]!==
-d[b],f||e[b]===d[b]||(h++,e[b]=d[b]);else{e!==p&&(e=p={},r=0,h++);a=0;for(b in d)d.hasOwnProperty(b)&&(a++,e.hasOwnProperty(b)?(f=e[b]!==e[b]&&d[b]!==d[b],f||e[b]===d[b]||(h++,e[b]=d[b])):(r++,e[b]=d[b],h++));if(r>a)for(b in h++,e)e.hasOwnProperty(b)&&!d.hasOwnProperty(b)&&(r--,delete e[b])}else e!==d&&(e=d,h++);return h},function(){n?(n=!1,b(d,d,c)):b(d,g,c);if(k)if(T(d))if(Pa(d)){g=Array(d.length);for(var a=0;a<d.length;a++)g[a]=d[a]}else for(a in g={},d)kb.call(d,a)&&(g[a]=d[a]);else g=d})},$digest:function(){var d,
-f,k,h,l=this.$$asyncQueue,r=this.$$postDigestQueue,R,z,t=b,L,O=[],w,B,I;m("$digest");g.$$checkUrlChange();c=null;do{z=!1;for(L=this;l.length;){try{I=l.shift(),I.scope.$eval(I.expression)}catch(H){p.$$phase=null,e(H)}c=null}a:do{if(h=L.$$watchers)for(R=h.length;R--;)try{if(d=h[R])if((f=d.get(L))!==(k=d.last)&&!(d.eq?Aa(f,k):"number"===typeof f&&"number"===typeof k&&isNaN(f)&&isNaN(k)))z=!0,c=d,d.last=d.eq?Ha(f,null):f,d.fn(f,k===n?f:k,L),5>t&&(w=4-t,O[w]||(O[w]=[]),B=P(d.exp)?"fn: "+(d.exp.name||d.exp.toString()):
-d.exp,B+="; newVal: "+na(f)+"; oldVal: "+na(k),O[w].push(B));else if(d===c){z=!1;break a}}catch(y){p.$$phase=null,e(y)}if(!(h=L.$$childHead||L!==this&&L.$$nextSibling))for(;L!==this&&!(h=L.$$nextSibling);)L=L.$parent}while(L=h);if((z||l.length)&&!t--)throw p.$$phase=null,a("infdig",b,na(O));}while(z||l.length);for(p.$$phase=null;r.length;)try{r.shift()()}catch(v){e(v)}},$destroy:function(){if(!this.$$destroyed){var a=this.$parent;this.$broadcast("$destroy");this.$$destroyed=!0;this!==p&&(r(this.$$listenerCount,
-Bb(null,l,this)),a.$$childHead==this&&(a.$$childHead=this.$$nextSibling),a.$$childTail==this&&(a.$$childTail=this.$$prevSibling),this.$$prevSibling&&(this.$$prevSibling.$$nextSibling=this.$$nextSibling),this.$$nextSibling&&(this.$$nextSibling.$$prevSibling=this.$$prevSibling),this.$parent=this.$$nextSibling=this.$$prevSibling=this.$$childHead=this.$$childTail=this.$root=null,this.$$listeners={},this.$$watchers=this.$$asyncQueue=this.$$postDigestQueue=[],this.$destroy=this.$digest=this.$apply=E,this.$on=
-this.$watch=function(){return E})}},$eval:function(a,b){return f(a)(this,b)},$evalAsync:function(a){p.$$phase||p.$$asyncQueue.length||g.defer(function(){p.$$asyncQueue.length&&p.$digest()});this.$$asyncQueue.push({scope:this,expression:a})},$$postDigest:function(a){this.$$postDigestQueue.push(a)},$apply:function(a){try{return m("$apply"),this.$eval(a)}catch(b){e(b)}finally{p.$$phase=null;try{p.$digest()}catch(c){throw e(c),c;}}},$on:function(a,b){var c=this.$$listeners[a];c||(this.$$listeners[a]=
-c=[]);c.push(b);var d=this;do d.$$listenerCount[a]||(d.$$listenerCount[a]=0),d.$$listenerCount[a]++;while(d=d.$parent);var e=this;return function(){c[Ra(c,b)]=null;l(e,1,a)}},$emit:function(a,b){var c=[],d,f=this,g=!1,k={name:a,targetScope:f,stopPropagation:function(){g=!0},preventDefault:function(){k.defaultPrevented=!0},defaultPrevented:!1},h=[k].concat(Ba.call(arguments,1)),l,m;do{d=f.$$listeners[a]||c;k.currentScope=f;l=0;for(m=d.length;l<m;l++)if(d[l])try{d[l].apply(null,h)}catch(p){e(p)}else d.splice(l,
-1),l--,m--;if(g)break;f=f.$parent}while(f);return k},$broadcast:function(a,b){for(var c=this,d=this,f={name:a,targetScope:this,preventDefault:function(){f.defaultPrevented=!0},defaultPrevented:!1},g=[f].concat(Ba.call(arguments,1)),k,h;c=d;){f.currentScope=c;d=c.$$listeners[a]||[];k=0;for(h=d.length;k<h;k++)if(d[k])try{d[k].apply(null,g)}catch(l){e(l)}else d.splice(k,1),k--,h--;if(!(d=c.$$listenerCount[a]&&c.$$childHead||c!==this&&c.$$nextSibling))for(;c!==this&&!(d=c.$$nextSibling);)c=c.$parent}return f}};
-var p=new k;return p}]}function cd(){var b=/^\s*(https?|ftp|mailto|tel|file):/,a=/^\s*((https?|ftp|file):|data:image\/)/;this.aHrefSanitizationWhitelist=function(a){return y(a)?(b=a,this):b};this.imgSrcSanitizationWhitelist=function(b){return y(b)?(a=b,this):a};this.$get=function(){return function(c,d){var e=d?a:b,f;if(!Q||8<=Q)if(f=ua(c).href,""!==f&&!f.match(e))return"unsafe:"+f;return c}}}function Be(b){if("self"===b)return b;if(v(b)){if(-1<b.indexOf("***"))throw xa("iwcard",b);b=b.replace(/([-()\[\]{}+?*.$\^|,:#<!\\])/g,
-"\\$1").replace(/\x08/g,"\\x08").replace("\\*\\*",".*").replace("\\*","[^:/.?&;]*");return RegExp("^"+b+"$")}if(jb(b))return RegExp("^"+b.source+"$");throw xa("imatcher");}function Gc(b){var a=[];y(b)&&r(b,function(b){a.push(Be(b))});return a}function be(){this.SCE_CONTEXTS=ga;var b=["self"],a=[];this.resourceUrlWhitelist=function(a){arguments.length&&(b=Gc(a));return b};this.resourceUrlBlacklist=function(b){arguments.length&&(a=Gc(b));return a};this.$get=["$injector",function(c){function d(a){var b=
-function(a){this.$$unwrapTrustedValue=function(){return a}};a&&(b.prototype=new a);b.prototype.valueOf=function(){return this.$$unwrapTrustedValue()};b.prototype.toString=function(){return this.$$unwrapTrustedValue().toString()};return b}var e=function(a){throw xa("unsafe");};c.has("$sanitize")&&(e=c.get("$sanitize"));var f=d(),g={};g[ga.HTML]=d(f);g[ga.CSS]=d(f);g[ga.URL]=d(f);g[ga.JS]=d(f);g[ga.RESOURCE_URL]=d(g[ga.URL]);return{trustAs:function(a,b){var c=g.hasOwnProperty(a)?g[a]:null;if(!c)throw xa("icontext",
-a,b);if(null===b||b===t||""===b)return b;if("string"!==typeof b)throw xa("itype",a);return new c(b)},getTrusted:function(c,d){if(null===d||d===t||""===d)return d;var f=g.hasOwnProperty(c)?g[c]:null;if(f&&d instanceof f)return d.$$unwrapTrustedValue();if(c===ga.RESOURCE_URL){var f=ua(d.toString()),l,n,p=!1;l=0;for(n=b.length;l<n;l++)if("self"===b[l]?Pb(f):b[l].exec(f.href)){p=!0;break}if(p)for(l=0,n=a.length;l<n;l++)if("self"===a[l]?Pb(f):a[l].exec(f.href)){p=!1;break}if(p)return d;throw xa("insecurl",
-d.toString());}if(c===ga.HTML)return e(d);throw xa("unsafe");},valueOf:function(a){return a instanceof f?a.$$unwrapTrustedValue():a}}}]}function ae(){var b=!0;this.enabled=function(a){arguments.length&&(b=!!a);return b};this.$get=["$parse","$sniffer","$sceDelegate",function(a,c,d){if(b&&c.msie&&8>c.msieDocumentMode)throw xa("iequirks");var e=ha(ga);e.isEnabled=function(){return b};e.trustAs=d.trustAs;e.getTrusted=d.getTrusted;e.valueOf=d.valueOf;b||(e.trustAs=e.getTrusted=function(a,b){return b},
-e.valueOf=Qa);e.parseAs=function(b,c){var d=a(c);return d.literal&&d.constant?d:function(a,c){return e.getTrusted(b,d(a,c))}};var f=e.parseAs,g=e.getTrusted,k=e.trustAs;r(ga,function(a,b){var c=K(b);e[Za("parse_as_"+c)]=function(b){return f(a,b)};e[Za("get_trusted_"+c)]=function(b){return g(a,b)};e[Za("trust_as_"+c)]=function(b){return k(a,b)}});return e}]}function ce(){this.$get=["$window","$document",function(b,a){var c={},d=U((/android (\d+)/.exec(K((b.navigator||{}).userAgent))||[])[1]),e=/Boxee/i.test((b.navigator||
-{}).userAgent),f=a[0]||{},g=f.documentMode,k,m=/^(Moz|webkit|O|ms)(?=[A-Z])/,h=f.body&&f.body.style,l=!1,n=!1;if(h){for(var p in h)if(l=m.exec(p)){k=l[0];k=k.substr(0,1).toUpperCase()+k.substr(1);break}k||(k="WebkitOpacity"in h&&"webkit");l=!!("transition"in h||k+"Transition"in h);n=!!("animation"in h||k+"Animation"in h);!d||l&&n||(l=v(f.body.style.webkitTransition),n=v(f.body.style.webkitAnimation))}return{history:!(!b.history||!b.history.pushState||4>d||e),hashchange:"onhashchange"in b&&(!g||7<
-g),hasEvent:function(a){if("input"==a&&9==Q)return!1;if(x(c[a])){var b=f.createElement("div");c[a]="on"+a in b}return c[a]},csp:Xa(),vendorPrefix:k,transitions:l,animations:n,android:d,msie:Q,msieDocumentMode:g}}]}function ee(){this.$get=["$rootScope","$browser","$q","$exceptionHandler",function(b,a,c,d){function e(e,k,m){var h=c.defer(),l=h.promise,n=y(m)&&!m;k=a.defer(function(){try{h.resolve(e())}catch(a){h.reject(a),d(a)}finally{delete f[l.$$timeoutId]}n||b.$apply()},k);l.$$timeoutId=k;f[k]=h;
-return l}var f={};e.cancel=function(b){return b&&b.$$timeoutId in f?(f[b.$$timeoutId].reject("canceled"),delete f[b.$$timeoutId],a.defer.cancel(b.$$timeoutId)):!1};return e}]}function ua(b,a){var c=b;Q&&(Y.setAttribute("href",c),c=Y.href);Y.setAttribute("href",c);return{href:Y.href,protocol:Y.protocol?Y.protocol.replace(/:$/,""):"",host:Y.host,search:Y.search?Y.search.replace(/^\?/,""):"",hash:Y.hash?Y.hash.replace(/^#/,""):"",hostname:Y.hostname,port:Y.port,pathname:"/"===Y.pathname.charAt(0)?Y.pathname:
-"/"+Y.pathname}}function Pb(b){b=v(b)?ua(b):b;return b.protocol===Hc.protocol&&b.host===Hc.host}function fe(){this.$get=ba(W)}function mc(b){function a(d,e){if(T(d)){var f={};r(d,function(b,c){f[c]=a(c,b)});return f}return b.factory(d+c,e)}var c="Filter";this.register=a;this.$get=["$injector",function(a){return function(b){return a.get(b+c)}}];a("currency",Ic);a("date",Jc);a("filter",Ce);a("json",De);a("limitTo",Ee);a("lowercase",Fe);a("number",Kc);a("orderBy",Lc);a("uppercase",Ge)}function Ce(){return function(b,
-a,c){if(!J(b))return b;var d=typeof c,e=[];e.check=function(a){for(var b=0;b<e.length;b++)if(!e[b](a))return!1;return!0};"function"!==d&&(c="boolean"===d&&c?function(a,b){return Va.equals(a,b)}:function(a,b){if(a&&b&&"object"===typeof a&&"object"===typeof b){for(var d in a)if("$"!==d.charAt(0)&&kb.call(a,d)&&c(a[d],b[d]))return!0;return!1}b=(""+b).toLowerCase();return-1<(""+a).toLowerCase().indexOf(b)});var f=function(a,b){if("string"==typeof b&&"!"===b.charAt(0))return!f(a,b.substr(1));switch(typeof a){case "boolean":case "number":case "string":return c(a,
-b);case "object":switch(typeof b){case "object":return c(a,b);default:for(var d in a)if("$"!==d.charAt(0)&&f(a[d],b))return!0}return!1;case "array":for(d=0;d<a.length;d++)if(f(a[d],b))return!0;return!1;default:return!1}};switch(typeof a){case "boolean":case "number":case "string":a={$:a};case "object":for(var g in a)(function(b){"undefined"!==typeof a[b]&&e.push(function(c){return f("$"==b?c:c&&c[b],a[b])})})(g);break;case "function":e.push(a);break;default:return b}d=[];for(g=0;g<b.length;g++){var k=
-b[g];e.check(k)&&d.push(k)}return d}}function Ic(b){var a=b.NUMBER_FORMATS;return function(b,d){x(d)&&(d=a.CURRENCY_SYM);return Mc(b,a.PATTERNS[1],a.GROUP_SEP,a.DECIMAL_SEP,2).replace(/\u00A4/g,d)}}function Kc(b){var a=b.NUMBER_FORMATS;return function(b,d){return Mc(b,a.PATTERNS[0],a.GROUP_SEP,a.DECIMAL_SEP,d)}}function Mc(b,a,c,d,e){if(null==b||!isFinite(b)||T(b))return"";var f=0>b;b=Math.abs(b);var g=b+"",k="",m=[],h=!1;if(-1!==g.indexOf("e")){var l=g.match(/([\d\.]+)e(-?)(\d+)/);l&&"-"==l[2]&&
-l[3]>e+1?(g="0",b=0):(k=g,h=!0)}if(h)0<e&&(-1<b&&1>b)&&(k=b.toFixed(e));else{g=(g.split(Nc)[1]||"").length;x(e)&&(e=Math.min(Math.max(a.minFrac,g),a.maxFrac));b=+(Math.round(+(b.toString()+"e"+e)).toString()+"e"+-e);0===b&&(f=!1);b=(""+b).split(Nc);g=b[0];b=b[1]||"";var l=0,n=a.lgSize,p=a.gSize;if(g.length>=n+p)for(l=g.length-n,h=0;h<l;h++)0===(l-h)%p&&0!==h&&(k+=c),k+=g.charAt(h);for(h=l;h<g.length;h++)0===(g.length-h)%n&&0!==h&&(k+=c),k+=g.charAt(h);for(;b.length<e;)b+="0";e&&"0"!==e&&(k+=d+b.substr(0,
-e))}m.push(f?a.negPre:a.posPre);m.push(k);m.push(f?a.negSuf:a.posSuf);return m.join("")}function Xb(b,a,c){var d="";0>b&&(d="-",b=-b);for(b=""+b;b.length<a;)b="0"+b;c&&(b=b.substr(b.length-a));return d+b}function $(b,a,c,d){c=c||0;return function(e){e=e["get"+b]();if(0<c||e>-c)e+=c;0===e&&-12==c&&(e=12);return Xb(e,a,d)}}function vb(b,a){return function(c,d){var e=c["get"+b](),f=Ia(a?"SHORT"+b:b);return d[f][e]}}function Jc(b){function a(a){var b;if(b=a.match(c)){a=new Date(0);var f=0,g=0,k=b[8]?
-a.setUTCFullYear:a.setFullYear,m=b[8]?a.setUTCHours:a.setHours;b[9]&&(f=U(b[9]+b[10]),g=U(b[9]+b[11]));k.call(a,U(b[1]),U(b[2])-1,U(b[3]));f=U(b[4]||0)-f;g=U(b[5]||0)-g;k=U(b[6]||0);b=Math.round(1E3*parseFloat("0."+(b[7]||0)));m.call(a,f,g,k,b)}return a}var c=/^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/;return function(c,e){var f="",g=[],k,m;e=e||"mediumDate";e=b.DATETIME_FORMATS[e]||e;v(c)&&(c=He.test(c)?U(c):a(c));ib(c)&&(c=new Date(c));
-if(!ta(c))return c;for(;e;)(m=Ie.exec(e))?(g=g.concat(Ba.call(m,1)),e=g.pop()):(g.push(e),e=null);r(g,function(a){k=Je[a];f+=k?k(c,b.DATETIME_FORMATS):a.replace(/(^'|'$)/g,"").replace(/''/g,"'")});return f}}function De(){return function(b){return na(b,!0)}}function Ee(){return function(b,a){if(!J(b)&&!v(b))return b;a=Infinity===Math.abs(Number(a))?Number(a):U(a);if(v(b))return a?0<=a?b.slice(0,a):b.slice(a,b.length):"";var c=[],d,e;a>b.length?a=b.length:a<-b.length&&(a=-b.length);0<a?(d=0,e=a):(d=
-b.length+a,e=b.length);for(;d<e;d++)c.push(b[d]);return c}}function Lc(b){return function(a,c,d){function e(a,b){return Ua(b)?function(b,c){return a(c,b)}:a}function f(a,b){var c=typeof a,d=typeof b;return c==d?(ta(a)&&ta(b)&&(a=a.valueOf(),b=b.valueOf()),"string"==c&&(a=a.toLowerCase(),b=b.toLowerCase()),a===b?0:a<b?-1:1):c<d?-1:1}if(!Pa(a)||!c)return a;c=J(c)?c:[c];c=Vc(c,function(a){var c=!1,d=a||Qa;if(v(a)){if("+"==a.charAt(0)||"-"==a.charAt(0))c="-"==a.charAt(0),a=a.substring(1);d=b(a);if(d.constant){var g=
-d();return e(function(a,b){return f(a[g],b[g])},c)}}return e(function(a,b){return f(d(a),d(b))},c)});for(var g=[],k=0;k<a.length;k++)g.push(a[k]);return g.sort(e(function(a,b){for(var d=0;d<c.length;d++){var e=c[d](a,b);if(0!==e)return e}return 0},d))}}function ya(b){P(b)&&(b={link:b});b.restrict=b.restrict||"AC";return ba(b)}function Oc(b,a,c,d){function e(a,c){c=c?"-"+mb(c,"-"):"";d.setClass(b,(a?wb:xb)+c,(a?xb:wb)+c)}var f=this,g=b.parent().controller("form")||yb,k=0,m=f.$error={},h=[];f.$name=
-a.name||a.ngForm;f.$dirty=!1;f.$pristine=!0;f.$valid=!0;f.$invalid=!1;g.$addControl(f);b.addClass(Oa);e(!0);f.$addControl=function(a){Da(a.$name,"input");h.push(a);a.$name&&(f[a.$name]=a)};f.$removeControl=function(a){a.$name&&f[a.$name]===a&&delete f[a.$name];r(m,function(b,c){f.$setValidity(c,!0,a)});Sa(h,a)};f.$setValidity=function(a,b,c){var d=m[a];if(b)d&&(Sa(d,c),d.length||(k--,k||(e(b),f.$valid=!0,f.$invalid=!1),m[a]=!1,e(!0,a),g.$setValidity(a,!0,f)));else{k||e(b);if(d){if(-1!=Ra(d,c))return}else m[a]=
-d=[],k++,e(!1,a),g.$setValidity(a,!1,f);d.push(c);f.$valid=!1;f.$invalid=!0}};f.$setDirty=function(){d.removeClass(b,Oa);d.addClass(b,zb);f.$dirty=!0;f.$pristine=!1;g.$setDirty()};f.$setPristine=function(){d.removeClass(b,zb);d.addClass(b,Oa);f.$dirty=!1;f.$pristine=!0;r(h,function(a){a.$setPristine()})}}function sa(b,a,c,d){b.$setValidity(a,c);return c?d:t}function Pc(b,a){var c,d;if(a)for(c=0;c<a.length;++c)if(d=a[c],b[d])return!0;return!1}function Ke(b,a,c,d,e){T(e)&&(b.$$hasNativeValidators=!0,
-b.$parsers.push(function(f){if(b.$error[a]||Pc(e,d)||!Pc(e,c))return f;b.$setValidity(a,!1)}))}function Ab(b,a,c,d,e,f){var g=a.prop(Le),k=a[0].placeholder,m={},h=K(a[0].type);d.$$validityState=g;if(!e.android){var l=!1;a.on("compositionstart",function(a){l=!0});a.on("compositionend",function(){l=!1;n()})}var n=function(e){if(!l){var f=a.val();if(Q&&"input"===(e||m).type&&a[0].placeholder!==k)k=a[0].placeholder;else if("password"!==h&&Ua(c.ngTrim||"T")&&(f=aa(f)),e=g&&d.$$hasNativeValidators,d.$viewValue!==
-f||""===f&&e)b.$root.$$phase?d.$setViewValue(f):b.$apply(function(){d.$setViewValue(f)})}};if(e.hasEvent("input"))a.on("input",n);else{var p,q=function(){p||(p=f.defer(function(){n();p=null}))};a.on("keydown",function(a){a=a.keyCode;91===a||(15<a&&19>a||37<=a&&40>=a)||q()});if(e.hasEvent("paste"))a.on("paste cut",q)}a.on("change",n);d.$render=function(){a.val(d.$isEmpty(d.$viewValue)?"":d.$viewValue)};var s=c.ngPattern;s&&((e=s.match(/^\/(.*)\/([gim]*)$/))?(s=RegExp(e[1],e[2]),e=function(a){return sa(d,
-"pattern",d.$isEmpty(a)||s.test(a),a)}):e=function(c){var e=b.$eval(s);if(!e||!e.test)throw C("ngPattern")("noregexp",s,e,ia(a));return sa(d,"pattern",d.$isEmpty(c)||e.test(c),c)},d.$formatters.push(e),d.$parsers.push(e));if(c.ngMinlength){var r=U(c.ngMinlength);e=function(a){return sa(d,"minlength",d.$isEmpty(a)||a.length>=r,a)};d.$parsers.push(e);d.$formatters.push(e)}if(c.ngMaxlength){var u=U(c.ngMaxlength);e=function(a){return sa(d,"maxlength",d.$isEmpty(a)||a.length<=u,a)};d.$parsers.push(e);
-d.$formatters.push(e)}}function Yb(b,a){b="ngClass"+b;return["$animate",function(c){function d(a,b){var c=[],d=0;a:for(;d<a.length;d++){for(var e=a[d],l=0;l<b.length;l++)if(e==b[l])continue a;c.push(e)}return c}function e(a){if(!J(a)){if(v(a))return a.split(" ");if(T(a)){var b=[];r(a,function(a,c){a&&(b=b.concat(c.split(" ")))});return b}}return a}return{restrict:"AC",link:function(f,g,k){function m(a,b){var c=g.data("$classCounts")||{},d=[];r(a,function(a){if(0<b||c[a])c[a]=(c[a]||0)+b,c[a]===+(0<
-b)&&d.push(a)});g.data("$classCounts",c);return d.join(" ")}function h(b){if(!0===a||f.$index%2===a){var h=e(b||[]);if(!l){var q=m(h,1);k.$addClass(q)}else if(!Aa(b,l)){var s=e(l),q=d(h,s),h=d(s,h),h=m(h,-1),q=m(q,1);0===q.length?c.removeClass(g,h):0===h.length?c.addClass(g,q):c.setClass(g,q,h)}}l=ha(b)}var l;f.$watch(k[b],h,!0);k.$observe("class",function(a){h(f.$eval(k[b]))});"ngClass"!==b&&f.$watch("$index",function(c,d){var g=c&1;if(g!==(d&1)){var h=e(f.$eval(k[b]));g===a?(g=m(h,1),k.$addClass(g)):
-(g=m(h,-1),k.$removeClass(g))}})}}}]}var Le="validity",K=function(b){return v(b)?b.toLowerCase():b},kb=Object.prototype.hasOwnProperty,Ia=function(b){return v(b)?b.toUpperCase():b},Q,w,Ea,Ba=[].slice,Me=[].push,za=Object.prototype.toString,Ta=C("ng"),Va=W.angular||(W.angular={}),Ya,Ma,ma=["0","0","0"];Q=U((/msie (\d+)/.exec(K(navigator.userAgent))||[])[1]);isNaN(Q)&&(Q=U((/trident\/.*; rv:(\d+)/.exec(K(navigator.userAgent))||[])[1]));E.$inject=[];Qa.$inject=[];var J=function(){return P(Array.isArray)?
-Array.isArray:function(b){return"[object Array]"===za.call(b)}}(),aa=function(){return String.prototype.trim?function(b){return v(b)?b.trim():b}:function(b){return v(b)?b.replace(/^\s\s*/,"").replace(/\s\s*$/,""):b}}();Ma=9>Q?function(b){b=b.nodeName?b:b[0];return b.scopeName&&"HTML"!=b.scopeName?Ia(b.scopeName+":"+b.nodeName):b.nodeName}:function(b){return b.nodeName?b.nodeName:b[0].nodeName};var Xa=function(){if(y(Xa.isActive_))return Xa.isActive_;var b=!(!X.querySelector("[ng-csp]")&&!X.querySelector("[data-ng-csp]"));
-if(!b)try{new Function("")}catch(a){b=!0}return Xa.isActive_=b},Yc=/[A-Z]/g,ad={full:"1.2.26",major:1,minor:2,dot:26,codeName:"captivating-disinterest"};S.expando="ng339";var ab=S.cache={},ne=1,sb=W.document.addEventListener?function(b,a,c){b.addEventListener(a,c,!1)}:function(b,a,c){b.attachEvent("on"+a,c)},$a=W.document.removeEventListener?function(b,a,c){b.removeEventListener(a,c,!1)}:function(b,a,c){b.detachEvent("on"+a,c)};S._data=function(b){return this.cache[b[this.expando]]||{}};var ie=/([\:\-\_]+(.))/g,
-je=/^moz([A-Z])/,Hb=C("jqLite"),ke=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,Ib=/<|&#?\w+;/,le=/<([\w:]+)/,me=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,ea={option:[1,'<select multiple="multiple">',"</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ea.optgroup=ea.option;ea.tbody=ea.tfoot=ea.colgroup=ea.caption=ea.thead;ea.th=
-ea.td;var La=S.prototype={ready:function(b){function a(){c||(c=!0,b())}var c=!1;"complete"===X.readyState?setTimeout(a):(this.on("DOMContentLoaded",a),S(W).on("load",a))},toString:function(){var b=[];r(this,function(a){b.push(""+a)});return"["+b.join(", ")+"]"},eq:function(b){return 0<=b?w(this[b]):w(this[this.length+b])},length:0,push:Me,sort:[].sort,splice:[].splice},qb={};r("multiple selected checked disabled readOnly required open".split(" "),function(b){qb[K(b)]=b});var rc={};r("input select option textarea button form details".split(" "),
-function(b){rc[Ia(b)]=!0});r({data:Mb,removeData:Lb},function(b,a){S[a]=b});r({data:Mb,inheritedData:pb,scope:function(b){return w.data(b,"$scope")||pb(b.parentNode||b,["$isolateScope","$scope"])},isolateScope:function(b){return w.data(b,"$isolateScope")||w.data(b,"$isolateScopeNoTemplate")},controller:oc,injector:function(b){return pb(b,"$injector")},removeAttr:function(b,a){b.removeAttribute(a)},hasClass:Nb,css:function(b,a,c){a=Za(a);if(y(c))b.style[a]=c;else{var d;8>=Q&&(d=b.currentStyle&&b.currentStyle[a],
-""===d&&(d="auto"));d=d||b.style[a];8>=Q&&(d=""===d?t:d);return d}},attr:function(b,a,c){var d=K(a);if(qb[d])if(y(c))c?(b[a]=!0,b.setAttribute(a,d)):(b[a]=!1,b.removeAttribute(d));else return b[a]||(b.attributes.getNamedItem(a)||E).specified?d:t;else if(y(c))b.setAttribute(a,c);else if(b.getAttribute)return b=b.getAttribute(a,2),null===b?t:b},prop:function(b,a,c){if(y(c))b[a]=c;else return b[a]},text:function(){function b(b,d){var e=a[b.nodeType];if(x(d))return e?b[e]:"";b[e]=d}var a=[];9>Q?(a[1]=
-"innerText",a[3]="nodeValue"):a[1]=a[3]="textContent";b.$dv="";return b}(),val:function(b,a){if(x(a)){if("SELECT"===Ma(b)&&b.multiple){var c=[];r(b.options,function(a){a.selected&&c.push(a.value||a.text)});return 0===c.length?null:c}return b.value}b.value=a},html:function(b,a){if(x(a))return b.innerHTML;for(var c=0,d=b.childNodes;c<d.length;c++)Ja(d[c]);b.innerHTML=a},empty:pc},function(b,a){S.prototype[a]=function(a,d){var e,f,g=this.length;if(b!==pc&&(2==b.length&&b!==Nb&&b!==oc?a:d)===t){if(T(a)){for(e=
-0;e<g;e++)if(b===Mb)b(this[e],a);else for(f in a)b(this[e],f,a[f]);return this}e=b.$dv;g=e===t?Math.min(g,1):g;for(f=0;f<g;f++){var k=b(this[f],a,d);e=e?e+k:k}return e}for(e=0;e<g;e++)b(this[e],a,d);return this}});r({removeData:Lb,dealoc:Ja,on:function a(c,d,e,f){if(y(f))throw Hb("onargs");var g=oa(c,"events"),k=oa(c,"handle");g||oa(c,"events",g={});k||oa(c,"handle",k=oe(c,g));r(d.split(" "),function(d){var f=g[d];if(!f){if("mouseenter"==d||"mouseleave"==d){var l=X.body.contains||X.body.compareDocumentPosition?
-function(a,c){var d=9===a.nodeType?a.documentElement:a,e=c&&c.parentNode;return a===e||!!(e&&1===e.nodeType&&(d.contains?d.contains(e):a.compareDocumentPosition&&a.compareDocumentPosition(e)&16))}:function(a,c){if(c)for(;c=c.parentNode;)if(c===a)return!0;return!1};g[d]=[];a(c,{mouseleave:"mouseout",mouseenter:"mouseover"}[d],function(a){var c=a.relatedTarget;c&&(c===this||l(this,c))||k(a,d)})}else sb(c,d,k),g[d]=[];f=g[d]}f.push(e)})},off:nc,one:function(a,c,d){a=w(a);a.on(c,function f(){a.off(c,
-d);a.off(c,f)});a.on(c,d)},replaceWith:function(a,c){var d,e=a.parentNode;Ja(a);r(new S(c),function(c){d?e.insertBefore(c,d.nextSibling):e.replaceChild(c,a);d=c})},children:function(a){var c=[];r(a.childNodes,function(a){1===a.nodeType&&c.push(a)});return c},contents:function(a){return a.contentDocument||a.childNodes||[]},append:function(a,c){r(new S(c),function(c){1!==a.nodeType&&11!==a.nodeType||a.appendChild(c)})},prepend:function(a,c){if(1===a.nodeType){var d=a.firstChild;r(new S(c),function(c){a.insertBefore(c,
-d)})}},wrap:function(a,c){c=w(c)[0];var d=a.parentNode;d&&d.replaceChild(c,a);c.appendChild(a)},remove:function(a){Ja(a);var c=a.parentNode;c&&c.removeChild(a)},after:function(a,c){var d=a,e=a.parentNode;r(new S(c),function(a){e.insertBefore(a,d.nextSibling);d=a})},addClass:ob,removeClass:nb,toggleClass:function(a,c,d){c&&r(c.split(" "),function(c){var f=d;x(f)&&(f=!Nb(a,c));(f?ob:nb)(a,c)})},parent:function(a){return(a=a.parentNode)&&11!==a.nodeType?a:null},next:function(a){if(a.nextElementSibling)return a.nextElementSibling;
-for(a=a.nextSibling;null!=a&&1!==a.nodeType;)a=a.nextSibling;return a},find:function(a,c){return a.getElementsByTagName?a.getElementsByTagName(c):[]},clone:Kb,triggerHandler:function(a,c,d){var e,f;e=c.type||c;var g=(oa(a,"events")||{})[e];g&&(e={preventDefault:function(){this.defaultPrevented=!0},isDefaultPrevented:function(){return!0===this.defaultPrevented},stopPropagation:E,type:e,target:a},c.type&&(e=D(e,c)),c=ha(g),f=d?[e].concat(d):[e],r(c,function(c){c.apply(a,f)}))}},function(a,c){S.prototype[c]=
-function(c,e,f){for(var g,k=0;k<this.length;k++)x(g)?(g=a(this[k],c,e,f),y(g)&&(g=w(g))):Jb(g,a(this[k],c,e,f));return y(g)?g:this};S.prototype.bind=S.prototype.on;S.prototype.unbind=S.prototype.off});bb.prototype={put:function(a,c){this[Ka(a,this.nextUid)]=c},get:function(a){return this[Ka(a,this.nextUid)]},remove:function(a){var c=this[a=Ka(a,this.nextUid)];delete this[a];return c}};var qe=/^function\s*[^\(]*\(\s*([^\)]*)\)/m,re=/,/,se=/^\s*(_?)(\S+?)\1\s*$/,pe=/((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg,
-cb=C("$injector"),Ne=C("$animate"),Md=["$provide",function(a){this.$$selectors={};this.register=function(c,d){var e=c+"-animation";if(c&&"."!=c.charAt(0))throw Ne("notcsel",c);this.$$selectors[c.substr(1)]=e;a.factory(e,d)};this.classNameFilter=function(a){1===arguments.length&&(this.$$classNameFilter=a instanceof RegExp?a:null);return this.$$classNameFilter};this.$get=["$timeout","$$asyncCallback",function(a,d){return{enter:function(a,c,g,k){g?g.after(a):(c&&c[0]||(c=g.parent()),c.append(a));k&&
-d(k)},leave:function(a,c){a.remove();c&&d(c)},move:function(a,c,d,k){this.enter(a,c,d,k)},addClass:function(a,c,g){c=v(c)?c:J(c)?c.join(" "):"";r(a,function(a){ob(a,c)});g&&d(g)},removeClass:function(a,c,g){c=v(c)?c:J(c)?c.join(" "):"";r(a,function(a){nb(a,c)});g&&d(g)},setClass:function(a,c,g,k){r(a,function(a){ob(a,c);nb(a,g)});k&&d(k)},enabled:E}}]}],ja=C("$compile");ic.$inject=["$provide","$$sanitizeUriProvider"];var we=/^(x[\:\-_]|data[\:\-_])/i,yc=C("$interpolate"),Oe=/^([^\?#]*)(\?([^#]*))?(#(.*))?$/,
-ze={http:80,https:443,ftp:21},Sb=C("$location");Ub.prototype=Tb.prototype=Bc.prototype={$$html5:!1,$$replace:!1,absUrl:tb("$$absUrl"),url:function(a){if(x(a))return this.$$url;a=Oe.exec(a);a[1]&&this.path(decodeURIComponent(a[1]));(a[2]||a[1])&&this.search(a[3]||"");this.hash(a[5]||"");return this},protocol:tb("$$protocol"),host:tb("$$host"),port:tb("$$port"),path:Cc("$$path",function(a){a=a?a.toString():"";return"/"==a.charAt(0)?a:"/"+a}),search:function(a,c){switch(arguments.length){case 0:return this.$$search;
-case 1:if(v(a)||ib(a))a=a.toString(),this.$$search=ec(a);else if(T(a))r(a,function(c,e){null==c&&delete a[e]}),this.$$search=a;else throw Sb("isrcharg");break;default:x(c)||null===c?delete this.$$search[a]:this.$$search[a]=c}this.$$compose();return this},hash:Cc("$$hash",function(a){return a?a.toString():""}),replace:function(){this.$$replace=!0;return this}};var la=C("$parse"),Fc={},wa,Pe=Function.prototype.call,Qe=Function.prototype.apply,Qc=Function.prototype.bind,gb={"null":function(){return null},
-"true":function(){return!0},"false":function(){return!1},undefined:E,"+":function(a,c,d,e){d=d(a,c);e=e(a,c);return y(d)?y(e)?d+e:d:y(e)?e:t},"-":function(a,c,d,e){d=d(a,c);e=e(a,c);return(y(d)?d:0)-(y(e)?e:0)},"*":function(a,c,d,e){return d(a,c)*e(a,c)},"/":function(a,c,d,e){return d(a,c)/e(a,c)},"%":function(a,c,d,e){return d(a,c)%e(a,c)},"^":function(a,c,d,e){return d(a,c)^e(a,c)},"=":E,"===":function(a,c,d,e){return d(a,c)===e(a,c)},"!==":function(a,c,d,e){return d(a,c)!==e(a,c)},"==":function(a,
-c,d,e){return d(a,c)==e(a,c)},"!=":function(a,c,d,e){return d(a,c)!=e(a,c)},"<":function(a,c,d,e){return d(a,c)<e(a,c)},">":function(a,c,d,e){return d(a,c)>e(a,c)},"<=":function(a,c,d,e){return d(a,c)<=e(a,c)},">=":function(a,c,d,e){return d(a,c)>=e(a,c)},"&&":function(a,c,d,e){return d(a,c)&&e(a,c)},"||":function(a,c,d,e){return d(a,c)||e(a,c)},"&":function(a,c,d,e){return d(a,c)&e(a,c)},"|":function(a,c,d,e){return e(a,c)(a,c,d(a,c))},"!":function(a,c,d){return!d(a,c)}},Re={n:"\n",f:"\f",r:"\r",
-t:"\t",v:"\v","'":"'",'"':'"'},Wb=function(a){this.options=a};Wb.prototype={constructor:Wb,lex:function(a){this.text=a;this.index=0;this.ch=t;this.lastCh=":";for(this.tokens=[];this.index<this.text.length;){this.ch=this.text.charAt(this.index);if(this.is("\"'"))this.readString(this.ch);else if(this.isNumber(this.ch)||this.is(".")&&this.isNumber(this.peek()))this.readNumber();else if(this.isIdent(this.ch))this.readIdent();else if(this.is("(){}[].,;:?"))this.tokens.push({index:this.index,text:this.ch}),
-this.index++;else if(this.isWhitespace(this.ch)){this.index++;continue}else{a=this.ch+this.peek();var c=a+this.peek(2),d=gb[this.ch],e=gb[a],f=gb[c];f?(this.tokens.push({index:this.index,text:c,fn:f}),this.index+=3):e?(this.tokens.push({index:this.index,text:a,fn:e}),this.index+=2):d?(this.tokens.push({index:this.index,text:this.ch,fn:d}),this.index+=1):this.throwError("Unexpected next character ",this.index,this.index+1)}this.lastCh=this.ch}return this.tokens},is:function(a){return-1!==a.indexOf(this.ch)},
-was:function(a){return-1!==a.indexOf(this.lastCh)},peek:function(a){a=a||1;return this.index+a<this.text.length?this.text.charAt(this.index+a):!1},isNumber:function(a){return"0"<=a&&"9">=a},isWhitespace:function(a){return" "===a||"\r"===a||"\t"===a||"\n"===a||"\v"===a||"\u00a0"===a},isIdent:function(a){return"a"<=a&&"z">=a||"A"<=a&&"Z">=a||"_"===a||"$"===a},isExpOperator:function(a){return"-"===a||"+"===a||this.isNumber(a)},throwError:function(a,c,d){d=d||this.index;c=y(c)?"s "+c+"-"+this.index+" ["+
-this.text.substring(c,d)+"]":" "+d;throw la("lexerr",a,c,this.text);},readNumber:function(){for(var a="",c=this.index;this.index<this.text.length;){var d=K(this.text.charAt(this.index));if("."==d||this.isNumber(d))a+=d;else{var e=this.peek();if("e"==d&&this.isExpOperator(e))a+=d;else if(this.isExpOperator(d)&&e&&this.isNumber(e)&&"e"==a.charAt(a.length-1))a+=d;else if(!this.isExpOperator(d)||e&&this.isNumber(e)||"e"!=a.charAt(a.length-1))break;else this.throwError("Invalid exponent")}this.index++}a*=
-1;this.tokens.push({index:c,text:a,literal:!0,constant:!0,fn:function(){return a}})},readIdent:function(){for(var a=this,c="",d=this.index,e,f,g,k;this.index<this.text.length;){k=this.text.charAt(this.index);if("."===k||this.isIdent(k)||this.isNumber(k))"."===k&&(e=this.index),c+=k;else break;this.index++}if(e)for(f=this.index;f<this.text.length;){k=this.text.charAt(f);if("("===k){g=c.substr(e-d+1);c=c.substr(0,e-d);this.index=f;break}if(this.isWhitespace(k))f++;else break}d={index:d,text:c};if(gb.hasOwnProperty(c))d.fn=
-gb[c],d.literal=!0,d.constant=!0;else{var m=Ec(c,this.options,this.text);d.fn=D(function(a,c){return m(a,c)},{assign:function(d,e){return ub(d,c,e,a.text,a.options)}})}this.tokens.push(d);g&&(this.tokens.push({index:e,text:"."}),this.tokens.push({index:e+1,text:g}))},readString:function(a){var c=this.index;this.index++;for(var d="",e=a,f=!1;this.index<this.text.length;){var g=this.text.charAt(this.index),e=e+g;if(f)"u"===g?(f=this.text.substring(this.index+1,this.index+5),f.match(/[\da-f]{4}/i)||
-this.throwError("Invalid unicode escape [\\u"+f+"]"),this.index+=4,d+=String.fromCharCode(parseInt(f,16))):d+=Re[g]||g,f=!1;else if("\\"===g)f=!0;else{if(g===a){this.index++;this.tokens.push({index:c,text:e,string:d,literal:!0,constant:!0,fn:function(){return d}});return}d+=g}this.index++}this.throwError("Unterminated quote",c)}};var fb=function(a,c,d){this.lexer=a;this.$filter=c;this.options=d};fb.ZERO=D(function(){return 0},{constant:!0});fb.prototype={constructor:fb,parse:function(a){this.text=
-a;this.tokens=this.lexer.lex(a);a=this.statements();0!==this.tokens.length&&this.throwError("is an unexpected token",this.tokens[0]);a.literal=!!a.literal;a.constant=!!a.constant;return a},primary:function(){var a;if(this.expect("("))a=this.filterChain(),this.consume(")");else if(this.expect("["))a=this.arrayDeclaration();else if(this.expect("{"))a=this.object();else{var c=this.expect();(a=c.fn)||this.throwError("not a primary expression",c);a.literal=!!c.literal;a.constant=!!c.constant}for(var d;c=
-this.expect("(","[",".");)"("===c.text?(a=this.functionCall(a,d),d=null):"["===c.text?(d=a,a=this.objectIndex(a)):"."===c.text?(d=a,a=this.fieldAccess(a)):this.throwError("IMPOSSIBLE");return a},throwError:function(a,c){throw la("syntax",c.text,a,c.index+1,this.text,this.text.substring(c.index));},peekToken:function(){if(0===this.tokens.length)throw la("ueoe",this.text);return this.tokens[0]},peek:function(a,c,d,e){if(0<this.tokens.length){var f=this.tokens[0],g=f.text;if(g===a||g===c||g===d||g===
-e||!(a||c||d||e))return f}return!1},expect:function(a,c,d,e){return(a=this.peek(a,c,d,e))?(this.tokens.shift(),a):!1},consume:function(a){this.expect(a)||this.throwError("is unexpected, expecting ["+a+"]",this.peek())},unaryFn:function(a,c){return D(function(d,e){return a(d,e,c)},{constant:c.constant})},ternaryFn:function(a,c,d){return D(function(e,f){return a(e,f)?c(e,f):d(e,f)},{constant:a.constant&&c.constant&&d.constant})},binaryFn:function(a,c,d){return D(function(e,f){return c(e,f,a,d)},{constant:a.constant&&
-d.constant})},statements:function(){for(var a=[];;)if(0<this.tokens.length&&!this.peek("}",")",";","]")&&a.push(this.filterChain()),!this.expect(";"))return 1===a.length?a[0]:function(c,d){for(var e,f=0;f<a.length;f++){var g=a[f];g&&(e=g(c,d))}return e}},filterChain:function(){for(var a=this.expression(),c;;)if(c=this.expect("|"))a=this.binaryFn(a,c.fn,this.filter());else return a},filter:function(){for(var a=this.expect(),c=this.$filter(a.text),d=[];;)if(a=this.expect(":"))d.push(this.expression());
-else{var e=function(a,e,k){k=[k];for(var m=0;m<d.length;m++)k.push(d[m](a,e));return c.apply(a,k)};return function(){return e}}},expression:function(){return this.assignment()},assignment:function(){var a=this.ternary(),c,d;return(d=this.expect("="))?(a.assign||this.throwError("implies assignment but ["+this.text.substring(0,d.index)+"] can not be assigned to",d),c=this.ternary(),function(d,f){return a.assign(d,c(d,f),f)}):a},ternary:function(){var a=this.logicalOR(),c,d;if(this.expect("?")){c=this.assignment();
+mb(b[a]);return b.join("/")}function xc(b,a,c){b=xa(b,c);a.$$protocol=b.protocol;a.$$host=b.hostname;a.$$port=U(b.port)||ze[b.protocol]||null}function yc(b,a,c){var d="/"!==b.charAt(0);d&&(b="/"+b);b=xa(b,c);a.$$path=decodeURIComponent(d&&"/"===b.pathname.charAt(0)?b.pathname.substring(1):b.pathname);a.$$search=cc(b.search);a.$$hash=decodeURIComponent(b.hash);a.$$path&&"/"!=a.$$path.charAt(0)&&(a.$$path="/"+a.$$path)}function ta(b,a){if(0===a.indexOf(b))return a.substr(b.length)}function Ga(b){var a=
+b.indexOf("#");return-1==a?b:b.substr(0,a)}function Rb(b){return b.substr(0,Ga(b).lastIndexOf("/")+1)}function zc(b,a){this.$$html5=!0;a=a||"";var c=Rb(b);xc(b,this,b);this.$$parse=function(a){var e=ta(c,a);if(!G(e))throw Sb("ipthprfx",a,c);yc(e,this,b);this.$$path||(this.$$path="/");this.$$compose()};this.$$compose=function(){var a=Cb(this.$$search),b=this.$$hash?"#"+mb(this.$$hash):"";this.$$url=Qb(this.$$path)+(a?"?"+a:"")+b;this.$$absUrl=c+this.$$url.substr(1)};this.$$parseLinkUrl=function(d,
+e){var f,g;(f=ta(b,d))!==u?(g=f,g=(f=ta(a,f))!==u?c+(ta("/",f)||f):b+g):(f=ta(c,d))!==u?g=c+f:c==d+"/"&&(g=c);g&&this.$$parse(g);return!!g}}function Tb(b,a){var c=Rb(b);xc(b,this,b);this.$$parse=function(d){var e=ta(b,d)||ta(c,d),e="#"==e.charAt(0)?ta(a,e):this.$$html5?e:"";if(!G(e))throw Sb("ihshprfx",d,a);yc(e,this,b);d=this.$$path;var f=/^\/[A-Z]:(\/.*)/;0===e.indexOf(b)&&(e=e.replace(b,""));f.exec(e)||(d=(e=f.exec(d))?e[1]:d);this.$$path=d;this.$$compose()};this.$$compose=function(){var c=Cb(this.$$search),
+e=this.$$hash?"#"+mb(this.$$hash):"";this.$$url=Qb(this.$$path)+(c?"?"+c:"")+e;this.$$absUrl=b+(this.$$url?a+this.$$url:"")};this.$$parseLinkUrl=function(a,c){return Ga(b)==Ga(a)?(this.$$parse(a),!0):!1}}function Ac(b,a){this.$$html5=!0;Tb.apply(this,arguments);var c=Rb(b);this.$$parseLinkUrl=function(d,e){var f,g;b==Ga(d)?f=d:(g=ta(c,d))?f=b+a+g:c===d+"/"&&(f=c);f&&this.$$parse(f);return!!f};this.$$compose=function(){var c=Cb(this.$$search),e=this.$$hash?"#"+mb(this.$$hash):"";this.$$url=Qb(this.$$path)+
+(c?"?"+c:"")+e;this.$$absUrl=b+a+this.$$url}}function tb(b){return function(){return this[b]}}function Bc(b,a){return function(c){if(F(c))return this[b];this[b]=a(c);this.$$compose();return this}}function Vd(){var b="",a=!1;this.hashPrefix=function(a){return D(a)?(b=a,this):b};this.html5Mode=function(b){return D(b)?(a=b,this):a};this.$get=["$rootScope","$browser","$sniffer","$rootElement",function(c,d,e,f){function g(a){c.$broadcast("$locationChangeSuccess",h.absUrl(),a)}var h,k=d.baseHref(),m=d.url();
+a?(k=m.substring(0,m.indexOf("/",m.indexOf("//")+2))+(k||"/"),e=e.history?zc:Ac):(k=Ga(m),e=Tb);h=new e(k,"#"+b);h.$$parseLinkUrl(m,m);var l=/^\s*(javascript|mailto):/i;f.on("click",function(a){if(!a.ctrlKey&&!a.metaKey&&2!=a.which){for(var b=A(a.target);"a"!==x(b[0].nodeName);)if(b[0]===f[0]||!(b=b.parent())[0])return;var e=b.prop("href"),g=b.attr("href")||b.attr("xlink:href");T(e)&&"[object SVGAnimatedString]"===e.toString()&&(e=xa(e.animVal).href);l.test(e)||(!e||(b.attr("target")||a.isDefaultPrevented())||
+!h.$$parseLinkUrl(e,g))||(a.preventDefault(),h.absUrl()!=d.url()&&(c.$apply(),W.angular["ff-684208-preventDefault"]=!0))}});h.absUrl()!=m&&d.url(h.absUrl(),!0);d.onUrlChange(function(a){h.absUrl()!=a&&(c.$evalAsync(function(){var b=h.absUrl();h.$$parse(a);c.$broadcast("$locationChangeStart",a,b).defaultPrevented?(h.$$parse(b),d.url(b)):g(b)}),c.$$phase||c.$digest())});var n=0;c.$watch(function(){var a=d.url(),b=h.$$replace;n&&a==h.absUrl()||(n++,c.$evalAsync(function(){c.$broadcast("$locationChangeStart",
+h.absUrl(),a).defaultPrevented?h.$$parse(a):(d.url(h.absUrl(),b),g(a))}));h.$$replace=!1;return n});return h}]}function Wd(){var b=!0,a=this;this.debugEnabled=function(a){return D(a)?(b=a,this):b};this.$get=["$window",function(c){function d(a){a instanceof Error&&(a.stack?a=a.message&&-1===a.stack.indexOf(a.message)?"Error: "+a.message+"\n"+a.stack:a.stack:a.sourceURL&&(a=a.message+"\n"+a.sourceURL+":"+a.line));return a}function e(a){var b=c.console||{},e=b[a]||b.log||v;a=!1;try{a=!!e.apply}catch(k){}return a?
+function(){var a=[];r(arguments,function(b){a.push(d(b))});return e.apply(b,a)}:function(a,b){e(a,null==b?"":b)}}return{log:e("log"),info:e("info"),warn:e("warn"),error:e("error"),debug:function(){var c=e("debug");return function(){b&&c.apply(a,arguments)}}()}}]}function ka(b,a){if("__defineGetter__"===b||"__defineSetter__"===b||"__lookupGetter__"===b||"__lookupSetter__"===b||"__proto__"===b)throw la("isecfld",a);return b}function ma(b,a){if(b){if(b.constructor===b)throw la("isecfn",a);if(b.document&&
+b.location&&b.alert&&b.setInterval)throw la("isecwindow",a);if(b.children&&(b.nodeName||b.prop&&b.attr&&b.find))throw la("isecdom",a);if(b===Object)throw la("isecobj",a);}return b}function ub(b,a,c,d,e){ma(b,d);e=e||{};a=a.split(".");for(var f,g=0;1<a.length;g++){f=ka(a.shift(),d);var h=ma(b[f],d);h||(h={},b[f]=h);b=h;b.then&&e.unwrapPromises&&(ya(d),"$$v"in b||function(a){a.then(function(b){a.$$v=b})}(b),b.$$v===u&&(b.$$v={}),b=b.$$v)}f=ka(a.shift(),d);ma(b[f],d);return b[f]=c}function Qa(b){return"constructor"==
+b}function Cc(b,a,c,d,e,f,g){ka(b,f);ka(a,f);ka(c,f);ka(d,f);ka(e,f);var h=function(a){return ma(a,f)},k=g.expensiveChecks,m=k||Qa(b)?h:ga,l=k||Qa(a)?h:ga,n=k||Qa(c)?h:ga,q=k||Qa(d)?h:ga,p=k||Qa(e)?h:ga;return g.unwrapPromises?function(g,h){var k=h&&h.hasOwnProperty(b)?h:g,t;if(null==k)return k;(k=m(k[b]))&&k.then&&(ya(f),"$$v"in k||(t=k,t.$$v=u,t.then(function(a){t.$$v=m(a)})),k=m(k.$$v));if(!a)return k;if(null==k)return u;(k=l(k[a]))&&k.then&&(ya(f),"$$v"in k||(t=k,t.$$v=u,t.then(function(a){t.$$v=
+l(a)})),k=l(k.$$v));if(!c)return k;if(null==k)return u;(k=n(k[c]))&&k.then&&(ya(f),"$$v"in k||(t=k,t.$$v=u,t.then(function(a){t.$$v=n(a)})),k=n(k.$$v));if(!d)return k;if(null==k)return u;(k=q(k[d]))&&k.then&&(ya(f),"$$v"in k||(t=k,t.$$v=u,t.then(function(a){t.$$v=q(a)})),k=q(k.$$v));if(!e)return k;if(null==k)return u;(k=p(k[e]))&&k.then&&(ya(f),"$$v"in k||(t=k,t.$$v=u,t.then(function(a){t.$$v=p(a)})),k=p(k.$$v));return k}:function(f,g){var h=g&&g.hasOwnProperty(b)?g:f;if(null==h)return h;h=m(h[b]);
+if(!a)return h;if(null==h)return u;h=l(h[a]);if(!c)return h;if(null==h)return u;h=n(h[c]);if(!d)return h;if(null==h)return u;h=q(h[d]);return e?null==h?u:h=p(h[e]):h}}function Ae(b,a){return function(c,d){return b(c,d,ya,ma,a)}}function Dc(b,a,c){var d=a.expensiveChecks,e=d?Be:Ce;if(e.hasOwnProperty(b))return e[b];var f=b.split("."),g=f.length,h;if(a.csp)h=6>g?Cc(f[0],f[1],f[2],f[3],f[4],c,a):function(b,d){var e=0,h;do h=Cc(f[e++],f[e++],f[e++],f[e++],f[e++],c,a)(b,d),d=u,b=h;while(e<g);return h};
+else{var k="var p;\n";d&&(k+="s = eso(s, fe);\nl = eso(l, fe);\n");var m=d;r(f,function(b,e){ka(b,c);var f=(e?"s":'((l&&l.hasOwnProperty("'+b+'"))?l:s)')+'["'+b+'"]',g=d||Qa(b);g&&(f="eso("+f+", fe)",m=!0);k+="if(s == null) return undefined;\ns="+f+";\n";a.unwrapPromises&&(k+='if (s && s.then) {\n pw("'+c.replace(/(["\r\n])/g,"\\$1")+'");\n if (!("$$v" in s)) {\n p=s;\n p.$$v = undefined;\n p.then(function(v) {p.$$v='+(g?"eso(v)":"v")+";});\n}\n s="+(g?"eso(s.$$v)":"s.$$v")+"\n}\n")});k+="return s;";
+h=new Function("s","l","pw","eso","fe",k);h.toString=aa(k);if(m||a.unwrapPromises)h=Ae(h,c)}"hasOwnProperty"!==b&&(e[b]=h);return h}function Xd(){var b={},a={},c={csp:!1,unwrapPromises:!1,logPromiseWarnings:!0,expensiveChecks:!1};this.unwrapPromises=function(a){return D(a)?(c.unwrapPromises=!!a,this):c.unwrapPromises};this.logPromiseWarnings=function(a){return D(a)?(c.logPromiseWarnings=a,this):c.logPromiseWarnings};this.$get=["$filter","$sniffer","$log",function(d,e,f){c.csp=e.csp;var g={csp:c.csp,
+unwrapPromises:c.unwrapPromises,logPromiseWarnings:c.logPromiseWarnings,expensiveChecks:!0};ya=function(a){c.logPromiseWarnings&&!Ec.hasOwnProperty(a)&&(Ec[a]=!0,f.warn("[$parse] Promise found in the expression `"+a+"`. Automatic unwrapping of promises in Angular expressions is deprecated."))};return function(e,f){var m;switch(typeof e){case "string":var l=f?a:b;if(l.hasOwnProperty(e))return l[e];m=f?g:c;var n=new Ub(m);m=(new gb(n,d,m)).parse(e);"hasOwnProperty"!==e&&(l[e]=m);return m;case "function":return e;
+default:return v}}}]}function Zd(){this.$get=["$rootScope","$exceptionHandler",function(b,a){return De(function(a){b.$evalAsync(a)},a)}]}function De(b,a){function c(a){return a}function d(a){return g(a)}var e=function(){var g=[],m,l;return l={resolve:function(a){if(g){var c=g;g=u;m=f(a);c.length&&b(function(){for(var a,b=0,d=c.length;b<d;b++)a=c[b],m.then(a[0],a[1],a[2])})}},reject:function(a){l.resolve(h(a))},notify:function(a){if(g){var c=g;g.length&&b(function(){for(var b,d=0,e=c.length;d<e;d++)b=
+c[d],b[2](a)})}},promise:{then:function(b,f,h){var l=e(),J=function(d){try{l.resolve((N(b)?b:c)(d))}catch(e){l.reject(e),a(e)}},w=function(b){try{l.resolve((N(f)?f:d)(b))}catch(c){l.reject(c),a(c)}},t=function(b){try{l.notify((N(h)?h:c)(b))}catch(d){a(d)}};g?g.push([J,w,t]):m.then(J,w,t);return l.promise},"catch":function(a){return this.then(null,a)},"finally":function(a){function b(a,c){var d=e();c?d.resolve(a):d.reject(a);return d.promise}function d(e,f){var g=null;try{g=(a||c)()}catch(h){return b(h,
+!1)}return g&&N(g.then)?g.then(function(){return b(e,f)},function(a){return b(a,!1)}):b(e,f)}return this.then(function(a){return d(a,!0)},function(a){return d(a,!1)})}}}},f=function(a){return a&&N(a.then)?a:{then:function(c){var d=e();b(function(){d.resolve(c(a))});return d.promise}}},g=function(a){var b=e();b.reject(a);return b.promise},h=function(c){return{then:function(f,g){var h=e();b(function(){try{h.resolve((N(g)?g:d)(c))}catch(b){h.reject(b),a(b)}});return h.promise}}};return{defer:e,reject:g,
+when:function(h,m,l,n){var q=e(),p,s=function(b){try{return(N(m)?m:c)(b)}catch(d){return a(d),g(d)}},J=function(b){try{return(N(l)?l:d)(b)}catch(c){return a(c),g(c)}},w=function(b){try{return(N(n)?n:c)(b)}catch(d){a(d)}};b(function(){f(h).then(function(a){p||(p=!0,q.resolve(f(a).then(s,J,w)))},function(a){p||(p=!0,q.resolve(J(a)))},function(a){p||q.notify(w(a))})});return q.promise},all:function(a){var b=e(),c=0,d=L(a)?[]:{};r(a,function(a,e){c++;f(a).then(function(a){d.hasOwnProperty(e)||(d[e]=a,
+--c||b.resolve(d))},function(a){d.hasOwnProperty(e)||b.reject(a)})});0===c&&b.resolve(d);return b.promise}}}function fe(){this.$get=["$window","$timeout",function(b,a){var c=b.requestAnimationFrame||b.webkitRequestAnimationFrame||b.mozRequestAnimationFrame,d=b.cancelAnimationFrame||b.webkitCancelAnimationFrame||b.mozCancelAnimationFrame||b.webkitCancelRequestAnimationFrame,e=!!c,f=e?function(a){var b=c(a);return function(){d(b)}}:function(b){var c=a(b,16.66,!1);return function(){a.cancel(c)}};f.supported=
+e;return f}]}function Yd(){var b=10,a=z("$rootScope"),c=null;this.digestTtl=function(a){arguments.length&&(b=a);return b};this.$get=["$injector","$exceptionHandler","$parse","$browser",function(d,e,f,g){function h(){this.$id=ib();this.$$phase=this.$parent=this.$$watchers=this.$$nextSibling=this.$$prevSibling=this.$$childHead=this.$$childTail=null;this["this"]=this.$root=this;this.$$destroyed=!1;this.$$asyncQueue=[];this.$$postDigestQueue=[];this.$$listeners={};this.$$listenerCount={};this.$$isolateBindings=
+{}}function k(b){if(q.$$phase)throw a("inprog",q.$$phase);q.$$phase=b}function m(a,b){var c=f(a);Ya(c,b);return c}function l(a,b,c){do a.$$listenerCount[c]-=b,0===a.$$listenerCount[c]&&delete a.$$listenerCount[c];while(a=a.$parent)}function n(){}h.prototype={constructor:h,$new:function(a){a?(a=new h,a.$root=this.$root,a.$$asyncQueue=this.$$asyncQueue,a.$$postDigestQueue=this.$$postDigestQueue):(this.$$childScopeClass||(this.$$childScopeClass=function(){this.$$watchers=this.$$nextSibling=this.$$childHead=
+this.$$childTail=null;this.$$listeners={};this.$$listenerCount={};this.$id=ib();this.$$childScopeClass=null},this.$$childScopeClass.prototype=this),a=new this.$$childScopeClass);a["this"]=a;a.$parent=this;a.$$prevSibling=this.$$childTail;this.$$childHead?this.$$childTail=this.$$childTail.$$nextSibling=a:this.$$childHead=this.$$childTail=a;return a},$watch:function(a,b,d){var e=m(a,"watch"),f=this.$$watchers,g={fn:b,last:n,get:e,exp:a,eq:!!d};c=null;if(!N(b)){var h=m(b||v,"listener");g.fn=function(a,
+b,c){h(c)}}if("string"==typeof a&&e.constant){var k=g.fn;g.fn=function(a,b,c){k.call(this,a,b,c);Ua(f,g)}}f||(f=this.$$watchers=[]);f.unshift(g);return function(){Ua(f,g);c=null}},$watchCollection:function(a,b){var c=this,d,e,g,h=1<b.length,k=0,l=f(a),m=[],n={},q=!0,r=0;return this.$watch(function(){d=l(c);var a,b,f;if(T(d))if(Sa(d))for(e!==m&&(e=m,r=e.length=0,k++),a=d.length,r!==a&&(k++,e.length=r=a),b=0;b<a;b++)f=e[b]!==e[b]&&d[b]!==d[b],f||e[b]===d[b]||(k++,e[b]=d[b]);else{e!==n&&(e=n={},r=0,
+k++);a=0;for(b in d)d.hasOwnProperty(b)&&(a++,e.hasOwnProperty(b)?(f=e[b]!==e[b]&&d[b]!==d[b],f||e[b]===d[b]||(k++,e[b]=d[b])):(r++,e[b]=d[b],k++));if(r>a)for(b in k++,e)e.hasOwnProperty(b)&&!d.hasOwnProperty(b)&&(r--,delete e[b])}else e!==d&&(e=d,k++);return k},function(){q?(q=!1,b(d,d,c)):b(d,g,c);if(h)if(T(d))if(Sa(d)){g=Array(d.length);for(var a=0;a<d.length;a++)g[a]=d[a]}else for(a in g={},d)lb.call(d,a)&&(g[a]=d[a]);else g=d})},$digest:function(){var d,f,h,l,m=this.$$asyncQueue,r=this.$$postDigestQueue,
+K,B,u=b,O,M=[],A,P,C;k("$digest");g.$$checkUrlChange();c=null;do{B=!1;for(O=this;m.length;){try{C=m.shift(),C.scope.$eval(C.expression)}catch(I){q.$$phase=null,e(I)}c=null}a:do{if(l=O.$$watchers)for(K=l.length;K--;)try{if(d=l[K])if((f=d.get(O))!==(h=d.last)&&!(d.eq?Ca(f,h):"number"===typeof f&&"number"===typeof h&&isNaN(f)&&isNaN(h)))B=!0,c=d,d.last=d.eq?Ka(f,null):f,d.fn(f,h===n?f:h,O),5>u&&(A=4-u,M[A]||(M[A]=[]),P=N(d.exp)?"fn: "+(d.exp.name||d.exp.toString()):d.exp,P+="; newVal: "+oa(f)+"; oldVal: "+
+oa(h),M[A].push(P));else if(d===c){B=!1;break a}}catch(D){q.$$phase=null,e(D)}if(!(l=O.$$childHead||O!==this&&O.$$nextSibling))for(;O!==this&&!(l=O.$$nextSibling);)O=O.$parent}while(O=l);if((B||m.length)&&!u--)throw q.$$phase=null,a("infdig",b,oa(M));}while(B||m.length);for(q.$$phase=null;r.length;)try{r.shift()()}catch(x){e(x)}},$destroy:function(){if(!this.$$destroyed){var a=this.$parent;this.$broadcast("$destroy");this.$$destroyed=!0;this!==q&&(r(this.$$listenerCount,Bb(null,l,this)),a.$$childHead==
+this&&(a.$$childHead=this.$$nextSibling),a.$$childTail==this&&(a.$$childTail=this.$$prevSibling),this.$$prevSibling&&(this.$$prevSibling.$$nextSibling=this.$$nextSibling),this.$$nextSibling&&(this.$$nextSibling.$$prevSibling=this.$$prevSibling),this.$parent=this.$$nextSibling=this.$$prevSibling=this.$$childHead=this.$$childTail=this.$root=null,this.$$listeners={},this.$$watchers=this.$$asyncQueue=this.$$postDigestQueue=[],this.$destroy=this.$digest=this.$apply=v,this.$on=this.$watch=function(){return v})}},
+$eval:function(a,b){return f(a)(this,b)},$evalAsync:function(a){q.$$phase||q.$$asyncQueue.length||g.defer(function(){q.$$asyncQueue.length&&q.$digest()});this.$$asyncQueue.push({scope:this,expression:a})},$$postDigest:function(a){this.$$postDigestQueue.push(a)},$apply:function(a){try{return k("$apply"),this.$eval(a)}catch(b){e(b)}finally{q.$$phase=null;try{q.$digest()}catch(c){throw e(c),c;}}},$on:function(a,b){var c=this.$$listeners[a];c||(this.$$listeners[a]=c=[]);c.push(b);var d=this;do d.$$listenerCount[a]||
+(d.$$listenerCount[a]=0),d.$$listenerCount[a]++;while(d=d.$parent);var e=this;return function(){var d=Ta(c,b);-1!==d&&(c[d]=null,l(e,1,a))}},$emit:function(a,b){var c=[],d,f=this,g=!1,h={name:a,targetScope:f,stopPropagation:function(){g=!0},preventDefault:function(){h.defaultPrevented=!0},defaultPrevented:!1},k=[h].concat(wa.call(arguments,1)),l,m;do{d=f.$$listeners[a]||c;h.currentScope=f;l=0;for(m=d.length;l<m;l++)if(d[l])try{d[l].apply(null,k)}catch(n){e(n)}else d.splice(l,1),l--,m--;if(g)break;
+f=f.$parent}while(f);return h},$broadcast:function(a,b){for(var c=this,d=this,f={name:a,targetScope:this,preventDefault:function(){f.defaultPrevented=!0},defaultPrevented:!1},g=[f].concat(wa.call(arguments,1)),h,k;c=d;){f.currentScope=c;d=c.$$listeners[a]||[];h=0;for(k=d.length;h<k;h++)if(d[h])try{d[h].apply(null,g)}catch(l){e(l)}else d.splice(h,1),h--,k--;if(!(d=c.$$listenerCount[a]&&c.$$childHead||c!==this&&c.$$nextSibling))for(;c!==this&&!(d=c.$$nextSibling);)c=c.$parent}return f}};var q=new h;
+return q}]}function bd(){var b=/^\s*(https?|ftp|mailto|tel|file):/,a=/^\s*((https?|ftp|file):|data:image\/)/;this.aHrefSanitizationWhitelist=function(a){return D(a)?(b=a,this):b};this.imgSrcSanitizationWhitelist=function(b){return D(b)?(a=b,this):a};this.$get=function(){return function(c,d){var e=d?a:b,f;if(!R||8<=R)if(f=xa(c).href,""!==f&&!f.match(e))return"unsafe:"+f;return c}}}function Ee(b){if("self"===b)return b;if(G(b)){if(-1<b.indexOf("***"))throw za("iwcard",b);b=b.replace(/([-()\[\]{}+?*.$\^|,:#<!\\])/g,
+"\\$1").replace(/\x08/g,"\\x08").replace("\\*\\*",".*").replace("\\*","[^:/.?&;]*");return RegExp("^"+b+"$")}if(kb(b))return RegExp("^"+b.source+"$");throw za("imatcher");}function Fc(b){var a=[];D(b)&&r(b,function(b){a.push(Ee(b))});return a}function ae(){this.SCE_CONTEXTS=fa;var b=["self"],a=[];this.resourceUrlWhitelist=function(a){arguments.length&&(b=Fc(a));return b};this.resourceUrlBlacklist=function(b){arguments.length&&(a=Fc(b));return a};this.$get=["$injector",function(c){function d(a){var b=
+function(a){this.$$unwrapTrustedValue=function(){return a}};a&&(b.prototype=new a);b.prototype.valueOf=function(){return this.$$unwrapTrustedValue()};b.prototype.toString=function(){return this.$$unwrapTrustedValue().toString()};return b}var e=function(a){throw za("unsafe");};c.has("$sanitize")&&(e=c.get("$sanitize"));var f=d(),g={};g[fa.HTML]=d(f);g[fa.CSS]=d(f);g[fa.URL]=d(f);g[fa.JS]=d(f);g[fa.RESOURCE_URL]=d(g[fa.URL]);return{trustAs:function(a,b){var c=g.hasOwnProperty(a)?g[a]:null;if(!c)throw za("icontext",
+a,b);if(null===b||b===u||""===b)return b;if("string"!==typeof b)throw za("itype",a);return new c(b)},getTrusted:function(c,d){if(null===d||d===u||""===d)return d;var f=g.hasOwnProperty(c)?g[c]:null;if(f&&d instanceof f)return d.$$unwrapTrustedValue();if(c===fa.RESOURCE_URL){var f=xa(d.toString()),l,n,q=!1;l=0;for(n=b.length;l<n;l++)if("self"===b[l]?Pb(f):b[l].exec(f.href)){q=!0;break}if(q)for(l=0,n=a.length;l<n;l++)if("self"===a[l]?Pb(f):a[l].exec(f.href)){q=!1;break}if(q)return d;throw za("insecurl",
+d.toString());}if(c===fa.HTML)return e(d);throw za("unsafe");},valueOf:function(a){return a instanceof f?a.$$unwrapTrustedValue():a}}}]}function $d(){var b=!0;this.enabled=function(a){arguments.length&&(b=!!a);return b};this.$get=["$parse","$sniffer","$sceDelegate",function(a,c,d){if(b&&c.msie&&8>c.msieDocumentMode)throw za("iequirks");var e=ha(fa);e.isEnabled=function(){return b};e.trustAs=d.trustAs;e.getTrusted=d.getTrusted;e.valueOf=d.valueOf;b||(e.trustAs=e.getTrusted=function(a,b){return b},
+e.valueOf=ga);e.parseAs=function(b,c){var d=a(c);return d.literal&&d.constant?d:function(a,c){return e.getTrusted(b,d(a,c))}};var f=e.parseAs,g=e.getTrusted,h=e.trustAs;r(fa,function(a,b){var c=x(b);e[ab("parse_as_"+c)]=function(b){return f(a,b)};e[ab("get_trusted_"+c)]=function(b){return g(a,b)};e[ab("trust_as_"+c)]=function(b){return h(a,b)}});return e}]}function be(){this.$get=["$window","$document",function(b,a){var c={},d=U((/android (\d+)/.exec(x((b.navigator||{}).userAgent))||[])[1]),e=/Boxee/i.test((b.navigator||
+{}).userAgent),f=a[0]||{},g=f.documentMode,h,k=/^(Moz|webkit|O|ms)(?=[A-Z])/,m=f.body&&f.body.style,l=!1,n=!1;if(m){for(var q in m)if(l=k.exec(q)){h=l[0];h=h.substr(0,1).toUpperCase()+h.substr(1);break}h||(h="WebkitOpacity"in m&&"webkit");l=!!("transition"in m||h+"Transition"in m);n=!!("animation"in m||h+"Animation"in m);!d||l&&n||(l=G(f.body.style.webkitTransition),n=G(f.body.style.webkitAnimation))}return{history:!(!b.history||!b.history.pushState||4>d||e),hashchange:"onhashchange"in b&&(!g||7<
+g),hasEvent:function(a){if("input"==a&&9==R)return!1;if(F(c[a])){var b=f.createElement("div");c[a]="on"+a in b}return c[a]},csp:Za(),vendorPrefix:h,transitions:l,animations:n,android:d,msie:R,msieDocumentMode:g}}]}function de(){this.$get=["$rootScope","$browser","$q","$exceptionHandler",function(b,a,c,d){function e(e,h,k){var m=c.defer(),l=m.promise,n=D(k)&&!k;h=a.defer(function(){try{m.resolve(e())}catch(a){m.reject(a),d(a)}finally{delete f[l.$$timeoutId]}n||b.$apply()},h);l.$$timeoutId=h;f[h]=m;
+return l}var f={};e.cancel=function(b){return b&&b.$$timeoutId in f?(f[b.$$timeoutId].reject("canceled"),delete f[b.$$timeoutId],a.defer.cancel(b.$$timeoutId)):!1};return e}]}function xa(b,a){var c=b;R&&(Y.setAttribute("href",c),c=Y.href);Y.setAttribute("href",c);return{href:Y.href,protocol:Y.protocol?Y.protocol.replace(/:$/,""):"",host:Y.host,search:Y.search?Y.search.replace(/^\?/,""):"",hash:Y.hash?Y.hash.replace(/^#/,""):"",hostname:Y.hostname,port:Y.port,pathname:"/"===Y.pathname.charAt(0)?Y.pathname:
+"/"+Y.pathname}}function Pb(b){b=G(b)?xa(b):b;return b.protocol===Gc.protocol&&b.host===Gc.host}function ee(){this.$get=aa(W)}function kc(b){function a(d,e){if(T(d)){var f={};r(d,function(b,c){f[c]=a(c,b)});return f}return b.factory(d+c,e)}var c="Filter";this.register=a;this.$get=["$injector",function(a){return function(b){return a.get(b+c)}}];a("currency",Hc);a("date",Ic);a("filter",Fe);a("json",Ge);a("limitTo",He);a("lowercase",Ie);a("number",Jc);a("orderBy",Kc);a("uppercase",Je)}function Fe(){return function(b,
+a,c){if(!L(b))return b;var d=typeof c,e=[];e.check=function(a){for(var b=0;b<e.length;b++)if(!e[b](a))return!1;return!0};"function"!==d&&(c="boolean"===d&&c?function(a,b){return Xa.equals(a,b)}:function(a,b){if(a&&b&&"object"===typeof a&&"object"===typeof b){for(var d in a)if("$"!==d.charAt(0)&&lb.call(a,d)&&c(a[d],b[d]))return!0;return!1}b=(""+b).toLowerCase();return-1<(""+a).toLowerCase().indexOf(b)});var f=function(a,b){if("string"===typeof b&&"!"===b.charAt(0))return!f(a,b.substr(1));switch(typeof a){case "boolean":case "number":case "string":return c(a,
+b);case "object":switch(typeof b){case "object":return c(a,b);default:for(var d in a)if("$"!==d.charAt(0)&&f(a[d],b))return!0}return!1;case "array":for(d=0;d<a.length;d++)if(f(a[d],b))return!0;return!1;default:return!1}};switch(typeof a){case "boolean":case "number":case "string":a={$:a};case "object":for(var g in a)(function(b){"undefined"!==typeof a[b]&&e.push(function(c){return f("$"==b?c:c&&c[b],a[b])})})(g);break;case "function":e.push(a);break;default:return b}d=[];for(g=0;g<b.length;g++){var h=
+b[g];e.check(h)&&d.push(h)}return d}}function Hc(b){var a=b.NUMBER_FORMATS;return function(b,d){F(d)&&(d=a.CURRENCY_SYM);return Lc(b,a.PATTERNS[1],a.GROUP_SEP,a.DECIMAL_SEP,2).replace(/\u00A4/g,d)}}function Jc(b){var a=b.NUMBER_FORMATS;return function(b,d){return Lc(b,a.PATTERNS[0],a.GROUP_SEP,a.DECIMAL_SEP,d)}}function Lc(b,a,c,d,e){if(null==b||!isFinite(b)||T(b))return"";var f=0>b;b=Math.abs(b);var g=b+"",h="",k=[],m=!1;if(-1!==g.indexOf("e")){var l=g.match(/([\d\.]+)e(-?)(\d+)/);l&&"-"==l[2]&&
+l[3]>e+1?(g="0",b=0):(h=g,m=!0)}if(m)0<e&&(-1<b&&1>b)&&(h=b.toFixed(e));else{g=(g.split(Mc)[1]||"").length;F(e)&&(e=Math.min(Math.max(a.minFrac,g),a.maxFrac));b=+(Math.round(+(b.toString()+"e"+e)).toString()+"e"+-e);0===b&&(f=!1);b=(""+b).split(Mc);g=b[0];b=b[1]||"";var l=0,n=a.lgSize,q=a.gSize;if(g.length>=n+q)for(l=g.length-n,m=0;m<l;m++)0===(l-m)%q&&0!==m&&(h+=c),h+=g.charAt(m);for(m=l;m<g.length;m++)0===(g.length-m)%n&&0!==m&&(h+=c),h+=g.charAt(m);for(;b.length<e;)b+="0";e&&"0"!==e&&(h+=d+b.substr(0,
+e))}k.push(f?a.negPre:a.posPre);k.push(h);k.push(f?a.negSuf:a.posSuf);return k.join("")}function Vb(b,a,c){var d="";0>b&&(d="-",b=-b);for(b=""+b;b.length<a;)b="0"+b;c&&(b=b.substr(b.length-a));return d+b}function Z(b,a,c,d){c=c||0;return function(e){e=e["get"+b]();if(0<c||e>-c)e+=c;0===e&&-12==c&&(e=12);return Vb(e,a,d)}}function vb(b,a){return function(c,d){var e=c["get"+b](),f=La(a?"SHORT"+b:b);return d[f][e]}}function Ic(b){function a(a){var b;if(b=a.match(c)){a=new Date(0);var f=0,g=0,h=b[8]?
+a.setUTCFullYear:a.setFullYear,k=b[8]?a.setUTCHours:a.setHours;b[9]&&(f=U(b[9]+b[10]),g=U(b[9]+b[11]));h.call(a,U(b[1]),U(b[2])-1,U(b[3]));f=U(b[4]||0)-f;g=U(b[5]||0)-g;h=U(b[6]||0);b=Math.round(1E3*parseFloat("0."+(b[7]||0)));k.call(a,f,g,h,b)}return a}var c=/^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/;return function(c,e){var f="",g=[],h,k;e=e||"mediumDate";e=b.DATETIME_FORMATS[e]||e;G(c)&&(c=Ke.test(c)?U(c):a(c));jb(c)&&(c=new Date(c));
+if(!va(c))return c;for(;e;)(k=Le.exec(e))?(g=g.concat(wa.call(k,1)),e=g.pop()):(g.push(e),e=null);r(g,function(a){h=Me[a];f+=h?h(c,b.DATETIME_FORMATS):a.replace(/(^'|'$)/g,"").replace(/''/g,"'")});return f}}function Ge(){return function(b){return oa(b,!0)}}function He(){return function(b,a){if(!L(b)&&!G(b))return b;a=Infinity===Math.abs(Number(a))?Number(a):U(a);if(G(b))return a?0<=a?b.slice(0,a):b.slice(a,b.length):"";var c=[],d,e;a>b.length?a=b.length:a<-b.length&&(a=-b.length);0<a?(d=0,e=a):(d=
+b.length+a,e=b.length);for(;d<e;d++)c.push(b[d]);return c}}function Kc(b){return function(a,c,d){function e(a,b){return Wa(b)?function(b,c){return a(c,b)}:a}function f(a,b){var c=typeof a,d=typeof b;return c==d?(va(a)&&va(b)&&(a=a.valueOf(),b=b.valueOf()),"string"==c&&(a=a.toLowerCase(),b=b.toLowerCase()),a===b?0:a<b?-1:1):c<d?-1:1}if(!Sa(a))return a;c=L(c)?c:[c];0===c.length&&(c=["+"]);c=Uc(c,function(a){var c=!1,d=a||ga;if(G(a)){if("+"==a.charAt(0)||"-"==a.charAt(0))c="-"==a.charAt(0),a=a.substring(1);
+if(""===a)return e(function(a,b){return f(a,b)},c);d=b(a);if(d.constant){var m=d();return e(function(a,b){return f(a[m],b[m])},c)}}return e(function(a,b){return f(d(a),d(b))},c)});return wa.call(a).sort(e(function(a,b){for(var d=0;d<c.length;d++){var e=c[d](a,b);if(0!==e)return e}return 0},d))}}function Aa(b){N(b)&&(b={link:b});b.restrict=b.restrict||"AC";return aa(b)}function Nc(b,a,c,d){function e(a,c){c=c?"-"+nb(c,"-"):"";d.setClass(b,(a?wb:xb)+c,(a?xb:wb)+c)}var f=this,g=b.parent().controller("form")||
+yb,h=0,k=f.$error={},m=[];f.$name=a.name||a.ngForm;f.$dirty=!1;f.$pristine=!0;f.$valid=!0;f.$invalid=!1;g.$addControl(f);b.addClass(Ra);e(!0);f.$addControl=function(a){Ea(a.$name,"input");m.push(a);a.$name&&(f[a.$name]=a)};f.$removeControl=function(a){a.$name&&f[a.$name]===a&&delete f[a.$name];r(k,function(b,c){f.$setValidity(c,!0,a)});Ua(m,a)};f.$setValidity=function(a,b,c){var d=k[a];if(b)d&&(Ua(d,c),d.length||(h--,h||(e(b),f.$valid=!0,f.$invalid=!1),k[a]=!1,e(!0,a),g.$setValidity(a,!0,f)));else{h||
+e(b);if(d){if(-1!=Ta(d,c))return}else k[a]=d=[],h++,e(!1,a),g.$setValidity(a,!1,f);d.push(c);f.$valid=!1;f.$invalid=!0}};f.$setDirty=function(){d.removeClass(b,Ra);d.addClass(b,zb);f.$dirty=!0;f.$pristine=!1;g.$setDirty()};f.$setPristine=function(){d.removeClass(b,zb);d.addClass(b,Ra);f.$dirty=!1;f.$pristine=!0;r(m,function(a){a.$setPristine()})}}function ua(b,a,c,d){b.$setValidity(a,c);return c?d:u}function Oc(b,a){var c,d;if(a)for(c=0;c<a.length;++c)if(d=a[c],b[d])return!0;return!1}function Ne(b,
+a,c,d,e){T(e)&&(b.$$hasNativeValidators=!0,b.$parsers.push(function(f){if(b.$error[a]||Oc(e,d)||!Oc(e,c))return f;b.$setValidity(a,!1)}))}function Ab(b,a,c,d,e,f){var g=a.prop(Oe),h=a[0].placeholder,k={},m=x(a[0].type);d.$$validityState=g;if(!e.android){var l=!1;a.on("compositionstart",function(a){l=!0});a.on("compositionend",function(){l=!1;n()})}var n=function(e){if(!l){var f=a.val();if(R&&"input"===(e||k).type&&a[0].placeholder!==h)h=a[0].placeholder;else if("password"!==m&&Wa(c.ngTrim||"T")&&
+(f=$(f)),e=g&&d.$$hasNativeValidators,d.$viewValue!==f||""===f&&e)b.$root.$$phase?d.$setViewValue(f):b.$apply(function(){d.$setViewValue(f)})}};if(e.hasEvent("input"))a.on("input",n);else{var q,p=function(){q||(q=f.defer(function(){n();q=null}))};a.on("keydown",function(a){a=a.keyCode;91===a||(15<a&&19>a||37<=a&&40>=a)||p()});if(e.hasEvent("paste"))a.on("paste cut",p)}a.on("change",n);d.$render=function(){a.val(d.$isEmpty(d.$viewValue)?"":d.$viewValue)};var s=c.ngPattern;s&&((e=s.match(/^\/(.*)\/([gim]*)$/))?
+(s=RegExp(e[1],e[2]),e=function(a){return ua(d,"pattern",d.$isEmpty(a)||s.test(a),a)}):e=function(c){var e=b.$eval(s);if(!e||!e.test)throw z("ngPattern")("noregexp",s,e,ia(a));return ua(d,"pattern",d.$isEmpty(c)||e.test(c),c)},d.$formatters.push(e),d.$parsers.push(e));if(c.ngMinlength){var r=U(c.ngMinlength);e=function(a){return ua(d,"minlength",d.$isEmpty(a)||a.length>=r,a)};d.$parsers.push(e);d.$formatters.push(e)}if(c.ngMaxlength){var w=U(c.ngMaxlength);e=function(a){return ua(d,"maxlength",d.$isEmpty(a)||
+a.length<=w,a)};d.$parsers.push(e);d.$formatters.push(e)}}function Wb(b,a){b="ngClass"+b;return["$animate",function(c){function d(a,b){var c=[],d=0;a:for(;d<a.length;d++){for(var e=a[d],l=0;l<b.length;l++)if(e==b[l])continue a;c.push(e)}return c}function e(a){if(!L(a)){if(G(a))return a.split(" ");if(T(a)){var b=[];r(a,function(a,c){a&&(b=b.concat(c.split(" ")))});return b}}return a}return{restrict:"AC",link:function(f,g,h){function k(a,b){var c=g.data("$classCounts")||{},d=[];r(a,function(a){if(0<
+b||c[a])c[a]=(c[a]||0)+b,c[a]===+(0<b)&&d.push(a)});g.data("$classCounts",c);return d.join(" ")}function m(b){if(!0===a||f.$index%2===a){var m=e(b||[]);if(!l){var p=k(m,1);h.$addClass(p)}else if(!Ca(b,l)){var s=e(l),p=d(m,s),m=d(s,m),m=k(m,-1),p=k(p,1);0===p.length?c.removeClass(g,m):0===m.length?c.addClass(g,p):c.setClass(g,p,m)}}l=ha(b)}var l;f.$watch(h[b],m,!0);h.$observe("class",function(a){m(f.$eval(h[b]))});"ngClass"!==b&&f.$watch("$index",function(c,d){var g=c&1;if(g!==(d&1)){var l=e(f.$eval(h[b]));
+g===a?(g=k(l,1),h.$addClass(g)):(g=k(l,-1),h.$removeClass(g))}})}}}]}var Oe="validity",x=function(b){return G(b)?b.toLowerCase():b},lb=Object.prototype.hasOwnProperty,La=function(b){return G(b)?b.toUpperCase():b},R,A,Fa,wa=[].slice,Pe=[].push,Ba=Object.prototype.toString,Va=z("ng"),Xa=W.angular||(W.angular={}),$a,Pa,na=["0","0","0"];R=U((/msie (\d+)/.exec(x(navigator.userAgent))||[])[1]);isNaN(R)&&(R=U((/trident\/.*; rv:(\d+)/.exec(x(navigator.userAgent))||[])[1]));v.$inject=[];ga.$inject=[];var L=
+function(){return N(Array.isArray)?Array.isArray:function(b){return"[object Array]"===Ba.call(b)}}(),$=function(){return String.prototype.trim?function(b){return G(b)?b.trim():b}:function(b){return G(b)?b.replace(/^\s\s*/,"").replace(/\s\s*$/,""):b}}();Pa=9>R?function(b){b=b.nodeName?b:b[0];return b.scopeName&&"HTML"!=b.scopeName?La(b.scopeName+":"+b.nodeName):b.nodeName}:function(b){return b.nodeName?b.nodeName:b[0].nodeName};var Za=function(){if(D(Za.isActive_))return Za.isActive_;var b=!(!X.querySelector("[ng-csp]")&&
+!X.querySelector("[data-ng-csp]"));if(!b)try{new Function("")}catch(a){b=!0}return Za.isActive_=b},Xc=/[A-Z]/g,$c={full:"1.2.28",major:1,minor:2,dot:28,codeName:"finnish-disembarkation"};S.expando="ng339";var cb=S.cache={},me=1,sb=W.document.addEventListener?function(b,a,c){b.addEventListener(a,c,!1)}:function(b,a,c){b.attachEvent("on"+a,c)},bb=W.document.removeEventListener?function(b,a,c){b.removeEventListener(a,c,!1)}:function(b,a,c){b.detachEvent("on"+a,c)};S._data=function(b){return this.cache[b[this.expando]]||
+{}};var he=/([\:\-\_]+(.))/g,ie=/^moz([A-Z])/,Hb=z("jqLite"),je=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,Ib=/<|&#?\w+;/,ke=/<([\w:]+)/,le=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,da={option:[1,'<select multiple="multiple">',"</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};da.optgroup=da.option;da.tbody=da.tfoot=da.colgroup=
+da.caption=da.thead;da.th=da.td;var Oa=S.prototype={ready:function(b){function a(){c||(c=!0,b())}var c=!1;"complete"===X.readyState?setTimeout(a):(this.on("DOMContentLoaded",a),S(W).on("load",a))},toString:function(){var b=[];r(this,function(a){b.push(""+a)});return"["+b.join(", ")+"]"},eq:function(b){return 0<=b?A(this[b]):A(this[this.length+b])},length:0,push:Pe,sort:[].sort,splice:[].splice},rb={};r("multiple selected checked disabled readOnly required open".split(" "),function(b){rb[x(b)]=b});
+var pc={};r("input select option textarea button form details".split(" "),function(b){pc[La(b)]=!0});r({data:Mb,removeData:Lb},function(b,a){S[a]=b});r({data:Mb,inheritedData:qb,scope:function(b){return A.data(b,"$scope")||qb(b.parentNode||b,["$isolateScope","$scope"])},isolateScope:function(b){return A.data(b,"$isolateScope")||A.data(b,"$isolateScopeNoTemplate")},controller:mc,injector:function(b){return qb(b,"$injector")},removeAttr:function(b,a){b.removeAttribute(a)},hasClass:Nb,css:function(b,
+a,c){a=ab(a);if(D(c))b.style[a]=c;else{var d;8>=R&&(d=b.currentStyle&&b.currentStyle[a],""===d&&(d="auto"));d=d||b.style[a];8>=R&&(d=""===d?u:d);return d}},attr:function(b,a,c){var d=x(a);if(rb[d])if(D(c))c?(b[a]=!0,b.setAttribute(a,d)):(b[a]=!1,b.removeAttribute(d));else return b[a]||(b.attributes.getNamedItem(a)||v).specified?d:u;else if(D(c))b.setAttribute(a,c);else if(b.getAttribute)return b=b.getAttribute(a,2),null===b?u:b},prop:function(b,a,c){if(D(c))b[a]=c;else return b[a]},text:function(){function b(b,
+d){var e=a[b.nodeType];if(F(d))return e?b[e]:"";b[e]=d}var a=[];9>R?(a[1]="innerText",a[3]="nodeValue"):a[1]=a[3]="textContent";b.$dv="";return b}(),val:function(b,a){if(F(a)){if("SELECT"===Pa(b)&&b.multiple){var c=[];r(b.options,function(a){a.selected&&c.push(a.value||a.text)});return 0===c.length?null:c}return b.value}b.value=a},html:function(b,a){if(F(a))return b.innerHTML;for(var c=0,d=b.childNodes;c<d.length;c++)Ma(d[c]);b.innerHTML=a},empty:nc},function(b,a){S.prototype[a]=function(a,d){var e,
+f,g=this.length;if(b!==nc&&(2==b.length&&b!==Nb&&b!==mc?a:d)===u){if(T(a)){for(e=0;e<g;e++)if(b===Mb)b(this[e],a);else for(f in a)b(this[e],f,a[f]);return this}e=b.$dv;g=e===u?Math.min(g,1):g;for(f=0;f<g;f++){var h=b(this[f],a,d);e=e?e+h:h}return e}for(e=0;e<g;e++)b(this[e],a,d);return this}});r({removeData:Lb,dealoc:Ma,on:function a(c,d,e,f){if(D(f))throw Hb("onargs");var g=pa(c,"events"),h=pa(c,"handle");g||pa(c,"events",g={});h||pa(c,"handle",h=ne(c,g));r(d.split(" "),function(d){var f=g[d];if(!f){if("mouseenter"==
+d||"mouseleave"==d){var l=X.body.contains||X.body.compareDocumentPosition?function(a,c){var d=9===a.nodeType?a.documentElement:a,e=c&&c.parentNode;return a===e||!!(e&&1===e.nodeType&&(d.contains?d.contains(e):a.compareDocumentPosition&&a.compareDocumentPosition(e)&16))}:function(a,c){if(c)for(;c=c.parentNode;)if(c===a)return!0;return!1};g[d]=[];a(c,{mouseleave:"mouseout",mouseenter:"mouseover"}[d],function(a){var c=a.relatedTarget;c&&(c===this||l(this,c))||h(a,d)})}else sb(c,d,h),g[d]=[];f=g[d]}f.push(e)})},
+off:lc,one:function(a,c,d){a=A(a);a.on(c,function f(){a.off(c,d);a.off(c,f)});a.on(c,d)},replaceWith:function(a,c){var d,e=a.parentNode;Ma(a);r(new S(c),function(c){d?e.insertBefore(c,d.nextSibling):e.replaceChild(c,a);d=c})},children:function(a){var c=[];r(a.childNodes,function(a){1===a.nodeType&&c.push(a)});return c},contents:function(a){return a.contentDocument||a.childNodes||[]},append:function(a,c){r(new S(c),function(c){1!==a.nodeType&&11!==a.nodeType||a.appendChild(c)})},prepend:function(a,
+c){if(1===a.nodeType){var d=a.firstChild;r(new S(c),function(c){a.insertBefore(c,d)})}},wrap:function(a,c){c=A(c)[0];var d=a.parentNode;d&&d.replaceChild(c,a);c.appendChild(a)},remove:function(a){Ma(a);var c=a.parentNode;c&&c.removeChild(a)},after:function(a,c){var d=a,e=a.parentNode;r(new S(c),function(a){e.insertBefore(a,d.nextSibling);d=a})},addClass:pb,removeClass:ob,toggleClass:function(a,c,d){c&&r(c.split(" "),function(c){var f=d;F(f)&&(f=!Nb(a,c));(f?pb:ob)(a,c)})},parent:function(a){return(a=
+a.parentNode)&&11!==a.nodeType?a:null},next:function(a){if(a.nextElementSibling)return a.nextElementSibling;for(a=a.nextSibling;null!=a&&1!==a.nodeType;)a=a.nextSibling;return a},find:function(a,c){return a.getElementsByTagName?a.getElementsByTagName(c):[]},clone:Kb,triggerHandler:function(a,c,d){var e,f;e=c.type||c;var g=(pa(a,"events")||{})[e];g&&(e={preventDefault:function(){this.defaultPrevented=!0},isDefaultPrevented:function(){return!0===this.defaultPrevented},stopPropagation:v,type:e,target:a},
+c.type&&(e=E(e,c)),c=ha(g),f=d?[e].concat(d):[e],r(c,function(c){c.apply(a,f)}))}},function(a,c){S.prototype[c]=function(c,e,f){for(var g,h=0;h<this.length;h++)F(g)?(g=a(this[h],c,e,f),D(g)&&(g=A(g))):Jb(g,a(this[h],c,e,f));return D(g)?g:this};S.prototype.bind=S.prototype.on;S.prototype.unbind=S.prototype.off});db.prototype={put:function(a,c){this[Na(a,this.nextUid)]=c},get:function(a){return this[Na(a,this.nextUid)]},remove:function(a){var c=this[a=Na(a,this.nextUid)];delete this[a];return c}};var pe=
+/^function\s*[^\(]*\(\s*([^\)]*)\)/m,qe=/,/,re=/^\s*(_?)(\S+?)\1\s*$/,oe=/((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg,eb=z("$injector"),Qe=z("$animate"),Ld=["$provide",function(a){this.$$selectors={};this.register=function(c,d){var e=c+"-animation";if(c&&"."!=c.charAt(0))throw Qe("notcsel",c);this.$$selectors[c.substr(1)]=e;a.factory(e,d)};this.classNameFilter=function(a){1===arguments.length&&(this.$$classNameFilter=a instanceof RegExp?a:null);return this.$$classNameFilter};this.$get=["$timeout","$$asyncCallback",
+function(a,d){return{enter:function(a,c,g,h){g?g.after(a):(c&&c[0]||(c=g.parent()),c.append(a));h&&d(h)},leave:function(a,c){a.remove();c&&d(c)},move:function(a,c,d,h){this.enter(a,c,d,h)},addClass:function(a,c,g){c=G(c)?c:L(c)?c.join(" "):"";r(a,function(a){pb(a,c)});g&&d(g)},removeClass:function(a,c,g){c=G(c)?c:L(c)?c.join(" "):"";r(a,function(a){ob(a,c)});g&&d(g)},setClass:function(a,c,g,h){r(a,function(a){pb(a,c);ob(a,g)});h&&d(h)},enabled:v}}]}],ja=z("$compile");gc.$inject=["$provide","$$sanitizeUriProvider"];
+var we=/^(x[\:\-_]|data[\:\-_])/i,wc=z("$interpolate"),Re=/^([^\?#]*)(\?([^#]*))?(#(.*))?$/,ze={http:80,https:443,ftp:21},Sb=z("$location");Ac.prototype=Tb.prototype=zc.prototype={$$html5:!1,$$replace:!1,absUrl:tb("$$absUrl"),url:function(a){if(F(a))return this.$$url;a=Re.exec(a);a[1]&&this.path(decodeURIComponent(a[1]));(a[2]||a[1])&&this.search(a[3]||"");this.hash(a[5]||"");return this},protocol:tb("$$protocol"),host:tb("$$host"),port:tb("$$port"),path:Bc("$$path",function(a){a=null!==a?a.toString():
+"";return"/"==a.charAt(0)?a:"/"+a}),search:function(a,c){switch(arguments.length){case 0:return this.$$search;case 1:if(G(a)||jb(a))a=a.toString(),this.$$search=cc(a);else if(T(a))r(a,function(c,e){null==c&&delete a[e]}),this.$$search=a;else throw Sb("isrcharg");break;default:F(c)||null===c?delete this.$$search[a]:this.$$search[a]=c}this.$$compose();return this},hash:Bc("$$hash",function(a){return null!==a?a.toString():""}),replace:function(){this.$$replace=!0;return this}};var la=z("$parse"),Ec=
+{},ya,Se=Function.prototype.call,Te=Function.prototype.apply,Pc=Function.prototype.bind,hb={"null":function(){return null},"true":function(){return!0},"false":function(){return!1},undefined:v,"+":function(a,c,d,e){d=d(a,c);e=e(a,c);return D(d)?D(e)?d+e:d:D(e)?e:u},"-":function(a,c,d,e){d=d(a,c);e=e(a,c);return(D(d)?d:0)-(D(e)?e:0)},"*":function(a,c,d,e){return d(a,c)*e(a,c)},"/":function(a,c,d,e){return d(a,c)/e(a,c)},"%":function(a,c,d,e){return d(a,c)%e(a,c)},"^":function(a,c,d,e){return d(a,c)^
+e(a,c)},"=":v,"===":function(a,c,d,e){return d(a,c)===e(a,c)},"!==":function(a,c,d,e){return d(a,c)!==e(a,c)},"==":function(a,c,d,e){return d(a,c)==e(a,c)},"!=":function(a,c,d,e){return d(a,c)!=e(a,c)},"<":function(a,c,d,e){return d(a,c)<e(a,c)},">":function(a,c,d,e){return d(a,c)>e(a,c)},"<=":function(a,c,d,e){return d(a,c)<=e(a,c)},">=":function(a,c,d,e){return d(a,c)>=e(a,c)},"&&":function(a,c,d,e){return d(a,c)&&e(a,c)},"||":function(a,c,d,e){return d(a,c)||e(a,c)},"&":function(a,c,d,e){return d(a,
+c)&e(a,c)},"|":function(a,c,d,e){return e(a,c)(a,c,d(a,c))},"!":function(a,c,d){return!d(a,c)}},Ue={n:"\n",f:"\f",r:"\r",t:"\t",v:"\v","'":"'",'"':'"'},Ub=function(a){this.options=a};Ub.prototype={constructor:Ub,lex:function(a){this.text=a;this.index=0;this.ch=u;this.lastCh=":";for(this.tokens=[];this.index<this.text.length;){this.ch=this.text.charAt(this.index);if(this.is("\"'"))this.readString(this.ch);else if(this.isNumber(this.ch)||this.is(".")&&this.isNumber(this.peek()))this.readNumber();else if(this.isIdent(this.ch))this.readIdent();
+else if(this.is("(){}[].,;:?"))this.tokens.push({index:this.index,text:this.ch}),this.index++;else if(this.isWhitespace(this.ch)){this.index++;continue}else{a=this.ch+this.peek();var c=a+this.peek(2),d=hb[this.ch],e=hb[a],f=hb[c];f?(this.tokens.push({index:this.index,text:c,fn:f}),this.index+=3):e?(this.tokens.push({index:this.index,text:a,fn:e}),this.index+=2):d?(this.tokens.push({index:this.index,text:this.ch,fn:d}),this.index+=1):this.throwError("Unexpected next character ",this.index,this.index+
+1)}this.lastCh=this.ch}return this.tokens},is:function(a){return-1!==a.indexOf(this.ch)},was:function(a){return-1!==a.indexOf(this.lastCh)},peek:function(a){a=a||1;return this.index+a<this.text.length?this.text.charAt(this.index+a):!1},isNumber:function(a){return"0"<=a&&"9">=a},isWhitespace:function(a){return" "===a||"\r"===a||"\t"===a||"\n"===a||"\v"===a||"\u00a0"===a},isIdent:function(a){return"a"<=a&&"z">=a||"A"<=a&&"Z">=a||"_"===a||"$"===a},isExpOperator:function(a){return"-"===a||"+"===a||this.isNumber(a)},
+throwError:function(a,c,d){d=d||this.index;c=D(c)?"s "+c+"-"+this.index+" ["+this.text.substring(c,d)+"]":" "+d;throw la("lexerr",a,c,this.text);},readNumber:function(){for(var a="",c=this.index;this.index<this.text.length;){var d=x(this.text.charAt(this.index));if("."==d||this.isNumber(d))a+=d;else{var e=this.peek();if("e"==d&&this.isExpOperator(e))a+=d;else if(this.isExpOperator(d)&&e&&this.isNumber(e)&&"e"==a.charAt(a.length-1))a+=d;else if(!this.isExpOperator(d)||e&&this.isNumber(e)||"e"!=a.charAt(a.length-
+1))break;else this.throwError("Invalid exponent")}this.index++}a*=1;this.tokens.push({index:c,text:a,literal:!0,constant:!0,fn:function(){return a}})},readIdent:function(){for(var a=this,c="",d=this.index,e,f,g,h;this.index<this.text.length;){h=this.text.charAt(this.index);if("."===h||this.isIdent(h)||this.isNumber(h))"."===h&&(e=this.index),c+=h;else break;this.index++}if(e)for(f=this.index;f<this.text.length;){h=this.text.charAt(f);if("("===h){g=c.substr(e-d+1);c=c.substr(0,e-d);this.index=f;break}if(this.isWhitespace(h))f++;
+else break}d={index:d,text:c};if(hb.hasOwnProperty(c))d.fn=hb[c],d.literal=!0,d.constant=!0;else{var k=Dc(c,this.options,this.text);d.fn=E(function(a,c){return k(a,c)},{assign:function(d,e){return ub(d,c,e,a.text,a.options)}})}this.tokens.push(d);g&&(this.tokens.push({index:e,text:"."}),this.tokens.push({index:e+1,text:g}))},readString:function(a){var c=this.index;this.index++;for(var d="",e=a,f=!1;this.index<this.text.length;){var g=this.text.charAt(this.index),e=e+g;if(f)"u"===g?(f=this.text.substring(this.index+
+1,this.index+5),f.match(/[\da-f]{4}/i)||this.throwError("Invalid unicode escape [\\u"+f+"]"),this.index+=4,d+=String.fromCharCode(parseInt(f,16))):d+=Ue[g]||g,f=!1;else if("\\"===g)f=!0;else{if(g===a){this.index++;this.tokens.push({index:c,text:e,string:d,literal:!0,constant:!0,fn:function(){return d}});return}d+=g}this.index++}this.throwError("Unterminated quote",c)}};var gb=function(a,c,d){this.lexer=a;this.$filter=c;this.options=d};gb.ZERO=E(function(){return 0},{constant:!0});gb.prototype={constructor:gb,
+parse:function(a){this.text=a;this.tokens=this.lexer.lex(a);a=this.statements();0!==this.tokens.length&&this.throwError("is an unexpected token",this.tokens[0]);a.literal=!!a.literal;a.constant=!!a.constant;return a},primary:function(){var a;if(this.expect("("))a=this.filterChain(),this.consume(")");else if(this.expect("["))a=this.arrayDeclaration();else if(this.expect("{"))a=this.object();else{var c=this.expect();(a=c.fn)||this.throwError("not a primary expression",c);a.literal=!!c.literal;a.constant=
+!!c.constant}for(var d;c=this.expect("(","[",".");)"("===c.text?(a=this.functionCall(a,d),d=null):"["===c.text?(d=a,a=this.objectIndex(a)):"."===c.text?(d=a,a=this.fieldAccess(a)):this.throwError("IMPOSSIBLE");return a},throwError:function(a,c){throw la("syntax",c.text,a,c.index+1,this.text,this.text.substring(c.index));},peekToken:function(){if(0===this.tokens.length)throw la("ueoe",this.text);return this.tokens[0]},peek:function(a,c,d,e){if(0<this.tokens.length){var f=this.tokens[0],g=f.text;if(g===
+a||g===c||g===d||g===e||!(a||c||d||e))return f}return!1},expect:function(a,c,d,e){return(a=this.peek(a,c,d,e))?(this.tokens.shift(),a):!1},consume:function(a){this.expect(a)||this.throwError("is unexpected, expecting ["+a+"]",this.peek())},unaryFn:function(a,c){return E(function(d,e){return a(d,e,c)},{constant:c.constant})},ternaryFn:function(a,c,d){return E(function(e,f){return a(e,f)?c(e,f):d(e,f)},{constant:a.constant&&c.constant&&d.constant})},binaryFn:function(a,c,d){return E(function(e,f){return c(e,
+f,a,d)},{constant:a.constant&&d.constant})},statements:function(){for(var a=[];;)if(0<this.tokens.length&&!this.peek("}",")",";","]")&&a.push(this.filterChain()),!this.expect(";"))return 1===a.length?a[0]:function(c,d){for(var e,f=0;f<a.length;f++){var g=a[f];g&&(e=g(c,d))}return e}},filterChain:function(){for(var a=this.expression(),c;;)if(c=this.expect("|"))a=this.binaryFn(a,c.fn,this.filter());else return a},filter:function(){for(var a=this.expect(),c=this.$filter(a.text),d=[];;)if(a=this.expect(":"))d.push(this.expression());
+else{var e=function(a,e,h){h=[h];for(var k=0;k<d.length;k++)h.push(d[k](a,e));return c.apply(a,h)};return function(){return e}}},expression:function(){return this.assignment()},assignment:function(){var a=this.ternary(),c,d;return(d=this.expect("="))?(a.assign||this.throwError("implies assignment but ["+this.text.substring(0,d.index)+"] can not be assigned to",d),c=this.ternary(),function(d,f){return a.assign(d,c(d,f),f)}):a},ternary:function(){var a=this.logicalOR(),c,d;if(this.expect("?")){c=this.assignment();
 if(d=this.expect(":"))return this.ternaryFn(a,c,this.assignment());this.throwError("expected :",d)}else return a},logicalOR:function(){for(var a=this.logicalAND(),c;;)if(c=this.expect("||"))a=this.binaryFn(a,c.fn,this.logicalAND());else return a},logicalAND:function(){var a=this.equality(),c;if(c=this.expect("&&"))a=this.binaryFn(a,c.fn,this.logicalAND());return a},equality:function(){var a=this.relational(),c;if(c=this.expect("==","!=","===","!=="))a=this.binaryFn(a,c.fn,this.equality());return a},
-relational:function(){var a=this.additive(),c;if(c=this.expect("<",">","<=",">="))a=this.binaryFn(a,c.fn,this.relational());return a},additive:function(){for(var a=this.multiplicative(),c;c=this.expect("+","-");)a=this.binaryFn(a,c.fn,this.multiplicative());return a},multiplicative:function(){for(var a=this.unary(),c;c=this.expect("*","/","%");)a=this.binaryFn(a,c.fn,this.unary());return a},unary:function(){var a;return this.expect("+")?this.primary():(a=this.expect("-"))?this.binaryFn(fb.ZERO,a.fn,
-this.unary()):(a=this.expect("!"))?this.unaryFn(a.fn,this.unary()):this.primary()},fieldAccess:function(a){var c=this,d=this.expect().text,e=Ec(d,this.options,this.text);return D(function(c,d,k){return e(k||a(c,d))},{assign:function(e,g,k){(k=a(e,k))||a.assign(e,k={});return ub(k,d,g,c.text,c.options)}})},objectIndex:function(a){var c=this,d=this.expression();this.consume("]");return D(function(e,f){var g=a(e,f),k=d(e,f),m;ka(k,c.text);if(!g)return t;(g=va(g[k],c.text))&&(g.then&&c.options.unwrapPromises)&&
-(m=g,"$$v"in g||(m.$$v=t,m.then(function(a){m.$$v=a})),g=g.$$v);return g},{assign:function(e,f,g){var k=ka(d(e,g),c.text);(g=va(a(e,g),c.text))||a.assign(e,g={});return g[k]=f}})},functionCall:function(a,c){var d=[];if(")"!==this.peekToken().text){do d.push(this.expression());while(this.expect(","))}this.consume(")");var e=this;return function(f,g){for(var k=[],m=c?c(f,g):f,h=0;h<d.length;h++)k.push(va(d[h](f,g),e.text));h=a(f,g,m)||E;va(m,e.text);var l=e.text;if(h){if(h.constructor===h)throw la("isecfn",
-l);if(h===Pe||h===Qe||Qc&&h===Qc)throw la("isecff",l);}k=h.apply?h.apply(m,k):h(k[0],k[1],k[2],k[3],k[4]);return va(k,e.text)}},arrayDeclaration:function(){var a=[],c=!0;if("]"!==this.peekToken().text){do{if(this.peek("]"))break;var d=this.expression();a.push(d);d.constant||(c=!1)}while(this.expect(","))}this.consume("]");return D(function(c,d){for(var g=[],k=0;k<a.length;k++)g.push(a[k](c,d));return g},{literal:!0,constant:c})},object:function(){var a=[],c=!0;if("}"!==this.peekToken().text){do{if(this.peek("}"))break;
-var d=this.expect(),d=d.string||d.text;this.consume(":");var e=this.expression();a.push({key:d,value:e});e.constant||(c=!1)}while(this.expect(","))}this.consume("}");return D(function(c,d){for(var e={},m=0;m<a.length;m++){var h=a[m];e[h.key]=h.value(c,d)}return e},{literal:!0,constant:c})}};var Vb={},xa=C("$sce"),ga={HTML:"html",CSS:"css",URL:"url",RESOURCE_URL:"resourceUrl",JS:"js"},Y=X.createElement("a"),Hc=ua(W.location.href,!0);mc.$inject=["$provide"];Ic.$inject=["$locale"];Kc.$inject=["$locale"];
-var Nc=".",Je={yyyy:$("FullYear",4),yy:$("FullYear",2,0,!0),y:$("FullYear",1),MMMM:vb("Month"),MMM:vb("Month",!0),MM:$("Month",2,1),M:$("Month",1,1),dd:$("Date",2),d:$("Date",1),HH:$("Hours",2),H:$("Hours",1),hh:$("Hours",2,-12),h:$("Hours",1,-12),mm:$("Minutes",2),m:$("Minutes",1),ss:$("Seconds",2),s:$("Seconds",1),sss:$("Milliseconds",3),EEEE:vb("Day"),EEE:vb("Day",!0),a:function(a,c){return 12>a.getHours()?c.AMPMS[0]:c.AMPMS[1]},Z:function(a){a=-1*a.getTimezoneOffset();return a=(0<=a?"+":"")+(Xb(Math[0<
-a?"floor":"ceil"](a/60),2)+Xb(Math.abs(a%60),2))}},Ie=/((?:[^yMdHhmsaZE']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z))(.*)/,He=/^\-?\d+$/;Jc.$inject=["$locale"];var Fe=ba(K),Ge=ba(Ia);Lc.$inject=["$parse"];var dd=ba({restrict:"E",compile:function(a,c){8>=Q&&(c.href||c.name||c.$set("href",""),a.append(X.createComment("IE fix")));if(!c.href&&!c.xlinkHref&&!c.name)return function(a,c){var f="[object SVGAnimatedString]"===za.call(c.prop("href"))?"xlink:href":"href";c.on("click",function(a){c.attr(f)||
-a.preventDefault()})}}}),Fb={};r(qb,function(a,c){if("multiple"!=a){var d=pa("ng-"+c);Fb[d]=function(){return{priority:100,link:function(a,f,g){a.$watch(g[d],function(a){g.$set(c,!!a)})}}}}});r(["src","srcset","href"],function(a){var c=pa("ng-"+a);Fb[c]=function(){return{priority:99,link:function(d,e,f){var g=a,k=a;"href"===a&&"[object SVGAnimatedString]"===za.call(e.prop("href"))&&(k="xlinkHref",f.$attr[k]="xlink:href",g=null);f.$observe(c,function(c){c?(f.$set(k,c),Q&&g&&e.prop(g,f[k])):"href"===
-a&&f.$set(k,null)})}}}});var yb={$addControl:E,$removeControl:E,$setValidity:E,$setDirty:E,$setPristine:E};Oc.$inject=["$element","$attrs","$scope","$animate"];var Rc=function(a){return["$timeout",function(c){return{name:"form",restrict:a?"EAC":"E",controller:Oc,compile:function(){return{pre:function(a,e,f,g){if(!f.action){var k=function(a){a.preventDefault?a.preventDefault():a.returnValue=!1};sb(e[0],"submit",k);e.on("$destroy",function(){c(function(){$a(e[0],"submit",k)},0,!1)})}var m=e.parent().controller("form"),
-h=f.name||f.ngForm;h&&ub(a,h,g,h);if(m)e.on("$destroy",function(){m.$removeControl(g);h&&ub(a,h,t,h);D(g,yb)})}}}}}]},ed=Rc(),rd=Rc(!0),Se=/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/,Te=/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i,Ue=/^\s*(\-|\+)?(\d+|(\d*(\.\d*)))\s*$/,Sc={text:Ab,number:function(a,c,d,e,f,g){Ab(a,c,d,e,f,g);e.$parsers.push(function(a){var c=e.$isEmpty(a);if(c||Ue.test(a))return e.$setValidity("number",
-!0),""===a?null:c?a:parseFloat(a);e.$setValidity("number",!1);return t});Ke(e,"number",Ve,null,e.$$validityState);e.$formatters.push(function(a){return e.$isEmpty(a)?"":""+a});d.min&&(a=function(a){var c=parseFloat(d.min);return sa(e,"min",e.$isEmpty(a)||a>=c,a)},e.$parsers.push(a),e.$formatters.push(a));d.max&&(a=function(a){var c=parseFloat(d.max);return sa(e,"max",e.$isEmpty(a)||a<=c,a)},e.$parsers.push(a),e.$formatters.push(a));e.$formatters.push(function(a){return sa(e,"number",e.$isEmpty(a)||
-ib(a),a)})},url:function(a,c,d,e,f,g){Ab(a,c,d,e,f,g);a=function(a){return sa(e,"url",e.$isEmpty(a)||Se.test(a),a)};e.$formatters.push(a);e.$parsers.push(a)},email:function(a,c,d,e,f,g){Ab(a,c,d,e,f,g);a=function(a){return sa(e,"email",e.$isEmpty(a)||Te.test(a),a)};e.$formatters.push(a);e.$parsers.push(a)},radio:function(a,c,d,e){x(d.name)&&c.attr("name",hb());c.on("click",function(){c[0].checked&&a.$apply(function(){e.$setViewValue(d.value)})});e.$render=function(){c[0].checked=d.value==e.$viewValue};
-d.$observe("value",e.$render)},checkbox:function(a,c,d,e){var f=d.ngTrueValue,g=d.ngFalseValue;v(f)||(f=!0);v(g)||(g=!1);c.on("click",function(){a.$apply(function(){e.$setViewValue(c[0].checked)})});e.$render=function(){c[0].checked=e.$viewValue};e.$isEmpty=function(a){return a!==f};e.$formatters.push(function(a){return a===f});e.$parsers.push(function(a){return a?f:g})},hidden:E,button:E,submit:E,reset:E,file:E},Ve=["badInput"],jc=["$browser","$sniffer",function(a,c){return{restrict:"E",require:"?ngModel",
-link:function(d,e,f,g){g&&(Sc[K(f.type)]||Sc.text)(d,e,f,g,c,a)}}}],wb="ng-valid",xb="ng-invalid",Oa="ng-pristine",zb="ng-dirty",We=["$scope","$exceptionHandler","$attrs","$element","$parse","$animate",function(a,c,d,e,f,g){function k(a,c){c=c?"-"+mb(c,"-"):"";g.removeClass(e,(a?xb:wb)+c);g.addClass(e,(a?wb:xb)+c)}this.$modelValue=this.$viewValue=Number.NaN;this.$parsers=[];this.$formatters=[];this.$viewChangeListeners=[];this.$pristine=!0;this.$dirty=!1;this.$valid=!0;this.$invalid=!1;this.$name=
-d.name;var m=f(d.ngModel),h=m.assign;if(!h)throw C("ngModel")("nonassign",d.ngModel,ia(e));this.$render=E;this.$isEmpty=function(a){return x(a)||""===a||null===a||a!==a};var l=e.inheritedData("$formController")||yb,n=0,p=this.$error={};e.addClass(Oa);k(!0);this.$setValidity=function(a,c){p[a]!==!c&&(c?(p[a]&&n--,n||(k(!0),this.$valid=!0,this.$invalid=!1)):(k(!1),this.$invalid=!0,this.$valid=!1,n++),p[a]=!c,k(c,a),l.$setValidity(a,c,this))};this.$setPristine=function(){this.$dirty=!1;this.$pristine=
-!0;g.removeClass(e,zb);g.addClass(e,Oa)};this.$setViewValue=function(d){this.$viewValue=d;this.$pristine&&(this.$dirty=!0,this.$pristine=!1,g.removeClass(e,Oa),g.addClass(e,zb),l.$setDirty());r(this.$parsers,function(a){d=a(d)});this.$modelValue!==d&&(this.$modelValue=d,h(a,d),r(this.$viewChangeListeners,function(a){try{a()}catch(d){c(d)}}))};var q=this;a.$watch(function(){var c=m(a);if(q.$modelValue!==c){var d=q.$formatters,e=d.length;for(q.$modelValue=c;e--;)c=d[e](c);q.$viewValue!==c&&(q.$viewValue=
-c,q.$render())}return c})}],Gd=function(){return{require:["ngModel","^?form"],controller:We,link:function(a,c,d,e){var f=e[0],g=e[1]||yb;g.$addControl(f);a.$on("$destroy",function(){g.$removeControl(f)})}}},Id=ba({require:"ngModel",link:function(a,c,d,e){e.$viewChangeListeners.push(function(){a.$eval(d.ngChange)})}}),kc=function(){return{require:"?ngModel",link:function(a,c,d,e){if(e){d.required=!0;var f=function(a){if(d.required&&e.$isEmpty(a))e.$setValidity("required",!1);else return e.$setValidity("required",
-!0),a};e.$formatters.push(f);e.$parsers.unshift(f);d.$observe("required",function(){f(e.$viewValue)})}}}},Hd=function(){return{require:"ngModel",link:function(a,c,d,e){var f=(a=/\/(.*)\//.exec(d.ngList))&&RegExp(a[1])||d.ngList||",";e.$parsers.push(function(a){if(!x(a)){var c=[];a&&r(a.split(f),function(a){a&&c.push(aa(a))});return c}});e.$formatters.push(function(a){return J(a)?a.join(", "):t});e.$isEmpty=function(a){return!a||!a.length}}}},Xe=/^(true|false|\d+)$/,Jd=function(){return{priority:100,
-compile:function(a,c){return Xe.test(c.ngValue)?function(a,c,f){f.$set("value",a.$eval(f.ngValue))}:function(a,c,f){a.$watch(f.ngValue,function(a){f.$set("value",a)})}}}},jd=ya({compile:function(a){a.addClass("ng-binding");return function(a,d,e){d.data("$binding",e.ngBind);a.$watch(e.ngBind,function(a){d.text(a==t?"":a)})}}}),ld=["$interpolate",function(a){return function(c,d,e){c=a(d.attr(e.$attr.ngBindTemplate));d.addClass("ng-binding").data("$binding",c);e.$observe("ngBindTemplate",function(a){d.text(a)})}}],
-kd=["$sce","$parse",function(a,c){return{compile:function(d){d.addClass("ng-binding");return function(d,f,g){f.data("$binding",g.ngBindHtml);var k=c(g.ngBindHtml);d.$watch(function(){return(k(d)||"").toString()},function(c){f.html(a.getTrustedHtml(k(d))||"")})}}}}],md=Yb("",!0),od=Yb("Odd",0),nd=Yb("Even",1),pd=ya({compile:function(a,c){c.$set("ngCloak",t);a.removeClass("ng-cloak")}}),qd=[function(){return{scope:!0,controller:"@",priority:500}}],lc={},Ye={blur:!0,focus:!0};r("click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste".split(" "),
-function(a){var c=pa("ng-"+a);lc[c]=["$parse","$rootScope",function(d,e){return{compile:function(f,g){var k=d(g[c]);return function(c,d){d.on(a,function(d){var f=function(){k(c,{$event:d})};Ye[a]&&e.$$phase?c.$evalAsync(f):c.$apply(f)})}}}}]});var td=["$animate",function(a){return{transclude:"element",priority:600,terminal:!0,restrict:"A",$$tlb:!0,link:function(c,d,e,f,g){var k,m,h;c.$watch(e.ngIf,function(f){Ua(f)?m||(m=c.$new(),g(m,function(c){c[c.length++]=X.createComment(" end ngIf: "+e.ngIf+
-" ");k={clone:c};a.enter(c,d.parent(),d)})):(h&&(h.remove(),h=null),m&&(m.$destroy(),m=null),k&&(h=Eb(k.clone),a.leave(h,function(){h=null}),k=null))})}}}],ud=["$http","$templateCache","$anchorScroll","$animate","$sce",function(a,c,d,e,f){return{restrict:"ECA",priority:400,terminal:!0,transclude:"element",controller:Va.noop,compile:function(g,k){var m=k.ngInclude||k.src,h=k.onload||"",l=k.autoscroll;return function(g,k,q,r,F){var u=0,t,w,R,z=function(){w&&(w.remove(),w=null);t&&(t.$destroy(),t=null);
-R&&(e.leave(R,function(){w=null}),w=R,R=null)};g.$watch(f.parseAsResourceUrl(m),function(f){var m=function(){!y(l)||l&&!g.$eval(l)||d()},q=++u;f?(a.get(f,{cache:c}).success(function(a){if(q===u){var c=g.$new();r.template=a;a=F(c,function(a){z();e.enter(a,null,k,m)});t=c;R=a;t.$emit("$includeContentLoaded");g.$eval(h)}}).error(function(){q===u&&z()}),g.$emit("$includeContentRequested")):(z(),r.template=null)})}}}}],Kd=["$compile",function(a){return{restrict:"ECA",priority:-400,require:"ngInclude",
-link:function(c,d,e,f){d.html(f.template);a(d.contents())(c)}}}],vd=ya({priority:450,compile:function(){return{pre:function(a,c,d){a.$eval(d.ngInit)}}}}),wd=ya({terminal:!0,priority:1E3}),xd=["$locale","$interpolate",function(a,c){var d=/{}/g;return{restrict:"EA",link:function(e,f,g){var k=g.count,m=g.$attr.when&&f.attr(g.$attr.when),h=g.offset||0,l=e.$eval(m)||{},n={},p=c.startSymbol(),q=c.endSymbol(),s=/^when(Minus)?(.+)$/;r(g,function(a,c){s.test(c)&&(l[K(c.replace("when","").replace("Minus","-"))]=
-f.attr(g.$attr[c]))});r(l,function(a,e){n[e]=c(a.replace(d,p+k+"-"+h+q))});e.$watch(function(){var c=parseFloat(e.$eval(k));if(isNaN(c))return"";c in l||(c=a.pluralCat(c-h));return n[c](e,f,!0)},function(a){f.text(a)})}}}],yd=["$parse","$animate",function(a,c){var d=C("ngRepeat");return{transclude:"element",priority:1E3,terminal:!0,$$tlb:!0,link:function(e,f,g,k,m){var h=g.ngRepeat,l=h.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?\s*$/),n,p,q,s,t,u,A={$id:Ka};if(!l)throw d("iexp",
-h);g=l[1];k=l[2];(l=l[3])?(n=a(l),p=function(a,c,d){u&&(A[u]=a);A[t]=c;A.$index=d;return n(e,A)}):(q=function(a,c){return Ka(c)},s=function(a){return a});l=g.match(/^(?:([\$\w]+)|\(([\$\w]+)\s*,\s*([\$\w]+)\))$/);if(!l)throw d("iidexp",g);t=l[3]||l[1];u=l[2];var y={};e.$watchCollection(k,function(a){var g,k,l=f[0],n,A={},B,I,H,v,E,C,x,J=[];if(Pa(a))C=a,E=p||q;else{E=p||s;C=[];for(H in a)a.hasOwnProperty(H)&&"$"!=H.charAt(0)&&C.push(H);C.sort()}B=C.length;k=J.length=C.length;for(g=0;g<k;g++)if(H=a===
-C?g:C[g],v=a[H],n=E(H,v,g),Da(n,"`track by` id"),y.hasOwnProperty(n))x=y[n],delete y[n],A[n]=x,J[g]=x;else{if(A.hasOwnProperty(n))throw r(J,function(a){a&&a.scope&&(y[a.id]=a)}),d("dupes",h,n,na(v));J[g]={id:n};A[n]=!1}for(H in y)y.hasOwnProperty(H)&&(x=y[H],g=Eb(x.clone),c.leave(g),r(g,function(a){a.$$NG_REMOVED=!0}),x.scope.$destroy());g=0;for(k=C.length;g<k;g++){H=a===C?g:C[g];v=a[H];x=J[g];J[g-1]&&(l=J[g-1].clone[J[g-1].clone.length-1]);if(x.scope){I=x.scope;n=l;do n=n.nextSibling;while(n&&n.$$NG_REMOVED);
-x.clone[0]!=n&&c.move(Eb(x.clone),null,w(l));l=x.clone[x.clone.length-1]}else I=e.$new();I[t]=v;u&&(I[u]=H);I.$index=g;I.$first=0===g;I.$last=g===B-1;I.$middle=!(I.$first||I.$last);I.$odd=!(I.$even=0===(g&1));x.scope||m(I,function(a){a[a.length++]=X.createComment(" end ngRepeat: "+h+" ");c.enter(a,null,w(l));l=a;x.scope=I;x.clone=a;A[x.id]=x})}y=A})}}}],zd=["$animate",function(a){return function(c,d,e){c.$watch(e.ngShow,function(c){a[Ua(c)?"removeClass":"addClass"](d,"ng-hide")})}}],sd=["$animate",
-function(a){return function(c,d,e){c.$watch(e.ngHide,function(c){a[Ua(c)?"addClass":"removeClass"](d,"ng-hide")})}}],Ad=ya(function(a,c,d){a.$watch(d.ngStyle,function(a,d){d&&a!==d&&r(d,function(a,d){c.css(d,"")});a&&c.css(a)},!0)}),Bd=["$animate",function(a){return{restrict:"EA",require:"ngSwitch",controller:["$scope",function(){this.cases={}}],link:function(c,d,e,f){var g=[],k=[],m=[],h=[];c.$watch(e.ngSwitch||e.on,function(d){var n,p;n=0;for(p=m.length;n<p;++n)m[n].remove();n=m.length=0;for(p=
-h.length;n<p;++n){var q=k[n];h[n].$destroy();m[n]=q;a.leave(q,function(){m.splice(n,1)})}k.length=0;h.length=0;if(g=f.cases["!"+d]||f.cases["?"])c.$eval(e.change),r(g,function(d){var e=c.$new();h.push(e);d.transclude(e,function(c){var e=d.element;k.push(c);a.enter(c,e.parent(),e)})})})}}}],Cd=ya({transclude:"element",priority:800,require:"^ngSwitch",link:function(a,c,d,e,f){e.cases["!"+d.ngSwitchWhen]=e.cases["!"+d.ngSwitchWhen]||[];e.cases["!"+d.ngSwitchWhen].push({transclude:f,element:c})}}),Dd=
-ya({transclude:"element",priority:800,require:"^ngSwitch",link:function(a,c,d,e,f){e.cases["?"]=e.cases["?"]||[];e.cases["?"].push({transclude:f,element:c})}}),Fd=ya({link:function(a,c,d,e,f){if(!f)throw C("ngTransclude")("orphan",ia(c));f(function(a){c.empty();c.append(a)})}}),fd=["$templateCache",function(a){return{restrict:"E",terminal:!0,compile:function(c,d){"text/ng-template"==d.type&&a.put(d.id,c[0].text)}}}],Ze=C("ngOptions"),Ed=ba({terminal:!0}),gd=["$compile","$parse",function(a,c){var d=
-/^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w]*)|(?:\(\s*([\$\w][\$\w]*)\s*,\s*([\$\w][\$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/,e={$setViewValue:E};return{restrict:"E",require:["select","?ngModel"],controller:["$element","$scope","$attrs",function(a,c,d){var m=this,h={},l=e,n;m.databound=d.ngModel;m.init=function(a,c,d){l=a;n=d};m.addOption=function(c){Da(c,'"option value"');h[c]=!0;l.$viewValue==c&&(a.val(c),n.parent()&&n.remove())};
-m.removeOption=function(a){this.hasOption(a)&&(delete h[a],l.$viewValue==a&&this.renderUnknownOption(a))};m.renderUnknownOption=function(c){c="? "+Ka(c)+" ?";n.val(c);a.prepend(n);a.val(c);n.prop("selected",!0)};m.hasOption=function(a){return h.hasOwnProperty(a)};c.$on("$destroy",function(){m.renderUnknownOption=E})}],link:function(e,g,k,m){function h(a,c,d,e){d.$render=function(){var a=d.$viewValue;e.hasOption(a)?(v.parent()&&v.remove(),c.val(a),""===a&&u.prop("selected",!0)):x(a)&&u?c.val(""):e.renderUnknownOption(a)};
-c.on("change",function(){a.$apply(function(){v.parent()&&v.remove();d.$setViewValue(c.val())})})}function l(a,c,d){var e;d.$render=function(){var a=new bb(d.$viewValue);r(c.find("option"),function(c){c.selected=y(a.get(c.value))})};a.$watch(function(){Aa(e,d.$viewValue)||(e=ha(d.$viewValue),d.$render())});c.on("change",function(){a.$apply(function(){var a=[];r(c.find("option"),function(c){c.selected&&a.push(c.value)});d.$setViewValue(a)})})}function n(e,f,g){function k(){var a={"":[]},c=[""],d,h,
-s,t,v;s=g.$modelValue;t=w(e)||[];var E=n?Zb(t):t,I,M,B;M={};B=!1;if(q)if(h=g.$modelValue,x&&J(h))for(B=new bb([]),d={},v=0;v<h.length;v++)d[m]=h[v],B.put(x(e,d),h[v]);else B=new bb(h);v=B;var D,K;for(B=0;I=E.length,B<I;B++){h=B;if(n){h=E[B];if("$"===h.charAt(0))continue;M[n]=h}M[m]=t[h];d=r(e,M)||"";(h=a[d])||(h=a[d]=[],c.push(d));q?d=y(v.remove(x?x(e,M):u(e,M))):(x?(d={},d[m]=s,d=x(e,d)===x(e,M)):d=s===u(e,M),v=v||d);D=l(e,M);D=y(D)?D:"";h.push({id:x?x(e,M):n?E[B]:B,label:D,selected:d})}q||(F||null===
-s?a[""].unshift({id:"",label:"",selected:!v}):v||a[""].unshift({id:"?",label:"",selected:!0}));M=0;for(E=c.length;M<E;M++){d=c[M];h=a[d];z.length<=M?(s={element:C.clone().attr("label",d),label:h.label},t=[s],z.push(t),f.append(s.element)):(t=z[M],s=t[0],s.label!=d&&s.element.attr("label",s.label=d));D=null;B=0;for(I=h.length;B<I;B++)d=h[B],(v=t[B+1])?(D=v.element,v.label!==d.label&&D.text(v.label=d.label),v.id!==d.id&&D.val(v.id=d.id),D[0].selected!==d.selected&&(D.prop("selected",v.selected=d.selected),
-Q&&D.prop("selected",v.selected))):(""===d.id&&F?K=F:(K=A.clone()).val(d.id).prop("selected",d.selected).attr("selected",d.selected).text(d.label),t.push({element:K,label:d.label,id:d.id,selected:d.selected}),p.addOption(d.label,K),D?D.after(K):s.element.append(K),D=K);for(B++;t.length>B;)d=t.pop(),p.removeOption(d.label),d.element.remove()}for(;z.length>M;)z.pop()[0].element.remove()}var h;if(!(h=s.match(d)))throw Ze("iexp",s,ia(f));var l=c(h[2]||h[1]),m=h[4]||h[6],n=h[5],r=c(h[3]||""),u=c(h[2]?
-h[1]:m),w=c(h[7]),x=h[8]?c(h[8]):null,z=[[{element:f,label:""}]];F&&(a(F)(e),F.removeClass("ng-scope"),F.remove());f.empty();f.on("change",function(){e.$apply(function(){var a,c=w(e)||[],d={},h,l,p,r,s,v,y;if(q)for(l=[],r=0,v=z.length;r<v;r++)for(a=z[r],p=1,s=a.length;p<s;p++){if((h=a[p].element)[0].selected){h=h.val();n&&(d[n]=h);if(x)for(y=0;y<c.length&&(d[m]=c[y],x(e,d)!=h);y++);else d[m]=c[h];l.push(u(e,d))}}else if(h=f.val(),"?"==h)l=t;else if(""===h)l=null;else if(x)for(y=0;y<c.length;y++){if(d[m]=
-c[y],x(e,d)==h){l=u(e,d);break}}else d[m]=c[h],n&&(d[n]=h),l=u(e,d);g.$setViewValue(l);k()})});g.$render=k;e.$watchCollection(w,k);e.$watchCollection(function(){var a={},c=w(e);if(c){for(var d=Array(c.length),f=0,g=c.length;f<g;f++)a[m]=c[f],d[f]=l(e,a);return d}},k);q&&e.$watchCollection(function(){return g.$modelValue},k)}if(m[1]){var p=m[0];m=m[1];var q=k.multiple,s=k.ngOptions,F=!1,u,A=w(X.createElement("option")),C=w(X.createElement("optgroup")),v=A.clone();k=0;for(var z=g.children(),E=z.length;k<
-E;k++)if(""===z[k].value){u=F=z.eq(k);break}p.init(m,F,v);q&&(m.$isEmpty=function(a){return!a||0===a.length});s?n(e,g,m):q?l(e,g,m):h(e,g,m,p)}}}}],id=["$interpolate",function(a){var c={addOption:E,removeOption:E};return{restrict:"E",priority:100,compile:function(d,e){if(x(e.value)){var f=a(d.text(),!0);f||e.$set("value",d.text())}return function(a,d,e){var h=d.parent(),l=h.data("$selectController")||h.parent().data("$selectController");l&&l.databound?d.prop("selected",!1):l=c;f?a.$watch(f,function(a,
-c){e.$set("value",a);a!==c&&l.removeOption(c);l.addOption(a)}):l.addOption(e.value);d.on("$destroy",function(){l.removeOption(e.value)})}}}}],hd=ba({restrict:"E",terminal:!0});W.angular.bootstrap?console.log("WARNING: Tried to load angular more than once."):((Ea=W.jQuery)&&Ea.fn.on?(w=Ea,D(Ea.fn,{scope:La.scope,isolateScope:La.isolateScope,controller:La.controller,injector:La.injector,inheritedData:La.inheritedData}),Gb("remove",!0,!0,!1),Gb("empty",!1,!1,!1),Gb("html",!1,!1,!0)):w=S,Va.element=w,
-$c(Va),w(X).ready(function(){Xc(X,fc)}))})(window,document);!window.angular.$$csp()&&window.angular.element(document).find("head").prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide{display:none !important;}ng\\:form{display:block;}.ng-animate-block-transitions{transition:0s all!important;-webkit-transition:0s all!important;}.ng-hide-add-active,.ng-hide-remove{display:block!important;}</style>');
+relational:function(){var a=this.additive(),c;if(c=this.expect("<",">","<=",">="))a=this.binaryFn(a,c.fn,this.relational());return a},additive:function(){for(var a=this.multiplicative(),c;c=this.expect("+","-");)a=this.binaryFn(a,c.fn,this.multiplicative());return a},multiplicative:function(){for(var a=this.unary(),c;c=this.expect("*","/","%");)a=this.binaryFn(a,c.fn,this.unary());return a},unary:function(){var a;return this.expect("+")?this.primary():(a=this.expect("-"))?this.binaryFn(gb.ZERO,a.fn,
+this.unary()):(a=this.expect("!"))?this.unaryFn(a.fn,this.unary()):this.primary()},fieldAccess:function(a){var c=this,d=this.expect().text,e=Dc(d,this.options,this.text);return E(function(c,d,h){return e(h||a(c,d))},{assign:function(e,g,h){(h=a(e,h))||a.assign(e,h={});return ub(h,d,g,c.text,c.options)}})},objectIndex:function(a){var c=this,d=this.expression();this.consume("]");return E(function(e,f){var g=a(e,f),h=d(e,f),k;ka(h,c.text);if(!g)return u;(g=ma(g[h],c.text))&&(g.then&&c.options.unwrapPromises)&&
+(k=g,"$$v"in g||(k.$$v=u,k.then(function(a){k.$$v=a})),g=g.$$v);return g},{assign:function(e,f,g){var h=ka(d(e,g),c.text);(g=ma(a(e,g),c.text))||a.assign(e,g={});return g[h]=f}})},functionCall:function(a,c){var d=[];if(")"!==this.peekToken().text){do d.push(this.expression());while(this.expect(","))}this.consume(")");var e=this;return function(f,g){for(var h=[],k=c?c(f,g):f,m=0;m<d.length;m++)h.push(ma(d[m](f,g),e.text));m=a(f,g,k)||v;ma(k,e.text);var l=e.text;if(m){if(m.constructor===m)throw la("isecfn",
+l);if(m===Se||m===Te||Pc&&m===Pc)throw la("isecff",l);}h=m.apply?m.apply(k,h):m(h[0],h[1],h[2],h[3],h[4]);return ma(h,e.text)}},arrayDeclaration:function(){var a=[],c=!0;if("]"!==this.peekToken().text){do{if(this.peek("]"))break;var d=this.expression();a.push(d);d.constant||(c=!1)}while(this.expect(","))}this.consume("]");return E(function(c,d){for(var g=[],h=0;h<a.length;h++)g.push(a[h](c,d));return g},{literal:!0,constant:c})},object:function(){var a=[],c=!0;if("}"!==this.peekToken().text){do{if(this.peek("}"))break;
+var d=this.expect(),d=d.string||d.text;this.consume(":");var e=this.expression();a.push({key:d,value:e});e.constant||(c=!1)}while(this.expect(","))}this.consume("}");return E(function(c,d){for(var e={},k=0;k<a.length;k++){var m=a[k];e[m.key]=m.value(c,d)}return e},{literal:!0,constant:c})}};var Ce={},Be={},za=z("$sce"),fa={HTML:"html",CSS:"css",URL:"url",RESOURCE_URL:"resourceUrl",JS:"js"},Y=X.createElement("a"),Gc=xa(W.location.href,!0);kc.$inject=["$provide"];Hc.$inject=["$locale"];Jc.$inject=["$locale"];
+var Mc=".",Me={yyyy:Z("FullYear",4),yy:Z("FullYear",2,0,!0),y:Z("FullYear",1),MMMM:vb("Month"),MMM:vb("Month",!0),MM:Z("Month",2,1),M:Z("Month",1,1),dd:Z("Date",2),d:Z("Date",1),HH:Z("Hours",2),H:Z("Hours",1),hh:Z("Hours",2,-12),h:Z("Hours",1,-12),mm:Z("Minutes",2),m:Z("Minutes",1),ss:Z("Seconds",2),s:Z("Seconds",1),sss:Z("Milliseconds",3),EEEE:vb("Day"),EEE:vb("Day",!0),a:function(a,c){return 12>a.getHours()?c.AMPMS[0]:c.AMPMS[1]},Z:function(a){a=-1*a.getTimezoneOffset();return a=(0<=a?"+":"")+(Vb(Math[0<
+a?"floor":"ceil"](a/60),2)+Vb(Math.abs(a%60),2))}},Le=/((?:[^yMdHhmsaZE']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z))(.*)/,Ke=/^\-?\d+$/;Ic.$inject=["$locale"];var Ie=aa(x),Je=aa(La);Kc.$inject=["$parse"];var cd=aa({restrict:"E",compile:function(a,c){8>=R&&(c.href||c.name||c.$set("href",""),a.append(X.createComment("IE fix")));if(!c.href&&!c.xlinkHref&&!c.name)return function(a,c){var f="[object SVGAnimatedString]"===Ba.call(c.prop("href"))?"xlink:href":"href";c.on("click",function(a){c.attr(f)||
+a.preventDefault()})}}}),Fb={};r(rb,function(a,c){if("multiple"!=a){var d=qa("ng-"+c);Fb[d]=function(){return{priority:100,link:function(a,f,g){a.$watch(g[d],function(a){g.$set(c,!!a)})}}}}});r(["src","srcset","href"],function(a){var c=qa("ng-"+a);Fb[c]=function(){return{priority:99,link:function(d,e,f){var g=a,h=a;"href"===a&&"[object SVGAnimatedString]"===Ba.call(e.prop("href"))&&(h="xlinkHref",f.$attr[h]="xlink:href",g=null);f.$observe(c,function(c){c?(f.$set(h,c),R&&g&&e.prop(g,f[h])):"href"===
+a&&f.$set(h,null)})}}}});var yb={$addControl:v,$removeControl:v,$setValidity:v,$setDirty:v,$setPristine:v};Nc.$inject=["$element","$attrs","$scope","$animate"];var Qc=function(a){return["$timeout",function(c){return{name:"form",restrict:a?"EAC":"E",controller:Nc,compile:function(){return{pre:function(a,e,f,g){if(!f.action){var h=function(a){a.preventDefault?a.preventDefault():a.returnValue=!1};sb(e[0],"submit",h);e.on("$destroy",function(){c(function(){bb(e[0],"submit",h)},0,!1)})}var k=e.parent().controller("form"),
+m=f.name||f.ngForm;m&&ub(a,m,g,m);if(k)e.on("$destroy",function(){k.$removeControl(g);m&&ub(a,m,u,m);E(g,yb)})}}}}}]},dd=Qc(),qd=Qc(!0),Ve=/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/,We=/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i,Xe=/^\s*(\-|\+)?(\d+|(\d*(\.\d*)))\s*$/,Rc={text:Ab,number:function(a,c,d,e,f,g){Ab(a,c,d,e,f,g);e.$parsers.push(function(a){var c=e.$isEmpty(a);if(c||Xe.test(a))return e.$setValidity("number",
+!0),""===a?null:c?a:parseFloat(a);e.$setValidity("number",!1);return u});Ne(e,"number",Ye,null,e.$$validityState);e.$formatters.push(function(a){return e.$isEmpty(a)?"":""+a});d.min&&(a=function(a){var c=parseFloat(d.min);return ua(e,"min",e.$isEmpty(a)||a>=c,a)},e.$parsers.push(a),e.$formatters.push(a));d.max&&(a=function(a){var c=parseFloat(d.max);return ua(e,"max",e.$isEmpty(a)||a<=c,a)},e.$parsers.push(a),e.$formatters.push(a));e.$formatters.push(function(a){return ua(e,"number",e.$isEmpty(a)||
+jb(a),a)})},url:function(a,c,d,e,f,g){Ab(a,c,d,e,f,g);a=function(a){return ua(e,"url",e.$isEmpty(a)||Ve.test(a),a)};e.$formatters.push(a);e.$parsers.push(a)},email:function(a,c,d,e,f,g){Ab(a,c,d,e,f,g);a=function(a){return ua(e,"email",e.$isEmpty(a)||We.test(a),a)};e.$formatters.push(a);e.$parsers.push(a)},radio:function(a,c,d,e){F(d.name)&&c.attr("name",ib());c.on("click",function(){c[0].checked&&a.$apply(function(){e.$setViewValue(d.value)})});e.$render=function(){c[0].checked=d.value==e.$viewValue};
+d.$observe("value",e.$render)},checkbox:function(a,c,d,e){var f=d.ngTrueValue,g=d.ngFalseValue;G(f)||(f=!0);G(g)||(g=!1);c.on("click",function(){a.$apply(function(){e.$setViewValue(c[0].checked)})});e.$render=function(){c[0].checked=e.$viewValue};e.$isEmpty=function(a){return a!==f};e.$formatters.push(function(a){return a===f});e.$parsers.push(function(a){return a?f:g})},hidden:v,button:v,submit:v,reset:v,file:v},Ye=["badInput"],hc=["$browser","$sniffer",function(a,c){return{restrict:"E",require:"?ngModel",
+link:function(d,e,f,g){g&&(Rc[x(f.type)]||Rc.text)(d,e,f,g,c,a)}}}],wb="ng-valid",xb="ng-invalid",Ra="ng-pristine",zb="ng-dirty",Ze=["$scope","$exceptionHandler","$attrs","$element","$parse","$animate",function(a,c,d,e,f,g){function h(a,c){c=c?"-"+nb(c,"-"):"";g.removeClass(e,(a?xb:wb)+c);g.addClass(e,(a?wb:xb)+c)}this.$modelValue=this.$viewValue=Number.NaN;this.$parsers=[];this.$formatters=[];this.$viewChangeListeners=[];this.$pristine=!0;this.$dirty=!1;this.$valid=!0;this.$invalid=!1;this.$name=
+d.name;var k=f(d.ngModel),m=k.assign;if(!m)throw z("ngModel")("nonassign",d.ngModel,ia(e));this.$render=v;this.$isEmpty=function(a){return F(a)||""===a||null===a||a!==a};var l=e.inheritedData("$formController")||yb,n=0,q=this.$error={};e.addClass(Ra);h(!0);this.$setValidity=function(a,c){q[a]!==!c&&(c?(q[a]&&n--,n||(h(!0),this.$valid=!0,this.$invalid=!1)):(h(!1),this.$invalid=!0,this.$valid=!1,n++),q[a]=!c,h(c,a),l.$setValidity(a,c,this))};this.$setPristine=function(){this.$dirty=!1;this.$pristine=
+!0;g.removeClass(e,zb);g.addClass(e,Ra)};this.$setViewValue=function(d){this.$viewValue=d;this.$pristine&&(this.$dirty=!0,this.$pristine=!1,g.removeClass(e,Ra),g.addClass(e,zb),l.$setDirty());r(this.$parsers,function(a){d=a(d)});this.$modelValue!==d&&(this.$modelValue=d,m(a,d),r(this.$viewChangeListeners,function(a){try{a()}catch(d){c(d)}}))};var p=this;a.$watch(function(){var c=k(a);if(p.$modelValue!==c){var d=p.$formatters,e=d.length;for(p.$modelValue=c;e--;)c=d[e](c);p.$viewValue!==c&&(p.$viewValue=
+c,p.$render())}return c})}],Fd=function(){return{require:["ngModel","^?form"],controller:Ze,link:function(a,c,d,e){var f=e[0],g=e[1]||yb;g.$addControl(f);a.$on("$destroy",function(){g.$removeControl(f)})}}},Hd=aa({require:"ngModel",link:function(a,c,d,e){e.$viewChangeListeners.push(function(){a.$eval(d.ngChange)})}}),ic=function(){return{require:"?ngModel",link:function(a,c,d,e){if(e){d.required=!0;var f=function(a){if(d.required&&e.$isEmpty(a))e.$setValidity("required",!1);else return e.$setValidity("required",
+!0),a};e.$formatters.push(f);e.$parsers.unshift(f);d.$observe("required",function(){f(e.$viewValue)})}}}},Gd=function(){return{require:"ngModel",link:function(a,c,d,e){var f=(a=/\/(.*)\//.exec(d.ngList))&&RegExp(a[1])||d.ngList||",";e.$parsers.push(function(a){if(!F(a)){var c=[];a&&r(a.split(f),function(a){a&&c.push($(a))});return c}});e.$formatters.push(function(a){return L(a)?a.join(", "):u});e.$isEmpty=function(a){return!a||!a.length}}}},$e=/^(true|false|\d+)$/,Id=function(){return{priority:100,
+compile:function(a,c){return $e.test(c.ngValue)?function(a,c,f){f.$set("value",a.$eval(f.ngValue))}:function(a,c,f){a.$watch(f.ngValue,function(a){f.$set("value",a)})}}}},id=Aa({compile:function(a){a.addClass("ng-binding");return function(a,d,e){d.data("$binding",e.ngBind);a.$watch(e.ngBind,function(a){d.text(a==u?"":a)})}}}),kd=["$interpolate",function(a){return function(c,d,e){c=a(d.attr(e.$attr.ngBindTemplate));d.addClass("ng-binding").data("$binding",c);e.$observe("ngBindTemplate",function(a){d.text(a)})}}],
+jd=["$sce","$parse",function(a,c){return{compile:function(d){d.addClass("ng-binding");return function(d,f,g){f.data("$binding",g.ngBindHtml);var h=c(g.ngBindHtml);d.$watch(function(){return(h(d)||"").toString()},function(c){f.html(a.getTrustedHtml(h(d))||"")})}}}}],ld=Wb("",!0),nd=Wb("Odd",0),md=Wb("Even",1),od=Aa({compile:function(a,c){c.$set("ngCloak",u);a.removeClass("ng-cloak")}}),pd=[function(){return{scope:!0,controller:"@",priority:500}}],jc={},af={blur:!0,focus:!0};r("click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste".split(" "),
+function(a){var c=qa("ng-"+a);jc[c]=["$parse","$rootScope",function(d,e){return{compile:function(f,g){var h=d(g[c],!0);return function(c,d){d.on(a,function(d){var f=function(){h(c,{$event:d})};af[a]&&e.$$phase?c.$evalAsync(f):c.$apply(f)})}}}}]});var sd=["$animate",function(a){return{transclude:"element",priority:600,terminal:!0,restrict:"A",$$tlb:!0,link:function(c,d,e,f,g){var h,k,m;c.$watch(e.ngIf,function(f){Wa(f)?k||(k=c.$new(),g(k,function(c){c[c.length++]=X.createComment(" end ngIf: "+e.ngIf+
+" ");h={clone:c};a.enter(c,d.parent(),d)})):(m&&(m.remove(),m=null),k&&(k.$destroy(),k=null),h&&(m=Eb(h.clone),a.leave(m,function(){m=null}),h=null))})}}}],td=["$http","$templateCache","$anchorScroll","$animate","$sce",function(a,c,d,e,f){return{restrict:"ECA",priority:400,terminal:!0,transclude:"element",controller:Xa.noop,compile:function(g,h){var k=h.ngInclude||h.src,m=h.onload||"",l=h.autoscroll;return function(g,h,p,r,J){var w=0,t,y,u,B=function(){y&&(y.remove(),y=null);t&&(t.$destroy(),t=null);
+u&&(e.leave(u,function(){y=null}),y=u,u=null)};g.$watch(f.parseAsResourceUrl(k),function(f){var k=function(){!D(l)||l&&!g.$eval(l)||d()},p=++w;f?(a.get(f,{cache:c}).success(function(a){if(p===w){var c=g.$new();r.template=a;a=J(c,function(a){B();e.enter(a,null,h,k)});t=c;u=a;t.$emit("$includeContentLoaded");g.$eval(m)}}).error(function(){p===w&&B()}),g.$emit("$includeContentRequested")):(B(),r.template=null)})}}}}],Jd=["$compile",function(a){return{restrict:"ECA",priority:-400,require:"ngInclude",
+link:function(c,d,e,f){d.html(f.template);a(d.contents())(c)}}}],ud=Aa({priority:450,compile:function(){return{pre:function(a,c,d){a.$eval(d.ngInit)}}}}),vd=Aa({terminal:!0,priority:1E3}),wd=["$locale","$interpolate",function(a,c){var d=/{}/g;return{restrict:"EA",link:function(e,f,g){var h=g.count,k=g.$attr.when&&f.attr(g.$attr.when),m=g.offset||0,l=e.$eval(k)||{},n={},q=c.startSymbol(),p=c.endSymbol(),s=/^when(Minus)?(.+)$/;r(g,function(a,c){s.test(c)&&(l[x(c.replace("when","").replace("Minus","-"))]=
+f.attr(g.$attr[c]))});r(l,function(a,e){n[e]=c(a.replace(d,q+h+"-"+m+p))});e.$watch(function(){var c=parseFloat(e.$eval(h));if(isNaN(c))return"";c in l||(c=a.pluralCat(c-m));return n[c](e,f,!0)},function(a){f.text(a)})}}}],xd=["$parse","$animate",function(a,c){var d=z("ngRepeat");return{transclude:"element",priority:1E3,terminal:!0,$$tlb:!0,link:function(e,f,g,h,k){var m=g.ngRepeat,l=m.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?\s*$/),n,q,p,s,u,w,t={$id:Na};if(!l)throw d("iexp",
+m);g=l[1];h=l[2];(l=l[3])?(n=a(l),q=function(a,c,d){w&&(t[w]=a);t[u]=c;t.$index=d;return n(e,t)}):(p=function(a,c){return Na(c)},s=function(a){return a});l=g.match(/^(?:([\$\w]+)|\(([\$\w]+)\s*,\s*([\$\w]+)\))$/);if(!l)throw d("iidexp",g);u=l[3]||l[1];w=l[2];var y={};e.$watchCollection(h,function(a){var g,h,l=f[0],n,t={},D,C,I,x,G,v,z,F=[];if(Sa(a))v=a,G=q||p;else{G=q||s;v=[];for(I in a)a.hasOwnProperty(I)&&"$"!=I.charAt(0)&&v.push(I);v.sort()}D=v.length;h=F.length=v.length;for(g=0;g<h;g++)if(I=a===
+v?g:v[g],x=a[I],n=G(I,x,g),Ea(n,"`track by` id"),y.hasOwnProperty(n))z=y[n],delete y[n],t[n]=z,F[g]=z;else{if(t.hasOwnProperty(n))throw r(F,function(a){a&&a.scope&&(y[a.id]=a)}),d("dupes",m,n,oa(x));F[g]={id:n};t[n]=!1}for(I in y)y.hasOwnProperty(I)&&(z=y[I],g=Eb(z.clone),c.leave(g),r(g,function(a){a.$$NG_REMOVED=!0}),z.scope.$destroy());g=0;for(h=v.length;g<h;g++){I=a===v?g:v[g];x=a[I];z=F[g];F[g-1]&&(l=F[g-1].clone[F[g-1].clone.length-1]);if(z.scope){C=z.scope;n=l;do n=n.nextSibling;while(n&&n.$$NG_REMOVED);
+z.clone[0]!=n&&c.move(Eb(z.clone),null,A(l));l=z.clone[z.clone.length-1]}else C=e.$new();C[u]=x;w&&(C[w]=I);C.$index=g;C.$first=0===g;C.$last=g===D-1;C.$middle=!(C.$first||C.$last);C.$odd=!(C.$even=0===(g&1));z.scope||k(C,function(a){a[a.length++]=X.createComment(" end ngRepeat: "+m+" ");c.enter(a,null,A(l));l=a;z.scope=C;z.clone=a;t[z.id]=z})}y=t})}}}],yd=["$animate",function(a){return function(c,d,e){c.$watch(e.ngShow,function(c){a[Wa(c)?"removeClass":"addClass"](d,"ng-hide")})}}],rd=["$animate",
+function(a){return function(c,d,e){c.$watch(e.ngHide,function(c){a[Wa(c)?"addClass":"removeClass"](d,"ng-hide")})}}],zd=Aa(function(a,c,d){a.$watch(d.ngStyle,function(a,d){d&&a!==d&&r(d,function(a,d){c.css(d,"")});a&&c.css(a)},!0)}),Ad=["$animate",function(a){return{restrict:"EA",require:"ngSwitch",controller:["$scope",function(){this.cases={}}],link:function(c,d,e,f){var g=[],h=[],k=[],m=[];c.$watch(e.ngSwitch||e.on,function(d){var n,q;n=0;for(q=k.length;n<q;++n)k[n].remove();n=k.length=0;for(q=
+m.length;n<q;++n){var p=h[n];m[n].$destroy();k[n]=p;a.leave(p,function(){k.splice(n,1)})}h.length=0;m.length=0;if(g=f.cases["!"+d]||f.cases["?"])c.$eval(e.change),r(g,function(d){var e=c.$new();m.push(e);d.transclude(e,function(c){var e=d.element;h.push(c);a.enter(c,e.parent(),e)})})})}}}],Bd=Aa({transclude:"element",priority:800,require:"^ngSwitch",link:function(a,c,d,e,f){e.cases["!"+d.ngSwitchWhen]=e.cases["!"+d.ngSwitchWhen]||[];e.cases["!"+d.ngSwitchWhen].push({transclude:f,element:c})}}),Cd=
+Aa({transclude:"element",priority:800,require:"^ngSwitch",link:function(a,c,d,e,f){e.cases["?"]=e.cases["?"]||[];e.cases["?"].push({transclude:f,element:c})}}),Ed=Aa({link:function(a,c,d,e,f){if(!f)throw z("ngTransclude")("orphan",ia(c));f(function(a){c.empty();c.append(a)})}}),ed=["$templateCache",function(a){return{restrict:"E",terminal:!0,compile:function(c,d){"text/ng-template"==d.type&&a.put(d.id,c[0].text)}}}],bf=z("ngOptions"),Dd=aa({terminal:!0}),fd=["$compile","$parse",function(a,c){var d=
+/^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w]*)|(?:\(\s*([\$\w][\$\w]*)\s*,\s*([\$\w][\$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/,e={$setViewValue:v};return{restrict:"E",require:["select","?ngModel"],controller:["$element","$scope","$attrs",function(a,c,d){var k=this,m={},l=e,n;k.databound=d.ngModel;k.init=function(a,c,d){l=a;n=d};k.addOption=function(c){Ea(c,'"option value"');m[c]=!0;l.$viewValue==c&&(a.val(c),n.parent()&&n.remove())};
+k.removeOption=function(a){this.hasOption(a)&&(delete m[a],l.$viewValue==a&&this.renderUnknownOption(a))};k.renderUnknownOption=function(c){c="? "+Na(c)+" ?";n.val(c);a.prepend(n);a.val(c);n.prop("selected",!0)};k.hasOption=function(a){return m.hasOwnProperty(a)};c.$on("$destroy",function(){k.renderUnknownOption=v})}],link:function(e,g,h,k){function m(a,c,d,e){d.$render=function(){var a=d.$viewValue;e.hasOption(a)?(x.parent()&&x.remove(),c.val(a),""===a&&w.prop("selected",!0)):F(a)&&w?c.val(""):e.renderUnknownOption(a)};
+c.on("change",function(){a.$apply(function(){x.parent()&&x.remove();d.$setViewValue(c.val())})})}function l(a,c,d){var e;d.$render=function(){var a=new db(d.$viewValue);r(c.find("option"),function(c){c.selected=D(a.get(c.value))})};a.$watch(function(){Ca(e,d.$viewValue)||(e=ha(d.$viewValue),d.$render())});c.on("change",function(){a.$apply(function(){var a=[];r(c.find("option"),function(c){c.selected&&a.push(c.value)});d.$setViewValue(a)})})}function n(e,f,g){function h(){var a={"":[]},c=[""],d,k,
+s,u,v;s=g.$modelValue;u=A(e)||[];var F=n?Xb(u):u,G,Q,C;Q={};C=!1;if(p)if(k=g.$modelValue,w&&L(k))for(C=new db([]),d={},v=0;v<k.length;v++)d[m]=k[v],C.put(w(e,d),k[v]);else C=new db(k);v=C;var E,K;for(C=0;G=F.length,C<G;C++){k=C;if(n){k=F[C];if("$"===k.charAt(0))continue;Q[n]=k}Q[m]=u[k];d=r(e,Q)||"";(k=a[d])||(k=a[d]=[],c.push(d));p?d=D(v.remove(w?w(e,Q):x(e,Q))):(w?(d={},d[m]=s,d=w(e,d)===w(e,Q)):d=s===x(e,Q),v=v||d);E=l(e,Q);E=D(E)?E:"";k.push({id:w?w(e,Q):n?F[C]:C,label:E,selected:d})}p||(z||null===
+s?a[""].unshift({id:"",label:"",selected:!v}):v||a[""].unshift({id:"?",label:"",selected:!0}));Q=0;for(F=c.length;Q<F;Q++){d=c[Q];k=a[d];B.length<=Q?(s={element:y.clone().attr("label",d),label:k.label},u=[s],B.push(u),f.append(s.element)):(u=B[Q],s=u[0],s.label!=d&&s.element.attr("label",s.label=d));E=null;C=0;for(G=k.length;C<G;C++)d=k[C],(v=u[C+1])?(E=v.element,v.label!==d.label&&(E.text(v.label=d.label),E.prop("label",v.label)),v.id!==d.id&&E.val(v.id=d.id),E[0].selected!==d.selected&&(E.prop("selected",
+v.selected=d.selected),R&&E.prop("selected",v.selected))):(""===d.id&&z?K=z:(K=t.clone()).val(d.id).prop("selected",d.selected).attr("selected",d.selected).prop("label",d.label).text(d.label),u.push({element:K,label:d.label,id:d.id,selected:d.selected}),q.addOption(d.label,K),E?E.after(K):s.element.append(K),E=K);for(C++;u.length>C;)d=u.pop(),q.removeOption(d.label),d.element.remove()}for(;B.length>Q;)B.pop()[0].element.remove()}var k;if(!(k=s.match(d)))throw bf("iexp",s,ia(f));var l=c(k[2]||k[1]),
+m=k[4]||k[6],n=k[5],r=c(k[3]||""),x=c(k[2]?k[1]:m),A=c(k[7]),w=k[8]?c(k[8]):null,B=[[{element:f,label:""}]];z&&(a(z)(e),z.removeClass("ng-scope"),z.remove());f.empty();f.on("change",function(){e.$apply(function(){var a,c=A(e)||[],d={},k,l,q,r,s,t,v;if(p)for(l=[],r=0,t=B.length;r<t;r++)for(a=B[r],q=1,s=a.length;q<s;q++){if((k=a[q].element)[0].selected){k=k.val();n&&(d[n]=k);if(w)for(v=0;v<c.length&&(d[m]=c[v],w(e,d)!=k);v++);else d[m]=c[k];l.push(x(e,d))}}else if(k=f.val(),"?"==k)l=u;else if(""===
+k)l=null;else if(w)for(v=0;v<c.length;v++){if(d[m]=c[v],w(e,d)==k){l=x(e,d);break}}else d[m]=c[k],n&&(d[n]=k),l=x(e,d);g.$setViewValue(l);h()})});g.$render=h;e.$watchCollection(A,h);e.$watchCollection(function(){var a={},c=A(e);if(c){for(var d=Array(c.length),f=0,g=c.length;f<g;f++)a[m]=c[f],d[f]=l(e,a);return d}},h);p&&e.$watchCollection(function(){return g.$modelValue},h)}if(k[1]){var q=k[0];k=k[1];var p=h.multiple,s=h.ngOptions,z=!1,w,t=A(X.createElement("option")),y=A(X.createElement("optgroup")),
+x=t.clone();h=0;for(var B=g.children(),v=B.length;h<v;h++)if(""===B[h].value){w=z=B.eq(h);break}q.init(k,z,x);p&&(k.$isEmpty=function(a){return!a||0===a.length});s?n(e,g,k):p?l(e,g,k):m(e,g,k,q)}}}}],hd=["$interpolate",function(a){var c={addOption:v,removeOption:v};return{restrict:"E",priority:100,compile:function(d,e){if(F(e.value)){var f=a(d.text(),!0);f||e.$set("value",d.text())}return function(a,d,e){var m=d.parent(),l=m.data("$selectController")||m.parent().data("$selectController");l&&l.databound?
+d.prop("selected",!1):l=c;f?a.$watch(f,function(a,c){e.$set("value",a);a!==c&&l.removeOption(c);l.addOption(a)}):l.addOption(e.value);d.on("$destroy",function(){l.removeOption(e.value)})}}}}],gd=aa({restrict:"E",terminal:!0});W.angular.bootstrap?console.log("WARNING: Tried to load angular more than once."):((Fa=W.jQuery)&&Fa.fn.on?(A=Fa,E(Fa.fn,{scope:Oa.scope,isolateScope:Oa.isolateScope,controller:Oa.controller,injector:Oa.injector,inheritedData:Oa.inheritedData}),Gb("remove",!0,!0,!1),Gb("empty",
+!1,!1,!1),Gb("html",!1,!1,!0)):A=S,Xa.element=A,Zc(Xa),A(X).ready(function(){Wc(X,dc)}))})(window,document);!window.angular.$$csp()&&window.angular.element(document).find("head").prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide{display:none !important;}ng\\:form{display:block;}.ng-animate-block-transitions{transition:0s all!important;-webkit-transition:0s all!important;}.ng-hide-add-active,.ng-hide-remove{display:block!important;}</style>');
 //# sourceMappingURL=angular.min.js.map
diff --git a/libs/bower_components/angular/angular.min.js.gzip b/libs/bower_components/angular/angular.min.js.gzip
index 2cfe6b78e8..8f86428b97 100644
--- a/libs/bower_components/angular/angular.min.js.gzip
+++ b/libs/bower_components/angular/angular.min.js.gzip
diff --git a/libs/bower_components/angular/angular.min.js.map b/libs/bower_components/angular/angular.min.js.map
index 59e4627855..bf40d3e271 100644
--- a/libs/bower_components/angular/angular.min.js.map
+++ b/libs/bower_components/angular/angular.min.js.map
@@ -1,8 +1,8 @@
 {
 "version":3,
 "file":"angular.min.js",
-"lineCount":215,
-"mappings":"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",
+"lineCount":216,
+"mappings":"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",
 "sources":["angular.js"],
-"names":["window","document","undefined","minErr","isArrayLike","obj","isWindow","length","nodeType","isString","isArray","forEach","iterator","context","key","isFunction","hasOwnProperty","call","sortedKeys","keys","push","sort","forEachSorted","i","reverseParams","iteratorFn","value","nextUid","index","uid","digit","charCodeAt","join","String","fromCharCode","unshift","setHashKey","h","$$hashKey","extend","dst","arguments","int","str","parseInt","inherit","parent","extra","noop","identity","$","valueFn","isUndefined","isDefined","isObject","isNumber","isDate","toString","isRegExp","location","alert","setInterval","isElement","node","nodeName","prop","attr","find","map","results","list","indexOf","array","arrayRemove","splice","copy","source","destination","stackSource","stackDest","$evalAsync","$watch","ngMinErr","result","Date","getTime","RegExp","match","lastIndex","shallowCopy","src","charAt","equals","o1","o2","t1","t2","isNaN","keySet","bind","self","fn","curryArgs","slice","startIndex","apply","concat","toJsonReplacer","val","toJson","pretty","JSON","stringify","fromJson","json","parse","toBoolean","v","lowercase","startingTag","element","jqLite","clone","empty","e","elemHtml","append","html","TEXT_NODE","replace","tryDecodeURIComponent","decodeURIComponent","parseKeyValue","keyValue","key_value","split","toKeyValue","parts","arrayValue","encodeUriQuery","encodeUriSegment","pctEncodeSpaces","encodeURIComponent","angularInit","bootstrap","elements","appElement","module","names","NG_APP_CLASS_REGEXP","name","getElementById","querySelectorAll","exec","className","attributes","modules","doBootstrap","injector","tag","$provide","createInjector","invoke","scope","compile","animate","$apply","data","NG_DEFER_BOOTSTRAP","test","angular","resumeBootstrap","angular.resumeBootstrap","extraModules","snake_case","separator","SNAKE_CASE_REGEXP","letter","pos","toLowerCase","assertArg","arg","reason","assertArgFn","acceptArrayAnnotation","constructor","assertNotHasOwnProperty","getter","path","bindFnToScope","lastInstance","len","getBlockElements","nodes","startNode","endNode","nextSibling","setupModuleLoader","$injectorMinErr","$$minErr","factory","requires","configFn","invokeLater","provider","method","insertMethod","invokeQueue","moduleInstance","runBlocks","config","run","block","publishExternalAPI","version","uppercase","csp","angularModule","$LocaleProvider","ngModule","$$SanitizeUriProvider","$CompileProvider","directive","htmlAnchorDirective","inputDirective","formDirective","scriptDirective","selectDirective","styleDirective","optionDirective","ngBindDirective","ngBindHtmlDirective","ngBindTemplateDirective","ngClassDirective","ngClassEvenDirective","ngClassOddDirective","ngCloakDirective","ngControllerDirective","ngFormDirective","ngHideDirective","ngIfDirective","ngIncludeDirective","ngInitDirective","ngNonBindableDirective","ngPluralizeDirective","ngRepeatDirective","ngShowDirective","ngStyleDirective","ngSwitchDirective","ngSwitchWhenDirective","ngSwitchDefaultDirective","ngOptionsDirective","ngTranscludeDirective","ngModelDirective","ngListDirective","ngChangeDirective","requiredDirective","ngValueDirective","ngIncludeFillContentDirective","ngAttributeAliasDirectives","ngEventDirectives","$AnchorScrollProvider","$AnimateProvider","$BrowserProvider","$CacheFactoryProvider","$ControllerProvider","$DocumentProvider","$ExceptionHandlerProvider","$FilterProvider","$InterpolateProvider","$IntervalProvider","$HttpProvider","$HttpBackendProvider","$LocationProvider","$LogProvider","$ParseProvider","$RootScopeProvider","$QProvider","$SceProvider","$SceDelegateProvider","$SnifferProvider","$TemplateCacheProvider","$TimeoutProvider","$WindowProvider","$$RAFProvider","$$AsyncCallbackProvider","camelCase","SPECIAL_CHARS_REGEXP","_","offset","toUpperCase","MOZ_HACK_REGEXP","jqLitePatchJQueryRemove","dispatchThis","filterElems","getterIfNoArguments","removePatch","param","filter","fireEvent","set","setIndex","setLength","childIndex","children","shift","triggerHandler","childLength","jQuery","originalJqFn","$original","JQLite","trim","jqLiteMinErr","parsed","SINGLE_TAG_REGEXP","fragment","createDocumentFragment","HTML_REGEXP","tmp","appendChild","createElement","TAG_NAME_REGEXP","wrap","wrapMap","_default","innerHTML","XHTML_TAG_REGEXP","removeChild","firstChild","lastChild","j","jj","childNodes","textContent","createTextNode","jqLiteAddNodes","jqLiteClone","cloneNode","jqLiteDealoc","jqLiteRemoveData","jqLiteOff","type","unsupported","events","jqLiteExpandoStore","handle","eventHandler","removeEventListenerFn","expandoId","ng339","expandoStore","jqCache","$destroy","jqId","jqLiteData","isSetter","keyDefined","isSimpleGetter","jqLiteHasClass","selector","getAttribute","jqLiteRemoveClass","cssClasses","setAttribute","cssClass","jqLiteAddClass","existingClasses","root","jqLiteController","jqLiteInheritedData","documentElement","ii","parentNode","host","jqLiteEmpty","getBooleanAttrName","booleanAttr","BOOLEAN_ATTR","BOOLEAN_ELEMENTS","createEventHandler","event","preventDefault","event.preventDefault","returnValue","stopPropagation","event.stopPropagation","cancelBubble","target","srcElement","defaultPrevented","prevent","isDefaultPrevented","event.isDefaultPrevented","eventHandlersCopy","msie","elem","hashKey","nextUidFn","objType","HashMap","isolatedUid","this.nextUid","put","annotate","$inject","fnText","STRIP_COMMENTS","argDecl","FN_ARGS","FN_ARG_SPLIT","FN_ARG","all","underscore","last","modulesToLoad","supportObject","delegate","provider_","providerInjector","instantiate","$get","providerCache","providerSuffix","factoryFn","loadModules","moduleFn","loadedModules","get","_runBlocks","_invokeQueue","invokeArgs","message","stack","createInternalInjector","cache","getService","serviceName","INSTANTIATING","err","locals","args","Type","Constructor","returnedValue","prototype","instance","has","service","$injector","constant","instanceCache","decorator","decorFn","origProvider","orig$get","origProvider.$get","origInstance","instanceInjector","servicename","autoScrollingEnabled","disableAutoScrolling","this.disableAutoScrolling","$window","$location","$rootScope","getFirstAnchor","scroll","hash","elm","scrollIntoView","getElementsByName","scrollTo","autoScrollWatch","autoScrollWatchAction","$$rAF","$timeout","supported","Browser","$log","$sniffer","completeOutstandingRequest","outstandingRequestCount","outstandingRequestCallbacks","pop","error","startPoller","interval","setTimeout","check","pollFns","pollFn","pollTimeout","fireUrlChange","newLocation","lastBrowserUrl","url","urlChangeListeners","listener","rawDocument","history","clearTimeout","pendingDeferIds","isMock","$$completeOutstandingRequest","$$incOutstandingRequestCount","self.$$incOutstandingRequestCount","notifyWhenNoOutstandingRequests","self.notifyWhenNoOutstandingRequests","callback","addPollFn","self.addPollFn","href","baseElement","self.url","replaceState","pushState","urlChangeInit","onUrlChange","self.onUrlChange","on","hashchange","$$checkUrlChange","baseHref","self.baseHref","lastCookies","lastCookieString","cookiePath","cookies","self.cookies","cookieLength","cookie","escape","warn","cookieArray","unescape","substring","defer","self.defer","delay","timeoutId","cancel","self.defer.cancel","deferId","$document","this.$get","cacheFactory","cacheId","options","refresh","entry","freshEnd","staleEnd","n","link","p","nextEntry","prevEntry","caches","size","stats","capacity","Number","MAX_VALUE","lruHash","lruEntry","remove","removeAll","destroy","info","cacheFactory.info","cacheFactory.get","$cacheFactory","$$sanitizeUriProvider","hasDirectives","Suffix","COMMENT_DIRECTIVE_REGEXP","CLASS_DIRECTIVE_REGEXP","EVENT_HANDLER_ATTR_REGEXP","this.directive","registerDirective","directiveFactory","$exceptionHandler","directives","priority","require","controller","restrict","aHrefSanitizationWhitelist","this.aHrefSanitizationWhitelist","regexp","imgSrcSanitizationWhitelist","this.imgSrcSanitizationWhitelist","$interpolate","$http","$templateCache","$parse","$controller","$sce","$animate","$$sanitizeUri","$compileNodes","transcludeFn","maxPriority","ignoreDirective","previousCompileContext","nodeValue","compositeLinkFn","compileNodes","safeAddClass","publicLinkFn","cloneConnectFn","transcludeControllers","parentBoundTranscludeFn","$linkNode","JQLitePrototype","eq","$element","addClass","nodeList","$rootElement","childLinkFn","childScope","childBoundTranscludeFn","nodeListLength","stableNodeList","Array","linkFns","nodeLinkFn","$new","transcludeOnThisElement","createBoundTranscludeFn","transclude","templateOnThisElement","attrs","linkFnFound","Attributes","collectDirectives","applyDirectivesToNode","$$element","terminal","previousBoundTranscludeFn","boundTranscludeFn","transcludedScope","cloneFn","controllers","scopeCreated","$$transcluded","attrsMap","$attr","addDirective","directiveNormalize","nodeName_","isNgAttr","nAttrs","attrStartName","attrEndName","specified","ngAttrName","NG_ATTR_BINDING","substr","directiveNName","nName","addAttrInterpolateDirective","addTextInterpolateDirective","byPriority","groupScan","attrStart","attrEnd","depth","hasAttribute","$compileMinErr","groupElementsLinkFnWrapper","linkFn","compileNode","templateAttrs","jqCollection","originalReplaceDirective","preLinkFns","postLinkFns","addLinkFns","pre","post","directiveName","newIsolateScopeDirective","$$isolateScope","cloneAndAnnotateFn","getControllers","elementControllers","retrievalMethod","optional","linkNode","controllersBoundTransclude","cloneAttachFn","hasElementTranscludeDirective","isolateScope","LOCAL_REGEXP","templateDirective","$$originalDirective","definition","scopeName","attrName","mode","lastValue","parentGet","parentSet","compare","$$isolateBindings","$observe","$$observers","$$scope","literal","a","b","assign","parentValueWatch","parentValue","controllerDirectives","controllerInstance","controllerAs","$scope","scopeToChild","template","templateUrl","terminalPriority","newScopeDirective","nonTlbTranscludeDirective","hasTranscludeDirective","hasTemplate","$compileNode","$template","childTranscludeFn","$$start","$$end","directiveValue","assertNoDuplicate","$$tlb","createComment","replaceWith","replaceDirective","contents","denormalizeTemplate","newTemplateAttrs","templateDirectives","unprocessedDirectives","markDirectivesAsIsolate","mergeTemplateAttributes","compileTemplateUrl","Math","max","tDirectives","startAttrName","endAttrName","srcAttr","dstAttr","$set","tAttrs","linkQueue","afterTemplateNodeLinkFn","afterTemplateChildLinkFn","beforeTemplateCompileNode","origAsyncDirective","derivedSyncDirective","getTrustedResourceUrl","success","content","tempTemplateAttrs","beforeTemplateLinkNode","linkRootElement","oldClasses","response","code","headers","delayedNodeLinkFn","ignoreChildLinkFn","rootElement","diff","what","previousDirective","text","interpolateFn","textInterpolateCompileFn","templateNode","hasCompileParent","textInterpolateLinkFn","bindings","interpolateFnWatchAction","getTrustedContext","attrNormalizedName","HTML","RESOURCE_URL","attrInterpolatePreLinkFn","$$inter","newValue","oldValue","$updateClass","elementsToRemove","newNode","firstElementToRemove","removeCount","j2","replaceChild","expando","k","kk","annotation","$addClass","classVal","$removeClass","removeClass","newClasses","toAdd","tokenDifference","toRemove","setClass","writeAttr","booleanKey","removeAttr","listeners","startSymbol","endSymbol","PREFIX_REGEXP","str1","str2","values","tokens1","tokens2","token","CNTRL_REG","register","this.register","expression","identifier","exception","cause","parseHeaders","line","headersGetter","headersObj","transformData","fns","JSON_START","JSON_END","PROTECTION_PREFIX","CONTENT_TYPE_APPLICATION_JSON","defaults","d","interceptorFactories","interceptors","responseInterceptorFactories","responseInterceptors","$httpBackend","$browser","$q","requestConfig","transformResponse","resp","status","reject","transformRequest","mergeHeaders","defHeaders","reqHeaders","defHeaderName","reqHeaderName","common","lowercaseDefHeaderName","execHeaders","headerContent","headerFn","header","chain","serverRequest","reqData","withCredentials","sendReq","then","promise","when","reversedInterceptors","interceptor","request","requestError","responseError","thenFn","rejectFn","promise.success","promise.error","done","headersString","statusText","resolvePromise","$$phase","deferred","resolve","removePendingReq","idx","pendingRequests","cachedResp","buildUrl","params","defaultCache","xsrfValue","urlIsSameOrigin","xsrfCookieName","xsrfHeaderName","timeout","responseType","toISOString","interceptorFactory","responseFn","createShortMethods","createShortMethodsWithData","createXhr","XMLHttpRequest","ActiveXObject","createHttpBackend","callbacks","$browserDefer","jsonpReq","callbackId","script","async","body","called","addEventListenerFn","onreadystatechange","script.onreadystatechange","readyState","ABORTED","timeoutRequest","jsonpDone","xhr","abort","completeRequest","urlResolve","protocol","counter","open","setRequestHeader","xhr.onreadystatechange","responseHeaders","getAllResponseHeaders","responseText","send","this.startSymbol","this.endSymbol","mustHaveExpression","trustedContext","endIndex","hasInterpolation","startSymbolLength","exp","endSymbolLength","$interpolateMinErr","part","getTrusted","valueOf","newErr","$interpolate.startSymbol","$interpolate.endSymbol","count","invokeApply","clearInterval","iteration","skipApply","$$intervalId","tick","notify","intervals","interval.cancel","short","pluralCat","num","encodePath","segments","parseAbsoluteUrl","absoluteUrl","locationObj","appBase","parsedUrl","$$protocol","$$host","hostname","$$port","port","DEFAULT_PORTS","parseAppUrl","relativeUrl","prefixed","$$path","pathname","$$search","search","$$hash","beginsWith","begin","whole","stripHash","stripFile","lastIndexOf","LocationHtml5Url","basePrefix","$$html5","appBaseNoFile","$$parse","this.$$parse","pathUrl","$locationMinErr","$$compose","this.$$compose","$$url","$$absUrl","$$rewrite","this.$$rewrite","appUrl","prevAppUrl","LocationHashbangUrl","hashPrefix","withoutBaseUrl","withoutHashUrl","windowsFilePathExp","firstPathSegmentMatch","LocationHashbangInHtml5Url","locationGetter","property","locationGetterSetter","preprocess","html5Mode","this.hashPrefix","prefix","this.html5Mode","afterLocationChange","oldUrl","$broadcast","absUrl","LocationMode","initialUrl","IGNORE_URI_REGEXP","ctrlKey","metaKey","which","absHref","animVal","rewrittenUrl","newUrl","$digest","changeCounter","$locationWatch","currentReplace","$$replace","debug","debugEnabled","this.debugEnabled","flag","formatError","Error","sourceURL","consoleLog","console","logFn","log","hasApply","arg1","arg2","ensureSafeMemberName","fullExpression","$parseMinErr","ensureSafeObject","Object","setter","setValue","fullExp","propertyObj","unwrapPromises","promiseWarning","$$v","cspSafeGetterFn","key0","key1","key2","key3","key4","cspSafePromiseEnabledGetter","pathVal","cspSafeGetter","getterFn","getterFnCache","pathKeys","pathKeysLength","evaledFnGetter","Function","$parseOptions","this.unwrapPromises","logPromiseWarnings","this.logPromiseWarnings","$filter","promiseWarningCache","parsedExpression","lexer","Lexer","parser","Parser","qFactory","nextTick","exceptionHandler","defaultCallback","defaultErrback","pending","ref","createInternalRejectedPromise","progress","errback","progressback","wrappedCallback","wrappedErrback","wrappedProgressback","catch","finally","makePromise","resolved","handleCallback","isResolved","callbackOutput","promises","requestAnimationFrame","webkitRequestAnimationFrame","mozRequestAnimationFrame","cancelAnimationFrame","webkitCancelAnimationFrame","mozCancelAnimationFrame","webkitCancelRequestAnimationFrame","rafSupported","raf","id","timer","TTL","$rootScopeMinErr","lastDirtyWatch","digestTtl","this.digestTtl","Scope","$id","$parent","$$watchers","$$nextSibling","$$prevSibling","$$childHead","$$childTail","$root","$$destroyed","$$asyncQueue","$$postDigestQueue","$$listeners","$$listenerCount","beginPhase","phase","compileToFn","decrementListenerCount","current","initWatchVal","isolate","child","$$childScopeClass","this.$$childScopeClass","watchExp","objectEquality","watcher","listenFn","watcher.fn","newVal","oldVal","originalFn","deregisterWatch","$watchCollection","veryOldValue","trackVeryOldValue","changeDetected","objGetter","internalArray","internalObject","initRun","oldLength","$watchCollectionWatch","newLength","bothNaN","$watchCollectionAction","watch","watchers","asyncQueue","postDigestQueue","dirty","ttl","watchLog","logIdx","logMsg","asyncTask","$eval","next","$on","this.$watch","expr","$$postDigest","namedListeners","$emit","listenerArgs","array1","currentScope","sanitizeUri","uri","isImage","regex","normalizedVal","adjustMatcher","matcher","$sceMinErr","adjustMatchers","matchers","adjustedMatchers","SCE_CONTEXTS","resourceUrlWhitelist","resourceUrlBlacklist","this.resourceUrlWhitelist","this.resourceUrlBlacklist","generateHolderType","Base","holderType","trustedValue","$$unwrapTrustedValue","this.$$unwrapTrustedValue","holderType.prototype.valueOf","holderType.prototype.toString","htmlSanitizer","trustedValueHolderBase","byType","CSS","URL","JS","trustAs","maybeTrusted","allowed","enabled","this.enabled","$sceDelegate","msieDocumentMode","sce","isEnabled","sce.isEnabled","sce.getTrusted","parseAs","sce.parseAs","sceParseAsTrusted","enumValue","lName","eventSupport","android","userAgent","navigator","boxee","documentMode","vendorPrefix","vendorRegex","bodyStyle","style","transitions","animations","webkitTransition","webkitAnimation","hasEvent","divElm","deferreds","$$timeoutId","timeout.cancel","base","urlParsingNode","requestUrl","originUrl","filters","suffix","currencyFilter","dateFilter","filterFilter","jsonFilter","limitToFilter","lowercaseFilter","numberFilter","orderByFilter","uppercaseFilter","comparator","comparatorType","predicates","predicates.check","objKey","filtered","$locale","formats","NUMBER_FORMATS","amount","currencySymbol","CURRENCY_SYM","formatNumber","PATTERNS","GROUP_SEP","DECIMAL_SEP","number","fractionSize","pattern","groupSep","decimalSep","isFinite","isNegative","abs","numStr","formatedText","hasExponent","toFixed","fractionLen","min","minFrac","maxFrac","round","fraction","lgroup","lgSize","group","gSize","negPre","posPre","negSuf","posSuf","padNumber","digits","neg","dateGetter","date","dateStrGetter","shortForm","jsonStringToDate","string","R_ISO8601_STR","tzHour","tzMin","dateSetter","setUTCFullYear","setFullYear","timeSetter","setUTCHours","setHours","m","s","ms","parseFloat","format","DATETIME_FORMATS","NUMBER_STRING","DATE_FORMATS_SPLIT","DATE_FORMATS","object","input","limit","Infinity","out","sortPredicate","reverseOrder","reverseComparator","comp","descending","v1","v2","predicate","arrayCopy","ngDirective","FormController","toggleValidCss","isValid","validationErrorKey","VALID_CLASS","INVALID_CLASS","form","parentForm","nullFormCtrl","invalidCount","errors","$error","controls","$name","ngForm","$dirty","$pristine","$valid","$invalid","$addControl","PRISTINE_CLASS","form.$addControl","control","$removeControl","form.$removeControl","queue","validationToken","$setValidity","form.$setValidity","$setDirty","form.$setDirty","DIRTY_CLASS","$setPristine","form.$setPristine","validate","ctrl","validatorName","validity","testFlags","flags","addNativeHtml5Validators","badFlags","ignoreFlags","$$hasNativeValidators","$parsers","validator","textInputType","VALIDITY_STATE_PROPERTY","placeholder","noevent","$$validityState","composing","ev","ngTrim","revalidate","$viewValue","$setViewValue","deferListener","keyCode","$render","ctrl.$render","$isEmpty","ngPattern","patternValidator","patternObj","$formatters","ngMinlength","minlength","minLengthValidator","ngMaxlength","maxlength","maxLengthValidator","classDirective","arrayDifference","arrayClasses","classes","digestClassCounts","classCounts","classesToUpdate","ngClassWatchAction","$index","old$index","mod","isActive_","active","querySelector","addEventListener","attachEvent","removeEventListener","detachEvent","_data","JQLite._data","optgroup","option","tbody","tfoot","colgroup","caption","thead","th","td","ready","trigger","fired","removeAttribute","css","currentStyle","lowercasedName","getNamedItem","ret","getText","textProp","NODE_TYPE_TEXT_PROPERTY","$dv","multiple","selected","nodeCount","onFn","eventFns","contains","compareDocumentPosition","adown","bup","eventmap","related","relatedTarget","one","off","replaceNode","insertBefore","contentDocument","prepend","wrapNode","after","newElement","toggleClass","condition","classCondition","nextElementSibling","getElementsByTagName","extraParameters","dummyEvent","handlerArgs","eventName","eventFnsCopy","arg3","unbind","$animateMinErr","$$selectors","classNameFilter","this.classNameFilter","$$classNameFilter","$$asyncCallback","enter","leave","move","add","PATH_MATCH","paramValue","CALL","APPLY","BIND","OPERATORS","null","true","false","+","-","*","/","%","^","===","!==","==","!=","<",">","<=",">=","&&","||","&","|","!","ESCAPE","lex","ch","lastCh","tokens","is","readString","peek","readNumber","isIdent","readIdent","isWhitespace","ch2","ch3","fn2","fn3","throwError","chars","was","isExpOperator","start","end","colStr","peekCh","ident","lastDot","peekIndex","methodName","quote","rawString","hex","rep","ZERO","statements","primary","expect","filterChain","consume","arrayDeclaration","functionCall","objectIndex","fieldAccess","msg","peekToken","e1","e2","e3","e4","t","unaryFn","right","ternaryFn","left","middle","binaryFn","statement","argsFn","fnInvoke","assignment","ternary","logicalOR","logicalAND","equality","relational","additive","multiplicative","unary","field","o","indexFn","contextGetter","fnPtr","elementFns","allConstant","elementFn","keyValues","ampmGetter","getHours","AMPMS","timeZoneGetter","zone","getTimezoneOffset","paddedZone","xlinkHref","propName","normalized","ngBooleanAttrWatchAction","formDirectiveFactory","isNgForm","formElement","action","preventDefaultListener","parentFormCtrl","alias","URL_REGEXP","EMAIL_REGEXP","NUMBER_REGEXP","inputType","numberInputType","numberBadFlags","minValidator","maxValidator","urlInputType","urlValidator","emailInputType","emailValidator","radioInputType","checked","checkboxInputType","trueValue","ngTrueValue","falseValue","ngFalseValue","ctrl.$isEmpty","NgModelController","$modelValue","NaN","$viewChangeListeners","ngModelGet","ngModel","ngModelSet","this.$isEmpty","inheritedData","this.$setValidity","this.$setPristine","this.$setViewValue","ngModelWatch","formatters","ctrls","modelCtrl","formCtrl","ngChange","required","ngList","viewValue","CONSTANT_VALUE_REGEXP","tpl","tplAttr","ngValue","ngValueConstantLink","ngValueLink","valueWatchAction","templateElement","ngBind","ngBindWatchAction","ngBindTemplate","tElement","ngBindHtml","getStringValue","ngBindHtmlWatchAction","getTrustedHtml","forceAsyncEvents","ngEventHandler","$transclude","previousElements","ngIf","ngIfWatchAction","$anchorScroll","srcExp","ngInclude","onloadExp","onload","autoScrollExp","autoscroll","previousElement","currentElement","cleanupLastIncludeContent","parseAsResourceUrl","ngIncludeWatchAction","afterAnimation","thisChangeId","newScope","$compile","ngInit","BRACE","numberExp","whenExp","whens","whensExpFns","isWhen","attributeName","ngPluralizeWatch","ngPluralizeWatchAction","ngRepeatMinErr","ngRepeat","trackByExpGetter","trackByIdExpFn","trackByIdArrayFn","trackByIdObjFn","valueIdentifier","keyIdentifier","hashFnLocals","lhs","rhs","trackByExp","lastBlockMap","ngRepeatAction","collection","previousNode","nextNode","nextBlockMap","arrayLength","trackByIdFn","collectionKeys","nextBlockOrder","trackById","$first","$last","$middle","$odd","$even","ngShow","ngShowWatchAction","ngHide","ngHideWatchAction","ngStyle","ngStyleWatchAction","newStyles","oldStyles","ngSwitchController","cases","selectedTranscludes","selectedElements","selectedScopes","ngSwitch","ngSwitchWatchAction","change","selectedTransclude","selectedScope","caseElement","anchor","ngSwitchWhen","$attrs","ngOptionsMinErr","NG_OPTIONS_REGEXP","nullModelCtrl","optionsMap","ngModelCtrl","unknownOption","databound","init","self.init","ngModelCtrl_","nullOption_","unknownOption_","addOption","self.addOption","removeOption","self.removeOption","hasOption","renderUnknownOption","self.renderUnknownOption","unknownVal","self.hasOption","setupAsSingle","selectElement","selectCtrl","ngModelCtrl.$render","emptyOption","setupAsMultiple","lastView","items","selectMultipleWatch","setupAsOptions","render","optionGroups","optionGroupNames","optionGroupName","optionGroup","existingParent","existingOptions","existingOption","modelValue","valuesFn","keyName","groupIndex","selectedSet","trackFn","trackIndex","valueName","lastElement","groupByFn","modelCast","label","displayFn","nullOption","groupLength","optionGroupsCache","optGroupTemplate","optionTemplate","optionsExp","track","optionElement","toDisplay","ngOptions","ngModelCtrl.$isEmpty","nullSelectCtrl","selectCtrlName","interpolateWatchAction","$$csp"]
+"names":["window","document","undefined","minErr","isArrayLike","obj","isWindow","length","nodeType","isString","isArray","forEach","iterator","context","key","isFunction","hasOwnProperty","call","sortedKeys","keys","push","sort","forEachSorted","i","reverseParams","iteratorFn","value","nextUid","index","uid","digit","charCodeAt","join","String","fromCharCode","unshift","setHashKey","h","$$hashKey","extend","dst","arguments","int","str","parseInt","inherit","parent","extra","noop","identity","$","valueFn","isUndefined","isDefined","isObject","isNumber","isDate","toString","isRegExp","location","alert","setInterval","isElement","node","nodeName","prop","attr","find","map","results","list","indexOf","array","arrayRemove","splice","copy","source","destination","stackSource","stackDest","$evalAsync","$watch","ngMinErr","result","Date","getTime","RegExp","match","lastIndex","shallowCopy","src","charAt","equals","o1","o2","t1","t2","isNaN","keySet","bind","self","fn","curryArgs","slice","startIndex","apply","concat","toJsonReplacer","val","toJson","pretty","JSON","stringify","fromJson","json","parse","toBoolean","v","lowercase","startingTag","element","jqLite","clone","empty","e","elemHtml","append","html","TEXT_NODE","replace","tryDecodeURIComponent","decodeURIComponent","parseKeyValue","keyValue","key_value","split","toKeyValue","parts","arrayValue","encodeUriQuery","encodeUriSegment","pctEncodeSpaces","encodeURIComponent","angularInit","bootstrap","elements","appElement","module","names","NG_APP_CLASS_REGEXP","name","getElementById","querySelectorAll","exec","className","attributes","modules","doBootstrap","injector","tag","$provide","createInjector","invoke","scope","compile","animate","$apply","data","NG_DEFER_BOOTSTRAP","test","angular","resumeBootstrap","angular.resumeBootstrap","extraModules","snake_case","separator","SNAKE_CASE_REGEXP","letter","pos","toLowerCase","assertArg","arg","reason","assertArgFn","acceptArrayAnnotation","constructor","assertNotHasOwnProperty","getter","path","bindFnToScope","lastInstance","len","getBlockElements","nodes","startNode","endNode","nextSibling","setupModuleLoader","$injectorMinErr","$$minErr","factory","requires","configFn","invokeLater","provider","method","insertMethod","invokeQueue","moduleInstance","runBlocks","config","run","block","publishExternalAPI","version","uppercase","csp","angularModule","$LocaleProvider","ngModule","$$SanitizeUriProvider","$CompileProvider","directive","htmlAnchorDirective","inputDirective","formDirective","scriptDirective","selectDirective","styleDirective","optionDirective","ngBindDirective","ngBindHtmlDirective","ngBindTemplateDirective","ngClassDirective","ngClassEvenDirective","ngClassOddDirective","ngCloakDirective","ngControllerDirective","ngFormDirective","ngHideDirective","ngIfDirective","ngIncludeDirective","ngInitDirective","ngNonBindableDirective","ngPluralizeDirective","ngRepeatDirective","ngShowDirective","ngStyleDirective","ngSwitchDirective","ngSwitchWhenDirective","ngSwitchDefaultDirective","ngOptionsDirective","ngTranscludeDirective","ngModelDirective","ngListDirective","ngChangeDirective","requiredDirective","ngValueDirective","ngIncludeFillContentDirective","ngAttributeAliasDirectives","ngEventDirectives","$AnchorScrollProvider","$AnimateProvider","$BrowserProvider","$CacheFactoryProvider","$ControllerProvider","$DocumentProvider","$ExceptionHandlerProvider","$FilterProvider","$InterpolateProvider","$IntervalProvider","$HttpProvider","$HttpBackendProvider","$LocationProvider","$LogProvider","$ParseProvider","$RootScopeProvider","$QProvider","$SceProvider","$SceDelegateProvider","$SnifferProvider","$TemplateCacheProvider","$TimeoutProvider","$WindowProvider","$$RAFProvider","$$AsyncCallbackProvider","camelCase","SPECIAL_CHARS_REGEXP","_","offset","toUpperCase","MOZ_HACK_REGEXP","jqLitePatchJQueryRemove","dispatchThis","filterElems","getterIfNoArguments","removePatch","param","filter","fireEvent","set","setIndex","setLength","childIndex","children","shift","triggerHandler","childLength","jQuery","originalJqFn","$original","JQLite","trim","jqLiteMinErr","parsed","SINGLE_TAG_REGEXP","fragment","createDocumentFragment","HTML_REGEXP","tmp","appendChild","createElement","TAG_NAME_REGEXP","wrap","wrapMap","_default","innerHTML","XHTML_TAG_REGEXP","removeChild","firstChild","lastChild","j","jj","childNodes","textContent","createTextNode","jqLiteAddNodes","jqLiteClone","cloneNode","jqLiteDealoc","jqLiteRemoveData","jqLiteOff","type","unsupported","events","jqLiteExpandoStore","handle","eventHandler","removeEventListenerFn","expandoId","ng339","expandoStore","jqCache","$destroy","jqId","jqLiteData","isSetter","keyDefined","isSimpleGetter","jqLiteHasClass","selector","getAttribute","jqLiteRemoveClass","cssClasses","setAttribute","cssClass","jqLiteAddClass","existingClasses","root","jqLiteController","jqLiteInheritedData","documentElement","ii","parentNode","host","jqLiteEmpty","getBooleanAttrName","booleanAttr","BOOLEAN_ATTR","BOOLEAN_ELEMENTS","createEventHandler","event","preventDefault","event.preventDefault","returnValue","stopPropagation","event.stopPropagation","cancelBubble","target","srcElement","defaultPrevented","prevent","isDefaultPrevented","event.isDefaultPrevented","eventHandlersCopy","msie","elem","hashKey","nextUidFn","objType","HashMap","isolatedUid","this.nextUid","put","annotate","$inject","fnText","STRIP_COMMENTS","argDecl","FN_ARGS","FN_ARG_SPLIT","FN_ARG","all","underscore","last","modulesToLoad","supportObject","delegate","provider_","providerInjector","instantiate","$get","providerCache","providerSuffix","factoryFn","loadModules","moduleFn","loadedModules","get","_runBlocks","_invokeQueue","invokeArgs","message","stack","createInternalInjector","cache","getService","serviceName","INSTANTIATING","err","locals","args","Type","Constructor","returnedValue","prototype","instance","has","service","$injector","constant","instanceCache","decorator","decorFn","origProvider","orig$get","origProvider.$get","origInstance","instanceInjector","servicename","autoScrollingEnabled","disableAutoScrolling","this.disableAutoScrolling","$window","$location","$rootScope","getFirstAnchor","scroll","hash","elm","scrollIntoView","getElementsByName","scrollTo","autoScrollWatch","autoScrollWatchAction","$$rAF","$timeout","supported","Browser","$log","$sniffer","completeOutstandingRequest","outstandingRequestCount","outstandingRequestCallbacks","pop","error","startPoller","interval","setTimeout","check","pollFns","pollFn","pollTimeout","fireUrlChange","lastBrowserUrl","url","urlChangeListeners","listener","rawDocument","history","clearTimeout","pendingDeferIds","isMock","$$completeOutstandingRequest","$$incOutstandingRequestCount","self.$$incOutstandingRequestCount","notifyWhenNoOutstandingRequests","self.notifyWhenNoOutstandingRequests","callback","addPollFn","self.addPollFn","href","baseElement","reloadLocation","self.url","sameBase","stripHash","replaceState","pushState","urlChangeInit","onUrlChange","self.onUrlChange","on","hashchange","$$checkUrlChange","baseHref","self.baseHref","lastCookies","lastCookieString","cookiePath","cookies","self.cookies","cookieLength","cookie","escape","warn","cookieArray","unescape","substring","defer","self.defer","delay","timeoutId","cancel","self.defer.cancel","deferId","$document","this.$get","cacheFactory","cacheId","options","refresh","entry","freshEnd","staleEnd","n","link","p","nextEntry","prevEntry","caches","size","stats","capacity","Number","MAX_VALUE","lruHash","lruEntry","remove","removeAll","destroy","info","cacheFactory.info","cacheFactory.get","$cacheFactory","$$sanitizeUriProvider","hasDirectives","Suffix","COMMENT_DIRECTIVE_REGEXP","CLASS_DIRECTIVE_REGEXP","EVENT_HANDLER_ATTR_REGEXP","this.directive","registerDirective","directiveFactory","$exceptionHandler","directives","priority","require","controller","restrict","aHrefSanitizationWhitelist","this.aHrefSanitizationWhitelist","regexp","imgSrcSanitizationWhitelist","this.imgSrcSanitizationWhitelist","$interpolate","$http","$templateCache","$parse","$controller","$sce","$animate","$$sanitizeUri","$compileNodes","transcludeFn","maxPriority","ignoreDirective","previousCompileContext","nodeValue","compositeLinkFn","compileNodes","safeAddClass","publicLinkFn","cloneConnectFn","transcludeControllers","parentBoundTranscludeFn","$linkNode","JQLitePrototype","eq","$element","addClass","nodeList","$rootElement","childLinkFn","childScope","childBoundTranscludeFn","nodeListLength","stableNodeList","Array","linkFns","nodeLinkFn","$new","transcludeOnThisElement","createBoundTranscludeFn","transclude","templateOnThisElement","attrs","linkFnFound","Attributes","collectDirectives","applyDirectivesToNode","$$element","terminal","previousBoundTranscludeFn","boundTranscludeFn","transcludedScope","cloneFn","controllers","scopeCreated","$$transcluded","attrsMap","$attr","addDirective","directiveNormalize","nodeName_","isNgAttr","nAttrs","attrStartName","attrEndName","specified","ngAttrName","NG_ATTR_BINDING","substr","directiveNName","nName","addAttrInterpolateDirective","addTextInterpolateDirective","byPriority","groupScan","attrStart","attrEnd","depth","hasAttribute","$compileMinErr","groupElementsLinkFnWrapper","linkFn","compileNode","templateAttrs","jqCollection","originalReplaceDirective","preLinkFns","postLinkFns","addLinkFns","pre","post","directiveName","newIsolateScopeDirective","$$isolateScope","cloneAndAnnotateFn","getControllers","elementControllers","retrievalMethod","optional","linkNode","controllersBoundTransclude","cloneAttachFn","hasElementTranscludeDirective","isolateScope","LOCAL_REGEXP","templateDirective","$$originalDirective","definition","scopeName","attrName","mode","lastValue","parentGet","parentSet","compare","$$isolateBindings","$observe","$$observers","$$scope","literal","a","b","assign","parentValueWatch","parentValue","controllerDirectives","controllerInstance","controllerAs","$scope","scopeToChild","template","templateUrl","terminalPriority","newScopeDirective","nonTlbTranscludeDirective","hasTranscludeDirective","hasTemplate","$compileNode","$template","childTranscludeFn","$$start","$$end","directiveValue","assertNoDuplicate","$$tlb","createComment","replaceWith","replaceDirective","contents","denormalizeTemplate","newTemplateAttrs","templateDirectives","unprocessedDirectives","markDirectivesAsIsolate","mergeTemplateAttributes","compileTemplateUrl","Math","max","tDirectives","startAttrName","endAttrName","srcAttr","dstAttr","$set","tAttrs","linkQueue","afterTemplateNodeLinkFn","afterTemplateChildLinkFn","beforeTemplateCompileNode","origAsyncDirective","derivedSyncDirective","getTrustedResourceUrl","success","content","tempTemplateAttrs","beforeTemplateLinkNode","linkRootElement","oldClasses","response","code","headers","delayedNodeLinkFn","ignoreChildLinkFn","rootElement","diff","what","previousDirective","text","interpolateFn","textInterpolateCompileFn","templateNode","hasCompileParent","textInterpolateLinkFn","bindings","interpolateFnWatchAction","getTrustedContext","attrNormalizedName","HTML","RESOURCE_URL","attrInterpolatePreLinkFn","$$inter","newValue","oldValue","$updateClass","elementsToRemove","newNode","firstElementToRemove","removeCount","j2","replaceChild","expando","k","kk","annotation","$addClass","classVal","$removeClass","removeClass","newClasses","toAdd","tokenDifference","toRemove","setClass","writeAttr","booleanKey","removeAttr","listeners","startSymbol","endSymbol","PREFIX_REGEXP","str1","str2","values","tokens1","tokens2","token","CNTRL_REG","register","this.register","expression","identifier","exception","cause","parseHeaders","line","headersGetter","headersObj","transformData","fns","JSON_START","JSON_END","PROTECTION_PREFIX","CONTENT_TYPE_APPLICATION_JSON","defaults","d","interceptorFactories","interceptors","responseInterceptorFactories","responseInterceptors","$httpBackend","$browser","$q","requestConfig","transformResponse","resp","status","reject","transformRequest","mergeHeaders","defHeaders","reqHeaders","defHeaderName","reqHeaderName","common","lowercaseDefHeaderName","execHeaders","headerContent","headerFn","header","chain","serverRequest","reqData","withCredentials","sendReq","then","promise","when","reversedInterceptors","interceptor","request","requestError","responseError","thenFn","rejectFn","promise.success","promise.error","done","headersString","statusText","resolvePromise","$$phase","deferred","resolve","removePendingReq","idx","pendingRequests","cachedResp","buildUrl","params","defaultCache","xsrfValue","urlIsSameOrigin","xsrfCookieName","xsrfHeaderName","timeout","responseType","toISOString","interceptorFactory","responseFn","createShortMethods","createShortMethodsWithData","createXhr","XMLHttpRequest","ActiveXObject","createHttpBackend","callbacks","$browserDefer","jsonpReq","callbackId","script","async","body","called","addEventListenerFn","onreadystatechange","script.onreadystatechange","readyState","ABORTED","timeoutRequest","jsonpDone","xhr","abort","completeRequest","urlResolve","protocol","counter","open","setRequestHeader","xhr.onreadystatechange","responseHeaders","getAllResponseHeaders","responseText","send","this.startSymbol","this.endSymbol","mustHaveExpression","trustedContext","endIndex","hasInterpolation","startSymbolLength","exp","endSymbolLength","$interpolateMinErr","part","getTrusted","valueOf","newErr","$interpolate.startSymbol","$interpolate.endSymbol","count","invokeApply","clearInterval","iteration","skipApply","$$intervalId","tick","notify","intervals","interval.cancel","short","pluralCat","num","encodePath","segments","parseAbsoluteUrl","absoluteUrl","locationObj","appBase","parsedUrl","$$protocol","$$host","hostname","$$port","port","DEFAULT_PORTS","parseAppUrl","relativeUrl","prefixed","$$path","pathname","$$search","search","$$hash","beginsWith","begin","whole","stripFile","lastIndexOf","LocationHtml5Url","basePrefix","$$html5","appBaseNoFile","$$parse","this.$$parse","pathUrl","$locationMinErr","$$compose","this.$$compose","$$url","$$absUrl","$$parseLinkUrl","this.$$parseLinkUrl","relHref","appUrl","prevAppUrl","rewrittenUrl","LocationHashbangUrl","hashPrefix","withoutBaseUrl","withoutHashUrl","windowsFilePathExp","firstPathSegmentMatch","LocationHashbangInHtml5Url","locationGetter","property","locationGetterSetter","preprocess","html5Mode","this.hashPrefix","prefix","this.html5Mode","afterLocationChange","oldUrl","$broadcast","absUrl","initialUrl","LocationMode","IGNORE_URI_REGEXP","ctrlKey","metaKey","which","absHref","animVal","newUrl","$digest","changeCounter","$locationWatch","currentReplace","$$replace","debug","debugEnabled","this.debugEnabled","flag","formatError","Error","sourceURL","consoleLog","console","logFn","log","hasApply","arg1","arg2","ensureSafeMemberName","fullExpression","$parseMinErr","ensureSafeObject","Object","setter","setValue","fullExp","propertyObj","unwrapPromises","promiseWarning","$$v","isPossiblyDangerousMemberName","cspSafeGetterFn","key0","key1","key2","key3","key4","eso","o","expensiveChecks","eso0","eso1","eso2","eso3","eso4","cspSafePromiseEnabledGetter","pathVal","cspSafeGetter","getterFnWithExtraArgs","s","l","getterFn","getterFnCache","getterFnCacheExpensive","getterFnCacheDefault","pathKeys","pathKeysLength","needsEnsureSafeObject","lookupJs","wrapWithEso","evaledFnGetter","Function","cacheDefault","cacheExpensive","$parseOptions","this.unwrapPromises","logPromiseWarnings","this.logPromiseWarnings","$filter","$parseOptionsExpensive","promiseWarningCache","parsedExpression","parseOptions","lexer","Lexer","parser","Parser","qFactory","nextTick","exceptionHandler","defaultCallback","defaultErrback","pending","ref","createInternalRejectedPromise","progress","errback","progressback","wrappedCallback","wrappedErrback","wrappedProgressback","catch","finally","makePromise","resolved","handleCallback","isResolved","callbackOutput","promises","requestAnimationFrame","webkitRequestAnimationFrame","mozRequestAnimationFrame","cancelAnimationFrame","webkitCancelAnimationFrame","mozCancelAnimationFrame","webkitCancelRequestAnimationFrame","rafSupported","raf","id","timer","TTL","$rootScopeMinErr","lastDirtyWatch","digestTtl","this.digestTtl","Scope","$id","$parent","$$watchers","$$nextSibling","$$prevSibling","$$childHead","$$childTail","$root","$$destroyed","$$asyncQueue","$$postDigestQueue","$$listeners","$$listenerCount","beginPhase","phase","compileToFn","decrementListenerCount","current","initWatchVal","isolate","child","$$childScopeClass","this.$$childScopeClass","watchExp","objectEquality","watcher","listenFn","watcher.fn","newVal","oldVal","originalFn","deregisterWatch","$watchCollection","veryOldValue","trackVeryOldValue","changeDetected","objGetter","internalArray","internalObject","initRun","oldLength","$watchCollectionWatch","newLength","bothNaN","$watchCollectionAction","watch","watchers","asyncQueue","postDigestQueue","dirty","ttl","watchLog","logIdx","logMsg","asyncTask","$eval","next","$on","this.$watch","expr","$$postDigest","namedListeners","indexOfListener","$emit","listenerArgs","array1","currentScope","sanitizeUri","uri","isImage","regex","normalizedVal","adjustMatcher","matcher","$sceMinErr","adjustMatchers","matchers","adjustedMatchers","SCE_CONTEXTS","resourceUrlWhitelist","resourceUrlBlacklist","this.resourceUrlWhitelist","this.resourceUrlBlacklist","generateHolderType","Base","holderType","trustedValue","$$unwrapTrustedValue","this.$$unwrapTrustedValue","holderType.prototype.valueOf","holderType.prototype.toString","htmlSanitizer","trustedValueHolderBase","byType","CSS","URL","JS","trustAs","maybeTrusted","allowed","enabled","this.enabled","$sceDelegate","msieDocumentMode","sce","isEnabled","sce.isEnabled","sce.getTrusted","parseAs","sce.parseAs","sceParseAsTrusted","enumValue","lName","eventSupport","android","userAgent","navigator","boxee","documentMode","vendorPrefix","vendorRegex","bodyStyle","style","transitions","animations","webkitTransition","webkitAnimation","hasEvent","divElm","deferreds","$$timeoutId","timeout.cancel","base","urlParsingNode","requestUrl","originUrl","filters","suffix","currencyFilter","dateFilter","filterFilter","jsonFilter","limitToFilter","lowercaseFilter","numberFilter","orderByFilter","uppercaseFilter","comparator","comparatorType","predicates","predicates.check","objKey","filtered","$locale","formats","NUMBER_FORMATS","amount","currencySymbol","CURRENCY_SYM","formatNumber","PATTERNS","GROUP_SEP","DECIMAL_SEP","number","fractionSize","pattern","groupSep","decimalSep","isFinite","isNegative","abs","numStr","formatedText","hasExponent","toFixed","fractionLen","min","minFrac","maxFrac","round","fraction","lgroup","lgSize","group","gSize","negPre","posPre","negSuf","posSuf","padNumber","digits","neg","dateGetter","date","dateStrGetter","shortForm","jsonStringToDate","string","R_ISO8601_STR","tzHour","tzMin","dateSetter","setUTCFullYear","setFullYear","timeSetter","setUTCHours","setHours","m","ms","parseFloat","format","DATETIME_FORMATS","NUMBER_STRING","DATE_FORMATS_SPLIT","DATE_FORMATS","object","input","limit","Infinity","out","sortPredicate","reverseOrder","reverseComparator","comp","descending","v1","v2","predicate","ngDirective","FormController","toggleValidCss","isValid","validationErrorKey","VALID_CLASS","INVALID_CLASS","form","parentForm","nullFormCtrl","invalidCount","errors","$error","controls","$name","ngForm","$dirty","$pristine","$valid","$invalid","$addControl","PRISTINE_CLASS","form.$addControl","control","$removeControl","form.$removeControl","queue","validationToken","$setValidity","form.$setValidity","$setDirty","form.$setDirty","DIRTY_CLASS","$setPristine","form.$setPristine","validate","ctrl","validatorName","validity","testFlags","flags","addNativeHtml5Validators","badFlags","ignoreFlags","$$hasNativeValidators","$parsers","validator","textInputType","VALIDITY_STATE_PROPERTY","placeholder","noevent","$$validityState","composing","ev","ngTrim","revalidate","$viewValue","$setViewValue","deferListener","keyCode","$render","ctrl.$render","$isEmpty","ngPattern","patternValidator","patternObj","$formatters","ngMinlength","minlength","minLengthValidator","ngMaxlength","maxlength","maxLengthValidator","classDirective","arrayDifference","arrayClasses","classes","digestClassCounts","classCounts","classesToUpdate","ngClassWatchAction","$index","old$index","mod","isActive_","active","querySelector","addEventListener","attachEvent","removeEventListener","detachEvent","_data","JQLite._data","optgroup","option","tbody","tfoot","colgroup","caption","thead","th","td","ready","trigger","fired","removeAttribute","css","currentStyle","lowercasedName","getNamedItem","ret","getText","textProp","NODE_TYPE_TEXT_PROPERTY","$dv","multiple","selected","nodeCount","onFn","eventFns","contains","compareDocumentPosition","adown","bup","eventmap","related","relatedTarget","one","off","replaceNode","insertBefore","contentDocument","prepend","wrapNode","after","newElement","toggleClass","condition","classCondition","nextElementSibling","getElementsByTagName","extraParameters","dummyEvent","handlerArgs","eventName","eventFnsCopy","arg3","unbind","$animateMinErr","$$selectors","classNameFilter","this.classNameFilter","$$classNameFilter","$$asyncCallback","enter","leave","move","add","PATH_MATCH","paramValue","CALL","APPLY","BIND","OPERATORS","null","true","false","+","-","*","/","%","^","===","!==","==","!=","<",">","<=",">=","&&","||","&","|","!","ESCAPE","lex","ch","lastCh","tokens","is","readString","peek","readNumber","isIdent","readIdent","isWhitespace","ch2","ch3","fn2","fn3","throwError","chars","was","isExpOperator","start","end","colStr","peekCh","ident","lastDot","peekIndex","methodName","quote","rawString","hex","rep","ZERO","statements","primary","expect","filterChain","consume","arrayDeclaration","functionCall","objectIndex","fieldAccess","msg","peekToken","e1","e2","e3","e4","t","unaryFn","right","ternaryFn","left","middle","binaryFn","statement","argsFn","fnInvoke","assignment","ternary","logicalOR","logicalAND","equality","relational","additive","multiplicative","unary","field","indexFn","contextGetter","fnPtr","elementFns","allConstant","elementFn","keyValues","ampmGetter","getHours","AMPMS","timeZoneGetter","zone","getTimezoneOffset","paddedZone","xlinkHref","propName","normalized","ngBooleanAttrWatchAction","formDirectiveFactory","isNgForm","formElement","action","preventDefaultListener","parentFormCtrl","alias","URL_REGEXP","EMAIL_REGEXP","NUMBER_REGEXP","inputType","numberInputType","numberBadFlags","minValidator","maxValidator","urlInputType","urlValidator","emailInputType","emailValidator","radioInputType","checked","checkboxInputType","trueValue","ngTrueValue","falseValue","ngFalseValue","ctrl.$isEmpty","NgModelController","$modelValue","NaN","$viewChangeListeners","ngModelGet","ngModel","ngModelSet","this.$isEmpty","inheritedData","this.$setValidity","this.$setPristine","this.$setViewValue","ngModelWatch","formatters","ctrls","modelCtrl","formCtrl","ngChange","required","ngList","viewValue","CONSTANT_VALUE_REGEXP","tpl","tplAttr","ngValue","ngValueConstantLink","ngValueLink","valueWatchAction","templateElement","ngBind","ngBindWatchAction","ngBindTemplate","tElement","ngBindHtml","getStringValue","ngBindHtmlWatchAction","getTrustedHtml","forceAsyncEvents","ngEventHandler","$transclude","previousElements","ngIf","ngIfWatchAction","$anchorScroll","srcExp","ngInclude","onloadExp","onload","autoScrollExp","autoscroll","previousElement","currentElement","cleanupLastIncludeContent","parseAsResourceUrl","ngIncludeWatchAction","afterAnimation","thisChangeId","newScope","$compile","ngInit","BRACE","numberExp","whenExp","whens","whensExpFns","isWhen","attributeName","ngPluralizeWatch","ngPluralizeWatchAction","ngRepeatMinErr","ngRepeat","trackByExpGetter","trackByIdExpFn","trackByIdArrayFn","trackByIdObjFn","valueIdentifier","keyIdentifier","hashFnLocals","lhs","rhs","trackByExp","lastBlockMap","ngRepeatAction","collection","previousNode","nextNode","nextBlockMap","arrayLength","trackByIdFn","collectionKeys","nextBlockOrder","trackById","$first","$last","$middle","$odd","$even","ngShow","ngShowWatchAction","ngHide","ngHideWatchAction","ngStyle","ngStyleWatchAction","newStyles","oldStyles","ngSwitchController","cases","selectedTranscludes","selectedElements","selectedScopes","ngSwitch","ngSwitchWatchAction","change","selectedTransclude","selectedScope","caseElement","anchor","ngSwitchWhen","$attrs","ngOptionsMinErr","NG_OPTIONS_REGEXP","nullModelCtrl","optionsMap","ngModelCtrl","unknownOption","databound","init","self.init","ngModelCtrl_","nullOption_","unknownOption_","addOption","self.addOption","removeOption","self.removeOption","hasOption","renderUnknownOption","self.renderUnknownOption","unknownVal","self.hasOption","setupAsSingle","selectElement","selectCtrl","ngModelCtrl.$render","emptyOption","setupAsMultiple","lastView","items","selectMultipleWatch","setupAsOptions","render","optionGroups","optionGroupNames","optionGroupName","optionGroup","existingParent","existingOptions","existingOption","modelValue","valuesFn","keyName","groupIndex","selectedSet","trackFn","trackIndex","valueName","lastElement","groupByFn","modelCast","label","displayFn","nullOption","groupLength","optionGroupsCache","optGroupTemplate","optionTemplate","optionsExp","track","optionElement","toDisplay","ngOptions","ngModelCtrl.$isEmpty","nullSelectCtrl","selectCtrlName","interpolateWatchAction","$$csp"]
 }
diff --git a/libs/bower_components/angular/bower.json b/libs/bower_components/angular/bower.json
index 63d30a9e65..4689d923d1 100644
--- a/libs/bower_components/angular/bower.json
+++ b/libs/bower_components/angular/bower.json
@@ -1,7 +1,8 @@
 {
   "name": "angular",
-  "version": "1.2.26",
+  "version": "1.2.28",
   "main": "./angular.js",
+  "ignore": [],
   "dependencies": {
   }
 }
diff --git a/libs/bower_components/angular/package.json b/libs/bower_components/angular/package.json
index d305473f69..40cf22288c 100644
--- a/libs/bower_components/angular/package.json
+++ b/libs/bower_components/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular",
-  "version": "",
+  "version": "1.2.28",
   "description": "HTML enhanced for web apps",
   "main": "angular.js",
   "scripts": {
diff --git a/libs/upgradephp/upgrade.php b/libs/upgradephp/upgrade.php
index 322ffd0455..c6591b70a9 100644
--- a/libs/upgradephp/upgrade.php
+++ b/libs/upgradephp/upgrade.php
@@ -633,8 +633,8 @@ function _readfile($filename, $byteStart, $byteEnd, $useIncludePath = false, $co
         for ($pos = $byteStart; $pos < $byteEnd && !feof($handle); $pos = ftell($handle)) {
 			echo fread($handle, min(8192, $byteEnd - $pos));
 
-			ob_flush();
-			flush();
+			@ob_flush();
+			@flush();
 		}
 
 		fclose($handle);
@@ -696,3 +696,9 @@ if (!function_exists('gzopen')
         return gzopen64($filename , $mode, $use_include_path);
     }
 }
+
+if (!function_exists('dump')) {
+    function dump () {
+
+    }
+}
diff --git a/misc/How to install Piwik.html b/misc/How to install Piwik.html
index 5a26b7d34e..be287e64c8 100644
--- a/misc/How to install Piwik.html
+++ b/misc/How to install Piwik.html
@@ -1,7 +1,7 @@
 <html>
 <head>
-    <meta http-equiv="refresh" content="0;url=http://piwik.org/docs/installation/"/>
+    <meta http-equiv="refresh" content="0;url=https://piwik.org/docs/installation/"/>
 </head>
-<body>You will be redirected to the Piwik Installation documentation on <a href='http://piwik.org/docs/installation/'>http://piwik.org/docs/installation/</a>
+<body>You will be redirected to the Piwik Installation documentation on <a href='https://piwik.org/docs/installation/'>https://piwik.org/docs/installation/</a>
 </body>
 </html>
diff --git a/misc/cron/archive.php b/misc/cron/archive.php
index 3975f90bea..eecd78946b 100644
--- a/misc/cron/archive.php
+++ b/misc/cron/archive.php
@@ -9,6 +9,13 @@
  * @package Piwik
  */
 
+use Monolog\Handler\StreamHandler;
+use Monolog\Logger;
+use Piwik\Container\StaticContainer;
+use Symfony\Bridge\Monolog\Handler\ConsoleHandler;
+use Symfony\Component\Console\Output\ConsoleOutput;
+use Symfony\Component\Console\Output\OutputInterface;
+
 if (!defined('PIWIK_INCLUDE_PATH')) {
     define('PIWIK_INCLUDE_PATH', realpath(dirname(__FILE__) . "/../.."));
 }
@@ -17,12 +24,10 @@ if (!defined('PIWIK_USER_PATH')) {
     define('PIWIK_USER_PATH', PIWIK_INCLUDE_PATH);
 }
 
-if (!class_exists('Piwik\Console', false)) {
-    define('PIWIK_ENABLE_DISPATCH', false);
-    define('PIWIK_ENABLE_ERROR_HANDLER', false);
-    define('PIWIK_ENABLE_SESSION_START', false);
-    require_once PIWIK_INCLUDE_PATH . "/index.php";
-}
+define('PIWIK_ENABLE_DISPATCH', false);
+define('PIWIK_ENABLE_ERROR_HANDLER', false);
+define('PIWIK_ENABLE_SESSION_START', false);
+require_once PIWIK_INCLUDE_PATH . "/index.php";
 
 if (!empty($_SERVER['argv'][0])) {
     $callee = $_SERVER['argv'][0];
@@ -55,14 +60,29 @@ if (isset($_SERVER['argv']) && Piwik\Console::isSupported()) {
 
     $console->run();
 } else { // if running via web request, use CronArchive directly
+
+    if (Piwik\Common::isPhpCliMode()) {
+        // We can run the archive in CLI with `php-cgi` so we have to configure the container/logger
+        // just like for CLI
+        StaticContainer::setEnvironment('cli');
+        /** @var ConsoleHandler $consoleLogHandler */
+        $consoleLogHandler = StaticContainer::get('Symfony\Bridge\Monolog\Handler\ConsoleHandler');
+        $consoleLogHandler->setOutput(new ConsoleOutput(OutputInterface::VERBOSITY_VERBOSE));
+    } else {
+        // HTTP request: logs needs to be dumped in the HTTP response (on top of existing log destinations)
+        /** @var \Monolog\Logger $logger */
+        $logger = StaticContainer::get('Psr\Log\LoggerInterface');
+        $handler = new StreamHandler('php://output', Logger::INFO);
+        $handler->setFormatter(StaticContainer::get('Piwik\Plugins\Monolog\Formatter\LineMessageFormatter'));
+        $logger->pushHandler($handler);
+    }
+
     $archiver = new Piwik\CronArchive();
 
     if (!Piwik\Common::isPhpCliMode()) {
         $token_auth = Piwik\Common::getRequestVar('token_auth', '', 'string');
 
-        if ($token_auth !== $archiver->getTokenAuth()
-            || strlen($token_auth) != 32
-        ) {
+        if (!$archiver->isTokenAuthSuperUserToken($token_auth)) {
             die('<b>You must specify the Super User token_auth as a parameter to this script, eg. <code>?token_auth=XYZ</code> if you wish to run this script through the browser. </b><br>
                     However it is recommended to run it <a href="http://piwik.org/docs/setup-auto-archiving/">via cron in the command line</a>, since it can take a long time to run.<br/>
                     In a shell, execute for example the following to trigger archiving on the local Piwik server:<br/>
diff --git a/misc/cron/updatetoken.php b/misc/cron/updatetoken.php
index 37513b1a42..3e27babc44 100644
--- a/misc/cron/updatetoken.php
+++ b/misc/cron/updatetoken.php
@@ -59,7 +59,7 @@ $token = Db::get()->fetchOne("SELECT token_auth
                               WHERE superuser_access = 1
                               ORDER BY date_registered ASC");
 
-$filename = StaticContainer::getContainer()->get('path.tmp') . '/cache/token.php';
+$filename = StaticContainer::get('path.tmp') . '/cache/token.php';
 
 $content  = "<?php exit; //\t" . $token;
 file_put_contents($filename, $content);
diff --git a/misc/log-analytics/README.md b/misc/log-analytics/README.md
index a9d53d8dfc..5684d5f112 100644
--- a/misc/log-analytics/README.md
+++ b/misc/log-analytics/README.md
@@ -4,7 +4,12 @@
 
 * Python 2.6 or 2.7. Python 3.x is not supported.
 * Update to Piwik 1.11
-* OrderedDict is optional (see https://pypi.python.org/pypi/ordereddict for more details). .
+
+## Contributors
+
+We're looking for contributors! Feel free to submit Pull requests on Github.
+
+For example this documentation page could be improved and maybe you would like to help? Or **maybe you know Python**, check out the [list of issues for import_logs.py](https://github.com/piwik/piwik/labels/c%3A%20Log%20Analytics%20%28import_logs.py%29) which lists many interesting ideas and projects that need help. FYI [we plan to move](https://github.com/piwik/piwik/issues/7163) the project to its own repository on Github and split the big file into smaller files.
 
 ## How to use this script?
 
@@ -22,6 +27,12 @@ If you wish to track all requests the following command would be used:
 
     python /path/to/piwik/misc/log-analytics/import_logs.py --url=http://mysite/piwik/ --idsite=1234 --recorders=4 --enable-http-errors --enable-http-redirects --enable-static --enable-bots access.log 
 
+### Format Specific Details
+
+* If you are importing Netscaler log files, make sure to specify the **--iis-time-taken-secs** option. Netscaler stores
+  the time-taken field in seconds while most other formats use milliseconds. Using this option will ensure that the
+  log importer interprets the field correctly.
+
 ## How to import your logs automatically every day?
 
 You must first make sure your logs are automatically rotated every day. The most
@@ -59,14 +70,116 @@ To improve performance,
    you can disable server access logging for these requests.
    Each Piwik webserver (Apache, Nginx, IIS) can also be tweaked a bit to handle more req/sec.
 
-## Setup Apache CustomLog that directly imports in Piwik
+## Advanced uses
+
+### Example Nginx Virtual Host Log Format
+
+This log format can be specified for nginx access logs to capture multiple virtual hosts:
+
+* log_format vhosts '$host $remote_addr - $remote_user [$time_local] "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent"';
+* access_log /PATH/TO/access.log vhosts;
+
+When executing import_logs.py specify the "common_complete" format.
+
+### How do I import Page Speed Metric from logs?
+
+In Piwik> Actions> Page URLs and Page Title reports, Piwik reports the Avg. generation time, as an indicator of your website speed.
+This metric works by default when using the Javascript tracker, but you can use it with log file as well.
+
+Apache can log the generation time in microseconds using %D in the LogFormat.
+This metric can be imported using a custom log format in this script.
+In the command line, add the --log-format-regex parameter that contains the group generation_time_micro.
+
+Here's an example:
+Apache LogFormat "%h %l %u %t \"%r\" %>s %b %D"
+--log-format-regex="(?P<ip>\S+) \S+ \S+ \[(?P<date>.*?) (?P<timezone>.*?)\] \"\S+ (?P<path>.*?) \S+\" (?P<status>\S+) (?P<length>\S+) (?P<generation_time_micro>\S+)"
+
+Note: the group <generation_time_milli> is also available if your server logs generation time in milliseconds rather than microseconds.
+
+### How do I setup Nginx to directly imports in Piwik via syslog?
+
+With the syslog patch from http://wiki.nginx.org/3rdPartyModules which is compiled in dotdeb's release, you can log to syslog and imports them live to Piwik.
+Path: Nginx -> syslog -> (syslog central server) -> this script -> piwik
+
+You can use any log format that this script can handle, like Apache Combined, and Json format which needs less processing.
+
+##### Setup Nginx logs
+
+```
+http {
+...
+log_format  piwik                   '{"ip": "$remote_addr",'
+                                    '"host": "$host",'
+                                    '"path": "$request_uri",'
+                                    '"status": "$status",'
+                                    '"referrer": "$http_referer",'
+                                    '"user_agent": "$http_user_agent",'
+                                    '"length": $bytes_sent,'
+                                    '"generation_time_milli": $request_time,'
+                                    '"date": "$time_iso8601"}';
+...
+	server {
+	...
+	access_log syslog:info piwik;
+	...
+	}
+}
+```
+
+##### Setup syslog-ng
+
+This is the config for the central server if any. If not, you can also use this config on the same server as Nginx.
+
+```
+options {
+    stats_freq(600); stats_level(1);
+    log_fifo_size(1280000);
+    log_msg_size(8192);
+};
+source s_nginx { udp(); };
+destination d_piwik {
+    program("/usr/local/piwik/piwik.sh" template("$MSG\n"));
+};
+log { source(s_nginx); filter(f_info); destination(d_piwik); };
+```
+
+##### piwik.sh
+
+Just needed to configure the best params for import_logs.py :
+```
+#!/bin/sh
+
+exec python /path/to/misc/log-analytics/import_logs.py \
+ --url=http://localhost/ --token-auth=<your_auth_token> \
+ --idsite=1 --recorders=4 --enable-http-errors --enable-http-redirects --enable-static --enable-bots \
+ --log-format-name=nginx_json -
+```
+
+##### Example of regex for syslog format (centralized logs)
+
+###### log format exemple
+
+```
+Aug 31 23:59:59 tt-srv-name www.tt.com: 1.1.1.1 - - [31/Aug/2014:23:59:59 +0200] "GET /index.php HTTP/1.0" 200 3838 "http://www.tt.com/index.php" "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Firefox/31.0" 365020 www.tt.com
+```
+
+###### Corresponding regex
+
+```
+--log-format-regex='.* ((?P<ip>\S+) \S+ \S+ \[(?P<date>.*?) (?P<timezone>.*?)\] "\S+ (?P<path>.*?) \S+" (?P<status>\S+) (?P<length>\S+) "(?P<referrer>.*?)" "(?P<user_agent>.*?)").*'
+```
+
+
+### Setup Apache CustomLog that directly imports in Piwik
 
 Since apache CustomLog directives can send log data to a script, it is possible to import hits into piwik server-side in real-time rather than processing a logfile each day.
 
 This approach has many advantages, including real-time data being available on your piwik site, using real logs files instead of relying on client-side Javacsript, and not having a surge of CPU/RAM usage during log processing.
 The disadvantage is that if Piwik is unavailable, logging data will be lost. Therefore we recommend to also log into a standard log file. Bear in mind also that apache processes will wait until a request is logged before processing a new request, so if piwik runs slow so does your site: it's therefore important to tune --recorders to the right level.
 
-In the most basic setup, you might have in your main config section:
+##### Basic setup
+
+You might have in your main config section:
 
 ```
 # Set up your log format as a normal extended format, with hostname at the start
@@ -89,7 +202,7 @@ Useful options here are:
 
 You can have as many CustomLog statements as you like. However, if you define any CustomLog directives within a <VirtualHost> block, all CustomLogs in the main config will be overridden. Therefore if you require custom logging for particular VirtualHosts, it is recommended to use mod_macro to make configuration more maintainable.
 
-## Advanced Log Analytics use case: Apache vhost, custom logs, automatic website creation
+##### Advanced setup: Apache vhost, custom logs, automatic website creation
 
 As a rather extreme example of what you can do, here is an apache config with:
 
@@ -100,7 +213,7 @@ As a rather extreme example of what you can do, here is an apache config with:
 
 NB use of mod_macro to ensure consistency and maintainability
 
-## Apache configuration source code:
+Apache configuration source code:
 
 ```
 # Set up macro with the options
@@ -166,102 +279,9 @@ Use piwiklog %v vhost_common main " "
 </VirtualHost>
 ```
 
-## Nginx Virtual Host Log Format
-
-This log format can be specified for nginx access logs to capture multiple virtual hosts:
-
-* log_format vhosts '$host $remote_addr - $remote_user [$time_local] "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent"';
-* access_log /PATH/TO/access.log vhosts;
-
-When executing import_logs.py specify the "common_complete" format.
-
-## Import Page Speed Metric from logs
-
-In Piwik> Actions> Page URLs and Page Title reports, Piwik reports the Avg. generation time, as an indicator of your website speed.
-This metric works by default when using the Javascript tracker, but you can use it with log file as well.
-
-Apache can log the generation time in microseconds using %D in the LogFormat.
-This metric can be imported using a custom log format in this script.
-In the command line, add the --log-format-regex parameter that contains the group generation_time_micro.
-
-Here's an example:
-Apache LogFormat "%h %l %u %t \"%r\" %>s %b %D"
---log-format-regex="(?P<ip>\S+) \S+ \S+ \[(?P<date>.*?) (?P<timezone>.*?)\] \"\S+ (?P<path>.*?) \S+\" (?P<status>\S+) (?P<length>\S+) (?P<generation_time_micro>\S+)"
-
-Note: the group <generation_time_milli> is also available if your server logs generation time in milliseconds rather than microseconds.
-
-## Setup Nginx to directly imports in Piwik via syslog
-
-With the syslog patch from http://wiki.nginx.org/3rdPartyModules which is compiled in dotdeb's release, you can log to syslog and imports them live to Piwik.
-Path: Nginx -> syslog -> (syslog central server) -> this script -> piwik
-
-You can use any log format that this script can handle, like Apache Combined, and Json format which needs less processing.
-
-### Setup Nginx logs
+### And that's all !
 
-```
-http {
-...
-log_format  piwik                   '{"ip": "$remote_addr",'
-                                    '"host": "$host",'
-                                    '"path": "$request_uri",'
-                                    '"status": "$status",'
-                                    '"referrer": "$http_referer",'
-                                    '"user_agent": "$http_user_agent",'
-                                    '"length": $bytes_sent,'
-                                    '"generation_time_milli": $request_time,'
-                                    '"date": "$time_iso8601"}';
-...
-	server {
-	...
-	access_log syslog:info piwik;
-	...
-	}
-}
-```
-
-# Setup syslog-ng
-
-This is the config for the central server if any. If not, you can also use this config on the same server as Nginx.
-
-```
-options {
-    stats_freq(600); stats_level(1);
-    log_fifo_size(1280000);
-    log_msg_size(8192);
-};
-source s_nginx { udp(); };
-destination d_piwik {
-    program("/usr/local/piwik/piwik.sh" template("$MSG\n"));
-};
-log { source(s_nginx); filter(f_info); destination(d_piwik); };
-```
-
-# piwik.sh
-
-Just needed to configure the best params for import_logs.py :
-```
-#!/bin/sh
-
-exec python /path/to/misc/log-analytics/import_logs.py \
- --url=http://localhost/ --token-auth=<your_auth_token> \
- --idsite=1 --recorders=4 --enable-http-errors --enable-http-redirects --enable-static --enable-bots \
- --log-format-name=nginx_json -
-```
-
-# regex example for syslog format (centralized logs)
-
-## log format exemple
-
-```
-Aug 31 23:59:59 tt-srv-name www.tt.com: 1.1.1.1 - - [31/Aug/2014:23:59:59 +0200] "GET /index.php HTTP/1.0" 200 3838 "http://www.tt.com/index.php" "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Firefox/31.0" 365020 www.tt.com
-```
-
-## Corresponding regex
-
-```
---log-format-regex='.* ((?P<ip>\S+) \S+ \S+ \[(?P<date>.*?) (?P<timezone>.*?)\] "\S+ (?P<path>.*?) \S+" (?P<status>\S+) (?P<length>\S+) "(?P<referrer>.*?)" "(?P<user_agent>.*?)").*'
-```
 
-And that's all !
+***This documentation is a community effort, feel free to suggest any change via Github Pull request.***
 
+ 
diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py
index 6d94b6d122..fda54ee34b 100755
--- a/misc/log-analytics/import_logs.py
+++ b/misc/log-analytics/import_logs.py
@@ -36,6 +36,8 @@ import urllib
 import urllib2
 import urlparse
 import subprocess
+import functools
+import traceback
 
 try:
     import json
@@ -54,7 +56,7 @@ except ImportError:
 ##
 
 STATIC_EXTENSIONS = set((
-    'gif jpg jpeg png bmp ico svg ttf eot woff class swf css js xml robots.txt'
+    'gif jpg jpeg png bmp ico svg svgz ttf otf eot woff class swf css js xml robots.txt'
 ).split())
 
 DOWNLOAD_EXTENSIONS = set((
@@ -161,6 +163,10 @@ class JsonFormat(BaseFormat):
     def get_all(self,):
         return self.json
 
+    def remove_ignored_groups(self, groups):
+        for group in groups:
+            del self.json[group]
+
 class RegexFormat(BaseFormat):
 
     def __init__(self, name, regex, date_format=None):
@@ -175,76 +181,182 @@ class RegexFormat(BaseFormat):
         return self.match(line)
 
     def match(self,line):
-        self.matched = self.regex.match(line)
-        return self.matched
+        if not self.regex:
+            return None
+        match_result = self.regex.match(line)
+        if match_result:
+            self.matched = match_result.groupdict()
+        else:
+            self.matched = None
+        return match_result
 
     def get(self, key):
         try:
-            return self.matched.group(key)
-        except IndexError:
+            return self.matched[key]
+        except KeyError:
             raise BaseFormatException()
 
     def get_all(self,):
-        return self.matched.groupdict()
+        return self.matched
 
-class IisFormat(RegexFormat):
+    def remove_ignored_groups(self, groups):
+        for group in groups:
+            del self.matched[group]
+
+class W3cExtendedFormat(RegexFormat):
+
+    FIELDS_LINE_PREFIX = '#Fields: '
+
+    fields = {
+        'date': '(?P<date>^\d+[-\d+]+',
+        'time': '[\d+:]+)[.\d]*?', # TODO should not assume date & time will be together not sure how to fix ATM.
+        'cs-uri-stem': '(?P<path>/\S*)',
+        'cs-uri-query': '(?P<query_string>\S*)',
+        'c-ip': '"?(?P<ip>[\d*.]*)"?',
+        'cs(User-Agent)': '(?P<user_agent>".*?"|\S+)',
+        'cs(Referer)': '(?P<referrer>\S+)',
+        'sc-status': '(?P<status>\d+)',
+        'sc-bytes': '(?P<length>\S+)',
+        'cs-host': '(?P<host>\S+)',
+        'cs-username': '(?P<userid>\S+)',
+        'time-taken': '(?P<generation_time_secs>[.\d]+)'
+    }
 
     def __init__(self):
-        super(IisFormat, self).__init__('iis', None, '%Y-%m-%d %H:%M:%S')
+        super(W3cExtendedFormat, self).__init__('w3c_extended', None, '%Y-%m-%d %H:%M:%S')
 
     def check_format(self, file):
-        line = file.readline()
-        if not line.startswith('#Software: Microsoft Internet Information Services '):
+        self.create_regex(file)
+
+        # if we couldn't create a regex, this file does not follow the W3C extended log file format
+        if not self.regex:
             file.seek(0)
             return
-        # Skip the next 2 lines.
-        for i in xrange(2):
-            file.readline()
-        # Parse the 4th line (regex)
+
+        first_line = file.readline()
+
+        file.seek(0)
+        return self.check_format_line(first_line)
+
+    def create_regex(self, file):
+        fields_line = None
+        if config.options.w3c_fields:
+            fields_line = config.options.w3c_fields
+
+        # collect all header lines up until the Fields: line
+        # if we're reading from stdin, we can't seek, so don't read any more than the Fields line
+        header_lines = []
+        while fields_line is None:
+            line = file.readline()
+
+            if not line.startswith('#'):
+                break
+
+            if line.startswith(W3cExtendedFormat.FIELDS_LINE_PREFIX):
+                fields_line = line
+            else:
+                header_lines.append(line)
+
+        if not fields_line:
+            return
+
+        # store the header lines for a later check for IIS
+        self.header_lines = header_lines
+
+        # Parse the 'Fields: ' line to create the regex to use
         full_regex = []
-        line = file.readline()
-        fields = {
-            'date': '(?P<date>^\d+[-\d+]+',
-            'time': '[\d+:]+)',
-            'cs-uri-stem': '(?P<path>/\S*)',
-            'cs-uri-query': '(?P<query_string>\S*)',
-            'c-ip': '(?P<ip>[\d*.]*)',
-            'cs(User-Agent)': '(?P<user_agent>\S+)',
-            'cs(Referer)': '(?P<referrer>\S+)',
-            'sc-status': '(?P<status>\d+)',
-            'sc-bytes': '(?P<length>\S+)',
-            'cs-host': '(?P<host>\S+)',
-        }
+
+        expected_fields = type(self).fields.copy() # turn custom field mapping into field => regex mapping
+
+        # if the --w3c-time-taken-millisecs option is used, make sure the time-taken field is interpreted as milliseconds
+        if config.options.w3c_time_taken_in_millisecs:
+            expected_fields['time-taken'] = '(?P<generation_time_milli>[\d.]+)'
+
+        for mapped_field_name, field_name in config.options.custom_w3c_fields.iteritems():
+            expected_fields[mapped_field_name] = expected_fields[field_name]
+            del expected_fields[field_name]
+
+        # add custom field regexes supplied through --w3c-field-regex option
+        for field_name, field_regex in config.options.w3c_field_regexes.iteritems():
+            expected_fields[field_name] = field_regex
+
         # Skip the 'Fields: ' prefix.
-        line = line[9:]
-        for field in line.split():
+        fields_line = fields_line[9:]
+        for field in fields_line.split():
             try:
-                regex = fields[field]
+                regex = expected_fields[field]
             except KeyError:
                 regex = '\S+'
             full_regex.append(regex)
-        self.regex = re.compile(' '.join(full_regex))
+        full_regex = '\s+'.join(full_regex)
+        self.regex = re.compile(full_regex)
+
+    def check_for_iis_option(self):
+        if not config.options.w3c_time_taken_in_millisecs and self._is_time_taken_milli() and self._is_iis():
+            logging.info("WARNING: IIS log file being parsed without --w3c-time-taken-milli option. IIS"
+                         " stores millisecond values in the time-taken field. If your logfile does this, the aforementioned"
+                         " option must be used in order to get accurate generation times.")
+
+    def _is_iis(self):
+        return len([line for line in self.header_lines if 'internet information services' in line.lower() or 'iis' in line.lower()]) > 0
+
+    def _is_time_taken_milli(self):
+        return 'generation_time_milli' not in self.regex.pattern
+
+class IisFormat(W3cExtendedFormat):
+
+    fields = W3cExtendedFormat.fields.copy()
+    fields.update({
+        'time-taken': '(?P<generation_time_milli>[.\d]+)',
+        'sc-win32-status': '(?P<__win32_status>\S+)' # this group is useless for log importing, but capturing it
+                                                     # will ensure we always select IIS for the format instead of
+                                                     # W3C logs when detecting the format. This way there will be
+                                                     # less accidental importing of IIS logs w/o --w3c-time-taken-milli.
+    })
+
+    def __init__(self):
+        super(IisFormat, self).__init__()
+
+        self.name = 'iis'
+
+class AmazonCloudFrontFormat(W3cExtendedFormat):
 
-        start_pos = file.tell()
-        nextline = file.readline()
-        file.seek(start_pos)
-        return self.check_format_line(nextline)
+    fields = W3cExtendedFormat.fields.copy()
+    fields.update({
+        'x-event': '(?P<event_action>\S+)',
+        'x-sname': '(?P<event_name>\S+)',
+        'cs-uri-stem': '(?:rtmp:/)?(?P<path>/\S*)',
+        'c-user-agent': '(?P<user_agent>".*?"|\S+)'
+    })
 
-_HOST_PREFIX = '(?P<host>[\w\-\.]*)(?::\d+)? '
+    def __init__(self):
+        super(AmazonCloudFrontFormat, self).__init__()
+
+        self.name = 'amazon_cloudfront'
+
+    def get(self, key):
+        if key == 'event_category' and 'event_category' not in self.matched:
+            return 'cloudfront_rtmp'
+        elif key == 'status' and 'status' not in self.matched:
+            return '200'
+        else:
+            return super(AmazonCloudFrontFormat, self).get(key)
+
+_HOST_PREFIX = '(?P<host>[\w\-\.]*)(?::\d+)?\s+'
 _COMMON_LOG_FORMAT = (
-    '(?P<ip>\S+) \S+ \S+ \[(?P<date>.*?) (?P<timezone>.*?)\] '
-    '"\S+ (?P<path>.*?) \S+" (?P<status>\S+) (?P<length>\S+)'
+    '(?P<ip>\S+)\s+\S+\s+\S+\s+\[(?P<date>.*?)\s+(?P<timezone>.*?)\]\s+'
+    '"\S+\s+(?P<path>.*?)\s+\S+"\s+(?P<status>\S+)\s+(?P<length>\S+)'
 )
 _NCSA_EXTENDED_LOG_FORMAT = (_COMMON_LOG_FORMAT +
-    ' "(?P<referrer>.*?)" "(?P<user_agent>.*?)"'
+    '\s+"(?P<referrer>.*?)"\s+"(?P<user_agent>.*?)"'
 )
 _S3_LOG_FORMAT = (
-    '\S+ (?P<host>\S+) \[(?P<date>.*?) (?P<timezone>.*?)\] (?P<ip>\S+) '
-    '\S+ \S+ \S+ \S+ "\S+ (?P<path>.*?) \S+" (?P<status>\S+) \S+ (?P<length>\S+) '
-    '\S+ \S+ \S+ "(?P<referrer>.*?)" "(?P<user_agent>.*?)"'
+    '\S+\s+(?P<host>\S+)\s+\[(?P<date>.*?)\s+(?P<timezone>.*?)\]\s+(?P<ip>\S+)\s+'
+    '\S+\s+\S+\s+\S+\s+\S+\s+"\S+\s+(?P<path>.*?)\s+\S+"\s+(?P<status>\S+)\s+\S+\s+(?P<length>\S+)\s+'
+    '\S+\s+\S+\s+\S+\s+"(?P<referrer>.*?)"\s+"(?P<user_agent>.*?)"'
 )
 _ICECAST2_LOG_FORMAT = ( _NCSA_EXTENDED_LOG_FORMAT +
-    ' (?P<session_time>\S+)'
+    '\s+(?P<session_time>\S+)'
 )
 
 FORMATS = {
@@ -252,6 +364,8 @@ FORMATS = {
     'common_vhost': RegexFormat('common_vhost', _HOST_PREFIX + _COMMON_LOG_FORMAT),
     'ncsa_extended': RegexFormat('ncsa_extended', _NCSA_EXTENDED_LOG_FORMAT),
     'common_complete': RegexFormat('common_complete', _HOST_PREFIX + _NCSA_EXTENDED_LOG_FORMAT),
+    'w3c_extended': W3cExtendedFormat(),
+    'amazon_cloudfront': AmazonCloudFrontFormat(),
     'iis': IisFormat(),
     's3': RegexFormat('s3', _S3_LOG_FORMAT),
     'icecast2': RegexFormat('icecast2', _ICECAST2_LOG_FORMAT),
@@ -286,13 +400,14 @@ class Configuration(object):
                    "              Found a bug? Please create a ticket in http://dev.piwik.org/ "
                    "              Please send your suggestions or successful user story to hello@piwik.org "
         )
+
         option_parser.add_option(
             '--debug', '-d', dest='debug', action='count', default=0,
             help="Enable debug output (specify multiple times for more verbose)",
         )
         option_parser.add_option(
             '--url', dest='piwik_url',
-            help="REQUIRED Piwik base URL, eg. http://example.com/piwik/ or http://analytics.example.net",
+            help="REQUIRED Your Piwik server URL, eg. http://example.com/piwik/ or http://analytics.example.net",
         )
         option_parser.add_option(
             '--dry-run', dest='dry_run',
@@ -421,10 +536,14 @@ class Configuration(object):
                   "When not specified, the log format will be autodetected by trying all supported log formats."
                   % ', '.join(sorted(FORMATS.iterkeys())))
         )
+        available_regex_groups = ['date', 'path', 'query_string', 'ip', 'user_agent', 'referrer', 'status',
+                                  'length', 'host', 'userid', 'generation_time_milli', 'event_action',
+                                  'event_name', 'timezone', 'session_time']
         option_parser.add_option(
             '--log-format-regex', dest='log_format_regex', default=None,
-            help="Access log regular expression. For an example of a supported Regex, see the source code of this file. "
-                 "Overrides --log-format-name"
+            help="Regular expression used to parse log entries. Regexes must contain named groups for different log fields. "
+                 "Recognized fields include: %s. For an example of a supported Regex, see the source code of this file. "
+                 "Overrides --log-format-name." % (', '.join(available_regex_groups))
         )
         option_parser.add_option(
             '--log-hostname', dest='log_hostname', default=None,
@@ -451,6 +570,11 @@ class Configuration(object):
             help="Replay piwik.php requests found in custom logs (only piwik.php requests expected). \nSee http://piwik.org/faq/how-to/faq_17033/"
         )
         option_parser.add_option(
+            '--replay-tracking-expected-tracker-file', dest='replay_tracking_expected_tracker_file', default='piwik.php',
+            help="The expected suffix for tracking request paths. Only logs whose paths end with this will be imported. Defaults "
+            "to 'piwik.php' so only requests to the piwik.php file will be imported."
+        )
+        option_parser.add_option(
             '--output', dest='output',
             help="Redirect output (stdout and stderr) to the specified file"
         )
@@ -485,8 +609,92 @@ class Configuration(object):
             '--download-extensions', dest='download_extensions', default=None,
             help="By default Piwik tracks as Downloads the most popular file extensions. If you set this parameter (format: pdf,doc,...) then files with an extension found in the list will be imported as Downloads, other file extensions downloads will be skipped."
         )
+        option_parser.add_option(
+            '--w3c-map-field', action='callback', callback=functools.partial(self._set_option_map, 'custom_w3c_fields'), type='string',
+            help="Map a custom log entry field in your W3C log to a default one. Use this option to load custom log "
+                 "files that use the W3C extended log format such as those from the Advanced Logging W3C module. Used "
+                 "as, eg, --w3c-map-field my-date=date. Recognized default fields include: %s\n\n"
+                 "Formats that extend the W3C extended log format (like the cloudfront RTMP log format) may define more "
+                 "fields that can be mapped."
+                     % (', '.join(W3cExtendedFormat.fields.keys()))
+        )
+        option_parser.add_option(
+            '--w3c-time-taken-millisecs', action='store_true', default=False, dest='w3c_time_taken_in_millisecs',
+            help="If set, interprets the time-taken W3C log field as a number of milliseconds. This must be set for importing"
+                 " IIS logs."
+        )
+        option_parser.add_option(
+            '--w3c-fields', dest='w3c_fields', default=None,
+            help="Specify the '#Fields:' line for a log file in the W3C Extended log file format. Use this option if "
+                 "your log file doesn't contain the '#Fields:' line which is required for parsing. This option must be used "
+                 "in conjuction with --log-format-name=w3c_extended.\n"
+                 "Example: --w3c-fields='#Fields: date time c-ip ...'"
+        )
+        option_parser.add_option(
+            '--w3c-field-regex', action='callback', callback=functools.partial(self._set_option_map, 'w3c_field_regexes'), type='string',
+            help="Specify a regex for a field in your W3C extended log file. You can use this option to parse fields the "
+                 "importer does not natively recognize and then use one of the --regex-group-to-XXX-cvar options to track "
+                 "the field in a custom variable. For example, specifying --w3c-field-regex=sc-win32-status=(?P<win32_status>\\S+) "
+                 "--regex-group-to-page-cvar=\"win32_status=Windows Status Code\" will track the sc-win32-status IIS field "
+                 "in the 'Windows Status Code' custom variable. Regexes must contain a named group."
+        )
+        option_parser.add_option(
+            '--title-category-delimiter', dest='title_category_delimiter', default='/',
+            help="If --enable-http-errors is used, errors are shown in the page titles report. If you have "
+            "changed General.action_title_category_delimiter in your Piwik configuration, you need to set this "
+            "option to the same value in order to get a pretty page titles report."
+        )
+        option_parser.add_option(
+            '--dump-log-regex', dest='dump_log_regex', action='store_true', default=False,
+            help="Prints out the regex string used to parse log lines and exists. Can be useful for using formats "
+                 "in newer versions of the script in older versions of the script. The output regex can be used with "
+                 "the --log-format-regex option."
+        )
+
+        option_parser.add_option(
+            '--ignore-groups', dest='regex_groups_to_ignore', default=None,
+            help="Comma separated list of regex groups to ignore when parsing log lines. Can be used to, for example, "
+                 "disable normal user id tracking. See documentation for --log-format-regex for list of available "
+                 "regex groups."
+        )
+
+        option_parser.add_option(
+            '--regex-group-to-visit-cvar', action='callback', callback=functools.partial(self._set_option_map, 'regex_group_to_visit_cvars_map'), type='string',
+            help="Track an attribute through a custom variable with visit scope instead of through Piwik's normal "
+                 "approach. For example, to track usernames as a custom variable instead of through the uid tracking "
+                 "parameter, supply --regex-group-to-visit-cvar=\"userid=User Name\". This will track usernames in a "
+                 "custom variable named 'User Name'. See documentation for --log-format-regex for list of available "
+                 "regex groups."
+        )
+        option_parser.add_option(
+            '--regex-group-to-page-cvar', action='callback', callback=functools.partial(self._set_option_map, 'regex_group_to_page_cvars_map'), type='string',
+            help="Track an attribute through a custom variable with page scope instead of through Piwik's normal "
+                 "approach. For example, to track usernames as a custom variable instead of through the uid tracking "
+                 "parameter, supply --regex-group-to-page-cvar=\"userid=User Name\". This will track usernames in a "
+                 "custom variable named 'User Name'. See documentation for --log-format-regex for list of available "
+                 "regex groups."
+        )
         return option_parser
 
+    def _set_option_map(self, option_attr_name, option, opt_str, value, parser):
+        """
+        Sets a key-value mapping in a dict that is built from command line options. Options that map
+        string keys to string values (like --w3c-map-field) can set the callback to a bound partial
+        of this method to handle the option.
+        """
+
+        parts = value.split('=')
+
+        if len(parts) != 2:
+            fatal_error("Invalid %s option: '%s'" % (opt_str, value))
+
+        key, value = parts
+
+        if not hasattr(parser.values, option_attr_name):
+            setattr(parser.values, option_attr_name, {})
+
+        getattr(parser.values, option_attr_name)[key] = value
+
     def _parse_args(self, option_parser):
         """
         Parse the command line args and create self.options and self.filenames.
@@ -537,6 +745,30 @@ class Configuration(object):
         else:
             self.format = None
 
+        if not hasattr(self.options, 'custom_w3c_fields'):
+            self.options.custom_w3c_fields = {}
+        elif self.format is not None:
+            # validate custom field mappings
+            for custom_name, default_name in self.options.custom_w3c_fields.iteritems():
+                if default_name not in type(format).fields:
+                    fatal_error("custom W3C field mapping error: don't know how to parse and use the '%' field" % default_name)
+                    return
+
+        if not hasattr(self.options, 'regex_group_to_visit_cvars_map'):
+            self.options.regex_group_to_visit_cvars_map = {}
+
+        if not hasattr(self.options, 'regex_group_to_page_cvars_map'):
+            self.options.regex_group_to_page_cvars_map = {}
+
+        if not hasattr(self.options, 'w3c_field_regexes'):
+            self.options.w3c_field_regexes = {}
+        else:
+            # make sure each custom w3c field regex has a named group
+            for field_name, field_regex in self.options.w3c_field_regexes.iteritems():
+                if '(?P<' not in field_regex:
+                    fatal_error("cannot find named group in custom w3c field regex '%s' for field '%s'" % (field_regex, field_name))
+                    return
+
         if not self.options.piwik_url:
             fatal_error('no URL given for Piwik')
 
@@ -559,6 +791,9 @@ class Configuration(object):
         else:
             self.options.download_extensions = DOWNLOAD_EXTENSIONS
 
+        if self.options.regex_groups_to_ignore:
+            self.options.regex_groups_to_ignore = set(self.options.regex_groups_to_ignore.split(','))
+
     def __init__(self):
         self._parse_args(self._create_parser())
 
@@ -1116,7 +1351,7 @@ class DynamicResolver(object):
     def check_format(self, format):
         if config.options.replay_tracking:
             pass
-        elif 'host' not in format.regex.groupindex and not config.options.log_hostname:
+        elif format.regex is not None and 'host' not in format.regex.groupindex and not config.options.log_hostname:
             fatal_error(
                 "the selected log format doesn't include the hostname: you must "
                 "specify the Piwik site ID with the --idsite argument"
@@ -1241,6 +1476,15 @@ class Recorder(object):
         # only prepend main url if it's a path
         url = (main_url if path.startswith('/') else '') + path[:1024]
 
+        # handle custom variables before generating args dict
+        if config.options.enable_bots:
+            if hit.is_robot:
+                hit.add_visit_custom_var("Bot", hit.user_agent)
+            else:
+                hit.add_visit_custom_var("Not-Bot", hit.user_agent)
+
+        hit.add_page_custom_var("HTTP-code", hit.status)
+
         args = {
             'rec': '1',
             'apiv': '1',
@@ -1250,8 +1494,9 @@ class Recorder(object):
             'cdt': self.date_to_piwik(hit.date),
             'idsite': site_id,
             'dp': '0' if config.options.reverse_dns else '1',
-            'ua': hit.user_agent.encode('utf8'),
+            'ua': hit.user_agent.encode('utf8')
         }
+
         if config.options.replay_tracking:
             # prevent request to be force recorded when option replay-tracking
             args['rec'] = '0'
@@ -1263,24 +1508,38 @@ class Recorder(object):
 
         if config.options.enable_bots:
             args['bots'] = '1'
-            if hit.is_robot:
-                args['_cvar'] = '{"1":["Bot","%s"]}' % hit.user_agent
-            else:
-                args['_cvar'] = '{"1":["Not-Bot","%s"]}' % hit.user_agent
-
-        # do not overwrite custom variables if it's already set (eg. when replaying ecommerce logs)
-        if 'cvar' not in args:
-            args['cvar'] = '{"1":["HTTP-code","%s"]}' % hit.status
 
         if hit.is_error or hit.is_redirect:
-			args['action_name'] = '%s/URL = %s%s' % (
+			args['action_name'] = '%s%sURL = %s%s' % (
 				hit.status,
+				config.options.title_category_delimiter,
 				urllib.quote(args['url'], ''),
-				("/From = %s" % urllib.quote(args['urlref'], '') if args['urlref'] != ''  else '')
+				("%sFrom = %s" % ( 
+					config.options.title_category_delimiter,
+					urllib.quote(args['urlref'], '')
+				) if args['urlref'] != ''  else '')
 			)
 
         if hit.generation_time_milli > 0:
-            args['gt_ms'] = hit.generation_time_milli
+            args['gt_ms'] = int(hit.generation_time_milli)
+
+        if hit.event_category and hit.event_action:
+            args['e_c'] = hit.event_category
+            args['e_a'] = hit.event_action
+
+            if hit.event_name:
+                args['e_n'] = hit.event_name
+
+        if hit.length:
+            args['bw_bytes'] = hit.length
+
+        # convert custom variable args to JSON
+        if 'cvar' in args and not isinstance(args['cvar'], basestring):
+            args['cvar'] = json.dumps(args['cvar'])
+
+        if '_cvar' in args and not isinstance(args['_cvar'], basestring):
+            args['_cvar'] = json.dumps(args['_cvar'])
+
         return args
 
     def _record_hits(self, hits):
@@ -1292,13 +1551,20 @@ class Recorder(object):
                 'token_auth': config.options.piwik_token_auth,
                 'requests': [self._get_hit_args(hit) for hit in hits]
             }
-            piwik.call(
+            result = piwik.call(
                 '/piwik.php', args={},
                 expected_content=None,
                 headers={'Content-type': 'application/json'},
                 data=data,
                 on_failure=self._on_tracking_failure
             )
+
+            # make sure the request succeeded and returned valid json
+            try:
+                result = json.loads(result)
+            except ValueError, e:
+                fatal_error("Incorrect response from tracking API: '%s'\nIs the BulkTracking plugin disabled?" % result)
+
         stats.count_lines_recorded.advance(len(hits))
 
     def _on_tracking_failure(self, response, data):
@@ -1319,26 +1585,6 @@ class Recorder(object):
 
         return response['message']
 
-    @staticmethod
-    def invalidate_reports():
-        if config.options.dry_run or not stats.dates_recorded:
-            return
-
-        if config.options.invalidate_dates is not None:
-            dates = [date for date in config.options.invalidate_dates.split(',') if date]
-        else:
-            dates = [date.strftime('%Y-%m-%d') for date in stats.dates_recorded]
-        if dates:
-            print '\nPurging Piwik archives for dates: ' + ' '.join(dates)
-            result = piwik.call_api(
-                'CoreAdminHome.invalidateArchivedReports',
-                dates=','.join(dates),
-                idSites=','.join(str(site_id) for site_id in stats.piwik_sites),
-            )
-            print('\nTo re-process these reports with your newly imported data, execute the following command: \n'
-                  '$ /path/to/piwik/console core:archive --url=http://example/piwik --force-all-websites --force-all-periods=315576000 --force-date-last-n=1000'
-                  '\nReference: http://piwik.org/docs/setup-auto-archiving/ ')
-
 class Hit(object):
     """
     It's a simple container.
@@ -1362,6 +1608,29 @@ class Hit(object):
 
         return abs(hash(visitor_id))
 
+    def add_page_custom_var(self, key, value):
+        """
+        Adds a page custom variable to this Hit.
+        """
+        self._add_custom_var(key, value, 'cvar')
+
+    def add_visit_custom_var(self, key, value):
+        """
+        Adds a visit custom variable to this Hit.
+        """
+        self._add_custom_var(key, value, '_cvar')
+
+    def _add_custom_var(self, key, value, api_arg_name):
+        if api_arg_name not in self.args:
+            self.args[api_arg_name] = {}
+
+        if isinstance(self.args[api_arg_name], basestring):
+            logging.debug("Ignoring custom %s variable addition [ %s = %s ], custom var already set to string." % (api_arg_name, key, value))
+            return
+
+        index = len(self.args[api_arg_name]) + 1
+        self.args[api_arg_name][index] = [key, value]
+
 class Parser(object):
     """
     The Parser parses the lines in a specified file and inserts them into
@@ -1469,7 +1738,8 @@ class Parser(object):
                     match = candidate_format.check_format_line(lineOrFile)
                 else:
                     match = candidate_format.check_format(lineOrFile)
-            except:
+            except Exception, e:
+                logging.debug('Error in format checking: %s', traceback.format_exc())
                 pass
 
             if match:
@@ -1488,6 +1758,11 @@ class Parser(object):
             else:
                 logging.debug('Format %s does not match', name)
 
+        # if the format is W3cExtendedFormat, check if the logs are from IIS and if so, issue a warning if the
+        # --w3c-time-taken-milli option isn't set
+        if isinstance(format, W3cExtendedFormat):
+            format.check_for_iis_option()
+
         return format
 
     @staticmethod
@@ -1499,7 +1774,7 @@ class Parser(object):
 
         format = False
 
-        # check the format using the file (for formats like the IIS one)
+        # check the format using the file (for formats like the W3cExtendedFormat one)
         format = Parser.check_format(file)
 
         # check the format using the first N lines (to avoid irregular ones)
@@ -1507,6 +1782,9 @@ class Parser(object):
         limit = 100000
         while not format and lineno < limit:
             line = file.readline()
+            if not line: # if at eof, don't keep looping
+                break
+
             lineno = lineno + 1
 
             logging.debug("Detecting format against line %i" % lineno)
@@ -1539,7 +1817,7 @@ class Parser(object):
             file = sys.stdin
         else:
             if not os.path.exists(filename):
-                print >> sys.stderr, 'File %s does not exist' % filename
+                print >> sys.stderr, "\n=====> Warning: File %s does not exist <=====" % filename
                 return
             else:
                 if filename.endswith('.bz2'):
@@ -1556,6 +1834,15 @@ class Parser(object):
         if config.format:
             # The format was explicitely specified.
             format = config.format
+
+            if isinstance(format, W3cExtendedFormat):
+                format.create_regex(file)
+
+                if format.regex is None:
+                    return fatal_error(
+                        "File is not in the correct format, is there a '#Fields:' line? "
+                        "If not, use the --w3c-fields option."
+                    )
         else:
             # If the file is empty, don't bother.
             data = file.read(100)
@@ -1575,6 +1862,15 @@ class Parser(object):
         # Make sure the format is compatible with the resolver.
         resolver.check_format(format)
 
+        if config.options.dump_log_regex:
+            logging.info("Using format '%s'." % format.name)
+            if format.regex:
+                logging.info("Regex being used: %s" % format.regex.pattern)
+            else:
+                logging.info("Format %s does not use a regex to parse log lines." % format.name)
+            logging.info("--dump-log-regex option used, aborting log import.")
+            os._exit(0)
+
         hits = []
         for lineno, line in enumerate(file):
             try:
@@ -1604,13 +1900,22 @@ class Parser(object):
                 args={},
             )
 
+            if config.options.regex_group_to_page_cvars_map:
+                self._add_custom_vars_from_regex_groups(hit, format, config.options.regex_group_to_page_cvars_map, True)
+
+            if config.options.regex_group_to_visit_cvars_map:
+                self._add_custom_vars_from_regex_groups(hit, format, config.options.regex_group_to_visit_cvars_map, False)
+
+            if config.options.regex_groups_to_ignore:
+                format.remove_ignored_groups(config.options.regex_groups_to_ignore)
+
             try:
                 hit.query_string = format.get('query_string')
                 hit.path = hit.full_path
             except BaseFormatException:
                 hit.path, _, hit.query_string = hit.full_path.partition(config.options.query_string_delimiter)
 
-            # IIS detaults to - when there is no query string, but we want empty string
+            # W3cExtendedFormat detaults to - when there is no query string, but we want empty string
             if hit.query_string == '-':
                 hit.query_string = ''
 
@@ -1618,6 +1923,9 @@ class Parser(object):
 
             try:
                 hit.referrer = format.get('referrer')
+
+                if hit.referrer.startswith('"'):
+                    hit.referrer = hit.referrer[1:-1]
             except BaseFormatException:
                 hit.referrer = ''
             if hit.referrer == '-':
@@ -1625,6 +1933,11 @@ class Parser(object):
 
             try:
                 hit.user_agent = format.get('user_agent')
+
+                # in case a format parser included enclosing quotes, remove them so they are not
+                # sent to Piwik
+                if hit.user_agent.startswith('"'):
+                    hit.user_agent = hit.user_agent[1:-1]
             except BaseFormatException:
                 hit.user_agent = ''
 
@@ -1632,26 +1945,55 @@ class Parser(object):
             try:
                 hit.length = int(format.get('length'))
             except (ValueError, BaseFormatException):
-                # Some lines or formats don't have a length (e.g. 304 redirects, IIS logs)
+                # Some lines or formats don't have a length (e.g. 304 redirects, W3C logs)
                 hit.length = 0
 
             try:
-                hit.generation_time_milli = int(format.get('generation_time_milli'))
+                hit.generation_time_milli = float(format.get('generation_time_milli'))
             except BaseFormatException:
                 try:
-                    hit.generation_time_milli = int(format.get('generation_time_micro')) / 1000
+                    hit.generation_time_milli = float(format.get('generation_time_micro')) / 1000
                 except BaseFormatException:
-                    hit.generation_time_milli = 0
+                    try:
+                        hit.generation_time_milli = float(format.get('generation_time_secs')) * 1000
+                    except BaseFormatException:
+                        hit.generation_time_milli = 0
 
             if config.options.log_hostname:
                 hit.host = config.options.log_hostname
             else:
                 try:
                     hit.host = format.get('host').lower().strip('.')
+
+                    if hit.host.startswith('"'):
+                        hit.host = hit.host[1:-1]
                 except BaseFormatException:
                     # Some formats have no host.
                     pass
 
+            # Add userid
+            try:
+                hit.userid = None
+
+                userid = format.get('userid')
+                if userid != '-':
+                    hit.args['uid'] = hit.userid = userid
+            except:
+                pass
+
+            # add event info
+            try:
+                hit.event_category = hit.event_action = hit.event_name = None
+
+                hit.event_category = format.get('event_category')
+                hit.event_action = format.get('event_action')
+
+                hit.event_name = format.get('event_name')
+                if hit.event_name == '-':
+                    hit.event_name = None
+            except:
+                pass
+
             # Check if the hit must be excluded.
             if not all((method(hit) for method in self.check_methods)):
                 continue
@@ -1680,7 +2022,7 @@ class Parser(object):
 
             if config.options.replay_tracking:
                 # we need a query string and we only consider requests with piwik.php
-                if not hit.query_string or not hit.path.lower().endswith('piwik.php'):
+                if not hit.query_string or not hit.path.lower().endswith(config.options.replay_tracking_expected_tracker_file):
                     invalid_line(line, 'no query string, or ' + hit.path.lower() + ' does not end with piwik.php')
                     continue
 
@@ -1705,6 +2047,20 @@ class Parser(object):
         if len(hits) > 0:
             Recorder.add_hits(hits)
 
+    def _add_custom_vars_from_regex_groups(self, hit, format, groups, is_page_var):
+        for group_name, custom_var_name in groups.iteritems():
+            if group_name in format.get_all():
+                value = format.get(group_name)
+
+                # don't track the '-' empty placeholder value
+                if value == '-':
+                    continue
+
+                if is_page_var:
+                    hit.add_page_custom_var(custom_var_name, value)
+                else:
+                    hit.add_visit_custom_var(custom_var_name, value)
+
 def main():
     """
     Start the importing process.
@@ -1729,10 +2085,6 @@ def main():
     if config.options.show_progress:
         stats.stop_monitor()
 
-    try:
-        Recorder.invalidate_reports()
-    except Piwik.Error, e:
-        pass
     stats.print_summary()
 
 def fatal_error(error, filename=None, lineno=None):
diff --git a/misc/log-analytics/tests/logs/amazon_cloudfront_rtmp.log b/misc/log-analytics/tests/logs/amazon_cloudfront_rtmp.log
new file mode 100644
index 0000000000..7b226473d0
--- /dev/null
+++ b/misc/log-analytics/tests/logs/amazon_cloudfront_rtmp.log
@@ -0,0 +1,4 @@
+#Version: 1.0
+#Fields: date time x-edge-location c-ip x-event sc-bytes x-cf-status x-cf-client-id cs-uri-stem cs-uri-query c-referrer x-page-url​  c-user-agent x-sname x-sname-query x-file-ext x-sid
+2010-03-12   23:51:20   SEA4   192.0.2.147   connect   2014   OK   bfd8a98bee0840d9b871b7f6ade9908f   rtmp://shqshne4jdp4b6.cloudfront.net/cfx/st​  key=value   http://player.longtailvideo.com/player.swf   http://www.longtailvideo.com/support/jw-player-setup-wizard?example=204   LNX%2010,0,32,18   -   -   -   -
+2010-03-12   23:51:21   SEA4   192.0.2.222   play   3914   OK   bfd8a98bee0840d9b871b7f6ade9908f   rtmp://shqshne4jdp4b6.cloudfront.net/cfx/st​  key=value   http://player.longtailvideo.com/player.swf   http://www.longtailvideo.com/support/jw-player-setup-wizard?example=204   LNX%2010,0,32,18   myvideo   p=2&q=4   flv   1
diff --git a/misc/log-analytics/tests/logs/amazon_cloudfront_web.log b/misc/log-analytics/tests/logs/amazon_cloudfront_web.log
new file mode 100644
index 0000000000..30db4a152a
--- /dev/null
+++ b/misc/log-analytics/tests/logs/amazon_cloudfront_web.log
@@ -0,0 +1,3 @@
+#Version: 1.0
+#Fields: date time x-edge-location sc-bytes c-ip cs-method cs(Host) cs-uri-stem sc-status cs(Referer) cs(User-Agent) cs-uri-query cs(Cookie) x-edge-result-type x-edge-request-id x-host-header cs-protocol cs-bytes time-taken
+2014-05-23 01:13:11 FRA2 182 192.0.2.10 GET d111111abcdef8.cloudfront.net /view/my/file.html 200 www.displaymyfiles.com Mozilla/4.0%20(compatible;%20MSIE%205.0b1;%20Mac_PowerPC) - zip=98101 RefreshHit MRVMF7KydIvxMWfJIglgwHQwZsbG2IhRJ07sn9AkKUFSHS9EXAMPLE== d111111abcdef8.cloudfront.net http - 0.001
diff --git a/misc/log-analytics/tests/logs/iis.log b/misc/log-analytics/tests/logs/iis.log
index 0ec7bf504f..f25cc5fad6 100644
--- a/misc/log-analytics/tests/logs/iis.log
+++ b/misc/log-analytics/tests/logs/iis.log
@@ -2,4 +2,4 @@
 #Version: 1.0
 #Date: 2012-04-01 00:00:13
 #Fields: date time s-sitename s-computername s-ip cs-method cs-uri-stem cs-uri-query s-port cs-username c-ip cs-version cs(User-Agent) cs(Cookie) cs(Referer) cs-host sc-status sc-substatus sc-win32-status sc-bytes cs-bytes time-taken
-2012-04-01 00:00:13 W3SVC834221556 PXQD1 1.2.3.4 GET /foo/bar topCat1=divinity&submit=Search 80 - 5.6.7.8 HTTP/1.1 Mozilla/5.0+(X11;+U;+Linux+i686;+en-US;+rv:1.9.2.7)+Gecko/20100722+Firefox/3.6.7 - - example.com 200 0 0 27028 214 1687
+2012-04-01 00:00:13 W3SVC834221556 PXQD1 1.2.3.4 GET /foo/bar topCat1=divinity&submit=Search 80 theuser 5.6.7.8 HTTP/1.1 Mozilla/5.0+(X11;+U;+Linux+i686;+en-US;+rv:1.9.2.7)+Gecko/20100722+Firefox/3.6.7 - - example.com 200 654 456 27028 214 1687
diff --git a/misc/log-analytics/tests/logs/iis_custom.log b/misc/log-analytics/tests/logs/iis_custom.log
new file mode 100644
index 0000000000..73797b64dd
--- /dev/null
+++ b/misc/log-analytics/tests/logs/iis_custom.log
@@ -0,0 +1,7 @@
+#Software: IIS Advanced Logging Module
+#Version: 1.0
+#Start-Date: 2014-11-18 00:00:00.128
+#Fields:  date-local time-local s-ip cs-method cs-uri-stem cs-uri-query s-port cs-username c-ip cs(User-Agent) cs(Referer) cs(Host) sc-status sc-substatus sc-win32-status TimeTakenMS
+2012-08-15 17:00:00.363 10.10.28.140 GET /Products/theProduct - 80 - "70.95.0.0" "Mozilla/5.0 (Linux; Android 4.4.4; SM-G900V Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.59 Mobile Safari/537.36" "http://example.com/Search/SearchResults.pg?informationRecipient.languageCode.c=en" "xzy.example.com" 200 0 0 109
+2012-08-15 17:00:00.660 10.10.28.140 GET /Topic/hw43061 - 80 - "70.95.32.0" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2227.1 Safari/537.36" - "example.hello.com" 301 0 0 0
+2012-08-15 17:00:00.675 10.10.28.140 GET /hello/world/6,681965 - 80 - "173.5.0.0" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124 Safari/537.36" - "hello.example.com" 404 0 0 359
diff --git a/misc/log-analytics/tests/logs/netscaler.log b/misc/log-analytics/tests/logs/netscaler.log
new file mode 100644
index 0000000000..380c09d2c4
--- /dev/null
+++ b/misc/log-analytics/tests/logs/netscaler.log
@@ -0,0 +1,5 @@
+#Version: 1.0
+#Software: Netscaler Web Logging(NSWL)
+#Date: 2014-02-18 11:55:13
+#Fields: date time c-ip cs-username sc-servicename s-ip s-port cs-method cs-uri-stem cs-uri-query sc-status cs-bytes sc-bytes time-taken cs-version cs(User-Agent) cs(Cookie) cs(Referer)
+2012-08-16 11:55:13 172.20.1.0 - HTTP 192.168.6.254 8080 GET /Citrix/XenApp/Wan/auth/login.jsp - 302 247 355 1 HTTP/1.1 Mozilla/4.0+(compatible;+MSIE+7.0;+Windows+NT+5.1;+Trident/4.0;+.NET+CLR+1.1.4322;+.NET+CLR+2.0.50727;+.NET+CLR+3.0.04506.648;+.NET+CLR+3.5.21022) - -
diff --git a/misc/log-analytics/tests/tests.py b/misc/log-analytics/tests/tests.py
index 37af5eee8f..b790629717 100644
--- a/misc/log-analytics/tests/tests.py
+++ b/misc/log-analytics/tests/tests.py
@@ -1,6 +1,8 @@
 # vim: et sw=4 ts=4:
 import functools
 import os
+import datetime
+import re
 
 import import_logs
 
@@ -16,26 +18,70 @@ def add_junk_to_file(path):
 
     return 'tmp.log'
 
+def add_multiple_spaces_to_file(path):
+    file = open(path)
+    contents = file.read()
+    file.close()
+
+    # replace spaces that aren't between " quotes
+    contents = contents.split('"')
+    for i in xrange(0, len(contents), 2):
+        contents[i] = re.sub(' ', "  ", contents[i])
+    contents = '"'.join(contents)
+    import_logs.logging.debug(contents)
+
+    assert "  " in contents # sanity check
+
+    file = open('tmp.log', 'w')
+    file.write(contents)
+    file.close()
+
+    return 'tmp.log'
+
 def tearDownModule():
     if os.path.exists('tmp.log'):
         os.remove('tmp.log')
 
 def test_format_detection():
-    def _test(format_name):
-        file = open('logs/%s.log' % format_name)
+    def _test(format_name, log_file = None):
+        if log_file is None:
+            log_file = 'logs/%s.log' % format_name
+
+        file = open(log_file)
+        import_logs.config = Config()
+        format = import_logs.Parser.detect_format(file)
+        assert(format is not None)
+        assert(format.name == format_name)
+
+    def _test_junk(format_name, log_file = None):
+        if log_file is None:
+            log_file = 'logs/%s.log' % format_name
+        
+        tmp_path = add_junk_to_file(log_file)
+
+        file = open(tmp_path)
+        import_logs.config = Config()
         format = import_logs.Parser.detect_format(file)
         assert(format is not None)
         assert(format.name == format_name)
 
-    def _test_junk(format_name):
-        tmp_path = add_junk_to_file('logs/%s.log' % format_name)
+    def _test_multiple_spaces(format_name, log_file = None):
+        if log_file is None:
+            log_file = 'logs/%s.log' % format_name
+
+        tmp_path = add_multiple_spaces_to_file(log_file) # TODO
 
         file = open(tmp_path)
+        import_logs.config = Config()
         format = import_logs.Parser.detect_format(file)
         assert(format is not None)
         assert(format.name == format_name)
 
     for format_name in import_logs.FORMATS.iterkeys():
+        # w3c extended tested by iis and netscaler log files; amazon cloudfront tested later
+        if format_name == 'w3c_extended' or format_name == 'amazon_cloudfront':
+            continue
+
         f = functools.partial(_test, format_name)
         f.description = 'Testing autodetection of format ' + format_name
         yield f
@@ -44,6 +90,35 @@ def test_format_detection():
         f.description = 'Testing autodetection of format ' + format_name + ' w/ garbage at end of line'
         yield f
 
+        f = functools.partial(_test_multiple_spaces, format_name)
+        f.description = 'Testing autodetection of format ' + format_name + ' when multiple spaces separate fields'
+        yield f
+
+    # add tests for amazon cloudfront (normal web + rtmp)
+    f = functools.partial(_test, 'w3c_extended', 'logs/amazon_cloudfront_web.log')
+    f.description = 'Testing autodetection of amazon cloudfront (web) logs.'
+    yield f
+
+    f = functools.partial(_test_junk, 'w3c_extended', 'logs/amazon_cloudfront_web.log')
+    f.description = 'Testing autodetection of amazon cloudfront (web) logs w/ garbage at end of line'
+    yield f
+
+    f = functools.partial(_test_multiple_spaces, 'w3c_extended', 'logs/amazon_cloudfront_web.log')
+    f.description = 'Testing autodetection of format amazon cloudfront (web) logs when multiple spaces separate fields'
+    yield f
+
+    f = functools.partial(_test, 'amazon_cloudfront', 'logs/amazon_cloudfront_rtmp.log')
+    f.description = 'Testing autodetection of amazon cloudfront (rtmp) logs.'
+    yield f
+
+    f = functools.partial(_test_junk, 'amazon_cloudfront', 'logs/amazon_cloudfront_rtmp.log')
+    f.description = 'Testing autodetection of amazon cloudfront (rtmp) logs w/ garbage at end of line.'
+    yield f
+
+    f = functools.partial(_test_multiple_spaces, 'amazon_cloudfront', 'logs/amazon_cloudfront_rtmp.log')
+    f.description = 'Testing autodetection of format amazon cloudfront (rtmp) logs when multiple spaces separate fields'
+    yield f
+
 class Options(object):
     """Mock config options necessary to run checkers from Parser class."""
     debug = False
@@ -64,6 +139,14 @@ class Options(object):
     included_paths = []
     enable_http_errors = False
     download_extensions = 'doc,pdf'
+    custom_w3c_fields = {}
+    dump_log_regex = False
+    w3c_time_taken_in_millisecs = False
+    w3c_fields = None
+    w3c_field_regexes = {}
+    regex_group_to_visit_cvars_map = {}
+    regex_group_to_page_cvars_map = {}
+    regex_groups_to_ignore = None
 
 class Config(object):
     """Mock configuration."""
@@ -183,6 +266,8 @@ def test_replay_tracking_arguments():
 def parse_log_file_line(format_name, file_):
     format = import_logs.FORMATS[format_name]
 
+    import_logs.config.options.custom_w3c_fields = {}
+
     file = open(file_)
     match = format.check_format(file)
     file.close()
@@ -226,7 +311,9 @@ def check_iis_groups(groups):
     assert groups['host'] == 'example.com'
 
     expected_hit_properties = ['date', 'path', 'query_string', 'ip', 'referrer', 'user_agent',
-    						   'status', 'length', 'host']
+                               'status', 'length', 'host', 'userid', 'generation_time_milli',
+                               '__win32_status']
+
     for property_name in groups.keys():
         assert property_name in expected_hit_properties
 
@@ -272,15 +359,335 @@ def test_format_parsing():
         _test(format_name, tmp_path)
 
     for format_name in import_logs.FORMATS.iterkeys():
+        # w3c extended tested by IIS and netscaler logs; amazon cloudfront tested individually
+        if format_name == 'w3c_extended' or format_name == 'amazon_cloudfront':
+            continue
+
         f = functools.partial(_test, format_name, 'logs/' + format_name + '.log')
         f.description = 'Testing parsing of format "%s"' % format_name
         yield f
 
         f = functools.partial(_test_with_junk, format_name, 'logs/' + format_name + '.log')
-        f.description = 'Testing parsin of format "%s" with junk appended to path' % format_name
+        f.description = 'Testing parsing of format "%s" with junk appended to path' % format_name
         yield f
 
     f = functools.partial(_test, 'common', 'logs/ncsa_extended.log')
     f.description = 'Testing parsing of format "common" with ncsa_extended log'
     yield f
 
+def test_iis_custom_format():
+    """test IIS custom format name parsing."""
+
+    file_ = 'logs/iis_custom.log'
+
+    # have to override previous globals override for this test
+    import_logs.config.options.custom_w3c_fields = {
+        'date-local': 'date',
+        'time-local': 'time',
+        'cs(Host)': 'cs-host',
+        'TimeTakenMS': 'time-taken'
+    }
+    Recorder.recorders = []
+    import_logs.parser = import_logs.Parser()
+    import_logs.config.format = None
+    import_logs.config.options.enable_http_redirects = True
+    import_logs.config.options.enable_http_errors = True
+    import_logs.config.options.replay_tracking = False
+    # import_logs.config.options.w3c_time_taken_in_millisecs = True test that even w/o this, we get the right values
+    import_logs.parser.parse(file_)
+
+    hits = [hit.__dict__ for hit in Recorder.recorders]
+
+    assert hits[0]['status'] == '200'
+    assert hits[0]['is_error'] == False
+    assert hits[0]['extension'] == u'/products/theproduct'
+    assert hits[0]['is_download'] == False
+    assert hits[0]['referrer'] == u'http://example.com/Search/SearchResults.pg?informationRecipient.languageCode.c=en'
+    assert hits[0]['args'] == {}
+    assert hits[0]['generation_time_milli'] == 109
+    assert hits[0]['host'] == 'foo'
+    assert hits[0]['filename'] == 'logs/iis_custom.log'
+    assert hits[0]['is_redirect'] == False
+    assert hits[0]['date'] == datetime.datetime(2012, 8, 15, 17, 0)
+    assert hits[0]['lineno'] == 4
+    assert hits[0]['ip'] == u'70.95.0.0'
+    assert hits[0]['query_string'] == ''
+    assert hits[0]['path'] == u'/Products/theProduct'
+    assert hits[0]['is_robot'] == False
+    assert hits[0]['full_path'] == u'/Products/theProduct'
+    assert hits[0]['user_agent'] == u'Mozilla/5.0 (Linux; Android 4.4.4; SM-G900V Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.59 Mobile Safari/537.36'
+
+    assert hits[1]['status'] == u'301'
+    assert hits[1]['is_error'] == False
+    assert hits[1]['extension'] == u'/topic/hw43061'
+    assert hits[1]['is_download'] == False
+    assert hits[1]['referrer'] == ''
+    assert hits[1]['args'] == {}
+    assert hits[1]['generation_time_milli'] == 0
+    assert hits[1]['host'] == 'foo'
+    assert hits[1]['filename'] == 'logs/iis_custom.log'
+    assert hits[1]['is_redirect'] == True
+    assert hits[1]['date'] == datetime.datetime(2012, 8, 15, 17, 0)
+    assert hits[1]['lineno'] == 5
+    assert hits[1]['ip'] == '70.95.32.0'
+    assert hits[1]['query_string'] == ''
+    assert hits[1]['path'] == u'/Topic/hw43061'
+    assert hits[1]['is_robot'] == False
+    assert hits[1]['full_path'] == u'/Topic/hw43061'
+    assert hits[1]['user_agent'] == u'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2227.1 Safari/537.36'
+
+    assert hits[2]['status'] == u'404'
+    assert hits[2]['is_error'] == True
+    assert hits[2]['extension'] == u'/hello/world/6,681965'
+    assert hits[2]['is_download'] == False
+    assert hits[2]['referrer'] == ''
+    assert hits[2]['args'] == {}
+    assert hits[2]['generation_time_milli'] == 359
+    assert hits[2]['host'] == 'foo'
+    assert hits[2]['filename'] == 'logs/iis_custom.log'
+    assert hits[2]['is_redirect'] == False
+    assert hits[2]['date'] == datetime.datetime(2012, 8, 15, 17, 0)
+    assert hits[2]['lineno'] == 6
+    assert hits[2]['ip'] == u'173.5.0.0'
+    assert hits[2]['query_string'] == ''
+    assert hits[2]['path'] == u'/hello/world/6,681965'
+    assert hits[2]['is_robot'] == False
+    assert hits[2]['full_path'] == u'/hello/world/6,681965'
+    assert hits[2]['user_agent'] == u'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124 Safari/537.36'
+
+def test_netscaler_parsing():
+    """test parsing of netscaler logs (which use extended W3C log format)"""
+
+    file_ = 'logs/netscaler.log'
+
+    # have to override previous globals override for this test
+    import_logs.config.options.custom_w3c_fields = {}
+    Recorder.recorders = []
+    import_logs.parser = import_logs.Parser()
+    import_logs.config.format = None
+    import_logs.config.options.enable_http_redirects = True
+    import_logs.config.options.enable_http_errors = True
+    import_logs.config.options.replay_tracking = False
+    import_logs.config.options.w3c_time_taken_in_millisecs = False
+    import_logs.parser.parse(file_)
+
+    hits = [hit.__dict__ for hit in Recorder.recorders]
+
+    assert hits[0]['status'] == u'302'
+    assert hits[0]['userid'] == None
+    assert hits[0]['is_error'] == False
+    assert hits[0]['extension'] == u'jsp'
+    assert hits[0]['is_download'] == False
+    assert hits[0]['referrer'] == ''
+    assert hits[0]['args'] == {}
+    assert hits[0]['generation_time_milli'] == 1000
+    assert hits[0]['host'] == 'foo'
+    assert hits[0]['filename'] == 'logs/netscaler.log'
+    assert hits[0]['is_redirect'] == True
+    assert hits[0]['date'] == datetime.datetime(2012, 8, 16, 11, 55, 13)
+    assert hits[0]['lineno'] == 4
+    assert hits[0]['ip'] == u'172.20.1.0'
+    assert hits[0]['query_string'] == ''
+    assert hits[0]['path'] == u'/Citrix/XenApp/Wan/auth/login.jsp'
+    assert hits[0]['is_robot'] == False
+    assert hits[0]['full_path'] == u'/Citrix/XenApp/Wan/auth/login.jsp'
+    assert hits[0]['user_agent'] == u'Mozilla/4.0+(compatible;+MSIE+7.0;+Windows+NT+5.1;+Trident/4.0;+.NET+CLR+1.1.4322;+.NET+CLR+2.0.50727;+.NET+CLR+3.0.04506.648;+.NET+CLR+3.5.21022)'
+
+def test_amazon_cloudfront_web_parsing():
+    """test parsing of amazon cloudfront logs (which use extended W3C log format)"""
+
+    file_ = 'logs/amazon_cloudfront_web.log'
+
+    # have to override previous globals override for this test
+    import_logs.config.options.custom_w3c_fields = {}
+    Recorder.recorders = []
+    import_logs.parser = import_logs.Parser()
+    import_logs.config.format = None
+    import_logs.config.options.enable_http_redirects = True
+    import_logs.config.options.enable_http_errors = True
+    import_logs.config.options.replay_tracking = False
+    import_logs.config.options.w3c_time_taken_in_millisecs = False
+    import_logs.parser.parse(file_)
+
+    hits = [hit.__dict__ for hit in Recorder.recorders]
+
+    assert hits[0]['status'] == u'200'
+    assert hits[0]['userid'] == None
+    assert hits[0]['is_error'] == False
+    assert hits[0]['extension'] == u'html'
+    assert hits[0]['is_download'] == False
+    assert hits[0]['referrer'] == u'www.displaymyfiles.com'
+    assert hits[0]['args'] == {}
+    assert hits[0]['generation_time_milli'] == 1.0
+    assert hits[0]['host'] == 'foo'
+    assert hits[0]['filename'] == 'logs/amazon_cloudfront_web.log'
+    assert hits[0]['is_redirect'] == False
+    assert hits[0]['date'] == datetime.datetime(2014, 5, 23, 1, 13, 11)
+    assert hits[0]['lineno'] == 2
+    assert hits[0]['ip'] == u'192.0.2.10'
+    assert hits[0]['query_string'] == ''
+    assert hits[0]['path'] == u'/view/my/file.html'
+    assert hits[0]['is_robot'] == False
+    assert hits[0]['full_path'] == u'/view/my/file.html'
+    assert hits[0]['user_agent'] == u'Mozilla/4.0%20(compatible;%20MSIE%205.0b1;%20Mac_PowerPC)'
+
+    assert len(hits) == 1
+
+def test_amazon_cloudfront_rtmp_parsing():
+    """test parsing of amazon cloudfront rtmp logs (which use extended W3C log format w/ custom fields for event info)"""
+
+    file_ = 'logs/amazon_cloudfront_rtmp.log'
+
+    # have to override previous globals override for this test
+    import_logs.config.options.custom_w3c_fields = {}
+    Recorder.recorders = []
+    import_logs.parser = import_logs.Parser()
+    import_logs.config.format = None
+    import_logs.config.options.enable_http_redirects = True
+    import_logs.config.options.enable_http_errors = True
+    import_logs.config.options.replay_tracking = False
+    import_logs.config.options.w3c_time_taken_in_millisecs = False
+    import_logs.parser.parse(file_)
+
+    hits = [hit.__dict__ for hit in Recorder.recorders]
+
+    assert hits[0]['is_download'] == False
+    assert hits[0]['ip'] == u'192.0.2.147'
+    assert hits[0]['is_redirect'] == False
+    assert hits[0]['filename'] == 'logs/amazon_cloudfront_rtmp.log'
+    assert hits[0]['event_category'] == 'cloudfront_rtmp'
+    assert hits[0]['event_action'] == u'connect'
+    assert hits[0]['lineno'] == 2
+    assert hits[0]['status'] == '200'
+    assert hits[0]['is_error'] == False
+    assert hits[0]['event_name'] == None
+    assert hits[0]['args'] == {}
+    assert hits[0]['host'] == 'foo'
+    assert hits[0]['date'] == datetime.datetime(2010, 3, 12, 23, 51, 20)
+    assert hits[0]['path'] == u'/shqshne4jdp4b6.cloudfront.net/cfx/st\u200b'
+    assert hits[0]['extension'] == u'net/cfx/st\u200b'
+    assert hits[0]['referrer'] == ''
+    assert hits[0]['userid'] == None
+    assert hits[0]['user_agent'] == u'LNX%2010,0,32,18'
+    assert hits[0]['generation_time_milli'] == 0
+    assert hits[0]['query_string'] == u'key=value'
+    assert hits[0]['is_robot'] == False
+    assert hits[0]['full_path'] == u'/shqshne4jdp4b6.cloudfront.net/cfx/st\u200b'
+
+    assert hits[1]['is_download'] == False
+    assert hits[1]['ip'] == u'192.0.2.222'
+    assert hits[1]['is_redirect'] == False
+    assert hits[1]['filename'] == 'logs/amazon_cloudfront_rtmp.log'
+    assert hits[1]['event_category'] == 'cloudfront_rtmp'
+    assert hits[1]['event_action'] == u'play'
+    assert hits[1]['lineno'] == 3
+    assert hits[1]['status'] == '200'
+    assert hits[1]['is_error'] == False
+    assert hits[1]['event_name'] == u'myvideo'
+    assert hits[1]['args'] == {}
+    assert hits[1]['host'] == 'foo'
+    assert hits[1]['date'] == datetime.datetime(2010, 3, 12, 23, 51, 21)
+    assert hits[1]['path'] == u'/shqshne4jdp4b6.cloudfront.net/cfx/st\u200b'
+    assert hits[1]['extension'] == u'net/cfx/st\u200b'
+    assert hits[1]['referrer'] == ''
+    assert hits[1]['userid'] == None
+    assert hits[1]['length'] == 3914
+    assert hits[1]['user_agent'] == u'LNX%2010,0,32,18'
+    assert hits[1]['generation_time_milli'] == 0
+    assert hits[1]['query_string'] == u'key=value'
+    assert hits[1]['is_robot'] == False
+    assert hits[1]['full_path'] == u'/shqshne4jdp4b6.cloudfront.net/cfx/st\u200b'
+
+    assert len(hits) == 2
+
+def test_ignore_groups_option_removes_groups():
+    """Test that the --ignore-groups option removes groups so they do not appear in hits."""
+
+    file_ = 'logs/iis.log'
+
+    # have to override previous globals override for this test
+    import_logs.config.options.custom_w3c_fields = {}
+    Recorder.recorders = []
+    import_logs.parser = import_logs.Parser()
+    import_logs.config.format = None
+    import_logs.config.options.enable_http_redirects = True
+    import_logs.config.options.enable_http_errors = True
+    import_logs.config.options.replay_tracking = False
+    import_logs.config.options.w3c_time_taken_in_millisecs = True
+    import_logs.config.options.regex_groups_to_ignore = set(['userid','generation_time_milli'])
+    import_logs.parser.parse(file_)
+
+    hits = [hit.__dict__ for hit in Recorder.recorders]
+
+    assert hits[0]['userid'] == None
+    assert hits[0]['generation_time_milli'] == 0
+
+def test_regex_group_to_custom_var_options():
+    """Test that the --regex-group-to-visit-cvar and --regex-group-to-page-cvar track regex groups to custom vars."""
+
+    file_ = 'logs/iis.log'
+
+    # have to override previous globals override for this test
+    import_logs.config.options.custom_w3c_fields = {}
+    Recorder.recorders = []
+    import_logs.parser = import_logs.Parser()
+    import_logs.config.format = None
+    import_logs.config.options.enable_http_redirects = True
+    import_logs.config.options.enable_http_errors = True
+    import_logs.config.options.replay_tracking = False
+    import_logs.config.options.w3c_time_taken_in_millisecs = True
+    import_logs.config.options.regex_groups_to_ignore = set()
+    import_logs.config.options.regex_group_to_visit_cvars_map = {
+        'userid': "User Name",
+        'date': "The Date"
+    }
+    import_logs.config.options.regex_group_to_page_cvars_map = {
+        'generation_time_milli': 'Geneartion Time',
+        'referrer': 'The Referrer'
+    }
+    import_logs.parser.parse(file_)
+
+    hits = [hit.__dict__ for hit in Recorder.recorders]
+
+    assert hits[0]['args']['_cvar'] == {1: ['The Date', '2012-04-01 00:00:13'], 2: ['User Name', 'theuser']} # check visit custom vars
+    assert hits[0]['args']['cvar'] == {1: ['Geneartion Time', '1687']} # check page custom vars
+
+    assert hits[0]['userid'] == 'theuser'
+    assert hits[0]['date'] == datetime.datetime(2012, 4, 1, 0, 0, 13)
+    assert hits[0]['generation_time_milli'] == 1687
+    assert hits[0]['referrer'] == ''
+
+def test_w3c_custom_field_regex_option():
+    """Test that --w3c-field-regex can be used to match custom W3C log fields."""
+
+    file_ = 'logs/iis.log'
+
+    # have to override previous globals override for this test
+    import_logs.config.options.custom_w3c_fields = {}
+    Recorder.recorders = []
+    import_logs.parser = import_logs.Parser()
+    import_logs.config.format = None
+    import_logs.config.options.enable_http_redirects = True
+    import_logs.config.options.enable_http_errors = True
+    import_logs.config.options.replay_tracking = False
+    import_logs.config.options.w3c_time_taken_in_millisecs = True
+    import_logs.config.options.w3c_field_regexes = {
+        'sc-substatus': '(?P<substatus>\S+)',
+        'sc-win32-status': '(?P<win32_status>\S+)'
+    }
+
+    format = import_logs.W3cExtendedFormat()
+
+    file_handle = open(file_)
+    format.check_format(file_handle)
+    match = None
+    while not match:
+        line = file_handle.readline()
+        if not line:
+            break
+        match = format.match(line)
+    file_handle.close()
+
+    assert match is not None
+    assert format.get('substatus') == '654'
+    assert format.get('win32_status') == '456'
diff --git a/misc/others/api_internal_call.php b/misc/others/api_internal_call.php
index f099b962ee..4cc0052911 100644
--- a/misc/others/api_internal_call.php
+++ b/misc/others/api_internal_call.php
@@ -18,7 +18,7 @@ FrontController::getInstance()->init();
 // This inits the API Request with the specified parameters
 $request = new Request('
 			module=API
-			&method=UserSettings.getResolution
+			&method=Resolution.getResolution
 			&idSite=7
 			&date=yesterday
 			&period=week
diff --git a/misc/others/cli-script-bootstrap.php b/misc/others/cli-script-bootstrap.php
index f26d45abcc..afd3494834 100644
--- a/misc/others/cli-script-bootstrap.php
+++ b/misc/others/cli-script-bootstrap.php
@@ -4,37 +4,34 @@
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
  */
-use Piwik\Config;
-use Piwik\FrontController;
 
-error_reporting(E_ALL | E_NOTICE);
+use Piwik\Container\StaticContainer;
+use Piwik\FrontController;
+use Symfony\Bridge\Monolog\Handler\ConsoleHandler;
+use Symfony\Component\Console\Output\ConsoleOutput;
 
 define('PIWIK_DOCUMENT_ROOT', dirname(__FILE__) == '/' ? '' : dirname(__FILE__) . '/../..');
 if (file_exists(PIWIK_DOCUMENT_ROOT . '/bootstrap.php')) {
     require_once PIWIK_DOCUMENT_ROOT . '/bootstrap.php';
 }
-if (!defined('PIWIK_USER_PATH')) {
-    define('PIWIK_USER_PATH', PIWIK_DOCUMENT_ROOT);
-}
 if (!defined('PIWIK_INCLUDE_PATH')) {
     define('PIWIK_INCLUDE_PATH', PIWIK_DOCUMENT_ROOT);
 }
 
+require_once PIWIK_INCLUDE_PATH . '/core/bootstrap.php';
+
 ignore_user_abort(true);
 set_time_limit(0);
-@date_default_timezone_set('UTC');
-
-require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php';
-require_once PIWIK_INCLUDE_PATH . '/core/testMinimumPhpVersion.php';
-require_once PIWIK_INCLUDE_PATH . '/core/Loader.php';
-\Piwik\Loader::init();
 
 $GLOBALS['PIWIK_TRACKER_DEBUG'] = false;
 define('PIWIK_ENABLE_DISPATCH', false);
 
-Config::getInstance()->log['log_writers'][] = 'screen';
-Config::getInstance()->log['log_level'] = 'VERBOSE';
-Config::getInstance()->log['string_message_format'] = "%message%";
-FrontController::getInstance()->init();
\ No newline at end of file
+if (Piwik\Common::isPhpCliMode()) {
+    StaticContainer::setEnvironment('cli');
+    /** @var ConsoleHandler $consoleLogHandler */
+    $consoleLogHandler = StaticContainer::get('Symfony\Bridge\Monolog\Handler\ConsoleHandler');
+    $consoleLogHandler->setOutput(new ConsoleOutput());
+}
+
+FrontController::getInstance()->init();
diff --git a/misc/others/uninstall-delete-piwik-directory.php b/misc/others/uninstall-delete-piwik-directory.php
index 97030daa48..ac606bb721 100644
--- a/misc/others/uninstall-delete-piwik-directory.php
+++ b/misc/others/uninstall-delete-piwik-directory.php
@@ -1,10 +1,13 @@
 <?php
+exit; // Remove this line before using the script
+
 // How to remove the piwik/ directory if it does not work in FTP?
 // 1) Download and upload this file to your webserver
-// 2) Put this file in the folder that contains the piwik/ directory (above the piwik/ directory)
+// 2) Remove the 2nd line (the "exit;")
+// 3) Put this file in the folder that contains the piwik/ directory (above the piwik/ directory)
 //    For example if the piwik/ folder is at http://your-site/piwik/ you put the file in http://your-site/uninstall-delete-piwik-directory.php
-// 3) Go with your browser to http://your-site/uninstall-delete-piwik-directory.php
-// 4) The folder http://your-site/piwik/ should now be deleted!
+// 4) Go with your browser to http://your-site/uninstall-delete-piwik-directory.php
+// 5) The folder http://your-site/piwik/ should now be deleted!
 // We hope you enjoyed Piwik. If you have any feedback why you stopped using Piwik,
 // please let us know at hello@piwik.org - we are interested by your experience
 function unlinkRecursive($dir)
diff --git a/misc/phpstorm-codestyles/Piwik_codestyle.xml b/misc/phpstorm-codestyles/Piwik_codestyle.xml
index ed09f367d7..e863de94cd 100644
--- a/misc/phpstorm-codestyles/Piwik_codestyle.xml
+++ b/misc/phpstorm-codestyles/Piwik_codestyle.xml
@@ -14,7 +14,13 @@
     <option name="KEEP_SIMPLE_BLOCKS_IN_ONE_LINE" value="true" />
     <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
   </codeStyleSettings>
+  <codeStyleSettings language="LESS">
+    <indentOptions>
+      <option name="INDENT_SIZE" value="4" />
+    </indentOptions>
+  </codeStyleSettings>
   <codeStyleSettings language="PHP">
+    <option name="BLANK_LINES_AFTER_PACKAGE" value="1" />
     <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
     <arrangement>
       <groups>
diff --git a/misc/phpstorm-codestyles/README.md b/misc/phpstorm-codestyles/README.md
index 0dc8868440..020f5d1cc8 100644
--- a/misc/phpstorm-codestyles/README.md
+++ b/misc/phpstorm-codestyles/README.md
@@ -17,5 +17,5 @@ Phpstorm can also be configured to apply the style automatically before commit.
 
 You are now writing code that respects Piwik coding standards. Enjoy!
 
-Reference: http://piwik.org/participate/coding-standards/
+Reference: [Piwik Coding standards](http://developer.piwik.org/guides/contributing-to-piwik-core#piwik-core-code-standards)
 
diff --git a/misc/proxy-hide-piwik-url/README.md b/misc/proxy-hide-piwik-url/README.md
index 8c726b20ac..cf2bebf1e4 100644
--- a/misc/proxy-hide-piwik-url/README.md
+++ b/misc/proxy-hide-piwik-url/README.md
@@ -1,55 +1,3 @@
-## Piwik Proxy Hide URL
-This script allows to track statistics using Piwik, without revealing the
-Piwik Server URL. This is useful for users who track multiple websites
-on the same Piwik server, but don't want to show the Piwik server URL in
-the source code of all tracked websites.
+# Piwik Proxy Hide URL
 
-### Requirements
-To run this properly you will need
-
- * Piwik server latest version
- * One or several website(s) to track with this Piwik server, for example http://trackedsite.com
- * The website to track must run on a server with PHP5 support
- * In your php.ini you must check that the following is set: `allow_url_fopen = On`
-
-### How to track trackedsite.com in your Piwik without revealing the Piwik server URL?
-
-1. In your Piwik server, login as Super user
-2. create a user, set the login for example: "UserTrackingAPI"
-3. Assign this user "admin" permission on all websites you wish to track without showing the Piwik URL
-4. Copy the "token_auth" for this user, and paste it below in this file, in `$TOKEN_AUTH = "xyz"`
-5. In this file, below this help test, edit $PIWIK_URL variable and change http://your-piwik-domain.example.org/piwik/ with the URL to your Piwik server.
-6. Upload this modified piwik.php file in the website root directory, for example at: http://trackedsite.com/piwik.php
-   This file (http://trackedsite.com/piwik.php) will be called by the Piwik Javascript,
-   instead of calling directly the (secret) Piwik Server URL (http://your-piwik-domain.example.org/piwik/).
-7. You now need to add the modified Piwik Javascript Code to the footer of your pages at http://trackedsite.com/
-   Go to Piwik > Settings > Websites > Show Javascript Tracking Code.
-   Copy the Javascript snippet. Then, edit this code and change the last lines to the following:
-
-   ```
-   [...]
-   (function() {
-       var u="//trackedsite.com/";
-       _paq.push(["setTrackerUrl", u+"piwik.php"]);
-       _paq.push(["setSiteId", "trackedsite-id"]);
-       var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0];
-       g.type="text/javascript"; g.async=true; g.defer=true; g.src=u+"piwik.php"; s.parentNode.insertBefore(g,s);
-   })();
-   </script>
-   <!-- End Piwik Code -->
-   ```
-
-   What's changed in this code snippet compared to the normal Piwik code?
-
-   * the (secret) Piwik URL is now replaced by your website URL
-   * the "piwik.js" becomes "piwik.php" because this piwik.php proxy script will also display and proxy the Javascript file
-   * the `<noscript>` part of the code at the end is removed,
-     since it is not currently used by Piwik, and it contains the (secret) Piwik URL which you want to hide.
-   * make sure to replace trackedsite-id with your idsite again.
-
- 8. Paste the modified Piwik Javascript code in your website "trackedsite.com" pages you wish to track.
-    This modified Javascript Code will then track visits/pages/conversions by calling trackedsite.com/piwik.php
-    which will then automatically call your (hidden) Piwik Server URL.
- 9. Done!
-    At this stage, example.com should be tracked by your Piwik without showing the Piwik server URL.
-    Repeat the steps 6, 7 and 8 for each website you wish to track in Piwik.
+The proxy script has been moved to [piwik/tracker-proxy](https://github.com/piwik/tracker-proxy).
diff --git a/misc/proxy-hide-piwik-url/piwik.php b/misc/proxy-hide-piwik-url/piwik.php
deleted file mode 100644
index d1c9e9ca3c..0000000000
--- a/misc/proxy-hide-piwik-url/piwik.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- * Piwik Proxy Hide URL
- *
- * @link http://piwik.org/faq/how-to/#faq_132
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-// -----
-// Important: read the instructions in README.md or at:
-// https://github.com/piwik/piwik/tree/master/misc/proxy-hide-piwik-url#piwik-proxy-hide-url
-// -----
-
-// Edit the line below, and replace http://your-piwik-domain.example.org/piwik/
-// with your Piwik URL ending with a slash.
-// This URL will never be revealed to visitors or search engines.
-$PIWIK_URL = 'http://your-piwik-domain.example.org/piwik/';
-
-// Edit the line below, and replace xyz by the token_auth for the user "UserTrackingAPI"
-// which you created when you followed instructions above.
-$TOKEN_AUTH = 'xyz';
-
-// Maximum time, in seconds, to wait for the Piwik server to return the 1*1 GIF
-$timeout = 5;
-
-function sendHeader($header, $replace = true)
-{
-    headers_sent() || header($header, $replace);
-}
-
-function arrayValue($array, $key, $value = null)
-{
-    if (!empty($array[$key])) {
-        $value = $array[$key];
-    }
-    return $value;
-}
-
-// DO NOT MODIFY BELOW
-// ---------------------------
-// 1) PIWIK.JS PROXY: No _GET parameter, we serve the JS file
-if (empty($_GET)) {
-    $modifiedSince = false;
-    if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
-        $modifiedSince = $_SERVER['HTTP_IF_MODIFIED_SINCE'];
-        // strip any trailing data appended to header
-        if (false !== ($semicolon = strpos($modifiedSince, ';'))) {
-            $modifiedSince = strtotime(substr($modifiedSince, 0, $semicolon));
-        }
-    }
-    // Re-download the piwik.js once a day maximum
-    $lastModified = time() - 86400;
-
-    // set HTTP response headers
-    sendHeader('Vary: Accept-Encoding');
-
-    // Returns 304 if not modified since
-    if (!empty($modifiedSince) && $modifiedSince < $lastModified) {
-        sendHeader(sprintf("%s 304 Not Modified", $_SERVER['SERVER_PROTOCOL']));
-    } else {
-        sendHeader('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
-        sendHeader('Content-Type: application/javascript; charset=UTF-8');
-        if ($piwikJs = file_get_contents($PIWIK_URL . 'piwik.js')) {
-            echo $piwikJs;
-        } else {
-            sendHeader($_SERVER['SERVER_PROTOCOL'] . '505 Internal server error');
-        }
-    }
-    exit;
-}
-
-@ini_set('magic_quotes_runtime', 0);
-
-// 2) PIWIK.PHP PROXY: GET parameters found, this is a tracking request, we redirect it to Piwik
-$url = sprintf("%spiwik.php?cip=%s&token_auth=%s&", $PIWIK_URL, getVisitIp(), $TOKEN_AUTH);
-
-foreach ($_GET as $key => $value) {
-    $url .= urlencode($key ). '=' . urlencode($value) . '&';
-}
-sendHeader("Content-Type: image/gif");
-$stream_options = array('http' => array(
-    'user_agent' => arrayValue($_SERVER, 'HTTP_USER_AGENT', ''),
-    'header'     => sprintf("Accept-Language: %s\r\n", str_replace(array("\n", "\t", "\r"), "", arrayValue($_SERVER, 'HTTP_ACCEPT_LANGUAGE', ''))),
-    'timeout'    => $timeout
-));
-$ctx = stream_context_create($stream_options);
-echo file_get_contents($url, 0, $ctx);
-
-function getVisitIp()
-{
-    $matchIp = '/^([0-9]{1,3}\.){3}[0-9]{1,3}$/';
-    $ipKeys = array(
-        'HTTP_X_FORWARDED_FOR',
-        'HTTP_CLIENT_IP',
-        'HTTP_CF_CONNECTING_IP',
-    );
-    foreach($ipKeys as $ipKey) {
-        if (isset($_SERVER[$ipKey])
-            && preg_match($matchIp, $_SERVER[$ipKey])) {
-            return $_SERVER[$ipKey];
-        }
-    }
-    return arrayValue($_SERVER, 'REMOTE_ADDR');
-}
diff --git a/piwik.js b/piwik.js
index 0eb59e8cc6..7dee2eeab8 100644
--- a/piwik.js
+++ b/piwik.js
@@ -27,28 +27,28 @@ if(Q.hasNodeAttributeWithValue(W,"href")){X=Q.getAttributeValueFromNode(W,"href"
 }}}var ac=Q.findNodesByTagName(aa,"embed");if(ac&&ac.length){return this.findMediaUrlInNode(ac[0])}}},trim:function(W){if(W&&String(W)===W){return W.replace(/^\s+|\s+$/g,"")}return W},isOrWasNodeInViewport:function(ab){if(!ab||!ab.getBoundingClientRect||ab.nodeType!==1){return true}var aa=ab.getBoundingClientRect();var Z=u.documentElement||{};var Y=aa.top<0;if(Y&&ab.offsetTop){Y=(ab.offsetTop+aa.height)>0}var X=Z.clientWidth;if(G.innerWidth&&X>G.innerWidth){X=G.innerWidth}var W=Z.clientHeight;if(G.innerHeight&&W>G.innerHeight){W=G.innerHeight}return((aa.bottom>0||Y)&&aa.right>0&&aa.left<X&&((aa.top<W)||Y))},isNodeVisible:function(X){var W=g(X);var Y=this.isOrWasNodeInViewport(X);return W&&Y},buildInteractionRequestParams:function(W,X,Y,Z){var aa="";if(W){aa+="c_i="+l(W)}if(X){if(aa){aa+="&"}aa+="c_n="+l(X)}if(Y){if(aa){aa+="&"}aa+="c_p="+l(Y)}if(Z){if(aa){aa+="&"}aa+="c_t="+l(Z)}return aa},buildImpressionRequestParams:function(W,X,Y){var Z="c_n="+l(W)+"&c_p="+l(X);if(Y){Z+="&c_t="+l(Y)}return Z
 },buildContentBlock:function(Y){if(!Y){return}var W=this.findContentName(Y);var X=this.findContentPiece(Y);var Z=this.findContentTarget(Y);W=this.trim(W);X=this.trim(X);Z=this.trim(Z);return{name:W||"Unknown",piece:X||"Unknown",target:Z||""}},collectContent:function(Z){if(!Z||!Z.length){return[]}var Y=[];var W,X;for(W=0;W<Z.length;W++){X=this.buildContentBlock(Z[W]);if(w(X)){Y.push(X)}}return Y},setLocation:function(W){this.location=W},getLocation:function(){var W=this.location||G.location;if(!W.origin){W.origin=W.protocol+"//"+W.hostname+(W.port?":"+W.port:"")}return W},toAbsoluteUrl:function(X){if((!X||String(X)!==X)&&X!==""){return X}if(""===X){return this.getLocation().href}if(X.search(/^\/\//)!==-1){return this.getLocation().protocol+X}if(X.search(/:\/\//)!==-1){return X}if(0===X.indexOf("#")){return this.getLocation().origin+this.getLocation().pathname+X}if(0===X.indexOf("?")){return this.getLocation().origin+this.getLocation().pathname+X}if(0===X.search("^[a-zA-Z]{2,11}:")){return X
 }if(X.search(/^\//)!==-1){return this.getLocation().origin+X}var W="(.*/)";var Y=this.getLocation().origin+this.getLocation().pathname.match(new RegExp(W))[0];return Y+X},isUrlToCurrentDomain:function(X){var Y=this.toAbsoluteUrl(X);if(!Y){return false}var W=this.getLocation().origin;if(W===Y){return true}if(0===String(Y).indexOf(W)){if(":"===String(Y).substr(W.length,1)){return false}return true}return false},setHrefAttribute:function(X,W){if(!X||!W){return}Q.setAnyAttribute(X,"href",W)},shouldIgnoreInteraction:function(Y){var X=Q.hasNodeAttribute(Y,this.CONTENT_IGNOREINTERACTION_ATTR);var W=Q.hasNodeCssClass(Y,this.CONTENT_IGNOREINTERACTION_CLASS);return X||W}};function B(W,X){if(X){return X}if(W.slice(-9)==="piwik.php"){W=W.slice(0,W.length-9)}return W}function A(aa){var W="Piwik_Overlay";var ad=new RegExp("index\\.php\\?module=Overlay&action=startOverlaySession&idSite=([0-9]+)&period=([^&]+)&date=([^&]+)$");var Y=ad.exec(u.referrer);if(Y){var Z=Y[1];if(Z!==String(aa)){return false}var ac=Y[2],X=Y[3];
-G.name=W+"###"+ac+"###"+X}var ab=G.name.split("###");return ab.length===3&&ab[0]===W}function M(X,ac,Z){var ab=G.name.split("###"),aa=ab[1],W=ab[2],Y=B(X,ac);i(Y+"plugins/Overlay/client/client.js?v=1",function(){Piwik_Overlay_Client.initialize(Y,Z,aa,W)})}function D(aE,bl,bJ){var ad=N(u.domain,G.location.href,x()),bL=y(ad[0]),b3=ad[1],bt=ad[2],b6=false,bp="GET",br=bp,bb="application/x-www-form-urlencoded; charset=UTF-8",aK=bb,aa=aE||"",ax="",bn="",bR=bl||"",aJ="",a6,aS=u.title,aU="7z|aac|apk|ar[cj]|as[fx]|avi|azw3|bin|csv|deb|dmg|docx?|epub|exe|flv|gif|gz|gzip|hqx|jar|jpe?g|js|mobi|mp(2|3|4|e?g)|mov(ie)?|ms[ip]|od[bfgpst]|og[gv]|pdf|phps|png|pptx?|qtm?|ra[mr]?|rpm|sea|sit|tar|t?bz2?|tgz|torrent|txt|wav|wm[av]|wpd||xlsx?|xml|z|zip",bo=[bL],ai=[],be=[],aC=[],bm=500,aj,aG,ak,an,aY=["pk_campaign","piwik_campaign","utm_campaign","utm_source","utm_medium"],aP=["pk_kwd","piwik_kwd","utm_term"],b1="_pk_",aq,b2,ao=false,bV,a0,a4,aw=33955200000,az=1800000,a9=15768000000,a1=true,aI=0,a5=false,ag=false,au,bf={},ab={},bW=200,bD={},bS={},ah=[],ay=false,a8=false,by=false,bT=false,bv=false,bs,bi,at,aX=T,bx,a2=bJ;
-function bF(cf,cc,cb,ce,ca,cd){if(ao){return}var b9;if(cb){b9=new Date();b9.setTime(b9.getTime()+cb)}u.cookie=cf+"="+l(cc)+(cb?";expires="+b9.toGMTString():"")+";path="+(ce||"/")+(ca?";domain="+ca:"")+(cd?";secure":"")}function av(cb){if(ao){return 0}var b9=new RegExp("(^|;)[ ]*"+cb+"=([^;]*)"),ca=b9.exec(u.cookie);return ca?F(ca[2]):0}function bX(b9){var ca;if(ak){ca=new RegExp("#.*");return b9.replace(ca,"")}return b9}function bK(cb,b9){var cc=k(b9),ca;if(cc){return b9}if(b9.slice(0,1)==="/"){return k(cb)+"://"+b(cb)+b9}cb=bX(cb);ca=cb.indexOf("?");if(ca>=0){cb=cb.slice(0,ca)}ca=cb.lastIndexOf("/");if(ca!==cb.length-1){cb=cb.slice(0,ca+1)}return cb+b9}function bq(cc){var ca,b9,cb;for(ca=0;ca<bo.length;ca++){b9=y(bo[ca].toLowerCase());if(cc===b9){return true}if(b9.slice(0,1)==="."){if(cc===b9.slice(1)){return true}cb=cc.length-b9.length;if((cb>0)&&(cc.slice(cb)===b9)){return true}}}return false}function b8(b9,cb){var ca=new Image(1,1);ca.onload=function(){t=0;if(typeof cb==="function"){cb()
-}};ca.src=aa+(aa.indexOf("?")<0?"?":"&")+b9}function bG(ca,cd,b9){if(!w(b9)||null===b9){b9=true}try{var cc=G.XMLHttpRequest?new G.XMLHttpRequest():G.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):null;cc.open("POST",aa,true);cc.onreadystatechange=function(){if(this.readyState===4&&!(this.status>=200&&this.status<300)&&b9){b8(ca,cd)}else{if(typeof cd==="function"){cd()}}};cc.setRequestHeader("Content-Type",aK);cc.send(ca)}catch(cb){if(b9){b8(ca,cd)}}}function bY(ca){var b9=new Date();var cb=b9.getTime()+ca;if(!j||cb>j){j=cb}}function aD(cd){var ca=new Date();var b9=ca.getTime();if(a8&&b9<a8){var cb=a8-b9;setTimeout(cd,cb);bY(cb+50);a8+=50;return}if(a8===false){var cc=800;a8=b9+cc}cd()}function aZ(ca,b9,cb){if(!bV&&ca){aD(function(){if(br==="POST"){bG(ca,cb)}else{b8(ca,cb)}bY(b9)})}}function ba(b9){if(bV){return false}return(b9&&b9.length)}function ap(cb,b9){if(!ba(cb)){return}var ca='{"requests":["?'+cb.join('","?')+'"]}';aD(function(){bG(ca,null,false);bY(b9)})}function bE(b9){return b1+b9+"."+bR+"."+bx
-}function ae(){if(ao){return"0"}if(!w(e.cookieEnabled)){var b9=bE("testcookie");bF(b9,"1");return av(b9)==="1"?"1":"0"}return e.cookieEnabled?"1":"0"}function bj(){bx=aX((aq||bL)+(b2||"/")).slice(0,4)}function ar(){var ca=bE("cvar"),b9=av(ca);if(b9.length){b9=JSON2.parse(b9);if(J(b9)){return b9}}return{}}function Z(){if(ag===false){ag=ar()}}function bQ(){var b9=new Date();bs=b9.getTime()}function Y(){var ca=new Date(),b9=Math.round(ca.getTime()/1000),cc=av(bE("id")),cb;if(cc){cb=cc.split(".");cb.unshift("0")}else{if(!a2){a2=aX((e.userAgent||"")+(e.platform||"")+JSON2.stringify(bS)+ca.getTime()+Math.random()).slice(0,16)}cb=["1",a2,b9,0,b9,"",""]}return cb}function aL(){var cd=new Date(),ca=cd.getTime(),cc=Y();var b9=parseInt(cc[2],10);var cb=(b9*1000)+aw-ca;return cb}function am(cd,ca,b9,cc,cb,cf){var ce=aL();bF(bE("id"),cd+"."+ca+"."+b9+"."+cc+"."+cb+"."+cf,ce,b2,aq)}function X(){var b9=av(bE("ref"));if(b9.length){try{b9=JSON2.parse(b9);if(J(b9)){return b9}}catch(ca){}}return["","",0,""]
-}function W(){var b9=ao;ao=false;bF(bE("id"),"",-86400,b2,aq);bF(bE("ses"),"",-86400,b2,aq);bF(bE("cvar"),"",-86400,b2,aq);bF(bE("ref"),"",-86400,b2,aq);ao=b9}function bP(cd){if(!cd||!J(cd)){return}var cc=[];var cb;for(cb in cd){if(Object.prototype.hasOwnProperty.call(cd,cb)){cc.push(cb)}}var ce={};cc.sort();var b9=cc.length;var ca;for(ca=0;ca<b9;ca++){ce[cc[ca]]=cd[cc[ca]]}return ce}function aT(cb,cz,cA,cc){var cx,ca=new Date(),cj=Math.round(ca.getTime()/1000),cD,cy,ce,cp,cu,ci,cs,cf,cw,cd=1024,cF,cm,ct=ag,ck=bE("ses"),cl=bE("ref"),cG=bE("cvar"),cq=Y(),co=av(ck),cv=X(),cC=a6||b3,cg,b9;if(ao){W()}if(bV){return""}cD=cq[0];cy=cq[1];cp=cq[2];ce=cq[3];cu=cq[4];ci=cq[5];if(!w(cq[6])){cq[6]=""}cs=cq[6];if(!w(cc)){cc=""}var cn=u.characterSet||u.charset;if(!cn||cn.toLowerCase()==="utf-8"){cn=null}cg=cv[0];b9=cv[1];cf=cv[2];cw=cv[3];if(!co){var cB=az/1000;if(!ci||(cj-ci)>cB){ce++;ci=cu}if(!a4||!cg.length){for(cx in aY){if(Object.prototype.hasOwnProperty.call(aY,cx)){cg=I(cC,aY[cx]);if(cg.length){break
-}}}for(cx in aP){if(Object.prototype.hasOwnProperty.call(aP,cx)){b9=I(cC,aP[cx]);if(b9.length){break}}}}cF=b(bt);cm=cw.length?b(cw):"";if(cF.length&&!bq(cF)&&(!a4||!cm.length||bq(cm))){cw=bt}if(cw.length||cg.length){cf=cj;cv=[cg,b9,cf,bX(cw.slice(0,cd))];bF(cl,JSON2.stringify(cv),a9,b2,aq)}}cb+="&idsite="+bR+"&rec=1&r="+String(Math.random()).slice(2,8)+"&h="+ca.getHours()+"&m="+ca.getMinutes()+"&s="+ca.getSeconds()+"&url="+l(bX(cC))+(bt.length?"&urlref="+l(bX(bt)):"")+(aJ.length?"&uid="+l(aJ):"")+"&_id="+cy+"&_idts="+cp+"&_idvc="+ce+"&_idn="+cD+(cg.length?"&_rcn="+l(cg):"")+(b9.length?"&_rck="+l(b9):"")+"&_refts="+cf+"&_viewts="+ci+(String(cs).length?"&_ects="+cs:"")+(String(cw).length?"&_ref="+l(bX(cw.slice(0,cd))):"")+(cn?"&cs="+l(cn):"")+"&send_image=0";for(cx in bS){if(Object.prototype.hasOwnProperty.call(bS,cx)){cb+="&"+cx+"="+bS[cx]}}if(cz){cb+="&data="+l(JSON2.stringify(cz))}else{if(an){cb+="&data="+l(JSON2.stringify(an))}}function ch(cH,cI){var cJ=JSON2.stringify(cH);if(cJ.length>2){return"&"+cI+"="+l(cJ)
-}return""}var cE=bP(bf);var cr=bP(ab);cb+=ch(cE,"cvar");cb+=ch(cr,"e_cvar");if(ag){cb+=ch(ag,"_cvar");for(cx in ct){if(Object.prototype.hasOwnProperty.call(ct,cx)){if(ag[cx][0]===""||ag[cx][1]===""){delete ag[cx]}}}if(a5){bF(cG,JSON2.stringify(ag),az,b2,aq)}}if(a1){if(aI){cb+="&gt_ms="+aI}else{if(f&&f.timing&&f.timing.requestStart&&f.timing.responseEnd){cb+="&gt_ms="+(f.timing.responseEnd-f.timing.requestStart)}}}am(cy,cp,ce,cj,ci,w(cc)&&String(cc).length?cc:cs);bF(ck,"*",az,b2,aq);cb+=O(cA);if(bn.length){cb+="&"+bn}if(q(au)){cb=au(cb)}return cb}function bI(cc,cb,cg,cd,b9,cj){var ce="idgoal=0",cf,ca=new Date(),ch=[],ci;if(String(cc).length){ce+="&ec_id="+l(cc);cf=Math.round(ca.getTime()/1000)}ce+="&revenue="+cb;if(String(cg).length){ce+="&ec_st="+cg}if(String(cd).length){ce+="&ec_tx="+cd}if(String(b9).length){ce+="&ec_sh="+b9}if(String(cj).length){ce+="&ec_dt="+cj}if(bD){for(ci in bD){if(Object.prototype.hasOwnProperty.call(bD,ci)){if(!w(bD[ci][1])){bD[ci][1]=""}if(!w(bD[ci][2])){bD[ci][2]=""
-}if(!w(bD[ci][3])||String(bD[ci][3]).length===0){bD[ci][3]=0}if(!w(bD[ci][4])||String(bD[ci][4]).length===0){bD[ci][4]=1}ch.push(bD[ci])}}ce+="&ec_items="+l(JSON2.stringify(ch))}ce=aT(ce,an,"ecommerce",cf);aZ(ce,bm)}function bH(b9,cd,cc,cb,ca,ce){if(String(b9).length&&w(cd)){bI(b9,cd,cc,cb,ca,ce)}}function b0(b9){if(w(b9)){bI("",b9,"","","","")}}function bd(cc,cd){var b9=new Date(),cb=aT("action_name="+l(V(cc||aS)),cd,"log");aZ(cb,bm);if(aj&&aG&&!bv){bv=true;U(u,"click",bQ);U(u,"mouseup",bQ);U(u,"mousedown",bQ);U(u,"mousemove",bQ);U(u,"mousewheel",bQ);U(G,"DOMMouseScroll",bQ);U(G,"scroll",bQ);U(u,"keypress",bQ);U(u,"keydown",bQ);U(u,"keyup",bQ);U(G,"resize",bQ);U(G,"focus",bQ);U(G,"blur",bQ);bs=b9.getTime();setTimeout(function ca(){var ce;b9=new Date();if((bs+aG)>b9.getTime()){if(aj<b9.getTime()){ce=aT("ping=1",cd,"ping");aZ(ce,bm)}setTimeout(ca,aG)}},aG)}}function aH(cb,ca){var cc,b9="(^| )(piwik[_-]"+ca;if(cb){for(cc=0;cc<cb.length;cc++){b9+="|"+cb[cc]}}b9+=")( |$)";return new RegExp(b9)
-}function bB(b9){return(aa&&b9&&0===String(b9).indexOf(aa))}function bO(cc,b9,cd){if(bB(b9)){return 0}var cb=aH(be,"download"),ca=aH(aC,"link"),ce=new RegExp("\\.("+aU+")([?&#]|$)","i");if(ca.test(cc)){return"link"}if(cb.test(cc)||ce.test(b9)){return"download"}if(cd){return 0}return"link"}function a7(ca){var b9;b9=ca.parentNode;while(b9!==null&&w(b9)){if(Q.isLinkElement(ca)){break}ca=b9;b9=ca.parentNode}return ca}function bh(cd){cd=a7(cd);if(!Q.hasNodeAttribute(cd,"href")){return}if(!w(cd.href)){return}var cc=Q.getAttributeValueFromNode(cd,"href");if(bB(cc)){return}var ce=cd.hostname||b(cd.href);var cf=ce.toLowerCase();var ca=cd.href.replace(ce,cf);var cb=new RegExp("^(javascript|vbscript|jscript|mocha|livescript|ecmascript|mailto):","i");if(!cb.test(ca)){var b9=bO(cd.className,ca,bq(cf));if(b9){return{type:b9,href:ca}}}}function b5(b9,ca,cb,cc){var cd=m.buildInteractionRequestParams(b9,ca,cb,cc);if(!cd){return}return aT(cd,null,"contentInteraction")}function b4(cb,cc,cg,b9,ca){if(!w(cb)){return
-}if(bB(cb)){return cb}var ce=m.toAbsoluteUrl(cb);var cd="redirecturl="+l(ce)+"&";cd+=b5(cc,cg,b9,(ca||cb));var cf="&";if(aa.indexOf("?")<0){cf="?"}return aa+cf+cd}function a3(b9,ca){if(!b9||!ca){return false}var cb=m.findTargetNode(b9);if(m.shouldIgnoreInteraction(cb)){return false}cb=m.findTargetNodeNoDefault(b9);if(cb&&!H(cb,ca)){return false}return true}function aR(cb,ca,cd){if(!cb){return}var b9=m.findParentContentNode(cb);if(!b9){return}if(!a3(b9,cb)){return}var cc=m.buildContentBlock(b9);if(!cc){return}if(!cc.target&&cd){cc.target=cd}return m.buildInteractionRequestParams(ca,cc.name,cc.piece,cc.target)}function aO(ca){if(!ah||!ah.length){return false}var b9,cb;for(b9=0;b9<ah.length;b9++){cb=ah[b9];if(cb&&cb.name===ca.name&&cb.piece===ca.piece&&cb.target===ca.target){return true}}return false}function ac(cc){if(!cc){return false}var cf=m.findTargetNode(cc);if(!cf||m.shouldIgnoreInteraction(cf)){return false}var cg=bh(cf);if(bT&&cg&&cg.type){return false}if(Q.isLinkElement(cf)&&Q.hasNodeAttributeWithValue(cf,"href")){var b9=String(Q.getAttributeValueFromNode(cf,"href"));
-if(0===b9.indexOf("#")){return false}if(bB(b9)){return true}if(!m.isUrlToCurrentDomain(b9)){return false}var cd=m.buildContentBlock(cc);if(!cd){return}var cb=cd.name;var ch=cd.piece;var ce=cd.target;if(!Q.hasNodeAttributeWithValue(cf,m.CONTENT_TARGET_ATTR)||cf.wasContentTargetAttrReplaced){cf.wasContentTargetAttrReplaced=true;ce=m.toAbsoluteUrl(b9);Q.setAnyAttribute(cf,m.CONTENT_TARGET_ATTR,ce)}var ca=b4(b9,"click",cb,ch,ce);m.setHrefAttribute(cf,ca);return true}return false}function af(ca){if(!ca||!ca.length){return}var b9;for(b9=0;b9<ca.length;b9++){ac(ca[b9])}}function bg(b9){return function(ca){if(!b9){return}var cd=m.findParentContentNode(b9);var ce;if(ca){ce=ca.target||ca.srcElement}if(!ce){ce=b9}if(!a3(cd,ce)){return}bY(bm);if(Q.isLinkElement(b9)&&Q.hasNodeAttributeWithValue(b9,"href")&&Q.hasNodeAttributeWithValue(b9,m.CONTENT_TARGET_ATTR)){var cb=Q.getAttributeValueFromNode(b9,"href");if(!bB(cb)&&b9.wasContentTargetAttrReplaced){Q.setAnyAttribute(b9,m.CONTENT_TARGET_ATTR,"")}}var ci=bh(b9);
-if(by&&ci&&ci.type){return ci.type}if(ac(cd)){return"href"}var cf=m.buildContentBlock(cd);if(!cf){return}var cc=cf.name;var cj=cf.piece;var ch=cf.target;var cg=b5("click",cc,cj,ch);aZ(cg,bm);return cg}}function aF(cb){if(!cb||!cb.length){return}var b9,ca;for(b9=0;b9<cb.length;b9++){ca=m.findTargetNode(cb[b9]);if(ca&&!ca.contentInteractionTrackingSetupDone){ca.contentInteractionTrackingSetupDone=true;U(ca,"click",bg(ca))}}}function aB(cb,cc){if(!cb||!cb.length){return[]}var b9,ca;for(b9=0;b9<cb.length;b9++){if(aO(cb[b9])){cb.splice(b9,1);b9--}else{ah.push(cb[b9])}}if(!cb||!cb.length){return[]}af(cc);aF(cc);var cd=[];for(b9=0;b9<cb.length;b9++){ca=aT(m.buildImpressionRequestParams(cb[b9].name,cb[b9].piece,cb[b9].target),undefined,"contentImpressions");cd.push(ca)}return cd}function aW(ca){var b9=m.collectContent(ca);return aB(b9,ca)}function bA(ca){if(!ca||!ca.length){return[]}var b9;for(b9=0;b9<ca.length;b9++){if(!m.isNodeVisible(ca[b9])){ca.splice(b9,1);b9--}}if(!ca||!ca.length){return[]
-}return aW(ca)}function bM(cb,b9,ca){var cc=m.buildImpressionRequestParams(cb,b9,ca);return aT(cc,null,"contentImpression")}function aV(cc,ca){if(!cc){return}var b9=m.findParentContentNode(cc);var cb=m.buildContentBlock(b9);if(!cb){return}if(!ca){ca="Unknown"}return b5(ca,cb.name,cb.piece,cb.target)}function bw(ca,cc,b9,cb){return"e_c="+l(ca)+"&e_a="+l(cc)+(w(b9)?"&e_n="+l(b9):"")+(w(cb)?"&e_v="+l(cb):"")}function al(cb,cd,b9,cc,ce){if(String(cb).length===0||String(cd).length===0){return false}var ca=aT(bw(cb,cd,b9,cc),ce,"event");aZ(ca,bm)}function aN(b9,cc,ca,cd){var cb=aT("search="+l(b9)+(cc?"&search_cat="+l(cc):"")+(w(ca)?"&search_count="+ca:""),cd,"sitesearch");aZ(cb,bm)}function bk(b9,cc,cb){var ca=aT("idgoal="+b9+(cc?"&revenue="+cc:""),cb,"goal");aZ(ca,bm)}function bN(cc,b9,cg,cf,cb){var ce=b9+"="+l(bX(cc));var ca=aR(cb,"click",cc);if(ca){ce+="&"+ca}var cd=aT(ce,cg,"link");aZ(cd,(cf?0:bm),cf)}function bU(ca,b9){if(ca!==""){return ca+b9.charAt(0).toUpperCase()+b9.slice(1)}return b9
-}function aM(ce){var cd,b9,cc=["","webkit","ms","moz"],cb;if(!a0){for(b9=0;b9<cc.length;b9++){cb=cc[b9];if(Object.prototype.hasOwnProperty.call(u,bU(cb,"hidden"))){if(u[bU(cb,"visibilityState")]==="prerender"){cd=true}break}}}if(cd){U(u,cb+"visibilitychange",function ca(){u.removeEventListener(cb+"visibilitychange",ca,false);ce()});return}ce()}function aQ(b9){if(u.readyState==="complete"){b9()}else{if(G.addEventListener){G.addEventListener("load",b9)}else{if(G.attachEvent){G.attachEvent("onLoad",b9)}}}}function aA(ca){var b9=false;if(u.attachEvent){b9=u.readyState==="complete"}else{b9=u.readyState!=="loading"}if(b9){ca()}else{if(u.addEventListener){u.addEventListener("DOMContentLoaded",ca)}else{if(u.attachEvent){u.attachEvent("onreadystatechange",ca)}}}}function bC(b9){var ca=bh(b9);if(ca&&ca.type){ca.href=h(ca.href);bN(ca.href,ca.type,undefined,null,b9)}}function b7(b9){var ca,cb;b9=b9||G.event;ca=b9.which||b9.button;cb=b9.target||b9.srcElement;if(b9.type==="click"){if(cb){bC(cb)}}else{if(b9.type==="mousedown"){if((ca===1||ca===2)&&cb){bi=ca;
-at=cb}else{bi=at=null}}else{if(b9.type==="mouseup"){if(ca===bi&&cb===at){bC(cb)}bi=at=null}}}}function bz(ca,b9){if(b9){U(ca,"mouseup",b7,false);U(ca,"mousedown",b7,false)}else{U(ca,"click",b7,false)}}function bc(ca){if(!by){by=true;var cb,b9=aH(ai,"ignore"),cc=u.links;if(cc){for(cb=0;cb<cc.length;cb++){if(!b9.test(cc[cb].className)){bz(cc[cb],ca)}}}}}function bu(cb,cd,ce){if(ay){return true}ay=true;var cf=false;var cc,ca;function b9(){cf=true}aQ(function(){function cg(ci){setTimeout(function(){if(!ay){return}cf=false;ce.trackVisibleContentImpressions();cg(ci)},ci)}function ch(ci){setTimeout(function(){if(!ay){return}if(cf){cf=false;ce.trackVisibleContentImpressions()}ch(ci)},ci)}if(cb){cc=["scroll","resize"];for(ca=0;ca<cc.length;ca++){if(u.addEventListener){u.addEventListener(cc[ca],b9)}else{G.attachEvent("on"+cc[ca],b9)}}ch(100)}if(cd&&cd>0){cd=parseInt(cd,10);cg(cd)}})}function bZ(){var ca,cb,cc={pdf:"application/pdf",qt:"video/quicktime",realp:"audio/x-pn-realaudio-plugin",wma:"application/x-mplayer2",dir:"application/x-director",fla:"application/x-shockwave-flash",java:"application/x-java-vm",gears:"application/x-googlegears",ag:"application/x-silverlight"},b9=(new RegExp("Mac OS X.*Safari/")).test(e.userAgent)?G.devicePixelRatio||1:1;
-if(!((new RegExp("MSIE")).test(e.userAgent))){if(e.mimeTypes&&e.mimeTypes.length){for(ca in cc){if(Object.prototype.hasOwnProperty.call(cc,ca)){cb=e.mimeTypes[cc[ca]];bS[ca]=(cb&&cb.enabledPlugin)?"1":"0"}}}if(typeof navigator.javaEnabled!=="unknown"&&w(e.javaEnabled)&&e.javaEnabled()){bS.java="1"}if(q(G.GearsFactory)){bS.gears="1"}bS.cookie=ae()}bS.res=K.width*b9+"x"+K.height*b9}bZ();bj();return{getVisitorId:function(){return(Y())[1]},getVisitorInfo:function(){return Y()},getAttributionInfo:function(){return X()},getAttributionCampaignName:function(){return X()[0]},getAttributionCampaignKeyword:function(){return X()[1]},getAttributionReferrerTimestamp:function(){return X()[2]},getAttributionReferrerUrl:function(){return X()[3]},setTrackerUrl:function(b9){aa=b9},setSiteId:function(b9){bR=b9},setUserId:function(b9){aJ=b9},getUserId:function(){return aJ},setCustomData:function(b9,ca){if(J(b9)){an=b9}else{if(!an){an={}}an[b9]=ca}},getCustomData:function(){return an},setCustomRequestProcessing:function(b9){au=b9
-},appendToTrackingUrl:function(b9){bn=b9},getRequest:function(b9){return aT(b9)},addPlugin:function(b9,ca){a[b9]=ca},setCustomVariable:function(ca,b9,cd,cb){var cc;if(!w(cb)){cb="visit"}if(!w(b9)){return}if(!w(cd)){cd=""}if(ca>0){b9=!n(b9)?String(b9):b9;cd=!n(cd)?String(cd):cd;cc=[b9.slice(0,bW),cd.slice(0,bW)];if(cb==="visit"||cb===2){Z();ag[ca]=cc}else{if(cb==="page"||cb===3){bf[ca]=cc}else{if(cb==="event"){ab[ca]=cc}}}}},getCustomVariable:function(ca,cb){var b9;if(!w(cb)){cb="visit"}if(cb==="page"||cb===3){b9=bf[ca]}else{if(cb==="event"){b9=ab[ca]}else{if(cb==="visit"||cb===2){Z();b9=ag[ca]}}}if(!w(b9)||(b9&&b9[0]==="")){return false}return b9},deleteCustomVariable:function(b9,ca){if(this.getCustomVariable(b9,ca)){this.setCustomVariable(b9,"","",ca)}},storeCustomVariablesInCookie:function(){a5=true},setLinkTrackingTimer:function(b9){bm=b9},setDownloadExtensions:function(b9){aU=b9},addDownloadExtensions:function(b9){aU+="|"+b9},setDomains:function(b9){bo=n(b9)?[b9]:b9;bo.push(bL)},setIgnoreClasses:function(b9){ai=n(b9)?[b9]:b9
-},setRequestMethod:function(b9){br=b9||bp},setRequestContentType:function(b9){aK=b9||bb},setReferrerUrl:function(b9){bt=b9},setCustomUrl:function(b9){a6=bK(b3,b9)},setDocumentTitle:function(b9){aS=b9},setAPIUrl:function(b9){ax=b9},setDownloadClasses:function(b9){be=n(b9)?[b9]:b9},setLinkClasses:function(b9){aC=n(b9)?[b9]:b9},setCampaignNameKey:function(b9){aY=n(b9)?[b9]:b9},setCampaignKeywordKey:function(b9){aP=n(b9)?[b9]:b9},discardHashTag:function(b9){ak=b9},setCookieNamePrefix:function(b9){b1=b9;ag=ar()},setCookieDomain:function(b9){aq=y(b9);bj()},setCookiePath:function(b9){b2=b9;bj()},setVisitorCookieTimeout:function(b9){aw=b9*1000},setSessionCookieTimeout:function(b9){az=b9*1000},setReferralCookieTimeout:function(b9){a9=b9*1000},setConversionAttributionFirstReferrer:function(b9){a4=b9},disableCookies:function(){ao=true;bS.cookie="0"},deleteCookies:function(){W()},setDoNotTrack:function(ca){var b9=e.doNotTrack||e.msDoNotTrack;bV=ca&&(b9==="yes"||b9==="1");if(bV){this.disableCookies()
-}},addListener:function(ca,b9){bz(ca,b9)},enableLinkTracking:function(b9){bT=true;if(p){bc(b9)}else{E.push(function(){bc(b9)})}},enableJSErrorTracking:function(){if(b6){return}b6=true;var b9=G.onerror;G.onerror=function(ce,cc,cb,cd,ca){aM(function(){var cf="JavaScript Errors";var cg=cc+":"+cb;if(cd){cg+=":"+cd}al(cf,cg,ce)});if(b9){return b9(ce,cc,cb,cd,ca)}return false}},disablePerformanceTracking:function(){a1=false},setGenerationTimeMs:function(b9){aI=parseInt(b9,10)},setHeartBeatTimer:function(cb,ca){var b9=new Date();aj=b9.getTime()+cb*1000;aG=ca*1000},killFrame:function(){if(G.location!==G.top.location){G.top.location=G.location}},redirectFile:function(b9){if(G.location.protocol==="file:"){G.location=b9}},setCountPreRendered:function(b9){a0=b9},trackGoal:function(b9,cb,ca){aM(function(){bk(b9,cb,ca)})},trackLink:function(ca,b9,cc,cb){aM(function(){bN(ca,b9,cc,cb)})},trackPageView:function(b9,ca){ah=[];if(A(bR)){aM(function(){M(aa,ax,bR)})}else{aM(function(){bd(b9,ca)})}},trackAllContentImpressions:function(){if(A(bR)){return
-}aM(function(){aA(function(){var b9=m.findContentNodes();var ca=aW(b9);ap(ca,bm)})})},trackVisibleContentImpressions:function(b9,ca){if(A(bR)){return}if(!w(b9)){b9=true}if(!w(ca)){ca=750}bu(b9,ca,this);aM(function(){aQ(function(){var cb=m.findContentNodes();var cc=bA(cb);ap(cc,bm)})})},trackContentImpression:function(cb,b9,ca){if(A(bR)){return}if(!cb){return}b9=b9||"Unknown";aM(function(){var cc=bM(cb,b9,ca);aZ(cc,bm)})},trackContentImpressionsWithinNode:function(b9){if(A(bR)||!b9){return}aM(function(){if(ay){aQ(function(){var ca=m.findContentNodesWithinNode(b9);var cb=bA(ca);ap(cb,bm)})}else{aA(function(){var ca=m.findContentNodesWithinNode(b9);var cb=aW(ca);ap(cb,bm)})}})},trackContentInteraction:function(cb,cc,b9,ca){if(A(bR)){return}if(!cb||!cc){return}b9=b9||"Unknown";aM(function(){var cd=b5(cb,cc,b9,ca);aZ(cd,bm)})},trackContentInteractionNode:function(ca,b9){if(A(bR)||!ca){return}aM(function(){var cb=aV(ca,b9);aZ(cb,bm)})},trackEvent:function(ca,cc,b9,cb){aM(function(){al(ca,cc,b9,cb)
-})},trackSiteSearch:function(b9,cb,ca){aM(function(){aN(b9,cb,ca)})},setEcommerceView:function(cc,b9,cb,ca){if(!w(cb)||!cb.length){cb=""}else{if(cb instanceof Array){cb=JSON2.stringify(cb)}}bf[5]=["_pkc",cb];if(w(ca)&&String(ca).length){bf[2]=["_pkp",ca]}if((!w(cc)||!cc.length)&&(!w(b9)||!b9.length)){return}if(w(cc)&&cc.length){bf[3]=["_pks",cc]}if(!w(b9)||!b9.length){b9=""}bf[4]=["_pkn",b9]},addEcommerceItem:function(cd,b9,cb,ca,cc){if(cd.length){bD[cd]=[cd,b9,cb,ca,cc]}},trackEcommerceOrder:function(b9,cd,cc,cb,ca,ce){bH(b9,cd,cc,cb,ca,ce)},trackEcommerceCartUpdate:function(b9){b0(b9)}}}function v(){return{push:R}}U(G,"beforeunload",S,false);o();Date.prototype.getTimeAlias=Date.prototype.getTime;L=new D();var r={setTrackerUrl:1,setAPIUrl:1,setSiteId:1,disableCookies:1,enableLinkTracking:1};var d;for(t=0;t<_paq.length;t++){d=_paq[t][0];if(r[d]){R(_paq[t]);delete _paq[t];if(r[d]>1){if(console!==undefined&&console&&console.error){console.error("The method "+d+' is registered more than once in "_paq" variable. Only the last call has an effect. Please have a look at the multiple Piwik trackers documentation: http://developer.piwik.org/api-reference/tracking-javascript#multiple-piwik-trackers')
-}}r[d]++}}for(t=0;t<_paq.length;t++){if(_paq[t]){R(_paq[t])}}_paq=new v();c={addPlugin:function(W,X){a[W]=X},getTracker:function(W,X){return new D(W,X,L.getVisitorId())},getAsyncTracker:function(){return L}};if(typeof define==="function"&&define.amd){define("piwik",[],function(){return c})}return c}())}if(window&&window.piwikAsyncInit){window.piwikAsyncInit()}(function(){var a=(typeof AnalyticsTracker);if(a==="undefined"){AnalyticsTracker=Piwik}}());if(typeof piwik_log!=="function"){piwik_log=function(b,f,d,g){function a(h){try{return eval("piwik_"+h)}catch(i){}return}var c,e=Piwik.getTracker(d,f);e.setDocumentTitle(b);e.setCustomData(g);c=a("tracker_pause");if(c){e.setLinkTrackingTimer(c)}c=a("download_extensions");if(c){e.setDownloadExtensions(c)}c=a("hosts_alias");if(c){e.setDomains(c)}c=a("ignore_classes");if(c){e.setIgnoreClasses(c)}e.trackPageView();if(a("install_tracker")){piwik_track=function(i,k,j,h){e.setSiteId(k);e.setTrackerUrl(j);e.trackLink(i,h)};e.enableLinkTracking()
-}};
+G.name=W+"###"+ac+"###"+X}var ab=G.name.split("###");return ab.length===3&&ab[0]===W}function M(X,ac,Z){var ab=G.name.split("###"),aa=ab[1],W=ab[2],Y=B(X,ac);i(Y+"plugins/Overlay/client/client.js?v=1",function(){Piwik_Overlay_Client.initialize(Y,Z,aa,W)})}function D(aE,bm){var ad=N(u.domain,G.location.href,x()),bM=y(ad[0]),b4=F(ad[1]),bu=F(ad[2]),b8=false,bq="GET",bs=bq,bc="application/x-www-form-urlencoded; charset=UTF-8",aK=bc,aa=aE||"",ax="",bo="",bS=bm||"",aJ="",a2="",a7,aS=u.title,aU="7z|aac|apk|ar[cj]|as[fx]|avi|azw3|bin|csv|deb|dmg|docx?|epub|exe|flv|gif|gz|gzip|hqx|jar|jpe?g|js|mobi|mp(2|3|4|e?g)|mov(ie)?|ms[ip]|od[bfgpst]|og[gv]|pdf|phps|png|pptx?|qtm?|ra[mr]?|rpm|sea|sit|tar|t?bz2?|tgz|torrent|txt|wav|wm[av]|wpd||xlsx?|xml|z|zip",bp=[bM],ai=[],bf=[],aC=[],bn=500,aj,aG,ak,an,aY=["pk_campaign","piwik_campaign","utm_campaign","utm_source","utm_medium"],aP=["pk_kwd","piwik_kwd","utm_term"],b2="_pk_",aq,b3,ao=false,bW,a0,a5,aw=33955200000,az=1800000,ba=15768000000,a1=true,aI=0,a6=false,ag=false,au,bg={},ab={},bX=200,bF={},bT={},ah=[],ay=false,a9=false,bz=false,bU=false,bw=false,bt,bj,at,aX=T,by;
+function bH(ch,ce,cd,cg,cc,cf){if(ao){return}var cb;if(cd){cb=new Date();cb.setTime(cb.getTime()+cd)}u.cookie=ch+"="+l(ce)+(cd?";expires="+cb.toGMTString():"")+";path="+(cg||"/")+(cc?";domain="+cc:"")+(cf?";secure":"")}function av(cd){if(ao){return 0}var cb=new RegExp("(^|;)[ ]*"+cd+"=([^;]*)"),cc=cb.exec(u.cookie);return cc?F(cc[2]):0}function bY(cb){var cc;if(ak){cc=new RegExp("#.*");return cb.replace(cc,"")}return cb}function bL(cd,cb){var ce=k(cb),cc;if(ce){return cb}if(cb.slice(0,1)==="/"){return k(cd)+"://"+b(cd)+cb}cd=bY(cd);cc=cd.indexOf("?");if(cc>=0){cd=cd.slice(0,cc)}cc=cd.lastIndexOf("/");if(cc!==cd.length-1){cd=cd.slice(0,cc+1)}return cd+cb}function br(ce){var cc,cb,cd;for(cc=0;cc<bp.length;cc++){cb=y(bp[cc].toLowerCase());if(ce===cb){return true}if(cb.slice(0,1)==="."){if(ce===cb.slice(1)){return true}cd=ce.length-cb.length;if((cd>0)&&(ce.slice(cd)===cb)){return true}}}return false}function ca(cb,cd){var cc=new Image(1,1);cc.onload=function(){t=0;if(typeof cd==="function"){cd()
+}};cc.src=aa+(aa.indexOf("?")<0?"?":"&")+cb}function bI(cc,cf,cb){if(!w(cb)||null===cb){cb=true}try{var ce=G.XMLHttpRequest?new G.XMLHttpRequest():G.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):null;ce.open("POST",aa,true);ce.onreadystatechange=function(){if(this.readyState===4&&!(this.status>=200&&this.status<300)&&cb){ca(cc,cf)}else{if(typeof cf==="function"){cf()}}};ce.setRequestHeader("Content-Type",aK);ce.send(cc)}catch(cd){if(cb){ca(cc,cf)}}}function bZ(cc){var cb=new Date();var cd=cb.getTime()+cc;if(!j||cd>j){j=cd}}function aD(cf){var cc=new Date();var cb=cc.getTime();if(a9&&cb<a9){var cd=a9-cb;setTimeout(cf,cd);bZ(cd+50);a9+=50;return}if(a9===false){var ce=800;a9=cb+ce}cf()}function aZ(cc,cb,cd){if(!bW&&cc){aD(function(){if(bs==="POST"){bI(cc,cd)}else{ca(cc,cd)}bZ(cb)})}}function bb(cb){if(bW){return false}return(cb&&cb.length)}function ap(cd,cb){if(!bb(cd)){return}var cc='{"requests":["?'+cd.join('","?')+'"]}';aD(function(){bI(cc,null,false);bZ(cb)})}function bG(cb){return b2+cb+"."+bS+"."+by
+}function ae(){if(ao){return"0"}if(!w(e.cookieEnabled)){var cb=bG("testcookie");bH(cb,"1");return av(cb)==="1"?"1":"0"}return e.cookieEnabled?"1":"0"}function bk(){by=aX((aq||bM)+(b3||"/")).slice(0,4)}function ar(){var cc=bG("cvar"),cb=av(cc);if(cb.length){cb=JSON2.parse(cb);if(J(cb)){return cb}}return{}}function Z(){if(ag===false){ag=ar()}}function bR(){var cb=new Date();bt=cb.getTime()}function Y(){var cd=new Date(),cb=Math.round(cd.getTime()/1000),cc=bG("id"),cg=av(cc),cf,ce;if(cg){cf=cg.split(".");cf.unshift("0");if(a2.length){cf[1]=a2}return cf}if(a2.length){ce=a2}else{ce=aX((e.userAgent||"")+(e.platform||"")+JSON2.stringify(bT)+cd.getTime()+Math.random()).slice(0,16)}cf=["1",ce,cb,0,cb,"",""];return cf}function bB(){var ci=Y(),ce=ci[0],cf=ci[1],cc=ci[2],cb=ci[3],cg=ci[4],cd=ci[5];if(!w(ci[6])){ci[6]=""}var ch=ci[6];return{newVisitor:ce,uuid:cf,createTs:cc,visitCount:cb,currentVisitTs:cg,lastVisitTs:cd,lastEcommerceOrderTs:ch}}function aL(){var ce=new Date(),cc=ce.getTime(),cf=bB().createTs;
+var cb=parseInt(cf,10);var cd=(cb*1000)+aw-cc;return cd}function am(cb){if(!bS){return}var cd=new Date(),cc=Math.round(cd.getTime()/1000);if(!w(cb)){cb=bB()}var ce=cb.uuid+"."+cb.createTs+"."+cb.visitCount+"."+cc+"."+cb.lastVisitTs+"."+cb.lastEcommerceOrderTs;bH(bG("id"),ce,aL(),b3,aq)}function X(){var cb=av(bG("ref"));if(cb.length){try{cb=JSON2.parse(cb);if(J(cb)){return cb}}catch(cc){}}return["","",0,""]}function W(){var cb=ao;ao=false;bH(bG("id"),"",-86400,b3,aq);bH(bG("ses"),"",-86400,b3,aq);bH(bG("cvar"),"",-86400,b3,aq);bH(bG("ref"),"",-86400,b3,aq);ao=cb}function b7(cb){bS=cb;am()}function bQ(cf){if(!cf||!J(cf)){return}var ce=[];var cd;for(cd in cf){if(Object.prototype.hasOwnProperty.call(cf,cd)){ce.push(cd)}}var cg={};ce.sort();var cb=ce.length;var cc;for(cc=0;cc<cb;cc++){cg[ce[cc]]=cf[ce[cc]]}return cg}function a4(){bH(bG("ses"),"*",az,b3,aq)}function aT(cd,cw,cx,ce){var cv,cc=new Date(),ck=Math.round(cc.getTime()/1000),ch,cu,cf=1024,cB,cl,cs=ag,cg=bG("ses"),cq=bG("ref"),cn=bG("cvar"),co=av(cg),ct=X(),cz=a7||b4,ci,cb;
+if(ao){W()}if(bW){return""}var cp=bB();if(!w(ce)){ce=""}var cm=u.characterSet||u.charset;if(!cm||cm.toLowerCase()==="utf-8"){cm=null}ci=ct[0];cb=ct[1];ch=ct[2];cu=ct[3];if(!co){var cy=az/1000;if(!cp.lastVisitTs||(ck-cp.lastVisitTs)>cy){cp.visitCount++;cp.lastVisitTs=cp.currentVisitTs}if(!a5||!ci.length){for(cv in aY){if(Object.prototype.hasOwnProperty.call(aY,cv)){ci=I(cz,aY[cv]);if(ci.length){break}}}for(cv in aP){if(Object.prototype.hasOwnProperty.call(aP,cv)){cb=I(cz,aP[cv]);if(cb.length){break}}}}cB=b(bu);cl=cu.length?b(cu):"";if(cB.length&&!br(cB)&&(!a5||!cl.length||br(cl))){cu=bu}if(cu.length||ci.length){ch=ck;ct=[ci,cb,ch,bY(cu.slice(0,cf))];bH(cq,JSON2.stringify(ct),ba,b3,aq)}}cd+="&idsite="+bS+"&rec=1&r="+String(Math.random()).slice(2,8)+"&h="+cc.getHours()+"&m="+cc.getMinutes()+"&s="+cc.getSeconds()+"&url="+l(bY(cz))+(bu.length?"&urlref="+l(bY(bu)):"")+((aJ&&aJ.length)?"&uid="+l(aJ):"")+"&_id="+cp.uuid+"&_idts="+cp.createTs+"&_idvc="+cp.visitCount+"&_idn="+cp.newVisitor+(ci.length?"&_rcn="+l(ci):"")+(cb.length?"&_rck="+l(cb):"")+"&_refts="+ch+"&_viewts="+cp.lastVisitTs+(String(cp.lastEcommerceOrderTs).length?"&_ects="+cp.lastEcommerceOrderTs:"")+(String(cu).length?"&_ref="+l(bY(cu.slice(0,cf))):"")+(cm?"&cs="+l(cm):"")+"&send_image=0";
+for(cv in bT){if(Object.prototype.hasOwnProperty.call(bT,cv)){cd+="&"+cv+"="+bT[cv]}}if(cw){cd+="&data="+l(JSON2.stringify(cw))}else{if(an){cd+="&data="+l(JSON2.stringify(an))}}function cj(cC,cD){var cE=JSON2.stringify(cC);if(cE.length>2){return"&"+cD+"="+l(cE)}return""}var cA=bQ(bg);var cr=bQ(ab);cd+=cj(cA,"cvar");cd+=cj(cr,"e_cvar");if(ag){cd+=cj(ag,"_cvar");for(cv in cs){if(Object.prototype.hasOwnProperty.call(cs,cv)){if(ag[cv][0]===""||ag[cv][1]===""){delete ag[cv]}}}if(a6){bH(cn,JSON2.stringify(ag),az,b3,aq)}}if(a1){if(aI){cd+="&gt_ms="+aI}else{if(f&&f.timing&&f.timing.requestStart&&f.timing.responseEnd){cd+="&gt_ms="+(f.timing.responseEnd-f.timing.requestStart)}}}cp.lastEcommerceOrderTs=w(ce)&&String(ce).length?ce:cp.lastEcommerceOrderTs;am(cp);a4();cd+=O(cx);if(bo.length){cd+="&"+bo}if(q(au)){cd=au(cd)}return cd}function bK(ce,cd,ci,cf,cb,cl){var cg="idgoal=0",ch,cc=new Date(),cj=[],ck;if(String(ce).length){cg+="&ec_id="+l(ce);ch=Math.round(cc.getTime()/1000)}cg+="&revenue="+cd;if(String(ci).length){cg+="&ec_st="+ci
+}if(String(cf).length){cg+="&ec_tx="+cf}if(String(cb).length){cg+="&ec_sh="+cb}if(String(cl).length){cg+="&ec_dt="+cl}if(bF){for(ck in bF){if(Object.prototype.hasOwnProperty.call(bF,ck)){if(!w(bF[ck][1])){bF[ck][1]=""}if(!w(bF[ck][2])){bF[ck][2]=""}if(!w(bF[ck][3])||String(bF[ck][3]).length===0){bF[ck][3]=0}if(!w(bF[ck][4])||String(bF[ck][4]).length===0){bF[ck][4]=1}cj.push(bF[ck])}}cg+="&ec_items="+l(JSON2.stringify(cj))}cg=aT(cg,an,"ecommerce",ch);aZ(cg,bn)}function bJ(cb,cf,ce,cd,cc,cg){if(String(cb).length&&w(cf)){bK(cb,cf,ce,cd,cc,cg)}}function b1(cb){if(w(cb)){bK("",cb,"","","","")}}function be(ce,cf){var cb=new Date(),cd=aT("action_name="+l(V(ce||aS)),cf,"log");aZ(cd,bn);if(aj&&aG&&!bw){bw=true;U(u,"click",bR);U(u,"mouseup",bR);U(u,"mousedown",bR);U(u,"mousemove",bR);U(u,"mousewheel",bR);U(G,"DOMMouseScroll",bR);U(G,"scroll",bR);U(u,"keypress",bR);U(u,"keydown",bR);U(u,"keyup",bR);U(G,"resize",bR);U(G,"focus",bR);U(G,"blur",bR);bt=cb.getTime();setTimeout(function cc(){var cg;cb=new Date();
+if((bt+aG)>cb.getTime()){if(aj<cb.getTime()){cg=aT("ping=1",cf,"ping");aZ(cg,bn)}setTimeout(cc,aG)}},aG)}}function aH(cd,cc){var ce,cb="(^| )(piwik[_-]"+cc;if(cd){for(ce=0;ce<cd.length;ce++){cb+="|"+cd[ce]}}cb+=")( |$)";return new RegExp(cb)}function bD(cb){return(aa&&cb&&0===String(cb).indexOf(aa))}function bP(ce,cb,cf){if(bD(cb)){return 0}var cd=aH(bf,"download"),cc=aH(aC,"link"),cg=new RegExp("\\.("+aU+")([?&#]|$)","i");if(cc.test(ce)){return"link"}if(cd.test(ce)||cg.test(cb)){return"download"}if(cf){return 0}return"link"}function a8(cc){var cb;cb=cc.parentNode;while(cb!==null&&w(cb)){if(Q.isLinkElement(cc)){break}cc=cb;cb=cc.parentNode}return cc}function bi(cf){cf=a8(cf);if(!Q.hasNodeAttribute(cf,"href")){return}if(!w(cf.href)){return}var ce=Q.getAttributeValueFromNode(cf,"href");if(bD(ce)){return}var cg=cf.hostname||b(cf.href);var ch=cg.toLowerCase();var cc=cf.href.replace(cg,ch);var cd=new RegExp("^(javascript|vbscript|jscript|mocha|livescript|ecmascript|mailto):","i");if(!cd.test(cc)){var cb=bP(cf.className,cc,br(ch));
+if(cb){return{type:cb,href:cc}}}}function b6(cb,cc,cd,ce){var cf=m.buildInteractionRequestParams(cb,cc,cd,ce);if(!cf){return}return aT(cf,null,"contentInteraction")}function b5(cd,ce,ci,cb,cc){if(!w(cd)){return}if(bD(cd)){return cd}var cg=m.toAbsoluteUrl(cd);var cf="redirecturl="+l(cg)+"&";cf+=b6(ce,ci,cb,(cc||cd));var ch="&";if(aa.indexOf("?")<0){ch="?"}return aa+ch+cf}function a3(cb,cc){if(!cb||!cc){return false}var cd=m.findTargetNode(cb);if(m.shouldIgnoreInteraction(cd)){return false}cd=m.findTargetNodeNoDefault(cb);if(cd&&!H(cd,cc)){return false}return true}function aR(cd,cc,cf){if(!cd){return}var cb=m.findParentContentNode(cd);if(!cb){return}if(!a3(cb,cd)){return}var ce=m.buildContentBlock(cb);if(!ce){return}if(!ce.target&&cf){ce.target=cf}return m.buildInteractionRequestParams(cc,ce.name,ce.piece,ce.target)}function aO(cc){if(!ah||!ah.length){return false}var cb,cd;for(cb=0;cb<ah.length;cb++){cd=ah[cb];if(cd&&cd.name===cc.name&&cd.piece===cc.piece&&cd.target===cc.target){return true
+}}return false}function ac(ce){if(!ce){return false}var ch=m.findTargetNode(ce);if(!ch||m.shouldIgnoreInteraction(ch)){return false}var ci=bi(ch);if(bU&&ci&&ci.type){return false}if(Q.isLinkElement(ch)&&Q.hasNodeAttributeWithValue(ch,"href")){var cb=String(Q.getAttributeValueFromNode(ch,"href"));if(0===cb.indexOf("#")){return false}if(bD(cb)){return true}if(!m.isUrlToCurrentDomain(cb)){return false}var cf=m.buildContentBlock(ce);if(!cf){return}var cd=cf.name;var cj=cf.piece;var cg=cf.target;if(!Q.hasNodeAttributeWithValue(ch,m.CONTENT_TARGET_ATTR)||ch.wasContentTargetAttrReplaced){ch.wasContentTargetAttrReplaced=true;cg=m.toAbsoluteUrl(cb);Q.setAnyAttribute(ch,m.CONTENT_TARGET_ATTR,cg)}var cc=b5(cb,"click",cd,cj,cg);m.setHrefAttribute(ch,cc);return true}return false}function af(cc){if(!cc||!cc.length){return}var cb;for(cb=0;cb<cc.length;cb++){ac(cc[cb])}}function bh(cb){return function(cc){if(!cb){return}var cf=m.findParentContentNode(cb);var cg;if(cc){cg=cc.target||cc.srcElement}if(!cg){cg=cb
+}if(!a3(cf,cg)){return}bZ(bn);if(Q.isLinkElement(cb)&&Q.hasNodeAttributeWithValue(cb,"href")&&Q.hasNodeAttributeWithValue(cb,m.CONTENT_TARGET_ATTR)){var cd=Q.getAttributeValueFromNode(cb,"href");if(!bD(cd)&&cb.wasContentTargetAttrReplaced){Q.setAnyAttribute(cb,m.CONTENT_TARGET_ATTR,"")}}var ck=bi(cb);if(bz&&ck&&ck.type){return ck.type}if(ac(cf)){return"href"}var ch=m.buildContentBlock(cf);if(!ch){return}var ce=ch.name;var cl=ch.piece;var cj=ch.target;var ci=b6("click",ce,cl,cj);aZ(ci,bn);return ci}}function aF(cd){if(!cd||!cd.length){return}var cb,cc;for(cb=0;cb<cd.length;cb++){cc=m.findTargetNode(cd[cb]);if(cc&&!cc.contentInteractionTrackingSetupDone){cc.contentInteractionTrackingSetupDone=true;U(cc,"click",bh(cc))}}}function aB(cd,ce){if(!cd||!cd.length){return[]}var cb,cc;for(cb=0;cb<cd.length;cb++){if(aO(cd[cb])){cd.splice(cb,1);cb--}else{ah.push(cd[cb])}}if(!cd||!cd.length){return[]}af(ce);aF(ce);var cf=[];for(cb=0;cb<cd.length;cb++){cc=aT(m.buildImpressionRequestParams(cd[cb].name,cd[cb].piece,cd[cb].target),undefined,"contentImpressions");
+cf.push(cc)}return cf}function aW(cc){var cb=m.collectContent(cc);return aB(cb,cc)}function bC(cc){if(!cc||!cc.length){return[]}var cb;for(cb=0;cb<cc.length;cb++){if(!m.isNodeVisible(cc[cb])){cc.splice(cb,1);cb--}}if(!cc||!cc.length){return[]}return aW(cc)}function bN(cd,cb,cc){var ce=m.buildImpressionRequestParams(cd,cb,cc);return aT(ce,null,"contentImpression")}function aV(ce,cc){if(!ce){return}var cb=m.findParentContentNode(ce);var cd=m.buildContentBlock(cb);if(!cd){return}if(!cc){cc="Unknown"}return b6(cc,cd.name,cd.piece,cd.target)}function bx(cc,ce,cb,cd){return"e_c="+l(cc)+"&e_a="+l(ce)+(w(cb)?"&e_n="+l(cb):"")+(w(cd)?"&e_v="+l(cd):"")}function al(cd,cf,cb,ce,cg){if(String(cd).length===0||String(cf).length===0){return false}var cc=aT(bx(cd,cf,cb,ce),cg,"event");aZ(cc,bn)}function aN(cb,ce,cc,cf){var cd=aT("search="+l(cb)+(ce?"&search_cat="+l(ce):"")+(w(cc)?"&search_count="+cc:""),cf,"sitesearch");aZ(cd,bn)}function bl(cb,ce,cd){var cc=aT("idgoal="+cb+(ce?"&revenue="+ce:""),cd,"goal");
+aZ(cc,bn)}function bO(ce,cb,ci,ch,cd){var cg=cb+"="+l(bY(ce));var cc=aR(cd,"click",ce);if(cc){cg+="&"+cc}var cf=aT(cg,ci,"link");aZ(cf,(ch?0:bn),ch)}function bV(cc,cb){if(cc!==""){return cc+cb.charAt(0).toUpperCase()+cb.slice(1)}return cb}function aM(cg){var cf,cb,ce=["","webkit","ms","moz"],cd;if(!a0){for(cb=0;cb<ce.length;cb++){cd=ce[cb];if(Object.prototype.hasOwnProperty.call(u,bV(cd,"hidden"))){if(u[bV(cd,"visibilityState")]==="prerender"){cf=true}break}}}if(cf){U(u,cd+"visibilitychange",function cc(){u.removeEventListener(cd+"visibilitychange",cc,false);cg()});return}cg()}function aQ(cb){if(u.readyState==="complete"){cb()}else{if(G.addEventListener){G.addEventListener("load",cb)}else{if(G.attachEvent){G.attachEvent("onLoad",cb)}}}}function aA(cc){var cb=false;if(u.attachEvent){cb=u.readyState==="complete"}else{cb=u.readyState!=="loading"}if(cb){cc()}else{if(u.addEventListener){u.addEventListener("DOMContentLoaded",cc)}else{if(u.attachEvent){u.attachEvent("onreadystatechange",cc)}}}}function bE(cb){var cc=bi(cb);
+if(cc&&cc.type){cc.href=h(cc.href);bO(cc.href,cc.type,undefined,null,cb)}}function b9(cb){var cc,cd;cb=cb||G.event;cc=cb.which||cb.button;cd=cb.target||cb.srcElement;if(cb.type==="click"){if(cd){bE(cd)}}else{if(cb.type==="mousedown"){if((cc===1||cc===2)&&cd){bj=cc;at=cd}else{bj=at=null}}else{if(cb.type==="mouseup"){if(cc===bj&&cd===at){bE(cd)}bj=at=null}}}}function bA(cc,cb){if(cb){U(cc,"mouseup",b9,false);U(cc,"mousedown",b9,false)}else{U(cc,"click",b9,false)}}function bd(cc){if(!bz){bz=true;var cd,cb=aH(ai,"ignore"),ce=u.links;if(ce){for(cd=0;cd<ce.length;cd++){if(!cb.test(ce[cd].className)){bA(ce[cd],cc)}}}}}function bv(cd,cf,cg){if(ay){return true}ay=true;var ch=false;var ce,cc;function cb(){ch=true}aQ(function(){function ci(ck){setTimeout(function(){if(!ay){return}ch=false;cg.trackVisibleContentImpressions();ci(ck)},ck)}function cj(ck){setTimeout(function(){if(!ay){return}if(ch){ch=false;cg.trackVisibleContentImpressions()}cj(ck)},ck)}if(cd){ce=["scroll","resize"];for(cc=0;cc<ce.length;
+cc++){if(u.addEventListener){u.addEventListener(ce[cc],cb)}else{G.attachEvent("on"+ce[cc],cb)}}cj(100)}if(cf&&cf>0){cf=parseInt(cf,10);ci(cf)}})}function b0(){var cc,cd,ce={pdf:"application/pdf",qt:"video/quicktime",realp:"audio/x-pn-realaudio-plugin",wma:"application/x-mplayer2",dir:"application/x-director",fla:"application/x-shockwave-flash",java:"application/x-java-vm",gears:"application/x-googlegears",ag:"application/x-silverlight"},cb=(new RegExp("Mac OS X.*Safari/")).test(e.userAgent)?G.devicePixelRatio||1:1;if(!((new RegExp("MSIE")).test(e.userAgent))){if(e.mimeTypes&&e.mimeTypes.length){for(cc in ce){if(Object.prototype.hasOwnProperty.call(ce,cc)){cd=e.mimeTypes[ce[cc]];bT[cc]=(cd&&cd.enabledPlugin)?"1":"0"}}}if(typeof navigator.javaEnabled!=="unknown"&&w(e.javaEnabled)&&e.javaEnabled()){bT.java="1"}if(q(G.GearsFactory)){bT.gears="1"}bT.cookie=ae()}bT.res=K.width*cb+"x"+K.height*cb}b0();bk();am();return{getVisitorId:function(){return bB().uuid},getVisitorInfo:function(){return Y()
+},getAttributionInfo:function(){return X()},getAttributionCampaignName:function(){return X()[0]},getAttributionCampaignKeyword:function(){return X()[1]},getAttributionReferrerTimestamp:function(){return X()[2]},getAttributionReferrerUrl:function(){return X()[3]},setTrackerUrl:function(cb){aa=cb},getTrackerUrl:function(){return aa},getSiteId:function(){return bS},setSiteId:function(cb){b7(cb)},setUserId:function(cb){aJ=cb;a2=aX(aJ).substr(0,16)},getUserId:function(){return aJ},setCustomData:function(cb,cc){if(J(cb)){an=cb}else{if(!an){an={}}an[cb]=cc}},getCustomData:function(){return an},setCustomRequestProcessing:function(cb){au=cb},appendToTrackingUrl:function(cb){bo=cb},getRequest:function(cb){return aT(cb)},addPlugin:function(cb,cc){a[cb]=cc},setCustomVariable:function(cc,cb,cf,cd){var ce;if(!w(cd)){cd="visit"}if(!w(cb)){return}if(!w(cf)){cf=""}if(cc>0){cb=!n(cb)?String(cb):cb;cf=!n(cf)?String(cf):cf;ce=[cb.slice(0,bX),cf.slice(0,bX)];if(cd==="visit"||cd===2){Z();ag[cc]=ce}else{if(cd==="page"||cd===3){bg[cc]=ce
+}else{if(cd==="event"){ab[cc]=ce}}}}},getCustomVariable:function(cc,cd){var cb;if(!w(cd)){cd="visit"}if(cd==="page"||cd===3){cb=bg[cc]}else{if(cd==="event"){cb=ab[cc]}else{if(cd==="visit"||cd===2){Z();cb=ag[cc]}}}if(!w(cb)||(cb&&cb[0]==="")){return false}return cb},deleteCustomVariable:function(cb,cc){if(this.getCustomVariable(cb,cc)){this.setCustomVariable(cb,"","",cc)}},storeCustomVariablesInCookie:function(){a6=true},setLinkTrackingTimer:function(cb){bn=cb},setDownloadExtensions:function(cb){aU=cb},addDownloadExtensions:function(cb){aU+="|"+cb},setDomains:function(cb){bp=n(cb)?[cb]:cb;bp.push(bM)},setIgnoreClasses:function(cb){ai=n(cb)?[cb]:cb},setRequestMethod:function(cb){bs=cb||bq},setRequestContentType:function(cb){aK=cb||bc},setReferrerUrl:function(cb){bu=cb},setCustomUrl:function(cb){a7=bL(b4,cb)},setDocumentTitle:function(cb){aS=cb},setAPIUrl:function(cb){ax=cb},setDownloadClasses:function(cb){bf=n(cb)?[cb]:cb},setLinkClasses:function(cb){aC=n(cb)?[cb]:cb},setCampaignNameKey:function(cb){aY=n(cb)?[cb]:cb
+},setCampaignKeywordKey:function(cb){aP=n(cb)?[cb]:cb},discardHashTag:function(cb){ak=cb},setCookieNamePrefix:function(cb){b2=cb;ag=ar()},setCookieDomain:function(cb){aq=y(cb);bk()},setCookiePath:function(cb){b3=cb;bk()},setVisitorCookieTimeout:function(cb){aw=cb*1000},setSessionCookieTimeout:function(cb){az=cb*1000},setReferralCookieTimeout:function(cb){ba=cb*1000},setConversionAttributionFirstReferrer:function(cb){a5=cb},disableCookies:function(){ao=true;bT.cookie="0"},deleteCookies:function(){W()},setDoNotTrack:function(cc){var cb=e.doNotTrack||e.msDoNotTrack;bW=cc&&(cb==="yes"||cb==="1");if(bW){this.disableCookies()}},addListener:function(cc,cb){bA(cc,cb)},enableLinkTracking:function(cb){bU=true;if(p){bd(cb)}else{E.push(function(){bd(cb)})}},enableJSErrorTracking:function(){if(b8){return}b8=true;var cb=G.onerror;G.onerror=function(cg,ce,cd,cf,cc){aM(function(){var ch="JavaScript Errors";var ci=ce+":"+cd;if(cf){ci+=":"+cf}al(ch,ci,cg)});if(cb){return cb(cg,ce,cd,cf,cc)}return false}},disablePerformanceTracking:function(){a1=false
+},setGenerationTimeMs:function(cb){aI=parseInt(cb,10)},setHeartBeatTimer:function(cd,cc){var cb=new Date();aj=cb.getTime()+cd*1000;aG=cc*1000},killFrame:function(){if(G.location!==G.top.location){G.top.location=G.location}},redirectFile:function(cb){if(G.location.protocol==="file:"){G.location=cb}},setCountPreRendered:function(cb){a0=cb},trackGoal:function(cb,cd,cc){aM(function(){bl(cb,cd,cc)})},trackLink:function(cc,cb,ce,cd){aM(function(){bO(cc,cb,ce,cd)})},trackPageView:function(cb,cc){ah=[];if(A(bS)){aM(function(){M(aa,ax,bS)})}else{aM(function(){be(cb,cc)})}},trackAllContentImpressions:function(){if(A(bS)){return}aM(function(){aA(function(){var cb=m.findContentNodes();var cc=aW(cb);ap(cc,bn)})})},trackVisibleContentImpressions:function(cb,cc){if(A(bS)){return}if(!w(cb)){cb=true}if(!w(cc)){cc=750}bv(cb,cc,this);aM(function(){aQ(function(){var cd=m.findContentNodes();var ce=bC(cd);ap(ce,bn)})})},trackContentImpression:function(cd,cb,cc){if(A(bS)){return}if(!cd){return}cb=cb||"Unknown";
+aM(function(){var ce=bN(cd,cb,cc);aZ(ce,bn)})},trackContentImpressionsWithinNode:function(cb){if(A(bS)||!cb){return}aM(function(){if(ay){aQ(function(){var cc=m.findContentNodesWithinNode(cb);var cd=bC(cc);ap(cd,bn)})}else{aA(function(){var cc=m.findContentNodesWithinNode(cb);var cd=aW(cc);ap(cd,bn)})}})},trackContentInteraction:function(cd,ce,cb,cc){if(A(bS)){return}if(!cd||!ce){return}cb=cb||"Unknown";aM(function(){var cf=b6(cd,ce,cb,cc);aZ(cf,bn)})},trackContentInteractionNode:function(cc,cb){if(A(bS)||!cc){return}aM(function(){var cd=aV(cc,cb);aZ(cd,bn)})},trackEvent:function(cc,ce,cb,cd){aM(function(){al(cc,ce,cb,cd)})},trackSiteSearch:function(cb,cd,cc){aM(function(){aN(cb,cd,cc)})},setEcommerceView:function(ce,cb,cd,cc){if(!w(cd)||!cd.length){cd=""}else{if(cd instanceof Array){cd=JSON2.stringify(cd)}}bg[5]=["_pkc",cd];if(w(cc)&&String(cc).length){bg[2]=["_pkp",cc]}if((!w(ce)||!ce.length)&&(!w(cb)||!cb.length)){return}if(w(ce)&&ce.length){bg[3]=["_pks",ce]}if(!w(cb)||!cb.length){cb=""
+}bg[4]=["_pkn",cb]},addEcommerceItem:function(cf,cb,cd,cc,ce){if(cf.length){bF[cf]=[cf,cb,cd,cc,ce]}},trackEcommerceOrder:function(cb,cf,ce,cd,cc,cg){bJ(cb,cf,ce,cd,cc,cg)},trackEcommerceCartUpdate:function(cb){b1(cb)}}}function v(){return{push:R}}U(G,"beforeunload",S,false);o();Date.prototype.getTimeAlias=Date.prototype.getTime;L=new D();var r={setTrackerUrl:1,setAPIUrl:1,setUserId:1,setSiteId:1,disableCookies:1,enableLinkTracking:1};var d;for(t=0;t<_paq.length;t++){d=_paq[t][0];if(r[d]){R(_paq[t]);delete _paq[t];if(r[d]>1){if(console!==undefined&&console&&console.error){console.error("The method "+d+' is registered more than once in "_paq" variable. Only the last call has an effect. Please have a look at the multiple Piwik trackers documentation: http://developer.piwik.org/guides/tracking-javascript-guide#multiple-piwik-trackers')}}r[d]++}}for(t=0;t<_paq.length;t++){if(_paq[t]){R(_paq[t])}}_paq=new v();c={addPlugin:function(W,X){a[W]=X},getTracker:function(W,X){if(!w(X)){X=this.getAsyncTracker().getSiteId()
+}if(!w(W)){W=this.getAsyncTracker().getTrackerUrl()}return new D(W,X)},getAsyncTracker:function(){return L}};if(typeof define==="function"&&define.amd){define("piwik",[],function(){return c})}return c}())}if(window&&window.piwikAsyncInit){window.piwikAsyncInit()}(function(){var a=(typeof AnalyticsTracker);if(a==="undefined"){AnalyticsTracker=Piwik}}());if(typeof piwik_log!=="function"){piwik_log=function(b,f,d,g){function a(h){try{return eval("piwik_"+h)}catch(i){}return}var c,e=Piwik.getTracker(d,f);e.setDocumentTitle(b);e.setCustomData(g);c=a("tracker_pause");if(c){e.setLinkTrackingTimer(c)}c=a("download_extensions");if(c){e.setDownloadExtensions(c)}c=a("hosts_alias");if(c){e.setDomains(c)}c=a("ignore_classes");if(c){e.setIgnoreClasses(c)}e.trackPageView();if(a("install_tracker")){piwik_track=function(i,k,j,h){e.setSiteId(k);e.setTrackerUrl(j);e.trackLink(i,h)};e.enableLinkTracking()}};
 /*! @license-end */
 };
\ No newline at end of file
diff --git a/piwik.php b/piwik.php
index 636d6f8b22..95cc6271f1 100644
--- a/piwik.php
+++ b/piwik.php
@@ -8,51 +8,29 @@
  * @package Piwik
  */
 
-use Piwik\Common;
-use Piwik\Timer;
+use Piwik\Tracker\RequestSet;
 use Piwik\Tracker;
+use Piwik\Tracker\Handler;
 
 // Note: if you wish to debug the Tracking API please see this documentation:
 // http://developer.piwik.org/api-reference/tracking-api#debugging-the-tracker
 
-define('PIWIK_ENABLE_TRACKING', true);
-
 if (!defined('PIWIK_DOCUMENT_ROOT')) {
     define('PIWIK_DOCUMENT_ROOT', dirname(__FILE__) == '/' ? '' : dirname(__FILE__));
 }
-
 if (file_exists(PIWIK_DOCUMENT_ROOT . '/bootstrap.php')) {
     require_once PIWIK_DOCUMENT_ROOT . '/bootstrap.php';
 }
-
-$GLOBALS['PIWIK_TRACKER_MODE'] = true;
-error_reporting(E_ALL | E_NOTICE);
-@ini_set('xdebug.show_exception_trace', 0);
-@ini_set('magic_quotes_runtime', 0);
-
-if (!defined('PIWIK_USER_PATH')) {
-    define('PIWIK_USER_PATH', PIWIK_DOCUMENT_ROOT);
-}
 if (!defined('PIWIK_INCLUDE_PATH')) {
     define('PIWIK_INCLUDE_PATH', PIWIK_DOCUMENT_ROOT);
 }
 
-@ignore_user_abort(true);
+require_once PIWIK_INCLUDE_PATH . '/core/bootstrap.php';
 
-if (file_exists(PIWIK_INCLUDE_PATH . '/vendor/autoload.php')) {
-    $vendorDirectory = PIWIK_INCLUDE_PATH . '/vendor';
-} else {
-    $vendorDirectory = PIWIK_INCLUDE_PATH . '/../..';
-}
-require_once $vendorDirectory . '/autoload.php';
+@ignore_user_abort(true);
 
 require_once PIWIK_INCLUDE_PATH . '/core/Plugin/Controller.php';
 require_once PIWIK_INCLUDE_PATH . '/core/Plugin/ControllerAdmin.php';
-
-\Piwik\Plugin\ControllerAdmin::disableEacceleratorIfEnabled();
-
-require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php';
-require_once PIWIK_INCLUDE_PATH . '/core/testMinimumPhpVersion.php';
 require_once PIWIK_INCLUDE_PATH . '/core/Singleton.php';
 require_once PIWIK_INCLUDE_PATH . '/core/Plugin/Manager.php';
 require_once PIWIK_INCLUDE_PATH . '/core/Plugin.php';
@@ -62,62 +40,34 @@ require_once PIWIK_INCLUDE_PATH . '/core/IP.php';
 require_once PIWIK_INCLUDE_PATH . '/core/UrlHelper.php';
 require_once PIWIK_INCLUDE_PATH . '/core/Url.php';
 require_once PIWIK_INCLUDE_PATH . '/core/SettingsPiwik.php';
+require_once PIWIK_INCLUDE_PATH . '/core/SettingsServer.php';
 require_once PIWIK_INCLUDE_PATH . '/core/Tracker.php';
 require_once PIWIK_INCLUDE_PATH . '/core/Config.php';
 require_once PIWIK_INCLUDE_PATH . '/core/Translate.php';
 require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Cache.php';
-require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Db.php';
-require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Db/DbException.php';
-require_once PIWIK_INCLUDE_PATH . '/core/Tracker/IgnoreCookie.php';
-require_once PIWIK_INCLUDE_PATH . '/core/Tracker/VisitInterface.php';
-require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Visit.php';
-require_once PIWIK_INCLUDE_PATH . '/core/Tracker/GoalManager.php';
-require_once PIWIK_INCLUDE_PATH . '/core/Tracker/PageUrl.php';
-require_once PIWIK_INCLUDE_PATH . '/core/Tracker/TableLogAction.php';
-require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Action.php';
-require_once PIWIK_INCLUDE_PATH . '/core/Tracker/ActionPageview.php';
 require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Request.php';
-require_once PIWIK_INCLUDE_PATH . '/core/Tracker/VisitExcluded.php';
-require_once PIWIK_INCLUDE_PATH . '/core/Tracker/VisitorNotFoundInDb.php';
-require_once PIWIK_INCLUDE_PATH . '/core/CacheFile.php';
-require_once PIWIK_INCLUDE_PATH . '/core/Filesystem.php';
 require_once PIWIK_INCLUDE_PATH . '/core/Cookie.php';
 
-session_cache_limiter('nocache');
-@date_default_timezone_set('UTC');
+Tracker::loadTrackerEnvironment();
 
-if (!defined('PIWIK_ENABLE_TRACKING') || PIWIK_ENABLE_TRACKING) {
-    ob_start();
-}
+$tracker    = new Tracker();
+$requestSet = new RequestSet();
 
-\Piwik\FrontController::createConfigObject();
+ob_start();
 
-$GLOBALS['PIWIK_TRACKER_DEBUG'] = (bool) \Piwik\Config::getInstance()->Tracker['debug'];
-if ($GLOBALS['PIWIK_TRACKER_DEBUG'] === true) {
-    require_once PIWIK_INCLUDE_PATH . '/core/Error.php';
-    \Piwik\Error::setErrorHandler();
-    require_once PIWIK_INCLUDE_PATH . '/core/ExceptionHandler.php';
-    \Piwik\ExceptionHandler::setUp();
+try {
+    $handler  = Handler\Factory::make();
+    $response = $tracker->main($handler, $requestSet);
 
-    $timer = new Timer();
-    Common::printDebug("Debug enabled - Input parameters: ");
-    Common::printDebug(var_export($_GET, true));
+    if (!is_null($response)) {
+        echo $response;
+    }
 
-    \Piwik\Tracker\Db::enableProfiling();
+} catch (Exception $e) {
+    echo "Error:" . $e->getMessage();
+    exit(1);
 }
 
-if (!defined('PIWIK_ENABLE_TRACKING') || PIWIK_ENABLE_TRACKING) {
-    $process = new Tracker();
-
-    try {
-        $process->main();
-    } catch (Exception $e) {
-        echo "Error:" . $e->getMessage();
-        exit(1);
-    }
+if (ob_get_level() > 1) {
     ob_end_flush();
-    if ($GLOBALS['PIWIK_TRACKER_DEBUG'] === true) {
-        Common::printDebug($_COOKIE);
-        Common::printDebug((string)$timer);
-    }
-}
+}
\ No newline at end of file
diff --git a/plugins/API/API.php b/plugins/API/API.php
index f9f60dd261..2f5f21f4e9 100644
--- a/plugins/API/API.php
+++ b/plugins/API/API.php
@@ -12,6 +12,7 @@ use Piwik\API\Proxy;
 use Piwik\API\Request;
 use Piwik\Columns\Dimension;
 use Piwik\Config;
+use Piwik\Container\StaticContainer;
 use Piwik\DataTable;
 use Piwik\DataTable\Filter\ColumnDelete;
 use Piwik\DataTable\Row;
@@ -23,8 +24,9 @@ use Piwik\Period\Range;
 use Piwik\Piwik;
 use Piwik\Plugin\Dimension\VisitDimension;
 use Piwik\Plugins\CoreAdminHome\CustomLogo;
-use Piwik\SegmentExpression;
+use Piwik\Segment\SegmentExpression;
 use Piwik\Translate;
+use Piwik\Translation\Translator;
 use Piwik\Version;
 
 require_once PIWIK_INCLUDE_PATH . '/core/Config.php';
@@ -158,8 +160,7 @@ class API extends \Piwik\Plugin\API
             'name'           => 'General_UserId',
             'segment'        => 'userId',
             'acceptedValues' => 'any non empty unique string identifying the user (such as an email address or a username).',
-            'sqlSegment'     => 'log_visit.idvisitor',
-            'sqlFilterValue' => array('Piwik\Common', 'convertUserIdToVisitorIdBin'),
+            'sqlSegment'     => 'log_visit.user_id',
             'sqlFilter'      => array($this, 'checkSegmentMatchTypeIsValidForUser'),
             'permission'     => $isAuthenticatedWithViewAccess,
 
@@ -321,7 +322,12 @@ class API extends \Piwik\Plugin\API
     public function getMetadata($idSite, $apiModule, $apiAction, $apiParameters = array(), $language = false,
                                 $period = false, $date = false, $hideMetricsDoc = false, $showSubtableReports = false)
     {
-        Translate::reloadLanguage($language);
+        if ($language) {
+            /** @var Translator $translator */
+            $translator = StaticContainer::get('Piwik\Translation\Translator');
+            $translator->setCurrentLanguage($language);
+        }
+
         $reporter = new ProcessedReport();
         $metadata = $reporter->getMetadata($idSite, $apiModule, $apiAction, $apiParameters, $language, $period, $date, $hideMetricsDoc, $showSubtableReports);
         return $metadata;
@@ -516,6 +522,18 @@ class API extends \Piwik\Plugin\API
     }
 
     /**
+     * Return true if plugin is activated, false otherwise
+     *
+     * @param string $pluginName
+     * @return bool
+     */
+    public function isPluginActivated($pluginName)
+    {
+        Piwik::checkUserHasSomeViewAccess();
+        return \Piwik\Plugin\Manager::getInstance()->isPluginActivated($pluginName);
+    }
+
+    /**
      * Given a segment, will return a list of the most used values for this particular segment.
      * @param $segmentName
      * @param $idSite
diff --git a/plugins/API/Controller.php b/plugins/API/Controller.php
index 18e39d58a2..d11f953704 100644
--- a/plugins/API/Controller.php
+++ b/plugins/API/Controller.php
@@ -30,7 +30,13 @@ class Controller extends \Piwik\Plugin\Controller
         }
 
         $request = new Request('token_auth=' . Common::getRequestVar('token_auth', 'anonymous', 'string'));
-        return $request->process();
+        $response = $request->process();
+
+        if (is_array($response)) {
+            $response = var_export($response, true);
+        }
+
+        return $response;
     }
 
     public function listAllMethods()
diff --git a/plugins/API/Menu.php b/plugins/API/Menu.php
index b01c686ac0..a0f71ddf54 100644
--- a/plugins/API/Menu.php
+++ b/plugins/API/Menu.php
@@ -43,7 +43,7 @@ class Menu extends \Piwik\Plugin\Menu
         }
 
         $ua = new OperatingSystem($_SERVER['HTTP_USER_AGENT']);
-        $ua->setCache(new DeviceDetectorCache('tracker', 86400));
+        $ua->setCache(new DeviceDetectorCache(86400));
         $parsedOS = $ua->parse();
 
         if (!empty($parsedOS['short_name']) && in_array($parsedOS['short_name'], array(self::DD_SHORT_NAME_ANDROID, self::DD_SHORT_NAME_IOS))) {
diff --git a/plugins/API/ProcessedReport.php b/plugins/API/ProcessedReport.php
index a5ba529658..7c4bd46c9e 100644
--- a/plugins/API/ProcessedReport.php
+++ b/plugins/API/ProcessedReport.php
@@ -11,7 +11,8 @@ namespace Piwik\Plugins\API;
 use Exception;
 use Piwik\API\Request;
 use Piwik\Archive\DataTableFactory;
-use Piwik\Cache\PluginAwareStaticCache;
+use Piwik\CacheId;
+use Piwik\Cache as PiwikCache;
 use Piwik\Common;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
@@ -154,10 +155,11 @@ class ProcessedReport
         // as they cache key contains a lot of information there would be an even better cache result by caching parts of
         // this huge method separately but that makes it also more complicated. leaving it like this for now.
         $key   = $this->buildReportMetadataCacheKey($idSites, $period, $date, $hideMetricsDoc, $showSubtableReports);
-        $cache = new PluginAwareStaticCache($key);
+        $key   = CacheId::pluginAware($key);
+        $cache = PiwikCache::getTransientCache();
 
-        if ($cache->has()) {
-            return $cache->get();
+        if ($cache->contains($key)) {
+            return $cache->fetch($key);
         }
 
         $parameters = array('idSites' => $idSites, 'period' => $period, 'date' => $date);
@@ -332,7 +334,7 @@ class ProcessedReport
         }
 
         $actualReports = array_values($availableReports);
-        $cache->set($actualReports);
+        $cache->save($key, $actualReports);
 
         return $actualReports; // make sure array has contiguous key values
     }
@@ -672,8 +674,9 @@ class ProcessedReport
                     // if we handle MultiSites.getAll we do not always have the same idSite but different ones for
                     // each site, see https://github.com/piwik/piwik/issues/5006
                     $idSiteForRow = $idSite;
-                    if ($row->getMetadata('idsite') && is_numeric($row->getMetadata('idsite'))) {
-                        $idSiteForRow = (int) $row->getMetadata('idsite');
+                    $idSiteMetadata = $row->getMetadata('idsite');
+                    if ($idSiteMetadata && is_numeric($idSiteMetadata)) {
+                        $idSiteForRow = (int) $idSiteMetadata;
                     }
 
                     $prettyValue = self::getPrettyValue($formatter, $idSiteForRow, $columnName, $columnValue, $htmlAllowed = false);
diff --git a/plugins/API/Renderer/Json.php b/plugins/API/Renderer/Json.php
index 89db01a816..1dffa1f45f 100644
--- a/plugins/API/Renderer/Json.php
+++ b/plugins/API/Renderer/Json.php
@@ -61,15 +61,27 @@ class Json extends ApiRenderer
 
     public function sendHeader()
     {
-        Renderer\Json::sendHeaderJSON();
+        if ($this->isJsonp()) {
+            Common::sendHeader('Content-Type: application/javascript; charset=utf-8');
+        } else {
+            Renderer\Json::sendHeaderJSON();
+        }
+
         ProxyHttp::overrideCacheControlHeaders();
     }
 
-    /**
-     * @param $str
-     * @return string
-     */
-    private function applyJsonpIfNeeded($str)
+    private function isJsonp()
+    {
+        $callback = $this->getJsonpCallback();
+
+        if (false === $callback) {
+            return false;
+        }
+
+        return preg_match('/^[0-9a-zA-Z_.]*$/D', $callback) > 0;
+    }
+
+    private function getJsonpCallback()
     {
         $jsonCallback = Common::getRequestVar('callback', false, null, $this->request);
 
@@ -77,10 +89,18 @@ class Json extends ApiRenderer
             $jsonCallback = Common::getRequestVar('jsoncallback', false, null, $this->request);
         }
 
-        if ($jsonCallback !== false) {
-            if (preg_match('/^[0-9a-zA-Z_.]*$/D', $jsonCallback) > 0) {
-                $str = $jsonCallback . "(" . $str . ")";
-            }
+        return $jsonCallback;
+    }
+
+    /**
+     * @param $str
+     * @return string
+     */
+    private function applyJsonpIfNeeded($str)
+    {
+        if ($this->isJsonp()) {
+            $jsonCallback = $this->getJsonpCallback();
+            $str = $jsonCallback . "(" . $str . ")";
         }
 
         return $str;
diff --git a/plugins/API/Reports/Get.php b/plugins/API/Reports/Get.php
index 11a4df5d6a..de087d0a86 100644
--- a/plugins/API/Reports/Get.php
+++ b/plugins/API/Reports/Get.php
@@ -67,7 +67,10 @@ class Get extends Report
     {
         $processedMetrics = array();
         foreach ($this->reportsToMerge as $report) {
-            $processedMetrics = array_merge($processedMetrics, $report->getProcessedMetrics());
+            $reportMetrics = $report->getProcessedMetrics();
+            if (is_array($reportMetrics)) {
+                $processedMetrics = array_merge($processedMetrics, $reportMetrics);
+            }
         }
         return $processedMetrics;
     }
diff --git a/plugins/API/RowEvolution.php b/plugins/API/RowEvolution.php
index a326b5022f..6e31a13317 100644
--- a/plugins/API/RowEvolution.php
+++ b/plugins/API/RowEvolution.php
@@ -280,9 +280,7 @@ class RowEvolution
         // note: some reports should not be filtered with AddColumnProcessedMetrics
         // specifically, reports without the Metrics::INDEX_NB_VISITS metric such as Goals.getVisitsUntilConversion & Goal.getDaysToConversion
         // this is because the AddColumnProcessedMetrics filter removes all datable rows lacking this metric
-        if (isset($metadata['metrics']['nb_visits'])
-            && !empty($label)
-        ) {
+        if (isset($metadata['metrics']['nb_visits'])) {
             $parameters['filter_add_columns_when_show_all_columns'] = '0';
         }
 
diff --git a/plugins/API/lang/ar.json b/plugins/API/lang/ar.json
index 9125b01329..d0af7dc0dd 100644
--- a/plugins/API/lang/ar.json
+++ b/plugins/API/lang/ar.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "مفتاح المصادقة هذا سري كما هو الحال في اسم المستخدم ولكلمة المرور، %s لا تعطه لأحد قط%s!",
         "LoadedAPIs": "تم تحميل %s واجهة تطبيقات.",
         "MoreInformation": "لمزيد من المعلومات حول واجهة التطبيقات لبرنامج Piwik، الرجاء مراجعة %s مقدمة إلى واجهة تطبيقات Piwik %s وكذلك %sدليل واجهة تطبيقات Piwik %s.",
-        "PluginDescription": "كافة البيانات في Piwik متوافرة من خلال واجهة برمجة تطبيقات API بسيطة. هذه الإضافة هي خدمة ترتكز إلى ويب كنقطة دخول، يمكنك استخدامها في الوصول إلى بيانات تحليلات ويب في شكل xml, json, php, csv, وغيرها.",
         "QuickDocumentationTitle": "مستندات دعم API السريعة",
         "TopLinkTooltip": "الوصول إلى تحليلات ويب الخاصة بك برمجياً عبر واجهة تطبيقات بسيطة API على شكل json, xml وغيرها.",
         "UserAuthentication": "مصادقة المستخدم",
diff --git a/plugins/API/lang/be.json b/plugins/API/lang/be.json
index a5019bf0c4..5be16cf3da 100644
--- a/plugins/API/lang/be.json
+++ b/plugins/API/lang/be.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "Гэта ідэнтыфікацыйны токэн, ён такі жа сакрэтны, як ваш лагін і пароль, %s не дзеліцеся ім ня з кім%s!",
         "LoadedAPIs": "%s API паспяхова загружаны",
         "MoreInformation": "Дадатковыя звесткі аб Piwik API, калі ласка, звярніце ўвагу на %s Уводзіны ў Piwik API %s і %s Piwik API спасылкі %s.",
-        "PluginDescription": "Усе дадзеныя ў Piwik даступныя праз простый API. Гэта убудаваныя вэб-службы, праз якія вы можаце атрымаць дадзеныя вэб-аналітыкі ў xml, json, php, csv і г.д. фармаце.",
         "QuickDocumentationTitle": "Хуткая дакументацыя па API-функцыях",
         "UserAuthentication": "Аўтэнтыфікацыя карыстальніка",
         "UsingTokenAuth": "Калі вы жадаеце %s запытаць дадзеныя ў рамках скрыпта, кронтаба і г.д. %s. Вам патрабуецца дадаць параметр %s да API каб выклікаць URL-адрасоў, якія патрабуюць праверкі сапраўднасці."
diff --git a/plugins/API/lang/bg.json b/plugins/API/lang/bg.json
index 0321083621..17bc80c631 100644
--- a/plugins/API/lang/bg.json
+++ b/plugins/API/lang/bg.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "Това token_auth е тайна, като Вашето потребителско име и парола, %s не го споделяйте%s!",
         "LoadedAPIs": "Успешно заредени %s API-та",
         "MoreInformation": "За повече информация за Piwik API-тата, моля погледнете %s Въведение в Piwik API%s и %s Piwik API Референт%s.",
-        "PluginDescription": "Цялата информация от Piwik е достъпна чрез просто API. Тази добавка ви дава възможност да получите данни от Вашият Уеб Анализатор под формата на xml,json,php,cvs и др.",
         "QuickDocumentationTitle": "API бърза документация",
         "TopLinkTooltip": "Информацията за уеб анализите може да бъде достъпена чрез прост приложно-програмен интерфейс в json, xml и др. формат.",
         "UserAuthentication": "Удостоверяване на потребителя",
diff --git a/plugins/API/lang/ca.json b/plugins/API/lang/ca.json
index ff4c475a42..0b17ce0fe1 100644
--- a/plugins/API/lang/ca.json
+++ b/plugins/API/lang/ca.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "El token_auth es tan secret com el vostre usuari i la vostra contrasenya, %s no compartiu el seu %s!",
         "LoadedAPIs": "S'ha carregat correctament un total de %s API",
         "MoreInformation": "Per mes informació sobre les APIs de Piwik, siusplau reviseu %s Introducció a l'API de Piwik %s i %s la Referència de l'API de Piwik %s.",
-        "PluginDescription": "Tota la informació del Piwik està disponible a travès de APIs simples. Aquest plugin es el punt d'entrada que podeu ciradar per obtenir la informació de l'anàlisis Web en xml, json, php, csv, etc.",
         "QuickDocumentationTitle": "Documentació ràpida de la API",
         "TopLinkTooltip": "Accediu a la vostra informació de l'anàlisis Web d'una forma programada a través d'una API simple en json, xml, etc.",
         "UserAuthentication": "Autentificació de l'usuari",
diff --git a/plugins/API/lang/cs.json b/plugins/API/lang/cs.json
index 4405b0c708..08bbdeede8 100644
--- a/plugins/API/lang/cs.json
+++ b/plugins/API/lang/cs.json
@@ -4,7 +4,7 @@
         "KeepTokenSecret": "Tento token_auth je tajný jako vaše uživatelské jméno a heslo, %s neříkejte jej nikomu jinému %s!",
         "LoadedAPIs": "Úspěšně načteno %s API",
         "MoreInformation": "Pro více informací o API Piwiku se podívejte na %s Úvod do API Piwiku %s a %s Referenci API Piwiku %s",
-        "PluginDescription": "Všechna data v Piwiku jsou dostupná přes jednoduchá API. Tento zásuvný modul je vstupním bodem pro webovou službu, kterou můžete volat, abyste získali data ve formátech xml, json, php, csv, atd.",
+        "PluginDescription": "Všechna data v Piwiku jsou dostupná pomocí jednoduchých API. Tento zásuvný modul je vstupním bodem těchto webových služeb, který vám umožňuje získat vaše analitická data jako XML, JSON, CSV, PHP atd.",
         "QuickDocumentationTitle": "Rychlá dokumentace API",
         "TopLinkTooltip": "Zpřístupněte Vaše Webové analýzy programově skrze jednoduché API pomocí json, xml a dalších.",
         "UserAuthentication": "Autentifikace uživatele",
diff --git a/plugins/API/lang/da.json b/plugins/API/lang/da.json
index 7d8ca9094d..d7d85003f8 100644
--- a/plugins/API/lang/da.json
+++ b/plugins/API/lang/da.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "Token_auth er ligeså hemmeligt som brugernavn og adgangskode, %sdel det ikke ud%s!",
         "LoadedAPIs": "%s APIs indlæst",
         "MoreInformation": "Mere information om Piwik API'er, findes på %sIntroduktion til Piwik API%s og %sPiwik API Reference%s.",
-        "PluginDescription": "Alle data i Piwik er tilgængelig via enkle API'er. Programudvidelsen er webservice indgangen, som kan kaldes for at få Web analyse-data i xml, json, php, csv, osv.",
         "QuickDocumentationTitle": "API - hurtig i gang dokumentation",
         "TopLinkTooltip": "Få adgang til dine webanalyse data programmeringsmæssigt gennem en simpel API i JSON, XML, etc.",
         "UserAuthentication": "Brugergodkendelse",
diff --git a/plugins/API/lang/de.json b/plugins/API/lang/de.json
index 1dfecee608..1aaba97aac 100644
--- a/plugins/API/lang/de.json
+++ b/plugins/API/lang/de.json
@@ -4,7 +4,7 @@
         "KeepTokenSecret": "Der token_auth ist so geheim wie Ihr Login und Passwort, %s teilen Sie es niemandem mit%s!",
         "LoadedAPIs": "%s APIs erfolgreich geladen",
         "MoreInformation": "Für weitere Informationen über die Piwik-APIs lesen Sie bitte %s Einführung in die Piwik-API %s und die %s Piwik API Referenz %s.",
-        "PluginDescription": "Alle Daten sind über eine einfache API verfügbar. Dieses Plugin ist der Webservice, den Sie nutzen können, um Ihre Webanalyse-Daten in XML, JSON, PHP, CSV, etc. zu exportieren.",
+        "PluginDescription": "Alle Daten in Piwik sind über einfache APIs verfügbar. Dieses Plugin ist der Web Service Eingangspunkt, welchen Sie nutzen können um Daten der Webanalyse in XML, JSON, PHP, CSV usw. zu beziehen.",
         "QuickDocumentationTitle": "API-Kurzdokumentation",
         "TopLinkTooltip": "Greife auf die Webanalytikdaten über eine einfache API mit json, xml, usw. zu.",
         "UserAuthentication": "Benutzerauthentifizierung",
diff --git a/plugins/API/lang/el.json b/plugins/API/lang/el.json
index 8c99f2bf6e..c65966ab6c 100644
--- a/plugins/API/lang/el.json
+++ b/plugins/API/lang/el.json
@@ -4,7 +4,7 @@
         "KeepTokenSecret": "Αυτή το πειστήριο πιστοποίησης είναι μυστικό το όνομα χρήστη και ο κωδικός πρόσβασης. %s Μη το δημοσιεύετε%s!",
         "LoadedAPIs": "Φορτώθηκαν επιτυχώς %s APIs",
         "MoreInformation": "Για περισσότερες πληροφορίες για τα APIs του Piwik, δείτε την %s Παρουσίαση των API του Piwik %s και την %s Τεκμηρίωση των API του Piwik %s.",
-        "PluginDescription": "Όλα τα δεδομένα στο Piwik είναι διαθέσιμα μέσω απλών APIs. Αυτό το πρόσθετο είναι το σημείο εισόδου της υπηρεσίας ιστού που μπορείτε να καλέσετε τα δεδομένα Ανάλυσης Ιστού σε xml, json, php, csv, κλπ.",
+        "PluginDescription": "Όλα τα δεδομένα στο Piwik είναι διαθέσιμα μέσω απλών API. Το πρόσθετο αυτό είναι ένα σημείο εισόδου μιας υπηρεσίας ιστού, που μπορείτε να καλείτε για να λαμβάνετε τα δεδομένα αναλυτικών σας σε μορφή xml, json, php, csv, κτλ.",
         "QuickDocumentationTitle": "Σύντομη τεκμηρίωση API",
         "TopLinkTooltip": "Προσπελάστε τα δεδομένα Στατιστικών Ιστού προγραμματιστικά μέσω μιας απλής εφαρμογής σε json, xml, κλπ.",
         "UserAuthentication": "Πιστοποίηση χρήστη",
diff --git a/plugins/API/lang/es.json b/plugins/API/lang/es.json
index 64b2bc85a8..8c94321d56 100644
--- a/plugins/API/lang/es.json
+++ b/plugins/API/lang/es.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "Esta token_auth es tan secreta como su nombre de usuario y contraseña, %s no lo comparta %s!",
         "LoadedAPIs": "Se han cargado %s APIs con éxito",
         "MoreInformation": "Para mayor información acerca de las APIs Piwik, por favor mire la %s Introducción a las API Piwik %s y a la %s Referencia de las API Piwik %s.",
-        "PluginDescription": "Todos los datos de Piwik están disponibles a través de simples APIs. Este plugin es el punto de entrada de servicio web, que puede llamar para obtener los datos de su Análisis Web en xml, json, php, csv, etc",
         "QuickDocumentationTitle": "Documentación rápida de API",
         "TopLinkTooltip": "Accede a tus datos de Análisis Web programáticamente, a través de una sencilla API en json, xml, etc.",
         "UserAuthentication": "Autenticación de usuario",
diff --git a/plugins/API/lang/et.json b/plugins/API/lang/et.json
index bb1ccfd0e5..e0ecccbdad 100644
--- a/plugins/API/lang/et.json
+++ b/plugins/API/lang/et.json
@@ -2,7 +2,6 @@
     "API": {
         "LoadedAPIs": "Edukalt laetud %s API-id",
         "MoreInformation": "Et saada rohkem infot Piwiku API-st, vaata %sPiwiku API tutvustus%s ja %sPiwiku API juhend%s.",
-        "PluginDescription": "Kõik andmed on Piwikus kättesaadavad ka lihtsa API kaudu. Antud moodul on veebiteenuste sisend, mida saad kasutada veebistatistika küsimiseks xml, json, php, csv jne formaatides.",
         "QuickDocumentationTitle": "API lühidokumentatsioon",
         "UserAuthentication": "Kasutaja autentimine"
     }
diff --git a/plugins/API/lang/fa.json b/plugins/API/lang/fa.json
index ff596c5a35..258d37db92 100644
--- a/plugins/API/lang/fa.json
+++ b/plugins/API/lang/fa.json
@@ -2,7 +2,6 @@
     "API": {
         "KeepTokenSecret": "این token_auth برای رمزعبور و ورود شما مثل یک راز است , %s آن را به کسی نگویید %s!",
         "LoadedAPIs": "API های %s با موفقیت بارگزاری شدند",
-        "PluginDescription": "تمام داده در پیویک توسط APIهای ساده در دسترس می باشد. این افزونه نقطه ورود وب سرویسی می باشد که شما می توانید برای دریافت اطلاعات آماری وب خود در xml, json, php, cvs یا سایر از آن استفاده کنید.",
         "QuickDocumentationTitle": "مستندات API",
         "TopLinkTooltip": "با استفاده از یک API ساده به اطلاعات آماری وب خود از طریق کدنویسی در فرمت های json و xml و غیره دسترسی پیدا کنید.",
         "UserAuthentication": "تأیید هویت کاربر"
diff --git a/plugins/API/lang/fi.json b/plugins/API/lang/fi.json
index dbfb33454e..73ce4c1f7b 100644
--- a/plugins/API/lang/fi.json
+++ b/plugins/API/lang/fi.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "Tämä token_auth on yhtä salainen kuin salasanasi, %s älä jaa sitä%s!",
         "LoadedAPIs": "Ladattiin %s APIa",
         "MoreInformation": "Lisätietoa Piwikin APIsta löytyy sivulta %sJohdatus Piwikin APIin%s ja %sPiwikin API%s.",
-        "PluginDescription": "Kaikki Piwikin tiedot ovat saatavilla yksinkertaisella API:lla. Tämä lisäosa on API:n aloituspiste, josta voit hakea tietoja xml:ksi, json:ksi, php:ksi, csv:ksi jne.",
         "QuickDocumentationTitle": "API:n pikadokumentaatio",
         "TopLinkTooltip": "Hae analytiikkatietoja automaattisesti yksinkertaisella API:lla JSON:lla, XML:llä jne.",
         "UserAuthentication": "Käyttäjän autentikointi",
diff --git a/plugins/API/lang/fr.json b/plugins/API/lang/fr.json
index 7156d81f16..85050a2a4e 100644
--- a/plugins/API/lang/fr.json
+++ b/plugins/API/lang/fr.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "Cette clef partagée (tocken_auth) est aussi secrète que votre login et mot de passe, %s ne la partagez pas%s !",
         "LoadedAPIs": "%s API chargées avec succès",
         "MoreInformation": "Pour plus d'informations à propos de l'API de Piwik, merci de visiter %s l'introduction à Piwik %s et %s la référence de l'API Piwik %s.",
-        "PluginDescription": "Toutes les données de Piwik sont disponibles au travers de simples APIs. Ce plugin est le point d'entrée du web service, ainsi vous pouvez obtenir vos données Statistiques Web en xml, json, php, csv, etc.",
         "QuickDocumentationTitle": "Documentation rapide de l'API.",
         "TopLinkTooltip": "Accédez à vos données de statistiques web depuis votre code via une API simple en JSON, XML, Etc.",
         "UserAuthentication": "Authentification de l'utilisateur",
diff --git a/plugins/API/lang/he.json b/plugins/API/lang/he.json
index 940416b87a..b7b6565d5d 100644
--- a/plugins/API/lang/he.json
+++ b/plugins/API/lang/he.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "הtoken_auth סודי ביותר כמו שם המשתמש והסיסמה, %s אין לשתף אף אחד בפרטים אלו%s!",
         "LoadedAPIs": "%s APIים נטענו בהצלחה",
         "MoreInformation": "למידע נוסף עבור הAPIים של Piwik, מומלץ להציץ ב%sהיכרות עם הAPI של Piwik%s וגם ב%sהעמקה אודות הAPI של Piwik%s.",
-        "PluginDescription": "כל המידע בPiwik חופשי לשימוש דרך APIים פשוטים. תוסף זה הוא נקודת הגישה לשירותי רשת, אליהם ניתן לגשת בכדי לקבל ניתוח על אתרך במספר פורמטים: xml, json, php, csv וכו'.",
         "QuickDocumentationTitle": "מדריך מקוצר ל-API",
         "UserAuthentication": "אימות משתמש",
         "UsingTokenAuth": "אם ברצונך %s לדרוש מידע מתוך סקריטפ, עבודה כרונית וכד' %s יש צורך להוסיף את הפרמטר %s לכל קריאת API מהURLים שדורשים אימות."
diff --git a/plugins/API/lang/hi.json b/plugins/API/lang/hi.json
index 19d87be904..5a6ad58173 100644
--- a/plugins/API/lang/hi.json
+++ b/plugins/API/lang/hi.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "इस टोकन प्रमाणन अपने लॉगिन और पासवर्ड के रूप में गुप्त रूप है, %s %s यह साझा नहीं करते हैं!",
         "LoadedAPIs": "सफलतापूर्वक लोड %s एपीआई",
         "MoreInformation": "Piwik एपीआई के बारे में अधिक जानकारी के लिए,कृपया %s Piwik एपीआई %s और %s Piwik एपीआई संदर्भ %s के परिचय पर एक नजर डाले",
-        "PluginDescription": "Piwik में सभी डेटा सरल एपीआई के माध्यम से उपलब्ध है.यह प्लगइन वेब सेवा प्रवेश बिंदु है जो प्राप्त करने के लिए आप कॉल करे अपने वेब विश्लेषिकी डेटा xml, json, PHP, csv, आदि में",
         "QuickDocumentationTitle": "एपीआई त्वरित प्रलेखन",
         "TopLinkTooltip": "Json, xml, आदि में एक सरल एपीआई के माध्यम से प्रोग्राम के रूप में अपने वेब विश्लेषिकी डेटा का उपयोग करे",
         "UserAuthentication": "प्रयोगकर्ता का प्रामाणीकरण",
diff --git a/plugins/API/lang/hu.json b/plugins/API/lang/hu.json
index 18a0cce2ce..126bc3e91f 100644
--- a/plugins/API/lang/hu.json
+++ b/plugins/API/lang/hu.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "Ez a token_auth nevű kód pontosan annyira érzékeny adat mint a felhasználói neved és jelszavad, ezért %s ne oszd meg mindenkivel%s!",
         "LoadedAPIs": "A(z) %s API sikeresen betöltődött.",
         "MoreInformation": "További információkért a Piwik API-kkal kapcsolatban kérjük, tekintse meg a %s Introduction to Piwik API %s és a %s Piwik API Reference %s című leírásokat.",
-        "PluginDescription": "A Piwik által tárolt összes adat elérhető egyszerű API-k segítségével. Ez a kiegészítő egy belépési pontként funkcionáló web alkalmazás, melyet meghívhatsz, hogy hozzáférhess a webanalitika adatokhoz xml, json, php, csv, stb. formátumokban.",
         "QuickDocumentationTitle": "API dokumentáció összefoglalója",
         "UserAuthentication": "Felhasználó autentikációja",
         "UsingTokenAuth": "Ha azt szeretné, hogy a %s külső alkalmazás adatot kérjen a szkripten belül, a crontab segítségével, stb. %s hozzá kell adnia a %s paramétert az API hívásoknál használt URL-ekhez, ha autentikáció szükséges számukra."
diff --git a/plugins/API/lang/id.json b/plugins/API/lang/id.json
index daf1176604..b468c0e5e3 100644
--- a/plugins/API/lang/id.json
+++ b/plugins/API/lang/id.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "token_auth ini merupakan hal yang rahasia sebagaimana nama-id dan sandi Anda, %s sehingga jangan memberitahukannya%s!",
         "LoadedAPIs": "Berhasil memuat API %s",
         "MoreInformation": "Untuk informasi selengkapnya tentang API Piwik, silakan melihat %s Pengenalan API Piwik%s dan %sReferensi API Piwik%s.",
-        "PluginDescription": "Seluruh data di Piwik tersedia dalam API sederhana. Pengaya ini adalah titik masuk layanan ramatraya, yang dapat Anda hubungi untuk mendapatkan data Analisis Ramatraya Anda dalam xml, json, php, csv, dll",
         "QuickDocumentationTitle": "Dokumentasi API ringkas",
         "TopLinkTooltip": "Akses data Analisis Ramatraya terprogram melalui API sederhana dalam json, xml, dan lain lain.",
         "UserAuthentication": "Otentikasi pengguna",
diff --git a/plugins/API/lang/is.json b/plugins/API/lang/is.json
index b4720a8b5a..2c830e748b 100644
--- a/plugins/API/lang/is.json
+++ b/plugins/API/lang/is.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "Þessi tókar auðkenning er eins leynd og þitt notendanafn og lykilorð %s deilið því ekki%s!",
         "LoadedAPIs": "Tókst að hlaða %s API",
         "MoreInformation": "Fyrir frekari upplýsingar um Piwik API, Vinsamlegast skoðið %s Inngangur að Piwik API %s og %s Piwik API Tilvísunir %s.",
-        "PluginDescription": "Öll gögn í Piwik eru til boði í gegnum einfalt API. Þessi íbót er vefþjónustu inngangur sem þú getur kallað í til fá þín vefgögn í xml JSON, PHP, csv, o.fl.",
         "QuickDocumentationTitle": "API hraðskjöl.",
         "UserAuthentication": "Notenda auðkenning",
         "UsingTokenAuth": "Ef þú vilt að %s biðji um gögn inn í skriftu eða crontab færslu osfv. %s verður þú að bæta við færibreytu %s til API kalls vefslóðir sem krefst auðkenningar."
diff --git a/plugins/API/lang/it.json b/plugins/API/lang/it.json
index 94b29d8b19..eb67c0618f 100644
--- a/plugins/API/lang/it.json
+++ b/plugins/API/lang/it.json
@@ -4,7 +4,7 @@
         "KeepTokenSecret": "Questo token_auth è segreto come il tuo login e la tua password, %s non condividerlo %s!",
         "LoadedAPIs": "Sono state caricate con successo %s API",
         "MoreInformation": "Per ulteriori informazioni sulle API di Piwik, si prega di dare un'occhiata all' introduzione delle API di Pwik %s e a %s %s Piwik API di riferimento API %s.",
-        "PluginDescription": "Tutti i dati in Piwik sono disponibili tramite semplici API. Questo plugin è il punto di accesso web service che puoi chiamare per avere le tue statistiche in xml, json, php, csv, ecc...",
+        "PluginDescription": "Tutti i dati di Piwik sono disponibili tramite semplici API. Questo plugin è la porta d'accesso al servizio web che puoi utilizzare per avere i dati delle tue statistiche web in xml, json, php, csv, ecc.",
         "QuickDocumentationTitle": "Documentazione rapida sulle API",
         "TopLinkTooltip": "Accedi ai tuoi dati di Web Analytics tramite le semplici API in JSON, XML, ecc",
         "UserAuthentication": "Autenticazione utente",
diff --git a/plugins/API/lang/ja.json b/plugins/API/lang/ja.json
index 3863721009..559e0592a5 100644
--- a/plugins/API/lang/ja.json
+++ b/plugins/API/lang/ja.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "token_auth は、ログイン名とパスワードのように秘密にし、%s絶対に共有しないでください%s！",
         "LoadedAPIs": "%s API が正常に読み込まれました",
         "MoreInformation": "Piwik API の詳細については、%sIntroduction to Piwik API%s や %sPiwik API Reference%s を参照してください。",
-        "PluginDescription": "Piwik のすべてのデータはシンプルな API 経由で利用可能です。 このプラグインは、xml、json、php、csv 等にウェブ解析データを得るためにコールすることができる、ウェブサービスのエントリーポイントです。",
         "QuickDocumentationTitle": "API クイックドキュメント",
         "TopLinkTooltip": "jsopn、xml等シンプルなAPIを介して、プログラムで分析データにアクセスできます",
         "UserAuthentication": "ユーザー認証",
diff --git a/plugins/API/lang/ka.json b/plugins/API/lang/ka.json
index e47555792e..4d0e64c558 100644
--- a/plugins/API/lang/ka.json
+++ b/plugins/API/lang/ka.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "ეს token_auth ისევე საიდუმლოა, როგორც თქვენი მომხმარებლის სახელი და პაროლი, %s არავის გაუზიაროთ ის%s!",
         "LoadedAPIs": "%s API ფუნქციები წარმატებით ჩაიტვირთა",
         "MoreInformation": "Piwik API ფუნქციების შესახებ დამატებითი ინფორმაციისთვის გთხოვთ, გადახედოთ მასალებს %s Piwik API ფუნქციბის გამოყენების ინსტრუქცია %s და %s Piwik API ფუნქციების ცნობარი %s.",
-        "PluginDescription": "Piwik-ის ყველა მონაცემი მიიღება მარტივი API ფუნქციების გამოყენებით. ეს პლაგინი არის ვებ სერვისით სარგებლობის საწყისი წერტილი, რომელიც შეგიძლიათ გამოიძახოთ xml, json, php, csv და სხვ. ფაილებიდან, რომ მიიღოთ მონაცემები თქვენს ვებ ანალიზატორში",
         "QuickDocumentationTitle": "API ფუნქციების მოკლე დოკუმენტაცია",
         "UserAuthentication": "მომხმარებლის აუტენთიფიკაცია",
         "UsingTokenAuth": "თუ გსურთ %s გააკეთოთ მონაცემების მოთხოვნა სკრიპტიდან, crontab ფაილიდან და სხვ. %s თქვენ უნდა დაამატოთ %s პარამეტრი API ფუნქციის გამოძახების URL–ებს, რაც მოითხოვს აუტენთიფიკაციას."
diff --git a/plugins/API/lang/ko.json b/plugins/API/lang/ko.json
index 273d7e0823..38b7868679 100644
--- a/plugins/API/lang/ko.json
+++ b/plugins/API/lang/ko.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "token_auth는 외부 로그인을 위한 비밀키입니다. %s 절대로 공유하지 마세요 %s!",
         "LoadedAPIs": "성공적으로 %s API를 불러옴",
         "MoreInformation": "Piwik API에 대한 자세한 내용은 %sIntroduction to Piwik API %s 문서와 %sPiwik API Reference%s 문서를 참조하세요.",
-        "PluginDescription": "Piwik의 모든 데이터는 간단한 API를 통해 사용할 수 있습니다. 이 플러그인은 xml, json, php, csv 등 웹 분석 데이터를 얻기 위해 호출 할 수있는 웹서비스의 진입점입니다.",
         "QuickDocumentationTitle": "API 퀵 가이드",
         "TopLinkTooltip": "JSON, XML 등의 간단한 API를 통해 프로그래밍 방식으로 웹 로그 분석 데이터에 접근할 수 있습니다.",
         "UserAuthentication": "용자 인증",
diff --git a/plugins/API/lang/lt.json b/plugins/API/lang/lt.json
index 7ef5987cc1..378ef1a013 100644
--- a/plugins/API/lang/lt.json
+++ b/plugins/API/lang/lt.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "Šis token_auth yra slaptas kaip ir naudotojo vardas bei slaptažodis, %s neviešinkite jo%s!",
         "LoadedAPIs": "Sėkmingai įkrautos API sąsajos (%s).",
         "MoreInformation": "Norinčius gauti daugiau informacijos apie Piwik API sąsajas, prašome žvilgtelėti į %s Įvadas į Piwik API %s ir %s Piwik API informacija %s.",
-        "PluginDescription": "Visi duomenys Piwik pasiekiami per paprastas API sąsajas. Šis papildinys - tai žiniatinklio tarnybos įėjimo taškas, kuriuo galite naudotis norėdami gauti savo žiniatinklio analizatoriaus duomenis xml, json, php, csv ir kitais formatais.",
         "QuickDocumentationTitle": "API trumpa dokumentacija",
         "UserAuthentication": "Naudotojo autentifikavimas",
         "UsingTokenAuth": "Jei norite %s gauti duomenis scenarijų, crontab ir pan. įrankių pagalba, %s turite pridėti parametrus %s į API užklausų URLs, kurios reikalauja autentifikacijos."
diff --git a/plugins/API/lang/lv.json b/plugins/API/lang/lv.json
index f37ba312a2..35e080f3fb 100644
--- a/plugins/API/lang/lv.json
+++ b/plugins/API/lang/lv.json
@@ -1,6 +1,5 @@
 {
     "API": {
-        "PluginDescription": "Visi Piwik dati ir pieejami caur vienkāršiem API. Šis spraudnis ir tīkla servisa pieejas punkts, kuru varat izsaukt, lai iegūtu savus tīkla analīzes datus xml, json, php, csv un citos formātos.",
         "QuickDocumentationTitle": "Ātra API dokumentācija",
         "UserAuthentication": "Lietotāja autentifikācija"
     }
diff --git a/plugins/API/lang/nl.json b/plugins/API/lang/nl.json
index afc72182ff..b03bee32ae 100644
--- a/plugins/API/lang/nl.json
+++ b/plugins/API/lang/nl.json
@@ -4,7 +4,7 @@
         "KeepTokenSecret": "Deze token_auth is even geheim als uw gebruikersnaam en wachtwoord. %s Deel het met niemand! %s!",
         "LoadedAPIs": "Succesvol %s APIs geladen",
         "MoreInformation": "Voor meer informatie over de Piwik API's, lees even de %s introductie van de Piwik API %s en de %s Piwik API referenties %s.",
-        "PluginDescription": "Alle data in Piwik is beschikbaar via simpele API's. Deze plugin is het webservice startpunt dat u kunt aanroepen om uw Web Analytics data te ontvangen in xml, json, php, csv, enz.",
+        "PluginDescription": "Alle data in Piwik is beschikbaar via eenvoudige API's. Deze plugin is het web service contactpunt, waarmee je je Web Analytics data in xml, json, php, csv, etc. kunt verkrijgen.",
         "QuickDocumentationTitle": "Korte API handleiding",
         "TopLinkTooltip": "Benader je Web Analyse data via een simpele API in josn, xml, enz.",
         "UserAuthentication": "Gebruikers authenticatie.",
diff --git a/plugins/API/lang/pl.json b/plugins/API/lang/pl.json
index 626ae121a1..0002372dd3 100644
--- a/plugins/API/lang/pl.json
+++ b/plugins/API/lang/pl.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "Ten token_auth jest tak samo tajny jak twój login i hasło, %s nie upowszechniaj go%s!",
         "LoadedAPIs": "Środowisko API załadowano %s pomyślnie",
         "MoreInformation": "Aby uzyskać więcej informacji o interfejsie API statystyk Piwik, prosimy przeczytać %s Wprowadzenie do interfejsu API w Piwik%s, a także na stronie opracowania %s Piwik API Reference%s.",
-        "PluginDescription": "Wszystkie analizowane dane są w Piwik osiągalne przy pomocy prostego interfejsu API. Jest o miejsce, w którym możesz dokonać wyboru wśród wielu opcji i pozyskać dane z analityki statystycznej, w formatach xml, json, php, csv, itd.",
         "QuickDocumentationTitle": "Skrócony przewodnik po interfejsie API",
         "TopLinkTooltip": "Dostęp do twoich danych analitycznych programistycznie poprzez proste API w formatach json, xml itp.",
         "UserAuthentication": "Uwierzytelnianie użytkownika",
diff --git a/plugins/API/lang/pt-br.json b/plugins/API/lang/pt-br.json
index 7b008da753..81db2d251b 100644
--- a/plugins/API/lang/pt-br.json
+++ b/plugins/API/lang/pt-br.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "Esse token_auth é tão secreto quanto seu login e sua senha, %s não compartilhe isso %s!",
         "LoadedAPIs": "%s APIs carregadas com sucesso",
         "MoreInformation": "Para mais informações sobre as APIs Piwik, por favor, dê uma olhada no %s Introdução para Piwik API %s e a %s API Piwik de Referência %s .",
-        "PluginDescription": "Todos os dados no Piwik estão disponíveis através de APIs simples. Esse plugin é o ponto de entrada para o web service, que você pode chamar para ter seus dados Web Analytics em xml, json, php, csv, etc.",
         "QuickDocumentationTitle": "Documentação rápida da API",
         "TopLinkTooltip": "Acesso ao Google Analytics seus dados Web programação através de uma API simples em json, xml, etc.",
         "UserAuthentication": "Autenticação de usuário",
diff --git a/plugins/API/lang/pt.json b/plugins/API/lang/pt.json
index 80c635a7a0..246f62ca47 100644
--- a/plugins/API/lang/pt.json
+++ b/plugins/API/lang/pt.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "Este token_auth é tão secreto como o seu nome de utilizador e palavra-passe. %s não o partilhe%s!",
         "LoadedAPIs": "%s APIs carregadas com sucesso",
         "MoreInformation": "Para mais informação sobre os APIs de Piwik, por favor dê uma vista de olhos na %s Introdução ao API Piwik %s e a %s Referência do API Piwik %s.",
-        "PluginDescription": "Todos os dados em Piwik estão disponíveis através de APIs simples. Este plugin é o ponto de entrada do serviço web, que pode chamar para receber os seus dados das Analíticas Web em xml, json, php, csv, etc.",
         "QuickDocumentationTitle": "Documentação rápida do API",
         "TopLinkTooltip": "Aceda programaticamente à sua informação através de uma simples API em json, xml, etc.",
         "UserAuthentication": "Autenticação do utilizador",
diff --git a/plugins/API/lang/ro.json b/plugins/API/lang/ro.json
index 0cf2b79869..1bc06f66c7 100644
--- a/plugins/API/lang/ro.json
+++ b/plugins/API/lang/ro.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "Acest token_auth este secret cum sunt login-ul si parola, %s nu le fa publice%s!",
         "LoadedAPIs": "%s API-uri încarcate cu succes",
         "MoreInformation": "Pentru mai multe informatii despre API-urile Piwik, va rugam sa va uitati la %s Introducere la Piwik API %s si la %s Referinte Piwik API %s.",
-        "PluginDescription": "Toate datele in Piwik sunt disponibile prin intermediul unor simple API-uri. Acest plugin este punctul de intrare in serviciul web pe care il poti apela pentru a lua datele tale de Web Analytics in xml, json, php, csv, etc.",
         "QuickDocumentationTitle": "Demonstrare rapida API",
         "TopLinkTooltip": "Acceseaza datele tale de Web Analytics in mod organizat prin intermediul unui simplu API in json, xml, etc.",
         "UserAuthentication": "Identificare utilizator",
diff --git a/plugins/API/lang/ru.json b/plugins/API/lang/ru.json
index 9cbddab5d3..67aabccb8e 100644
--- a/plugins/API/lang/ru.json
+++ b/plugins/API/lang/ru.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "Этот token_auth является таким же секретным, как ваш логин и пароль. %s НЕ СООБЩАЙТЕ ЕГО НИКОМУ%s!",
         "LoadedAPIs": "%s API успешно загружен",
         "MoreInformation": "Чтобы узнать больше информации о Piwik API, пожалуйста, посмотрите раздел %s Introduction to Piwik API %s в %s Piwik API Reference %s.",
-        "PluginDescription": "Доступ к любой информации в системе веб-аналитики осуществляется с помощью простого API. Этот плагин является точкой вхождения в веб сервис, и с его помощью вы можете извлекать данные о Веб аналитике в различные форматы, например, xml, json, php, csv и т. д.",
         "QuickDocumentationTitle": "Краткая API документация",
         "TopLinkTooltip": "Получайте доступ к вашей веб-аналитике с помощью простого API и использования json, xml и др.",
         "UserAuthentication": "Аутентификация пользователя",
diff --git a/plugins/API/lang/sl.json b/plugins/API/lang/sl.json
index 532a3a613b..b6cffbc355 100644
--- a/plugins/API/lang/sl.json
+++ b/plugins/API/lang/sl.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "Ta žeton je skriven, kot vaše uporabniško ime in geslo, %s ne delite ga z drugimi %s!",
         "LoadedAPIs": "Uspešno naloženih %s API-jev",
         "MoreInformation": "Za več informacij o Piwik API-ju, si oglejte %sNavodila za uporabo Piwik API-ja %s in %s Piwik API Reference %s.",
-        "PluginDescription": "Vsi podatki v Piwiku so na voljo preko prepreostega API vmesnika. Ta vtičnik je vstopna točka spletne storitve, ki jo lahko pokličete, če želite svoje podatke preko xml, json, php, csv, itd.",
         "QuickDocumentationTitle": "API hitra dokumentacija",
         "UserAuthentication": "Overitev uporabnika",
         "UsingTokenAuth": "Če želite %s zahtevati podatke preko skripte, crontaba, itd. %s potem morate dodati parameter %s v URL API klica za overitev."
diff --git a/plugins/API/lang/sq.json b/plugins/API/lang/sq.json
index 81412232c6..dafda14766 100644
--- a/plugins/API/lang/sq.json
+++ b/plugins/API/lang/sq.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "Ky token_auth është po aq i fshehtë sa të dhënat tuaja për hyrjen dhe fjalëkalimi juaj, %s mos ia jepni kujt%s!",
         "LoadedAPIs": "U ngarkua me sukses API %s",
         "MoreInformation": "Për më tepër të dhëna rreth API-ve të Piwik-ut, ju lutem, hidhini një sy %s Hyrje në API-t e Piwik-ut %s dhe %s Referencë API-sh Piwik-u %s.",
-        "PluginDescription": "Në Piwik krejt të dhënat mund të kihen përmes API-sh të thjeshta. Kjo shtojcë është pikënisja e shërbimit web, ajo që mund të thërrisni për të patur të dhënat për Analizën tuaj Web në format xml, json, php, csv, etj.",
         "QuickDocumentationTitle": "Dokumentim i shpejtë për API",
         "TopLinkTooltip": "Hyni programatikisht te të dhënat tuaja të Analizave Web përmes një API-je të thjeshtë json, xml, etj.",
         "UserAuthentication": "Mirëfilltësim përdoruesi",
diff --git a/plugins/API/lang/sr.json b/plugins/API/lang/sr.json
index 1a497f2829..f65ff5abb4 100644
--- a/plugins/API/lang/sr.json
+++ b/plugins/API/lang/sr.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "token_auth je poverljivi podatak poput vašeg korisničkog imena i lozinke, stoga ga %s nemojte nikome pokazivati%s!",
         "LoadedAPIs": "Uspešno učitano API-ja: %s",
         "MoreInformation": "Za više informacija o Piwik API-ju molimo vas da pogledate %s uvod u Piwik API %s i %s Piwik API referenc listu %s.",
-        "PluginDescription": "Svi podaci u Piwik-u su dostupni preko jednostavnog API-ja. Ovaj dodatak je ulazna tačka koju pozivate kako biste dobili podatke u xml, json, php, csv itd.",
         "QuickDocumentationTitle": "API kratka dokumentacija",
         "TopLinkTooltip": "Pristupite analitičkim podacima iz vašeg programa pomoću jednostavnog API-ja u json-u, xml-u itd.",
         "UserAuthentication": "Autentifikacija korisnika",
diff --git a/plugins/API/lang/sv.json b/plugins/API/lang/sv.json
index ae159d3e14..fdff37a9d3 100644
--- a/plugins/API/lang/sv.json
+++ b/plugins/API/lang/sv.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "Detta token_auth är lika hemligt som ditt användarnamn och lösenord, %s dela inte med dig av detta! %s!",
         "LoadedAPIs": "Laddade in %s API'er utan problem",
         "MoreInformation": "För mer information om Piwiks API'er, ta en titt i %s Introduction to Piwik API %s och %s Piwik API Reference %s.",
-        "PluginDescription": "All data i Piwik finns tillgängligt via enkla API'er. Denna plugin är webbtjänstens ingångspunkt som du kan anropa för att få tillgång till din webbanalysdata i xml, json, php, csv, osv.",
         "QuickDocumentationTitle": "API snabbdokumentation",
         "TopLinkTooltip": "Få åtkomst till webbanalysdata programmatiskt genom ett enkelt API i t.ex. json, xml etc.",
         "UserAuthentication": "Användarautentisering",
diff --git a/plugins/API/lang/ta.json b/plugins/API/lang/ta.json
index 6106bcdbaa..97537c2e27 100644
--- a/plugins/API/lang/ta.json
+++ b/plugins/API/lang/ta.json
@@ -2,7 +2,6 @@
     "API": {
         "KeepTokenSecret": "இந்த token_auth ஆனது உங்கள் கடவுச்சொல்லை போன்று இரகசியமானது. %s பகிர வேண்டாம்%s!",
         "LoadedAPIs": "%s ஏபிஐ-கள் வெற்றிகரமாக ஏற்றப்பட்டன",
-        "PluginDescription": "இலகுவான API மூலம் Piwik கின் அனைத்து தகவல்களும் கிடைக்கின்றன. இந்த சொருகி வலைச்சேவைக்கான நுழைவு புள்ளி., இதன் மூலம் நீங்கள் Xml, json, php, csv முதலிய வழிகளில் இணைய பகுப்பாய்வு தரவுகளை அணுக முடியும்.",
         "QuickDocumentationTitle": "ஏபிஐ குறு உதவிப்பக்கங்கள்",
         "TopLinkTooltip": "JSON, XML முதலிய எளிய பயன்பாட்டு நிரலாக்க இடைமுகம் மூலம் நிரலாக்கத்தின்படி உங்கள் இணைய பகுப்பாய்வு தரவு அணுக",
         "UserAuthentication": "பயனர் உறுதிப்பாடு"
diff --git a/plugins/API/lang/th.json b/plugins/API/lang/th.json
index 3a4180dd0d..be2aeb0f4c 100644
--- a/plugins/API/lang/th.json
+++ b/plugins/API/lang/th.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "token_auth นี้จะเป็นความลับในการเข้าสู่ระบบและรหัสผ่านของคุณ %s ไม่แชร์ %s ได้",
         "LoadedAPIs": "โหลด API %s สำเร็จแล้ว",
         "MoreInformation": "สำหรับข้อมูลเพิ่มเติมเกี่ยวกับ Piwik APIs โปรดให้ดูที่ %s บทนำสู่การใช้ Piwik API %s และ %s แหล่งที่มาของ Piwik API %s.",
-        "PluginDescription": "มีข้อมูลทั้งหมดใน Piwik ผ่านง่ายๆ ด้วย APIs ปลั๊กอินนี้คือ เว็บบริการรายการจุด ที่คุณสามารถเรียกใช้เพื่อให้ได้ข้อมูลของคุณเว็บวิเคราะห์ใน xml, json, php, csv ฯลฯ",
         "QuickDocumentationTitle": "คู่มือการใช้งาน API",
         "UserAuthentication": "การรับรองความถูกต้องของผู้ใช้",
         "UsingTokenAuth": "ถ้าคุณต้องการ ข้อมูลที่ร้องขอ %s ภายในสคริปต์ crontab ฯลฯ %s คุณต้องการเพิ่มพารามิเตอร์ %s API เรียก url ที่ต้องการการรับรองความถูกต้อง"
diff --git a/plugins/API/lang/tl.json b/plugins/API/lang/tl.json
index 0780d8a566..42b21d955e 100644
--- a/plugins/API/lang/tl.json
+++ b/plugins/API/lang/tl.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "Ang token_auth na ito ay isang lihim gaya ng iyong login at password, %s huwag itong ibahagi sa iba %s!",
         "LoadedAPIs": "Matagumpay na nai-load ang %s APIs",
         "MoreInformation": "Para sa karagdagang impormasyon tungkol sa Piwik API, mangyaring tumingin sa %s Panimula sa Piwik API %s at ang %s Piwik API Reference %s.",
-        "PluginDescription": "Lahat ng mga data sa Piwik ay available sa pamamagitan ng simpleng API. Ang plugin na ito ay ang web service entry point, na maaari mong tawagin upang makuha ang iyong Web Analytics data sa xml, json, php, csv, atbp.",
         "QuickDocumentationTitle": "Mabilis na dokumentasyon ng API",
         "TopLinkTooltip": "I-access ang iyong data ng Web Analytics programmatically sa pamamagitan ng isang simpleng API sa json, xml, atbp.",
         "UserAuthentication": "Pagpapatunay sa User",
diff --git a/plugins/API/lang/tr.json b/plugins/API/lang/tr.json
index 7cf6a9da8a..2121b0c124 100644
--- a/plugins/API/lang/tr.json
+++ b/plugins/API/lang/tr.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "token_auth kullanıcı adı ve şifreniz kadar gizlidir, %s kimseyle paylaşmayınız%s!",
         "LoadedAPIs": "%s API başarılı şekilde yüklendi",
         "MoreInformation": "Piwik APIsi hakkında daha fazla bilgi için lütfen %s Piwik API Kullanımı %s ve %s Piwik API Referansına %s bakınız.",
-        "PluginDescription": "Piwik içerisindeki tüm veriler basit APIlerle kullanılabilmektedir. Bu eklenti Web Istatistiklerinize xml, json, php, csv vb. yollarla erişebilmenizi sağlayan bir erişim noktasıdır.",
         "QuickDocumentationTitle": "API hızlı belgeler",
         "TopLinkTooltip": "Json, xml veya diğerleri ile Api kullanarak erişin.",
         "UserAuthentication": "Kullanıcı kimlik doğrulaması",
diff --git a/plugins/API/lang/uk.json b/plugins/API/lang/uk.json
index c524ed0092..d4851a2c79 100644
--- a/plugins/API/lang/uk.json
+++ b/plugins/API/lang/uk.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "token_auth є секретним, на рівні з логіном та паролем, тож %s тримайте цю інформацію секреті%s!",
         "LoadedAPIs": "%s API успішно завантажено",
         "MoreInformation": "Для отримання детальнішої інформації про API Piwik, перегляньте %s Вступ до Piwik API %s та %s Довідковий матеріал по Piwik API %s.",
-        "PluginDescription": "Всі дані в Piwik доступні через простий набір API для кожного набору даних. Цей плагін є точною входу для веб-сервісу, через яку можливо звертатися щоб отримати дані веб-аналітики у форматі xml, json, php, csv, тощо.",
         "QuickDocumentationTitle": "Базова документація API",
         "UserAuthentication": "Аутентифікація користоувача",
         "UsingTokenAuth": "Для %sдоступу до інформації скриптом, програмою і т.д.%s треба додавати параметр %s до кожного виклику API якищо використовуваний URL вимагає аутентифікації."
diff --git a/plugins/API/lang/vi.json b/plugins/API/lang/vi.json
index d49dba4482..926d0dea52 100644
--- a/plugins/API/lang/vi.json
+++ b/plugins/API/lang/vi.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "token_auth này chặt chẽ như mật khẩu đăng nhập của bạn, %s không thể chia sẻ nó %s!",
         "LoadedAPIs": "Nạp thành công API %s",
         "MoreInformation": "Để biết thêm thông tin về các API của Piwik, vui lòng xem ở Giới thiệu %s về %s API Piwik và API %s Piwik Reference %s",
-        "PluginDescription": "Tất cả dữ liệu trong Piwik được cung cấp thông qua những API đơn giản. Thông qua các plugin này, bạn có thể truy cập để lấy thông tin phân tích trang web hiển thị dưới dạng xml, json, php, csv, vv...",
         "QuickDocumentationTitle": "Tài liệu hướng dẫn nhanh API",
         "TopLinkTooltip": "Truy cập dữ liệu lập trình Web Analytics của bạn thông qua một API đơn giản trong JSON, xml, vv",
         "UserAuthentication": "Xác thực người dùng",
diff --git a/plugins/API/lang/zh-cn.json b/plugins/API/lang/zh-cn.json
index 2e335483d9..67ebb467d0 100644
--- a/plugins/API/lang/zh-cn.json
+++ b/plugins/API/lang/zh-cn.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "授权号 token_auth 与您的帐号和密码一样重要，%s请不要公开%s！",
         "LoadedAPIs": "已成功载入 %s 个 APIs",
         "MoreInformation": "了解更多关于 Piwik APIs 的资讯，请访问 %sPiwik API 介绍%s 和 %s Piwik API 参考资料%s。",
-        "PluginDescription": "所有在 Piwik 的资料都能通过简单的 APIs 取得。这个插件是页面服务的切入点，让您可以以 xml, json, php, csv 及其它格式取得网站分析资料。",
         "QuickDocumentationTitle": "API 快速入门文档",
         "TopLinkTooltip": "通过一个简单的 API，让您可以以 xml, json, 及其它格式取得网站统计数据。",
         "UserAuthentication": "身份验证",
diff --git a/plugins/API/lang/zh-tw.json b/plugins/API/lang/zh-tw.json
index 2532468052..401b305f55 100644
--- a/plugins/API/lang/zh-tw.json
+++ b/plugins/API/lang/zh-tw.json
@@ -4,7 +4,6 @@
         "KeepTokenSecret": "token_auth 如你的帳號和密碼般重要，%s請不要公開它%s！",
         "LoadedAPIs": "已成功載入 %s 個 APIs",
         "MoreInformation": "取得更多關於 Piwik APIs 的資訊，請前往 %sPiwik API 指引%s 與 %s Piwik API 參考資料%s。",
-        "PluginDescription": "所有在 Piwik 的資料都能使用簡單的 APIs 取得。這個外掛是網頁服務的切入點，讓你可以以 xml, json, php, csv 及其他格式取得網站分析資料。",
         "QuickDocumentationTitle": "API 快速說明文件",
         "TopLinkTooltip": "透過API可以取得網站流量統計分析json與xml格式的數據。",
         "UserAuthentication": "使用者驗證",
diff --git a/plugins/API/templates/listAllAPI.twig b/plugins/API/templates/listAllAPI.twig
index e4cf96174c..4bf0c04600 100644
--- a/plugins/API/templates/listAllAPI.twig
+++ b/plugins/API/templates/listAllAPI.twig
@@ -1,28 +1,27 @@
-{% extends 'dashboard.twig' %}
-{% set showMenu=false %}
+{% extends 'user.twig' %}
 
 {% block content %}
 
-{% include "@CoreHome/_siteSelectHeader.twig" %}
+<div>
 
-<div class="page_api pageWrap">
+    <h2>{{ 'API_QuickDocumentationTitle'|translate }}</h2>
+
+    {% include "@CoreHome/_siteSelectHeader.twig" %}
 
     <div class="top_controls">
         {% include "@CoreHome/_periodSelect.twig" %}
     </div>
 
-    <h2>{{ 'API_QuickDocumentationTitle'|translate }}</h2>
-
     <p>{{ 'API_PluginDescription'|translate }}</p>
 
     <p>
-        <strong>{{ 'API_MoreInformation'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/analytics-api'>","</a>","<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/analytics-api/reference'>","</a>")|raw }}</strong>
+        {{ 'API_MoreInformation'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/analytics-api'>","</a>","<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/analytics-api/reference'>","</a>")|raw }}
     </p>
 
     <h2>{{ 'API_UserAuthentication'|translate }}</h2>
 
     <p>
-        {{ 'API_UsingTokenAuth'|translate('<b>','</b>',"")|raw }}<br/>
+        {{ 'API_UsingTokenAuth'|translate('','',"")|raw }}<br/>
         <span id='token_auth'>&amp;token_auth=<strong>{{ token_auth }}</strong></span><br/>
         {{ 'API_KeepTokenSecret'|translate('<b>','</b>')|raw }}
         {{ list_api_methods_with_links|raw }}
diff --git a/plugins/API/tests/Integration/RssRendererTest.php b/plugins/API/tests/Integration/RssRendererTest.php
index 20ed016a61..4aa9966801 100644
--- a/plugins/API/tests/Integration/RssRendererTest.php
+++ b/plugins/API/tests/Integration/RssRendererTest.php
@@ -12,6 +12,7 @@ use Piwik\Access;
 use Piwik\DataTable;
 use Piwik\Plugins\API\Renderer\Rss;
 use Piwik\Tests\Framework\Fixture;
+use Piwik\Tests\Framework\Mock\FakeAccess;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 
 /**
@@ -29,8 +30,8 @@ class RssRendererTest extends IntegrationTestCase
     {
         parent::setUp();
 
-        $pseudoMockAccess = new \FakeAccess();
-        \FakeAccess::setSuperUserAccess(true);
+        $pseudoMockAccess = new FakeAccess();
+        FakeAccess::setSuperUserAccess(true);
         Access::setSingletonInstance($pseudoMockAccess);
 
         $idSite = Fixture::createWebsite('2014-01-01 00:00:00');
diff --git a/plugins/API/tests/Unit/JsonRendererTest.php b/plugins/API/tests/Unit/JsonRendererTest.php
index c4fa076483..68ed45b9f3 100644
--- a/plugins/API/tests/Unit/JsonRendererTest.php
+++ b/plugins/API/tests/Unit/JsonRendererTest.php
@@ -16,6 +16,7 @@ use Piwik\Plugins\API\Renderer\Json2;
  * @group Plugin
  * @group API
  * @group API_JsonRendererTest
+ * @group JsonRenderer
  */
 class JsonRendererTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/plugins/Actions/API.php b/plugins/Actions/API.php
index 37a3815394..91f1d70c45 100644
--- a/plugins/Actions/API.php
+++ b/plugins/Actions/API.php
@@ -14,7 +14,7 @@ use Piwik\Archive;
 use Piwik\Common;
 use Piwik\DataTable;
 use Piwik\Date;
-use Piwik\Metrics;
+use Piwik\Metrics as PiwikMetrics;
 use Piwik\Piwik;
 use Piwik\Plugin\Report;
 use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime;
@@ -247,7 +247,7 @@ class API extends \Piwik\Plugin\API
     public function getSiteSearchKeywords($idSite, $period, $date, $segment = false)
     {
         $dataTable = $this->getSiteSearchKeywordsRaw($idSite, $period, $date, $segment);
-        $dataTable->deleteColumn(Metrics::INDEX_SITE_SEARCH_HAS_NO_RESULT);
+        $dataTable->deleteColumn(PiwikMetrics::INDEX_SITE_SEARCH_HAS_NO_RESULT);
         $this->filterActionsDataTable($dataTable);
         $this->addPagesPerSearchColumn($dataTable);
         return $dataTable;
@@ -276,13 +276,13 @@ class API extends \Piwik\Plugin\API
         // Delete all rows that have some results
         $dataTable->filter('ColumnCallbackDeleteRow',
             array(
-                Metrics::INDEX_SITE_SEARCH_HAS_NO_RESULT,
+                PiwikMetrics::INDEX_SITE_SEARCH_HAS_NO_RESULT,
                 function ($value) {
                     return $value < 1;
                 }
             ));
         $dataTable->deleteRow(DataTable::ID_SUMMARY_ROW);
-        $dataTable->deleteColumn(Metrics::INDEX_SITE_SEARCH_HAS_NO_RESULT);
+        $dataTable->deleteColumn(PiwikMetrics::INDEX_SITE_SEARCH_HAS_NO_RESULT);
         $this->filterActionsDataTable($dataTable);
         $this->addPagesPerSearchColumn($dataTable);
         return $dataTable;
@@ -453,6 +453,18 @@ class API extends \Piwik\Plugin\API
         // (in the transition period between pre 1.2 and post 1.2 datatable structure)
         $dataTable->filter('ReplaceColumnNames');
         $dataTable->filter('Sort', array('nb_visits', 'desc', $naturalSort = false, $expanded));
+        $dataTable->filter(function (DataTable $dataTable) {
+            foreach ($dataTable->getRows() as $row) {
+                $url = $row->getMetadata('url');
+                if ($url) {
+                    $row->setMetadata('segmentValue', urldecode($url));
+                }
+            }
+        });
+
+        $dataTable->filter('GroupBy', array('label', function ($label) {
+            return urldecode($label);
+        }));
 
         $dataTable->queueFilter('ReplaceSummaryRowLabel');
     }
@@ -490,15 +502,7 @@ class API extends \Piwik\Plugin\API
 
     protected function getDataTableFromArchive($name, $idSite, $period, $date, $segment, $expanded = false, $idSubtable = null, $depth = null)
     {
-        $skipAggregationOfSubTables = false;
-        if ($period == 'range'
-            && empty($idSubtable)
-            && empty($expanded)
-            && !Request::shouldLoadFlatten()
-        ) {
-            $skipAggregationOfSubTables = false;
-        }
-        return Archive::getDataTableFromArchive($name, $idSite, $period, $date, $segment, $expanded, $idSubtable, $skipAggregationOfSubTables, $depth);
+        return Archive::getDataTableFromArchive($name, $idSite, $period, $date, $segment, $expanded, $idSubtable, $depth);
     }
 
     private function addPageProcessedMetrics(DataTable\DataTableInterface $dataTable)
diff --git a/plugins/Actions/Actions/ActionSiteSearch.php b/plugins/Actions/Actions/ActionSiteSearch.php
index d19cfaa6fc..392e3777f8 100644
--- a/plugins/Actions/Actions/ActionSiteSearch.php
+++ b/plugins/Actions/Actions/ActionSiteSearch.php
@@ -180,14 +180,19 @@ class ActionSiteSearch extends Action
         if (is_array($actionName)) {
             $actionName = reset($actionName);
         }
-        $actionName = trim(urldecode($actionName));
+
+        $actionName = PageUrl::urldecodeValidUtf8($actionName);
+        $actionName = trim($actionName);
         if (empty($actionName)) {
             return false;
         }
+
         if (is_array($categoryName)) {
             $categoryName = reset($categoryName);
         }
-        $categoryName = trim(urldecode($categoryName));
+        $categoryName = PageUrl::urldecodeValidUtf8($categoryName);
+        $categoryName = trim($categoryName);
+
         return array($url, $actionName, $categoryName, $count);
     }
 
diff --git a/plugins/Actions/Archiver.php b/plugins/Actions/Archiver.php
index 67408ced64..17fc4f058a 100644
--- a/plugins/Actions/Archiver.php
+++ b/plugins/Actions/Archiver.php
@@ -9,7 +9,7 @@
 namespace Piwik\Plugins\Actions;
 
 use Piwik\DataTable;
-use Piwik\Metrics;
+use Piwik\Metrics as PiwikMetrics;
 use Piwik\RankingQuery;
 use Piwik\Tracker\Action;
 use Piwik\Plugins\Actions\Actions\ActionSiteSearch;
@@ -37,39 +37,6 @@ class Archiver extends \Piwik\Plugin\Archiver
     const METRIC_SEARCHES_RECORD_NAME = 'Actions_nb_searches';
     const METRIC_KEYWORDS_RECORD_NAME = 'Actions_nb_keywords';
 
-    /* Metrics in use by the API Actions.get */
-    public static $actionsAggregateMetrics = array(
-        self::METRIC_PAGEVIEWS_RECORD_NAME      => 'nb_pageviews',
-        self::METRIC_UNIQ_PAGEVIEWS_RECORD_NAME => 'nb_uniq_pageviews',
-        self::METRIC_DOWNLOADS_RECORD_NAME      => 'nb_downloads',
-        self::METRIC_UNIQ_DOWNLOADS_RECORD_NAME => 'nb_uniq_downloads',
-        self::METRIC_OUTLINKS_RECORD_NAME       => 'nb_outlinks',
-        self::METRIC_UNIQ_OUTLINKS_RECORD_NAME  => 'nb_uniq_outlinks',
-        self::METRIC_SEARCHES_RECORD_NAME       => 'nb_searches',
-        self::METRIC_KEYWORDS_RECORD_NAME       => 'nb_keywords',
-    );
-
-    public static $actionTypes = array(
-        Action::TYPE_PAGE_URL,
-        Action::TYPE_OUTLINK,
-        Action::TYPE_DOWNLOAD,
-        Action::TYPE_PAGE_TITLE,
-        Action::TYPE_SITE_SEARCH,
-    );
-    protected static $columnsToRenameAfterAggregation = array(
-        Metrics::INDEX_NB_UNIQ_VISITORS            => Metrics::INDEX_SUM_DAILY_NB_UNIQ_VISITORS,
-        Metrics::INDEX_PAGE_ENTRY_NB_UNIQ_VISITORS => Metrics::INDEX_PAGE_ENTRY_SUM_DAILY_NB_UNIQ_VISITORS,
-        Metrics::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS  => Metrics::INDEX_PAGE_EXIT_SUM_DAILY_NB_UNIQ_VISITORS,
-    );
-    public static $columnsToDeleteAfterAggregation = array(
-        Metrics::INDEX_NB_UNIQ_VISITORS,
-        Metrics::INDEX_PAGE_ENTRY_NB_UNIQ_VISITORS,
-        Metrics::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS,
-    );
-    private static $columnsAggregationOperation = array(
-        Metrics::INDEX_PAGE_MAX_TIME_GENERATION => 'max',
-        Metrics::INDEX_PAGE_MIN_TIME_GENERATION => 'min'
-    );
     protected $actionsTablesByType = null;
     protected $isSiteSearchEnabled = false;
 
@@ -133,10 +100,10 @@ class Archiver extends \Piwik\Plugin\Archiver
     protected function updateQuerySelectFromForSiteSearch(&$select, &$from)
     {
         $selectFlagNoResultKeywords = ",
-				CASE WHEN (MAX(log_link_visit_action.custom_var_v" . ActionSiteSearch::CVAR_INDEX_SEARCH_COUNT . ") = 0
-				    AND log_link_visit_action.custom_var_k" . ActionSiteSearch::CVAR_INDEX_SEARCH_COUNT . " = '" . ActionSiteSearch::CVAR_KEY_SEARCH_COUNT . "')
-				THEN 1 ELSE 0 END
-				    AS `" . Metrics::INDEX_SITE_SEARCH_HAS_NO_RESULT . "`";
+                CASE WHEN (MAX(log_link_visit_action.custom_var_v" . ActionSiteSearch::CVAR_INDEX_SEARCH_COUNT . ") = 0
+                    AND log_link_visit_action.custom_var_k" . ActionSiteSearch::CVAR_INDEX_SEARCH_COUNT . " = '" . ActionSiteSearch::CVAR_KEY_SEARCH_COUNT . "')
+                THEN 1 ELSE 0 END
+                    AS `" . PiwikMetrics::INDEX_SITE_SEARCH_HAS_NO_RESULT . "`";
 
         //we need an extra JOIN to know whether the referrer "idaction_name_ref" was a Site Search request
         $from[] = array(
@@ -146,9 +113,9 @@ class Archiver extends \Piwik\Plugin\Archiver
         );
 
         $selectPageIsFollowingSiteSearch = ",
-				SUM( CASE WHEN log_action_name_ref.type = " . Action::TYPE_SITE_SEARCH . "
-				      THEN 1 ELSE 0 END)
-                    AS `" . Metrics::INDEX_PAGE_IS_FOLLOWING_SITE_SEARCH_NB_HITS . "`";
+                SUM( CASE WHEN log_action_name_ref.type = " . Action::TYPE_SITE_SEARCH . "
+                      THEN 1 ELSE 0 END)
+                    AS `" . PiwikMetrics::INDEX_PAGE_IS_FOLLOWING_SITE_SEARCH_NB_HITS . "`";
 
         $select .= $selectFlagNoResultKeywords
             . $selectPageIsFollowingSiteSearch;
@@ -160,7 +127,7 @@ class Archiver extends \Piwik\Plugin\Archiver
     private function initActionsTables()
     {
         $this->actionsTablesByType = array();
-        foreach (self::$actionTypes as $type) {
+        foreach (Metrics::$actionTypes as $type) {
             $dataTable = new DataTable();
             $dataTable->setMaximumAllowedRows(ArchivingHelper::$maximumRowsInDataTableLevelZero);
 
@@ -168,7 +135,7 @@ class Archiver extends \Piwik\Plugin\Archiver
                 || $type == Action::TYPE_PAGE_TITLE
             ) {
                 // for page urls and page titles, performance metrics exist and have to be aggregated correctly
-                $dataTable->setMetadata(DataTable::COLUMN_AGGREGATION_OPS_METADATA_NAME, self::$columnsAggregationOperation);
+                $dataTable->setMetadata(DataTable::COLUMN_AGGREGATION_OPS_METADATA_NAME, Metrics::$columnsAggregationOperation);
             }
 
             $this->actionsTablesByType[$type] = $dataTable;
@@ -177,30 +144,17 @@ class Archiver extends \Piwik\Plugin\Archiver
 
     protected function archiveDayActions($rankingQueryLimit)
     {
+        $metricsConfig = Metrics::getActionMetrics();
+
         $select = "log_action.name,
-				log_action.type,
-				log_action.idaction,
-				log_action.url_prefix,
-				count(distinct log_link_visit_action.idvisit) as `" . Metrics::INDEX_NB_VISITS . "`,
-				count(distinct log_link_visit_action.idvisitor) as `" . Metrics::INDEX_NB_UNIQ_VISITORS . "`,
-				count(*) as `" . Metrics::INDEX_PAGE_NB_HITS . "`,
-				sum(
-					case when " . Action::DB_COLUMN_CUSTOM_FLOAT . " is null
-						then 0
-						else " . Action::DB_COLUMN_CUSTOM_FLOAT . "
-					end
-				) / 1000 as `" . Metrics::INDEX_PAGE_SUM_TIME_GENERATION . "`,
-				sum(
-					case when " . Action::DB_COLUMN_CUSTOM_FLOAT . " is null
-						then 0
-						else 1
-					end
-				) as `" . Metrics::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION . "`,
-				min(" . Action::DB_COLUMN_CUSTOM_FLOAT . ") / 1000
-				    as `" . Metrics::INDEX_PAGE_MIN_TIME_GENERATION . "`,
-				max(" . Action::DB_COLUMN_CUSTOM_FLOAT . ") / 1000
-                    as `" . Metrics::INDEX_PAGE_MAX_TIME_GENERATION . "`
-				";
+                log_action.type,
+                log_action.idaction,
+                log_action.url_prefix,
+                count(distinct log_link_visit_action.idvisit) as `" . PiwikMetrics::INDEX_NB_VISITS . "`,
+                count(distinct log_link_visit_action.idvisitor) as `" . PiwikMetrics::INDEX_NB_UNIQ_VISITORS . "`,
+                count(*) as `" . PiwikMetrics::INDEX_PAGE_NB_HITS . "`";
+
+        $select = $this->addMetricsToSelect($select, $metricsConfig);
 
         $from = array(
             "log_link_visit_action",
@@ -211,29 +165,29 @@ class Archiver extends \Piwik\Plugin\Archiver
         );
 
         $where = "log_link_visit_action.server_time >= ?
-				AND log_link_visit_action.server_time <= ?
-				AND log_link_visit_action.idsite = ?
-				AND log_link_visit_action.%s IS NOT NULL"
+                AND log_link_visit_action.server_time <= ?
+                AND log_link_visit_action.idsite = ?
+                AND log_link_visit_action.%s IS NOT NULL"
             . $this->getWhereClauseActionIsNotEvent();
 
         $groupBy = "log_action.idaction";
-        $orderBy = "`" . Metrics::INDEX_PAGE_NB_HITS . "` DESC, name ASC";
+        $orderBy = "`" . PiwikMetrics::INDEX_PAGE_NB_HITS . "` DESC, name ASC";
 
         $rankingQuery = false;
         if ($rankingQueryLimit > 0) {
             $rankingQuery = new RankingQuery($rankingQueryLimit);
             $rankingQuery->setOthersLabel(DataTable::LABEL_SUMMARY_ROW);
             $rankingQuery->addLabelColumn(array('idaction', 'name'));
-            $rankingQuery->addColumn(array('url_prefix', Metrics::INDEX_NB_UNIQ_VISITORS));
-            $rankingQuery->addColumn(array(Metrics::INDEX_PAGE_NB_HITS, Metrics::INDEX_NB_VISITS), 'sum');
+            $rankingQuery->addColumn(array('url_prefix', PiwikMetrics::INDEX_NB_UNIQ_VISITORS));
+            $rankingQuery->addColumn(array(PiwikMetrics::INDEX_PAGE_NB_HITS, PiwikMetrics::INDEX_NB_VISITS), 'sum');
+
             if ($this->isSiteSearchEnabled()) {
-                $rankingQuery->addColumn(Metrics::INDEX_SITE_SEARCH_HAS_NO_RESULT, 'min');
-                $rankingQuery->addColumn(Metrics::INDEX_PAGE_IS_FOLLOWING_SITE_SEARCH_NB_HITS, 'sum');
+                $rankingQuery->addColumn(PiwikMetrics::INDEX_SITE_SEARCH_HAS_NO_RESULT, 'min');
+                $rankingQuery->addColumn(PiwikMetrics::INDEX_PAGE_IS_FOLLOWING_SITE_SEARCH_NB_HITS, 'sum');
             }
-            $rankingQuery->addColumn(Metrics::INDEX_PAGE_SUM_TIME_GENERATION, 'sum');
-            $rankingQuery->addColumn(Metrics::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION, 'sum');
-            $rankingQuery->addColumn(Metrics::INDEX_PAGE_MIN_TIME_GENERATION, 'min');
-            $rankingQuery->addColumn(Metrics::INDEX_PAGE_MAX_TIME_GENERATION, 'max');
+
+            $this->addMetricsToRankingQuery($rankingQuery, $metricsConfig);
+
             $rankingQuery->partitionResultIntoMultipleGroups('type', array_keys($this->actionsTablesByType));
         }
 
@@ -244,9 +198,30 @@ class Archiver extends \Piwik\Plugin\Archiver
             $this->updateQuerySelectFromForSiteSearch($select, $from);
         }
 
-        $this->archiveDayQueryProcess($select, $from, $where, $orderBy, $groupBy, "idaction_name", $rankingQuery);
+        $this->archiveDayQueryProcess($select, $from, $where, $groupBy, $orderBy, "idaction_name", $rankingQuery, $metricsConfig);
+        $this->archiveDayQueryProcess($select, $from, $where, $groupBy, $orderBy, "idaction_url", $rankingQuery, $metricsConfig);
+    }
 
-        $this->archiveDayQueryProcess($select, $from, $where, $orderBy, $groupBy, "idaction_url", $rankingQuery);
+    private function addMetricsToSelect($select, $metricsConfig)
+    {
+        if (!empty($metricsConfig)) {
+            foreach ($metricsConfig as $metric => $config) {
+                $select .= ', ' . $config['query'] . " as `" . $metric . "`";
+            }
+        }
+
+        return $select;
+    }
+
+    private function addMetricsToRankingQuery(RankingQuery $rankingQuery, $metricsConfig)
+    {
+        foreach ($metricsConfig as $metric => $config) {
+            if (!empty($config['aggregation'])) {
+                $rankingQuery->addColumn($metric, $config['aggregation']);
+            } else {
+                $rankingQuery->addColumn($metric);
+            }
+        }
     }
 
     protected function isSiteSearchEnabled()
@@ -254,7 +229,7 @@ class Archiver extends \Piwik\Plugin\Archiver
         return $this->isSiteSearchEnabled;
     }
 
-    protected function archiveDayQueryProcess($select, $from, $where, $orderBy, $groupBy, $sprintfField, $rankingQuery = false)
+    protected function archiveDayQueryProcess($select, $from, $where, $groupBy, $orderBy, $sprintfField, RankingQuery $rankingQuery = null, $metricsConfig = array())
     {
         $select = sprintf($select, $sprintfField);
 
@@ -266,12 +241,12 @@ class Archiver extends \Piwik\Plugin\Archiver
 
         // apply ranking query
         if ($rankingQuery) {
-            $querySql = $rankingQuery->generateQuery($querySql);
+            $querySql = $rankingQuery->generateRankingQuery($querySql);
         }
 
         // get result
         $resultSet = $this->getLogAggregator()->getDb()->query($querySql, $query['bind']);
-        $modified = ArchivingHelper::updateActionsTableWithRowQuery($resultSet, $sprintfField, $this->actionsTablesByType);
+        $modified = ArchivingHelper::updateActionsTableWithRowQuery($resultSet, $sprintfField, $this->actionsTablesByType, $metricsConfig);
         return $modified;
     }
 
@@ -285,11 +260,11 @@ class Archiver extends \Piwik\Plugin\Archiver
             $rankingQuery = new RankingQuery($rankingQueryLimit);
             $rankingQuery->setOthersLabel(DataTable::LABEL_SUMMARY_ROW);
             $rankingQuery->addLabelColumn('idaction');
-            $rankingQuery->addColumn(Metrics::INDEX_PAGE_ENTRY_NB_UNIQ_VISITORS);
-            $rankingQuery->addColumn(array(Metrics::INDEX_PAGE_ENTRY_NB_VISITS,
-                                           Metrics::INDEX_PAGE_ENTRY_NB_ACTIONS,
-                                           Metrics::INDEX_PAGE_ENTRY_SUM_VISIT_LENGTH,
-                                           Metrics::INDEX_PAGE_ENTRY_BOUNCE_COUNT), 'sum');
+            $rankingQuery->addColumn(PiwikMetrics::INDEX_PAGE_ENTRY_NB_UNIQ_VISITORS);
+            $rankingQuery->addColumn(array(PiwikMetrics::INDEX_PAGE_ENTRY_NB_VISITS,
+                                           PiwikMetrics::INDEX_PAGE_ENTRY_NB_ACTIONS,
+                                           PiwikMetrics::INDEX_PAGE_ENTRY_SUM_VISIT_LENGTH,
+                                           PiwikMetrics::INDEX_PAGE_ENTRY_BOUNCE_COUNT), 'sum');
             $rankingQuery->partitionResultIntoMultipleGroups('type', array_keys($this->actionsTablesByType));
 
             $extraSelects = 'log_action.type, log_action.name,';
@@ -300,7 +275,7 @@ class Archiver extends \Piwik\Plugin\Archiver
                     "joinOn" => "log_visit.%s = log_action.idaction"
                 )
             );
-            $orderBy = "`" . Metrics::INDEX_PAGE_ENTRY_NB_ACTIONS . "` DESC, log_action.name ASC";
+            $orderBy = "`" . PiwikMetrics::INDEX_PAGE_ENTRY_NB_ACTIONS . "` DESC, log_action.name ASC";
         } else {
             $extraSelects = false;
             $from = "log_visit";
@@ -308,22 +283,22 @@ class Archiver extends \Piwik\Plugin\Archiver
         }
 
         $select = "log_visit.%s as idaction, $extraSelects
-				count(distinct log_visit.idvisitor) as `" . Metrics::INDEX_PAGE_ENTRY_NB_UNIQ_VISITORS . "`,
-				count(*) as `" . Metrics::INDEX_PAGE_ENTRY_NB_VISITS . "`,
-				sum(log_visit.visit_total_actions) as `" . Metrics::INDEX_PAGE_ENTRY_NB_ACTIONS . "`,
-				sum(log_visit.visit_total_time) as `" . Metrics::INDEX_PAGE_ENTRY_SUM_VISIT_LENGTH . "`,
-				sum(case log_visit.visit_total_actions when 1 then 1 when 0 then 1 else 0 end) as `" . Metrics::INDEX_PAGE_ENTRY_BOUNCE_COUNT . "`";
+                count(distinct log_visit.idvisitor) as `" . PiwikMetrics::INDEX_PAGE_ENTRY_NB_UNIQ_VISITORS . "`,
+                count(*) as `" . PiwikMetrics::INDEX_PAGE_ENTRY_NB_VISITS . "`,
+                sum(log_visit.visit_total_actions) as `" . PiwikMetrics::INDEX_PAGE_ENTRY_NB_ACTIONS . "`,
+                sum(log_visit.visit_total_time) as `" . PiwikMetrics::INDEX_PAGE_ENTRY_SUM_VISIT_LENGTH . "`,
+                sum(case log_visit.visit_total_actions when 1 then 1 when 0 then 1 else 0 end) as `" . PiwikMetrics::INDEX_PAGE_ENTRY_BOUNCE_COUNT . "`";
 
         $where = "log_visit.visit_last_action_time >= ?
-				AND log_visit.visit_last_action_time <= ?
-				AND log_visit.idsite = ?
-		 		AND log_visit.%s > 0";
+                AND log_visit.visit_last_action_time <= ?
+                AND log_visit.idsite = ?
+                 AND log_visit.%s > 0";
 
         $groupBy = "log_visit.%s, idaction";
 
-        $this->archiveDayQueryProcess($select, $from, $where, $orderBy, $groupBy, "visit_entry_idaction_url", $rankingQuery);
+        $this->archiveDayQueryProcess($select, $from, $where, $groupBy, $orderBy, "visit_entry_idaction_url", $rankingQuery);
 
-        $this->archiveDayQueryProcess($select, $from, $where, $orderBy, $groupBy, "visit_entry_idaction_name", $rankingQuery);
+        $this->archiveDayQueryProcess($select, $from, $where, $groupBy, $orderBy, "visit_entry_idaction_name", $rankingQuery);
     }
 
     /**
@@ -336,8 +311,8 @@ class Archiver extends \Piwik\Plugin\Archiver
             $rankingQuery = new RankingQuery($rankingQueryLimit);
             $rankingQuery->setOthersLabel(DataTable::LABEL_SUMMARY_ROW);
             $rankingQuery->addLabelColumn('idaction');
-            $rankingQuery->addColumn(Metrics::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS);
-            $rankingQuery->addColumn(Metrics::INDEX_PAGE_EXIT_NB_VISITS, 'sum');
+            $rankingQuery->addColumn(PiwikMetrics::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS);
+            $rankingQuery->addColumn(PiwikMetrics::INDEX_PAGE_EXIT_NB_VISITS, 'sum');
             $rankingQuery->partitionResultIntoMultipleGroups('type', array_keys($this->actionsTablesByType));
 
             $extraSelects = 'log_action.type, log_action.name,';
@@ -348,7 +323,7 @@ class Archiver extends \Piwik\Plugin\Archiver
                     "joinOn" => "log_visit.%s = log_action.idaction"
                 )
             );
-            $orderBy = "`" . Metrics::INDEX_PAGE_EXIT_NB_VISITS . "` DESC, log_action.name ASC";
+            $orderBy = "`" . PiwikMetrics::INDEX_PAGE_EXIT_NB_VISITS . "` DESC, log_action.name ASC";
         } else {
             $extraSelects = false;
             $from = "log_visit";
@@ -356,19 +331,19 @@ class Archiver extends \Piwik\Plugin\Archiver
         }
 
         $select = "log_visit.%s as idaction, $extraSelects
-				count(distinct log_visit.idvisitor) as `" . Metrics::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS . "`,
-				count(*) as `" . Metrics::INDEX_PAGE_EXIT_NB_VISITS . "`";
+                count(distinct log_visit.idvisitor) as `" . PiwikMetrics::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS . "`,
+                count(*) as `" . PiwikMetrics::INDEX_PAGE_EXIT_NB_VISITS . "`";
 
         $where = "log_visit.visit_last_action_time >= ?
-				AND log_visit.visit_last_action_time <= ?
-		 		AND log_visit.idsite = ?
-		 		AND log_visit.%s > 0";
+                AND log_visit.visit_last_action_time <= ?
+                 AND log_visit.idsite = ?
+                 AND log_visit.%s > 0";
 
         $groupBy = "log_visit.%s, idaction";
 
-        $this->archiveDayQueryProcess($select, $from, $where, $orderBy, $groupBy, "visit_exit_idaction_url", $rankingQuery);
+        $this->archiveDayQueryProcess($select, $from, $where, $groupBy, $orderBy, "visit_exit_idaction_url", $rankingQuery);
 
-        $this->archiveDayQueryProcess($select, $from, $where, $orderBy, $groupBy, "visit_exit_idaction_name", $rankingQuery);
+        $this->archiveDayQueryProcess($select, $from, $where, $groupBy, $orderBy, "visit_exit_idaction_name", $rankingQuery);
         return array($rankingQuery, $extraSelects, $from, $orderBy, $select, $where, $groupBy);
     }
 
@@ -382,10 +357,10 @@ class Archiver extends \Piwik\Plugin\Archiver
             $rankingQuery = new RankingQuery($rankingQueryLimit);
             $rankingQuery->setOthersLabel(DataTable::LABEL_SUMMARY_ROW);
             $rankingQuery->addLabelColumn('idaction');
-            $rankingQuery->addColumn(Metrics::INDEX_PAGE_SUM_TIME_SPENT, 'sum');
+            $rankingQuery->addColumn(PiwikMetrics::INDEX_PAGE_SUM_TIME_SPENT, 'sum');
             $rankingQuery->partitionResultIntoMultipleGroups('type', array_keys($this->actionsTablesByType));
 
-            $extraSelects = "log_action.type, log_action.name, count(*) as `" . Metrics::INDEX_PAGE_NB_HITS . "`,";
+            $extraSelects = "log_action.type, log_action.name, count(*) as `" . PiwikMetrics::INDEX_PAGE_NB_HITS . "`,";
             $from = array(
                 "log_link_visit_action",
                 array(
@@ -393,7 +368,7 @@ class Archiver extends \Piwik\Plugin\Archiver
                     "joinOn" => "log_link_visit_action.%s = log_action.idaction"
                 )
             );
-            $orderBy = "`" . Metrics::INDEX_PAGE_NB_HITS . "` DESC, log_action.name ASC";
+            $orderBy = "`" . PiwikMetrics::INDEX_PAGE_NB_HITS . "` DESC, log_action.name ASC";
         } else {
             $extraSelects = false;
             $from = "log_link_visit_action";
@@ -401,20 +376,20 @@ class Archiver extends \Piwik\Plugin\Archiver
         }
 
         $select = "log_link_visit_action.%s as idaction, $extraSelects
-				sum(log_link_visit_action.time_spent_ref_action) as `" . Metrics::INDEX_PAGE_SUM_TIME_SPENT . "`";
+                sum(log_link_visit_action.time_spent_ref_action) as `" . PiwikMetrics::INDEX_PAGE_SUM_TIME_SPENT . "`";
 
         $where = "log_link_visit_action.server_time >= ?
-				AND log_link_visit_action.server_time <= ?
-		 		AND log_link_visit_action.idsite = ?
-		 		AND log_link_visit_action.time_spent_ref_action > 0
-		 		AND log_link_visit_action.%s > 0"
+                AND log_link_visit_action.server_time <= ?
+                 AND log_link_visit_action.idsite = ?
+                 AND log_link_visit_action.time_spent_ref_action > 0
+                 AND log_link_visit_action.%s > 0"
             . $this->getWhereClauseActionIsNotEvent();
 
         $groupBy = "log_link_visit_action.%s, idaction";
 
-        $this->archiveDayQueryProcess($select, $from, $where, $orderBy, $groupBy, "idaction_url_ref", $rankingQuery);
+        $this->archiveDayQueryProcess($select, $from, $where, $groupBy, $orderBy, "idaction_url_ref", $rankingQuery);
 
-        $this->archiveDayQueryProcess($select, $from, $where, $orderBy, $groupBy, "idaction_name_ref", $rankingQuery);
+        $this->archiveDayQueryProcess($select, $from, $where, $groupBy, $orderBy, "idaction_name_ref", $rankingQuery);
     }
 
     /**
@@ -437,10 +412,10 @@ class Archiver extends \Piwik\Plugin\Archiver
         $this->insertTable($dataTable, self::PAGE_URLS_RECORD_NAME);
 
         $records = array(
-            self::METRIC_PAGEVIEWS_RECORD_NAME      => array_sum($dataTable->getColumn(Metrics::INDEX_PAGE_NB_HITS)),
-            self::METRIC_UNIQ_PAGEVIEWS_RECORD_NAME => array_sum($dataTable->getColumn(Metrics::INDEX_NB_VISITS)),
-            self::METRIC_SUM_TIME_RECORD_NAME       => array_sum($dataTable->getColumn(Metrics::INDEX_PAGE_SUM_TIME_GENERATION)),
-            self::METRIC_HITS_TIMED_RECORD_NAME     => array_sum($dataTable->getColumn(Metrics::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION))
+            self::METRIC_PAGEVIEWS_RECORD_NAME      => array_sum($dataTable->getColumn(PiwikMetrics::INDEX_PAGE_NB_HITS)),
+            self::METRIC_UNIQ_PAGEVIEWS_RECORD_NAME => array_sum($dataTable->getColumn(PiwikMetrics::INDEX_NB_VISITS)),
+            self::METRIC_SUM_TIME_RECORD_NAME       => array_sum($dataTable->getColumn(PiwikMetrics::INDEX_PAGE_SUM_TIME_GENERATION)),
+            self::METRIC_HITS_TIMED_RECORD_NAME     => array_sum($dataTable->getColumn(PiwikMetrics::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION))
         );
         $this->getProcessor()->insertNumericRecords($records);
     }
@@ -466,8 +441,8 @@ class Archiver extends \Piwik\Plugin\Archiver
         $dataTable = $this->getDataTable(Action::TYPE_DOWNLOAD);
         $this->insertTable($dataTable, self::DOWNLOADS_RECORD_NAME);
 
-        $this->getProcessor()->insertNumericRecord(self::METRIC_DOWNLOADS_RECORD_NAME, array_sum($dataTable->getColumn(Metrics::INDEX_PAGE_NB_HITS)));
-        $this->getProcessor()->insertNumericRecord(self::METRIC_UNIQ_DOWNLOADS_RECORD_NAME, array_sum($dataTable->getColumn(Metrics::INDEX_NB_VISITS)));
+        $this->getProcessor()->insertNumericRecord(self::METRIC_DOWNLOADS_RECORD_NAME, array_sum($dataTable->getColumn(PiwikMetrics::INDEX_PAGE_NB_HITS)));
+        $this->getProcessor()->insertNumericRecord(self::METRIC_UNIQ_DOWNLOADS_RECORD_NAME, array_sum($dataTable->getColumn(PiwikMetrics::INDEX_NB_VISITS)));
     }
 
     protected function insertOutlinksReports()
@@ -475,8 +450,8 @@ class Archiver extends \Piwik\Plugin\Archiver
         $dataTable = $this->getDataTable(Action::TYPE_OUTLINK);
         $this->insertTable($dataTable, self::OUTLINKS_RECORD_NAME);
 
-        $this->getProcessor()->insertNumericRecord(self::METRIC_OUTLINKS_RECORD_NAME, array_sum($dataTable->getColumn(Metrics::INDEX_PAGE_NB_HITS)));
-        $this->getProcessor()->insertNumericRecord(self::METRIC_UNIQ_OUTLINKS_RECORD_NAME, array_sum($dataTable->getColumn(Metrics::INDEX_NB_VISITS)));
+        $this->getProcessor()->insertNumericRecord(self::METRIC_OUTLINKS_RECORD_NAME, array_sum($dataTable->getColumn(PiwikMetrics::INDEX_PAGE_NB_HITS)));
+        $this->getProcessor()->insertNumericRecord(self::METRIC_UNIQ_OUTLINKS_RECORD_NAME, array_sum($dataTable->getColumn(PiwikMetrics::INDEX_NB_VISITS)));
     }
 
     protected function insertPageTitlesReports()
@@ -491,21 +466,21 @@ class Archiver extends \Piwik\Plugin\Archiver
         $this->deleteUnusedColumnsFromKeywordsDataTable($dataTable);
         $this->insertTable($dataTable, self::SITE_SEARCH_RECORD_NAME);
 
-        $this->getProcessor()->insertNumericRecord(self::METRIC_SEARCHES_RECORD_NAME, array_sum($dataTable->getColumn(Metrics::INDEX_NB_VISITS)));
+        $this->getProcessor()->insertNumericRecord(self::METRIC_SEARCHES_RECORD_NAME, array_sum($dataTable->getColumn(PiwikMetrics::INDEX_PAGE_NB_HITS)));
         $this->getProcessor()->insertNumericRecord(self::METRIC_KEYWORDS_RECORD_NAME, $dataTable->getRowsCount());
     }
 
     protected function deleteUnusedColumnsFromKeywordsDataTable(DataTable $dataTable)
     {
         $columnsToDelete = array(
-            Metrics::INDEX_NB_UNIQ_VISITORS,
-            Metrics::INDEX_PAGE_IS_FOLLOWING_SITE_SEARCH_NB_HITS,
-            Metrics::INDEX_PAGE_ENTRY_NB_UNIQ_VISITORS,
-            Metrics::INDEX_PAGE_ENTRY_NB_ACTIONS,
-            Metrics::INDEX_PAGE_ENTRY_SUM_VISIT_LENGTH,
-            Metrics::INDEX_PAGE_ENTRY_NB_VISITS,
-            Metrics::INDEX_PAGE_ENTRY_BOUNCE_COUNT,
-            Metrics::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS,
+            PiwikMetrics::INDEX_NB_UNIQ_VISITORS,
+            PiwikMetrics::INDEX_PAGE_IS_FOLLOWING_SITE_SEARCH_NB_HITS,
+            PiwikMetrics::INDEX_PAGE_ENTRY_NB_UNIQ_VISITORS,
+            PiwikMetrics::INDEX_PAGE_ENTRY_NB_ACTIONS,
+            PiwikMetrics::INDEX_PAGE_ENTRY_SUM_VISIT_LENGTH,
+            PiwikMetrics::INDEX_PAGE_ENTRY_NB_VISITS,
+            PiwikMetrics::INDEX_PAGE_ENTRY_BOUNCE_COUNT,
+            PiwikMetrics::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS,
         );
         $dataTable->deleteColumns($columnsToDelete);
     }
@@ -521,8 +496,8 @@ class Archiver extends \Piwik\Plugin\Archiver
             ArchivingHelper::$maximumRowsInDataTableLevelZero,
             ArchivingHelper::$maximumRowsInSubDataTable,
             ArchivingHelper::$columnToSortByBeforeTruncation,
-            self::$columnsAggregationOperation,
-            self::$columnsToRenameAfterAggregation
+            Metrics::$columnsAggregationOperation,
+            Metrics::$columnsToRenameAfterAggregation
         );
 
         $dataTableToSum = array(
@@ -536,7 +511,7 @@ class Archiver extends \Piwik\Plugin\Archiver
             ArchivingHelper::$maximumRowsInSubDataTable,
             ArchivingHelper::$columnToSortByBeforeTruncation,
             $aggregation,
-            self::$columnsToRenameAfterAggregation
+            Metrics::$columnsToRenameAfterAggregation
         );
 
         $this->getProcessor()->aggregateNumericMetrics($this->getMetricNames());
diff --git a/plugins/Actions/ArchivingHelper.php b/plugins/Actions/ArchivingHelper.php
index e168f5d742..16a7c5f536 100644
--- a/plugins/Actions/ArchivingHelper.php
+++ b/plugins/Actions/ArchivingHelper.php
@@ -14,7 +14,7 @@ use Piwik\DataTable\Row\DataTableSummaryRow;
 use Piwik\DataTable;
 use Piwik\DataTable\Manager;
 use Piwik\DataTable\Row;
-use Piwik\Metrics;
+use Piwik\Metrics as PiwikMetrics;
 use Piwik\Piwik;
 use Piwik\Tracker\Action;
 use Piwik\Tracker\PageUrl;
@@ -38,7 +38,7 @@ class ArchivingHelper
      * @param array $actionsTablesByType
      * @return int
      */
-    public static function updateActionsTableWithRowQuery($query, $fieldQueried, & $actionsTablesByType)
+    public static function updateActionsTableWithRowQuery($query, $fieldQueried, & $actionsTablesByType, $metricsConfig)
     {
         $rowsProcessed = 0;
         while ($row = $query->fetch()) {
@@ -51,7 +51,7 @@ class ArchivingHelper
             }
 
             if ($row['type'] != Action::TYPE_SITE_SEARCH) {
-                unset($row[Metrics::INDEX_SITE_SEARCH_HAS_NO_RESULT]);
+                unset($row[PiwikMetrics::INDEX_SITE_SEARCH_HAS_NO_RESULT]);
             }
 
             if ($row['type'] == Action::TYPE_CONTENT) {
@@ -111,15 +111,15 @@ class ArchivingHelper
                 && !$actionRow->isSummaryRow()
             ) {
                 if (($existingUrl = $actionRow->getMetadata('url')) !== false) {
-                    if (!empty($row[Metrics::INDEX_PAGE_NB_HITS])
-                        && $row[Metrics::INDEX_PAGE_NB_HITS] > $actionRow->maxVisitsSummed
+                    if (!empty($row[PiwikMetrics::INDEX_PAGE_NB_HITS])
+                        && $row[PiwikMetrics::INDEX_PAGE_NB_HITS] > $actionRow->maxVisitsSummed
                     ) {
                         $actionRow->setMetadata('url', $url);
-                        $actionRow->maxVisitsSummed = $row[Metrics::INDEX_PAGE_NB_HITS];
+                        $actionRow->maxVisitsSummed = $row[PiwikMetrics::INDEX_PAGE_NB_HITS];
                     }
                 } else {
                     $actionRow->setMetadata('url', $url);
-                    $actionRow->maxVisitsSummed = !empty($row[Metrics::INDEX_PAGE_NB_HITS]) ? $row[Metrics::INDEX_PAGE_NB_HITS] : 0;
+                    $actionRow->maxVisitsSummed = !empty($row[PiwikMetrics::INDEX_PAGE_NB_HITS]) ? $row[PiwikMetrics::INDEX_PAGE_NB_HITS] : 0;
                 }
             }
 
@@ -127,17 +127,17 @@ class ArchivingHelper
                 && $row['type'] != Action::TYPE_PAGE_TITLE
             ) {
                 // only keep performance metrics when they're used (i.e. for URLs and page titles)
-                if (array_key_exists(Metrics::INDEX_PAGE_SUM_TIME_GENERATION, $row)) {
-                    unset($row[Metrics::INDEX_PAGE_SUM_TIME_GENERATION]);
+                if (array_key_exists(PiwikMetrics::INDEX_PAGE_SUM_TIME_GENERATION, $row)) {
+                    unset($row[PiwikMetrics::INDEX_PAGE_SUM_TIME_GENERATION]);
                 }
-                if (array_key_exists(Metrics::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION, $row)) {
-                    unset($row[Metrics::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION]);
+                if (array_key_exists(PiwikMetrics::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION, $row)) {
+                    unset($row[PiwikMetrics::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION]);
                 }
-                if (array_key_exists(Metrics::INDEX_PAGE_MIN_TIME_GENERATION, $row)) {
-                    unset($row[Metrics::INDEX_PAGE_MIN_TIME_GENERATION]);
+                if (array_key_exists(PiwikMetrics::INDEX_PAGE_MIN_TIME_GENERATION, $row)) {
+                    unset($row[PiwikMetrics::INDEX_PAGE_MIN_TIME_GENERATION]);
                 }
-                if (array_key_exists(Metrics::INDEX_PAGE_MAX_TIME_GENERATION, $row)) {
-                    unset($row[Metrics::INDEX_PAGE_MAX_TIME_GENERATION]);
+                if (array_key_exists(PiwikMetrics::INDEX_PAGE_MAX_TIME_GENERATION, $row)) {
+                    unset($row[PiwikMetrics::INDEX_PAGE_MAX_TIME_GENERATION]);
                 }
             }
 
@@ -151,7 +151,7 @@ class ArchivingHelper
                 // - this happens when 2 visitors visit the same new page at the same time, and 2 actions get recorded for the same name
                 // - this could also happen when 2 URLs end up having the same label (eg. 2 subdomains get aggregated to the "/index" page name)
                 if (($alreadyValue = $actionRow->getColumn($name)) !== false) {
-                    $newValue = self::getColumnValuesMerged($name, $alreadyValue, $value);
+                    $newValue = self::getColumnValuesMerged($name, $alreadyValue, $value, $metricsConfig);
                     $actionRow->setColumn($name, $newValue);
                 } else {
                     $actionRow->addColumn($name, $value);
@@ -161,7 +161,7 @@ class ArchivingHelper
             // if the exit_action was not recorded properly in the log_link_visit_action
             // there would be an error message when getting the nb_hits column
             // we must fake the record and add the columns
-            if ($actionRow->getColumn(Metrics::INDEX_PAGE_NB_HITS) === false) {
+            if ($actionRow->getColumn(PiwikMetrics::INDEX_PAGE_NB_HITS) === false) {
                 // to test this code: delete the entries in log_link_action_visit for
                 //  a given exit_idaction_url
                 foreach (self::getDefaultRow()->getColumns() as $name => $value) {
@@ -180,7 +180,7 @@ class ArchivingHelper
     {
         // Delete all columns that have a value of zero
         $dataTable->filter('ColumnDelete', array(
-                                                $columnsToRemove = array(Metrics::INDEX_PAGE_IS_FOLLOWING_SITE_SEARCH_NB_HITS),
+                                                $columnsToRemove = array(PiwikMetrics::INDEX_PAGE_IS_FOLLOWING_SITE_SEARCH_NB_HITS),
                                                 $columnsToKeep = array(),
                                                 $deleteIfZeroOnly = true
                                            ));
@@ -198,16 +198,16 @@ class ArchivingHelper
             if (($idSubtable = $row->getIdSubDataTable()) !== null
                 || $id === DataTable::ID_SUMMARY_ROW
             ) {
-                if ($idSubtable !== null) {
-                    $subtable = Manager::getInstance()->getTable($idSubtable);
-                    self::deleteInvalidSummedColumnsFromDataTable($subtable);
+                $subTable = $row->getSubtable();
+                if ($subTable) {
+                    self::deleteInvalidSummedColumnsFromDataTable($subTable);
                 }
 
                 if ($row instanceof DataTableSummaryRow) {
                     $row->recalculate();
                 }
 
-                foreach (Archiver::$columnsToDeleteAfterAggregation as $name) {
+                foreach (Metrics::$columnsToDeleteAfterAggregation as $name) {
                     $row->deleteColumn($name);
                 }
             }
@@ -267,21 +267,28 @@ class ArchivingHelper
      * @param $value
      * @return mixed
      */
-    private static function getColumnValuesMerged($columnName, $alreadyValue, $value)
+    private static function getColumnValuesMerged($columnName, $alreadyValue, $value, $metricsConfig)
     {
-        if ($columnName == Metrics::INDEX_PAGE_MIN_TIME_GENERATION) {
-            if (empty($alreadyValue)) {
-                $newValue = $value;
-            } else if (empty($value)) {
-                $newValue = $alreadyValue;
-            } else {
-                $newValue = min($alreadyValue, $value);
+        if (array_key_exists($columnName, $metricsConfig)) {
+            $config = $metricsConfig[$columnName];
+
+            if (!empty($config['aggregation'])) {
+
+                if ($config['aggregation'] == 'min') {
+                    if (empty($alreadyValue)) {
+                        $newValue = $value;
+                    } else if (empty($value)) {
+                        $newValue = $alreadyValue;
+                    } else {
+                        $newValue = min($alreadyValue, $value);
+                    }
+                    return $newValue;
+                }
+                if ($config['aggregation'] == 'max') {
+                    $newValue = max($alreadyValue, $value);
+                    return $newValue;
+                }
             }
-            return $newValue;
-        }
-        if ($columnName == Metrics::INDEX_PAGE_MAX_TIME_GENERATION) {
-            $newValue = max($alreadyValue, $value);
-            return $newValue;
         }
 
         $newValue = $alreadyValue + $value;
@@ -310,7 +317,7 @@ class ArchivingHelper
         }
 
         self::$defaultActionName = Config::getInstance()->General['action_default_name'];
-        self::$columnToSortByBeforeTruncation = Metrics::INDEX_NB_VISITS;
+        self::$columnToSortByBeforeTruncation = PiwikMetrics::INDEX_NB_VISITS;
         self::$maximumRowsInDataTableLevelZero = Config::getInstance()->General['datatable_archiving_maximum_rows_actions'];
         self::$maximumRowsInSubDataTable = Config::getInstance()->General['datatable_archiving_maximum_rows_subtable_actions'];
 
@@ -333,9 +340,9 @@ class ArchivingHelper
             // so we add this fake row information to make sure there is a nb_hits, etc. column for every action
             $row = new Row(array(
                                 Row::COLUMNS => array(
-                                    Metrics::INDEX_NB_VISITS        => 1,
-                                    Metrics::INDEX_NB_UNIQ_VISITORS => 1,
-                                    Metrics::INDEX_PAGE_NB_HITS     => 1,
+                                    PiwikMetrics::INDEX_NB_VISITS        => 1,
+                                    PiwikMetrics::INDEX_NB_UNIQ_VISITORS => 1,
+                                    PiwikMetrics::INDEX_PAGE_NB_HITS     => 1,
                                 )));
         }
         return $row;
@@ -351,13 +358,13 @@ class ArchivingHelper
      * @param array $actionsTablesByType
      * @return DataTable
      */
-    private static function getActionRow($actionName, $actionType, $urlPrefix = null, &$actionsTablesByType)
+    public static function getActionRow($actionName, $actionType, $urlPrefix = null, &$actionsTablesByType)
     {
         // we work on the root table of the given TYPE (either ACTION_URL or DOWNLOAD or OUTLINK etc.)
         /* @var DataTable $currentTable */
         $currentTable =& $actionsTablesByType[$actionType];
 
-        if(is_null($currentTable)) {
+        if (is_null($currentTable)) {
             throw new \Exception("Action table for type '$actionType' was not found during Actions archiving.");
         }
 
@@ -529,10 +536,10 @@ class ArchivingHelper
      */
     private static function getDefaultRowColumns()
     {
-        return array(Metrics::INDEX_NB_VISITS           => 0,
-                     Metrics::INDEX_NB_UNIQ_VISITORS    => 0,
-                     Metrics::INDEX_PAGE_NB_HITS        => 0,
-                     Metrics::INDEX_PAGE_SUM_TIME_SPENT => 0);
+        return array(PiwikMetrics::INDEX_NB_VISITS           => 0,
+                     PiwikMetrics::INDEX_NB_UNIQ_VISITORS    => 0,
+                     PiwikMetrics::INDEX_PAGE_NB_HITS        => 0,
+                     PiwikMetrics::INDEX_PAGE_SUM_TIME_SPENT => 0);
     }
 
     /**
diff --git a/plugins/Actions/Metrics.php b/plugins/Actions/Metrics.php
new file mode 100644
index 0000000000..83b1c7370a
--- /dev/null
+++ b/plugins/Actions/Metrics.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Actions;
+
+use Piwik\DataTable;
+use Piwik\Metrics as PiwikMetrics;
+use Piwik\Piwik;
+use Piwik\RankingQuery;
+use Piwik\Tracker\Action;
+use Piwik\Plugins\Actions\Actions\ActionSiteSearch;
+
+/**
+ * Class encapsulating logic to process Day/Period Archiving for the Actions reports
+ *
+ */
+class Metrics
+{
+
+    public static $actionTypes = array(
+        Action::TYPE_PAGE_URL,
+        Action::TYPE_OUTLINK,
+        Action::TYPE_DOWNLOAD,
+        Action::TYPE_PAGE_TITLE,
+        Action::TYPE_SITE_SEARCH,
+    );
+
+    public static $columnsToRenameAfterAggregation = array(
+        PiwikMetrics::INDEX_NB_UNIQ_VISITORS            => PiwikMetrics::INDEX_SUM_DAILY_NB_UNIQ_VISITORS,
+        PiwikMetrics::INDEX_PAGE_ENTRY_NB_UNIQ_VISITORS => PiwikMetrics::INDEX_PAGE_ENTRY_SUM_DAILY_NB_UNIQ_VISITORS,
+        PiwikMetrics::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS  => PiwikMetrics::INDEX_PAGE_EXIT_SUM_DAILY_NB_UNIQ_VISITORS,
+    );
+
+    public static $columnsToDeleteAfterAggregation = array(
+        PiwikMetrics::INDEX_NB_UNIQ_VISITORS,
+        PiwikMetrics::INDEX_PAGE_ENTRY_NB_UNIQ_VISITORS,
+        PiwikMetrics::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS,
+    );
+
+    public static $columnsAggregationOperation = array(
+        PiwikMetrics::INDEX_PAGE_MAX_TIME_GENERATION => 'max',
+        PiwikMetrics::INDEX_PAGE_MIN_TIME_GENERATION => 'min'
+    );
+
+    public static function getActionMetrics()
+    {
+        $metricsConfig = array(
+            PiwikMetrics::INDEX_PAGE_SUM_TIME_GENERATION => array(
+                'aggregation' => 'sum',
+                'query' => "sum(
+                        case when " . Action::DB_COLUMN_CUSTOM_FLOAT . " is null
+                            then 0
+                            else " . Action::DB_COLUMN_CUSTOM_FLOAT . "
+                        end
+                ) / 1000"
+            ),
+            PiwikMetrics::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION => array(
+                'aggregation' => 'sum',
+                'query' => "sum(
+                    case when " . Action::DB_COLUMN_CUSTOM_FLOAT . " is null
+                        then 0
+                        else 1
+                    end
+                )"
+            ),
+            PiwikMetrics::INDEX_PAGE_MIN_TIME_GENERATION => array(
+                'aggregation' => 'min',
+                'query' => "min(" . Action::DB_COLUMN_CUSTOM_FLOAT . ") / 1000"
+            ),
+            PiwikMetrics::INDEX_PAGE_MAX_TIME_GENERATION => array(
+                'aggregation' => 'max',
+                'query' => "max(" . Action::DB_COLUMN_CUSTOM_FLOAT . ") / 1000"
+            ),
+        );
+
+        Piwik::postEvent('Actions.Archiving.addActionMetrics', array(&$metricsConfig));
+
+        return $metricsConfig;
+    }
+}
diff --git a/plugins/Actions/Reports/GetExitPageUrls.php b/plugins/Actions/Reports/GetExitPageUrls.php
index e41039c9f1..2762a1139a 100644
--- a/plugins/Actions/Reports/GetExitPageUrls.php
+++ b/plugins/Actions/Reports/GetExitPageUrls.php
@@ -77,12 +77,9 @@ class GetExitPageUrls extends Base
 
     public function configureView(ViewDataTable $view)
     {
-        // link to the page, not just the report, but only if not a widget
-        $widget = Common::getRequestVar('widget', false);
-
         $view->config->self_url = Request::getCurrentUrlWithoutGenericFilters(array(
             'module' => 'Actions',
-            'action' => $widget === false ? 'indexExitPageUrls' : 'getExitPageUrls'
+            'action' => 'getExitPageUrls',
         ));
 
         $view->config->addTranslations(array('label' => $this->dimension->getName()));
diff --git a/plugins/Actions/Reports/GetPageTitles.php b/plugins/Actions/Reports/GetPageTitles.php
index 058d382ee9..d41082d149 100644
--- a/plugins/Actions/Reports/GetPageTitles.php
+++ b/plugins/Actions/Reports/GetPageTitles.php
@@ -63,12 +63,9 @@ class GetPageTitles extends Base
 
     public function configureView(ViewDataTable $view)
     {
-        // link to the page, not just the report, but only if not a widget
-        $widget = Common::getRequestVar('widget', false);
-
         $view->config->self_url = Request::getCurrentUrlWithoutGenericFilters(array(
             'module' => $this->module,
-            'action' => $widget === false ? 'indexPageTitles' : 'getPageTitles'
+            'action' => 'getPageTitles',
         ));
 
         $view->config->title = $this->name;
diff --git a/plugins/Actions/lang/ar.json b/plugins/Actions/lang/ar.json
index f77ec44a78..ff5941ee43 100644
--- a/plugins/Actions/lang/ar.json
+++ b/plugins/Actions/lang/ar.json
@@ -39,7 +39,6 @@
         "PagesReportDocumentation": "يتضمن هذا التقرير معلومات عن روابط الصفحات التي تم زيارتها. %s الجدول منظم هيكلياً، والروابط معروضة في شكل شجرة مجلدات.",
         "PageTitlesReportDocumentation": "يتضمن هذا التقرير معلومات عن عناوين الصفحات التي تم زيارتها. %s عنوان الصفحة هو وسم لغة %s HTML الذي تعرضه أغلب متصفحات ويب كعناون النافذة.",
         "PageUrls": "روابط الصفحة",
-        "PluginDescription": "التقارير حول مشاهدات الصفحة، الروابط الصادرة، والتحميلات. تتبع الروابط الصادرة والتحميلات يتم آلياً.",
         "SiteSearchCategories1": "يعرض هذا التقرير قائمة الفئات التي اختارها زوارك عندما قاموا بالبحث في موقعك.",
         "SiteSearchCategories2": "على سبيل المثال، المواقع التجارية عادة ما تحتوي طريقة لاختيار \"فئة\" بحيث يمكن للزوار حصر البحث في فئة منتجات معينة.",
         "SiteSearchFollowingPagesDoc": "عندما يقوم زوارك بالبحث في موقعك، فإنهم يبحثون عن صفحة بعينها، مقال ما، منتج أو خدمة. هذا التقرير يعرض أكثر الصفحات التي قاموا بالنقر عليها عند استخدام بحث الموقع. بكلمات أخرى، هذه قائمة بالصفحات التي يبحث عنها زوارك دائماً.",
diff --git a/plugins/Actions/lang/be.json b/plugins/Actions/lang/be.json
index 1ed2ab2ef4..b86bded152 100644
--- a/plugins/Actions/lang/be.json
+++ b/plugins/Actions/lang/be.json
@@ -20,7 +20,6 @@
         "OutlinksReportDocumentation": "Гэтая справаздача паказвае іерархічны спіс URL-адрасоў знешніх спасылак, якія былі націснуты вашымі наведвальнікамі.",
         "PagesReportDocumentation": "Гэтая справаздача змяшчае інфармацыю аб URL-адрасах старонак, якія былі наведаны. %s Табліца арганізавана іерархічна, URL-адрасы адлюстроўваюцца ў выглядзе тэчакавай структуры.",
         "PageTitlesReportDocumentation": "Гэтая справаздача змяшчае інфармацыю аб назвах старонак, якія былі наведаны. %s Назва старонкі гэта HTML %s тэг, які большасць брасзэраў паказваюць у загалоўке акна.",
-        "PluginDescription": "Справаздачы аб праглядах старонак, аутлінках і запампоўках. Аутлінкі і запампоўкі адсочваюцца аўтаматычна!",
         "SubmenuPagesEntry": "Старонкі ўваходу",
         "SubmenuPagesExit": "Старонкі выхаду",
         "SubmenuPageTitles": "Назвы старонак"
diff --git a/plugins/Actions/lang/bg.json b/plugins/Actions/lang/bg.json
index 1510dabe93..7b034b1064 100644
--- a/plugins/Actions/lang/bg.json
+++ b/plugins/Actions/lang/bg.json
@@ -39,7 +39,6 @@
         "PagesReportDocumentation": "Този доклад включва информация за посетените връзки. %s Таблицата е организирана йерархично, връзките са показани като структура от папки.",
         "PageTitlesReportDocumentation": "Този доклад включва информация за заглавията на посетена страница. %s Заглавието на страницата е HTML %s таг, който се изобразява в заглавната част на повечето браузери.",
         "PageUrls": "URLs страница",
-        "PluginDescription": "Доклади за посещения, изходящи връзки и сваляния. Изходящите връзки и Свалянията се отчитат автоматично!",
         "SiteSearchCategories1": "Този доклад показва списък с категориите, които посетителите са избрали при търсене във Вашия сайт.",
         "SiteSearchCategories2": "Например, електронните магазини обикновено имат категоризатор, така че посетителите да могат да филтрират търсенията си за всички продукти по категория.",
         "SiteSearchFollowingPagesDoc": "Когато посетителите разглеждат Вашия сайт, те търсят определена страница, продукт или услуга. Този доклад показва списъка със страници, които са били посетени предимно след използване на търсачката на сайта. С други думи, това е списъкът с най-посещаваните страници, които са били търсени от посетителите намиращи се във Вашия сайт.",
diff --git a/plugins/Actions/lang/bs.json b/plugins/Actions/lang/bs.json
index 094552088c..c963173341 100644
--- a/plugins/Actions/lang/bs.json
+++ b/plugins/Actions/lang/bs.json
@@ -39,7 +39,6 @@
         "PagesReportDocumentation": "Ovaj izvještaj sadrži informacije o stranicama koje su posjećene. %s tabela je organizovana hijerarhijski, URL-ovi su prikazani kao struktura foldera.",
         "PageTitlesReportDocumentation": "Ovaj raport sadrži informacije o naslovima stranica koje su posjećene. %s Naslov stranice je HTML %s Oznaka koju većina pregledača prikazuje u njihovom prozornom imenu.",
         "PageUrls": "Veze stranice",
-        "PluginDescription": "Izvješća o pregledima stranica, vanjskim vezama i preuzimanjima. Praćenje vanjskih veza i preuzimanja se vrši automatski.",
         "SiteSearchCategories1": "Ovaj raport prikazuje spisak kategorija koje su posjetioci odabrali kad su vršili istragu na vašoj stranici.",
         "SiteSearchCategories2": "Na primjer, stranice sa elektronskom trgovinom tipično imaju birač kategorija tako da se posjetioci mogu ograničiti na pretrage na svim proizvodima u specifičnoj kategoriji.",
         "SiteSearchFollowingPagesDoc": "Kada posjetioci traže na vašoj stranici, oni su u potrazi za određenu stranicu, sadržaj, proizvod, ili uslugu. Ovaj raport prikazuje spisak stranica koje su najviše kliknute poslije interne pretrage. S drugim riječima, ovo je spisak stranica koje su posjetioci najčešće pretraživali na vašoj stranici.",
diff --git a/plugins/Actions/lang/ca.json b/plugins/Actions/lang/ca.json
index 97d96a82c3..a8f9f053b8 100644
--- a/plugins/Actions/lang/ca.json
+++ b/plugins/Actions/lang/ca.json
@@ -38,7 +38,6 @@
         "PagesReportDocumentation": "Aquest informe conté les URL de les pàgines que s'han visitat. %s La taula s'organitza jerarquicament, i les URL es mostren amb estructura de directoris.",
         "PageTitlesReportDocumentation": "Aquest informe conté informació sobre els títols de les pàgines que s'han visitat. %s El títol de la pàgina es el tag HTML: %s, que es mostra al títol de la finestra en la majoría de navegadors.",
         "PageUrls": "URLs de les pàgines",
-        "PluginDescription": "Informe sobre les pàgines vistes, les enllaços de sortida i descarregues. Els enllaços de sortida i el seguiment de les descàrregues és automàtic.",
         "SiteSearchCategories1": "Aquest informe mostra les categoríes que han seleccionat els visitants quan han fet una cerca al vostre lloc web",
         "SiteSearchCategories2": "Per exemple, els llocs de Ecommers normalment tenen un selector de categoria que permet als visitants restringir les seves cerces als productes d'una Categoría concreta.",
         "SiteSearchFollowingPagesDoc": "Quan els visitants cerquen al teu lloc web, estan buscant una pàgina, un contingut, un producte o un servei en particular. Aquest informe mostra les pàgines que han estat clicades més vegades desprès d'una cerca interna. En altres paraules, la llista de pàgines que han estat més cercades pels visitants que ja están al vostre lloc web.",
diff --git a/plugins/Actions/lang/cs.json b/plugins/Actions/lang/cs.json
index 4c07889cd4..1c68478b02 100644
--- a/plugins/Actions/lang/cs.json
+++ b/plugins/Actions/lang/cs.json
@@ -39,7 +39,7 @@
         "PagesReportDocumentation": "Toto hlášení obsahuje informace o URL navštívených. %s Tabulka je organizována hyerarchicky jako strom složek.",
         "PageTitlesReportDocumentation": "Toto hlášení obsahuje informace o titulcích navštívených stránek. %s Titulek je HTML tag %s, který většina prohlížečů zobrazuje v titulku okna.",
         "PageUrls": "URL stránky",
-        "PluginDescription": "Hlásí zobrazení stránek, odchozí odkazy a stažení. Zaznamenávání odchozích stránek a stahování je automatické!",
+        "PluginDescription": "Podává hlášení o zobrazení a titulcích stránek. Umožňuje vám měřit váš interní vyhledávač. Automaticky sleduje kliky na externí odkazy a soubory ke stažení.",
         "SiteSearchCategories1": "Toto hlášení shrnuje kategorie, které návštěvníci vybrali při vyhledávání na stránkách.",
         "SiteSearchCategories2": "Například elektronické obchody mívají filtr kategorií, aby mohli uzákazníci zvolit, ve které kategorii bude provedeno hledání.",
         "SiteSearchFollowingPagesDoc": "Když návštěvníci hledají na vašich stránkách, snaží se nalézt určitou stránku, obhsa, produkt, nebo službu. Toto hlášení zobrazuje stránky, na které bylo klikáno nejčastěji po interním vyhledávání. Jinak řečeno, jedná se o stránky, které byly nejvíce hledány návštěvníky, kteří už byli na vašich stránkách.",
diff --git a/plugins/Actions/lang/da.json b/plugins/Actions/lang/da.json
index 750b9711a0..2f7eece65f 100644
--- a/plugins/Actions/lang/da.json
+++ b/plugins/Actions/lang/da.json
@@ -39,7 +39,6 @@
         "PagesReportDocumentation": "Rapporten indeholder oplysninger om sidens netadresser, der er blevet besøgt. %s tabellen er arrangeret hierarkisk, netadresserne vises i en mappestruktur.",
         "PageTitlesReportDocumentation": "Rapporten indeholder oplysninger om titlerne på de sider, der er blevet besøgt. %s side titel er HTML %s mærket, som de fleste netlæsere viser i vinduetitlen.",
         "PageUrls": "Side URL'er",
-        "PluginDescription": "Rapporter om sidevisninger, udgående links og fil-hentninger. Udgående links og filhentninger spores automatisk!",
         "SiteSearchCategories1": "Rapporten viser de kategorier, som de besøgende valgte, da de lavede en søgning på hjemmesiden.",
         "SiteSearchCategories2": "For eksempel har E-handel hjemmesider typisk en \"Kategori\" vælger, så besøgende kan begrænse deres søgninger til alle produkter i en bestemt kategori.",
         "SiteSearchFollowingPagesDoc": "Når besøgende søger på hjemmesiden, er de på udkig efter en bestemt side, indhold, produkt eller service. Rapporten viser de sider, der blev klikket mest på efter en intern søgning. Med andre ord, listen over sider mest søgt af besøgende allerede på hjemmesiden.",
diff --git a/plugins/Actions/lang/de.json b/plugins/Actions/lang/de.json
index eb176af733..d1e87c081b 100644
--- a/plugins/Actions/lang/de.json
+++ b/plugins/Actions/lang/de.json
@@ -39,7 +39,7 @@
         "PagesReportDocumentation": "Dieser Bericht enthält Informationen über die URLs der besuchten Seiten. %s Die Tabelle ist hierarchisch strukturiert, die URLs werden als Ordnerstruktur angezeigt.",
         "PageTitlesReportDocumentation": "Dieser Bericht enthält Informationen über die Seitentitel der besuchten Seiten. %s Der Seitentitel ist der HTML %s Tag, der von den meisten Browsern in ihrer Titelleiste angezeigt wird.",
         "PageUrls": "Seiten URL",
-        "PluginDescription": "Zusammenfassung über die Anzahl der betrachteten Seiten, ausgehenden Verweise und Downloads. Ausgehende Verweise und Downloads werden automatisch getrackt.",
+        "PluginDescription": "Berichte über die Seitenansichten und Seitentitel. Lässt Sie die internen Suchmaschinen Ihrer Webseiten erfassen. Trackt Klicks auf externe Links und Dateidownloads automatisch.",
         "SiteSearchCategories1": "Dieser Bericht zeigt die Kategorien, welche bei der internen Suche ausgewählt wurden.",
         "SiteSearchCategories2": "Onlineshops haben beispielsweise meist eine Kategorieauswahl, mit der Besucher ihre Suche auf eine bestimmte Produktkategorie einschränken können.",
         "SiteSearchFollowingPagesDoc": "Wenn Besucher die interne Suche verwenden, suchen sie meist nach einer bestimmten Seite, bzw. einem bestimmen Inhalt. In diesem Bericht wird angezeigt, welche Seiten am häufigsten von den Suchergebnissen aus besucht wurden. In anderen Worten sind dies die Seiten, nach denen Besucher am häufigsten gesucht haben, nachdem sie sich bereits auf der Webseite befanden.",
diff --git a/plugins/Actions/lang/el.json b/plugins/Actions/lang/el.json
index e5fa5762bf..edc949a3f3 100644
--- a/plugins/Actions/lang/el.json
+++ b/plugins/Actions/lang/el.json
@@ -39,7 +39,7 @@
         "PagesReportDocumentation": "Αυτή η αναφορά περιέχει πληροφορίες σχετικά με τις επισκεφθείσες διευθύνσεις σελίδων. %s Ο πίνακας ταξινομείται ιεραρχικά, οι διευθύνσεις σελίδων εμφανίζονται με δομή φακέλου.",
         "PageTitlesReportDocumentation": "Αυτή η αναφορά περιέχει πληροφορίες για τους τίτλους των επισκεφθεισών σελίδων. %s Ο τίτλος σελίδας είναι η ετικέτα HTML %s που οι περισσότεροι φυλλομετρητές δείχνουν στον τίτλο του παραθύρου τους.",
         "PageUrls": "Διευθύνσεις σελίδων",
-        "PluginDescription": "Αναφέρει για τις προβολές σελίδων, οι εξωτερικοί σύνδεσμοι και οι λήψεις. Η ανίχνευση των εξωτερικών συνδέσμων και των λήψεων είναι αυτόματη!",
+        "PluginDescription": "Αναφέρει σχετικά με τις αναγνώσεις σελίδων και τους τίτλους τους. Επιτρέπει την μέτρηση της εσωτερικής μηχανής αναζήτησης του ιστοτόπου σας. Αυτόματα παρακολουθεί τα κλικ προς εξωτερικούς συνδέσμους και κατεβάσματα αρχείων.",
         "SiteSearchCategories1": "Αυτή η αναφορά δημιουργεί λίστα με τις Κατηγορίες που οι επισκέπτες επέλεξαν όταν έκαναν μια Αναζήτηση στην ιστοσελίδα σας.",
         "SiteSearchCategories2": "Για παράδειγμα, οι ιστοσελίδες Ηλεκτρονικού Εμπορίου τυπικά έχουν έναν επιλογέα «Κατηγορίας» ώστε οι επισκέπτες μπορούν να περιορίσουν τις αναζητήσεις τους από όλα τα προϊόντα σε μια συγκεκριμένη κατηγορία.",
         "SiteSearchFollowingPagesDoc": "Όταν οι επισκέπτες αναζητούν στην ιστοσελίδα σας, αναζητούν μια συγκεκριμένη σελίδα, περιεχόμενο, προϊόν ή υπηρεσία. Αυτή η αναφορά δημιουργεί μια λίστα με τις σελίδες που επιλέχθηκαν περισσότερο μετά από μια εσωτερική αναζήτηση. Με άλλα λόγια, η λίστα των σελίδων που αναζητήθηκαν περίσσότερο από τους επισκέπτες που ήταν ήδη στην ιστοσελίδα σας.",
diff --git a/plugins/Actions/lang/en.json b/plugins/Actions/lang/en.json
index b182aa14fd..5a31efee34 100644
--- a/plugins/Actions/lang/en.json
+++ b/plugins/Actions/lang/en.json
@@ -39,7 +39,7 @@
         "PagesReportDocumentation": "This report contains information about the page URLs that have been visited. %s The table is organized hierarchically, the URLs are displayed as a folder structure.",
         "PageTitlesReportDocumentation": "This report contains information about the titles of the pages that have been visited. %s The page title is the HTML %s Tag that most browsers show in their window title.",
         "PageUrls": "Page URLs",
-        "PluginDescription": "Reports about the page views, the outlinks and downloads. Outlinks and Downloads tracking is automatic! You can also track your internal website's Search Engine.",
+        "PluginDescription": "Reports about the page views and page titles. Lets you measure your internal website's search engine. Automatically tracks clicks on external links and file downloads. ",
         "SiteSearchCategories1": "This report lists the Categories that visitors selected when they made a Search on your website.",
         "SiteSearchCategories2": "For example, Ecommerce websites typically have a \"Category\" selector so that visitors can restrict their searches to all products in a specific Category.",
         "SiteSearchFollowingPagesDoc": "When visitors search on your website, they are looking for a particular page, content, product, or service. This report lists the pages that were clicked the most after an internal search. In other words, the list of pages the most searched for by visitors already on your website.",
diff --git a/plugins/Actions/lang/es.json b/plugins/Actions/lang/es.json
index b0acfacc8f..14c7d8ad1c 100644
--- a/plugins/Actions/lang/es.json
+++ b/plugins/Actions/lang/es.json
@@ -39,7 +39,6 @@
         "PagesReportDocumentation": "Este reporte contiene información sobre las URLs de las páginas que han sido visitadas. %s La tabla está organizada por jerarquía, las URLs han sido mostradas como una estructura de carpetas.",
         "PageTitlesReportDocumentation": "Este reporte contiene información sobre los títulos de las páginas que han sido visitadas. %s El título de la página es el Tag %s de HTML, que la gran mayoría de los navegadores muestran en el título de su ventana.",
         "PageUrls": "URLs de página",
-        "PluginDescription": "Reportes de páginas vistas, enlaces externos y descargas. Los Enlaces Externos y las Descargas se rastrean automáticamente!",
         "SiteSearchCategories1": "Este reporte lista las Categorías que los visitantes eligieron cuando realizaron una búsqueda en tu sitio.",
         "SiteSearchCategories2": "Por ejemplo: los sitios de E-commerce usualmente tienen un selector de \"Categorías\" para que los visitantes puedan restringir sus búsquedas sólo a los productos de una categoría específica.",
         "SiteSearchFollowingPagesDoc": "Cuando los visitantes realizan una búsqueda en tu sitio, están buscando una página, contenido, producto o servicio en particular. Este reporte lista las páginas que más han sido clickeadas luego de una búsqueda interna. En otras palabras, la lista de páginas más buscadas por los visitantes que ya están en de tu sitio.",
diff --git a/plugins/Actions/lang/fa.json b/plugins/Actions/lang/fa.json
index c8ed45dbdc..2c7a55ad74 100644
--- a/plugins/Actions/lang/fa.json
+++ b/plugins/Actions/lang/fa.json
@@ -36,7 +36,6 @@
         "PagesReportDocumentation": "این گزارش شامل اطلاعاتی درباره URLهای صفحه هایی است که بازدید شده اند. %s جدول به صورت سلسله مراتبی سازماندهی شده است و URLها به عنوان پوشه نمایش داده شده اند.",
         "PageTitlesReportDocumentation": "این گزارش شامل اطلاعاتی درباره عنوان صفحه هایی است که بازدید شده اند. %s عنوان صفحه تگ %s HTML است که اغلب مرورگرها در عنوان پنجره هایشان نمایش می دهند.",
         "PageUrls": "آدرس صفحات",
-        "PluginDescription": "گزارش در مورد صفحه نمایش، از لینک ها و دریافت هاخروجی ها ردیابی خودکار است.",
         "SiteSearchCategories1": "این گزارش مجموعه هایی را فهرست می کند که بازدیدکنندگان هنگام جستجو در سایت شما , آن را انتخاب نموده اند.",
         "SiteSearchCategories2": "برای نمونه , وبسایت های تجاری معمولا \"مجموعه\"هایی برای انتخاب دارند که به بازدیدکنندگان اجازه می دهد جستجوهایشان را از تمام محصولات به مجموعه ای از محصولات محدود کنند.",
         "SiteSearchFollowingPagesDoc": "هنگامی که بازدیدکنندگان در سایت شما جستجو می کنند , آنها به دنبال صفحه ,محتوی ,محصول و یا سرویس خاصی هستند. این گزارش صفحاتی را فهرست می کند که بیشترین کلیک را بعد از جستجوی داخلی داشته اند. به عبارت دیگر ,فهرست صفحه هایی که بیشترین جستجو را توسط بازدیدکنندگان سایت شما داشته اند.",
diff --git a/plugins/Actions/lang/fi.json b/plugins/Actions/lang/fi.json
index 617d68f4bc..250e73c416 100644
--- a/plugins/Actions/lang/fi.json
+++ b/plugins/Actions/lang/fi.json
@@ -39,7 +39,6 @@
         "PagesReportDocumentation": "Tämä raportti sisältää tietoa sivuista, joilla on käyty. %s Taulukko on organisoitu hierarkisesti, URL:t näytetään puurakenteena.",
         "PageTitlesReportDocumentation": "Tämä raportti sisältää tietoa käytyjen sivujen otsikoista. %s Sivun otsikko on HTML:n %s-tagi, jonka useimmat selaimet näyttävät ikkunan otsikossa.",
         "PageUrls": "Sivujen URL:t",
-        "PluginDescription": "Raportit sivukatseluista, lähtölinkeistä ja latauksista. Lähtölinkkien ja latausten seuraaminen tapahtuu automaattisesti!",
         "SiteSearchCategories1": "Tämä raportti listaa kategoriat jotka kävijät valitsivat.",
         "SiteSearchCategories2": "Esimerkiksi e-kauppojen sivuilla on tyypillisesti \"Kategoria\"-valitsin, jolla käyttäjät voivat rajoittaa hakutuloksia.",
         "SiteSearchFollowingPagesDoc": "Kun kävijät hakevat sivuiltasi, he etsivät tiettyä sivua, sisältöä, tuotetta tai palvelua. Tämä raportti listaa sivut joita klikattiin useiten haun jälkeen.",
diff --git a/plugins/Actions/lang/fr.json b/plugins/Actions/lang/fr.json
index 5413f52feb..687d6c5ef8 100644
--- a/plugins/Actions/lang/fr.json
+++ b/plugins/Actions/lang/fr.json
@@ -39,7 +39,6 @@
         "PagesReportDocumentation": "Ce rapport contient des informations à propos des URLs qui ont été visitées. %s Le tableau est organisé hiérarchiquement, les URLs sont affichées en structure de dossier.",
         "PageTitlesReportDocumentation": "Ce rapport contient des informations à propos des titres des pages qui ont été visitées. %s Le titre de la page est le tag HTML %s que la plupart des navigateurs affichent dans le titre de la fenêtre.",
         "PageUrls": "URL de la page",
-        "PluginDescription": "Effectue des rapports sur les affichages de pages, les liens sortants et les téléchargements. Le suivi des liens sortants et des téléchargements est automatique!",
         "SiteSearchCategories1": "Ce rapport liste les catégories que les visiteurs ont sélectionnées lorsqu'ils ont effectué une recherche sur votre site web.",
         "SiteSearchCategories2": "Par exemple, les sites d'e-commerce ont généralement une sélection de la catégorie afin que les visiteurs puissent affiner leurs recherches aux produits d'une catégories définie.",
         "SiteSearchFollowingPagesDoc": "Quand les visiteurs recherchent sur votre site web, ils sont à la recherche d'une page, d'un produit, d'un contenu ou service en particulier. Ce rapport liste les pages qui ont été le plus cliquées après une recherche interne. En d'autres termes, la liste des pages les plus recherchées par des visiteurs déjà sur votre site.",
diff --git a/plugins/Actions/lang/he.json b/plugins/Actions/lang/he.json
index c9d70956ad..4604c2a255 100644
--- a/plugins/Actions/lang/he.json
+++ b/plugins/Actions/lang/he.json
@@ -39,7 +39,6 @@
         "PagesReportDocumentation": "דו״ח זה מכיל מידע אודות כתובת עמודים שבוקרו. %s הטבלה מאורגנת באופן היררכי, הכתובות מוצגות כמבנה תיקיות.",
         "PageTitlesReportDocumentation": "דו״ח זה מכיל מידע אודות כותרות העמודים שבוקרו. %s כותרת העמוד היא תגית HTML %s שרוב הדפדפנים מציגים בכותרת החלון שלהם.",
         "PageUrls": "כתובות עמוד",
-        "PluginDescription": "דיווח אודות צפיות בעמודים, קישורים יוצאים והורדות. עקיבה אחר קישורים יוצאים והורדות מתבצעת אוטומטית! ניתן גם לעקוב אחר מנוע החיפוש הפנימי של אתרך.",
         "SiteSearchCategories1": "דו״ח זה מציג רשימה של קטגוריות שמבקרים בחרו כאשר חיפשו באתרך.",
         "SiteSearchCategories2": "לדוגמה, אתרי מסחר מקוונים מציגים בד״כ בחירת ״קטגוריה״ כדי שהמבקרים יוכלו לצמצם את תוצאות החיפוש למוצרים בקטגוריה מסויימת.",
         "SiteSearchKeyword": "מילת מפתח (חיפוש באתר)",
diff --git a/plugins/Actions/lang/hi.json b/plugins/Actions/lang/hi.json
index 07e889fd7a..2b4e8ae53c 100644
--- a/plugins/Actions/lang/hi.json
+++ b/plugins/Actions/lang/hi.json
@@ -37,7 +37,6 @@
         "PagesReportDocumentation": "इस रिपोर्ट का दौरा किया गया है कि पृष्ठ यूआरएल के बारे में जानकारी शामिल हैं. तालिका %s पदानुक्रम रूप से आयोजित किया जाता है, यूआरएल एक फ़ोल्डर संरचना के रूप में प्रदर्शित कर रहे हैं.",
         "PageTitlesReportDocumentation": "इस रिपोर्ट का दौरा किया गया है कि पृष्ठों के शीर्षक के बारे में जानकारी शामिल हैं. %s पृष्ठ शीर्षक सबसे ब्राउज़रों अपने विंडो शीर्षक में पता चलता है कि एचटीएमएल %s टैग है.",
         "PageUrls": "पृष्ठों के यूआरएल",
-        "PluginDescription": "पृष्ठ विचारों, आउटलिंक और डाउनलोड के बारे में रिपोर्टें. आउटलिंक और डाउनलोड ट्रैकिंग स्वचालित है! आप भी अपनी आंतरिक वेबसाइट की खोज इंजन को ट्रैक कर सकते हैं.",
         "SiteSearchCategories1": "यह रिपोर्ट है कि वे अपनी वेबसाइट पर एक खोज कर दिया जब आगंतुकों द्वारा चयनित श्रेणियाँ सूचीबद्ध करता है.",
         "SiteSearchCategories2": "आगंतुकों को एक विशिष्ट श्रेणी में सभी उत्पादों को उनकी खोजों को सीमित कर सकते हैं इतना है कि उदाहरण के लिए, ईकॉमर्स वेबसाइटों आम तौर पर एक \"श्रेणी\" चयनकर्ता है.",
         "SiteSearchFollowingPagesDoc": "आगंतुकों को अपनी वेबसाइट पर खोज करते हैं, वे एक विशेष पृष्ठ, सामग्री, उत्पाद या सेवा के लिए देख रहे हैं. इस रिपोर्ट में यह एक आंतरिक खोज के बाद सबसे क्लिक किया गया है कि पृष्ठों की सूची. दूसरे शब्दों में, पृष्ठों की सूची में सबसे पहले से ही अपनी वेबसाइट पर आगंतुकों द्वारा की खोज की.",
diff --git a/plugins/Actions/lang/hr.json b/plugins/Actions/lang/hr.json
index 99d20b474d..08f1ce83a3 100644
--- a/plugins/Actions/lang/hr.json
+++ b/plugins/Actions/lang/hr.json
@@ -37,7 +37,6 @@
         "OutlinksReportDocumentation": "Ovo izvješće prikazuje hijerarhijski popis odlaznih URL adresa na koje su kliknuli vaši posjetitelji.",
         "PagesReportDocumentation": "Ovo izvješće sadrži informacije o linkovima stranica koje su posjećene. %s Tablica je organizirana hijerarhijski, URL-ovi su prikazani kao struktura mapa.",
         "PageUrls": "URL stranica",
-        "PluginDescription": "Izvješća o pregledima stranica, vanjskim poveznicama i preuzimanjima. Praćenje vanjskih poveznica i preuzimanja je automatsko! Također, možete pratiti pretraživanja vaše vlastite tražilice.",
         "SiteSearchCategories1": "Ovo izvješće prikazuje kategorije koje su posjetitelji odabrali kod pretraživanja vaše web-stranice",
         "SiteSearchCategories2": "Web-stranice kataloške prodaje najčešće imaju omogućen odabir \"kategorija\" kako bi posjetitelji pretraživali proizvode u željenoj kategoriji.",
         "SiteSearchKeyword": "Ključne riječi",
diff --git a/plugins/Actions/lang/hu.json b/plugins/Actions/lang/hu.json
index e49f56d107..728fe6abd5 100644
--- a/plugins/Actions/lang/hu.json
+++ b/plugins/Actions/lang/hu.json
@@ -29,7 +29,6 @@
         "PagesReportDocumentation": "Ez a jelentés a megtekintett URL-ekről tartalmaz információkat. %s A tábla hierarchigusan van szervezve, az URL-ek mappaként jelennek meg.",
         "PageTitlesReportDocumentation": "Ez a jelentés a megtekintett oldalak címéről tartalmaz információkat. %s Az oldal címe a %s HTML Tag, amit a legtöbb bönkésző az ablak címsorában mutat.",
         "PageUrls": "Oldal hivatkozások",
-        "PluginDescription": "Jelentések a lapmegtekintésekről, kimenő linkekről és fájlletöltésekről.",
         "SiteSearchKeyword": "Kulcsszó (Oldal keresés)",
         "SubmenuPagesEntry": "Belépési lapok",
         "SubmenuPagesExit": "Kilépési lapok",
diff --git a/plugins/Actions/lang/id.json b/plugins/Actions/lang/id.json
index a83f0dda86..8aa2e5c1d3 100644
--- a/plugins/Actions/lang/id.json
+++ b/plugins/Actions/lang/id.json
@@ -39,7 +39,6 @@
         "PagesReportDocumentation": "Laporan ini mengandung informasi tentang URL halaman yang dikunjungi. %s Tabel diatur berurutan, URL ditampilkan sebagai struktur map.",
         "PageTitlesReportDocumentation": "Laporan ini mengandung informasi tentang judul halaman yang telah dikunjungi. %s Judul halaman merupakan Etiket %s HTML yang kebanyakan peramban ditampilkan di judul jendela.",
         "PageUrls": "URL Halaman",
-        "PluginDescription": "Laporan tentang tampilan halaman, tautan keluar dan unduhan. Pelacakan Unduhan dan Tautan Keluar dilakukan secara otomatis!",
         "SiteSearchCategories1": "Lapotan ini mendaftar Kategori dipilih oleh pengunjung ketika membuat Pencarian di situs Anda.",
         "SiteSearchCategories2": "Misalnya, situs Niaga-E biasanya memiliki pemilih \"Kategori\" yang membatasi pencarian pengunjung terhadap seluruh produk dalam Kategori tertentu.",
         "SiteSearchFollowingPagesDoc": "Ketika pengnjung melakukan pencarian di situs Anda, mereka mencari sebagian halaman, isi, produk, atau layanan. Laporan ini mendaftar halaman paling banyak diklik dalam pencarian dalam. Dengan kata lain, daftar halaman paling dicari oleh pengunjung telah tersedia di situs Anda.",
diff --git a/plugins/Actions/lang/is.json b/plugins/Actions/lang/is.json
index 0a4782da91..84688ad477 100644
--- a/plugins/Actions/lang/is.json
+++ b/plugins/Actions/lang/is.json
@@ -7,7 +7,6 @@
         "ColumnPageURL": "Síðu slóð",
         "ColumnUniqueClicks": "Einstakir músasmellir",
         "ColumnUniqueDownloads": "Einstakt niðurhal",
-        "PluginDescription": "Skýrslur um flettingar, hlekki út og niðurhal. Hlekkir út og niðurhals mælingar eru sjálfvirkar!",
         "SubmenuPagesEntry": "Inngangssíður",
         "SubmenuPagesExit": "Útgangssíður",
         "SubmenuPageTitles": "Síðu titlar"
diff --git a/plugins/Actions/lang/it.json b/plugins/Actions/lang/it.json
index 6f93b8731a..d4b0e84212 100644
--- a/plugins/Actions/lang/it.json
+++ b/plugins/Actions/lang/it.json
@@ -39,7 +39,7 @@
         "PagesReportDocumentation": "Questo report contiene informazioni riguardo gli URL delle pagine che sono state viste. %s La tabella è organizzata gerarchicamente, gli URL vengono visualizzati come una struttura di cartelle.",
         "PageTitlesReportDocumentation": "Questo report contiene informazioni sui titoli delle pagine che sono state visitate. %s Il titolo della pagina è il tag HTML %s che la maggior parte dei browser mostrano nel titolo della loro finestra.",
         "PageUrls": "URL delle pagine",
-        "PluginDescription": "Rapporto sulle pagine viste, i link in uscita e i downloads. Il tracciamento dei Link in uscita e dei Download è automatico! Puoi anche tracciare il Motore di Ricerca interno al sito.",
+        "PluginDescription": "Riporta le viste e i titoli pagina. Ti consente di misurare il motore di ricerca interno al tuo sito. Traccia in automatico i click sui link esterni e i download dei files.",
         "SiteSearchCategories1": "Questo report elenca le Categorie che i visitatori hanno selezionato nel fare una ricerca sul vostro sito.",
         "SiteSearchCategories2": "Per esempio, i siti di Ecommerce hanno tipicamente un selettore di \"Categoria\", così che i visitatori possano restringere le ricerche ai prodotti in una Categoria specifica.",
         "SiteSearchFollowingPagesDoc": "Quando i visitatori fanno ricerche sul vostro sito, stanno cercando una determinata pagina, contenuto, prodotto e servizio. Questo report elenca le pagine più cliccate dopo una ricerca interna. In altre parole, è l'elenco delle pagine più ricercate dai visitatori sul vostro sito.",
diff --git a/plugins/Actions/lang/ja.json b/plugins/Actions/lang/ja.json
index 0319b5aa8a..2d9e44354e 100644
--- a/plugins/Actions/lang/ja.json
+++ b/plugins/Actions/lang/ja.json
@@ -39,7 +39,6 @@
         "PagesReportDocumentation": "これは訪問されたページURLについてのリポートです。%s 表は階層構造になっており、URLはフォルダーの階層で表示されています。",
         "PageTitlesReportDocumentation": "これは訪問されたページタイトルについてのリポートです。%s ページタイトルは多くのブラウザでウインドウのタイトルに表示されるHTMLの %s タグです。",
         "PageUrls": "ページURL",
-        "PluginDescription": "ページビュー、外部リンク、ダウンロードについてリポートします。 外部リンクとダウンロードのトラッキングは自動です！",
         "SiteSearchCategories1": "このレポートは、訪問者がサイトで検索した時に選択したカテゴリの一覧です。",
         "SiteSearchCategories2": "例えば、eコマースサイトは一般的に\"カテゴリー\"のセレクトを持っていて、訪問者は製品の検索結果を特定のカテゴリーに絞り込みできます。",
         "SiteSearchFollowingPagesDoc": "訪問者は、特定のページ、コンテンツ、製品、またはサービスを見つけようとして、サイト内で検索を行います。このレポートは、サイト内で検索してから最も多くクリックされたページの一覧です。言い換えれば、サイト内で訪問者が最も検索したページの一覧ということです。",
diff --git a/plugins/Actions/lang/ka.json b/plugins/Actions/lang/ka.json
index 51e85db358..80522247ec 100644
--- a/plugins/Actions/lang/ka.json
+++ b/plugins/Actions/lang/ka.json
@@ -7,7 +7,6 @@
         "ColumnPageURL": "გვერდის URL",
         "ColumnUniqueClicks": "უნიკალური დაწკაპუნებები",
         "ColumnUniqueDownloads": "უნიკალური ჩამოტვირთვები",
-        "PluginDescription": "აკეთებს ანგარიშს გვერდის დათვალიერების, გარე ბმულების და ჩამოტვირთვების შესახებ. გარებმულების და ჩამოტვირთვების ტრეკირება ხდება ავტომატურად!",
         "SubmenuPagesEntry": "შესვლის გვერდები",
         "SubmenuPagesExit": "გასავლის გვერდები",
         "SubmenuPageTitles": "გვერდის სათაურები"
diff --git a/plugins/Actions/lang/ko.json b/plugins/Actions/lang/ko.json
index 5ff4a59de1..b5ec63216b 100644
--- a/plugins/Actions/lang/ko.json
+++ b/plugins/Actions/lang/ko.json
@@ -37,7 +37,6 @@
         "PagesReportDocumentation": "이 보고서는 방문한 페이지 URL에 대한 정보입니다. %s 테이블은 계층 구조로 되어 있으며, URL은 폴더 구조로 표시됩니다.",
         "PageTitlesReportDocumentation": "이 보고서는 방문한 페이지 제목에 대한 정보입니다. %s 페이지 제목은 대부분의 브라우저 윈도우의 제목에 표시되는 HTML %s 태그입니다.",
         "PageUrls": "페이지 URL",
-        "PluginDescription": "페이지 뷰, 외부 링크, 다운로드에 대한 보고서입니다. 외부 링크 및 다운로드 추적은 자동입니다! 또한 웹사이트의 내부 검색 엔진을 추적할 수 있습니다.",
         "SiteSearchCategories1": "이 보고서는 웹사이트에서 검색했을 때 방문자가 선택한 카테고리를 나열합니다.",
         "SiteSearchCategories2": "예를 들면, 일반적인 전자상거래 사이트는 '카테고리'를 제공하는데 방문자는 특정 카테고리의 모든 제품을 검색하는 것으로 범위를 축소할 수 있습니다.",
         "SiteSearchFollowingPagesDoc": "방문자는 특정 페이지, 콘텐츠, 제품 또는 서비스를 찾으려고 웹사이트에서 검색을 시도합니다. 이 보고서는 사이트 내부에서 검색시도 후 가장 많이 클릭한 페이지 목록입니다. 즉, 이 페이지 목록은 대부분의 방문자가 사이트내 검색에 의해 방문한 것입니다.",
diff --git a/plugins/Actions/lang/lt.json b/plugins/Actions/lang/lt.json
index 068fdd5416..88cf1d48f6 100644
--- a/plugins/Actions/lang/lt.json
+++ b/plugins/Actions/lang/lt.json
@@ -7,7 +7,6 @@
         "ColumnPageURL": "Puslapio URL",
         "ColumnUniqueClicks": "Unikalūs paspaudimai",
         "ColumnUniqueDownloads": "Unikalūs atsisiuntimai",
-        "PluginDescription": "Puslapių peržiūros, išorinių nuorodų ir atsisiuntimų ataskaitos. Išorinių nuorodų ir atsisiuntimų stebėjimas yra įgalinamas automatiškai!",
         "SubmenuPagesEntry": "Užėjimo puslapiai",
         "SubmenuPagesExit": "Išėjimo puslapiai",
         "SubmenuPageTitles": "Puslapių antraštės"
diff --git a/plugins/Actions/lang/lv.json b/plugins/Actions/lang/lv.json
index cfc5d85c6c..dabb47af5c 100644
--- a/plugins/Actions/lang/lv.json
+++ b/plugins/Actions/lang/lv.json
@@ -13,7 +13,6 @@
         "ColumnUniqueClicks": "Unikālie klikšķi",
         "ColumnUniqueDownloads": "Unikālas lejupielādes",
         "ColumnUniqueOutlinks": "Unikālās arējās saites",
-        "PluginDescription": "Lapas skatījumu, izejošo saišu un lejupielāžu atskaite. Izejošo saišu un lejupielāžu izsekošana ir automātiska!",
         "SubmenuPagesEntry": "Ieejas lapas",
         "SubmenuPagesExit": "Izejas lapas",
         "SubmenuPageTitles": "Lapas virsraksti"
diff --git a/plugins/Actions/lang/nb.json b/plugins/Actions/lang/nb.json
index 8044d352f0..b27d78be96 100644
--- a/plugins/Actions/lang/nb.json
+++ b/plugins/Actions/lang/nb.json
@@ -24,7 +24,6 @@
         "ColumnUniqueOutlinks": "Unike utlenker",
         "DownloadsReportDocumentation": "I denne rapporten kan du se hvilke filer de besøkende har lastet ned. %s Hva Piwik teller som en nedlasting, er klikket på en nedlastingslink. Om nedlastingen ble fullført eller ikke er ikke kjent for Piwik.",
         "OneSearch": "1 søk",
-        "PluginDescription": "Rapporterer om sidevisinger, utlenker og nedlastinger. Sporing av utlenker og nedlastinger skjer automatisk.",
         "SiteSearchKeyword": "Nøkkelord (Sidesøk)",
         "SubmenuPagesEntry": "Innganssider",
         "SubmenuPagesExit": "Utgangssider",
diff --git a/plugins/Actions/lang/nl.json b/plugins/Actions/lang/nl.json
index 6905c5d20d..fec5a99829 100644
--- a/plugins/Actions/lang/nl.json
+++ b/plugins/Actions/lang/nl.json
@@ -5,9 +5,9 @@
         "ColumnClicks": "Kliks",
         "ColumnClicksDocumentation": "Aantal keer dat er op deze link geklikt is.",
         "ColumnDownloadURL": "Download link",
-        "ColumnEntryPageTitle": "Inkomende pagina titel",
+        "ColumnEntryPageTitle": "Inkomende paginatitel",
         "ColumnEntryPageURL": "Inkomende pagina URL",
-        "ColumnExitPageTitle": "Uitgaande pagina titel",
+        "ColumnExitPageTitle": "Uitgaande paginatitel",
         "ColumnExitPageURL": "Uitgaande pagina URL",
         "ColumnNoResultKeyword": "Sleutelwoord zonder zoekresultaten",
         "ColumnPageName": "Pagina naam",
@@ -27,10 +27,10 @@
         "ColumnUniqueOutlinks": "Unieke Outlinks",
         "DownloadsReportDocumentation": "Dit rapport laat zien welke bestanden door de bezoekers zijn gedownload. %s Piwik telt een klik op een downloadlink als een download. Piwik kan niet zien of de download succesvol is uitgevoerd en afgerond.",
         "EntryPagesReportDocumentation": "Dit rapport bevat informatie over de inkomende pagina's in de opgegeven periode. Een inkomende pagina is de eerste pagina waarop de bezoeker binnenkomt. %s De URL's van de inkomende pagina's worden getoond in een mapstructuur.",
-        "EntryPageTitles": "Inkomende pagina titels",
+        "EntryPageTitles": "Inkomende paginatitels",
         "EntryPageTitlesReportDocumentation": "Dit rapport bevat informatie over de titels van de inkomende pagina's in de opgegeven periode.",
         "ExitPagesReportDocumentation": "Dit rapport bevat informatie over de uitgaande pagina's tijdens de opgegeven periode. De iutgaande pagina is de laatste pagina die de bezoeker bekijkt. %s De URL's van de uitgaande pagina's worden getoond in een mapstructuur.",
-        "ExitPageTitles": "Uitgaande pagina titels",
+        "ExitPageTitles": "Uitgaande paginatitels",
         "ExitPageTitlesReportDocumentation": "Dit rapport bevat informatie over de titels van de uitgaande pagina's in de opgegeven periode.",
         "LearnMoreAboutSiteSearchLink": "Leer meer over de manier waarop bezoekers de zoekoptie in uw website gebruiken.",
         "OneSearch": "1 zoekopdracht",
@@ -39,7 +39,6 @@
         "PagesReportDocumentation": "Dit rapport bevat informatie over de pagina-URL's die zijn bezocht. %s De tabel is hiërarchisch georganiseerd. De URL's worden weergegeven in een map structuur.",
         "PageTitlesReportDocumentation": "Dit rapport bevat informatie over de titels van de pagina's die zijn bezocht. %s De paginatitel is de HTML %s Tag dat de meeste browsers laten zien in hun window titel.",
         "PageUrls": "pagina-URL's",
-        "PluginDescription": "Rapporteert over de pagina weergaves, uitgaande links en downloads. Dit wordt automatisch bijgehouden.",
         "SiteSearchCategories1": "Dit rapport toont de categorieën die bezoekers hebben geselecteerd bij het zoeken op uw website.",
         "SiteSearchCategories2": "Bijvoorbeeld, Ecommerce websites hebben vaak een categoriekeuze waarbij de zoekresultaten worden beperkt tot een specifieke categorie.",
         "SiteSearchFollowingPagesDoc": "Als bezoekers op uw website surfen, dan zoekt men vaak een bepaalde pagina, inhoud, produkt of dienst. Dit rapport laat de pagina's zien die het vaakst zijn aangeklikt na een interne zoekopdracht. Met andere woorden: de meeste gezochte pagina's door bezoekers die reeds op uw website zijn.",
@@ -49,14 +48,14 @@
         "SiteSearchKeywordsNoResultDocumentation": "Dit rapport toon een lijst met sleutelwoorden waarop door uw website geen zoekresultaten werden gegeven. Wellicht kan het zoekalgorithm worden verbeterd of misschien wordt gezocht op content dat (nog) niet beschikbaar is op uw website.",
         "SubmenuPagesEntry": "Pagina's waarlangs de bezoeker binnen kwam",
         "SubmenuPagesExit": "Pagina's die verlaten werden",
-        "SubmenuPageTitles": "Pagina titels",
+        "SubmenuPageTitles": "Paginatitels",
         "SubmenuSitesearch": "Lokale zoekopdracht",
-        "WidgetEntryPageTitles": "Inkomende pagina titels.",
-        "WidgetExitPageTitles": "Uitgaande pagina titels",
+        "WidgetEntryPageTitles": "Inkomende paginatitels.",
+        "WidgetExitPageTitles": "Uitgaande paginatitels",
         "WidgetPagesEntry": "Beginpagina's",
         "WidgetPagesExit": "Pagina's die verlaten werden.",
-        "WidgetPageTitles": "Pagina titels",
-        "WidgetPageTitlesFollowingSearch": "Pagina titels na zoekopdrachten",
+        "WidgetPageTitles": "Paginatitels",
+        "WidgetPageTitlesFollowingSearch": "Paginatitels na zoekopdrachten",
         "WidgetPageUrlsFollowingSearch": "Bestemmings pagina na lokale zoekopdracht",
         "WidgetSearchCategories": "Zoekcategorieën",
         "WidgetSearchKeywords": "Zoektermen lokale zoekopdracht",
diff --git a/plugins/Actions/lang/nn.json b/plugins/Actions/lang/nn.json
index 3d022e2165..2d5f2115c4 100644
--- a/plugins/Actions/lang/nn.json
+++ b/plugins/Actions/lang/nn.json
@@ -26,7 +26,6 @@
         "PagesReportDocumentation": "Denne rapporten inneheld informasjon om side-URLar som er vitja. %s Tabellen er organisert hierarkisk, URLane er vist som ein mappestruktur.",
         "PageTitlesReportDocumentation": "Denne rapporten inneheld informasjon om titlane til sidene som er vitja. %s Sidetittelen er HTML-entiteten %s som dei fleste nettlesarane viser som tittel på vindauget sitt.",
         "PageUrls": "Side-URLar",
-        "PluginDescription": "Rapportar om sidevisningar, utpeikarar og nedlastingar. Sporing av utpeikarar og nedlastingar skjer automatisk!",
         "SubmenuPagesEntry": "Inngangssider",
         "SubmenuPagesExit": "Utgangssider",
         "SubmenuPageTitles": "Sidetitlar"
diff --git a/plugins/Actions/lang/pl.json b/plugins/Actions/lang/pl.json
index 14e5d003df..2e114808d7 100644
--- a/plugins/Actions/lang/pl.json
+++ b/plugins/Actions/lang/pl.json
@@ -39,7 +39,6 @@
         "PagesReportDocumentation": "Ten raport zawiera informację o URL-ach stron które zostały odwiedzone. %s Tabela jest organizowana w hierarchii, URL-e są wyświetlane z uwzględnieniem struktury katalogów.",
         "PageTitlesReportDocumentation": "Ten raport zawiera informację o tytułach stron które zostały odwiedzone. %s Tytuł stron to %s znacznik HTML które większość przeglądarek wyświetla na belce tytułowej okna.",
         "PageUrls": "Strony URL",
-        "PluginDescription": "Raporty o oglądanych stronach, linkach zewnętrznych i pobraniach. Śledzenie linków zewnętrznych i pobrań jest automatyczne!",
         "SiteSearchCategories1": "Ten raport wyświetla listę Kategorii które odwiedzający wybrali kiedy używali wyszukiwarki na twojej stronie.",
         "SiteSearchCategories2": "Na przykład, strony E-Commerce zazwyczaj mają selektor \"Kategoria\" dzięki czemu odwiedzający mogą ograniczyć wyszukiwanie wszystkich produktów dla danej kategorii.",
         "SiteSearchFollowingPagesDoc": "Kiedy odwiedzający wyszukują na twojej stronie, wtedy szukają danej strony, zawartości, produktu lub usługi. Ten raport zawiera listę stron, które najczęściej były klikane po wewnętrznym wyszukiwaniu. Innymi słowy, lista stron które najczęściej użytkownicy szukają jak już znajdą się na twoje stronie.",
diff --git a/plugins/Actions/lang/pt-br.json b/plugins/Actions/lang/pt-br.json
index 827a871595..e979deac01 100644
--- a/plugins/Actions/lang/pt-br.json
+++ b/plugins/Actions/lang/pt-br.json
@@ -39,7 +39,6 @@
         "PagesReportDocumentation": "Este relatório contém informações sobre URL de páginas as quais foram visitadas. %s A tabela está organizada hierarquicamente, as URLs estão apresentadas como estrutura de pastas",
         "PageTitlesReportDocumentation": "Este relatório contém informações sobre títulos de páginas as quais foram visitadas. %s O título da página é um HTML %s Tag a qual é mais visualizada nos títulos do browser.",
         "PageUrls": "URLs de Página(s)",
-        "PluginDescription": "Relatórios sobre exibições de página, links externos e downaloads. Rastramentos de links externos e downloads é automático!",
         "SiteSearchCategories1": "Este relatório lista as categorias que os visitantes selecionaram, quando eles fizeram uma pesquisa em seu site.",
         "SiteSearchCategories2": "Por exemplo: os sites de comércio eletrônico têm tipicamente uma \"Categoria\" seletora de modo que os visitantes podem restringir suas pesquisas a todos os produtos de uma categoria específica.",
         "SiteSearchFollowingPagesDoc": "Quando os visitantes pesquisam em seu site, eles estão à procura de uma determinada página, conteúdo, produto ou serviço. Este relatório lista as páginas que foram mais clicadas depois de uma procura interna. Em outras palavras, a lista de páginas mais procuradas pelos visitantes já no seu site.",
diff --git a/plugins/Actions/lang/pt.json b/plugins/Actions/lang/pt.json
index c3fd59eb6a..00af2618bc 100644
--- a/plugins/Actions/lang/pt.json
+++ b/plugins/Actions/lang/pt.json
@@ -37,7 +37,6 @@
         "PagesReportDocumentation": "Este relatório contém informações sobre URLs das páginas que foram visitadas. %s A tabela está organizada hierarquicamente, as URLs são exibidas como uma estrutura de pastas.",
         "PageTitlesReportDocumentation": "Este relatório contém informação relativa aos títulos de páginas que foram visitadas. %s O título de página é a Etiqueta HTML %s que a maioria dos navegadores mostram como título de janela.",
         "PageUrls": "URLs de páginas",
-        "PluginDescription": "Relatórios sobre páginas vistas, ligações de saída e downloads. O rastreio de ligações de saída e downloads é automático.",
         "SiteSearchCategories1": "Este relatório lista as Categorias que os visitantes selecionaram quando realizaram uma Pesquisa na sua página.",
         "SiteSearchCategories2": "Por exemplo, os sites de comércio electrónico têm tipicamente uma \"Categoria\" seleccionada de modo que os visitantes podem restringir suas pesquisas a todos os produtos em uma categoria específica.",
         "SiteSearchIntro": "Rastrear pesquisas que os visitantes fazem em seu site é uma maneira muito eficaz de aprender mais sobre o que o seu público está procurando, ele pode ajudar a encontrar ideias para novos conteúdos, novos produtos de comércio electrónico que os potenciais clientes podem estar procurando, e em geral, melhorar os visitantes experiência em seu site.",
diff --git a/plugins/Actions/lang/ro.json b/plugins/Actions/lang/ro.json
index 1985724733..86e944e9c3 100644
--- a/plugins/Actions/lang/ro.json
+++ b/plugins/Actions/lang/ro.json
@@ -39,7 +39,6 @@
         "PagesReportDocumentation": "Acest raport conţine informaţii despre URL-urile paginilor ce au fost vizitate. %s Acest tabel este organizat ierarhic,URL-urile sunt afişate într-o structură tip arbore.",
         "PageTitlesReportDocumentation": "Acest raport conţine informaţii despre titlurile paginilor ce au fost vizitate. %s Titlul paginii este Tag-ul HTML %s afişat de cele mai multe browsere ca nume al ferestrei.",
         "PageUrls": "URL-uri pagini",
-        "PluginDescription": "Rapoarte despre numărul de pagini văzute, outlink-uri şi descărcări. Outlink-uri şi Descărcările sunt urmărite automat!",
         "SiteSearchCategories1": "Acest raport afiseaza Categoriile pe care vizitatorii le-au selectat cand au efectuat o Cautare pe siteul tau.",
         "SiteSearchCategories2": "De exemplu, magazinele online de obicei au o optiune de a selecta o anumita \"Categorie\" dintr-o lista, pentru ca vizitatorii sa restrictioneze cautarile pe site doar la produsele aflate intr-o anumita Categorie.",
         "SiteSearchFollowingPagesDoc": "Cand vizitatorii cauta pe siteul tau, ei doresc sa gaseasca o anumita pagina, continut, produs sau serviciu. Acest raport afiseaza paginile care au fost cel mai accesate prin click dupa efectuarea unei cautari interne. Cu alte cuvinte, o lista cu paginile cele mai cautate de vizitatorii aflati deja pe siteul tau.",
diff --git a/plugins/Actions/lang/ru.json b/plugins/Actions/lang/ru.json
index f47d056517..806dc1f404 100644
--- a/plugins/Actions/lang/ru.json
+++ b/plugins/Actions/lang/ru.json
@@ -1,5 +1,6 @@
 {
     "Actions": {
+        "AvgGenerationTimeTooltip": "В среднем по %s хит(ов) %s между %s и %s",
         "ColumnClickedURL": "URL кликов",
         "ColumnClicks": "Клики",
         "ColumnClicksDocumentation": "Количество кликов по этой ссылке.",
@@ -11,7 +12,7 @@
         "ColumnNoResultKeyword": "Ключевое слово без результатов в поиске",
         "ColumnPageName": "Название страницы",
         "ColumnPagesPerSearch": "Страницы результатов поиска",
-        "ColumnPagesPerSearchDocumentation": "Посетители будут пользоваться поиском на вашем сайте и иногда нажимать `next` (след. страница), чтобы просмотреть больше результатов. Это среднее число страниц с результатами поиска для этого ключевого слова.",
+        "ColumnPagesPerSearchDocumentation": "Посетители будут пользоваться поиском на вашем сайте и иногда нажимать \"next\" (след. страница), чтобы просмотреть больше результатов. Это среднее число страниц с результатами поиска для этого ключевого слова.",
         "ColumnPageURL": "URL страниц",
         "ColumnSearchCategory": "Искать категорию",
         "ColumnSearches": "Поиски",
@@ -25,23 +26,22 @@
         "ColumnUniqueDownloads": "Уникальные загрузки",
         "ColumnUniqueOutlinks": "Уникальные исходящие ссылки",
         "DownloadsReportDocumentation": "В этом отчете вы можете видеть файлы, которые скачивали ваши посетители. %s За скачивание считается клик по соответствующей ссылке. Однако закончил ли посетитель скачивание остается неизвестным. За скачивание считается также открытие картинок и других расширений файлов.",
-        "EntryPagesReportDocumentation": "Этот отчет содержит информацию о страницах входа за определенный период. Входная страница - это первая страница сайта, которую пользователь просматривает за посещение. %s Входящие ссылки отображаются в папочном виде.",
+        "EntryPagesReportDocumentation": "Этот отчет содержит информацию о страницах входа за определенный период. Входная страница – это первая страница сайта, которую пользователь просматривает за посещение. %s Входящие ссылки отображаются в папочном виде.",
         "EntryPageTitles": "Заголовки страниц входа",
         "EntryPageTitlesReportDocumentation": "Этот отчет содержит информацию о заголовках входных страниц, на которые попадали посетители в конкретный период.",
-        "ExitPagesReportDocumentation": "Этот отчет содержит информацию о страницах выхода за определенный период. Страница выхода - это последняя страница сайта, на которой побывал посетитель. %s Ссылки этих страниц отображаются в виде древовидной структуры.",
+        "ExitPagesReportDocumentation": "Этот отчет содержит информацию о страницах выхода за определенный период. Страница выхода – это последняя страница сайта, на которой побывал посетитель. %s Ссылки этих страниц отображаются в виде древовидной структуры.",
         "ExitPageTitles": "Заголовки страниц выхода",
         "ExitPageTitlesReportDocumentation": "Этот отчет содержит информацию о заголовках выходных страниц, с которых посетитель ушел с сайта в конкретный период.",
         "LearnMoreAboutSiteSearchLink": "Узнайте больше об отслеживании использования поиска на вашем сайте.",
-        "OutlinkDocumentation": "Исходящая ссылка - ссылка, которая уводит посетителя с вашего сайта (на другой домен).",
+        "OutlinkDocumentation": "Исходящая ссылка – ссылка, которая уводит посетителя с вашего сайта (на другой домен).",
         "OutlinksReportDocumentation": "Этот отчет показывает иерархический список исходящих ссылок, на которые пользователь кликнул.",
-        "PagesReportDocumentation": "Этот отчет содержит информацию об адресах страниц, на которых побывали посетители вашего сайта. %s Таблица организовано иерархично - URL-ы отображаются папочной структурой.",
+        "PagesReportDocumentation": "Этот отчет содержит информацию об адресах страниц, на которых побывали посетители вашего сайта. %s Таблица организовано иерархично – URL-ы отображаются папочной структурой.",
         "PageTitlesReportDocumentation": "Этот отчет содержит информацию о заголовках посещенных страниц. %s Заголовок страницы это HTML-тег %s, который браузеры отображают в заголовке окна (вкладки).",
         "PageUrls": "URL-ы страниц",
-        "PluginDescription": "Отчеты о просмотрах страниц, внешних ссылках и загрузках. Отслеживание внешних ссылок и загрузок происходит автоматически!",
         "SiteSearchCategories1": "Этот отчет показывает список категорий, которые выбрали посетители при поиске на вашем сайте.",
-        "SiteSearchCategories2": "Например, сайты электронной коммерции обычно имеют выбор `Категорий` товаровуслуг, чтобы посетителям было удобно их сортировать и искать.",
+        "SiteSearchCategories2": "Например, сайты электронной коммерции обычно имеют выбор «Категорий», чтобы посетителям было удобно их сортировать и искать.",
         "SiteSearchFollowingPagesDoc": "Когда посетители ищут что-то на вашем сайте, они хотят найти определенную страницу, контент, продукт или услугу. Этот отчет отображает страницы, по которым посетители кликают наиболее часто при поиске. Иными словами, это список страниц, которые ищутся наиболее часто на вашем сайте.",
-        "SiteSearchIntro": "Отслеживание поиска на вашем сайте - эффективный способ узнать, чем именно интересуется ваша аудитория. Это может помочь найти идеи для нового контента, новых продуктов и улучшить взаимодействие посетителей с вашим сайта в целом.",
+        "SiteSearchIntro": "Отслеживание поиска на вашем сайте – эффективный способ узнать, чем именно интересуется ваша аудитория. Это может помочь найти идеи для нового контента, новых продуктов и улучшить взаимодействие посетителей с вашим сайта в целом.",
         "SiteSearchKeyword": "Ключевое слово (поиск по сайту)",
         "SiteSearchKeywordsDocumentation": "Эти отчет показывает список ключевых слов, которые посетители искали на вашем сайте через ваш поиск.",
         "SiteSearchKeywordsNoResultDocumentation": "Этот отчет отображает список ключевых слов, по которым не было ничего найдено на вашем сайте: возможно, стоит улучшить поисковый алгоритм на вашем сайте или посетители ищут то, чего на вашем сайте нет?",
diff --git a/plugins/Actions/lang/sk.json b/plugins/Actions/lang/sk.json
index 088217089a..2d911afba0 100644
--- a/plugins/Actions/lang/sk.json
+++ b/plugins/Actions/lang/sk.json
@@ -23,7 +23,6 @@
         "EntryPageTitles": "Titulky vstupnej stránky",
         "ExitPageTitles": "Titulky výstupnej stránky",
         "PageUrls": "URL stránok",
-        "PluginDescription": "Správy o zobrazenie stránky, odkazy a súbory na prevzatie. Odkazy a súbory na prevzatie sa sledujú automaticky!",
         "SiteSearchKeyword": "Kľúčové slovo (vyhľadávanie na stránke)",
         "SubmenuPagesEntry": "Vstupné stránky",
         "SubmenuPagesExit": "Výstupné stránky",
diff --git a/plugins/Actions/lang/sl.json b/plugins/Actions/lang/sl.json
index 3646d6434f..5c852b18ec 100644
--- a/plugins/Actions/lang/sl.json
+++ b/plugins/Actions/lang/sl.json
@@ -33,7 +33,6 @@
         "PagesReportDocumentation": "To poročilo vsebuje informacije o URL-jih strani, ki so bile obiskane. %s Tabela je hierarhično organizirana. URL-ji so prikazani kot struktura mape.",
         "PageTitlesReportDocumentation": "To poročilo vsebuje informacije o nazivih strani, ki so bile obiskane. %s Naziv strani je HTML oznaka %s Oznaka, ki jo večina brskalnikov prikaže v nazivu okna.",
         "PageUrls": "URL-ji strani",
-        "PluginDescription": "Poročila o prikazih strani, izhodih preko zunanjih povezav in prenosih. Sledenje prenosom in izhodom preko zunanjih povezav je samodejno.",
         "SiteSearchKeyword": "Ključna beseda (iskanje po strani)",
         "SubmenuPagesEntry": "Vstopne strani",
         "SubmenuPagesExit": "Izhodne strani",
diff --git a/plugins/Actions/lang/sq.json b/plugins/Actions/lang/sq.json
index b489c614e7..93c342d052 100644
--- a/plugins/Actions/lang/sq.json
+++ b/plugins/Actions/lang/sq.json
@@ -37,7 +37,6 @@
         "PagesReportDocumentation": "Ky raport përmban të dhëna rreth URL faqesh që janë vizituar. %s Tabela është e sistemuar në mënyrë hierarkike, URL-të tregohen si strukturë dosjeje.",
         "PageTitlesReportDocumentation": "Ky raport përmban të dhëna rreth titujve të faqeve që janë vizituar. %s Titulli i faqes është Etiketa HTML %s që shfaqin shumica e shfletuesve te titulli i dritares.",
         "PageUrls": "URL faqesh",
-        "PluginDescription": "Raporton rreth shikimit të faqeve, lidhjeve nga jashtë dhe shkarkimeve. Ndjekja e Lidhjeve nga Jashtë dhe e Shkarkimeve bëhet automatikisht!",
         "SiteSearchCategories1": "Ky raport paraqet kategoritë që vizitorët kanë përzgjedhur kur bënë një Kërkim te site-i juaj web.",
         "SiteSearchCategories2": "Për shembull, site-et web për e-tregti kanë zakonisht një përzgjedhës \"Kategorish\" që kështu vizitorët të mund t'i ngushtojnë kërkimet e tyre nga krejt produktet te një Kategori specifike.",
         "SiteSearchFollowingPagesDoc": "Kur vizitorët kërkojnë te site-i juaj web, ata shohin për një faqe, lëndë, produkt ose shërbim të veçantë. Ky raport paraqet faqet që qenë klikuar më shumë pas një kërkimi të brendshëm. Me fjalë të tjera, listën e faqeve më të kërkuara nga vizitorët tashmë brenda site-it tuaj web.",
diff --git a/plugins/Actions/lang/sr.json b/plugins/Actions/lang/sr.json
index 69495d81bf..0e74dcd7ae 100644
--- a/plugins/Actions/lang/sr.json
+++ b/plugins/Actions/lang/sr.json
@@ -39,7 +39,6 @@
         "PagesReportDocumentation": "Ovaj izveštaj sadrži informacije o linkovima koji su posećeni. %s Tabela je organizovana hijerarhijski, linkovi su prikazani u vidu foldera.",
         "PageTitlesReportDocumentation": "Ovaj izveštaj sadrži informacije o naslovima stranica koje su posećene. %s Naslov stranice je HTML %s tag koji većina pregledača prikazuje umesto svog naslova.",
         "PageUrls": "Adrese stranica",
-        "PluginDescription": "Izveštaji o broju prikaza stranica, izlaznih linkova i preuzimanja. Praćenje izlaznih linkova i preuzimanja je automatsko!",
         "SiteSearchCategories1": "Ovaj izveštaj prikazuje kategorije koje posetioci biraju kada pretražuju vaš sajt.",
         "SiteSearchCategories2": "Na primer, sajtovi za elektronsku trgovinu obično nude mogućnost izbora kategorije kako bi posetioci ograničili svoju pretragu na proizvode iz određene kategorije.",
         "SiteSearchFollowingPagesDoc": "Kada posetioci pretražuju vaš sajt, oni traže određenu stranicu, sadržaj, proizvod ili uslugu. Ovaj izveštaj prikazuje stranice koje su najčešće otvarane nakom završene pretrage. Drugim rečima, ovo je spisak stranica koje se najviše traže na vašem sajtu.",
diff --git a/plugins/Actions/lang/sv.json b/plugins/Actions/lang/sv.json
index ea90cfa409..4f24d9ceb3 100644
--- a/plugins/Actions/lang/sv.json
+++ b/plugins/Actions/lang/sv.json
@@ -39,7 +39,6 @@
         "PagesReportDocumentation": "Denna rapport innehåller information om webbadresserna som har besökts. %s Tabellen ordnas hierarkiskt, webbadresserna visas som en mappstruktur.",
         "PageTitlesReportDocumentation": "Denna rapport innehåller information om titlarna på de sidor som har besökts. %s sidans titel är HTML-taggen %s som de flesta webbläsare visar i sina fönster titel.",
         "PageUrls": "Webbadress",
-        "PluginDescription": "Rapporter om sidvisningar, utlänkar och nedladdningar. Spårning av utlänkar och nedladdningar sker automatiskt!",
         "SiteSearchCategories1": "Den här rapporten listar kategorierna som besökarna valt när dom gjort en sökning på din webbplats.",
         "SiteSearchCategories2": "T.ex. så har e-handelssidor vanligtvis kategorier som gör att besökarna kan begränsa sökningen till produkter i en vald kategori",
         "SiteSearchFollowingPagesDoc": "När besökare söker på din webbplats så letar dom efter en speciell sida, innehåll, produkt eller tjänst. Den här rapporten listar de sidor med flest klick efter en intern sökning. Med andra ord, en lista med dom mest sökta sidorna av besökare som redan hittat till din webbplats.",
diff --git a/plugins/Actions/lang/ta.json b/plugins/Actions/lang/ta.json
index c228ad3ba0..0042514005 100644
--- a/plugins/Actions/lang/ta.json
+++ b/plugins/Actions/lang/ta.json
@@ -39,7 +39,6 @@
         "PagesReportDocumentation": "இந்த அறிக்கை வருகை தரப்பட்ட பக்கங்களின் முகவரிகளை காட்டுகிறது. %s அட்டவணை படிமுறை நிலையில் ஒழுங்காக்கப்பட்டு உள்ளது. முகவரிகள் கோப்பு வடிவில் உள்ளன.",
         "PageTitlesReportDocumentation": "இந்த அறிக்கை நீங்கள் இதற்கு முன்பு சென்று வந்த பக்கங்களைப் பற்றிய தலைப்புகளை உள்ளடக்கியது. %s ஒரு பக்கத்தின் தலைப்பானது %s அனைத்து உலாவிகளின் தலைப்பாக காட்டப்படும் HTML டேக் ஆகும்.",
         "PageUrls": "பக்க URLs",
-        "PluginDescription": "பக்க பார்வைகள் பற்றிய அறிக்கை, வெளி இணைப்புகள் மற்றும் தரவிறக்கங்கள் பற்றியது. வெளி இணைப்புகள் மற்றும் தரவிறக்கங்கள் தானாக கண்காணிக்கப்படும். உங்களால் உள்ளக தேடல் இயந்திரங்களையும் கண்காணிக்க முடியும்.",
         "SiteSearchCategories1": "இந்த அறிக்கையை, உங்கள் வலைத்தளத்தில் ஒரு தேடல் செய்த போது பார்வையாளர்கள் தேர்ந்தெடுத்த வகைகள் பட்டியலிடுகிறது.",
         "SiteSearchCategories2": "எடுத்துக்காட்டாக, மின்வணிக வலைத்தளங்களில் பொதுவாக ஒரு \"வகை\" தேர்வு இருக்கிறது. இதன் மூலம் தேடல் முடிவுகளை குறிப்பிட்ட வகையின் உள் பார்வையாலரால் மட்டுப்படுத்த முடியும்.",
         "SiteSearchFollowingPagesDoc": "பார்வையாளர் உங்கள் தளத்தில் தேடும் போது, அவர்கள் தனித்தன்மை வாய்ந்த பக்கங்கள், உற்பத்திகள் அல்லது சேவைகளை தேடுகிறார்கள். இந்த அறிக்கை உள்ளக தேடலின் பின்னர், அதிகளவில் பார்க்கப்பட்ட பக்கங்களை காட்டுகிறது.இவை பார்வையாளர்களால் அதிகளவில் தேடப்பட்ட பக்கங்கள் எனவும் சொல்லலாம்.",
diff --git a/plugins/Actions/lang/th.json b/plugins/Actions/lang/th.json
index b44cc4eddf..6af5f8874b 100644
--- a/plugins/Actions/lang/th.json
+++ b/plugins/Actions/lang/th.json
@@ -39,7 +39,6 @@
         "PagesReportDocumentation": "รายงานนี้ประกอบด้วยข้อมูลเกี่ยวกับ URL ของหน้าที่ได้รับการเข้าเยี่ยมชม %s ตารางจะถูกจัดลำดับชั้น URL ที่จะปรากฏเป็นโครงสร้างโฟลเดอร์",
         "PageTitlesReportDocumentation": "รายงานนี้ประกอบด้วยข้อมูลเกี่ยวกับชื่อเรื่องของหน้าเว็บที่ได้รับการเข้าเยี่ยมชม %s ชื่อหน้าจะเป็นแท็ก %s HTML เบราว์เซอร์ส่วนใหญ่จะแสดงในชื่อเรื่องของหน้าต่างของพวกเขา",
         "PageUrls": "Url ของเพจ",
-        "PluginDescription": "รายงานเกี่ยวกับมุมมองเพจลิงค์ออก ดาวน์โหลดลิงค์ออก และติดตามการดาวน์โหลดจะเป็นไปอย่างอัตโนมัติ!",
         "SiteSearchCategories1": "รายงานนี้แสดงรายการหมวดหมู่ที่ผู้เข้าชมเลือกไว้ เมื่อพวกเขาทำค้นหาบนเว็บไซต์ของคุณ",
         "SiteSearchCategories2": "ตัวอย่างเช่น เว็บไซต์อีคอมเมิร์ซมักจะมี \"หมวดหมู่\" เพื่อให้ผู้เข้าชมสามารถจำกัดการค้นหาของพวกเขาให้กับสินค้าทั้งหมดในหมวดหมู่ที่เลือกไว้ได้",
         "SiteSearchFollowingPagesDoc": "เมื่อผู้เยี่ยมชมค้นหาเว็บไซต์ของคุณ พวกเขาจะค้นหาเฉพาะหน้า เนื้อหา ผลิตภัณฑ์ หรือบริการ รายงานนี้จะแสดงรายการหน้าที่ถูกคลิกเป็นส่วนใหญ่",
diff --git a/plugins/Actions/lang/tl.json b/plugins/Actions/lang/tl.json
index 01aa6cbe53..0403fd0d6f 100644
--- a/plugins/Actions/lang/tl.json
+++ b/plugins/Actions/lang/tl.json
@@ -38,7 +38,6 @@
         "PagesReportDocumentation": "Ang ulat na ito ay naglalaman ng impormasyon tungkol sa mga URL ng pahina na binisita mo. %s ang talahanayan ay nakaayos ng hierarchically, ang mga URL ay ipinapakita bilang isang istraktura ng folder.",
         "PageTitlesReportDocumentation": "Ang ulat na ito ay naglalaman ng impormasyon tungkol sa mga pamagat ng mga pahina na binisita na. %s Ang pamagat ng pahina ay ang HTML %s Tag na karaniwang pinapakita ng ng karamihan sa mga browser sa kanilang mga window bilang pamagat.",
         "PageUrls": "Mga URL ng Pahina",
-        "PluginDescription": "Dokumentasyon ng bilang ng mga bumisita sa pahina, mga outlink at download na ginawa",
         "SiteSearchCategories1": "Inililista ng ulat na ito ang mga kategorya na napili ng mga bisita kapag ginawa nila ang isang Paghahanap sa iyong website.",
         "SiteSearchCategories2": "Halimbawa, ang mga Ecommerce website ay karaniwang may tagapili ng \"Kategorya\" upang ang mga bisita ay maaaring malimitahan ang kanilang mga paghahanap sa lahat ng produkto sa isang espesipikong Kategorya.",
         "SiteSearchFollowingPagesDoc": "Kapag naghanap ang mga bisita sa iyong website, ang mga ito ay naghahanap para sa isang partikular na pahina, nilalaman, produkto, o serbisyo. Inililista ng ulat na ito ang mga pahina na pinakana-click pagkatapos ng isang internal na paghahanap. Sa isang salita, ang listahan ng mga pahina ang pinaka-hinanap ng mga bisita na sa iyong website.",
diff --git a/plugins/Actions/lang/tr.json b/plugins/Actions/lang/tr.json
index c7e53087cf..16c6ef771b 100644
--- a/plugins/Actions/lang/tr.json
+++ b/plugins/Actions/lang/tr.json
@@ -39,7 +39,6 @@
         "PagesReportDocumentation": "Bu rapor ziyaret edilen sayfa URL'leri hakkında bilgi içerir. %s Tablo hiyerarşik olarak düzenlenmiştir, URL'ler klasör yapısı ile görüntülenmektedir.",
         "PageTitlesReportDocumentation": "Bu rapor ziyaret edilen sayfaların başlıkları ile ilgili bilgi içerir. %s Sayfa başlığı, birçok tarayıcının pencere başlığında gösterdiği HTML %s imidir.",
         "PageUrls": "Sayfa Adresleri",
-        "PluginDescription": "Sayfa gösterimleri, dışarı linkler ve indirilenler hakkında raporlar. Dışarı linkler ve indirilenler otomatik.",
         "SiteSearchCategories1": "Bu rapor, ziyaretçilerin sitenizde arama yaptıklarında seçtikleri kategorileri listelemektedir.",
         "SiteSearchCategories2": "Örnek olarak, E-Ticaret websitelerinde tipik bir \"Kategori\" seçimi vardır böylece ziyaretçiler aramalarını belirli bir kategori içindeki tüm ürünler ile kısıtlayabilirler.",
         "SiteSearchFollowingPagesDoc": "Ziyaretçileriniz web sitenizde arama yaptığında belirli bir sayfa, içerik, ürün ya da hizmete bakarlar. Bu rapor, web siteniz içinde yapılan bir aramadan sonra en çok tıklanan sayfalarınızı listeler. Diğer bir deyişle, web sitenizdeki mevcut ziyaretçilerinizin en çok aradığı sayfaları gösterir.",
diff --git a/plugins/Actions/lang/uk.json b/plugins/Actions/lang/uk.json
index 3a8809b014..9dcb09dc63 100644
--- a/plugins/Actions/lang/uk.json
+++ b/plugins/Actions/lang/uk.json
@@ -7,7 +7,6 @@
         "ColumnPageURL": "URL сторінки",
         "ColumnUniqueClicks": "Унікальні клацання",
         "ColumnUniqueDownloads": "Унікальні завантаження",
-        "PluginDescription": "Звіти про перегляди сторінок, переходи по посиланнях та завантаження. Відслідковування переходів по посиланнях та завантаження автоматизовано.",
         "SubmenuPagesEntry": "Сторінки входу",
         "SubmenuPagesExit": "Сторінки виходу",
         "SubmenuPageTitles": "Заголовки сторінок"
diff --git a/plugins/Actions/lang/vi.json b/plugins/Actions/lang/vi.json
index 288f28d30f..532fd0d614 100644
--- a/plugins/Actions/lang/vi.json
+++ b/plugins/Actions/lang/vi.json
@@ -39,7 +39,6 @@
         "PagesReportDocumentation": "Báo cáo này chứa thông tin về các URLs của trang đã được xem. %s Bảng này được tổ chức dưới dạng cây, Các URL được hiển thị dưới cấu trúc folder.",
         "PageTitlesReportDocumentation": "Báo cáo này chứa thông tin về tiêu đề các trang đã được truy cập. %s Tiêu đề trang là thẻ HTML %s mà các trình duyệt hiển thị trên thanh tiêu đề của cửa sổ trình duyệt.",
         "PageUrls": "Đường dẫn trang",
-        "PluginDescription": "Báo cáo về lượng xem trang (page views), các links ngoài (outlinks) và các lượt download. Link ngoài và lượt download được theo dõi một cách tự động. Bạn còn có thể theo dõi máy tìm kiếm nội bộ trên trang web của bạn.",
         "SiteSearchCategories1": "Báo cáo này liệt kê các hạng mục cho người truy cập lựa chọn khi họ thực hiện một tìm kiếm trên trang web của bạn",
         "SiteSearchCategories2": "Ví dụ, một trang thương mại điện tử (e-commerce) thường có chức năng \"Lựa chọn Phân mục\" để khách truy cập giới hạn phạm vi tìm kiếm đối với các sản phẩm trong một phân mục quy định.",
         "SiteSearchFollowingPagesDoc": "Khi khách tìm kiếm trên trang web của bạn, họ tìm kiếm một trang, nội dung, sản phẩm hoặc một dịch vụ cụ thể. Báo cáo này liệt kê các trang đã được click nhiều nhất sau khi thực hiện phép tìm kiếm (nội bộ). Nói cách khác, danh sách này chứa các trang được tìm kiếm nhiều nhất được thực hiện bởi khách trên trang web của bạn.",
diff --git a/plugins/Actions/lang/zh-cn.json b/plugins/Actions/lang/zh-cn.json
index cfef104d47..c3d9124725 100644
--- a/plugins/Actions/lang/zh-cn.json
+++ b/plugins/Actions/lang/zh-cn.json
@@ -39,7 +39,6 @@
         "PagesReportDocumentation": "本报表显示被访问的网页地址。%s 表格分级归类，网址按照目录结构显示。",
         "PageTitlesReportDocumentation": "本报表显示被访问页面的标题。%s 网页标题为 HTML %s 标签，多数浏览器显示为窗口的标题。",
         "PageUrls": "页面地址",
-        "PluginDescription": "报表显示页面浏览量、离站链接和下载次数。离站链接及下载跟踪是自动的！您也可以统计站内搜索。",
         "SiteSearchCategories1": "本报表显示访客使用站内搜索时选择的分类。",
         "SiteSearchCategories2": "例如，购物网站通常有个\"分类\"选项，访客可以限制在某个分类中搜索产品。",
         "SiteSearchFollowingPagesDoc": "当访客在网站上搜索时，他们是在寻找特定的页面、内容、产品或者服务，本报表显示站内搜索后点击最多的页面。也就是说，显示了已有访客搜索最多的页面。",
diff --git a/plugins/Actions/lang/zh-tw.json b/plugins/Actions/lang/zh-tw.json
index 37a7c9840f..0dc39bc574 100644
--- a/plugins/Actions/lang/zh-tw.json
+++ b/plugins/Actions/lang/zh-tw.json
@@ -23,7 +23,6 @@
         "ExitPageTitles": "離站網頁標題",
         "ExitPageTitlesReportDocumentation": "此報表涵括關於指定時段內離站網頁之標題等資訊",
         "PageUrls": "網頁",
-        "PluginDescription": "關於頁面瀏覽量、離開連結和下載。離開連結及下載的追蹤是自動的！",
         "SubmenuPagesEntry": "到達網頁",
         "SubmenuPagesExit": "離站網頁",
         "SubmenuPageTitles": "網頁標題",
diff --git a/plugins/Actions/tests/Unit/ArchiverTest.php b/plugins/Actions/tests/Unit/ArchiverTest.php
index a3ba57511a..ee1fe940ee 100644
--- a/plugins/Actions/tests/Unit/ArchiverTest.php
+++ b/plugins/Actions/tests/Unit/ArchiverTest.php
@@ -23,12 +23,12 @@ class ArchiverTests extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
-        Translate::reloadLanguage('en');
+        Translate::loadAllTranslations();
     }
 
     public function tearDown()
     {
-        Translate::unloadEnglishTranslation();
+        Translate::reset();
     }
 
     public function getActionNameTestData()
diff --git a/plugins/Annotations/lang/el.json b/plugins/Annotations/lang/el.json
index a7e3d9720e..46a8c8da0c 100644
--- a/plugins/Annotations/lang/el.json
+++ b/plugins/Annotations/lang/el.json
@@ -15,7 +15,7 @@
         "InlineQuickHelp": "Μπορείτε να δημιουργήσετε σημειώσεις για να επισημάνετε ειδικές εκδηλώσεις (όπως ένα νέο blog post, ή επανασχεδιασμό ιστοσελίδας), για να αποθηκεύσετε αναλύσεις των δεδομένων σας ή να αποθηκεύσετε ό,τι άλλο νομίζετε ότι είναι σημαντικό.",
         "LoginToAnnotate": "Συνδεθείτε για να δημιουργήσετε ένα σχολιασμό.",
         "NoAnnotations": "Δεν υπάρχουν σημειώσεις για αυτό το εύρος ημερομηνιών.",
-        "PluginDescription": "Σας επιτρέπει να επισυνάψετε σημειώσεις σε διαφορετικές ημέρες ώστε να θυμάστε γιατί τα δεδομένα σας φαίνονται έτσι.",
+        "PluginDescription": "Σας επιτρέπει να επισυνάπτετε σημειώσεις σε διαφορετικές ημέρες για να σημειώνετε αλλαγές που συμβαίνουν στον ιστοτόπο σας, να κρατάτε τις αναλύσεις που κάνετε σχετικά με τα δεδομένα σας και να μοιράζεστε τις σκέψεις σας με τους συναδέλφους σας. Με την επισύναψη σημειώσεων, θα είστε σίγουροι ότι θα θυμάστε για ποιο λόγο τα δεδομένα σας φαίνονται έτσι.",
         "ViewAndAddAnnotations": "Προβολή και προσθήκη σχολιασμών για %s...",
         "YouCannotModifyThisNote": "Δεν μπορείτε να τροποποιήσετε αυτή τη σημείωση, γιατί δεν τη δημιουργήσατε, ούτε έχετε πρόσβαση διαχειριστή για αυτό το site."
     }
diff --git a/plugins/Annotations/lang/nl.json b/plugins/Annotations/lang/nl.json
index b3e4e1bc3d..63bea9d3a5 100644
--- a/plugins/Annotations/lang/nl.json
+++ b/plugins/Annotations/lang/nl.json
@@ -15,7 +15,7 @@
         "InlineQuickHelp": "Je kunt annotaties aanmaken om speciale gebeurtenissen (zoals een nieuwe blog post of nieuw website ontwerp) te markeren, zodat je data analyses of andere belangrijke dingen kunt bewaren.",
         "LoginToAnnotate": "Login om een notitie te maken.",
         "NoAnnotations": "Er zijn geen notities beschikbaar voor deze periode.",
-        "PluginDescription": "Hier kunt je notities hechten aan de verschillende dagen zodat je zal worden herinnert waarom deze data er uitziet zoals het doet.",
+        "PluginDescription": "Hier kan je notities hechten aan de verschillende dagen zodat je zal worden herinnerd waarom deze data er uitziet zoals het doet.",
         "ViewAndAddAnnotations": "Bekijk en voeg annotaties toe voor %s...",
         "YouCannotModifyThisNote": "Je kunt deze notitie niet wijzigen omdat deze niet door jou is gemaakt of heb je ook geen admin rechten op deze site."
     }
diff --git a/plugins/Annotations/lang/ru.json b/plugins/Annotations/lang/ru.json
index c2d94f5b14..2c11fa8e3c 100644
--- a/plugins/Annotations/lang/ru.json
+++ b/plugins/Annotations/lang/ru.json
@@ -4,9 +4,9 @@
         "AnnotationOnDate": "Заметка на %1$s: %2$s",
         "Annotations": "Примечания",
         "ClickToDelete": "Удалить это примечание.",
-        "ClickToEdit": "Нажмите, чтобы отредактировать заметку.",
-        "ClickToEditOrAdd": "Щелкните, чтобы изменить или добавить новые заметки.",
-        "ClickToStarOrUnstar": "Кликните для того, чтобы поставить или снять отметку.",
+        "ClickToEdit": "Редактировать заметку.",
+        "ClickToEditOrAdd": "Изменить или добавить новые заметки.",
+        "ClickToStarOrUnstar": "Поставить или снять отметку.",
         "CreateNewAnnotation": "Создать заметку",
         "EnterAnnotationText": "Введите свою заметку",
         "HideAnnotationsFor": "Спрятать заметки для %s...",
diff --git a/plugins/UserSettings/.gitignore b/plugins/BulkTracking/.gitignore
index c8c9480010..c8c9480010 100644
--- a/plugins/UserSettings/.gitignore
+++ b/plugins/BulkTracking/.gitignore
diff --git a/plugins/BulkTracking/BulkTracking.php b/plugins/BulkTracking/BulkTracking.php
new file mode 100644
index 0000000000..b55a681030
--- /dev/null
+++ b/plugins/BulkTracking/BulkTracking.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\BulkTracking;
+use Piwik\Plugins\BulkTracking\Tracker\Handler;
+use Piwik\Plugins\BulkTracking\Tracker\Requests;
+use Piwik\Tracker\RequestSet;
+
+class BulkTracking extends \Piwik\Plugin
+{
+    /**
+     * @var Requests
+     */
+    private $requests;
+
+    /**
+     * @see Piwik\Plugin::getListHooksRegistered
+     */
+    public function getListHooksRegistered()
+    {
+        return array(
+            'Tracker.newHandler' => 'setHandlerIfBulkRequest',
+            'Tracker.initRequestSet' => 'initRequestSet',
+        );
+    }
+
+    public function setRequests(Requests $requests)
+    {
+        $this->requests = $requests;
+    }
+
+    public function initRequestSet(RequestSet $requestSet)
+    {
+        if ($this->isUsingBulkRequest()) {
+
+            $bulk = $this->buildBulkRequests();
+
+            list($requests, $token) = $bulk->initRequestsAndTokenAuth($bulk->getRawBulkRequest());
+
+            if ($bulk->requiresAuthentication()) {
+                $bulk->authenticateRequests($requests);
+            }
+
+            if (!$requestSet->getTokenAuth()) {
+                $requestSet->setTokenAuth($token);
+            }
+
+            $requestSet->setRequests($requests);
+        }
+    }
+
+    public function setHandlerIfBulkRequest(&$handler)
+    {
+        if (!is_null($handler)) {
+            return;
+        }
+
+        if ($this->isUsingBulkRequest()) {
+            $handler = new Handler();
+        }
+    }
+
+    private function isUsingBulkRequest()
+    {
+        $requests = $this->buildBulkRequests();
+        $rawData  = $requests->getRawBulkRequest();
+
+        return $requests->isUsingBulkRequest($rawData);
+    }
+
+    private function buildBulkRequests()
+    {
+        if (!is_null($this->requests)) {
+            return $this->requests;
+        }
+
+        return new Requests();
+    }
+}
diff --git a/plugins/BulkTracking/Tracker/Handler.php b/plugins/BulkTracking/Tracker/Handler.php
new file mode 100644
index 0000000000..e260237093
--- /dev/null
+++ b/plugins/BulkTracking/Tracker/Handler.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\BulkTracking\Tracker;
+
+use Piwik\Tracker;
+use Piwik\Tracker\RequestSet;
+use Piwik\Tracker\TrackerConfig;
+use Exception;
+
+class Handler extends Tracker\Handler
+{
+    private $transactionId = null;
+
+    public function __construct()
+    {
+        $this->setResponse(new Response());
+    }
+
+    public function onStartTrackRequests(Tracker $tracker, RequestSet $requestSet)
+    {
+        if ($this->isTransactionSupported()) {
+            $this->beginTransaction();
+        }
+    }
+
+    public function onAllRequestsTracked(Tracker $tracker, RequestSet $requestSet)
+    {
+        $this->commitTransaction();
+
+        // Do not run schedule task if we are importing logs or doing custom tracking (as it could slow down)
+    }
+
+    public function onException(Tracker $tracker, RequestSet $requestSet, Exception $e)
+    {
+        $this->rollbackTransaction();
+        parent::onException($tracker, $requestSet, $e);
+    }
+
+    private function beginTransaction()
+    {
+        if (empty($this->transactionId)) {
+            $this->transactionId = $this->getDb()->beginTransaction();
+        }
+    }
+
+    private function commitTransaction()
+    {
+        if (!empty($this->transactionId)) {
+            $this->getDb()->commit($this->transactionId);
+            $this->transactionId = null;
+        }
+    }
+
+    private function rollbackTransaction()
+    {
+        if (!empty($this->transactionId)) {
+            $this->getDb()->rollback($this->transactionId);
+            $this->transactionId = null;
+        }
+    }
+
+    private function getDb()
+    {
+        return Tracker::getDatabase();
+    }
+
+    /**
+     * @return bool
+     */
+    private function isTransactionSupported()
+    {
+        return (bool) TrackerConfig::getConfigValue('bulk_requests_use_transaction');
+    }
+
+}
diff --git a/plugins/BulkTracking/Tracker/Requests.php b/plugins/BulkTracking/Tracker/Requests.php
new file mode 100644
index 0000000000..af4eb23a15
--- /dev/null
+++ b/plugins/BulkTracking/Tracker/Requests.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\BulkTracking\Tracker;
+
+use Exception;
+use Piwik\Common;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\TrackerConfig;
+
+class Requests
+{
+
+    public function requiresAuthentication()
+    {
+        $requiresAuth = TrackerConfig::getConfigValue('bulk_requests_require_authentication');
+
+        return !empty($requiresAuth);
+    }
+
+    /**
+     * @param Request[] $requests
+     * @throws Exception
+     */
+    public function authenticateRequests($requests)
+    {
+        foreach ($requests as $request) {
+            $this->checkTokenAuthNotEmpty($request->getTokenAuth());
+
+            if (!$request->isAuthenticated()) {
+                $msg = sprintf("token_auth specified does not have Admin permission for idsite=%s", $request->getIdSite());
+                throw new Exception($msg);
+            }
+        }
+    }
+
+    private function checkTokenAuthNotEmpty($token)
+    {
+        if (empty($token)) {
+            throw new Exception("token_auth must be specified when using Bulk Tracking Import. "
+                . " See <a href='http://developer.piwik.org/api-reference/tracking-api'>Tracking Doc</a>");
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function getRawBulkRequest()
+    {
+        return file_get_contents("php://input");
+    }
+
+    public function isUsingBulkRequest($rawData)
+    {
+        if (!empty($rawData)) {
+            return strpos($rawData, '"requests"') || strpos($rawData, "'requests'");
+        }
+
+        return false;
+    }
+
+    public function getRequestsArrayFromBulkRequest($rawData)
+    {
+        $rawData = trim($rawData);
+        $rawData = Common::sanitizeLineBreaks($rawData);
+
+        // POST data can be array of string URLs or array of arrays w/ visit info
+        $jsonData = json_decode($rawData, $assoc = true);
+
+        $tokenAuth = Common::getRequestVar('token_auth', false, 'string', $jsonData);
+
+        $requests = array();
+        if (isset($jsonData['requests'])) {
+            $requests = $jsonData['requests'];
+        }
+
+        return array($requests, $tokenAuth);
+    }
+
+    public function initRequestsAndTokenAuth($rawData)
+    {
+        list($requests, $tokenAuth) = $this->getRequestsArrayFromBulkRequest($rawData);
+
+        $validRequests = array();
+
+        if (!empty($requests)) {
+
+            foreach ($requests as $index => $request) {
+                // if a string is sent, we assume its a URL and try to parse it
+                if (is_string($request)) {
+                    $params = array();
+
+                    $url = @parse_url($request);
+                    if (!empty($url['query'])) {
+                        @parse_str($url['query'], $params);
+                        $validRequests[] = new Request($params, $tokenAuth);
+                    }
+                } else {
+                    $validRequests[] = new Request($request, $tokenAuth);
+                }
+            }
+        }
+
+        return array($validRequests, $tokenAuth);
+    }
+}
diff --git a/plugins/BulkTracking/Tracker/Response.php b/plugins/BulkTracking/Tracker/Response.php
new file mode 100644
index 0000000000..fd3e304a5e
--- /dev/null
+++ b/plugins/BulkTracking/Tracker/Response.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\BulkTracking\Tracker;
+
+use Exception;
+use Piwik\Common;
+use Piwik\Tracker;
+
+class Response extends Tracker\Response
+{
+    /**
+     * Echos an error message & other information, then exits.
+     *
+     * @param Tracker $tracker
+     * @param Exception $e
+     * @param int  $statusCode eg 500
+     */
+    public function outputException(Tracker $tracker, Exception $e, $statusCode)
+    {
+        Common::sendResponseCode($statusCode);
+
+        $this->logExceptionToErrorLog($e);
+
+        $result = $this->formatException($tracker, $e);
+
+        echo json_encode($result);
+    }
+
+    public function outputResponse(Tracker $tracker)
+    {
+        if ($this->hasAlreadyPrintedOutput()) {
+            return;
+        }
+
+        $result = $this->formatResponse($tracker);
+
+        echo json_encode($result);
+    }
+
+    public function getOutput()
+    {
+        Common::sendHeader('Content-Type: application/json');
+
+        return parent::getOutput();
+    }
+
+    private function formatException(Tracker $tracker, Exception $e)
+    {
+        // when doing bulk tracking we return JSON so the caller will know how many succeeded
+        $result = array(
+            'status'  => 'error',
+            'tracked' => $tracker->getCountOfLoggedRequests()
+        );
+
+        // send error when in debug mode
+        if ($tracker->isDebugModeEnabled()) {
+            $result['message'] = $this->getMessageFromException($e);
+        }
+
+        return $result;
+    }
+
+    private function formatResponse(Tracker $tracker)
+    {
+        return array(
+            'status' => 'success',
+            'tracked' => $tracker->getCountOfLoggedRequests()
+        );
+    }
+
+}
diff --git a/plugins/BulkTracking/plugin.json b/plugins/BulkTracking/plugin.json
new file mode 100644
index 0000000000..2779ab2685
--- /dev/null
+++ b/plugins/BulkTracking/plugin.json
@@ -0,0 +1,4 @@
+{
+ "name": "BulkTracking",
+ "description": "Provides ability to send several Tracking API requests in one bulk request. Makes importing a lot of data in Piwik faster."
+}
\ No newline at end of file
diff --git a/plugins/BulkTracking/tests/Fixtures/SimpleFixtureTrackFewVisits.php b/plugins/BulkTracking/tests/Fixtures/SimpleFixtureTrackFewVisits.php
new file mode 100644
index 0000000000..aac9c14a2a
--- /dev/null
+++ b/plugins/BulkTracking/tests/Fixtures/SimpleFixtureTrackFewVisits.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+namespace Piwik\Plugins\BulkTracking\tests\Fixtures;
+
+use Piwik\Date;
+use Piwik\Tests\Framework\Fixture;
+
+/**
+ * Generates tracker testing data for our TrackerTest
+ *
+ * This Simple fixture adds one website and tracks one visit with couple pageviews and an ecommerce conversion
+ */
+class SimpleFixtureTrackFewVisits extends Fixture
+{
+    public $dateTime = '2013-01-23 01:23:45';
+    public $idSite = 1;
+
+    public function setUp()
+    {
+        $this->setUpWebsite();
+        $this->trackFirstVisit();
+        $this->trackSecondVisit();
+    }
+
+    public function tearDown()
+    {
+        // empty
+    }
+
+    private function setUpWebsite()
+    {
+        if (!self::siteCreated($this->idSite)) {
+            $idSite = self::createWebsite($this->dateTime, $ecommerce = 1);
+            $this->assertSame($this->idSite, $idSite);
+        }
+    }
+
+    protected function trackFirstVisit()
+    {
+        $t = self::getTracker($this->idSite, $this->dateTime, $defaultInit = true);
+
+        $t->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.1)->getDatetime());
+        $t->setUrl('http://example.com/');
+        self::checkResponse($t->doTrackPageView('Viewing homepage'));
+
+        $t->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.2)->getDatetime());
+        $t->setUrl('http://example.com/sub/page');
+        self::checkResponse($t->doTrackPageView('Second page view'));
+
+        $t->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.25)->getDatetime());
+        $t->addEcommerceItem($sku = 'SKU_ID', $name = 'Test item!', $category = 'Test & Category', $price = 777, $quantity = 33);
+        self::checkResponse($t->doTrackEcommerceOrder('TestingOrder', $grandTotal = 33 * 77));
+    }
+
+    protected function trackSecondVisit()
+    {
+        $t = self::getTracker($this->idSite, $this->dateTime, $defaultInit = true);
+        $t->setIp('56.11.55.73');
+
+        $t->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.1)->getDatetime());
+        $t->setUrl('http://example.com/sub/page');
+        self::checkResponse($t->doTrackPageView('Viewing homepage'));
+
+        $t->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.2)->getDatetime());
+        $t->setUrl('http://example.com/?search=this is a site search query');
+        self::checkResponse($t->doTrackPageView('Site search query'));
+
+        $t->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.3)->getDatetime());
+        $t->addEcommerceItem($sku = 'SKU_ID2', $name = 'A durable item', $category = 'Best seller', $price = 321);
+        self::checkResponse($t->doTrackEcommerceCartUpdate($grandTotal = 33 * 77));
+    }
+}
\ No newline at end of file
diff --git a/plugins/BulkTracking/tests/Framework/Mock/Tracker/Requests.php b/plugins/BulkTracking/tests/Framework/Mock/Tracker/Requests.php
new file mode 100644
index 0000000000..c6c39c4ee9
--- /dev/null
+++ b/plugins/BulkTracking/tests/Framework/Mock/Tracker/Requests.php
@@ -0,0 +1,42 @@
+<?php
+/**
+* Piwik - free/libre analytics platform
+*
+* @link http://piwik.org
+* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+*/
+
+namespace Piwik\Plugins\BulkTracking\tests\Framework\Mock\Tracker;
+
+use Piwik\Tracker;
+
+class Requests extends \Piwik\Plugins\BulkTracking\Tracker\Requests
+{
+    private $rawData;
+    private $requiresAuth = false;
+
+    public function setRawData($rawData)
+    {
+        $this->rawData = $rawData;
+    }
+
+    public function getRawBulkRequest()
+    {
+        if (!is_null($this->rawData)) {
+            return $this->rawData;
+        }
+
+        return parent::getRawBulkRequest();
+    }
+
+    public function enableRequiresAuth()
+    {
+        $this->requiresAuth = true;
+    }
+
+    public function requiresAuthentication()
+    {
+        return $this->requiresAuth;
+    }
+
+}
diff --git a/plugins/BulkTracking/tests/Framework/Mock/Tracker/Response.php b/plugins/BulkTracking/tests/Framework/Mock/Tracker/Response.php
new file mode 100644
index 0000000000..e514745ddb
--- /dev/null
+++ b/plugins/BulkTracking/tests/Framework/Mock/Tracker/Response.php
@@ -0,0 +1,21 @@
+<?php
+/**
+* Piwik - free/libre analytics platform
+*
+* @link http://piwik.org
+* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+*/
+
+namespace Piwik\Plugins\BulkTracking\tests\Framework\Mock\Tracker;
+
+use Piwik\Tracker;
+use Exception;
+
+class Response extends \Piwik\Plugins\BulkTracking\Tracker\Response
+{
+    protected function logExceptionToErrorLog(Exception $e)
+    {
+        // prevent from writing to console in tests
+    }
+
+}
diff --git a/plugins/BulkTracking/tests/Framework/TestCase/BulkTrackingTestCase.php b/plugins/BulkTracking/tests/Framework/TestCase/BulkTrackingTestCase.php
new file mode 100644
index 0000000000..23b96776ae
--- /dev/null
+++ b/plugins/BulkTracking/tests/Framework/TestCase/BulkTrackingTestCase.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\BulkTracking\tests\Framework\TestCase;
+
+use Piwik\Plugin;
+use Piwik\Plugins\BulkTracking\BulkTracking;
+use Piwik\Tests\Framework\Fixture;
+use Piwik\Plugins\BulkTracking\tests\Framework\Mock\Tracker\Requests;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+use Piwik\Tracker\Handler as DefaultHandler;
+use Piwik\Tracker\RequestSet;
+
+/**
+ * @group BulkTracking
+ * @group BulkTrackingTest
+ * @group Plugins
+ * @group Tracker
+ */
+class BulkTrackingTestCase extends IntegrationTestCase
+{
+    /**
+     * @var BulkTracking
+     */
+    protected $bulk;
+
+    private $pluginBackup;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->bulk = new BulkTracking();
+
+        $this->pluginBackup = Plugin\Manager::getInstance()->getLoadedPlugin('BulkTracking');
+        Plugin\Manager::getInstance()->addLoadedPlugin('BulkTracking', $this->bulk);
+    }
+
+    public function tearDown()
+    {
+        Plugin\Manager::getInstance()->addLoadedPlugin('BulkTracking', $this->pluginBackup);
+        parent::tearDown();
+    }
+
+    protected function getSuperUserToken()
+    {
+        Fixture::createSuperUser(false);
+        return Fixture::getTokenAuth();
+    }
+
+    protected function injectRawDataToBulk($rawData, $requiresAuth = false)
+    {
+        $requests = new Requests();
+        $requests->setRawData($rawData);
+
+        if ($requiresAuth) {
+            $requests->enableRequiresAuth();
+        }
+
+        $this->bulk->setRequests($requests);
+    }
+
+    protected function initRequestSet($rawData, $requiresAuth = false, $initToken = null)
+    {
+        $requestSet = new RequestSet();
+
+        if (!is_null($initToken)) {
+            $requestSet->setTokenAuth($initToken);
+        }
+
+        $this->injectRawDataToBulk($rawData, $requiresAuth);
+
+        $this->bulk->initRequestSet($requestSet);
+
+        return $requestSet;
+    }
+
+    protected function getDummyRequest($token = null)
+    {
+        $params = array(array('idsite' => '1', 'rec' => '1'), array('idsite' => '2', 'rec' => '1'));
+        $params = array('requests' => $params);
+
+        if (!is_null($token)) {
+            $params['token_auth'] = $token;
+        }
+
+        $request = json_encode($params);
+
+        return $request;
+    }
+}
diff --git a/plugins/BulkTracking/tests/Integration/BulkTrackingTest.php b/plugins/BulkTracking/tests/Integration/BulkTrackingTest.php
new file mode 100644
index 0000000000..c495afcee1
--- /dev/null
+++ b/plugins/BulkTracking/tests/Integration/BulkTrackingTest.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\BulkTracking\tests\Integration;
+
+use Piwik\Plugin;
+use Piwik\Plugins\BulkTracking\tests\Framework\TestCase\BulkTrackingTestCase;
+use Piwik\Plugins\BulkTracking\Tracker\Handler;
+use Piwik\Tracker\Handler as DefaultHandler;
+use Piwik\Tracker\RequestSet;
+
+/**
+ * @group BulkTracking
+ * @group BulkTrackingTest
+ * @group Plugins
+ * @group Tracker
+ */
+class BulkTrackingTest extends BulkTrackingTestCase
+{
+    public function test_initRequestSet_shouldNotSetAnything_IfItIsActuallyNotUsingBulkRequest()
+    {
+        $requestSet = new RequestSet();
+        $this->bulk->initRequestSet($requestSet);
+
+        $this->assertEquals(array(), $requestSet->getRequests());
+        $this->assertEquals(false, $requestSet->getTokenAuth());
+    }
+
+    public function test_initRequestSet_shouldNotSetAnything_IfNotBulkRequestRawDataIsGiven()
+    {
+        $requestSet = $this->initRequestSet('invalid:requests');
+
+        $this->assertEquals(array(), $requestSet->getRequests());
+        $this->assertEquals(false, $requestSet->getTokenAuth());
+    }
+
+    public function test_initRequestSet_shouldInitialize_AsItIsABulkRequest()
+    {
+        $token   = $this->getSuperUserToken();
+        $request = $this->getDummyRequest($token);
+
+        $requestSet = $this->initRequestSet($request);
+
+        $requests = $requestSet->getRequests();
+        $this->assertCount(2, $requests);
+        $this->assertEquals(array('idsite' => '1', 'rec' => '1'), $requests[0]->getParams());
+        $this->assertEquals(array('idsite' => '2', 'rec' => '1'), $requests[1]->getParams());
+        $this->assertEquals($token, $requestSet->getTokenAuth());
+    }
+
+    public function test_initRequestSet_shouldNotOverwriteAToken_IfOneIsAlreadySet()
+    {
+        $token   = $this->getSuperUserToken();
+        $request = $this->getDummyRequest($token);
+
+        $requestSet = $this->initRequestSet($request, false, 'initialtoken');
+
+        $this->assertEquals('initialtoken', $requestSet->getTokenAuth());
+        $this->assertCount(2, $requestSet->getRequests());
+    }
+
+    public function test_initRequestSet_shouldNotFail_IfNoTokenProvided_AsAuthenticationIsDisabledByDefault()
+    {
+        $request = $this->getDummyRequest();
+
+        $requestSet = $this->initRequestSet($request);
+
+        $requests = $requestSet->getRequests();
+        $this->assertCount(2, $requests);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage token_auth must be specified when using Bulk Tracking Import
+     */
+    public function test_initRequestSet_shouldTriggerException_InCaseNoValidTokenProvidedAndAuthenticationIsRequired()
+    {
+        $request = $this->getDummyRequest(false);
+
+        $this->initRequestSet($request, true);
+    }
+
+    public function test_setHandlerIfBulkRequest_shouldSetBulkHandler_InCaseNoHandlerIsSetAndItIsABulkRequest()
+    {
+        $this->injectRawDataToBulk($this->getDummyRequest());
+
+        $handler = null;
+        $this->bulk->setHandlerIfBulkRequest($handler);
+
+        $this->assertTrue($handler instanceof Handler);
+    }
+
+    public function test_setHandlerIfBulkRequest_shouldNotSetAHandler_IfOneIsAlreadySetEvenIfItIsABulkRequest()
+    {
+        $this->injectRawDataToBulk($this->getDummyRequest());
+
+        $default = new DefaultHandler();
+        $handler = $default;
+
+        $this->bulk->setHandlerIfBulkRequest($default);
+
+        $this->assertSame($default, $handler);
+    }
+
+    public function test_setHandlerIfBulkRequest_shouldNotSetAHandler_IfItIsNotABulkRequest()
+    {
+        $this->injectRawDataToBulk('{"test":"not a bulk request"}');
+
+        $handler = null;
+
+        $this->bulk->setHandlerIfBulkRequest($handler);
+
+        $this->assertNull($handler);
+    }
+
+    public function test_getListHooksRegistered_shouldListenToNewTrackerEventAndCreateBulkHandler_IfBulkRequest()
+    {
+        $this->injectRawDataToBulk($this->getDummyRequest());
+
+        $handler = DefaultHandler\Factory::make();
+
+        $this->assertTrue($handler instanceof Handler);
+    }
+
+    public function test_getListHooksRegistered_shouldListenToNewTrackerEventAndNotCreateBulkHandler_IfNotBulkRequest()
+    {
+        $handler = DefaultHandler\Factory::make();
+
+        $this->assertTrue($handler instanceof DefaultHandler);
+    }
+
+    public function test_getListHooksRegistered_shouldListenToInitRequestSetEventAndInit_IfBulkRequest()
+    {
+        $this->injectRawDataToBulk($this->getDummyRequest());
+
+        $requestSet = new RequestSet();
+        $requestSet->initRequestsAndTokenAuth();
+
+        $this->assertCount(2, $requestSet->getRequests());
+    }
+
+}
diff --git a/plugins/BulkTracking/tests/Integration/HandlerTest.php b/plugins/BulkTracking/tests/Integration/HandlerTest.php
new file mode 100644
index 0000000000..1b2b46c8cb
--- /dev/null
+++ b/plugins/BulkTracking/tests/Integration/HandlerTest.php
@@ -0,0 +1,161 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\BulkTracking\tests\Integration;
+
+use Piwik\Exception\InvalidRequestParameterException;
+use Piwik\Exception\UnexpectedWebsiteFoundException;
+use Piwik\Tests\Framework\Fixture;
+use Piwik\Tests\Framework\Mock\Tracker\Response;
+use Piwik\Tests\Framework\Mock\Tracker\ScheduledTasksRunner;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+use Piwik\Tracker;
+use Piwik\Plugins\BulkTracking\Tracker\Handler;
+use Piwik\Tests\Framework\Mock\Tracker\RequestSet;
+use Exception;
+
+/**
+ * @group HandlerTest
+ * @group Handler
+ * @group Tracker
+ */
+class HandlerTest extends IntegrationTestCase
+{
+    /**
+     * @var Handler
+     */
+    private $handler;
+
+    /**
+     * @var Response
+     */
+    private $response;
+
+    /**
+     * @var Tracker
+     */
+    private $tracker;
+
+    /**
+     * @var RequestSet
+     */
+    private $requestSet;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        Fixture::createWebsite('2014-01-01 00:00:00');
+        Tracker\Cache::deleteTrackerCache();
+
+        $this->response = new Response();
+        $this->handler  = new Handler();
+        $this->handler->setResponse($this->response);
+        $this->tracker  = new Tracker();
+        $this->requestSet = new RequestSet();
+    }
+
+    public function test_init_ShouldInitiateResponseInstance()
+    {
+        $this->handler->init($this->tracker, $this->requestSet);
+
+        $this->assertTrue($this->response->isInit);
+        $this->assertFalse($this->response->isResponseOutput);
+        $this->assertFalse($this->response->isSend);
+    }
+
+    public function test_finish_ShouldOutputAndSendResponse()
+    {
+        $response = $this->handler->finish($this->tracker, $this->requestSet);
+
+        $this->assertEquals('My Dummy Content', $response);
+
+        $this->assertFalse($this->response->isInit);
+        $this->assertFalse($this->response->isExceptionOutput);
+        $this->assertTrue($this->response->isResponseOutput);
+        $this->assertTrue($this->response->isSend);
+    }
+
+    public function test_onException_ShouldOutputAndSendResponse()
+    {
+        $this->executeOnException($this->buildException());
+
+        $this->assertFalse($this->response->isInit);
+        $this->assertFalse($this->response->isResponseOutput);
+        $this->assertTrue($this->response->isExceptionOutput);
+        $this->assertFalse($this->response->isSend);
+    }
+
+    public function test_onException_ShouldPassExceptionToResponse()
+    {
+        $exception = $this->buildException();
+
+        $this->executeOnException($exception);
+
+        $this->assertSame($exception, $this->response->exception);
+        $this->assertSame(500, $this->response->statusCode);
+    }
+
+    public function test_onException_ShouldSendStatusCode400IfUnexpectedWebsite()
+    {
+        $this->executeOnException(new UnexpectedWebsiteFoundException('test'));
+        $this->assertSame(400, $this->response->statusCode);
+    }
+
+    public function test_onException_ShouldSendStatusCode400IfInvalidRequestParameterException()
+    {
+        $this->executeOnException(new InvalidRequestParameterException('test'));
+        $this->assertSame(400, $this->response->statusCode);
+    }
+
+    public function test_onException_ShouldNotRethrowAnException()
+    {
+        $exception = $this->buildException();
+
+        $this->handler->onException($this->tracker, $this->requestSet, $exception);
+        $this->assertTrue(true);
+    }
+
+    public function test_onAllRequestsTracked_ShouldNeverTriggerScheduledTasksEvenIfEnabled()
+    {
+        $runner = new ScheduledTasksRunner();
+        $runner->shouldRun = true;
+
+        $this->handler->setScheduledTasksRunner($runner);
+        $this->handler->onAllRequestsTracked($this->tracker, $this->requestSet);
+
+        $this->assertFalse($runner->ranScheduledTasks);
+    }
+
+    public function test_process_ShouldTrackAllSetRequests()
+    {
+        $this->assertSame(0, $this->tracker->getCountOfLoggedRequests());
+
+        $this->requestSet->setRequests(array(
+            array('idsite' => 1, 'url' => 'http://localhost/foo?bar'),
+            array('idsite' => 1, 'url' => 'http://localhost'),
+        ));
+
+        $this->handler->process($this->tracker, $this->requestSet);
+
+        $this->assertSame(2, $this->tracker->getCountOfLoggedRequests());
+    }
+
+    private function buildException()
+    {
+        return new \Exception('MyMessage', 292);
+    }
+
+    private function executeOnException(Exception $exception)
+    {
+        try {
+            $this->handler->onException($this->tracker, $this->requestSet, $exception);
+        } catch (Exception $e) {
+        }
+    }
+}
diff --git a/plugins/BulkTracking/tests/Integration/RequestsTest.php b/plugins/BulkTracking/tests/Integration/RequestsTest.php
new file mode 100644
index 0000000000..ab45204303
--- /dev/null
+++ b/plugins/BulkTracking/tests/Integration/RequestsTest.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\BulkTracking\tests\Integration;
+
+use Piwik\Plugins\BulkTracking\Tracker\Requests;
+use Piwik\Plugins\UsersManager\API;
+use Piwik\Plugins\UsersManager\UsersManager;
+use Piwik\Tests\Framework\Fixture;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\TrackerConfig;
+
+/**
+ * @group BulkTracking
+ * @group RequestsTest
+ * @group Plugins
+ * @group Tracker
+ */
+class RequestsTest extends IntegrationTestCase
+{
+    /**
+     * @var Requests
+     */
+    private $requests;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->requests = new Requests();
+    }
+
+    public function tearDown()
+    {
+        // clean up your test here if needed
+
+        parent::tearDown();
+    }
+
+    public function test_requiresAuthentication_shouldReturnTrue_IfEnabled()
+    {
+        $oldConfig = TrackerConfig::getConfigValue('bulk_requests_require_authentication');
+        TrackerConfig::setConfigValue('bulk_requests_require_authentication', 1);
+
+        $this->assertTrue($this->requests->requiresAuthentication());
+
+        TrackerConfig::setConfigValue('bulk_requests_require_authentication', $oldConfig);
+    }
+
+    public function test_requiresAuthentication_shouldReturnFalse_IfDisabled()
+    {
+        $oldConfig = TrackerConfig::getConfigValue('bulk_requests_require_authentication');
+        TrackerConfig::setConfigValue('bulk_requests_require_authentication', 0);
+
+        $this->assertFalse($this->requests->requiresAuthentication());
+
+        TrackerConfig::setConfigValue('bulk_requests_require_authentication', $oldConfig);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage token_auth must be specified when using Bulk Tracking Import
+     */
+    public function test_authenticateRequests_shouldThrowAnException_IfTokenAuthIsEmpty()
+    {
+        $requests = array($this->buildDummyRequest());
+        $this->requests->authenticateRequests($requests);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage token_auth must be specified when using Bulk Tracking Import
+     */
+    public function test_authenticateRequests_shouldThrowAnException_IfAnyTokenAuthIsEmpty()
+    {
+        $requests = array($this->buildDummyRequest($this->getSuperUserToken()), $this->buildDummyRequest());
+        $this->requests->authenticateRequests($requests);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage token_auth specified does not have Admin permission for idsite=1
+     */
+    public function test_authenticateRequests_shouldThrowAnException_IfTokenIsNotValid()
+    {
+        $dummyToken = API::getInstance()->getTokenAuth('test', UsersManager::getPasswordHash('2'));
+        $superUserToken = $this->getSuperUserToken();
+
+        $requests = array($this->buildDummyRequest($superUserToken), $this->buildDummyRequest($dummyToken));
+        $this->requests->authenticateRequests($requests);
+    }
+
+    public function test_authenticateRequests_shouldNotFail_IfAllTokensAreValid()
+    {
+        $superUserToken = $this->getSuperUserToken();
+
+        $requests = array($this->buildDummyRequest($superUserToken), $this->buildDummyRequest($superUserToken));
+        $this->requests->authenticateRequests($requests);
+
+        $this->assertTrue(true);
+    }
+
+    public function test_authenticateRequests_shouldNotFail_IfEmptyRequestSetGiven()
+    {
+        $this->requests->authenticateRequests(array());
+
+        $this->assertTrue(true);
+    }
+
+    private function getSuperUserToken()
+    {
+        Fixture::createSuperUser(false);
+        return Fixture::getTokenAuth();
+    }
+
+    private function buildDummyRequest($token = false)
+    {
+        return new Request(array('idsite' => '1'), $token);
+    }
+
+}
diff --git a/plugins/BulkTracking/tests/Integration/TrackerTest.php b/plugins/BulkTracking/tests/Integration/TrackerTest.php
new file mode 100644
index 0000000000..dd1e37ea70
--- /dev/null
+++ b/plugins/BulkTracking/tests/Integration/TrackerTest.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\BulkTracking\tests\Integration;
+
+use Piwik\Common;
+use Piwik\Plugin;
+use Piwik\Plugins\BulkTracking\tests\Framework\Mock\Tracker\Response;
+use Piwik\Plugins\BulkTracking\tests\Framework\TestCase\BulkTrackingTestCase;
+use Piwik\Plugins\BulkTracking\Tracker\Handler;
+use Piwik\Tests\Framework\Fixture;
+use Piwik\Tracker;
+use Piwik\Translate;
+use Piwik\Tests\Framework\Mock\Tracker\RequestSet;
+
+class TestIntegrationTracker extends Tracker {
+
+    protected function loadTrackerPlugins()
+    {
+        // if we reload the plugins we would lose the injected data :(
+    }
+}
+
+/**
+ * @group TrackerTest
+ * @group Tracker
+ */
+class TrackerTest extends BulkTrackingTestCase
+{
+    /**
+     * @var TestIntegrationTracker
+     */
+    private $tracker;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->tracker = new TestIntegrationTracker();
+
+        Fixture::createWebsite('2014-01-01 00:00:00');
+        Fixture::createWebsite('2014-01-01 00:00:00');
+
+        $this->injectRawDataToBulk($this->getDummyRequest());
+    }
+
+    public function test_main_shouldIncreaseLoggedRequestsCounter()
+    {
+        $this->tracker->main($this->getHandler(), $this->getEmptyRequestSet());
+
+        $this->assertSame(2, $this->tracker->getCountOfLoggedRequests());
+    }
+
+    public function test_main_shouldUseBulkHandler()
+    {
+        $handler = $this->getHandler();
+        $this->assertTrue($handler instanceof Handler);
+    }
+
+    public function test_main_shouldReturnBulkTrackingResponse()
+    {
+        $response = $this->tracker->main($this->getHandler(), $this->getEmptyRequestSet());
+
+        $this->assertSame('{"status":"success","tracked":2}', $response);
+    }
+
+    public function test_main_shouldReturnErrorResponse_InCaseOfAnyError()
+    {
+        $requestSet = new RequestSet();
+        $requestSet->enableThrowExceptionOnInit();
+
+        $handler = $this->getHandler();
+        $handler->setResponse(new Response());
+
+        $response = $this->tracker->main($handler, $requestSet);
+
+        $this->assertSame('{"status":"error","tracked":0}', $response);
+    }
+
+    public function test_main_shouldReturnErrorResponse_IfNotAuthorized()
+    {
+        $this->injectRawDataToBulk($this->getDummyRequest(), true);
+
+        $handler = $this->getHandler();
+        $handler->setResponse(new Response());
+
+        $response = $this->tracker->main($handler, $this->getEmptyRequestSet());
+
+        $this->assertSame('{"status":"error","tracked":0}', $response);
+    }
+
+    public function test_main_shouldActuallyTrack()
+    {
+        $this->assertEmpty($this->getIdVisit(1));
+        $this->assertEmpty($this->getIdVisit(2));
+
+        $requestSet = $this->getEmptyRequestSet();
+        $this->tracker->main($this->getHandler(), $requestSet);
+
+        $this->assertCount(2, $requestSet->getRequests(), 'Nothing tracked because it could not find 2 requests');
+
+        $visit1 = $this->getIdVisit(1);
+        $visit2 = $this->getIdVisit(2);
+
+        $this->assertNotEmpty($visit1);
+        $this->assertEquals(1, $visit1['idsite']);
+        $this->assertNotEmpty($visit2);
+        $this->assertEquals(2, $visit2['idsite']);
+
+        $this->assertEmpty($this->getIdVisit(3));
+    }
+
+    private function getHandler()
+    {
+        return Tracker\Handler\Factory::make();
+    }
+
+    private function getEmptyRequestSet()
+    {
+        return new Tracker\RequestSet();
+    }
+
+    private function getIdVisit($idVisit)
+    {
+        return Tracker::getDatabase()->fetchRow("SELECT * FROM " . Common::prefixTable('log_visit') . " WHERE idvisit = ?", array($idVisit));
+    }
+
+}
\ No newline at end of file
diff --git a/plugins/BulkTracking/tests/System/TrackerTest.php b/plugins/BulkTracking/tests/System/TrackerTest.php
new file mode 100644
index 0000000000..5974a1acd5
--- /dev/null
+++ b/plugins/BulkTracking/tests/System/TrackerTest.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\BulkTracking\tests\System;
+
+use Piwik\Tests\Framework\Fixture;
+use Piwik\Tests\Framework\TestCase\SystemTestCase;
+
+/**
+ * @group BulkTracking
+ * @group TrackerTest
+ * @group Tracker
+ * @group Plugins
+ */
+class TrackerTest extends SystemTestCase
+{
+    public static $fixture = null;
+
+    /**
+     * @var \PiwikTracker
+     */
+    private $tracker;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $idSite = 1;
+        $dateTime = '2014-01-01 00:00:01';
+
+        if (!Fixture::siteCreated($idSite)) {
+            Fixture::createWebsite($dateTime);
+        }
+
+        $this->tracker = Fixture::getTracker($idSite, $dateTime, $defaultInit = true);
+        $this->tracker->enableBulkTracking();
+    }
+
+    public function test_response_ShouldContainBulkTrackingApiResponse()
+    {
+        $this->tracker->doTrackPageView('Test');
+        $this->tracker->doTrackPageView('Test');
+
+        $response = $this->tracker->doBulkTrack();
+
+        $this->assertEquals('{"status":"success","tracked":2}', $response);
+    }
+}
\ No newline at end of file
diff --git a/plugins/BulkTracking/tests/Unit/RequestsTest.php b/plugins/BulkTracking/tests/Unit/RequestsTest.php
new file mode 100644
index 0000000000..8a89e5c220
--- /dev/null
+++ b/plugins/BulkTracking/tests/Unit/RequestsTest.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\BulkTracking\tests\Unit;
+
+use Piwik\Plugins\BulkTracking\Tracker\Requests;
+use Piwik\Tests\Framework\TestCase\UnitTestCase;
+use Piwik\Tracker\Request;
+
+/**
+ * @group BulkTracking
+ * @group RequestsTest
+ * @group Plugins
+ */
+class RequestsTest extends UnitTestCase
+{
+    /**
+     * @var Requests
+     */
+    private $requests;
+
+    public function setUp()
+    {
+        parent::setUp();
+        $this->requests = new Requests();
+    }
+
+    public function test_isUsingBulkRequest_shouldReturnFalse_IfRequestIsEmpty()
+    {
+        $this->assertFalse($this->requests->isUsingBulkRequest(false));
+        $this->assertFalse($this->requests->isUsingBulkRequest(null));
+        $this->assertFalse($this->requests->isUsingBulkRequest(''));
+        $this->assertFalse($this->requests->isUsingBulkRequest(0));
+    }
+
+    public function test_isUsingBulkRequest_shouldReturnFalse_IfRequestIsNotABulkRequest()
+    {
+        $this->assertFalse($this->requests->isUsingBulkRequest(5));
+        $this->assertFalse($this->requests->isUsingBulkRequest('test'));
+        $this->assertFalse($this->requests->isUsingBulkRequest('requests'));
+        $this->assertFalse($this->requests->isUsingBulkRequest('{"test": "val", "request:" []}'));
+        $this->assertFalse($this->requests->isUsingBulkRequest('[5, 10, "request"]'));
+    }
+
+    public function test_isUsingBulkRequest_shouldReturnTrue_IfRequestIsABulkRequest()
+    {
+        $request = $this->buildRequestRawData(array(array('idsite' => '1')));
+        $this->assertTrue($this->requests->isUsingBulkRequest($request));
+
+        // don't know why this one is supposed to count as bulk request!
+        $this->assertTrue($this->requests->isUsingBulkRequest("{'requests'"));
+    }
+
+    public function test_getRequestsArrayFromBulkRequest_ShouldFindRequestsAndEmptyTokenAndItShouldTrimWhitespaceFromRawData()
+    {
+        $requests = array(array('idsite' => '1'), array('idsite' => '2'));
+        $request  = $this->buildRequestRawData($requests);
+
+        $result   = $this->requests->getRequestsArrayFromBulkRequest(' ' . $request . '     ');
+
+        $expected = array(array(array('idsite' => '1'), array('idsite' => '2')), '');
+        $this->assertEquals($expected, $result);
+    }
+
+    public function test_getRequestsArrayFromBulkRequest_shouldRecognize()
+    {
+        $token = md5('2');
+
+        $request  = $this->buildRequestRawData(array(), $token);
+        $result   = $this->requests->getRequestsArrayFromBulkRequest($request);
+
+        $expected = array(array(), $token);
+        $this->assertEquals($expected, $result);
+    }
+
+    public function test_initRequestsAndTokenAuth_NoRequestsSetShouldStillFindToken()
+    {
+        $token = md5('2');
+
+        $request  = json_encode(array('requests' => array(), 'token_auth' => $token));
+        $result   = $this->requests->initRequestsAndTokenAuth($request);
+
+        $expected = array(array(), $token);
+        $this->assertEquals($expected, $result);
+    }
+
+    public function test_initRequestsAndTokenAuth_ShouldFindRequestsAndEmptyToken()
+    {
+        $params  = array(array('idsite' => '1'), array('idsite' => '2'));
+        $request = $this->buildRequestRawData($params);
+
+        $result  = $this->requests->initRequestsAndTokenAuth($request);
+
+        /** @var Request[] $requests */
+        $requests  = $result[0];
+        $tokenAuth = $result[1];
+
+        $this->assertEquals('', $tokenAuth); // none was set
+
+        $this->assertEquals(array('idsite' => '1'), $requests[0]->getParams());
+        $this->assertEquals('', $requests[0]->getTokenAuth());
+        $this->assertEquals(array('idsite' => '2'), $requests[1]->getParams());
+        $this->assertEquals('', $requests[1]->getTokenAuth());
+        $this->assertCount(2, $requests);
+    }
+
+    public function test_initRequestsAndTokenAuth_ShouldFindRequestsAndASetTokenAndPassItToRequestInstances()
+    {
+        $token = md5(2);
+        $params  = array(array('idsite' => '1'), array('idsite' => '2'));
+        $request = $this->buildRequestRawData($params, $token);
+
+        $result  = $this->requests->initRequestsAndTokenAuth($request);
+
+        /** @var Request[] $requests */
+        $requests  = $result[0];
+
+        $this->assertEquals($token, $result[1]);
+        $this->assertEquals($token, $requests[0]->getTokenAuth());
+        $this->assertEquals($token, $requests[1]->getTokenAuth());
+    }
+
+    public function test_initRequestsAndTokenAuth_ShouldIgnoreEmptyUrls()
+    {
+        $token = md5(2);
+        $params  = array(array('idsite' => '1'), '', array('idsite' => '2'));
+        $request = $this->buildRequestRawData($params, $token);
+
+        $result  = $this->requests->initRequestsAndTokenAuth($request);
+
+        /** @var Request[] $requests */
+        $requests  = $result[0];
+
+        $this->assertEquals(array('idsite' => '1'), $requests[0]->getParams());
+        $this->assertEquals(array('idsite' => '2'), $requests[1]->getParams());
+        $this->assertCount(2, $requests);
+    }
+
+    public function test_initRequestsAndTokenAuth_ShouldResolveUrls()
+    {
+        $token = md5(2);
+        $params  = array('piwik.php?idsite=1', '', 'piwik.php?idsite=3&rec=0', array('idsite' => '2'));
+        $request = $this->buildRequestRawData($params, $token);
+
+        $result  = $this->requests->initRequestsAndTokenAuth($request);
+
+        /** @var Request[] $requests */
+        $requests  = $result[0];
+
+        $this->assertEquals(array('idsite' => '1'), $requests[0]->getParams());
+        $this->assertEquals(array('idsite' => '3', 'rec' => '0'), $requests[1]->getParams());
+        $this->assertEquals(array('idsite' => '2'), $requests[2]->getParams());
+        $this->assertCount(3, $requests);
+    }
+
+    private function buildRequestRawData($requests, $token = null)
+    {
+        $params = array('requests' => $requests);
+
+        if (!empty($token)) {
+            $params['token_auth'] = $token;
+        }
+
+        return json_encode($params);
+    }
+
+}
diff --git a/plugins/BulkTracking/tests/Unit/ResponseTest.php b/plugins/BulkTracking/tests/Unit/ResponseTest.php
new file mode 100644
index 0000000000..9da1e9a6b3
--- /dev/null
+++ b/plugins/BulkTracking/tests/Unit/ResponseTest.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\BulkTracking\tests\Unit;
+
+use Piwik\Plugins\BulkTracking\Tracker\Response;
+use Piwik\Tests\Framework\Mock\Tracker;
+use Piwik\Tests\Framework\TestCase\UnitTestCase;
+use Exception;
+
+class TestResponse extends Response {
+
+    protected function logExceptionToErrorLog(Exception $e)
+    {
+        // prevent console from outputting the error_log message
+    }
+}
+
+/**
+ * @group BulkTracking
+ * @group ResponseTest
+ * @group Plugins
+ */
+class ResponseTest extends UnitTestCase
+{
+    /**
+     * @var TestResponse
+     */
+    private $response;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->response = new TestResponse();
+        $this->response->init(new Tracker());
+    }
+
+    public function test_outputException_shouldOutputBulkResponse()
+    {
+        $tracker = $this->getTrackerWithCountedRequests();
+
+        $this->response->outputException($tracker, new Exception('My Custom Message'), 400);
+        $content = $this->response->getOutput();
+
+        $this->assertEquals('{"status":"error","tracked":5}', $content);
+    }
+
+    public function test_outputException_shouldOutputDebugMessageIfEnabled()
+    {
+        $tracker = $this->getTrackerWithCountedRequests();
+        $tracker->enableDebugMode();
+
+        $this->response->outputException($tracker, new Exception('My Custom Message'), 400);
+        $content = $this->response->getOutput();
+
+        $this->assertStringStartsWith('{"status":"error","tracked":5,"message":"My Custom Message\n', $content);
+    }
+
+    public function test_outputResponse_shouldOutputBulkResponse()
+    {
+        $tracker = $this->getTrackerWithCountedRequests();
+
+        $this->response->outputResponse($tracker);
+        $content = $this->response->getOutput();
+
+        $this->assertEquals('{"status":"success","tracked":5}', $content);
+    }
+
+    public function test_outputResponse_shouldNotOutputAnything_IfExceptionResponseAlreadySent()
+    {
+        $tracker = $this->getTrackerWithCountedRequests();
+
+        $this->response->outputException($tracker, new Exception('My Custom Message'), 400);
+        $this->response->outputResponse($tracker);
+        $content = $this->response->getOutput();
+
+        $this->assertEquals('{"status":"error","tracked":5}', $content);
+    }
+
+    private function getTrackerWithCountedRequests()
+    {
+        $tracker = new Tracker();
+        $tracker->setCountOfLoggedRequests(5);
+        return $tracker;
+    }
+
+}
diff --git a/plugins/Contents/API.php b/plugins/Contents/API.php
index 43d07b7cdc..968231a702 100644
--- a/plugins/Contents/API.php
+++ b/plugins/Contents/API.php
@@ -37,6 +37,17 @@ class API extends \Piwik\Plugin\API
         Piwik::checkUserHasViewAccess($idSite);
         $recordName = Dimensions::getRecordNameForAction($name);
         $dataTable  = Archive::getDataTableFromArchive($recordName, $idSite, $period, $date, $segment, $expanded, $idSubtable);
+
+        if (empty($idSubtable)) {
+            $dataTable->filter('AddSegmentValue', array(function ($label) {
+                if ($label === Archiver::CONTENT_PIECE_NOT_SET) {
+                    return false;
+                }
+
+                return $label;
+            }));
+        }
+
         $this->filterDataTable($dataTable);
         return $dataTable;
     }
diff --git a/plugins/Contents/Archiver.php b/plugins/Contents/Archiver.php
index 55668b4c3a..6d3a2e05ce 100644
--- a/plugins/Contents/Archiver.php
+++ b/plugins/Contents/Archiver.php
@@ -117,7 +117,7 @@ class Archiver extends \Piwik\Plugin\Archiver
             $rankingQuery->addColumn(array(Metrics::INDEX_CONTENT_NB_IMPRESSIONS, Metrics::INDEX_NB_VISITS), 'sum');
         }
 
-        $resultSet = $this->archiveDayQueryProcess($select, $from, $where, $orderBy, $groupBy, $rankingQuery);
+        $resultSet = $this->archiveDayQueryProcess($select, $from, $where, $groupBy, $orderBy, $rankingQuery);
 
         while ($row = $resultSet->fetch()) {
             $this->aggregateImpressionRow($row);
@@ -174,21 +174,21 @@ class Archiver extends \Piwik\Plugin\Archiver
             $rankingQuery->addColumn(array(Metrics::INDEX_CONTENT_NB_INTERACTIONS), 'sum');
         }
 
-        $resultSet = $this->archiveDayQueryProcess($select, $from, $where, $orderBy, $groupBy, $rankingQuery);
+        $resultSet = $this->archiveDayQueryProcess($select, $from, $where, $groupBy, $orderBy, $rankingQuery);
 
         while ($row = $resultSet->fetch()) {
             $this->aggregateInteractionRow($row);
         }
     }
 
-    private function archiveDayQueryProcess($select, $from, $where, $orderBy, $groupBy, RankingQuery $rankingQuery)
+    private function archiveDayQueryProcess($select, $from, $where, $groupBy, $orderBy, RankingQuery $rankingQuery)
     {
         // get query with segmentation
         $query = $this->getLogAggregator()->generateQuery($select, $from, $where, $groupBy, $orderBy);
 
         // apply ranking query
         if ($rankingQuery) {
-            $query['sql'] = $rankingQuery->generateQuery($query['sql']);
+            $query['sql'] = $rankingQuery->generateRankingQuery($query['sql']);
         }
 
         // get result
diff --git a/plugins/Contents/lang/ar.json b/plugins/Contents/lang/ar.json
new file mode 100644
index 0000000000..4896901163
--- /dev/null
+++ b/plugins/Contents/lang/ar.json
@@ -0,0 +1,9 @@
+{
+    "Contents": {
+        "ContentPiece": "جزء من المحتوى",
+        "Contents": "عنوان المحتوى",
+        "Impressions": "طباعة",
+        "Interaction": "المعاملة",
+        "InteractionRate": "نسبة المشاركة"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Contents/lang/ca.json b/plugins/Contents/lang/ca.json
new file mode 100644
index 0000000000..f5e51efbc9
--- /dev/null
+++ b/plugins/Contents/lang/ca.json
@@ -0,0 +1,6 @@
+{
+    "Contents": {
+        "ContentName": "Nom del contingut",
+        "Contents": "Continguts"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Contents/lang/es.json b/plugins/Contents/lang/es.json
index 3eb3bec9e7..af41fb774c 100644
--- a/plugins/Contents/lang/es.json
+++ b/plugins/Contents/lang/es.json
@@ -1,6 +1,11 @@
 {
     "Contents": {
         "ContentName": "Nombre del contenido",
+        "ContentPiece": "Pieza de Contenido",
+        "Contents": "Contenidos",
+        "ContentTarget": "Contenido de objetivo",
+        "Impressions": "Impresiones",
+        "InteractionRate": "Nivel de interaccion",
         "Interactions": "Interacciones"
     }
 }
\ No newline at end of file
diff --git a/plugins/Contents/lang/nb.json b/plugins/Contents/lang/nb.json
new file mode 100644
index 0000000000..28454917f6
--- /dev/null
+++ b/plugins/Contents/lang/nb.json
@@ -0,0 +1,7 @@
+{
+    "Contents": {
+        "Contents": "Innhold",
+        "Interaction": "Interaksjon",
+        "Interactions": "Interaksjoner"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Contents/lang/ru.json b/plugins/Contents/lang/ru.json
new file mode 100644
index 0000000000..87340c750d
--- /dev/null
+++ b/plugins/Contents/lang/ru.json
@@ -0,0 +1,8 @@
+{
+    "Contents": {
+        "ContentName": "Название публикации",
+        "ContentPiece": "Часть публикации",
+        "Contents": "Публикации",
+        "ContentTarget": "Цель публикации"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Contents/lang/sl.json b/plugins/Contents/lang/sl.json
new file mode 100644
index 0000000000..89553ad9d3
--- /dev/null
+++ b/plugins/Contents/lang/sl.json
@@ -0,0 +1,12 @@
+{
+    "Contents": {
+        "ContentName": "Ime vsebine",
+        "ContentPiece": "Del vsebine",
+        "Contents": "Vsebine",
+        "ContentTarget": "Cilj vsebine",
+        "Impressions": "Ogledi",
+        "Interaction": "Interakcija",
+        "InteractionRate": "Stopnja interakcij",
+        "Interactions": "Interakcije"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Contents/lang/sv.json b/plugins/Contents/lang/sv.json
new file mode 100644
index 0000000000..f748b91680
--- /dev/null
+++ b/plugins/Contents/lang/sv.json
@@ -0,0 +1,12 @@
+{
+    "Contents": {
+        "ContentName": "Namn på innehåll",
+        "ContentPiece": "Innehållsdel",
+        "Contents": "Innehåll",
+        "ContentTarget": "Innehållsmål",
+        "Impressions": "Visningar",
+        "Interaction": "Interaktion",
+        "InteractionRate": "Andel interaktioner",
+        "Interactions": "Interaktioner"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Contents/plugin.json b/plugins/Contents/plugin.json
index dbfd2b145f..b023382486 100644
--- a/plugins/Contents/plugin.json
+++ b/plugins/Contents/plugin.json
@@ -1,7 +1,7 @@
 {
  "name": "Contents",
  "version": "0.1.0",
- "description": "Content and banner tracking",
+ "description": "Content and banner tracking lets you measure the performance (views, clicks, CTR) of any piece of content on your pages (Banner ad, image, any item).",
  "theme": false,
  "authors": [
      {
diff --git a/plugins/Contents/tests/System/ContentsTest.php b/plugins/Contents/tests/System/ContentsTest.php
index b555cf7962..ccb7a69086 100644
--- a/plugins/Contents/tests/System/ContentsTest.php
+++ b/plugins/Contents/tests/System/ContentsTest.php
@@ -47,12 +47,13 @@ class ContentsTest extends SystemTestCase
     protected function setup()
     {
         parent::setup();
-        Translate::reloadLanguage('en');
+        Translate::loadAllTranslations();
     }
 
     protected function tearDown()
     {
         parent::tearDown();
+        Translate::reset();
     }
 
     public function getApiForTesting()
diff --git a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml
index d3e1af1e2e..311ac59259 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml
@@ -58,14 +58,17 @@
 		<result prettyDate="Sunday 3 January 2010">
 			<row>
 				<contentTarget>http://www.example.com</contentTarget>
+				<segment>contentName==ImageAd</segment>
 				
 			</row>
 			<row>
 				<contentTarget>http://piwik.org/</contentTarget>
+				<segment>contentName==Text+Ad</segment>
 				
 			</row>
 			<row>
 				<contentTarget />
+				<segment>contentName==Video+Ad</segment>
 				
 			</row>
 		</result>
diff --git a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml
index 402909f7d5..2f19e727d9 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml
@@ -82,22 +82,27 @@
 		<result prettyDate="Sunday 3 January 2010">
 			<row>
 				<contentTarget>http://piwik.org/download</contentTarget>
+				<segment>contentPiece==Click+to+download+Piwik+now</segment>
 				
 			</row>
 			<row>
 				<contentTarget>http://www.example.com</contentTarget>
+				<segment>contentPiece==%2Fpath%2Fad.jpg</segment>
 				
 			</row>
 			<row>
 				<contentTarget>http://www.example.com</contentTarget>
+				<segment>contentPiece==%2Fpath%2Fad2.jpg</segment>
 				
 			</row>
 			<row>
 				<contentTarget>http://piwik.org/</contentTarget>
+				<segment>contentPiece==Click+NOW</segment>
 				
 			</row>
 			<row>
 				<contentTarget />
+				<segment>contentPiece==movie.mov</segment>
 				
 			</row>
 			<row>
@@ -106,6 +111,7 @@
 			</row>
 			<row>
 				<contentTarget />
+				<segment>contentPiece==Unknown</segment>
 				
 			</row>
 		</result>
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_day.xml
index fde347f2b5..c93f842124 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_day.xml
@@ -21,5 +21,6 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0.333</avg_time_generation>
 		<url>http://www.example.org/page</url>
+		<segment>pageUrl==http%3A%2F%2Fwww.example.org%2Fpage</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_month.xml
index 3dc775d40a..c24ffddb6c 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_month.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_month.xml
@@ -21,5 +21,6 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0.333</avg_time_generation>
 		<url>http://www.example.org/page</url>
+		<segment>pageUrl==http%3A%2F%2Fwww.example.org%2Fpage</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_day.xml
index 957c6fa85a..e81ffde69d 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_day.xml
@@ -8,6 +8,7 @@
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>25%</interaction_rate>
 		<contentTarget>http://www.example.com</contentTarget>
+		<segment>contentName==ImageAd</segment>
 	</row>
 	<row>
 		<label>Text Ad</label>
@@ -17,6 +18,7 @@
 		<nb_interactions>4</nb_interactions>
 		<interaction_rate>66.67%</interaction_rate>
 		<contentTarget>http://piwik.org/</contentTarget>
+		<segment>contentName==Text+Ad</segment>
 	</row>
 	<row>
 		<label>Video Ad</label>
@@ -26,5 +28,6 @@
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
 		<contentTarget />
+		<segment>contentName==Video+Ad</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_month.xml
index 44bfdfd54e..069388968b 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_month.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_month.xml
@@ -8,6 +8,7 @@
 		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
 		<interaction_rate>25%</interaction_rate>
 		<contentTarget>http://www.example.com</contentTarget>
+		<segment>contentName==ImageAd</segment>
 	</row>
 	<row>
 		<label>Text Ad</label>
@@ -17,6 +18,7 @@
 		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<interaction_rate>66.67%</interaction_rate>
 		<contentTarget>http://piwik.org/</contentTarget>
+		<segment>contentName==Text+Ad</segment>
 	</row>
 	<row>
 		<label>Video Ad</label>
@@ -26,5 +28,6 @@
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<interaction_rate>0%</interaction_rate>
 		<contentTarget />
+		<segment>contentName==Video+Ad</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml
index 8927f8a8ec..a7e56b692a 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml
@@ -8,6 +8,7 @@
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>50%</interaction_rate>
 		<contentTarget>http://piwik.org/download</contentTarget>
+		<segment>contentPiece==Click+to+download+Piwik+now</segment>
 	</row>
 	<row>
 		<label>/path/ad.jpg</label>
@@ -17,6 +18,7 @@
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>100%</interaction_rate>
 		<contentTarget>http://www.example.com</contentTarget>
+		<segment>contentPiece==%2Fpath%2Fad.jpg</segment>
 	</row>
 	<row>
 		<label>/path/ad2.jpg</label>
@@ -26,6 +28,7 @@
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
 		<contentTarget>http://www.example.com</contentTarget>
+		<segment>contentPiece==%2Fpath%2Fad2.jpg</segment>
 	</row>
 	<row>
 		<label>Click NOW</label>
@@ -35,6 +38,7 @@
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>100%</interaction_rate>
 		<contentTarget>http://piwik.org/</contentTarget>
+		<segment>contentPiece==Click+NOW</segment>
 	</row>
 	<row>
 		<label>movie.mov</label>
@@ -44,6 +48,7 @@
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
 		<contentTarget />
+		<segment>contentPiece==movie.mov</segment>
 	</row>
 	<row>
 		<label>Content Piece not defined</label>
@@ -62,5 +67,6 @@
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
 		<contentTarget />
+		<segment>contentPiece==Unknown</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml
index b604544417..56da535eeb 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml
@@ -8,6 +8,7 @@
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 		<interaction_rate>50%</interaction_rate>
 		<contentTarget>http://piwik.org/download</contentTarget>
+		<segment>contentPiece==Click+to+download+Piwik+now</segment>
 	</row>
 	<row>
 		<label>/path/ad.jpg</label>
@@ -17,6 +18,7 @@
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<interaction_rate>100%</interaction_rate>
 		<contentTarget>http://www.example.com</contentTarget>
+		<segment>contentPiece==%2Fpath%2Fad.jpg</segment>
 	</row>
 	<row>
 		<label>/path/ad2.jpg</label>
@@ -26,6 +28,7 @@
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<interaction_rate>0%</interaction_rate>
 		<contentTarget>http://www.example.com</contentTarget>
+		<segment>contentPiece==%2Fpath%2Fad2.jpg</segment>
 	</row>
 	<row>
 		<label>Click NOW</label>
@@ -35,6 +38,7 @@
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<interaction_rate>100%</interaction_rate>
 		<contentTarget>http://piwik.org/</contentTarget>
+		<segment>contentPiece==Click+NOW</segment>
 	</row>
 	<row>
 		<label>movie.mov</label>
@@ -44,6 +48,7 @@
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<interaction_rate>0%</interaction_rate>
 		<contentTarget />
+		<segment>contentPiece==movie.mov</segment>
 	</row>
 	<row>
 		<label>Content Piece not defined</label>
@@ -62,5 +67,6 @@
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<interaction_rate>0%</interaction_rate>
 		<contentTarget />
+		<segment>contentPiece==Unknown</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
index 7b62e398c2..aac8a12ee8 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
@@ -17,6 +17,7 @@
 				<timeSpent>0</timeSpent>
 				<timeSpentPretty>0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -26,8 +27,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -41,31 +40,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>271</visitDuration>
 		<visitDurationPretty>4 min 31s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -77,21 +75,26 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -115,6 +118,7 @@
 				<timeSpent>0</timeSpent>
 				<timeSpentPretty>0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -124,8 +128,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -139,31 +141,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>271</visitDuration>
 		<visitDurationPretty>4 min 31s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -175,17 +176,22 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
index 7b62e398c2..aac8a12ee8 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
@@ -17,6 +17,7 @@
 				<timeSpent>0</timeSpent>
 				<timeSpentPretty>0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -26,8 +27,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -41,31 +40,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>271</visitDuration>
 		<visitDurationPretty>4 min 31s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -77,21 +75,26 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -115,6 +118,7 @@
 				<timeSpent>0</timeSpent>
 				<timeSpentPretty>0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -124,8 +128,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -139,31 +141,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>271</visitDuration>
 		<visitDurationPretty>4 min 31s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -175,17 +176,22 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
index 7b62e398c2..aac8a12ee8 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
@@ -17,6 +17,7 @@
 				<timeSpent>0</timeSpent>
 				<timeSpentPretty>0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -26,8 +27,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -41,31 +40,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>271</visitDuration>
 		<visitDurationPretty>4 min 31s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -77,21 +75,26 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -115,6 +118,7 @@
 				<timeSpent>0</timeSpent>
 				<timeSpentPretty>0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -124,8 +128,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -139,31 +141,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>271</visitDuration>
 		<visitDurationPretty>4 min 31s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -175,17 +176,22 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml
index 5212486a1c..f0c23afff4 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml
@@ -8,5 +8,6 @@
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>50%</interaction_rate>
 		<contentTarget>http://www.example.com</contentTarget>
+		<segment>contentName==ImageAd</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml
index ac1d39a577..ae70087a09 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml
@@ -8,6 +8,7 @@
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>100%</interaction_rate>
 		<contentTarget>http://www.example.com</contentTarget>
+		<segment>contentPiece==%2Fpath%2Fad.jpg</segment>
 	</row>
 	<row>
 		<label>/path/ad2.jpg</label>
@@ -17,5 +18,6 @@
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
 		<contentTarget>http://www.example.com</contentTarget>
+		<segment>contentPiece==%2Fpath%2Fad2.jpg</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
index 7b62e398c2..aac8a12ee8 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
@@ -17,6 +17,7 @@
 				<timeSpent>0</timeSpent>
 				<timeSpentPretty>0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -26,8 +27,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -41,31 +40,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>271</visitDuration>
 		<visitDurationPretty>4 min 31s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -77,21 +75,26 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -115,6 +118,7 @@
 				<timeSpent>0</timeSpent>
 				<timeSpentPretty>0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -124,8 +128,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -139,31 +141,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>271</visitDuration>
 		<visitDurationPretty>4 min 31s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -175,17 +176,22 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml
index 17b781db1c..1f75bfaa1b 100644
--- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml
+++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml
@@ -8,6 +8,7 @@
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>25%</interaction_rate>
 		<contentTarget>http://www.example.com</contentTarget>
+		<segment>contentName==ImageAd</segment>
 	</row>
 	<row>
 		<label>Text Ad</label>
@@ -17,5 +18,6 @@
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>50%</interaction_rate>
 		<contentTarget>http://piwik.org/download</contentTarget>
+		<segment>contentName==Text+Ad</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml
index 7df6e4f0e1..98fbf6ad4a 100644
--- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml
+++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml
@@ -8,6 +8,7 @@
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>50%</interaction_rate>
 		<contentTarget>http://piwik.org/download</contentTarget>
+		<segment>contentPiece==Click+to+download+Piwik+now</segment>
 	</row>
 	<row>
 		<label>/path/ad.jpg</label>
@@ -17,6 +18,7 @@
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>100%</interaction_rate>
 		<contentTarget>http://www.example.com</contentTarget>
+		<segment>contentPiece==%2Fpath%2Fad.jpg</segment>
 	</row>
 	<row>
 		<label>/path/ad2.jpg</label>
@@ -26,6 +28,7 @@
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
 		<contentTarget>http://www.example.com</contentTarget>
+		<segment>contentPiece==%2Fpath%2Fad2.jpg</segment>
 	</row>
 	<row>
 		<label>Content Piece not defined</label>
@@ -44,5 +47,6 @@
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
 		<contentTarget />
+		<segment>contentPiece==Unknown</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
index 7b62e398c2..aac8a12ee8 100644
--- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
@@ -17,6 +17,7 @@
 				<timeSpent>0</timeSpent>
 				<timeSpentPretty>0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -26,8 +27,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -41,31 +40,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>271</visitDuration>
 		<visitDurationPretty>4 min 31s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -77,21 +75,26 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -115,6 +118,7 @@
 				<timeSpent>0</timeSpent>
 				<timeSpentPretty>0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -124,8 +128,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -139,31 +141,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>271</visitDuration>
 		<visitDurationPretty>4 min 31s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -175,17 +176,22 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
diff --git a/plugins/CoreAdminHome/API.php b/plugins/CoreAdminHome/API.php
index 92ed49b1b0..60ba204d45 100644
--- a/plugins/CoreAdminHome/API.php
+++ b/plugins/CoreAdminHome/API.php
@@ -9,14 +9,14 @@
 namespace Piwik\Plugins\CoreAdminHome;
 
 use Exception;
+use Piwik\Container\StaticContainer;
 use Piwik\DataAccess\ArchiveInvalidator;
 use Piwik\Db;
 use Piwik\Piwik;
+use Piwik\Scheduler\Scheduler;
 use Piwik\Site;
-use Piwik\TaskScheduler;
 
 /**
- * @hideExceptForSuperUser
  * @method static \Piwik\Plugins\CoreAdminHome\API getInstance()
  */
 class API extends \Piwik\Plugin\API
@@ -25,23 +25,16 @@ class API extends \Piwik\Plugin\API
      * Will run all scheduled tasks due to run at this time.
      *
      * @return array
+     * @hideExceptForSuperUser
      */
     public function runScheduledTasks()
     {
         Piwik::checkUserHasSuperUserAccess();
-        return TaskScheduler::runTasks();
-    }
 
-    /**
-     * Return true if plugin is activated, false otherwise
-     *
-     * @param string $pluginName
-     * @return bool
-     */
-    public function isPluginActivated($pluginName)
-    {
-        Piwik::checkUserHasSomeViewAccess();
-        return \Piwik\Plugin\Manager::getInstance()->isPluginActivated($pluginName);
+        /** @var Scheduler $scheduler */
+        $scheduler = StaticContainer::getContainer()->get('Piwik\Scheduler\Scheduler');
+
+        return $scheduler->run();
     }
 
     /**
@@ -59,11 +52,12 @@ class API extends \Piwik\Plugin\API
      *
      * @param string $idSites Comma separated list of idSite that have had data imported for the specified dates
      * @param string $dates Comma separated list of dates to invalidate for all these websites
-     * @param string $period If specified (one of day, week, month, year, range) it will only delete archives for this period.
+     * @param string $period If specified (one of day, week, month, year, range) it will only invalidates archives for this period.
      *                      Note: because week, month, year, range reports aggregate day reports then you need to specifically invalidate day reports to see
      *                      other periods reports processed..
      * @throws Exception
      * @return array
+     * @hideExceptForSuperUser
      */
     public function invalidateArchivedReports($idSites, $dates, $period = false)
     {
diff --git a/plugins/CoreAdminHome/Commands/FixDuplicateLogActions.php b/plugins/CoreAdminHome/Commands/FixDuplicateLogActions.php
new file mode 100644
index 0000000000..47a058c7ad
--- /dev/null
+++ b/plugins/CoreAdminHome/Commands/FixDuplicateLogActions.php
@@ -0,0 +1,200 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\CoreAdminHome\Commands;
+
+use Piwik\Common;
+use Piwik\Container\StaticContainer;
+use Piwik\DataAccess\Actions;
+use Piwik\DataAccess\ArchiveInvalidator;
+use Piwik\Plugin\ConsoleCommand;
+use Piwik\Plugins\CoreAdminHome\Model\DuplicateActionRemover;
+use Piwik\Timer;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * Finds duplicate actions rows in log_action and removes them. Fixes references to duplicate
+ * actions in the log_link_visit_action table, log_conversion table, and log_conversion_item
+ * table.
+ *
+ * Prior to version 2.11, there was a race condition in the tracker where it was possible for
+ * two or more actions with the same name and type to be inserted simultaneously. This resulted
+ * in inaccurate data. A Piwik database with this problem can be fixed using this class.
+ *
+ * With version 2.11 and above, it is still possible for duplicate actions to be inserted, but
+ * ONLY if the tracker's PHP process fails suddenly right after inserting an action. This is
+ * very rare, and even if it does happen, report data will not be affected, but the extra
+ * actions can be deleted w/ this class.
+ */
+class FixDuplicateLogActions extends ConsoleCommand
+{
+    /**
+     * Used to invalidate archives. Only used if $shouldInvalidateArchives is true.
+     *
+     * @var ArchiveInvalidator
+     */
+    private $archiveInvalidator;
+
+    /**
+     * DAO used to find duplicate actions in log_action and fix references to them in other tables.
+     *
+     * @var DuplicateActionRemover
+     */
+    private $duplicateActionRemover;
+
+    /**
+     * DAO used to remove actions from the log_action table.
+     *
+     * @var Actions
+     */
+    private $actionsAccess;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * Constructor.
+     *
+     * @param ArchiveInvalidator $invalidator
+     * @param DuplicateActionRemover $duplicateActionRemover
+     * @param Actions $actionsAccess
+     * @param LoggerInterface $logger
+     */
+    public function __construct(ArchiveInvalidator $invalidator = null, DuplicateActionRemover $duplicateActionRemover = null,
+                                Actions $actionsAccess = null, LoggerInterface $logger = null)
+    {
+        parent::__construct();
+
+        $this->archiveInvalidator = $invalidator ?: new ArchiveInvalidator();
+        $this->duplicateActionRemover = $duplicateActionRemover ?: new DuplicateActionRemover();
+        $this->actionsAccess = $actionsAccess ?: new Actions();
+        $this->logger = $logger ?: StaticContainer::get('Psr\Log\LoggerInterface');
+    }
+
+    protected function configure()
+    {
+        $this->setName('core:fix-duplicate-log-actions');
+        $this->addOption('invalidate-archives', null, InputOption::VALUE_NONE, "If supplied, archives for logs that use duplicate actions will be invalidated."
+            . " On the next cron archive run, the reports for those dates will be re-processed.");
+        $this->setDescription('Removes duplicates in the log action table and fixes references to the duplicates in '
+                            . 'related tables. NOTE: This action can take a long time to run!');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $invalidateArchives = $input->getOption('invalidate-archives');
+
+        $timer = new Timer();
+
+        $duplicateActions = $this->duplicateActionRemover->getDuplicateIdActions();
+        if (empty($duplicateActions)) {
+            $output->writeln("Found no duplicate actions.");
+            return;
+        }
+
+        $output->writeln("<info>Found " . count($duplicateActions) . " actions with duplicates.</info>");
+
+        list($numberRemoved, $allArchivesAffected) = $this->fixDuplicateActionReferences($duplicateActions, $output);
+
+        $this->deleteDuplicatesFromLogAction($output, $duplicateActions);
+
+        if ($invalidateArchives) {
+            $this->invalidateArchivesUsingActionDuplicates($allArchivesAffected, $output);
+        } else {
+            $this->printAffectedArchives($allArchivesAffected, $output);
+        }
+
+        $logActionTable = Common::prefixTable('log_action');
+        $this->writeSuccessMessage($output, array(
+            "Found and deleted $numberRemoved duplicate action entries in the $logActionTable table.",
+            "References in log_link_visit_action, log_conversion and log_conversion_item were corrected.",
+            $timer->__toString()
+        ));
+    }
+
+    private function invalidateArchivesUsingActionDuplicates($archivesAffected, OutputInterface $output)
+    {
+        $output->write("Invalidating archives affected by duplicates fixed...");
+        foreach ($archivesAffected as $archiveInfo) {
+            $this->archiveInvalidator->markArchivesAsInvalidated(
+                array($archiveInfo['idsite']), $archiveInfo['server_time'], $period = false);
+        }
+        $output->writeln("Done.");
+    }
+
+    private function printAffectedArchives($allArchivesAffected, OutputInterface $output)
+    {
+        $output->writeln("The following archives used duplicate actions and should be invalidated if you want correct reports:");
+        foreach ($allArchivesAffected as $archiveInfo) {
+            $output->writeln("\t[ idSite = {$archiveInfo['idsite']}, date = {$archiveInfo['server_time']} ]");
+        }
+    }
+
+    private function fixDuplicateActionReferences($duplicateActions, OutputInterface $output)
+    {
+        $dupeCount = count($duplicateActions);
+
+        $numberRemoved = 0;
+        $allArchivesAffected = array();
+
+        foreach ($duplicateActions as $index => $dupeInfo) {
+            $name = $dupeInfo['name'];
+            $toIdAction = $dupeInfo['idaction'];
+            $fromIdActions = $dupeInfo['duplicateIdActions'];
+
+            $numberRemoved += count($fromIdActions);
+
+            $output->writeln("<info>[$index / $dupeCount]</info> Fixing duplicates for '$name'");
+
+            $this->logger->debug("  idaction = {idaction}, duplicate idactions = {duplicateIdActions}", array(
+                'idaction' => $toIdAction,
+                'duplicateIdActions' => $fromIdActions
+            ));
+
+            foreach (DuplicateActionRemover::$tablesWithIdActionColumns as $table) {
+                $archivesAffected = $this->fixDuplicateActionsInTable($output, $table, $toIdAction, $fromIdActions);
+                $allArchivesAffected = array_merge($allArchivesAffected, $archivesAffected);
+            }
+        }
+
+        $allArchivesAffected = array_values(array_unique($allArchivesAffected, SORT_REGULAR));
+
+        return array($numberRemoved, $allArchivesAffected);
+    }
+
+    private function fixDuplicateActionsInTable(OutputInterface $output, $table, $toIdAction, $fromIdActions)
+    {
+        $timer = new Timer();
+
+        $archivesAffected = $this->duplicateActionRemover->getSitesAndDatesOfRowsUsingDuplicates($table, $fromIdActions);
+
+        $this->duplicateActionRemover->fixDuplicateActionsInTable($table, $toIdAction, $fromIdActions);
+
+        $output->writeln("\tFixed duplicates in " . Common::prefixTable($table) . ". <comment>" . $timer->__toString() . "</comment>.");
+
+        return $archivesAffected;
+    }
+
+    private function deleteDuplicatesFromLogAction(OutputInterface $output, $duplicateActions)
+    {
+        $logActionTable = Common::prefixTable('log_action');
+        $output->writeln("<info>Deleting duplicate actions from $logActionTable...</info>");
+
+        $idActions = array();
+        foreach ($duplicateActions as $dupeInfo) {
+            $idActions = array_merge($idActions, $dupeInfo['duplicateIdActions']);
+        }
+
+        $this->actionsAccess->delete($idActions);
+    }
+}
\ No newline at end of file
diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php
index c03577e5e5..732639874a 100644
--- a/plugins/CoreAdminHome/Controller.php
+++ b/plugins/CoreAdminHome/Controller.php
@@ -18,6 +18,7 @@ use Piwik\Menu\MenuTop;
 use Piwik\Menu\MenuUser;
 use Piwik\Nonce;
 use Piwik\Piwik;
+use Piwik\Plugin\ControllerAdmin;
 use Piwik\Plugins\CorePluginsAdmin\UpdateCommunication;
 use Piwik\Plugins\CustomVariables\CustomVariables;
 use Piwik\Plugins\LanguagesManager\API as APILanguagesManager;
@@ -25,18 +26,30 @@ use Piwik\Plugins\LanguagesManager\LanguagesManager;
 use Piwik\Plugins\PrivacyManager\DoNotTrackHeaderChecker;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
 use Piwik\Settings\Manager as SettingsManager;
+use Piwik\Settings\SystemSetting;
+use Piwik\Settings\UserSetting;
 use Piwik\Site;
 use Piwik\Tracker\IgnoreCookie;
+use Piwik\Translation\Translator;
 use Piwik\Url;
 use Piwik\View;
 
-/**
- *
- */
-class Controller extends \Piwik\Plugin\ControllerAdmin
+class Controller extends ControllerAdmin
 {
     const SET_PLUGIN_SETTINGS_NONCE = 'CoreAdminHome.setPluginSettings';
 
+    /**
+     * @var Translator
+     */
+    private $translator;
+
+    public function __construct(Translator $translator)
+    {
+        $this->translator = $translator;
+
+        parent::__construct();
+    }
+
     public function index()
     {
         $this->redirectToIndex('UsersManager', 'userSettings');
@@ -45,7 +58,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
 
     public function generalSettings()
     {
-        Piwik::checkUserHasSomeAdminAccess();
+        Piwik::checkUserHasSuperUserAccess();
         $view = new View('@CoreAdminHome/generalSettings');
 
         if (Piwik::hasUserSuperUserAccess()) {
@@ -69,7 +82,53 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
         return $view->render();
     }
 
-    public function pluginSettings()
+    public function adminPluginSettings()
+    {
+        Piwik::checkUserHasSuperUserAccess();
+
+        $settings = $this->getPluginSettings();
+
+        $vars = array(
+            'nonce'                      => Nonce::getNonce(static::SET_PLUGIN_SETTINGS_NONCE),
+            'pluginsSettings'            => $this->getSettingsByType($settings, 'admin'),
+            'firstSuperUserSettingNames' => $this->getFirstSuperUserSettingNames($settings),
+            'mode' => 'admin'
+        );
+
+        return $this->renderTemplate('pluginSettings', $vars);
+    }
+
+    /**
+     * @param \Piwik\Plugin\Settings[] $pluginsSettings
+     * @return array   array([pluginName] => [])
+     */
+    private function getSettingsByType($pluginsSettings, $mode)
+    {
+        $byType = array();
+
+        foreach ($pluginsSettings as $pluginName => $pluginSettings) {
+            $settings = array();
+
+            foreach ($pluginSettings->getSettingsForCurrentUser() as $setting) {
+                if ('admin' === $mode && $setting instanceof SystemSetting) {
+                    $settings[] = $setting;
+                } elseif ('user' === $mode && $setting instanceof UserSetting) {
+                    $settings[] = $setting;
+                }
+            }
+
+            if (!empty($settings)) {
+                $byType[$pluginName] = array(
+                    'introduction' => $pluginSettings->getIntroduction(),
+                    'settings' => $settings
+                );
+            }
+        }
+
+        return $byType;
+    }
+
+    public function userPluginSettings()
     {
         Piwik::checkUserIsNotAnonymous();
 
@@ -77,8 +136,9 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
 
         $vars = array(
             'nonce'                      => Nonce::getNonce(static::SET_PLUGIN_SETTINGS_NONCE),
-            'pluginSettings'             => $settings,
-            'firstSuperUserSettingNames' => $this->getFirstSuperUserSettingNames($settings)
+            'pluginsSettings'            => $this->getSettingsByType($settings, 'user'),
+            'firstSuperUserSettingNames' => $this->getFirstSuperUserSettingNames($settings),
+            'mode' => 'user'
         );
 
         return $this->renderTemplate('pluginSettings', $vars);
@@ -123,7 +183,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
         if (!Nonce::verifyNonce(static::SET_PLUGIN_SETTINGS_NONCE, $nonce)) {
             return json_encode(array(
                 'result' => 'error',
-                'message' => Piwik::translate('General_ExceptionNonceMismatch')
+                'message' => $this->translator->translate('General_ExceptionNonceMismatch')
             ));
         }
 
@@ -160,7 +220,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
         } catch (Exception $e) {
             return json_encode(array(
                 'result' => 'error',
-                'message' => Piwik::translate('CoreAdminHome_PluginSettingsSaveFailed'))
+                'message' => $this->translator->translate('CoreAdminHome_PluginSettingsSaveFailed'))
             );
         }
 
diff --git a/plugins/CoreAdminHome/Menu.php b/plugins/CoreAdminHome/Menu.php
index 7926ff9cf5..7994979450 100644
--- a/plugins/CoreAdminHome/Menu.php
+++ b/plugins/CoreAdminHome/Menu.php
@@ -10,6 +10,8 @@ namespace Piwik\Plugins\CoreAdminHome;
 
 use Piwik\Db;
 use Piwik\Menu\MenuAdmin;
+use Piwik\Menu\MenuTop;
+use Piwik\Menu\MenuUser;
 use Piwik\Piwik;
 use Piwik\Settings\Manager as SettingsManager;
 
@@ -26,19 +28,46 @@ class Menu extends \Piwik\Plugin\Menu
             $menu->addDiagnosticItem(null, "", $order = 10);
             $menu->addDevelopmentItem(null, "", $order = 15);
 
-            $menu->addSettingsItem('CoreAdminHome_MenuGeneralSettings',
-                                   $this->urlForAction('generalSettings'),
-                                   $order = 6);
-            $menu->addManageItem('CoreAdminHome_TrackingCode',
-                                 $this->urlForAction('trackingCodeGenerator'),
-                                 $order = 4);
+            if (Piwik::hasUserSuperUserAccess()) {
+                $menu->addSettingsItem('General_General',
+                    $this->urlForAction('generalSettings'),
+                    $order = 6);
+            }
         }
 
-        if (SettingsManager::hasPluginsSettingsForCurrentUser()) {
+        if (Piwik::hasUserSuperUserAccess() && SettingsManager::hasSystemPluginsSettingsForCurrentUser()) {
             $menu->addSettingsItem('CoreAdminHome_PluginSettings',
-                                   $this->urlForAction('pluginSettings'),
+                                   $this->urlForAction('adminPluginSettings'),
                                    $order = 7);
         }
     }
 
+    public function configureTopMenu(MenuTop $menu)
+    {
+        if (Piwik::isUserHasSomeAdminAccess()) {
+            $url = $this->urlForModuleAction('SitesManager', 'index');
+
+            if (Piwik::hasUserSuperUserAccess()) {
+                $url = $this->urlForAction('generalSettings');
+            }
+
+            $menu->addItem('CoreAdminHome_Administration', null, $url, 10);
+        }
+    }
+
+    public function configureUserMenu(MenuUser $menu)
+    {
+        if (!Piwik::isUserIsAnonymous()) {
+            $menu->addManageItem('CoreAdminHome_TrackingCode',
+                $this->urlForAction('trackingCodeGenerator'),
+                $order = 10);
+
+            if (SettingsManager::hasUserPluginsSettingsForCurrentUser()) {
+                $menu->addPersonalItem('CoreAdminHome_PluginSettings',
+                    $this->urlForAction('userPluginSettings'),
+                    $order = 15);
+            }
+        }
+    }
+
 }
diff --git a/plugins/CoreAdminHome/Model/DuplicateActionRemover.php b/plugins/CoreAdminHome/Model/DuplicateActionRemover.php
new file mode 100644
index 0000000000..21a5613616
--- /dev/null
+++ b/plugins/CoreAdminHome/Model/DuplicateActionRemover.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+namespace Piwik\Plugins\CoreAdminHome\Model;
+
+use Piwik\Common;
+use Piwik\Container\StaticContainer;
+use Piwik\DataAccess\TableMetadata;
+use Piwik\Db;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Provides methods to find duplicate actions and fix duplicate action references in tables
+ * that reference log_action rows.
+ */
+class DuplicateActionRemover
+{
+    /**
+     * The tables that contain idaction reference columns.
+     *
+     * @var string[]
+     */
+    public static $tablesWithIdActionColumns = array(
+        'log_link_visit_action',
+        'log_conversion',
+        'log_conversion_item'
+    );
+
+    /**
+     * DAO used to get idaction column names in tables that reference log_action rows.
+     *
+     * @var TableMetadata
+     */
+    private $tableMetadataAccess;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * List of idaction columns in each table in $tablesWithIdActionColumns. idaction
+     * columns are table columns with the string `"idaction"` in them.
+     *
+     * @var string[]
+     */
+    private $idactionColumns = null;
+
+    /**
+     * Constructor.
+     *
+     * @param TableMetadata $tableMetadataAccess
+     * @param LoggerInterface $logger
+     */
+    public function __construct($tableMetadataAccess = null, $logger = null)
+    {
+        $this->tableMetadataAccess = $tableMetadataAccess ?: new TableMetadata();
+        $this->logger = $logger ?: StaticContainer::get('Psr\Log\LoggerInterface');
+    }
+
+    /**
+     * Returns list of all duplicate actions in the log_action table by name and the lowest action ID.
+     * The duplicate actions are returned with each action.
+     *
+     * @return array Contains the following elements:
+     *
+     *               * **name**: The action's name.
+     *               * **idaction**: The action's ID.
+     *               * **duplicateIdActions**: An array of duplicate action IDs.
+     */
+    public function getDuplicateIdActions()
+    {
+        $sql = "SELECT name, COUNT(*) AS count, GROUP_CONCAT(idaction ORDER BY idaction ASC SEPARATOR ',') as idactions
+                  FROM " . Common::prefixTable('log_action') . "
+              GROUP BY name, hash, type HAVING count > 1";
+
+        $result = array();
+        foreach (Db::fetchAll($sql) as $row) {
+            $dupeInfo = array('name' => $row['name']);
+
+            $idActions = explode(",", $row['idactions']);
+            $dupeInfo['idaction'] = array_shift($idActions);
+            $dupeInfo['duplicateIdActions'] = $idActions;
+
+            $result[] = $dupeInfo;
+        }
+        return $result;
+    }
+
+    /**
+     * Executes one SQL statement that sets all idaction columns in a table to a single value, if the
+     * values of those columns are in the specified set (`$duplicateIdActions`).
+     *
+     * Notes:
+     *
+     * The SQL will look like:
+     *
+     *     UPDATE $table SET
+     *         col1 = IF((col1 IN ($duplicateIdActions)), $realIdAction, col1),
+     *         col2 = IF((col2 IN ($duplicateIdActions)), $realIdAction, col2),
+     *         ...
+     *      WHERE col1 IN ($duplicateIdActions) OR col2 IN ($duplicateIdActions) OR ...
+     *
+     * @param string $table
+     * @param int $realIdAction The idaction to set column values to.
+     * @param int[] $duplicateIdActions The idaction values that should be changed.
+     */
+    public function fixDuplicateActionsInTable($table, $realIdAction, $duplicateIdActions)
+    {
+        $idactionColumns = $this->getIdActionTableColumnsFromMetadata();
+        $idactionColumns = array_values($idactionColumns[$table]);
+        $table = Common::prefixTable($table);
+
+        $inFromIdsExpression = $this->getInFromIdsExpression($duplicateIdActions);
+        $setExpression = "%1\$s = IF(($inFromIdsExpression), $realIdAction, %1\$s)";
+
+        $sql = "UPDATE $table SET\n";
+        foreach ($idactionColumns as $index => $column) {
+            if ($index != 0) {
+                $sql .= ",\n";
+            }
+            $sql .= sprintf($setExpression, $column);
+        }
+        $sql .= $this->getWhereToGetRowsUsingDuplicateActions($idactionColumns, $duplicateIdActions);
+
+        Db::query($sql);
+    }
+
+    /**
+     * Returns the server time and idsite of rows in a log table that reference at least one action
+     * in a set.
+     *
+     * @param string $table
+     * @param int[] $duplicateIdActions
+     * @return array with two elements **idsite** and **server_time**. idsite is the site ID and server_time
+     *               is the date of the log.
+     */
+    public function getSitesAndDatesOfRowsUsingDuplicates($table, $duplicateIdActions)
+    {
+        $idactionColumns = $this->getIdActionTableColumnsFromMetadata();
+        $idactionColumns = array_values($idactionColumns[$table]);
+        $table = Common::prefixTable($table);
+
+        $sql = "SELECT idsite, DATE(server_time) as server_time FROM $table ";
+        $sql .= $this->getWhereToGetRowsUsingDuplicateActions($idactionColumns, $duplicateIdActions);
+        return Db::fetchAll($sql);
+    }
+
+    private function getIdActionTableColumnsFromMetadata()
+    {
+        if ($this->idactionColumns === null) {
+            $this->idactionColumns = array();
+            foreach (self::$tablesWithIdActionColumns as $table) {
+                $columns = $this->tableMetadataAccess->getIdActionColumnNames(Common::prefixTable($table));
+
+                $this->logger->debug("Found following idactions in {table}: {columns}", array(
+                    'table' => $table,
+                    'columns' => implode(',', $columns)
+                ));
+
+                $this->idactionColumns[$table] = $columns;
+            }
+        }
+        return $this->idactionColumns;
+    }
+
+    private function getWhereToGetRowsUsingDuplicateActions($idactionColumns, $fromIdActions)
+    {
+        $sql = "WHERE ";
+        foreach ($idactionColumns as $index => $column) {
+            if ($index != 0) {
+                $sql .= "OR ";
+            }
+
+            $sql .= sprintf($this->getInFromIdsExpression($fromIdActions), $column) . " ";
+        }
+        return $sql;
+    }
+
+    private function getInFromIdsExpression($fromIdActions)
+    {
+        return "%1\$s IN (" . implode(',', $fromIdActions) . ")";
+    }
+}
\ No newline at end of file
diff --git a/plugins/CoreAdminHome/javascripts/generalSettings.js b/plugins/CoreAdminHome/javascripts/generalSettings.js
index 3d586e333d..ebb30c493c 100644
--- a/plugins/CoreAdminHome/javascripts/generalSettings.js
+++ b/plugins/CoreAdminHome/javascripts/generalSettings.js
@@ -119,7 +119,13 @@ $(document).ready(function () {
         uploadFrame.load(function (data) {
             setTimeout(function () {
                 refreshCustomLogo();
-                uploadFrame.remove();
+
+                var frameContent = $(uploadFrame.contents()).find('body').html();
+                frameContent = $.trim(frameContent);
+
+                if ('1' === frameContent || '0' === frameContent) {
+                    uploadFrame.remove();
+                }
             }, 1000);
         });
         $("body:first").append(uploadFrame);
diff --git a/plugins/CoreAdminHome/javascripts/jsTrackingGenerator.js b/plugins/CoreAdminHome/javascripts/jsTrackingGenerator.js
index 93010a3252..a404ee83a4 100644
--- a/plugins/CoreAdminHome/javascripts/jsTrackingGenerator.js
+++ b/plugins/CoreAdminHome/javascripts/jsTrackingGenerator.js
@@ -150,7 +150,7 @@
 
         // function that generates JS code
         var generateJsCodeAjax = null,
-            generateJsCode = function () {
+            generateJsCode = function (trackingCodeChangedManually) {
                 // get params used to generate JS code
                 var params = {
                     piwikUrl: piwikHost + piwikPath,
@@ -185,14 +185,20 @@
                 generateJsCodeAjax.setCallback(function (response) {
                     generateJsCodeAjax = null;
 
-                    $('#javascript-text').find('textarea').val(response.value);
+                    var jsCodeTextarea = $('#javascript-text').find('textarea');
+                    jsCodeTextarea.val(response.value);
+
+                    if(trackingCodeChangedManually) {
+                        jsCodeTextarea.effect("highlight", {}, 1500);
+                    }
+
                 });
                 generateJsCodeAjax.send();
             };
 
         // function that generates image tracker link
         var generateImageTrackingAjax = null,
-            generateImageTrackerLink = function () {
+            generateImageTrackerLink = function (trackingCodeChangedManually) {
                 // get data used to generate the link
                 var generateDataParams = {
                     piwikUrl: piwikHost + piwikPath,
@@ -221,7 +227,12 @@
                 generateImageTrackingAjax.setCallback(function (response) {
                     generateImageTrackingAjax = null;
 
-                    $('#image-tracking-text').find('textarea').val(response.value);
+                    var jsCodeTextarea = $('#image-tracking-text').find('textarea');
+                    jsCodeTextarea.val(response.value);
+
+                    if(trackingCodeChangedManually) {
+                        jsCodeTextarea.effect("highlight", {}, 1500);
+                    }
                 });
                 generateImageTrackingAjax.send();
             };
@@ -230,7 +241,7 @@
         $('#image-tracker-website').bind('change', function (e, site) {
             getSiteData(site.id, '#image-tracking-code-options', function () {
                 resetGoalSelectItems(site.id, 'image-tracker-goal');
-                generateImageTrackerLink();
+                generateImageTrackerLink(true);
             });
         });
 
@@ -250,7 +261,7 @@
                 $('.current-site-alias').text(siteUrls[site.id][1] || defaultAliasUrl);
 
                 resetGoalSelectItems(site.id, 'js-tracker-goal');
-                generateJsCode();
+                generateJsCode(true);
             });
         });
 
@@ -280,13 +291,13 @@
 
         // when any input in the JS tracking options section changes, regenerate JS code
         $('#optional-js-tracking-options').on('change', 'input', function () {
-            generateJsCode();
+            generateJsCode(true);
         });
 
         // when any input/select in the image tracking options section changes, regenerate
         // image tracker link
         $('#image-tracking-section').on('change', 'input,select', function () {
-            generateImageTrackerLink();
+            generateImageTrackerLink(true);
         });
 
         // on click generated code textareas, select the text so it can be easily copied
diff --git a/plugins/CoreAdminHome/lang/ar.json b/plugins/CoreAdminHome/lang/ar.json
index 350aebf71e..7bfcd30494 100644
--- a/plugins/CoreAdminHome/lang/ar.json
+++ b/plugins/CoreAdminHome/lang/ar.json
@@ -38,7 +38,6 @@
         "OptOutExplanationBis": "سيقوم هذا الكود بعرض iFrame يحتوي رابطاً لزوارك لإلغاء اشتراكهم في Piwik من خلال ضبط كوكيز في متصفحهم. %s انقر هنا %s لمشاهدة المحتويات التي سيتم عرضها في النافذة الفرعية iFrame.",
         "OptOutForYourVisitors": "إلغاء الاشتراك في Piwik لزوارك",
         "PiwikIsInstalledAt": "بايويك مثبت في المسار",
-        "PluginDescription": "إدارة Piwik",
         "PluginSettings": "إعدادات الإضافة",
         "TrackAGoal": "تتبع هدف",
         "TrackingCode": "كود التتبع",
diff --git a/plugins/CoreAdminHome/lang/be.json b/plugins/CoreAdminHome/lang/be.json
index bef06cba1a..c05e785a9e 100644
--- a/plugins/CoreAdminHome/lang/be.json
+++ b/plugins/CoreAdminHome/lang/be.json
@@ -14,7 +14,6 @@
         "OptOutExplanation": "Piwik прысвечаны забеспячэнню канфідэнцыяльнасці ў Інтэрнэце. Каб прапанаваць сваім наведвальнікам адмовіцца ад Piwik Вэб-Аналітыкі, вы можаце дадаць наступны код на адной з старонак вашага сайта, напрыклад, на старонцы Палітыка прыватнасці.",
         "OptOutExplanationBis": "Гэты код будзе адлюстроўвацца як Айфрэйм, які будзе змяшчаць спасылку для вашых наведвальнікаў, каб адмовіцца ад Piwik з дапамогай усталявання спецыяльных cookie у браўзэрах. %s Націсніце тут %s, каб прагледзець змесціва, якое будзе адлюстроўвацца ў Айфрэйме.",
         "OptOutForYourVisitors": "Адмова ад Piwik для вашых наведвальнікаў",
-        "PluginDescription": "Адміністрацыная частка Piwik.",
         "UseCustomLogo": "Выкарыстаць ўласны лагатып",
         "YouAreOptedIn": "У дадзены момант Вы не адмоўлены.",
         "YouAreOptedOut": "У дадзены момант Вы адмоўлены.",
diff --git a/plugins/CoreAdminHome/lang/bg.json b/plugins/CoreAdminHome/lang/bg.json
index 1cb391b9de..3931d94072 100644
--- a/plugins/CoreAdminHome/lang/bg.json
+++ b/plugins/CoreAdminHome/lang/bg.json
@@ -53,7 +53,6 @@
         "OptOutExplanationBis": "Този код ще ви покаже рамка, съдържаща връзка, чрез която вашите посетители могат да се откажат от Piwik, като поставят бисквитка в техните браузъри. %s Натиснете тук%s за да видите съдържанието, което ще бъде показано в рамката.",
         "OptOutForYourVisitors": "Piwik отказ за вашите посетители",
         "PiwikIsInstalledAt": "Piwik е инсталиран на",
-        "PluginDescription": "Администраторски панел на Piwik",
         "PluginSettingChangeNotAllowed": "Не е позволено да се променя стойността за настройка \"%s\" в добавка \"%s\"",
         "PluginSettings": "Настройки на добавките",
         "PluginSettingsIntro": "Тук могат да се променят настройките за следните добавки от трети страни:",
diff --git a/plugins/CoreAdminHome/lang/ca.json b/plugins/CoreAdminHome/lang/ca.json
index 45ead82d01..bb318f8013 100644
--- a/plugins/CoreAdminHome/lang/ca.json
+++ b/plugins/CoreAdminHome/lang/ca.json
@@ -23,7 +23,6 @@
         "OptOutExplanationBis": "Aquest codi mostrarà un Iframe que conté un enllaç per a que els vostres visitants es puguin donar de baixa del Piwik. Aquest enllaç guarda un cookie al seus navegadors. %s Click here%s per veure el contingut que es mostrarà al Iframe.",
         "OptOutForYourVisitors": "Pàgina de baixa del Piwik pels vostres visitants",
         "PiwikIsInstalledAt": "El Piwik està instal·lat a",
-        "PluginDescription": "Area d'administració del Piwik",
         "TrustedHostConfirm": "Esteu segur que voleu canviar el nom nom de la màquina (hostname) de confiança del Piwik?",
         "TrustedHostSettings": "Nom del host de Piwik de confiança",
         "UseCustomLogo": "Utilitza un logo personalitzat",
diff --git a/plugins/CoreAdminHome/lang/cs.json b/plugins/CoreAdminHome/lang/cs.json
index 3081c68d80..13befc3ff4 100644
--- a/plugins/CoreAdminHome/lang/cs.json
+++ b/plugins/CoreAdminHome/lang/cs.json
@@ -62,16 +62,18 @@
         "OptOutExplanation": "Piwik se zaměřuje na poskytování soukromí na internetu. Pokud chcete dát svým návštěvníkům možnost, aby byli vyloučeni z webové analýzy Piwikem, můžete na nějakou stránku (třeba stránku o soukromí) umístit následující HTML kód.",
         "OptOutExplanationBis": "Tento kód zobrazí iframe s odkazem, který nastaví u návštěvníka vynechávací cookie. %s Klikněte zde%s pro zobrazení obsahu iframe.",
         "OptOutForYourVisitors": "Piwik vyloučení pro Vaše návštěvníky",
+        "PersonalPluginSettings": "Osobní nastavení zásuvných modulů",
         "PiwikIsInstalledAt": "Piwik je nainstalován na",
-        "PluginDescription": "Administrační část Piwiku",
         "PluginSettingChangeNotAllowed": "Nemůžete změnit hodnotu volby %s zásuvného modulu \"%s\"",
         "PluginSettingReadNotAllowed": "Nemůžete číst hodnotu volby %s zásuvného modulu \"%s\"",
         "PluginSettings": "Nastavení zásuvného modulu",
         "PluginSettingsIntro": "Zde můžete změnit nastavení pro následující zásuvné moduly třetích stran:",
+        "PluginSettingsSaveFailed": "Nepodařilo se uložit nastavení zásuvného modulu",
         "PluginSettingsValueNotAllowed": "Hodnota pro pole \"%s\" zásuvného modulu \"%s\" není povolena",
         "SendPluginUpdateCommunication": "Odeslat e-mail s upozorněním, když je vydána aktualizace zásuvného modulu",
         "SendPluginUpdateCommunicationHelp": "Super uživatelům bude odeslán e-mail, když bude k dispozici aktualizace zásuvného modulu.",
         "StableReleases": "Piwik je důležitý nástroj pro měření, doporučujeme vždy používat nejnovější vydání. Pokud používáte nejnovější beta verzi a našli jste chyby, prosíme o jejich nahlášení %spřímo zde %s.",
+        "SystemPluginSettings": "Systémová nastavení zásuvných modulů",
         "TrackAGoal": "Sledovat cíl",
         "TrackingCode": "Sledovací kód",
         "TrustedHostConfirm": "Jste si jist(a), že chcete změnit důvěryhodné jméno hostitele Piwiku?",
diff --git a/plugins/CoreAdminHome/lang/da.json b/plugins/CoreAdminHome/lang/da.json
index 5f0f7d4372..a73cb7f909 100644
--- a/plugins/CoreAdminHome/lang/da.json
+++ b/plugins/CoreAdminHome/lang/da.json
@@ -63,11 +63,11 @@
         "OptOutExplanationBis": "Koden vil vise en Iframe, der indeholder et link til dine besøgende til at framelde Piwik ved at sætte en opt out-cookie i browseren. %sKlik her%s for at få vist indholdet af iFramen.",
         "OptOutForYourVisitors": "Piwik opt-out for dine besøgende",
         "PiwikIsInstalledAt": "Piwik er installeret på",
-        "PluginDescription": "Piwik administration.",
         "PluginSettingChangeNotAllowed": "Du må ikke ændre værdien \"%s\" i udvidelse \"%s\"",
         "PluginSettingReadNotAllowed": "Du har ikke tilladelse til at læse værdien af ​​indstillingen \"%s\" i udvidelsen \"%s\"",
         "PluginSettings": "Programudvidelses indstilinger",
         "PluginSettingsIntro": "Her kan du ændre indstillingerne for følgende 3. parts udvidelsesmoduler:",
+        "PluginSettingsSaveFailed": "Kunne ikke gemme udvidelsesmodul indstillinger",
         "PluginSettingsValueNotAllowed": "Værdien for feltet \"%s\" i udvidelsen \"%s\" er ikke tilladt",
         "SendPluginUpdateCommunication": "Send mig en e-mail når der er en ny opdatering af denne programudvidelse.",
         "SendPluginUpdateCommunicationHelp": "En e-mail vil blive sendt til Superbrugere, når der er en ny version tilgængelig for denne programudvidelse.",
diff --git a/plugins/CoreAdminHome/lang/de.json b/plugins/CoreAdminHome/lang/de.json
index 6862b46c8a..1039f4a862 100644
--- a/plugins/CoreAdminHome/lang/de.json
+++ b/plugins/CoreAdminHome/lang/de.json
@@ -62,16 +62,18 @@
         "OptOutExplanation": "Piwik ist es wichtig, die Privatsphäre Ihrer Besucher zu wahren. Fügen Sie den folgenden HTML-Code auf einer Seite Ihrer Seiten (z.B der Datenschutz-Seite) ein, um den Besuchern Ihrer Webseite die Möglichkeit zu geben, sich gegen eine Erfassung ihres Besuches durch Piwik zu entscheiden.",
         "OptOutExplanationBis": "Dieser Code wird innerhalb eines Iframes angezeigt und enthält einen Link, über den ein Cookie im Browser Ihrer Besucher abgelegt wird, womit die Erfassung durch Piwik deaktiviert wird. %s Klicken Sie hier%s, um eine Vorschau auf den Text zu bekommen, der den Besuchern in dem Iframe angezeigt wird.",
         "OptOutForYourVisitors": "Piwik-Deaktivierung für Ihre Besucher",
+        "PersonalPluginSettings": "Persönliche Plugin Einstellungen",
         "PiwikIsInstalledAt": "Piwik ist installiert unter",
-        "PluginDescription": "Piwik Administration",
         "PluginSettingChangeNotAllowed": "Sie sind nicht berechtigt den Wert für die Einstellung \"%s\" im Plugin \"%s\" zu ändern.",
         "PluginSettingReadNotAllowed": "Sie haben keine Berechtigung den Wert der Einstellung \"%s\" für das Plugin \"%s\" auszulesen.",
         "PluginSettings": "Plugin-Einstellungen",
         "PluginSettingsIntro": "Hier können Sie die Einstellungen für folgende Drittanbieter Plugins ändern:",
+        "PluginSettingsSaveFailed": "Speichern der Plugin Einstellungen fehlgeschlagen.",
         "PluginSettingsValueNotAllowed": "Der Wert für die Einstellung \"%s\" im Plugin \"%s\" ist nicht erlaubt.",
         "SendPluginUpdateCommunication": "Sende mir eine E-Mail-Benachrichtigung wenn eine neue Plugin-Aktualisierung zur Verfügung steht.",
         "SendPluginUpdateCommunicationHelp": "Der Hauptadministrator wird per E-Mail benachrichtigt, sobald eine neue Version eines Plugins zur Verfügung steht.",
         "StableReleases": "Sollte Piwik eine wichtige Komponente Ihres Unternehmens sein, empfehlen wir Ihnen den letzen stabilen Release zu verwenden. Sollten Sie die letze Beta Version verwenden und einen Fehler finden oder einen Vorschlag haben, %slesen Sie bitte hier%s.",
+        "SystemPluginSettings": "Globale Plugin Einstellungen",
         "TrackAGoal": "Ein Ziel aufzeichnen",
         "TrackingCode": "Tracking Code",
         "TrustedHostConfirm": "Wollen Sie wirklich den Vertrauten Piwik Hostnamen ändern?",
diff --git a/plugins/CoreAdminHome/lang/el.json b/plugins/CoreAdminHome/lang/el.json
index a4a487dd19..eab1e4101e 100644
--- a/plugins/CoreAdminHome/lang/el.json
+++ b/plugins/CoreAdminHome/lang/el.json
@@ -62,16 +62,18 @@
         "OptOutExplanation": "Το Piwik είναι αφοσιωμένο στην προστασία του ιδιωτικού απορρήτου στο Διαδίκτυο. Για να παρέχετε την δυνατότητα απενεργοποίησης των στατιστικών ιστού του Piwik στους επισκέπτες σας, μπορείτε να προσθέσετε τον ακόλουθο κώδικα σε μια από τις ιστοσελίδες σας, για παράδειγμα στη σελίδα Ιδιωτικού Απορρήτου.",
         "OptOutExplanationBis": "Αυτός ο κώδικας θα εμφανίσει ένα πλαίσιο (iframe) που θα περιέχει έναν σύνδεσμο για τους επισκέπτες σας για να απενεργοποιήσουν το Piwik ορίζοντας ένα cookie απενεργοποίησης στους φυλλομετρητές τους. %sΠατήστε εδώ%s για να δείτε τα περιεχόμενα που θα εμφανίζονται στο πλαίσιο.",
         "OptOutForYourVisitors": "Απενεργοποίηση του Piwik για τους επισκέπτες σας",
+        "PersonalPluginSettings": "Προσωπικές Ρυθμίσεις Πρόσθετου",
         "PiwikIsInstalledAt": "Το Piwik εγκαταστάθηκε στο",
-        "PluginDescription": "Περιοχή διαχείρισης του Piwik.",
         "PluginSettingChangeNotAllowed": "Δεν επιτρέπεται να αλλάξετε την τιμή της ρύθμισης \"%s\" στο πρόσθετο \"%s\"",
         "PluginSettingReadNotAllowed": "Απαγορεύεται να δείτε την τιμή της ρύθμισης \"%s\" στο πρόσθετο \"%s\"",
         "PluginSettings": "Ρυθμίσεις πρόσθετου",
         "PluginSettingsIntro": "Εδώ μπορείτε να αλλάξετε τις ρυθμίσεις των παρακάτω πρόσθετων από τρίτους:",
+        "PluginSettingsSaveFailed": "Υπήρξε αποτυχία κατά την αποθήκευση των ρυθμίσεων των πρόσθετων",
         "PluginSettingsValueNotAllowed": "Η τιμή για το πεδίο \"%s\" στο πρόσθετο \"%s\" δεν είναι επιτρεπτή",
         "SendPluginUpdateCommunication": "Να ειδοποιούμαι με e-mail όταν υπάρχει μια νέα ενημέρωση για πρόσθετο",
         "SendPluginUpdateCommunicationHelp": "Ένα e-mail θα στέλνεται στους Υπερ-Χρήστες όταν θα υπάρχει διαθέσιμη νέα έκδοση για ένα πρόσθετο.",
         "StableReleases": "Αν το Piwik αποτελεί ένα κρίσιμο μέρος της επιχείρησής σας, προτείνουμε να χρησιμοποιείτε την τελευταία σταθερή έκδοση. Αν χρησιμοποιείτε την τελευταία δοκιμαστική έκδοση και βρείτε κάποιο σφάλμα ή έχετε κάποια πρόταση, παρακαλούμε %sδείτε εδώ%s.",
+        "SystemPluginSettings": "Ρυθμίσεις Συστήματος Πρόσθετου",
         "TrackAGoal": "Παρακολούθηση ενός στόχου",
         "TrackingCode": "Κώδικας παρακολούθησης",
         "TrustedHostConfirm": "Είστε βέβαιοι ότι θέλετε να αλλάξετε το διαπιστευμένο όνομα του εξυπηρετητή του Piwik;",
diff --git a/plugins/CoreAdminHome/lang/en.json b/plugins/CoreAdminHome/lang/en.json
index a1c0307b48..42c0ae3960 100644
--- a/plugins/CoreAdminHome/lang/en.json
+++ b/plugins/CoreAdminHome/lang/en.json
@@ -63,7 +63,7 @@
         "OptOutExplanationBis": "This code will display an Iframe containing a link for your visitors to opt-out of Piwik by setting an opt-out cookie in their browsers. %s Click here%s to view the content that will be displayed by the iFrame.",
         "OptOutForYourVisitors": "Piwik opt-out for your visitors",
         "PiwikIsInstalledAt": "Piwik is installed at",
-        "PluginDescription": "Administration area of Piwik.",
+        "PersonalPluginSettings": "Personal Plugin Settings",
         "PluginSettingChangeNotAllowed": "You are not allowed to change the value of the setting \"%s\" in plugin \"%s\"",
         "PluginSettingReadNotAllowed": "You are not allowed to read the value of the setting \"%s\" in plugin \"%s\"",
         "PluginSettings": "Plugin settings",
@@ -73,6 +73,7 @@
         "SendPluginUpdateCommunication": "Send me an email notification when there is a new plugin update",
         "SendPluginUpdateCommunicationHelp": "An email will be sent to Super Users when there is a new version available for a plugin.",
         "StableReleases": "If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please %ssee here%s.",
+        "SystemPluginSettings": "System Plugin Settings",
         "TrackAGoal": "Track a goal",
         "TrackingCode": "Tracking Code",
         "TrustedHostConfirm": "Are you sure you want to change the trusted Piwik hostname?",
diff --git a/plugins/CoreAdminHome/lang/es.json b/plugins/CoreAdminHome/lang/es.json
index 6b034059f4..584a0edcb4 100644
--- a/plugins/CoreAdminHome/lang/es.json
+++ b/plugins/CoreAdminHome/lang/es.json
@@ -28,6 +28,8 @@
         "JSTracking_CodeNote": "Asegúrate de que este código se encuentre en cada página de tu sitio web antes de la etiqueta %1$s.",
         "JSTracking_CustomCampaignQueryParam": "Utiliza nombres de parámetros de consulta personalizados para el nombre de la campaña y la palabra clave",
         "JSTracking_CustomCampaignQueryParamDesc": "Nota: %1$sPiwik detectara automáticamente los parámetros de Google Analytics.%2$s",
+        "JSTracking_DisableCookies": "Desactivar todas las cookies de rastreo",
+        "JSTracking_DisableCookiesDesc": "Desactiva todas las cookies de origen. Piwik cookies existentes de este sitio web seran eliminarán en la siguiente página vistada.",
         "JSTracking_EnableDoNotTrack": "Habilitar detección por parte del cliente de DoNotTrack",
         "JSTracking_EnableDoNotTrack_AlreadyEnabled": "Nota: Soporte del lado del servidor para DoNotTrack ha sido activado, por lo que esta opción no tendrá ningún efecto.",
         "JSTracking_EnableDoNotTrackDesc": "De esta manera las solicitudes de seguimiento no será enviada si el visitante no desea ser seguido.",
@@ -61,11 +63,11 @@
         "OptOutExplanationBis": "Este código mostrará un iFrame que contendrá un link para que sus visitantes dejen de ser seguidos por Piwik configurando una cookie opt-out en sus navegadores. %s Haga clic aquí%s para ver el contenido que será mostrado por el iFrame.",
         "OptOutForYourVisitors": "Opción de no seguimiento de Piwik para sus visitantes",
         "PiwikIsInstalledAt": "Piwik está instalado en",
-        "PluginDescription": "Área de Administración de Piwik",
         "PluginSettingChangeNotAllowed": "No está permitido cambiar el valor de configuración \"%s\" en el plugin \"%s\"",
         "PluginSettingReadNotAllowed": "No está permitido que leas el valor de la opción \"%s\" en el plugin \"%s\"",
         "PluginSettings": "Configuración del plugin",
         "PluginSettingsIntro": "Aquí puedes cambiar la configuración de los siguientes plugins de terceros:",
+        "PluginSettingsSaveFailed": "Error al guardar la configuración del plugin",
         "PluginSettingsValueNotAllowed": "El valor del campo \"%s\" del plugin \"%s\" no es permitido.",
         "SendPluginUpdateCommunication": "Enviarme una notificación por correo electrónico cuando hay una actualización para los plugins",
         "SendPluginUpdateCommunicationHelp": "Se enviará un correo electrónico a los Super Users cuando hay disponible una nueva versión de un plugin.",
diff --git a/plugins/CoreAdminHome/lang/et.json b/plugins/CoreAdminHome/lang/et.json
index 50f2a6fd97..b520a3ebb0 100644
--- a/plugins/CoreAdminHome/lang/et.json
+++ b/plugins/CoreAdminHome/lang/et.json
@@ -23,7 +23,6 @@
         "MenuManage": "Halda",
         "OptOutForYourVisitors": "Piwiku külastajate väljaarvamine",
         "PiwikIsInstalledAt": "Piwik on paigaldatud",
-        "PluginDescription": "Piwiku haldusala.",
         "PluginSettings": "Lisatarkvara seaded",
         "TrackAGoal": "Kogu infot eesmärgi kohta",
         "TrackingCode": "Jälgimiskood",
diff --git a/plugins/CoreAdminHome/lang/fa.json b/plugins/CoreAdminHome/lang/fa.json
index ca13edcb5b..af259c870f 100644
--- a/plugins/CoreAdminHome/lang/fa.json
+++ b/plugins/CoreAdminHome/lang/fa.json
@@ -43,7 +43,6 @@
         "OptOutExplanation": "Piwik به ارائه حریم خصوصی در اینترنت اختصاص داده شده است. به منظور ارائه به بازدید کنندگان خود را با انتخاب از امید بستن به خارج از تجزیه و تحلیل وب سایت Piwik، شما می توانید از کد HTML زیر را در یک صفحه وب سایت خود را اضافه کنید، برای مثال در یک صفحه سیاست حفظ حریم خصوصی است.",
         "OptOutForYourVisitors": "Piwik انتخاب کردن را برای بازدید کنندگان خود را",
         "PiwikIsInstalledAt": "پیویک در این مسیر نصب شد",
-        "PluginDescription": "محیط مدیریت پیویک.",
         "PluginSettingChangeNotAllowed": "شما مجاز به تغییر مقدار \"%s\" در پلاگین \"%s\" نیستید.",
         "PluginSettings": "تنظیمات افزونه ها",
         "PluginSettingsIntro": "در اینجا شما می توانید تغییراتی در تنظیمات پلاگین های زیر انجام دهید :",
diff --git a/plugins/CoreAdminHome/lang/fi.json b/plugins/CoreAdminHome/lang/fi.json
index 6e8aa215f0..b108cffbec 100644
--- a/plugins/CoreAdminHome/lang/fi.json
+++ b/plugins/CoreAdminHome/lang/fi.json
@@ -63,7 +63,6 @@
         "OptOutExplanationBis": "Tämä koodi näyttää iframen, jossa on linkki Piwikin poistamiseen käytöstä vierailijan selaimesta. Linkin klikkaaminen ei vaikuta muihin käyttäjiin mitenkään. %sKlikkaa tästä%s, jos haluat nähdä, mitä iframessa näytetään.",
         "OptOutForYourVisitors": "Piwikin poistaminen käytöstä kävijöillesi (opt-out)",
         "PiwikIsInstalledAt": "Piwik on asennettu kohteeseen",
-        "PluginDescription": "Piwikin ylläpito.",
         "PluginSettingChangeNotAllowed": "Arvojen muuttaminen \"%s\" liitännäisessä \"%s\" -asetuksissa ei ole sallittua",
         "PluginSettingReadNotAllowed": "Et voi lukea asetusta \"%s\" lisäosasta \"%s\"",
         "PluginSettings": "Lisäosan asetukset",
diff --git a/plugins/CoreAdminHome/lang/fr.json b/plugins/CoreAdminHome/lang/fr.json
index 587e0a5f59..c0aaae347f 100644
--- a/plugins/CoreAdminHome/lang/fr.json
+++ b/plugins/CoreAdminHome/lang/fr.json
@@ -62,7 +62,6 @@
         "OptOutExplanationBis": "Ce code va afficher un iFrame contenant un lien permettant à vos visiteurs de ne pas être suivi par Piwik en installant un cookie de neutralisation dans leur navigateur. %s Cliquez ici %s pour visualiser le contenu qui sera affiché par l'iFrame.",
         "OptOutForYourVisitors": "Exclusion de Piwik pour vos visiteurs",
         "PiwikIsInstalledAt": "Piwik est installé à l'adresse",
-        "PluginDescription": "Zone d'administration de Piwik.",
         "PluginSettingChangeNotAllowed": "Vous n'êtes pas autorisé(e) à modifier la valeur du paramètre \"%s\" du plugin \"%s\"",
         "PluginSettingReadNotAllowed": "Vous n'êtes pas autorisé(e) à voir la valeur du paramètre \"%s\" dans le plugin \"%s\"",
         "PluginSettings": "Paramètres du composant",
diff --git a/plugins/CoreAdminHome/lang/he.json b/plugins/CoreAdminHome/lang/he.json
index 7d668cbc87..b7e1060097 100644
--- a/plugins/CoreAdminHome/lang/he.json
+++ b/plugins/CoreAdminHome/lang/he.json
@@ -19,7 +19,6 @@
         "MenuManage": "ניהול",
         "OptOutForYourVisitors": "התחמקות מ-Piwik עבור גולשיך",
         "PiwikIsInstalledAt": "Piwik מותקן ב",
-        "PluginDescription": "אזור הניהול של Piwik.",
         "PluginSettings": "הגדרות תוסף",
         "TrackAGoal": "עקיבה אחר יעד",
         "TrackingCode": "קוד מעקב",
diff --git a/plugins/CoreAdminHome/lang/hi.json b/plugins/CoreAdminHome/lang/hi.json
index 36faf232c7..52f4e55cad 100644
--- a/plugins/CoreAdminHome/lang/hi.json
+++ b/plugins/CoreAdminHome/lang/hi.json
@@ -52,7 +52,6 @@
         "OptOutExplanationBis": "यह कोड अपने दर्शकों के लिए एक कड़ी युक्त एक iframe को प्रदर्शित करेगा अपने ब्राउज़र में एक कुकी को सेट करके Piwik से लिए ऑप्ट बाहर जाने के लिए आइफ्रेम द्वारा प्रदर्शित की जाने वाली सामग्री को देखने के लिए %s यहां क्लिक करें %s.",
         "OptOutForYourVisitors": "अपने दर्शकों के लिए Piwik ऑप्ट आउट",
         "PiwikIsInstalledAt": "Piwik में स्थापित किया गया है",
-        "PluginDescription": "Piwik का प्रशासन क्षेत्र.",
         "StableReleases": "Piwik अपने व्यापार का एक महत्वपूर्ण हिस्सा है, तो हम आपको नवीनतम स्थिर रिलीज उपयोग की सलाह देते हैं. आप नवीनतम बीटा का उपयोग करें और आप एक बग मिल या एक सलाह देना चाहते हैं, %sयहां देखें%s.",
         "TrackAGoal": "एक लक्ष्य की खोज",
         "TrackingCode": "कोड देखना",
diff --git a/plugins/CoreAdminHome/lang/hr.json b/plugins/CoreAdminHome/lang/hr.json
index 3954e46403..a2da3a5984 100644
--- a/plugins/CoreAdminHome/lang/hr.json
+++ b/plugins/CoreAdminHome/lang/hr.json
@@ -4,7 +4,6 @@
         "EmailServerSettings": "Postavke email servera",
         "LogoUpload": "Odaberi logo za upload",
         "MenuGeneralSettings": "Opće postavke",
-        "PluginDescription": "Administratorsko područje PIWIK.",
         "TrackingCode": "Kod za praćenje"
     }
 }
\ No newline at end of file
diff --git a/plugins/CoreAdminHome/lang/hu.json b/plugins/CoreAdminHome/lang/hu.json
index ace8ddfe14..d7af7e02e8 100644
--- a/plugins/CoreAdminHome/lang/hu.json
+++ b/plugins/CoreAdminHome/lang/hu.json
@@ -1,12 +1,87 @@
 {
     "CoreAdminHome": {
         "Administration": "Adminisztráció",
-        "BrandingSettings": "Arculat beállítása",
+        "ArchivingSettings": "Archiválási beállítások",
+        "BrandingSettings": "Arculat beállítások",
+        "CheckReleaseGetVersion": "When checking for new version of Piwik, always get",
+        "ClickHereToOptIn": "Kattintson ide a bekapcsoláshoz.",
+        "ClickHereToOptOut": "Kattintson ide a kikapcsoláshoz.",
         "CustomLogoFeedbackInfo": "A Piwik logó konfigurálása esetén érdekes lehet a felső menüben található %s link eltávolítása is. Ehhez a %sBővítmények%s oldalon ki kell kapcsolni a Feedback bővítményt.",
         "CustomLogoHelpText": "A felhasználói felületen és az e-mail jelentésekben megjelenő Piwik logó testreszabható.",
+        "DevelopmentProcess": "Annak ellenére, hogy a %sfejlesztési folyamat%s során több ezer automatizált teszt hajtódik végre, a Beta tesztelők kulcsfontosságú szerepet töltenek be, hogy a \"Nincs hiba irányelv\" tartható legyen.",
         "EmailServerSettings": "E-mail szerver beállítások",
-        "LogoUpload": "Feltölteni kívánt logó:",
+        "FaviconUpload": "Válasszon egy Favicon-t a feltöltéshez",
+        "FileUploadDisabled": "A fájlfeltöltés nincs engedélyezve a PHP konfigurációban. Egyedi logó feltöltéséhez be kell állítani a php.ini fájlban a következőt: %s. A webszerver újraindítása is szükséges lehet.",
+        "ForBetaTestersOnly": "Csak béta tesztelőknek",
+        "ImageTracking": "Kép Követés",
+        "ImageTrackingIntro1": "Ha egy látogatónál le van tiltva a JavaScript, vagy JavaScript egyéb okokból nem használható, lehetőség van egy kép követési link segítségével követni a látogatókat.",
+        "ImageTrackingIntro2": "Erre használható az alább generált HTML kód az oldalba ágyazva. %1$s tagbe illesztve helyettesíthető a JavaScript követő kód, ha az valamiért nem használható.",
+        "ImageTrackingIntro3": "Az összes lehetséges opciót %1$sKövetés API dokumentáció%2$s tartalmazza.",
+        "ImageTrackingLink": "Kép Követési Link",
+        "ImportingServerLogs": "Szervernaplók Importálása",
+        "InvalidPluginsWarning": "A következő bővítmény nem kompatibilisek evvel: %1$s ezért nem lehet őket betölteni: %2$s.",
+        "InvalidPluginsYouCanUninstall": "A bővítmények frissíthetők vagy törölhetők a %1$sBővítmények%2$s oldalon.",
+        "JavaScriptTracking": "JavaScript Követés",
+        "JSTracking_CampaignKwdParam": "Kampány Kulcsszó paraméter",
+        "JSTracking_CampaignNameParam": "Kampány Név paraméter",
+        "JSTracking_CodeNote": "Győződjön meg róla, hogy a kód minden oldalon szerepel a %1$s tag előtt.",
+        "JSTracking_CustomCampaignQueryParam": "Saját paraméter nevek használata a kampány név és a kulcsszó mezőkhöz",
+        "JSTracking_CustomCampaignQueryParamDesc": "Megjegyzés: A %1$sPiwik automatikusan felismeri a Googly Analytics paramétereket.%2$s",
+        "JSTracking_DisableCookies": "Minden követő süti tiltása",
+        "JSTracking_DisableCookiesDesc": "Letilt minden első féltől származó sütit. A már meglévő sütik a következő oldalbetöltéskor törlődni fognak.",
+        "JSTracking_EnableDoNotTrack": "Kliens oldali DoNotTrack engedélyezése",
+        "JSTracking_EnableDoNotTrack_AlreadyEnabled": "Megjegyzés: A szerver oldali DoNotTrack már engedélyezve van, így ennek az opciónak arra nincs hatása.",
+        "JSTracking_EnableDoNotTrackDesc": "A látogatónak lehetősége van a követés megtiltására, így a követési kérések nem lesznek elküldve.",
+        "JSTracking_GroupPageTitlesByDomain": "Az weboldal domain nevének hozzáfűzése az oldal címéhez",
+        "JSTracking_GroupPageTitlesByDomainDesc1": "Ha valaki a 'Rólunk' oldalt látogatja meg a(z) blog.%1$s weboldalon, a naplóban 'blog \/ Rólunk' fog szerepelni. Ez a legegyszerűbb módja a látogatások aldomain szerinti áttekintésének.",
+        "JSTracking_MergeAliases": "A \"Kilépési lapok\" jelentésben az ismert álnevek (URLek) elrejtése a következőnél:",
+        "JSTracking_MergeAliasesDesc": "Egy álnevet (URLt) (pl. %s) tartalmazó linkre kattintás nem lesz \"Kilépési lapként\" számolva.",
+        "JSTracking_MergeSubdomains": "Látogatók követése a következő összes aldomainjén:",
+        "JSTracking_MergeSubdomainsDesc": "Ha egy látogató meglátogatja a(z) %1$s és %2$s weboldalakat, akkor egyedi látogatásként lesz számolva.",
+        "JSTracking_PageCustomVars": "Saját változók követése minden oldalmegtekintésnél",
+        "JSTracking_PageCustomVarsDesc": "Példa: változó: \"Kategória\", érték: \"Újság\".",
+        "JSTracking_VisitorCustomVars": "Saját változó kovetése látogatónként",
+        "JSTracking_VisitorCustomVarsDesc": "Példa: változó: \"Típus\", érték: \"Ügyfél\".",
+        "JSTrackingIntro1": "Látogatók követésére sokféle módszer létezik. A javasolt megoldás JavaScript követőkód használata. Ehhez a módszerhez minden oldalnak tartalmaznia kell egy JavaScript kódot.",
+        "JSTrackingIntro2": "A lent látható generált kódnak (vagy annak egy módosított változatának) szerepelnie kell minden oldalon, amit a Piwiknek követnie kell.",
+        "JSTrackingIntro3": "A legtöbb weboldalhoz, bloghoz, CMShez, stb. létezik egy beépülő, ami elvégzi a szükséges technikai dolgokat. (%1$sA lista a Piwiket integráló beépülőkről%2$s.) Ha nincs elérhető beépülő, akkor a kód manuálisan is beilleszthető a weboldal sablonjának \"lábléc\" részébe.",
+        "JSTrackingIntro4": "JavaScript követés helyett lehetőség van kép alapú követés használatára is, mely %1$saz alábbi linkre kattintva generálható%2$s.",
+        "JSTrackingIntro5": "Ha az oldalmegtekintések követése nem elég, tekintse meg a %1$sPiwik Javascript Követés dokumentációt%2$s a további funkciókért. Ezek használatával lehetőség van egyéni célok, saját változók, ecommerce rendelések, otthagyott bevásárló kosarak, stb, követésére.",
+        "LatestBetaRelease": "Legfirssebb béta kiadás",
+        "LatestStableRelease": "Legfrissebb stabil kiadás",
+        "LogoNotWriteableInstruction": "Egyedi logó használatához írási jogosultságra van szükség a következő könyvtárhoz: %1$s A logók tárolásához a következőfájlokhoz írási jogosultság szükséges: %2$s.",
+        "LogoUpload": "Válasszon egy logót a feltöltéshez",
+        "LogoUploadHelp": "A feltöltött fájlnak %s formátumban, minimum %s pixel magasnak kell lennie.",
+        "MenuDevelopment": "Fejlesztés",
+        "MenuDiagnostic": "Diagnosztika",
         "MenuGeneralSettings": "Alapbeállítások",
-        "PluginDescription": "Piwik adminisztrációs felület"
+        "MenuManage": "Kezelés",
+        "OptOutComplete": "Követés kikapcsolva; a látogatások semmilyen statisztikában nem fognak szerepelni.",
+        "OptOutCompleteBis": "Megjegyzés: abban az esetben, ha a követést tiltó süti törlődik, más számítógépről vagy böngészőből látogatja meg a weboldalt, a követést ismét le kell tiltania.",
+        "OptOutExplanation": "A Piwik tiszteletben tartja a magánéletet Internet. Annak érdekében, hogy látogatóinak lehetősége legyen a követés kikapcsolására, helyezze el az alábbi HTML kódot például egy Adatvédelmi Tájékoztató oldalon.",
+        "OptOutExplanationBis": "Az alábbi kód egy Iframet tartalmazó link, ahol a látogatók ki tudják kapcsolni a követést. Ehhez a Piwik egy követést letiltő sütit helyez el a böngészőben. %s Kattintson ide%s az iFrame tartalmának megtekintéséhez.",
+        "OptOutForYourVisitors": "Piwik követés letiltása látogatók által",
+        "PiwikIsInstalledAt": "Piwik telepítve itt:",
+        "PluginSettingChangeNotAllowed": "Önnek nincs jogosultsága a(z) \"%s\" beállítás módosításához a(z) \"%s\" bővítményben",
+        "PluginSettingReadNotAllowed": "Önnek nincs jogosultséga a(z) \"%s\" beállítás megtekintéséhez a(z) \"%s\" bővítményben",
+        "PluginSettings": "Bővítmény beállítások",
+        "PluginSettingsIntro": "Itt módosíthatók a harmadik féltől származó bővítmények beállításai:",
+        "PluginSettingsSaveFailed": "A bővítmény beállítások mentése sikertelen",
+        "PluginSettingsValueNotAllowed": "A(z) \"%s\" mező értéke a(z) \"%s\" bővítményben érvénytelen",
+        "SendPluginUpdateCommunication": "Értesítés küldése emailben ha egy bővítményhez frissítés érhető el",
+        "SendPluginUpdateCommunicationHelp": "Az adminisztrátorok emailben értesülnek ha egy bővítményhez frissítés érhető el.",
+        "StableReleases": "Ha a Piwik fontos része a vállalkozásának, javasoljuk, hogy a legfrissebb stabil kiadást használja. Ha a legfrissebb béte kiadást használja és hibát talál vagy javaslata van, kérjük %skattintson ide%s.",
+        "TrackAGoal": "Cél követése",
+        "TrackingCode": "Követőkód",
+        "TrustedHostConfirm": "Biztosan meg akarja változtatni a megbízható Piwik hosztnevet?",
+        "TrustedHostSettings": "Megbízható Piwik Hosztnév",
+        "UpdateSettings": "Beállítások frissítése",
+        "UseCustomLogo": "Saját logó használata",
+        "ValidPiwikHostname": "Érvényes Piwik Hosztnév",
+        "WithOptionalRevenue": "opcionális jövedelemmel",
+        "YouAreOptedIn": "A követés jelenleg be van kapcsolva.",
+        "YouAreOptedOut": "A követés jelenleg ki van kapcsolva.",
+        "YouMayOptOut": "Lehetőség van a számítógépen tárolt egyedi azonosító süti letiltására, hogy a látogatás ne szerepeljen semmilyen statisztikában.",
+        "YouMayOptOutBis": "Az alábbi kapcsoló segítségével engedélyezhető a követő süti használata."
     }
 }
\ No newline at end of file
diff --git a/plugins/CoreAdminHome/lang/id.json b/plugins/CoreAdminHome/lang/id.json
index 4612e87777..34fd0d2f3b 100644
--- a/plugins/CoreAdminHome/lang/id.json
+++ b/plugins/CoreAdminHome/lang/id.json
@@ -56,7 +56,6 @@
         "OptOutExplanationBis": "Kode ini akan menampilkan bingkai pendam yang mengandung tautan untuk pengunjung agar Piwik tidak merekam dengan mengatur kuki Jangan-Lacak di peramban pengunjung. %sKlik di sini%s untuk melihat isi yang ditampilkan oleh bingkai pendam.",
         "OptOutForYourVisitors": "Piwik Jangan-Lacakan untuk Pengunjung",
         "PiwikIsInstalledAt": "Piwik terpasang di",
-        "PluginDescription": "Halaman Administrasi Piwik",
         "PluginSettings": "Pengaturan pengaya",
         "StableReleases": "Bila Piwik merupakan hal yang penting dalam usaha Anda, kami menyarankan Anda menggunakan rilis stabil terkini. \tBila Anda menggunakan beta terkini dan Anda menemukan sebuah kutu atau sebuah sarah, harap %slihat di sini%s.",
         "TrackAGoal": "Lacak sebuah Tujuan",
diff --git a/plugins/CoreAdminHome/lang/is.json b/plugins/CoreAdminHome/lang/is.json
index 061cc7f549..91ae1fcae1 100644
--- a/plugins/CoreAdminHome/lang/is.json
+++ b/plugins/CoreAdminHome/lang/is.json
@@ -5,7 +5,6 @@
         "MenuGeneralSettings": "Almennar stillingar",
         "OptOutExplanation": "Piwik er tileinkað að bjóða uppá persónuvernd á netinu. Til að veita gestum þínum val á að kjósa ekki að taka þátt í Piwik vefumferðar mælingum þá getur þú bætt við eftirfarandi HTML kóða á eina af síðum vefjarins tildæmis á persónuverndarstefnu síðunni.",
         "OptOutForYourVisitors": "Piwik er útvalið fyrir þína gesti",
-        "PluginDescription": "Umsjónarsvæði Piwik",
         "YouAreOptedIn": "Þú ert nú valinn",
         "YouAreOptedOut": "Þú ert nú útvalinn",
         "YouMayOptOutBis": "Til að framkvæma það val, vinsamlegast smelltu hér fyrir neðan til að fá útvals smáköku."
diff --git a/plugins/CoreAdminHome/lang/it.json b/plugins/CoreAdminHome/lang/it.json
index bacea70736..28ee7f2245 100644
--- a/plugins/CoreAdminHome/lang/it.json
+++ b/plugins/CoreAdminHome/lang/it.json
@@ -59,19 +59,21 @@
         "MenuManage": "Gestione",
         "OptOutComplete": "Opt-out completato; le tue visite a questo sito non verranno registrate dallo strumento di Web Analytics.",
         "OptOutCompleteBis": "Nota che se cancelli i tuoi cookie, cancelli il cookie di opt-out, o se cambi computer o browser web, devi fare la procedura opt-out nuovamente.",
-        "OptOutExplanation": "Piwik è dedicato a fornire privacy su Internet. Per fornire ai vostri ospiti con la scelta di optare per l'uscita di Piwik Web Analytics, è possibile aggiungere il seguente codice HTML in una pagina del tuo sito web, ad esempio in una pagina sulla privacy.",
+        "OptOutExplanation": "Piwik è impegnato ad assicurare la riservatezza su Internet. Per dare ai vostri ospiti la possibilità di opt-out in Piwik Web Analytics, è possibile aggiungere il seguente codice HTML in una pagina del tuo sito web, ad esempio in una pagina sulla privacy.",
         "OptOutExplanationBis": "Questo codice serve per mostrare un iFrame contenente un link per i tuoi visitatori per opt-out per le impostazioni di Piwik, tramite un opt-out cookie nei loro browser. %s Clicca qui%s per vedere il contenuto che sarà mostrato nell'iFrame.",
         "OptOutForYourVisitors": "Piwik opt-out per i tuoi visitatori",
+        "PersonalPluginSettings": "Impostazioni Personali Plugin",
         "PiwikIsInstalledAt": "Piwik è installato su",
-        "PluginDescription": "Area di amministrazione Piwik.",
         "PluginSettingChangeNotAllowed": "Non sei abilitato a cambiare il valore dell'impostazione \"%s\" nel plugin \"%s\"",
         "PluginSettingReadNotAllowed": "Non sei abilitato a leggere il valore dell'impostazione \"%s\" nel plugin \"%s\"",
         "PluginSettings": "Impostazioni plugin",
         "PluginSettingsIntro": "Qui puoi cambiare le impostazioni dei seguenti plugin di terze parti:",
+        "PluginSettingsSaveFailed": "Salvataggio delle impostazioni del plugin fallito",
         "PluginSettingsValueNotAllowed": "Il valore del campo \"%s\" nel plugin \"%s\" non è consentito",
         "SendPluginUpdateCommunication": "Inviami una notifica email quando è disponibile un aggiornamento dei plugin",
         "SendPluginUpdateCommunicationHelp": "Verrà inviata una email ai Super User quando è disponibile una nuova versione di un plugin.",
         "StableReleases": "Se Piwik rappresenta una parte fondamentale nella vostra attività, vi raccomandiamo di utilizzare l'ultima versione stabile. Se utilizzate l'ultima versione beta e riscontrate un bug o avete dei suggerimenti, per favore %sguardate qui%s.",
+        "SystemPluginSettings": "Impostazioni di Sistema del Plugin",
         "TrackAGoal": "Traccia un obiettivo",
         "TrackingCode": "Codice di Tracciamento",
         "TrustedHostConfirm": "Siete sicuri di voler cambiare il nome host affidabile di Piwik?",
diff --git a/plugins/CoreAdminHome/lang/ja.json b/plugins/CoreAdminHome/lang/ja.json
index 19c1740a58..edab59ae39 100644
--- a/plugins/CoreAdminHome/lang/ja.json
+++ b/plugins/CoreAdminHome/lang/ja.json
@@ -63,7 +63,6 @@
         "OptOutExplanationBis": "HTML コードは、ビジターのブラウザにオプトアウト Cookie を設定する、Piwik オプトアウトリンクを含む iFrame を表示します。 iFrame で表示される内容を表示するには、%sここをクリック%sします。",
         "OptOutForYourVisitors": "ビジターの Piwik オプトアウト",
         "PiwikIsInstalledAt": "Piwikがインストールされているのは",
-        "PluginDescription": "Piwik の管理エリアです。",
         "PluginSettingChangeNotAllowed": "\"%s\" プラグインで \"%s\" 設定されている値変更は許可されていません。",
         "PluginSettingReadNotAllowed": "\"%s\" プラグインで \"%s\" 設定されている値の読み取りは許可されていません。",
         "PluginSettings": "プラグインの設定",
diff --git a/plugins/CoreAdminHome/lang/ka.json b/plugins/CoreAdminHome/lang/ka.json
index 4accd2e430..8e349f84f9 100644
--- a/plugins/CoreAdminHome/lang/ka.json
+++ b/plugins/CoreAdminHome/lang/ka.json
@@ -8,7 +8,6 @@
         "OptOutExplanation": "Piwik გამიზნულია ინტერნეტში კონფიდენციალურობის დაცვისთვის. რათა თქვენს ვიზიტორებს ქონდეთ საშუალება უარი თქვან Piwik Web Analytics მონაწილეობაზე, თქვენ შეგიძლიათ შემდეგი HTML კოდი ჩაამატოთ თქვენი ვებ საიტის ერთ–ერთ გვერდზე, მაგალითად კონფიდენციალურობის გვერდზე.",
         "OptOutExplanationBis": "ტეგი აჩვენებს Iframe, რომელიც შეიცავს ბმულს თქვენი ვიზიტორებისთვის, რომელზე დაწკაპუნებითაც ისინი უარს იტყვიან Piwik–ზე მათ ბრაუზერში უარის ქუქის ჩამატებით. %s დააწკაპუნეთ აქ%s, რომ იხილოთ მასალა, რომელიც გამოჩნდება iFrame–ით.",
         "OptOutForYourVisitors": "თქვენი ვიზიტორების უარი Piwik–ზე",
-        "PluginDescription": "Piwik–ის ადმინისტრირების ზონა",
         "YouAreOptedIn": "ამჟამად თქვენ მონაწილეობთ ანალიზში",
         "YouAreOptedOut": "ამჟამად თქვენ არ მონაწილეობთ ანალიზში",
         "YouMayOptOut": "თქვენ შეგიძლიათ შეარჩიოთ პარამეტრი, რომ არ გქონდეთ თქვენს კომპიუტერზე მინიჭებული ვებ ანალიზატორის ქუქის უნიკალური საიდენტიფიკაციო ნომერი, რათა არ მიიღოთ მონაწილეობა აგრეგაციასა და მონაცემთა ანალიზში ამ ვებ საიტზე.",
diff --git a/plugins/CoreAdminHome/lang/ko.json b/plugins/CoreAdminHome/lang/ko.json
index cd16201674..9158cdfb30 100644
--- a/plugins/CoreAdminHome/lang/ko.json
+++ b/plugins/CoreAdminHome/lang/ko.json
@@ -21,7 +21,6 @@
         "OptOutExplanationBis": "HTML 코드는 방문자의 브라우저에 차단 Cookie를 설정하는 Piwik 차단 링크를 ​​포함 iFrame을 표시합니다. iFrame에서 표시되는 내용을 표시하려면 %s여기를 클릭%s합니다.",
         "OptOutForYourVisitors": "방문자의 Piwik 차단",
         "PiwikIsInstalledAt": "Piwik가 설치되어 있습니다",
-        "PluginDescription": "Piwik의 관리 영역입니다.",
         "TrackAGoal": "목표 추적",
         "TrackingCode": "추적 코드",
         "TrustedHostConfirm": "신뢰할 수 있는 Piwik 호스트네임으로 변경하시겠습니까?",
diff --git a/plugins/CoreAdminHome/lang/lt.json b/plugins/CoreAdminHome/lang/lt.json
index 2f9abc1a73..82fb42f80f 100644
--- a/plugins/CoreAdminHome/lang/lt.json
+++ b/plugins/CoreAdminHome/lang/lt.json
@@ -1,7 +1,6 @@
 {
     "CoreAdminHome": {
         "Administration": "Administravimas",
-        "MenuGeneralSettings": "Pagrindiniai nustatymai",
-        "PluginDescription": "Piwik administravimo sritis"
+        "MenuGeneralSettings": "Pagrindiniai nustatymai"
     }
 }
\ No newline at end of file
diff --git a/plugins/CoreAdminHome/lang/lv.json b/plugins/CoreAdminHome/lang/lv.json
index e11920cbf9..62b565ad43 100644
--- a/plugins/CoreAdminHome/lang/lv.json
+++ b/plugins/CoreAdminHome/lang/lv.json
@@ -7,7 +7,6 @@
         "EmailServerSettings": "E-pasta servera iestatījumi",
         "LogoUpload": "Izvēlēties logo augšuplādei",
         "MenuGeneralSettings": "Vispārīgie iestatījumi",
-        "PluginDescription": "Piwik administrācijas sadaļa.",
         "UseCustomLogo": "Lietot izvēles logo",
         "YouAreOptedIn": "Jūs pašlaik esiet izvēlējušies piedalīties.",
         "YouAreOptedOut": "Jūs pašlaik esiet izvēlējušies nepiedalīties."
diff --git a/plugins/CoreAdminHome/lang/nb.json b/plugins/CoreAdminHome/lang/nb.json
index f8497516e9..12f70e7152 100644
--- a/plugins/CoreAdminHome/lang/nb.json
+++ b/plugins/CoreAdminHome/lang/nb.json
@@ -6,18 +6,18 @@
         "ClickHereToOptOut": "Trykk her for å ikke delta.",
         "EmailServerSettings": "Innstillinger for e-posttjener",
         "ForBetaTestersOnly": "Kun for beta testere",
-        "ImageTracking": "Bilde sporing",
+        "ImageTracking": "Bildesporing",
         "ImageTrackingLink": "Sporings lenke for bilde",
         "JavaScriptTracking": "JavaScript-sporing",
         "LatestBetaRelease": "Den nyeste betaversjonen",
         "LatestStableRelease": "Den siste stabile utgaven",
         "LogoUpload": "Velg en logo for å laste opp",
+        "MenuDevelopment": "Utvikling",
         "MenuDiagnostic": "Diagnostikk",
         "MenuGeneralSettings": "Generelle innstillinger",
         "MenuManage": "Administrer",
         "OptOutForYourVisitors": "Piwik «opt-out» for dine besøkende",
         "PiwikIsInstalledAt": "Piwik er installert på",
-        "PluginDescription": "Administrasjonsområdet for Piwik.",
         "TrackAGoal": "Spor et mål",
         "TrackingCode": "Sporingskode",
         "UpdateSettings": "Oppdater innstillinger",
diff --git a/plugins/CoreAdminHome/lang/nl.json b/plugins/CoreAdminHome/lang/nl.json
index 29c671240a..530f9d1974 100644
--- a/plugins/CoreAdminHome/lang/nl.json
+++ b/plugins/CoreAdminHome/lang/nl.json
@@ -33,7 +33,7 @@
         "JSTracking_EnableDoNotTrack": "Schakel Client side DoNotTrack detectie in.",
         "JSTracking_EnableDoNotTrack_AlreadyEnabled": "Opmerking: Server side DoNotTrack ondersteuning is ingeschakeld, deze optie heeft dus geen effect.",
         "JSTracking_EnableDoNotTrackDesc": "Tracking verzoeken zullen niet worden verzonden indien de bezoeker niet wenst gevolgd te worden.",
-        "JSTracking_GroupPageTitlesByDomain": "Plaats het site domein voor de pagina titel tijdens het traceren.",
+        "JSTracking_GroupPageTitlesByDomain": "Plaats het sitedomein voor de paginatitel tijdens het traceren.",
         "JSTracking_GroupPageTitlesByDomainDesc1": "Als iemand de 'over mij' bezoekt op blog.%1$s wordt het bewaard als 'blog \/ over mij'. Dit is de gemakkelijkste manier om een overzicht volgens subdomein te krijgen op je verkeer.",
         "JSTracking_MergeAliases": "In het \"Uitgaande links\" rapport, verberg kliks naar bekende aliassen van",
         "JSTracking_MergeAliasesDesc": "zo zullen kliks op links naar Ailias URL's (bijv. %s) zullen niet worden geteld worden als \"Uitgaande Link\"",
@@ -62,15 +62,18 @@
         "OptOutExplanation": "Piwik is ingericht om de privacy op internet te respecteren. U kunt uw bezoekers de keuze opting-out van Piwik Web Analytics aanbieden. Daartoe kunt u de volgende HTML-code toevoegen aan één van uw webpagina's, bijvoorbeeld op een pagina met de Privacy Policy.",
         "OptOutExplanationBis": "Deze code zal een I-frame tonen met daarin een link naar de opt-out van Piwik door een opt-out cookie te plaatsen in hun browser. %s Klik hier%s om de tekst te bekijken die in het I-frame getoond zal worden.",
         "OptOutForYourVisitors": "Piwik opt-out voor uw bezoekers",
+        "PersonalPluginSettings": "Persoonlijke Plugin Instellingen",
         "PiwikIsInstalledAt": "Piwik is geïnstalleerd in",
-        "PluginDescription": "Beheeromgeving van Piwik",
         "PluginSettingChangeNotAllowed": "U bent niet gemachtigd om de waarde aan te passen van de instelling \"%s\" in plugin \"%s\"",
+        "PluginSettingReadNotAllowed": "Je hebt geen toestemming voor het uitlezen van de instelling \"%s\" uit de plugin \"%s\"",
         "PluginSettings": "Plugin instellingen",
         "PluginSettingsIntro": "Hier kunt u instellingen aanpassen voor de volgende plugins van derden:",
+        "PluginSettingsSaveFailed": "Opslaan van plugin instellingen niet gelukt",
         "PluginSettingsValueNotAllowed": "De waarde voor veld \"%s\" in plugin \"%s\" is niet toegestaan",
         "SendPluginUpdateCommunication": "Stuur mij een email melding als er een nieuwe plugin update is",
         "SendPluginUpdateCommunicationHelp": "Een email wordt verstuurd naar de Super User wanneer er een nieuwe versie voor de plugin is.",
         "StableReleases": "Indien Piwik een essentieel onderdeel is van uw zaak, dan raaden wij aan om de laatste stabiele versie te draaien. Indien je de laatste beta gebruikt en je ontdekt bugs of hebt een suggestie, %skijk dan hier%s.",
+        "SystemPluginSettings": "Systeem Plugin Instellingen",
         "TrackAGoal": "Hou een doel bij.",
         "TrackingCode": "Tracking code.",
         "TrustedHostConfirm": "Weet je zker dat je de vertrouwde Piwik hostnaam wilt aanpassen?",
diff --git a/plugins/CoreAdminHome/lang/nn.json b/plugins/CoreAdminHome/lang/nn.json
index 97b2cd1164..ef834b8133 100644
--- a/plugins/CoreAdminHome/lang/nn.json
+++ b/plugins/CoreAdminHome/lang/nn.json
@@ -13,7 +13,6 @@
         "OptOutExplanation": "Piwik er oppteken av personvern på Internett.For å gje vitjarane dine valet om å slå av Piwik Nettstatistikk, kan du leggja til følgjande HTML-kode på ei av sidene dine, til dømes ei side med retningsliner for personvern.",
         "OptOutExplanationBis": "Denne koden vil visa ei flytande råme med ein peikar som vitjarane dine kan klikka på for å melda seg av med ein infokapsel i nettlesaren deira. %s Klikk her%s for å sjå innhaldet som visast i den flytande råma.",
         "OptOutForYourVisitors": "Avmelding av Piwik for vitjarar",
-        "PluginDescription": "Administrering av Piwik",
         "UseCustomLogo": "Bruk ein tilpassa logo",
         "YouAreOptedIn": "Du er påmeldt.",
         "YouAreOptedOut": "Du er avmeldt.",
diff --git a/plugins/CoreAdminHome/lang/pl.json b/plugins/CoreAdminHome/lang/pl.json
index f22c634a55..dc5c126ec5 100644
--- a/plugins/CoreAdminHome/lang/pl.json
+++ b/plugins/CoreAdminHome/lang/pl.json
@@ -63,7 +63,6 @@
         "OptOutExplanationBis": "Ten kod wyświetli ramkę Iframe zawierającą link dla odwiedzających do wyłączenia śledzenia przez ustawienie ciasteczka cookie dla ich przeglądarek. %s Kliknij tutaj%s, by zapoznać się z treścią wyświetlaną przez ramkę iFrame.",
         "OptOutForYourVisitors": "Wyłączenie działania Piwik dla twoich odwiedzających",
         "PiwikIsInstalledAt": "Piwik jest zainstalowany w",
-        "PluginDescription": "Strefa administratora statystyk Piwik.",
         "PluginSettingChangeNotAllowed": "Nie masz uprawnień do zmiany wartości parametru\"%s\" w pluginie \"%s\"",
         "PluginSettingReadNotAllowed": "Nie masz uprawnień do odczytu wartości ustawienia \"%s\" w pluginie \"%s\"",
         "PluginSettings": "Ustawienia pluginów",
diff --git a/plugins/CoreAdminHome/lang/pt-br.json b/plugins/CoreAdminHome/lang/pt-br.json
index bb1b19ea61..66a06a675b 100644
--- a/plugins/CoreAdminHome/lang/pt-br.json
+++ b/plugins/CoreAdminHome/lang/pt-br.json
@@ -57,7 +57,6 @@
         "OptOutExplanationBis": "Este código irá exibir um iframe contendo um link para os seus visitantes optarem por definir um cookie em seus navegadores para não utilizar o Piwik. %sClique aqui%s para visualizar o conteúdo que será exibido pelo iFrame.",
         "OptOutForYourVisitors": "Piwik opt-out para os seus visitantes",
         "PiwikIsInstalledAt": "Piwik esta instalado no",
-        "PluginDescription": "Área Administrativa do Piwik.",
         "PluginSettingChangeNotAllowed": "Você não tem permissão para alterar o valor da configuração \"%s\" no plug-in \"%s\"",
         "PluginSettings": "Configurações do plugin",
         "PluginSettingsIntro": "Aqui você pode alterar as configurações dos seguintes plugins de terceiros:",
diff --git a/plugins/CoreAdminHome/lang/pt.json b/plugins/CoreAdminHome/lang/pt.json
index a85b4e6d36..4c20cd633d 100644
--- a/plugins/CoreAdminHome/lang/pt.json
+++ b/plugins/CoreAdminHome/lang/pt.json
@@ -13,8 +13,10 @@
         "ForBetaTestersOnly": "Para testadores de versões beta apenas",
         "ImportingServerLogs": "A Importar Relatórios de Servidor",
         "InvalidPluginsWarning": "Os seguintes plugins não são compatíveis com %1$s e não puderam ser carregados: %2$s.",
+        "JavaScriptTracking": "Monitorização por JavaScript",
         "JSTracking_CampaignKwdParam": "Parâmetro da Palavra Chave da Campanha",
         "JSTracking_CodeNote": "Certifique-se que este código se encontra em todas as páginas do seu sítio de internet antes da etiqueta %1$s.",
+        "JSTracking_DisableCookies": "Desabilitar todos os cookies de rastreio.",
         "JSTracking_EnableDoNotTrack": "Ativar deteção NãoSeguir do lado do cliente",
         "JSTracking_MergeSubdomains": "Seguir visitantes através todos os subdomínios de",
         "JSTracking_PageCustomVars": "Siga uma variável personalizada para cada visualização de página",
@@ -25,6 +27,7 @@
         "LatestStableRelease": "A mais recente versão estável",
         "LogoUpload": "Selecione um logo para fazer upload",
         "MenuDevelopment": "Desenvolvimento",
+        "MenuDiagnostic": "Diagnóstico",
         "MenuGeneralSettings": "Definições gerais",
         "MenuManage": "Gerir",
         "OptOutComplete": "Opt-out completo; as suas visitas a este site não serão gravadas pela ferramenta de Web Analytics.",
@@ -33,7 +36,6 @@
         "OptOutExplanationBis": "Este código irá exibir um iFrame contendo um link para que seus visitantes possam fazer opt-out do Piwik definindo um cookie de opt-out nos navegadores do utilizador. %s Clique aqui%s para ver o conteúdo que será exibido pelo iFrame.",
         "OptOutForYourVisitors": "opt-out do Piwik para os seus visitantes",
         "PiwikIsInstalledAt": "Piwik encontra-se instalado em",
-        "PluginDescription": "Área de administração de Piwik.",
         "PluginSettingChangeNotAllowed": "Não lhe é permitido alterar o valor da definição \"%s\" no plugin \"%s\"",
         "PluginSettingReadNotAllowed": "Não lhe é permitido ler o valor da definição \"%s\" no plugin \"%s\"",
         "PluginSettings": "Definições de Plugin",
@@ -42,6 +44,7 @@
         "SendPluginUpdateCommunication": "Envie-me uma notificação para o correio eletrónico quando existir uma nova atualização para um plugin",
         "SendPluginUpdateCommunicationHelp": "Será enviado correio eletrónico para os Super Utilizadores quando existir uma nova versão disponível para um plugin.",
         "StableReleases": "Se o Piwik é uma parte crítica do seu negócio, recomendamos que utilize a versão estável mais recente. Se você usa a mais recente versão beta e julga que encontrou um erro ou possui uma sugestão, por favor %sveja aqui%s.",
+        "TrackingCode": "Código de monitorização",
         "UseCustomLogo": "Use um logo personalizado.",
         "YouAreOptedIn": "Actualmente está activa a opção opt-in",
         "YouAreOptedOut": "Actualmente está activa a opção opt-out",
diff --git a/plugins/CoreAdminHome/lang/ro.json b/plugins/CoreAdminHome/lang/ro.json
index 130de41f1c..47e6b3fb9f 100644
--- a/plugins/CoreAdminHome/lang/ro.json
+++ b/plugins/CoreAdminHome/lang/ro.json
@@ -59,7 +59,6 @@
         "OptOutExplanationBis": "Acest cod va afisa un Iframe ce va contine un link pentru ca vizitatorii tai sa se poata dezabona de la Piwik setand un cookie de dezabonare in browserele lor. %s Click aici%s pentru a vedea continutul care va fi afisat de iFrame.",
         "OptOutForYourVisitors": "Dezabonare Piwik pentru vizitatorii tai",
         "PiwikIsInstalledAt": "Piwik este instalat în",
-        "PluginDescription": "Zona de administrare Piwik.",
         "PluginSettingChangeNotAllowed": "Nu iti este permis sa schimbi valoarea setarii \"%s\" in plugin \"%s\"",
         "PluginSettingReadNotAllowed": "Nu se poate citi valoare setării \"%s\" din modulul \"%s\"",
         "PluginSettings": "Setarile pluginului",
diff --git a/plugins/CoreAdminHome/lang/ru.json b/plugins/CoreAdminHome/lang/ru.json
index dcf244d77d..06058c194b 100644
--- a/plugins/CoreAdminHome/lang/ru.json
+++ b/plugins/CoreAdminHome/lang/ru.json
@@ -26,19 +26,21 @@
         "JSTracking_CodeNote": "Удостоверьтесь, что этот код содержится на каждой странице вашего сайта перед тегом %1$s.",
         "JSTracking_CustomCampaignQueryParam": "Использовать пользовательские имена параметров в запросе для названия кампании и ключевого слова",
         "JSTracking_CustomCampaignQueryParamDesc": "Примечание: %1$sPiwik автоматически определит параметры Google Analytics.%2$s",
+        "JSTracking_DisableCookies": "Отключить все отслеживания cookies",
+        "JSTracking_DisableCookiesDesc": "Отключение всех first party cookies. Существующие cookies Piwik'а для этого веб-сайта будут удалены при следующем просмотре страницы.",
         "JSTracking_EnableDoNotTrack": "Включить обнаружение DoNotTrack на стороне пользователя.",
         "JSTracking_EnableDoNotTrack_AlreadyEnabled": "Примечание: на стороне сервера поддержка DoNotTrack была включена, так что эта опция не будет иметь никакого эффекта.",
         "JSTracking_EnableDoNotTrackDesc": "Пользователь не будет отслеживаться, если он этого не хочет.",
         "JSTracking_GroupPageTitlesByDomain": "Подставлять домен сайта перед названием страницы при отслеживании",
         "JSTracking_GroupPageTitlesByDomainDesc1": "Так что, если кто-то посещает страницу 'О нас' на поддомене blog.%1$s он будет записан как 'blog \/ О нас'. Это самый простой способ получить обзор вашего трафика по поддоменам.",
-        "JSTracking_MergeAliases": "В отчёте \"Внешние ссылки\" скрыть клики известных псевдонимов",
-        "JSTracking_MergeAliasesDesc": "Переходы по ссылкам на псевдонимы домена (например, %s) не будут учитываться как \"Внешние ссылки\".",
-        "JSTracking_MergeSubdomains": "Отслеживание посетителей через все поддомены",
+        "JSTracking_MergeAliases": "В отчёте «Внешние ссылки» скрыть клики известных псевдонимов сайта",
+        "JSTracking_MergeAliasesDesc": "Переходы по ссылкам на псевдонимы домена (например, %s) не будут учитываться как «Внешние ссылки».",
+        "JSTracking_MergeSubdomains": "Отслеживать посетителей через все поддомены сайта",
         "JSTracking_MergeSubdomainsDesc": "Если один посетитель заходил на %1$s и %2$s, то посещения будут учитываться как уникальный посетитель.",
         "JSTracking_PageCustomVars": "Отслеживать пользовательские переменные для каждого вида страницы",
-        "JSTracking_PageCustomVarsDesc": "Например, имя переменной \"Категория\" и значение \"Официальные документы\".",
+        "JSTracking_PageCustomVarsDesc": "Например, имя переменной «Категория», а значение – «Официальные документы».",
         "JSTracking_VisitorCustomVars": "Отслеживать пользовательские переменные для посетителя",
-        "JSTracking_VisitorCustomVarsDesc": "Например, имя переменной \"Тип\" и значение \"Клиент\".",
+        "JSTracking_VisitorCustomVarsDesc": "Например, имя переменной «Тип», а значение – «Клиент».",
         "JSTrackingIntro1": "Вы можете отслеживать посетителей разными способами. Мы рекомендуем использовать для этого JavaScript. Чтобы использовать это метод вы должны убедиться, что этот код размещён на каждой странице.",
         "JSTrackingIntro2": "Как только вы получили Javascript код для вашего сайта, скопируйте и вставьте его на все страницы вашего сайта, на которых вы хотите отслеживать посетителей.",
         "JSTrackingIntro3": "В большинстве CMS, блогах, сайтах и т.д. вы можете использовать готовый плагин, чтобы сделать технические правки на сайте вместо вас. (Смотрите %1$sсписок плагинов для интеграции с Piwik%2$s.) Если пока нет подходящего плагина - вы можете отредактировать шаблон сайта и добавить этот код в \"подвал\" файла.",
@@ -57,15 +59,17 @@
         "OptOutExplanation": "Piwik – за сохранение личных данных в сети. Поэтому данная система может предложить вашим пользователям выбор исключения из политики конфиденциальности (отказ от дальнейшего сбора статистики о пользователе). Вы можете вставить следующий HTML-код на одну из ваших страниц сайта, например на страницу о гарантиях конфиденциальности.",
         "OptOutExplanationBis": "Этот код будет отображаться в iFrame, содержащем ссылку для посетителя для отказа о сборе данных о нем. Данные отказа хранятся на стороне посетителя, в его cookies браузера. %s Нажмите здесь%s для просмотра содержимого iFrame.",
         "OptOutForYourVisitors": "Исключение из политики конфиденциальности Piwik для посетителей",
+        "PersonalPluginSettings": "Персональные настройки плагинов",
         "PiwikIsInstalledAt": "Piwik установлен в",
-        "PluginDescription": "Админпанель Piwik.",
         "PluginSettingChangeNotAllowed": "Вам не разрешено менять значение \"%s\" для плагина \"%s\"",
         "PluginSettingReadNotAllowed": "Вам не разрешено читать значение \"%s\" плагина \"%s\"",
-        "PluginSettings": "Настройки плагина",
+        "PluginSettings": "Настройки плагинов",
         "PluginSettingsIntro": "Здесь вы можете изменить настройки для следующих плагинов:",
+        "PluginSettingsSaveFailed": "Ошибка при сохранении настроек плагина",
         "SendPluginUpdateCommunication": "Отправить мне уведомление по электронной почте, когда есть новое обновление плагина",
         "SendPluginUpdateCommunicationHelp": "Письмо будет отправлено суперпользователю когда будет доступна новая версия плагина.",
         "StableReleases": "Если Piwik является важной частью вашего бизнеса, мы рекомендуем использовать последнюю стабильную версию. Если вы используете последнюю бета версию, и вы нашли ошибку или есть предложение, пожалуйста, %sперейдите по ссылке%s.",
+        "SystemPluginSettings": "Системные настройки плагинов",
         "TrackAGoal": "Отслеживать цель",
         "TrackingCode": "Код отслеживания",
         "TrustedHostConfirm": "Вы уверены, что хотите сменить имя доверенного хоста Piwik?",
diff --git a/plugins/CoreAdminHome/lang/sk.json b/plugins/CoreAdminHome/lang/sk.json
index c145c7d798..2b4ccdcf5f 100644
--- a/plugins/CoreAdminHome/lang/sk.json
+++ b/plugins/CoreAdminHome/lang/sk.json
@@ -12,7 +12,6 @@
         "MenuDiagnostic": "Diagnostika",
         "MenuGeneralSettings": "Všeobecné nastavenie",
         "MenuManage": "Spravovať",
-        "PluginDescription": "Správa oblasti Piwik.",
         "TrackAGoal": "Sledovať cieľ",
         "TrackingCode": "Kód sledovania",
         "TrustedHostConfirm": "Ste si istí, že chcete zmeniť dôveryhodné hostname pre Piwik?",
diff --git a/plugins/CoreAdminHome/lang/sl.json b/plugins/CoreAdminHome/lang/sl.json
index 42c1a18c2c..3b99f1173e 100644
--- a/plugins/CoreAdminHome/lang/sl.json
+++ b/plugins/CoreAdminHome/lang/sl.json
@@ -17,7 +17,6 @@
         "MenuManage": "Upravljaj",
         "OptOutExplanation": "Piwik želi zagotoviti zasebnost na internetu. Če želite svojim obiskovalcem omogočiti 'opt-out' iz Piwik spletne analitike, potem lahko dodate naslednjo HTML kodo na vašo spletno stran, npr. na stran 'Varovanje zasebnosti'.",
         "OptOutForYourVisitors": "'Opt-out' za vaše obiskovalce",
-        "PluginDescription": "Administrativno okolje Piwik.",
         "UseCustomLogo": "Uporabi poseben logo",
         "YouAreOptedIn": "Trenutno ste pridruženi.",
         "YouAreOptedOut": "Trenutno niste pridruženi."
diff --git a/plugins/CoreAdminHome/lang/sq.json b/plugins/CoreAdminHome/lang/sq.json
index 5e60565635..2e5f3bae8a 100644
--- a/plugins/CoreAdminHome/lang/sq.json
+++ b/plugins/CoreAdminHome/lang/sq.json
@@ -17,7 +17,6 @@
         "OptOutExplanationBis": "Ky kod do të shfaqë një Iframe që përmban një lidhje me të cilën vizitorët të mund të zgjedhin \"opt-out\" për Piwik-un, duke depozituar një \"opt-out cookie\" në shfletuesin e tyre. %s Klikoni këtu%s që të shihni lëndën që do të shfaqet nga iFrame-i.",
         "OptOutForYourVisitors": "\"Opt-out\" i Piwik-ut për vizitorët tuaj",
         "PiwikIsInstalledAt": "Piwik-u është instaluar te",
-        "PluginDescription": "Zona e administrimit të Piwik-ut.",
         "TrustedHostConfirm": "Jeni i sigurt se doni të ndryshoni emërstrehën e besuar të Piwik-ut?",
         "TrustedHostSettings": "Strehëemër e Besuar Piwik",
         "UseCustomLogo": "Përdorni një logo të përshtatur",
diff --git a/plugins/CoreAdminHome/lang/sr.json b/plugins/CoreAdminHome/lang/sr.json
index bf5f1557ce..a8fc2fd500 100644
--- a/plugins/CoreAdminHome/lang/sr.json
+++ b/plugins/CoreAdminHome/lang/sr.json
@@ -61,7 +61,6 @@
         "OptOutExplanationBis": "Ovaj tag će prikazati iframe element koji sadrži link za vaše posetioce koji žele da budu izuzeti iz Piwik analize tako što će imati specijalan opt-out kolačić u svom brauzeru. %s Kliknite ovde%s kako biste videli sadržaj iframe elementa.",
         "OptOutForYourVisitors": "Piwik opt-out za vaše posetioce",
         "PiwikIsInstalledAt": "Piwik je instaliran",
-        "PluginDescription": "Piwik administracija",
         "PluginSettingChangeNotAllowed": "Nije vam dozvoljeno da promenite vrednost podešavanja \"%s\" u dodatku \"%s\"",
         "PluginSettingReadNotAllowed": "Nije vam dozvoljeno da vidite vrednost podešavanja \"%s\" u dodatku \"%s\"",
         "PluginSettings": "Podešavanja dodatka",
diff --git a/plugins/CoreAdminHome/lang/sv.json b/plugins/CoreAdminHome/lang/sv.json
index e76241c8a3..68f4418f88 100644
--- a/plugins/CoreAdminHome/lang/sv.json
+++ b/plugins/CoreAdminHome/lang/sv.json
@@ -11,6 +11,7 @@
         "DevelopmentProcess": "Vår %sutvecklingsprocess%s inkluderar tusentals automatiserade test, och Beta test spelar en nyckelroll i Piwiks policy mot buggar.",
         "EmailServerSettings": "E-postinställningar (server)",
         "FaviconUpload": "Välj en Favicon att ladda upp",
+        "FileUploadDisabled": "Uppladdning av filer är inte aktiverat i din PHP-konfiguration. För att ladda upp din egen logo, sätt %s i php.ini och starta om din webbläsare.",
         "ForBetaTestersOnly": "Endast för betatestare",
         "ImageTracking": "Bildspårning",
         "ImageTrackingIntro1": "När en besökare har inaktiverat JavaScript, eller när JavaScript inte kan användas, så kan du använda bildspårning för att spåra besökare.",
@@ -27,6 +28,8 @@
         "JSTracking_CodeNote": "Se till att denna kod finns på varje sida av din hemsida före %1$s taggen.",
         "JSTracking_CustomCampaignQueryParam": "Använd den egna förfrågan för parameterns namn för kampanjnamn och sökord",
         "JSTracking_CustomCampaignQueryParamDesc": "Observera: %1$sPiwik kommer automatiskt upptäcka parametrar för Google Analytics. %2$s",
+        "JSTracking_DisableCookies": "Inaktivera spårnings cookies",
+        "JSTracking_DisableCookiesDesc": "Inaktivera alla direkta cookies. Befintliga Piwik cookies för denna webbsida kommer att raderas vid nästa sidvisning.",
         "JSTracking_EnableDoNotTrack": "Aktivera klientsidan för sidan \"SpåraInte\" upptäckt",
         "JSTracking_EnableDoNotTrack_AlreadyEnabled": "Observera: Rapporten till server sidan SpåraInteRapport har aktiverats, så det här valet kommer inte att ha någon effekt.",
         "JSTracking_EnableDoNotTrackDesc": "Ingen spårningsförfrågan kommer att skickas om inte besökare önskar att bli spårade.",
@@ -50,6 +53,7 @@
         "LogoNotWriteableInstruction": "Om du vill använda din egen logotyp istället för Piwiks logotyp, se till så att det finns skrivrättigheter till denna katalog: %1$s. Piwik behöver skrivrättighet för dina logotyper som lagras i filerna %2$s.",
         "LogoUpload": "Välj en logotyp att ladda upp",
         "LogoUploadHelp": "Ladda upp en fil i %s format med en minsta höjd på %s pixlar.",
+        "MenuDevelopment": "Utveckling",
         "MenuDiagnostic": "Diagnostik",
         "MenuGeneralSettings": "Allmänna inställningar",
         "MenuManage": "Hantera",
@@ -59,11 +63,11 @@
         "OptOutExplanationBis": "Denna kod kommer att visas i en iFrame som innehåller en länk så att dina besökare kan välja bort Piwik genom att sätta en cookie i sina webbläsare. %s Klicka här för%s att visa innehållet som kommer att visas i iFrame'n.",
         "OptOutForYourVisitors": "Exkludera spårning för dina besökare",
         "PiwikIsInstalledAt": "Piwik är installerat på",
-        "PluginDescription": "Piwik's administrationsområde.",
         "PluginSettingChangeNotAllowed": "Det är inte tillåtet att ändra värdet i inställningar för \"%s\" i plugin \"\"%s\"",
         "PluginSettingReadNotAllowed": "Du har inte rättighet att läsa värdet för inställningen \"%s\" i tillägget \"%s\"",
         "PluginSettings": "Plugin inställningar",
         "PluginSettingsIntro": "Här kan du ändra inställningarna för tredje parts plugin:",
+        "PluginSettingsSaveFailed": "Misslyckades att spara plugin-inställningar",
         "PluginSettingsValueNotAllowed": "Värdet för det här området \"%s\" i Plugin \"%s\" är inte tillåtet",
         "SendPluginUpdateCommunication": "Skicka mig ett e-postmeddelande när det finns en ny uppdatering för tillägget",
         "SendPluginUpdateCommunicationHelp": "Ett e-postmeddelande kommer att skickas till Administratörerna när det finns en ny uppdatering för ett tillägg",
diff --git a/plugins/CoreAdminHome/lang/ta.json b/plugins/CoreAdminHome/lang/ta.json
index dbaace7b5c..f104ceb1f5 100644
--- a/plugins/CoreAdminHome/lang/ta.json
+++ b/plugins/CoreAdminHome/lang/ta.json
@@ -34,7 +34,6 @@
         "OptOutComplete": "விலகுதல் முழுமையடைந்தது; இந்த வலைத்தளத்தில் உங்களது வருகைகள் இணைய பகுப்பாய்வு கருவி மூலம் பதிவு செய்யப்பட மாட்டாது.",
         "OptOutForYourVisitors": "பிவிக் உங்கள் வருகையாளர்களை தவிர்க்க",
         "PiwikIsInstalledAt": "பிவிக் நிறுவப்பட்ட இடம்",
-        "PluginDescription": "பிவிக் நிர்வாகப்பகுதி",
         "PluginSettingsIntro": "இங்கே மூன்றாம் தர சொருகிகளுக்கான அமைப்புக்களை மாற்ற முடியும்",
         "TrackAGoal": "ஒரு குறிக்கோளைக் கண்காணி",
         "TrackingCode": "கண்காணிக்கும் குறியீடுகள்",
diff --git a/plugins/CoreAdminHome/lang/te.json b/plugins/CoreAdminHome/lang/te.json
index bbde378139..4a0767fa80 100644
--- a/plugins/CoreAdminHome/lang/te.json
+++ b/plugins/CoreAdminHome/lang/te.json
@@ -1,7 +1,6 @@
 {
     "CoreAdminHome": {
         "Administration": "నిర్వహణ",
-        "MenuGeneralSettings": "సాధారణ అమరికలు",
-        "PluginDescription": "పివిక్ నిర్వహణా కేంద్రం."
+        "MenuGeneralSettings": "సాధారణ అమరికలు"
     }
 }
\ No newline at end of file
diff --git a/plugins/CoreAdminHome/lang/th.json b/plugins/CoreAdminHome/lang/th.json
index f86596cce6..570631d1e5 100644
--- a/plugins/CoreAdminHome/lang/th.json
+++ b/plugins/CoreAdminHome/lang/th.json
@@ -10,7 +10,6 @@
         "OptOutExplanation": "Piwik มีความมุ่งมั่นที่จะให้ความเป็นส่วนตัวบนอินเทอร์เน็ต เพื่อให้ผู้เข้าชมให้กับทางเลือกของการเลือกออกของ Piwik วิเคราะห์เว็บคุณสามารถเพิ่มรหัส HTML ต่อไปนี้บนหน้าหนึ่งของเว็บไซต์ของคุณ ตัวอย่างเช่น ในหน้านโยบายความเป็นส่วนตัว",
         "OptOutExplanationBis": "รหัสนี้จะแสดง Iframe ที่มีลิงค์สำหรับผู้เข้าชมของคุณเพื่อยกเลิกการเลือก Piwik โดยการตั้งค่าคุกกี้ยกเลิกการเลือกในเบราว์เซอร์ %s คลิกที่นี่ %s เพื่อดูเนื้อหาที่จะแสดงโดย iFrame",
         "OptOutForYourVisitors": "Piwik ยกเลิกการเลือกสำหรับผู้เข้าชมของคุณ",
-        "PluginDescription": "พื้นที่การจัดการของ Piwik",
         "TrustedHostSettings": "ชื่อโฮสต์ Piwik ที่เชื่อถือได้",
         "UseCustomLogo": "ใช้รูปโลโก้ที่กำหนดเอง",
         "YouAreOptedIn": "ขณะนี้คุณได้ออนไลน์",
diff --git a/plugins/CoreAdminHome/lang/tl.json b/plugins/CoreAdminHome/lang/tl.json
index 9a3da1fcb7..5f7eb5be28 100644
--- a/plugins/CoreAdminHome/lang/tl.json
+++ b/plugins/CoreAdminHome/lang/tl.json
@@ -61,7 +61,6 @@
         "OptOutExplanationBis": "Ang code na ito ay magpapakita ng isang Iframe na naglalaman ng isang link para makapag-opt-out ang iyong mga bisita sa Piwik sa pamamagitan ng pagtatakda ng isang opt-out na cookie sa kanilang mga browser. %s I-click dito%s upang tingnan ang nilalaman na ipapakita sa iFrame.",
         "OptOutForYourVisitors": "Piwik opt-out para sa iyong mga bisita",
         "PiwikIsInstalledAt": "Ang Piwik ay naka-install sa",
-        "PluginDescription": "Lugar ng Pangangasiwa ng Piwik",
         "PluginSettingChangeNotAllowed": "Hindi ka pinapahintulutang baguhin ang halaga ng setting \"%s\" sa plugin \"%s\"",
         "PluginSettingReadNotAllowed": "Hindi ka pinapahintulutang basahin ang halaga ng setting \"%s\" sa plugin \"%s\"",
         "PluginSettings": "Mga setting ng plugin",
diff --git a/plugins/CoreAdminHome/lang/tr.json b/plugins/CoreAdminHome/lang/tr.json
index 86d252c9f7..f3789430ac 100644
--- a/plugins/CoreAdminHome/lang/tr.json
+++ b/plugins/CoreAdminHome/lang/tr.json
@@ -52,7 +52,6 @@
         "OptOutExplanation": "Bu yazılım kendini internette gizlilik sağlamaya adamıştır. Ekteki html kodunu sitenize ekleyerek ziyaretçilerinize izlenmeme (opsiyonel olarak) seçeneği sunabilirsiniz. Örnek olarak bunu Gizlilik Politikanız sayfasında sunabilirsiniz.",
         "OptOutForYourVisitors": "ziyaretciniz için Piwiki devre dışı bırakmak",
         "PiwikIsInstalledAt": "Piwikde yüklenir",
-        "PluginDescription": "Piwik yönetici arenasi.",
         "PluginSettingChangeNotAllowed": "Bu ayarların \"%s\" değerlerini değiştirmek için \"%s\" eklentisinde gerekli izniniz yok.",
         "PluginSettings": "Eklenti ayarları",
         "PluginSettingsIntro": "Buradan aşağıdaki 3. parti eklentiler için ayarları değiştirebilirsiniz:",
diff --git a/plugins/CoreAdminHome/lang/uk.json b/plugins/CoreAdminHome/lang/uk.json
index 91cf32de42..940b3d5438 100644
--- a/plugins/CoreAdminHome/lang/uk.json
+++ b/plugins/CoreAdminHome/lang/uk.json
@@ -8,7 +8,6 @@
         "OptOutExplanation": "Piwik турбується про конфіденціальність в Інтернеті. Щоб надати вашим відвідувачам можливість відмовитися від включення інфомації про них до бази даних веб-аналітики Piwik, додайте наступний HTML код на одну з ваших сторінок - для прикладу на сторінку \"Політика конфіденційності\".",
         "OptOutExplanationBis": "Тег покаже \"iframe\", в якому міститиметься посилання для ваших відвідувачів, клацнувши на яке, вони зможуть відмовитися від потрапляння в веб-аналітику через отримання відповідного файлу cookie. %s Клацніть тут%s, щоб переглянути вміст що буде показано в \"iframe\".",
         "OptOutForYourVisitors": "Відмова від включення в аналітику для відвідувачів.",
-        "PluginDescription": "Панель Адміністратора Piwik",
         "YouAreOptedIn": "Наразі статистика записується в базу даних",
         "YouAreOptedOut": "Наразі статистика не записується в базу даних",
         "YouMayOptOut": "Ви можете вибрати варіант, щоб не отримувати унікального ідентифікатора cookie призначеного для вашого компютера, щоб уникнути агрегації та аналізу даних, зібраних цим веб-сайтом.",
diff --git a/plugins/CoreAdminHome/lang/vi.json b/plugins/CoreAdminHome/lang/vi.json
index b27cc55d0b..2654ccbda7 100644
--- a/plugins/CoreAdminHome/lang/vi.json
+++ b/plugins/CoreAdminHome/lang/vi.json
@@ -57,7 +57,6 @@
         "OptOutExplanationBis": "Đoạn mã này sẽ hiển thị một Iframe chứa đường dẫn cho người ghé thăm trang web của bạn chặn Piwik bằng cách thiết lập một cookie opt-out trong trình duyệt của họ. %sNhấn vào đây%s để xem nội dung sẽ được hiển thị bởi iFrame.",
         "OptOutForYourVisitors": "Piwik không tham gia truy cập của bạn",
         "PiwikIsInstalledAt": "Piwik được cài đặt tại",
-        "PluginDescription": "vùng quản trị của Piwik.",
         "PluginSettingChangeNotAllowed": "Bạn không được phép thay đổi giá trị của các thiết lập \"%s\" trong plugin \"%s\"",
         "PluginSettings": "Cài đặt tiện ích",
         "PluginSettingsIntro": "Ở đây bạn có thể thay đổi các thiết lập cho các plugin của bên thứ 3 như sau:",
diff --git a/plugins/CoreAdminHome/lang/zh-cn.json b/plugins/CoreAdminHome/lang/zh-cn.json
index 11fa57cd16..86c3447058 100644
--- a/plugins/CoreAdminHome/lang/zh-cn.json
+++ b/plugins/CoreAdminHome/lang/zh-cn.json
@@ -57,7 +57,6 @@
         "OptOutExplanationBis": "本代码将显示一个包含链接的 Iframe，供访客在浏览器中设置主动退出的 cookie 来退出 Piwik 的统计。%s 点这里%s 查看将在 iFrame 里显示的内容。",
         "OptOutForYourVisitors": "访客主动退出 Piwik",
         "PiwikIsInstalledAt": "Piwik 安装在",
-        "PluginDescription": "Piwik 插件管理",
         "PluginSettingChangeNotAllowed": "不允许更改插件＂%s＂中配置＂%s＂的值",
         "PluginSettings": "插件设置",
         "PluginSettingsIntro": "这里，你可以更改下列第三方插件的配置：",
diff --git a/plugins/CoreAdminHome/lang/zh-tw.json b/plugins/CoreAdminHome/lang/zh-tw.json
index 92f0e43368..ed8f285f51 100644
--- a/plugins/CoreAdminHome/lang/zh-tw.json
+++ b/plugins/CoreAdminHome/lang/zh-tw.json
@@ -5,7 +5,6 @@
         "JavaScriptTracking": "JS追蹤程式碼",
         "MenuDiagnostic": "診斷",
         "MenuGeneralSettings": "一般設定",
-        "MenuManage": "管理",
-        "PluginDescription": "Piwik 管理區域"
+        "MenuManage": "管理"
     }
 }
\ No newline at end of file
diff --git a/plugins/CoreAdminHome/stylesheets/generalSettings.less b/plugins/CoreAdminHome/stylesheets/generalSettings.less
index f4af53c901..076d760009 100644
--- a/plugins/CoreAdminHome/stylesheets/generalSettings.less
+++ b/plugins/CoreAdminHome/stylesheets/generalSettings.less
@@ -7,6 +7,11 @@
     text-decoration: underline;
 }
 
+.admin h2 + .top_bar_sites_selector {
+  margin-top: -62px;
+  margin-right: 0px !important;
+}
+
 #content.admin {
     margin: 0 0 0 260px;
     padding: 0 0 40px;
@@ -16,17 +21,18 @@
 
 .admin #header_message {
     margin-top: 10px;
+    margin-right: 10px;
 }
 
 table.admin {
     font-size: 0.9em;
-    background-color: #fff;
+    background-color: @theme-color-background-base;
     border-collapse: collapse;
 }
 
 table.admin thead th {
-    border-right: 1px solid #fff;
-    color: #fff;
+    border-right: 1px solid @theme-color-background-base;
+    color: @theme-color-background-base;
     text-align: center;
     padding: 5px;
     text-transform: uppercase;
@@ -138,6 +144,10 @@ table.admin  tbody td:hover, table.admin  tbody th:hover {
     margin-left: 50px;
 }
 
+.adminTable .columnHelp .ui-inline-help {
+    margin-left: 0px;
+}
+
 /* other styles */
 .form-description {
     color: @theme-color-text-lighter;
diff --git a/plugins/CoreAdminHome/stylesheets/menu.less b/plugins/CoreAdminHome/stylesheets/menu.less
index 79c98e228b..cb6f3a6eaf 100644
--- a/plugins/CoreAdminHome/stylesheets/menu.less
+++ b/plugins/CoreAdminHome/stylesheets/menu.less
@@ -21,6 +21,7 @@
     margin-top: 0.1em;
     border: 1px solid #ddd;
     border-radius: 5px;
+    border-left: 0px;
 }
 
 .Menu--admin > .Menu-tabList li {
diff --git a/plugins/CoreAdminHome/stylesheets/pluginSettings.less b/plugins/CoreAdminHome/stylesheets/pluginSettings.less
index 9633c0423d..0d8c8469cf 100644
--- a/plugins/CoreAdminHome/stylesheets/pluginSettings.less
+++ b/plugins/CoreAdminHome/stylesheets/pluginSettings.less
@@ -12,6 +12,10 @@
     width:200px
   }
 
+  .control_text, .control_password {
+    max-width: 220px;
+  }
+
   .title {
     font-weight: bold
   }
diff --git a/plugins/CoreAdminHome/templates/_menu.twig b/plugins/CoreAdminHome/templates/_menu.twig
index 5ec9b95cbd..080f36e93c 100644
--- a/plugins/CoreAdminHome/templates/_menu.twig
+++ b/plugins/CoreAdminHome/templates/_menu.twig
@@ -1,23 +1,3 @@
-{% if adminMenu|length > 1 %}
-    <div class="Menu Menu--admin">
-        <ul class="Menu-tabList">
-        {% for name,submenu in adminMenu %}
-            {% if submenu._hasSubmenu %}
-            <li>
-                <span>{{ name|translate }}</span>
-                <ul>
-                {% for sname,url in submenu %}
-                    {% if sname|slice(0,1) != '_' %}
-                    <li>
-                        <a href='index.php{{ url._url|urlRewriteWithParameters }}'
-                           {% if currentAdminMenuName is defined and sname==currentAdminMenuName %}class='active'{% endif %}>{{ sname|translate }}</a>
-                    </li>
-                    {% endif %}
-                {% endfor %}
-                </ul>
-            </li>
-            {% endif %}
-        {% endfor %}
-        </ul>
-    </div>
-{% endif %}
+{% import '@CoreHome/macros.twig' as corehome %}
+
+{{ corehome.sidebarMenu(adminMenu, currentModule, currentAction) }}
\ No newline at end of file
diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig
index 5ee3f91389..1a1497ada5 100644
--- a/plugins/CoreAdminHome/templates/generalSettings.twig
+++ b/plugins/CoreAdminHome/templates/generalSettings.twig
@@ -335,16 +335,5 @@
     </p>
     {% endif %}
 {% endif %}
-<h2>{{ 'CoreAdminHome_OptOutForYourVisitors'|translate }}</h2>
-
-<p>{{ 'CoreAdminHome_OptOutExplanation'|translate }}
-    {% set optOutUrl %}{{ piwikUrl }}index.php?module=CoreAdminHome&action=optOut&language={{ language }}{% endset %}
-    {% set iframeOptOut %}
-        <iframe style="border: 0; height: 200px; width: 600px;" src="{{ optOutUrl }}"></iframe>
-    {% endset %}
-    <code>{{ iframeOptOut|escape }}</code>
-    <br/>
-    {{ 'CoreAdminHome_OptOutExplanationBis'|translate("<a href='" ~ optOutUrl ~ "' rel='noreferrer' target='_blank'>","</a>")|raw }}
-</p>
 
 {% endblock %}
diff --git a/plugins/CoreAdminHome/templates/pluginSettings.twig b/plugins/CoreAdminHome/templates/pluginSettings.twig
index 3dfe2873f4..bf9443537e 100644
--- a/plugins/CoreAdminHome/templates/pluginSettings.twig
+++ b/plugins/CoreAdminHome/templates/pluginSettings.twig
@@ -1,4 +1,4 @@
-{% extends 'admin.twig' %}
+{% extends mode == 'user' ? "user.twig" : "admin.twig" %}
 
 {% block content %}
 
@@ -6,38 +6,36 @@
     {% import 'macros.twig' as piwik %}
     {% import 'ajaxMacros.twig' as ajax %}
 
+    {% if mode == 'user' %}
+        <h2 piwik-enriched-headline>{{ 'CoreAdminHome_PersonalPluginSettings'|translate }}</h2>
+    {% else %}
+        <h2 piwik-enriched-headline>{{ 'CoreAdminHome_SystemPluginSettings'|translate }}</h2>
+    {% endif %}
+
     <p>
         {{ 'CoreAdminHome_PluginSettingsIntro'|translate }}
-        {% for pluginName, settings in pluginSettings %}
+        {% for pluginName, settings in pluginsSettings %}
             <a href="#{{ pluginName|e('html_attr') }}">{{ pluginName }}</a>{% if not loop.last %}, {% endif %}
         {% endfor %}
     </p>
 
     <input type="hidden" name="setpluginsettingsnonce" value="{{ nonce }}">
 
-    {% for pluginName, settings in pluginSettings %}
+    {% for pluginName, pluginSettings in pluginsSettings %}
 
         <h2 id="{{ pluginName|e('html_attr') }}">{{ pluginName }}</h2>
 
-        {% if settings.getIntroduction %}
+        {% if pluginSettings.introduction %}
             <p class="pluginIntroduction">
-                {{ settings.getIntroduction }}
+                {{ pluginSettings.introduction }}
             </p>
         {% endif %}
 
         <table class="adminTable" id="pluginSettings" data-pluginname="{{ pluginName|e('html_attr') }}">
 
-        {% for name, setting in settings.getSettingsForCurrentUser %}
+        {% for name, setting in pluginSettings.settings %}
             {% set settingValue = setting.getValue %}
 
-            {% if pluginName in firstSuperUserSettingNames|keys and name == firstSuperUserSettingNames[pluginName] %}
-                <tr>
-                    <td colspan="3">
-                        <h3 class="superUserSettings">{{ 'MobileMessaging_Settings_SuperAdmin'|translate }}</h3>
-                    </td>
-                </tr>
-            {% endif %}
-
             {% if setting.introduction %}
                 <tr>
                     <td colspan="3">
@@ -123,6 +121,7 @@
                                     {% if setting.uiControlType == 'checkbox' and settingValue %}
                                         checked="checked"
                                     {% endif %}
+                                    class="control_{{ setting.uiControlType|e('html_attr') }}"
                                     type="{{ setting.uiControlType|e('html_attr') }}"
                                     name="{{ setting.getKey|e('html_attr') }}"
                                     value="{{ settingValue|e('html_attr') }}"
diff --git a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
index bd54182b76..51d48ebe3f 100644
--- a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
+++ b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
@@ -1,4 +1,4 @@
-{% extends 'admin.twig' %}
+{% extends 'user.twig' %}
 
 {% block head %}
     {{ parent() }}
@@ -13,7 +13,7 @@
     feature-name="{{ 'CoreAdminHome_TrackingCode'|translate }}"
     help-url="http://piwik.org/docs/tracking-api/">{{ 'CoreAdminHome_JavaScriptTracking'|translate }}</h2>
 
-<div id="js-code-options" class="adminTable">
+<div id="js-code-options">
 
     <p>
         {{ 'CoreAdminHome_JSTrackingIntro1'|translate }}
@@ -201,7 +201,7 @@
 
 <h2 id="image-tracking-link">{{ 'CoreAdminHome_ImageTracking'|translate }}</h2>
 
-<div id="image-tracking-code-options" class="adminTable">
+<div id="image-tracking-code-options">
 
     <p>
         {{ 'CoreAdminHome_ImageTrackingIntro1'|translate }} {{ 'CoreAdminHome_ImageTrackingIntro2'|translate("<em>&lt;noscript&gt;&lt;/noscript&gt;</em>")|raw }}
diff --git a/plugins/CoreAdminHome/tests/Fixture/DuplicateActions.php b/plugins/CoreAdminHome/tests/Fixture/DuplicateActions.php
new file mode 100644
index 0000000000..7d98a57670
--- /dev/null
+++ b/plugins/CoreAdminHome/tests/Fixture/DuplicateActions.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+namespace Piwik\Plugins\CoreAdminHome\tests\Fixture;
+
+use Piwik\Common;
+use Piwik\Db;
+use Piwik\Tests\Framework\Fixture;
+
+/**
+ * Fixture that adds log table rows that use duplicate actions.
+ */
+class DuplicateActions extends Fixture
+{
+    const DUMMY_IDVISITOR = 'c1d2a36653fd88e2';
+
+    private static $dataToInsert = array(
+        'log_action' => array(
+            array('name' => 'action1', 'type' => 1),
+            array('name' => 'action1', 'type' => 1),
+            array('name' => 'action1', 'type' => 1),
+
+            array('name' => 'action2', 'type' => 2),
+            array('name' => 'ACTION2', 'type' => 1),
+            array('name' => 'action4', 'type' => 3),
+            array('name' => 'ACTION2', 'type' => 1),
+            array('name' => 'action5', 'type' => 2),
+
+            array('name' => 'action2', 'type' => 2),
+            array('name' => 'action4', 'type' => 3),
+            array('name' => 'ACTION2', 'type' => 1),
+            array('name' => 'action4', 'type' => 3),
+        ),
+        'log_link_visit_action' => array(
+            array(
+                'idsite' => 1,
+                'idvisitor' => self::DUMMY_IDVISITOR,
+                'idvisit' => 1,
+                'server_time' => '2012-01-01 00:00:00',
+                'time_spent_ref_action' => 100,
+                'idaction_url_ref' => 1,
+                'idaction_name_ref' => 2,
+                'idaction_name' => 3,
+                'idaction_url' => 4,
+                'idaction_event_action' => 5,
+                'idaction_event_category' => 6,
+                'idaction_content_interaction' => 7,
+                'idaction_content_name' => 8,
+                'idaction_content_piece' => 9,
+                'idaction_content_target' => 10,
+            ),
+            array(
+                'idsite' => 2,
+                'idvisitor' => self::DUMMY_IDVISITOR,
+                'idvisit' => 2,
+                'server_time' => '2013-01-01 00:00:00',
+                'time_spent_ref_action' => 120,
+                'idaction_url_ref' => 2,
+                'idaction_name_ref' => 3,
+                'idaction_name' => 5,
+                'idaction_url' => 7,
+                'idaction_event_action' => 9,
+                'idaction_event_category' => 10,
+                'idaction_content_interaction' => 11,
+                'idaction_content_name' => 11,
+                'idaction_content_piece' => 12,
+                'idaction_content_target' => 12,
+            ),
+        ),
+        'log_conversion' => array(
+            array(
+                'idvisit' => 1,
+                'idsite' => 1,
+                'idvisitor' => self::DUMMY_IDVISITOR,
+                'server_time' => '2012-02-01 00:00:00',
+                'idgoal' => 1,
+                'buster' => 1,
+                'url' => 'http://example.com/',
+                'location_country' => 'nz',
+                'visitor_count_visits' => 1,
+                'visitor_returning' => 1,
+                'visitor_days_since_order' => 1,
+                'visitor_days_since_first' => 1,
+                'idaction_url' => 4,
+            ),
+
+            array(
+                'idvisit' => 2,
+                'idsite' => 2,
+                'idvisitor' => self::DUMMY_IDVISITOR,
+                'server_time' => '2012-03-01 00:00:00',
+                'idgoal' => 2,
+                'buster' => 2,
+                'url' => 'http://example.com/',
+                'location_country' => 'nz',
+                'visitor_count_visits' => 1,
+                'visitor_returning' => 1,
+                'visitor_days_since_order' => 1,
+                'visitor_days_since_first' => 1,
+                'idaction_url' => 7,
+            )
+        ),
+        'log_conversion_item' => array(
+            array(
+                'idsite' => 1,
+                'idvisitor' => self::DUMMY_IDVISITOR,
+                'server_time' => '2012-02-01 00:00:00',
+                'idvisit' => 1,
+                'idorder' => 1,
+                'price' => 10,
+                'quantity' => 2,
+                'deleted' => 0,
+                'idaction_sku' => 1,
+                'idaction_name' => 2,
+                'idaction_category' => 3,
+                'idaction_category2' => 4,
+                'idaction_category3' => 5,
+                'idaction_category4' => 6,
+                'idaction_category5' => 7,
+            ),
+            array(
+                'idsite' => 2,
+                'idvisitor' => self::DUMMY_IDVISITOR,
+                'server_time' => '2012-01-09 00:00:00',
+                'idvisit' => 2,
+                'idorder' => 2,
+                'price' => 10,
+                'quantity' => 1,
+                'deleted' => 1,
+                'idaction_sku' => 2,
+                'idaction_name' => 3,
+                'idaction_category' => 5,
+                'idaction_category2' => 7,
+                'idaction_category3' => 8,
+                'idaction_category4' => 9,
+                'idaction_category5' => 10,
+            )
+        )
+    );
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        foreach (self::$dataToInsert as $table => $rows) {
+            self::insertRowData($table, $rows);
+        }
+    }
+
+    private static function insertRowData($unprefixedTable, $rows)
+    {
+        $table = Common::prefixTable($unprefixedTable);
+        foreach ($rows as $row) {
+            if ($unprefixedTable == 'log_action') {
+                $row['hash'] = crc32($row['name']);
+            }
+
+            if (isset($row['idvisitor'])) {
+                $row['idvisitor'] = pack("H*", $row['idvisitor']);
+            }
+
+            $placeholders = array_map(function () { return "?"; }, $row);
+            $sql = "INSERT INTO $table (" . implode(',', array_keys($row)) . ") VALUES (" . implode(',', $placeholders) . ")";
+            Db::query($sql, array_values($row));
+        }
+    }
+}
\ No newline at end of file
diff --git a/plugins/CoreAdminHome/tests/Framework/Mock/API.php b/plugins/CoreAdminHome/tests/Framework/Mock/API.php
new file mode 100644
index 0000000000..70070c50e9
--- /dev/null
+++ b/plugins/CoreAdminHome/tests/Framework/Mock/API.php
@@ -0,0 +1,26 @@
+<?php
+/**
+* Piwik - free/libre analytics platform
+*
+* @link http://piwik.org
+* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+*/
+
+namespace Piwik\Plugins\CoreAdminHome\tests\Framework\Mock;
+
+use Piwik\Tracker;
+
+class API extends \Piwik\Plugins\CoreAdminHome\API
+{
+    private $invalidatedReports = array();
+
+    public function invalidateArchivedReports($idSites, $dates, $period = false)
+    {
+        $this->invalidatedReports[] = func_get_args();
+    }
+
+    public function getInvalidatedReports()
+    {
+        return $this->invalidatedReports;
+    }
+}
diff --git a/plugins/CoreAdminHome/tests/Integration/FixDuplicateActionsTest.php b/plugins/CoreAdminHome/tests/Integration/FixDuplicateActionsTest.php
new file mode 100644
index 0000000000..ca56f3b026
--- /dev/null
+++ b/plugins/CoreAdminHome/tests/Integration/FixDuplicateActionsTest.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+namespace Piwik\Plugins\CoreAdminHome\tests\Integration;
+
+use Piwik\Common;
+use Piwik\Console;
+use Piwik\Db;
+use Piwik\Plugin\Manager as PluginManager;
+use Piwik\Plugins\CoreAdminHome\tests\Fixture\DuplicateActions;
+use Piwik\Plugins\QueuedTracking\tests\Framework\TestCase\IntegrationTestCase;
+use Symfony\Component\Console\Tester\ApplicationTester;
+
+/**
+ * @group Core
+ */
+class FixDuplicateActionsTest extends IntegrationTestCase
+{
+    /**
+     * @var DuplicateActions
+     */
+    public static $fixture = null;
+
+    /**
+     * @var ApplicationTester
+     */
+    protected $applicationTester = null;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $application = new Console();
+        $application->setAutoExit(false);
+
+        $this->applicationTester = new ApplicationTester($application);
+    }
+
+    public function test_FixDuplicateLogActions_CorrectlyRemovesDuplicates_AndFixesReferencesInOtherTables()
+    {
+        $result = $this->applicationTester->run(array(
+            'command' => 'core:fix-duplicate-log-actions',
+            '--invalidate-archives' => 0,
+            '-vvv' => false
+        ));
+
+        $this->assertEquals(0, $result, "Command failed: " . $this->applicationTester->getDisplay());
+
+        $this->assertDuplicateActionsRemovedFromLogActionTable();
+        $this->assertDuplicatesFixedInLogLinkVisitActionTable();
+        $this->assertDuplicatesFixedInLogConversionTable();
+        $this->assertDuplicatesFixedInLogConversionItemTable();
+
+        $this->assertContains("Found and deleted 7 duplicate action entries", $this->applicationTester->getDisplay());
+
+        $expectedAffectedArchives = array(
+            array('idsite' => '1', 'server_time' => '2012-01-01'),
+            array('idsite' => '2', 'server_time' => '2013-01-01'),
+            array('idsite' => '1', 'server_time' => '2012-02-01'),
+            array('idsite' => '2', 'server_time' => '2012-01-09'),
+            array('idsite' => '2', 'server_time' => '2012-03-01'),
+        );
+        foreach ($expectedAffectedArchives as $archive) {
+            $this->assertContains("[ idSite = {$archive['idsite']}, date = {$archive['server_time']} ]", $this->applicationTester->getDisplay());
+        }
+    }
+
+    private function assertDuplicateActionsRemovedFromLogActionTable()
+    {
+        $actions = Db::fetchAll("SELECT idaction, name FROM " . Common::prefixTable('log_action'));
+        $expectedActions = array(
+            array('idaction' => 1, 'name' => 'action1'),
+            array('idaction' => 4, 'name' => 'action2'),
+            array('idaction' => 5, 'name' => 'ACTION2'),
+            array('idaction' => 6, 'name' => 'action4'),
+            array('idaction' => 8, 'name' => 'action5'),
+        );
+        $this->assertEquals($expectedActions, $actions);
+    }
+
+    private function assertDuplicatesFixedInLogLinkVisitActionTable()
+    {
+        $columns = array(
+            'idaction_url_ref',
+            'idaction_name_ref',
+            'idaction_name',
+            'idaction_url',
+            'idaction_event_action',
+            'idaction_event_category',
+            'idaction_content_interaction',
+            'idaction_content_name',
+            'idaction_content_piece',
+            'idaction_content_target'
+        );
+        $rows = Db::fetchAll("SELECT " . implode(',', $columns) . " FROM " . Common::prefixTable('log_link_visit_action'));
+        $expectedRows = array(
+            array(
+                'idaction_url_ref' => '1',
+                'idaction_name_ref' => '1',
+                'idaction_name' => '1',
+                'idaction_url' => '4',
+                'idaction_event_action' => '5',
+                'idaction_event_category' => '6',
+                'idaction_content_interaction' => '5',
+                'idaction_content_name' => '8',
+                'idaction_content_piece' => '4',
+                'idaction_content_target' => '6'
+            ),
+            array(
+                'idaction_url_ref' => '1',
+                'idaction_name_ref' => '1',
+                'idaction_name' => '5',
+                'idaction_url' => '5',
+                'idaction_event_action' => '4',
+                'idaction_event_category' => '6',
+                'idaction_content_interaction' => '5',
+                'idaction_content_name' => '5',
+                'idaction_content_piece' => '6',
+                'idaction_content_target' => '6'
+            )
+        );
+        $this->assertEquals($expectedRows, $rows);
+    }
+
+    private function assertDuplicatesFixedInLogConversionTable()
+    {
+        $rows = Db::fetchAll("SELECT idaction_url FROM " . Common::prefixTable('log_conversion'));
+        $expectedRows = array(
+            array('idaction_url' => 4),
+            array('idaction_url' => 5)
+        );
+        $this->assertEquals($expectedRows, $rows);
+    }
+
+    private function assertDuplicatesFixedInLogConversionItemTable()
+    {
+        $columns = array(
+            'idaction_sku',
+            'idaction_name',
+            'idaction_category',
+            'idaction_category2',
+            'idaction_category3',
+            'idaction_category4',
+            'idaction_category5'
+        );
+        $rows = Db::fetchAll("SELECT " . implode(',', $columns) . " FROM " . Common::prefixTable('log_conversion_item'));
+        $expectedRows = array(
+            array(
+                'idaction_sku' => '1',
+                'idaction_name' => '1',
+                'idaction_category' => '1',
+                'idaction_category2' => '4',
+                'idaction_category3' => '5',
+                'idaction_category4' => '6',
+                'idaction_category5' => '5'
+            ),
+            array(
+                'idaction_sku' => '1',
+                'idaction_name' => '1',
+                'idaction_category' => '5',
+                'idaction_category2' => '5',
+                'idaction_category3' => '8',
+                'idaction_category4' => '4',
+                'idaction_category5' => '6'
+            )
+        );
+        $this->assertEquals($expectedRows, $rows);
+    }
+}
+
+FixDuplicateActionsTest::$fixture = new DuplicateActions();
\ No newline at end of file
diff --git a/plugins/CoreAdminHome/tests/Integration/Model/DuplicateActionRemoverTest.php b/plugins/CoreAdminHome/tests/Integration/Model/DuplicateActionRemoverTest.php
new file mode 100644
index 0000000000..a898ef1616
--- /dev/null
+++ b/plugins/CoreAdminHome/tests/Integration/Model/DuplicateActionRemoverTest.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+namespace Piwik\Plugins\CoreAdminHome\tests\Integration\Model;
+
+use Piwik\Common;
+use Piwik\Db;
+use Piwik\Plugins\CoreAdminHome\Model\DuplicateActionRemover;
+use Piwik\Plugins\CoreAdminHome\tests\Fixture\DuplicateActions;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+
+/**
+ * @group Core
+ */
+class DuplicateActionRemoverTest extends IntegrationTestCase
+{
+    /**
+     * @var DuplicateActions
+     */
+    public static $fixture = null;
+
+    /**
+     * @var DuplicateActionRemover
+     */
+    private $duplicateActionRemover;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->duplicateActionRemover = new DuplicateActionRemover();
+    }
+
+    public function test_getDuplicateIdActions_ReturnsDuplicateIdActions_AndTreatsLowestIdActionAsOriginal()
+    {
+        $expectedResult = array(
+            array('name' => 'action1', 'idaction' => 1, 'duplicateIdActions' => array(2, 3)),
+            array('name' => 'ACTION2', 'idaction' => 5, 'duplicateIdActions' => array(7, 11)),
+            array('name' => 'action2', 'idaction' => 4, 'duplicateIdActions' => array(9)),
+            array('name' => 'action4', 'idaction' => 6, 'duplicateIdActions' => array(10, 12)),
+        );
+        $actualResult = $this->duplicateActionRemover->getDuplicateIdActions();
+        $this->assertEquals($expectedResult, $actualResult);
+    }
+
+    public function test_fixDuplicateActionsInTable_CorrectlyUpdatesIdActionColumns_InSpecifiedTable()
+    {
+        $this->duplicateActionRemover->fixDuplicateActionsInTable('log_conversion_item', 5, array(3, 6, 7, 10));
+
+        $columns = array('idaction_sku', 'idaction_name', 'idaction_category', 'idaction_category2',
+                         'idaction_category3', 'idaction_category4', 'idaction_category5');
+
+        $expectedResult = array(
+            array(
+                'idaction_sku' => '1',
+                'idaction_name' => '2',
+                'idaction_category' => '5',
+                'idaction_category2' => '4',
+                'idaction_category3' => '5',
+                'idaction_category4' => '5',
+                'idaction_category5' => '5'
+            ),
+            array(
+                'idaction_sku' => '2',
+                'idaction_name' => '5',
+                'idaction_category' => '5',
+                'idaction_category2' => '5',
+                'idaction_category3' => '8',
+                'idaction_category4' => '9',
+                'idaction_category5' => '5'
+            ),
+        );
+        $actualResult = Db::fetchAll("SELECT " . implode(", ", $columns) . " FROM " . Common::prefixTable('log_conversion_item'));
+        $this->assertEquals($expectedResult, $actualResult);
+    }
+
+    public function test_getSitesAndDatesOfRowsUsingDuplicates_ReturnsTheServerTimeAndIdSite_OfRowsUsingSpecifiedActionIds()
+    {
+        $row = array(
+            'idsite' => 3,
+            'idvisitor' => pack("H*", DuplicateActions::DUMMY_IDVISITOR),
+            'server_time' => '2012-02-13 00:00:00',
+            'idvisit' => 5,
+            'idorder' => 6,
+            'price' => 15,
+            'quantity' => 21,
+            'deleted' => 1,
+            'idaction_sku' => 3,
+            'idaction_name' => 3,
+            'idaction_category' => 12,
+            'idaction_category2' => 3,
+            'idaction_category3' => 3,
+            'idaction_category4' => 3,
+            'idaction_category5' => 3,
+        );
+        Db::query("INSERT INTO " . Common::prefixTable('log_conversion_item') . " (" . implode(", ", array_keys($row))
+            . ") VALUES ('" . implode("', '", array_values($row)) . "')");
+
+        $expectedResult = array(
+            array('idsite' => 1, 'server_time' => '2012-02-01'),
+            array('idsite' => 3, 'server_time' => '2012-02-13')
+        );
+        $actualResult = $this->duplicateActionRemover->getSitesAndDatesOfRowsUsingDuplicates('log_conversion_item', array(4, 6, 12));
+        $this->assertEquals($expectedResult, $actualResult);
+    }
+}
+
+DuplicateActionRemoverTest::$fixture = new DuplicateActions();
\ No newline at end of file
diff --git a/plugins/CoreConsole/Commands/CoreArchiver.php b/plugins/CoreConsole/Commands/CoreArchiver.php
index 3ed3f2a7a5..ec151bf0ef 100644
--- a/plugins/CoreConsole/Commands/CoreArchiver.php
+++ b/plugins/CoreConsole/Commands/CoreArchiver.php
@@ -35,11 +35,7 @@ class CoreArchiver extends ConsoleCommand
             throw new \InvalidArgumentException('No valid URL given. If you have specified a valid URL try --piwik-domain instead of --url');
         }
 
-        if ($input->getOption('verbose')) {
-            Log::getInstance()->setLogLevel(Log::VERBOSE);
-        }
-
-        $archiver = $this->makeArchiver($url, $input);
+        $archiver = self::makeArchiver($url, $input);
 
         try {
             $archiver->main();
diff --git a/plugins/CoreConsole/Commands/DevelopmentSyncProcessedSystemTests.php b/plugins/CoreConsole/Commands/DevelopmentSyncProcessedSystemTests.php
new file mode 100644
index 0000000000..f2f0bddf74
--- /dev/null
+++ b/plugins/CoreConsole/Commands/DevelopmentSyncProcessedSystemTests.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\CoreConsole\Commands;
+
+use Piwik\Container\StaticContainer;
+use Piwik\Decompress\Tar;
+use Piwik\Development;
+use Piwik\Http;
+use Piwik\Plugin\ConsoleCommand;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class DevelopmentSyncProcessedSystemTests extends ConsoleCommand
+{
+    private $targetDir = 'tests/PHPUnit/System/processed';
+
+    public function isEnabled()
+    {
+        return Development::isEnabled();
+    }
+
+    protected function configure()
+    {
+        $this->setName('development:sync-system-test-processed');
+        $this->setDescription('For Piwik core devs. Copies processed system tests from travis artifacts to ' . $this->targetDir);
+        $this->addOption('branch', null, InputOption::VALUE_REQUIRED, 'The branch the tests were running on', 'master');
+        $this->addArgument('buildnumber', InputArgument::REQUIRED, 'Travis build number you want to sync.');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $branch      = $input->getOption('branch');
+        $buildNumber = $input->getArgument('buildnumber');
+        $targetDir   = PIWIK_INCLUDE_PATH . '/' . dirname($this->targetDir);
+        $tmpDir      = StaticContainer::get('path.tmp');
+
+        $this->validate($buildNumber, $targetDir, $tmpDir);
+
+        $filename = sprintf('processed.%s.tar.bz2', $buildNumber);
+        $urlBase  = sprintf('http://builds-artifacts.piwik.org/%s/%s/%s', $branch, $buildNumber, $filename);
+        $tests    = Http::sendHttpRequest($urlBase, $timeout = 120);
+
+        $tarFile = $tmpDir . $filename;
+        file_put_contents($tarFile, $tests);
+
+        $tar = new Tar($tarFile, 'bz2');
+        $tar->extract($targetDir);
+
+        $this->writeSuccessMessage($output, array(
+            'All processed system test results were copied to <comment>' . $this->targetDir . '</comment>',
+            'Compare them with the expected test results and commit them if needed.'
+        ));
+
+        unlink($tarFile);
+    }
+
+    private function validate($buildNumber, $targetDir, $tmpDir)
+    {
+        if (empty($buildNumber)) {
+            throw new \InvalidArgumentException('Missing build number.');
+        }
+
+        if (!is_writable($targetDir)) {
+            throw new \RuntimeException('Target dir is not writable: ' . $targetDir);
+        }
+
+        if (!is_writable($tmpDir)) {
+            throw new \RuntimeException('Tempdir is not writable: ' . $tmpDir);
+        }
+    }
+}
diff --git a/plugins/CoreConsole/Commands/DevelopmentSyncUITestScreenshots.php b/plugins/CoreConsole/Commands/DevelopmentSyncUITestScreenshots.php
index f80864ad43..be1bedd05d 100644
--- a/plugins/CoreConsole/Commands/DevelopmentSyncUITestScreenshots.php
+++ b/plugins/CoreConsole/Commands/DevelopmentSyncUITestScreenshots.php
@@ -29,7 +29,7 @@ class DevelopmentSyncUITestScreenshots extends ConsoleCommand
     {
         $this->setName('development:sync-ui-test-screenshots');
         $this->setDescription('For Piwik core devs. Copies screenshots '
-                            . 'from travis artifacts to tests/PHPUnit/UI/expected-ui-screenshots/');
+                            . 'from travis artifacts to tests/UI/expected-ui-screenshots/');
         $this->addArgument('buildnumber', InputArgument::REQUIRED, 'Travis build number you want to sync.');
         $this->addArgument('screenshotsRegex', InputArgument::OPTIONAL,
             'A regex to use when selecting screenshots to copy. If not supplied all screenshots are copied.', '.*');
@@ -74,7 +74,7 @@ class DevelopmentSyncUITestScreenshots extends ConsoleCommand
                 && preg_match("/" . $screenshotsRegex . "/", $file)
             ) {
                 if ($testPlugin == null) {
-                    $downloadTo = "tests/PHPUnit/UI/expected-ui-screenshots/$file";
+                    $downloadTo = "tests/UI/expected-ui-screenshots/$file";
                 } else {
                     $downloadTo = "plugins/$testPlugin/tests/UI/expected-ui-screenshots/$file";
                 }
@@ -99,15 +99,15 @@ class DevelopmentSyncUITestScreenshots extends ConsoleCommand
         $output->writeln('');
         $output->writeln("If all downloaded screenshots are valid you may push them with these commands:");
         $output->writeln('');
-        $commands = "cd tests/PHPUnit/UI/
+        $commands = "cd tests/UI/expected-ui-screenshots
 git pull
-git add expected-ui-screenshots/
-git commit -m'' # WRITE A COMMIT MESSAGE
+git add .
+git commit -m '' # WRITE A COMMIT MESSAGE
 git push
 cd ..
 git pull
-git add UI
-git commit -m'' #WRITE A COMMIT MESSAGE
+git add expected-ui-screenshots
+git commit -m '' #WRITE A COMMIT MESSAGE
 git push";
         $output->writeln($commands);
     }
diff --git a/plugins/CoreConsole/Commands/GenerateTest.php b/plugins/CoreConsole/Commands/GenerateTest.php
index 6047f2ddc7..c2b31b6fe5 100644
--- a/plugins/CoreConsole/Commands/GenerateTest.php
+++ b/plugins/CoreConsole/Commands/GenerateTest.php
@@ -24,38 +24,44 @@ class GenerateTest extends GeneratePluginBase
             ->setDescription('Adds a test to an existing plugin')
             ->addOption('pluginname', null, InputOption::VALUE_REQUIRED, 'The name of an existing plugin')
             ->addOption('testname', null, InputOption::VALUE_REQUIRED, 'The name of the test to create')
-            ->addOption('testtype', null, InputOption::VALUE_REQUIRED, 'Whether you want to create a "unit", "integration" or "system" test');
+            ->addOption('testtype', null, InputOption::VALUE_REQUIRED, 'Whether you want to create a "unit", "integration", "system", or "ui" test');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $pluginName = $this->getPluginName($input, $output);
-        $testName   = $this->getTestName($input, $output);
         $testType   = $this->getTestType($input, $output);
+        $testName   = $this->getTestName($input, $output, $testType);
 
         $exampleFolder = PIWIK_INCLUDE_PATH . '/plugins/ExamplePlugin';
         $replace       = array(
             'ExamplePlugin'    => $pluginName,
             'SimpleTest'       => $testName,
-            'SimpleSystemTest' => $testName
+            'SimpleSystemTest' => $testName,
+            'SimpleUITest_spec.js' => $testName . '_spec.js',
+            'SimpleUITest'     => $testName,
          );
 
         $whitelistFiles = $this->getTestFilesWhitelist($testType);
         $this->copyTemplateToPlugin($exampleFolder, $pluginName, $replace, $whitelistFiles);
 
-        $this->writeSuccessMessage($output, array(
-             sprintf('Test %s for plugin %s generated.', $testName, $pluginName),
-             'You can now start writing beautiful tests!',
+        $messages = array(
+            sprintf('Test %s for plugin %s generated.', $testName, $pluginName),
+        );
 
-        ));
+        if (strtolower($testType) === 'ui') {
+            $messages[] = 'To run this test execute the command: ';
+            $messages[] = '<comment>' . sprintf('./console tests:run-ui %s', $testName) . '</comment>';
+        } else {
+            $messages[] = 'To run all your plugin tests, execute the command: ';
+            $messages[] = '<comment>' . sprintf('./console tests:run %s', $pluginName) . '</comment>';
+            $messages[] = 'To run only this test: ';
+            $messages[] = '<comment>' . sprintf('./console tests:run %s', $testName) . '</comment>';
+        }
 
-        $this->writeSuccessMessage($output, array(
-             'To run all your plugin tests, execute the command: ',
-             sprintf('./console tests:run %s', $pluginName),
-             'To run only this test: ',
-             sprintf('./console tests:run %s', $testName),
-             'Enjoy!'
-        ));
+        $messages[] = 'Enjoy!';
+
+        $this->writeSuccessMessage($output, $messages);
     }
 
     /**
@@ -64,7 +70,7 @@ class GenerateTest extends GeneratePluginBase
      * @return string
      * @throws \RuntimeException
      */
-    private function getTestName(InputInterface $input, OutputInterface $output)
+    private function getTestName(InputInterface $input, OutputInterface $output, $testType)
     {
         $testname = $input->getOption('testname');
 
@@ -83,7 +89,7 @@ class GenerateTest extends GeneratePluginBase
             $validate($testname);
         }
 
-        if (!Common::stringEndsWith(strtolower($testname), 'test')) {
+        if (strtolower($testType) !== 'ui' && !Common::stringEndsWith(strtolower($testname), 'test')) {
             $testname = $testname . 'Test';
         }
 
@@ -108,7 +114,7 @@ class GenerateTest extends GeneratePluginBase
 
     public function getValidTypes()
     {
-        return array('unit', 'integration', 'system');
+        return array('unit', 'integration', 'system', 'ui');
     }
 
     /**
@@ -145,6 +151,17 @@ class GenerateTest extends GeneratePluginBase
      */
     protected function getTestFilesWhitelist($testType)
     {
+        if ('Ui' == $testType) {
+            return array(
+                '/tests',
+                '/tests/UI',
+                '/tests/UI/.gitignore',
+                '/tests/UI/expected-ui-screenshots',
+                '/tests/UI/expected-ui-screenshots/.gitkeep',
+                '/tests/UI/SimpleUITest_spec.js',
+            );
+        }
+
         if ('System' == $testType) {
             return array(
                 '/.gitignore',
diff --git a/plugins/CoreConsole/Commands/ManagePlugin.php b/plugins/CoreConsole/Commands/ManagePlugin.php
index 00dcd29c0a..1c2a4de0b7 100644
--- a/plugins/CoreConsole/Commands/ManagePlugin.php
+++ b/plugins/CoreConsole/Commands/ManagePlugin.php
@@ -9,7 +9,10 @@
 namespace Piwik\Plugins\CoreConsole\Commands;
 
 use Piwik\Plugin\ConsoleCommand;
-use Piwik\Plugin\Manager;
+use Piwik\Plugins\CorePluginsAdmin\Commands\ActivatePlugin;
+use Piwik\Plugins\CorePluginsAdmin\Commands\DeactivatePlugin;
+use Piwik\Plugins\CorePluginsAdmin\Commands\ListPlugins;
+use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -17,6 +20,8 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * core:plugin console command.
+ *
+ * @deprecated This command has been replaced with `plugin:*` commands.
  */
 class ManagePlugin extends ConsoleCommand
 {
@@ -72,27 +77,32 @@ class ManagePlugin extends ConsoleCommand
 
     private function activatePlugin(InputInterface $input, OutputInterface $output, $plugin)
     {
-        Manager::getInstance()->activatePlugin($plugin, $input, $output);
+        $output->writeln('<comment>Warning: the command core:plugin is deprecated, use plugin:activate instead.</comment>');
 
-        $output->writeln("Activated plugin <info>$plugin</info>");
+        $command = new ActivatePlugin();
+        $input = new ArrayInput(array(
+            'plugin' => $plugin,
+        ));
+        return $command->run($input, $output);
     }
 
     private function deactivatePlugin(InputInterface $input, OutputInterface $output, $plugin)
     {
-        Manager::getInstance()->deactivatePlugin($plugin, $input, $output);
+        $output->writeln('<comment>Warning: the command core:plugin is deprecated, use plugin:deactivate instead.</comment>');
 
-        $output->writeln("Deactivated plugin <info>$plugin</info>");
+        $command = new DeactivatePlugin();
+        $input = new ArrayInput(array(
+            'plugin' => $plugin,
+        ));
+        return $command->run($input, $output);
     }
 
-    private function listPlugins(InputInterface $input, OutputInterface $output, $plugin)
+    private function listPlugins(InputInterface $input, OutputInterface $output)
     {
-        $plugins = Manager::getInstance()->getPluginsLoadedAndActivated();
-
-        $count = count($plugins);
-        $output->writeln("Listing $count activated plugins:");
-        foreach($plugins as $plugin) {
-            $pluginName = $plugin->getPluginName();
-            $output->writeln("<info>$pluginName</info>");
-        };
+        $output->writeln('<comment>Warning: the command core:plugin is deprecated, use plugin:list instead.</comment>');
+
+        $command = new ListPlugins();
+        $input = new ArrayInput(array());
+        return $command->run($input, $output);
     }
 }
\ No newline at end of file
diff --git a/plugins/CoreConsole/Commands/WatchLog.php b/plugins/CoreConsole/Commands/WatchLog.php
index d2b650726c..599c986ea7 100644
--- a/plugins/CoreConsole/Commands/WatchLog.php
+++ b/plugins/CoreConsole/Commands/WatchLog.php
@@ -26,7 +26,7 @@ class WatchLog extends ConsoleCommand
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $path = StaticContainer::getContainer()->get('path.tmp') . '/logs/';
+        $path = StaticContainer::get('path.tmp') . '/logs/';
         $cmd = sprintf('tail -f %s*.log', $path);
 
         $output->writeln('Executing command: ' . $cmd);
diff --git a/plugins/CoreHome/Columns/ServerTime.php b/plugins/CoreHome/Columns/ServerTime.php
index 72cdcb1357..297c410058 100644
--- a/plugins/CoreHome/Columns/ServerTime.php
+++ b/plugins/CoreHome/Columns/ServerTime.php
@@ -8,6 +8,7 @@
  */
 namespace Piwik\Plugins\CoreHome\Columns;
 
+use Piwik\Date;
 use Piwik\Db;
 use Piwik\Plugin\Dimension\ActionDimension;
 use Piwik\Tracker\Action;
@@ -32,6 +33,6 @@ class ServerTime extends ActionDimension
     {
         $timestamp = $request->getCurrentTimestamp();
 
-        return Tracker::getDatetimeFromTimestamp($timestamp);
+        return Date::getDatetimeFromTimestamp($timestamp);
     }
 }
diff --git a/plugins/CoreHome/Columns/UserId.php b/plugins/CoreHome/Columns/UserId.php
index 55fea6b517..d4c438c47a 100644
--- a/plugins/CoreHome/Columns/UserId.php
+++ b/plugins/CoreHome/Columns/UserId.php
@@ -8,7 +8,12 @@
  */
 namespace Piwik\Plugins\CoreHome\Columns;
 
+use Piwik\Cache;
+use Piwik\DataTable;
+use Piwik\DataTable\Map;
+use Piwik\Period\Range;
 use Piwik\Plugin\Dimension\VisitDimension;
+use Piwik\Plugins\VisitsSummary\API as VisitsSummaryApi;
 use Piwik\Tracker\Request;
 use Piwik\Tracker\Visitor;
 use Piwik\Tracker\Action;
@@ -51,4 +56,63 @@ class UserId extends VisitDimension
         return $request->getForcedUserId();
     }
 
+    public function isUsedInAtLeastOneSite($idSites, $period, $date)
+    {
+        if ($period === 'day' || $period === 'week') {
+            $period = 'month';
+        }
+
+        if ($period === 'range') {
+            $period = 'day';
+        }
+
+        foreach ($idSites as $idSite) {
+            if ($this->isUsedInSiteCached($idSite, $period, $date)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private function isUsedInSiteCached($idSite, $period, $date)
+    {
+        $cache = Cache::getTransientCache();
+        $key   = sprintf('%d.%s.%s', $idSite, $period, $date);
+
+        if (!$cache->contains($key)) {
+            $result = $this->isUsedInSite($idSite, $period, $date);
+            $cache->save($key, $result);
+        }
+
+        return $cache->fetch($key);
+    }
+
+    private function isUsedInSite($idSite, $period, $date)
+    {
+        $result = VisitsSummaryApi::getInstance()->get($idSite, $period, $date, false, 'nb_users');
+
+        return $this->hasDataTableUsers($result);
+    }
+
+    public function hasDataTableUsers(DataTable\DataTableInterface $result)
+    {
+        if ($result instanceof Map) {
+            foreach ($result->getDataTables() as $table) {
+                if ($this->hasDataTableUsers($table)) {
+                    return true;
+                }
+            }
+        }
+
+        if (!$result->getRowsCount()) {
+            return false;
+        }
+
+        $numUsers = $result->getColumn('nb_users');
+        $numUsers = array_sum($numUsers);
+
+        return !empty($numUsers);
+    }
+
 }
\ No newline at end of file
diff --git a/plugins/CoreHome/Columns/VisitFirstActionTime.php b/plugins/CoreHome/Columns/VisitFirstActionTime.php
index 92b6619fed..3985d53339 100644
--- a/plugins/CoreHome/Columns/VisitFirstActionTime.php
+++ b/plugins/CoreHome/Columns/VisitFirstActionTime.php
@@ -8,6 +8,7 @@
  */
 namespace Piwik\Plugins\CoreHome\Columns;
 
+use Piwik\Date;
 use Piwik\Plugin\Dimension\VisitDimension;
 use Piwik\Tracker\Action;
 use Piwik\Tracker\Request;
@@ -27,6 +28,6 @@ class VisitFirstActionTime extends VisitDimension
      */
     public function onNewVisit(Request $request, Visitor $visitor, $action)
     {
-        return Tracker::getDatetimeFromTimestamp($request->getCurrentTimestamp());
+        return Date::getDatetimeFromTimestamp($request->getCurrentTimestamp());
     }
 }
\ No newline at end of file
diff --git a/plugins/CoreHome/Columns/VisitLastActionTime.php b/plugins/CoreHome/Columns/VisitLastActionTime.php
index 988757301b..d25f09abab 100644
--- a/plugins/CoreHome/Columns/VisitLastActionTime.php
+++ b/plugins/CoreHome/Columns/VisitLastActionTime.php
@@ -8,6 +8,7 @@
  */
 namespace Piwik\Plugins\CoreHome\Columns;
 
+use Piwik\Date;
 use Piwik\Plugin\Dimension\VisitDimension;
 use Piwik\Tracker\Action;
 use Piwik\Tracker\Request;
@@ -31,7 +32,7 @@ class VisitLastActionTime extends VisitDimension
      */
     public function onNewVisit(Request $request, Visitor $visitor, $action)
     {
-        return Tracker::getDatetimeFromTimestamp($request->getCurrentTimestamp());
+        return Date::getDatetimeFromTimestamp($request->getCurrentTimestamp());
     }
 
     /**
diff --git a/plugins/CoreHome/Controller.php b/plugins/CoreHome/Controller.php
index 387c31e9e9..7fdfe1d814 100644
--- a/plugins/CoreHome/Controller.php
+++ b/plugins/CoreHome/Controller.php
@@ -13,7 +13,6 @@ use Piwik\API\Request;
 use Piwik\Common;
 use Piwik\Date;
 use Piwik\FrontController;
-use Piwik\Menu\MenuMain;
 use Piwik\Menu\MenuReporting;
 use Piwik\Notification\Manager as NotificationManager;
 use Piwik\Piwik;
@@ -24,6 +23,7 @@ use Piwik\Plugins\CorePluginsAdmin\MarketplaceApiClient;
 use Piwik\Plugins\Dashboard\DashboardManagerControl;
 use Piwik\Plugins\UsersManager\API;
 use Piwik\Site;
+use Piwik\Translation\Translator;
 use Piwik\UpdateCheck;
 use Piwik\Url;
 use Piwik\View;
@@ -32,7 +32,19 @@ use Piwik\Plugin\Widgets as PluginWidgets;
 
 class Controller extends \Piwik\Plugin\Controller
 {
-    function getDefaultAction()
+    /**
+     * @var Translator
+     */
+    private $translator;
+
+    public function __construct(Translator $translator)
+    {
+        $this->translator = $translator;
+
+        parent::__construct();
+    }
+    
+    public function getDefaultAction()
     {
         return 'redirectToCoreHomeIndex';
     }
@@ -45,7 +57,7 @@ class Controller extends \Piwik\Plugin\Controller
         $report = Report::factory($reportModule, $reportAction);
 
         if (empty($report)) {
-            throw new Exception(Piwik::translate('General_ExceptionReportNotFound'));
+            throw new Exception($this->translator->translate('General_ExceptionReportNotFound'));
         }
 
         $report->checkIsEnabled();
@@ -56,7 +68,7 @@ class Controller extends \Piwik\Plugin\Controller
             throw new Exception('This report is not supposed to be displayed in the menu, please define a $menuTitle in your report.');
         }
 
-        $menuTitle = Piwik::translate($menuTitle);
+        $menuTitle = $this->translator->translate($menuTitle);
         $content   = $this->renderReportWidget($reportModule, $reportAction);
 
         return View::singleReport($menuTitle, $content);
@@ -70,7 +82,7 @@ class Controller extends \Piwik\Plugin\Controller
         $report = Report::factory($reportModule, $reportAction);
 
         if (empty($report)) {
-            throw new Exception(Piwik::translate('General_ExceptionReportNotFound'));
+            throw new Exception($this->translator->translate('General_ExceptionReportNotFound'));
         }
 
         $report->checkIsEnabled();
@@ -88,7 +100,7 @@ class Controller extends \Piwik\Plugin\Controller
             return $widget->$widgetAction();
         }
 
-        throw new Exception(Piwik::translate('General_ExceptionWidgetNotFound'));
+        throw new Exception($this->translator->translate('General_ExceptionWidgetNotFound'));
     }
 
     function redirectToCoreHomeIndex()
diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php
index ea692d7ba8..3fc71ddd53 100644
--- a/plugins/CoreHome/CoreHome.php
+++ b/plugins/CoreHome/CoreHome.php
@@ -73,7 +73,6 @@ class CoreHome extends \Piwik\Plugin
         $stylesheets[] = "plugins/CoreHome/stylesheets/notification.less";
         $stylesheets[] = "plugins/CoreHome/stylesheets/zen-mode.less";
         $stylesheets[] = "plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.less";
-        $stylesheets[] = "plugins/CoreHome/angularjs/menudropdown/menudropdown.directive.less";
         $stylesheets[] = "plugins/CoreHome/angularjs/dialogtoggler/ngdialog.less";
         $stylesheets[] = "plugins/CoreHome/angularjs/notification/notification.directive.less";
     }
@@ -100,6 +99,7 @@ class CoreHome extends \Piwik\Plugin
         $jsFiles[] = "plugins/Morpheus/javascripts/ajaxHelper.js";
         $jsFiles[] = "plugins/Morpheus/javascripts/jquery.icheck.min.js";
         $jsFiles[] = "plugins/Morpheus/javascripts/morpheus.js";
+        $jsFiles[] = "plugins/Morpheus/javascripts/layout.js";
         $jsFiles[] = "plugins/CoreHome/javascripts/require.js";
         $jsFiles[] = "plugins/CoreHome/javascripts/uiControl.js";
         $jsFiles[] = "plugins/CoreHome/javascripts/dataTable.js";
@@ -182,6 +182,7 @@ class CoreHome extends \Piwik\Plugin
         $translationKeys[] = 'CoreHome_FlattenDataTable';
         $translationKeys[] = 'CoreHome_UnFlattenDataTable';
         $translationKeys[] = 'CoreHome_ExternalHelp';
+        $translationKeys[] = 'CoreHome_ClickToEditX';
         $translationKeys[] = 'SitesManager_NotFound';
         $translationKeys[] = 'Annotations_ViewAndAddAnnotations';
         $translationKeys[] = 'General_RowEvolutionRowActionTooltipTitle';
diff --git a/plugins/CoreHome/DataTableRowAction/RowEvolution.php b/plugins/CoreHome/DataTableRowAction/RowEvolution.php
index 2e2631203a..e1bc8d5d4f 100644
--- a/plugins/CoreHome/DataTableRowAction/RowEvolution.php
+++ b/plugins/CoreHome/DataTableRowAction/RowEvolution.php
@@ -81,7 +81,7 @@ class RowEvolution
      * @param null|string $graphType
      * @throws Exception
      */
-    public function __construct($idSite, $date, $graphType = null)
+    public function __construct($idSite, $date, $graphType = 'graphEvolution')
     {
         $this->apiMethod = Common::getRequestVar('apiMethod', '', 'string');
         if (empty($this->apiMethod)) throw new Exception("Parameter apiMethod not set.");
@@ -199,6 +199,7 @@ class RowEvolution
         }
 
         $view->config->show_goals = false;
+        $view->config->show_search = false;
         $view->config->show_all_views_icons = false;
         $view->config->show_active_view_icon = false;
         $view->config->show_related_reports  = false;
@@ -230,14 +231,6 @@ class RowEvolution
             list($first, $last) = $this->getFirstAndLastDataPointsForMetric($metric);
             $details = Piwik::translate('RowEvolution_MetricBetweenText', array($first, $last));
 
-            // TODO: this check should be determined by metric metadata, not hardcoded here
-            if ($metric == 'nb_users'
-                && $first == 0
-                && $last == 0
-            ) {
-                continue;
-            }
-
             if ($change !== false) {
                 $lowerIsBetter = Metrics::isLowerValueBetter($metric);
                 if (substr($change, 0, 1) == '+') {
@@ -275,6 +268,15 @@ class RowEvolution
             if (!empty($metricData['logo'])) {
                 $newMetric['logo'] = $metricData['logo'];
             }
+
+            // TODO: this check should be determined by metric metadata, not hardcoded here
+            if ($metric == 'nb_users'
+                && $first == 0
+                && $last == 0
+            ) {
+                $newMetric['hide'] = true;
+            }
+
             $metrics[] = $newMetric;
             $i++;
         }
diff --git a/plugins/CoreHome/Menu.php b/plugins/CoreHome/Menu.php
new file mode 100644
index 0000000000..b2c239885e
--- /dev/null
+++ b/plugins/CoreHome/Menu.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\CoreHome;
+
+use Piwik\Db;
+use Piwik\Menu\MenuTop;
+use Piwik\Menu\MenuUser;
+use Piwik\Piwik;
+use Piwik\Plugin;
+use Piwik\Plugins\UsersManager\API as APIUsersManager;
+
+class Menu extends \Piwik\Plugin\Menu
+{
+    public function configureTopMenu(MenuTop $menu)
+    {
+        $login = Piwik::getCurrentUserLogin();
+        $user  = APIUsersManager::getInstance()->getUser($login);
+
+        if (!empty($user['alias'])) {
+            $login = $user['alias'];
+        }
+
+        if (Piwik::isUserIsAnonymous()) {
+            if (Plugin\Manager::getInstance()->isPluginActivated('Feedback')) {
+                $menu->addItem($login, null, array('module' => 'Feedback', 'action' => 'index'), 998);
+            } else {
+                $menu->addItem($login, null, array('module' => 'API', 'action' => 'listAllAPI'), 998);
+            }
+        } else {
+            $menu->addItem($login, null, array('module' => 'UsersManager', 'action' => 'userSettings'), 998);
+        }
+
+        $module = $this->getLoginModule();
+        if (Piwik::isUserIsAnonymous()) {
+            $menu->addItem('Login_LogIn', null, array('module' => $module), 999);
+        } else {
+            $menu->addItem('General_Logout', null, array('module' => $module, 'action' => 'logout', 'idSite' => null), 999);
+        }
+    }
+
+    public function configureUserMenu(MenuUser $menu)
+    {
+        $menu->addPersonalItem(null, array(), 1, false);
+        $menu->addManageItem(null, array(), 2, false);
+        $menu->addPlatformItem(null, array(), 3, false);
+    }
+
+    private function getLoginModule()
+    {
+        return Piwik::getLoginPluginName();
+    }
+
+}
diff --git a/plugins/CoreHome/angularjs/dialogtoggler/ngdialog.less b/plugins/CoreHome/angularjs/dialogtoggler/ngdialog.less
index fb0f666f80..264dbda703 100644
--- a/plugins/CoreHome/angularjs/dialogtoggler/ngdialog.less
+++ b/plugins/CoreHome/angularjs/dialogtoggler/ngdialog.less
@@ -15,7 +15,7 @@
   border-radius: 4px;
   margin: 0 auto;
   max-width: 100%;
-  background-color: #fff;
+  background-color: @theme-color-background-base;
   padding: 1em 18px;
   position: relative;
   top: 100px;
@@ -67,4 +67,4 @@
   &:hover:before {
     background-image: url(libs/jquery/themes/base/images/ui-icons_454545_256x240.png);
   }
-}
\ No newline at end of file
+}
diff --git a/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.html b/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.html
index 2a03f809c4..53dbca5f2c 100644
--- a/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.html
+++ b/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.html
@@ -1,6 +1,9 @@
 <div class="enrichedHeadline"
     ng-mouseenter="view.showIcons=true" ng-mouseleave="view.showIcons=false">
-    <span ng-transclude></span>
+    <span ng-show="!editUrl" class="title" ng-transclude></span>
+    <a ng-show="editUrl" class="title" href="{{ editUrl }}"
+       title="{{ 'CoreHome_ClickToEditX'|translate:featureName }}"
+       ng-transclude></a>
 
     <span ng-show="view.showIcons">
         <a ng-if="helpUrl && !inlineHelp"
diff --git a/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.js b/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.js
index 5678034821..79e1da49bf 100644
--- a/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.js
+++ b/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.js
@@ -17,8 +17,11 @@
  * <h2 piwik-enriched-headline help-url="http://piwik.org/guide">All Websites Dashboard</h2>
  * -> shows help icon and links to external url
  *
+ * <h2 piwik-enriched-headline edit-url="index.php?module=Foo&action=bar&id=4">All Websites Dashboard</h2>
+ * -> makes the headline clickable linking to the specified url
+ *
  * <h2 piwik-enriched-headline>All Websites Dashboard
- *     <div class="inlineHelp>My <strong>inline help</strong></div>
+ *     <div class="inlineHelp">My <strong>inline help</strong></div>
  * </h2>
  * -> shows help icon to display inline help on click. Note: You can combine inlinehelp and help-url
  */
@@ -29,7 +32,8 @@
 
     function piwikEnrichedHeadline($document, piwik, $filter){
         var defaults = {
-            helpUrl: ''
+            helpUrl: '',
+            editUrl: ''
         };
 
         return {
@@ -37,6 +41,7 @@
             restrict: 'A',
             scope: {
                 helpUrl: '@',
+                editUrl: '@',
                 featureName: '@'
             },
             templateUrl: 'plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.html?cb=' + piwik.cacheBuster,
@@ -63,7 +68,7 @@
                     }
 
                     if (!attrs.featureName) {
-                        attrs.featureName = $.trim(element.text());
+                        attrs.featureName = $.trim(element.find('.title').first().text());
                     }
                 };
             }
diff --git a/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.less b/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.less
index 6a4ab6137c..24f22ca812 100644
--- a/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.less
+++ b/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.less
@@ -5,6 +5,14 @@
 .enrichedHeadline {
   min-height: 22px;
 
+  a.title {
+    cursor: pointer;
+  }
+
+  .title {
+    color: @color-black-piwik;
+  }
+
   .inlineHelp {
     display:block;
     background: #F7F7F7;
diff --git a/plugins/CoreHome/angularjs/menudropdown/menudropdown.directive.less b/plugins/CoreHome/angularjs/menudropdown/menudropdown.directive.less
index a2155872e4..da8b79a1fc 100644
--- a/plugins/CoreHome/angularjs/menudropdown/menudropdown.directive.less
+++ b/plugins/CoreHome/angularjs/menudropdown/menudropdown.directive.less
@@ -15,7 +15,6 @@
       right: -15px;
       color: @theme-color-link;
       display: inline;
-      content: " \25BC";
       font-size: 1px;
       height: 0px;
       width: 0px;
diff --git a/plugins/CoreHome/angularjs/notification/notification.directive.less b/plugins/CoreHome/angularjs/notification/notification.directive.less
index bc3c5e3f5f..87630d0c33 100644
--- a/plugins/CoreHome/angularjs/notification/notification.directive.less
+++ b/plugins/CoreHome/angularjs/notification/notification.directive.less
@@ -1,3 +1,9 @@
+.admin .system.notification {
+  a {
+    color: #9b7a44;
+  }
+}
+
 .system.notification {
   color: #9b7a44;
   float: none;
diff --git a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less
index 9cb75f0646..4f1bd44a20 100644
--- a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less
+++ b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less
@@ -7,6 +7,10 @@
   height: 30px; /* Hack to not push the dashboard widget below */
 }
 
+table.dataTable tr td .sites_autocomplete a {
+  width: auto;
+}
+
 .sites_selector_in_dashboard {
   margin-top:10px;
 }
@@ -35,12 +39,12 @@
   float: left;
   position: relative;
   z-index: 19;
-  background: #fff url(plugins/Morpheus/images/sites_selection.png) repeat-x 0 0;
+  background: @theme-color-background-base url(plugins/Morpheus/images/sites_selection.png) repeat-x 0 0;
   border: 1px solid #d4d4d4;
   color: #255792;
   border-radius: 4px;
   cursor: pointer;
-  min-width: 195px;
+  width: 205px;
 }
 
 .sites_autocomplete .custom_select_main_link {
@@ -53,6 +57,10 @@
   padding-bottom: 9px;
 }
 
+#content.admin .adminTable .sites_autocomplete a {
+  text-decoration: none;
+}
+
 .sites_autocomplete .custom_select_ul_list li a,
 .sites_autocomplete .custom_select_all a,
 .sites_autocomplete .custom_select_main_link > span {
@@ -119,7 +127,7 @@
 
 .sites_autocomplete .custom_select_search .inp {
   vertical-align: top;
-  width: 190px;
+  width: 165px;
   padding: 2px 6px;
   border: 0;
   background: transparent;
@@ -128,7 +136,7 @@
 
 }
 .sites_autocomplete {
-  width: 195px;
+  width: 205px;
 }
 
 .sites_autocomplete .custom_select_search .but {
@@ -153,7 +161,7 @@
 }
 
 .custom_select_search .reset {
-  position: relative; top: 3px; left: -74px; cursor: pointer;
+  position: relative; top: 3px; left: -50px; cursor: pointer;
 }
 
 .custom_select_block {
@@ -176,4 +184,4 @@
 .siteSelect a {
   white-space: normal;
   text-align: left;
-}
\ No newline at end of file
+}
diff --git a/plugins/CoreHome/javascripts/broadcast.js b/plugins/CoreHome/javascripts/broadcast.js
index 8482cad4fb..87d4e97800 100644
--- a/plugins/CoreHome/javascripts/broadcast.js
+++ b/plugins/CoreHome/javascripts/broadcast.js
@@ -197,7 +197,7 @@ var broadcast = {
         // if the module is not 'Goals', we specifically unset the 'idGoal' parameter
         // this is to ensure that the URLs are clean (and that clicks on graphs work as expected - they are broken with the extra parameter)
         var action = broadcast.getParamValue('action', currentHashStr);
-        if (action != 'goalReport' && action != 'ecommerceReport') {
+        if (action != 'goalReport' && action != 'ecommerceReport' && action != 'products' && action != 'sales') {
             currentHashStr = broadcast.updateParamValue('idGoal=', currentHashStr);
         }
         // unset idDashboard if use doesn't display a dashboard
diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js
index 5b37493a60..48dffda0c5 100644
--- a/plugins/CoreHome/javascripts/dataTable.js
+++ b/plugins/CoreHome/javascripts/dataTable.js
@@ -22,7 +22,7 @@ var exports = require('piwik/UI'),
  * method, and this class instance is stored using the jQuery $.data function
  * with the 'uiControlObject' key.
  *
- * To find a datatable element by report (ie, 'UserSettings.getBrowser'),
+ * To find a datatable element by report (ie, 'DevicesDetection.getBrowsers'),
  * use piwik.DataTable.getDataTableByReport.
  *
  * To get the dataTable JS instance (an instance of this class) for a
@@ -67,7 +67,7 @@ DataTable.registerFooterIconHandler = function (id, handler) {
 /**
  * Returns the first datatable div displaying a specific report.
  *
- * @param {string} report  The report, eg, UserSettings.getLanguage
+ * @param {string} report  The report, eg, UserLanguage.getLanguage
  * @return {Element} The datatable div displaying the report, or undefined if
  *                   it cannot be found.
  */
@@ -140,6 +140,10 @@ $.extend(DataTable.prototype, UIControl.prototype, {
         return !!$('#dashboardWidgetsArea').length;
     },
 
+    getReportMetadata: function () {
+        return JSON.parse(this.$element.attr('data-report-metadata') || '{}');
+    },
+
     //Reset DataTable filters (used before a reload or view change)
     resetAllFilters: function () {
         var self = this;
@@ -1048,6 +1052,14 @@ $.extend(DataTable.prototype, UIControl.prototype, {
             .attr('href', function () {
                 var format = $(this).attr('format');
                 var method = $(this).attr('methodToCall');
+                var params = $(this).attr('requestParams');
+
+                if (params) {
+                    params = JSON.parse(params)
+                } else {
+                    params = {};
+                }
+
                 var segment = self.param.segment;
                 var label = self.param.label;
                 var idGoal = self.param.idGoal;
@@ -1072,6 +1084,7 @@ $.extend(DataTable.prototype, UIControl.prototype, {
                     && self.param.viewDataTable == "graphEvolution") {
                     period = 'day';
                 }
+
                 var str = 'index.php?module=API'
                     + '&method=' + method
                     + '&format=' + format
@@ -1081,9 +1094,15 @@ $.extend(DataTable.prototype, UIControl.prototype, {
                     + ( typeof self.param.filter_pattern != "undefined" ? '&filter_pattern=' + self.param.filter_pattern : '')
                     + ( typeof self.param.filter_pattern_recursive != "undefined" ? '&filter_pattern_recursive=' + self.param.filter_pattern_recursive : '');
 
+                if ($.isPlainObject(params)) {
+                    $.each(params, function (index, param) {
+                        str += '&' + index + '=' + encodeURIComponent(param);
+                    });
+                }
+
                 if (typeof self.param.flat != "undefined") {
                     str += '&flat=' + (self.param.flat == 0 ? '0' : '1');
-                    if (typeof self.param.include_aggregate_rows != "undefined" && self.param.include_aggregate_rows) {
+                    if (typeof self.param.include_aggregate_rows != "undefined" && self.param.include_aggregate_rows == '1') {
                         str += '&include_aggregate_rows=1';
                     }
                     if (!self.param.flat
diff --git a/plugins/CoreHome/javascripts/menu.js b/plugins/CoreHome/javascripts/menu.js
index 33cd37cb3d..b229a0fab5 100644
--- a/plugins/CoreHome/javascripts/menu.js
+++ b/plugins/CoreHome/javascripts/menu.js
@@ -48,6 +48,7 @@ menu.prototype =
         this.menuNode = $('.Menu--dashboard');
 
         this.menuNode.find("li:has(ul),li#Searchmenu").hover(this.overMainLI, this.outMainLI);
+        this.menuNode.find("li:has(ul),li#Searchmenu").focusin(this.overMainLI);
 
         // add id to all li menu to support menu identification.
         // for all sub menu we want to have a unique id based on their module and action
@@ -100,7 +101,7 @@ menu.prototype =
     getSubmenuID: function (module, id, action) {
         var $li = '';
         // So, if module is Goals, id is present, and action is not Index, must be one of the goals
-        if (module == 'Goals' && id != '' && (action != 'index')) {
+        if ((module == 'Goals' || module == 'Ecommerce') && id != '' && (action != 'index')) {
             $li = $("#" + module + "_" + action + "_" + id);
             // if module is Dashboard and id is present, must be one of the dashboards
         } else if (module == 'Dashboard') {
diff --git a/plugins/CoreHome/lang/ar.json b/plugins/CoreHome/lang/ar.json
index c0cfab42f8..c75dce0228 100644
--- a/plugins/CoreHome/lang/ar.json
+++ b/plugins/CoreHome/lang/ar.json
@@ -32,7 +32,6 @@
         "PeriodWeeks": "أسابيع",
         "PeriodYear": "سنة",
         "PeriodYears": "سنوات",
-        "PluginDescription": "بنية تقارير تحليلات ويب.",
         "ReportGeneratedOn": "تم إنشاء التقرير في %s",
         "ReportGeneratedXAgo": "التقارير المستخرجة منذ %s",
         "SharePiwikLong": "مرحباً.. وجدت تطبيقاً رائعاً مفتوح المصدر: Piwik!\n\nسيمكنك بايويك من تتبع زوار موقعك مجاناً، ويتوجب عليك حقاً أن تجربه الآن!",
diff --git a/plugins/CoreHome/lang/be.json b/plugins/CoreHome/lang/be.json
index 90f13fd7c5..de41aaade9 100644
--- a/plugins/CoreHome/lang/be.json
+++ b/plugins/CoreHome/lang/be.json
@@ -12,7 +12,6 @@
         "PeriodWeeks": "тыдняў",
         "PeriodYear": "Год",
         "PeriodYears": "гадоў",
-        "PluginDescription": "Структура справаздач Вэб-Аналітыкі.",
         "ShowJSCode": "Паказаць Java-код для ўстаўкі",
         "ThereIsNoDataForThisReport": "Няма дадзеных для гэтай справаздачы.",
         "WebAnalyticsReports": "Справаздачы Вэб-Аналітыкі"
diff --git a/plugins/CoreHome/lang/bg.json b/plugins/CoreHome/lang/bg.json
index 86a6a77c1d..bc01a6ce63 100644
--- a/plugins/CoreHome/lang/bg.json
+++ b/plugins/CoreHome/lang/bg.json
@@ -38,7 +38,6 @@
         "PeriodWeeks": "седмици",
         "PeriodYear": "Година",
         "PeriodYears": "години",
-        "PluginDescription": "Уеб Анализи Доклади структура.",
         "ReportGeneratedOn": "Доклада е генериран за %s",
         "ReportGeneratedXAgo": "Доклада е генериран преди %s",
         "SharePiwikLong": "Здравейте! Туко-що открих прекрасен софтуер с отворен код: Piwik! Piwik позволява проследяването на посетителите на даден сайт безплатно. Задължително трябва да го пробвате!",
diff --git a/plugins/CoreHome/lang/ca.json b/plugins/CoreHome/lang/ca.json
index 5a00a80fba..79f68705ae 100644
--- a/plugins/CoreHome/lang/ca.json
+++ b/plugins/CoreHome/lang/ca.json
@@ -30,7 +30,6 @@
         "PeriodWeeks": "setmanes",
         "PeriodYear": "Any",
         "PeriodYears": "anys",
-        "PluginDescription": "Estructura dels informes de Anàlisis web.",
         "ReportGeneratedOn": "Informe generat el %s",
         "ReportGeneratedXAgo": "Informe generat fa %s",
         "ShortDateFormat": "%shortDay%, %day% de %shortMonth%",
diff --git a/plugins/CoreHome/lang/cs.json b/plugins/CoreHome/lang/cs.json
index 7b72a67a2e..2166ea98f9 100644
--- a/plugins/CoreHome/lang/cs.json
+++ b/plugins/CoreHome/lang/cs.json
@@ -4,6 +4,7 @@
         "CheckForUpdates": "Zkontrolovat aktualizace",
         "CheckPiwikOut": "Vyzkoušejte Piwik!",
         "ClickRowToExpandOrContract": "Klikněte na tento řádek pro rozbalení nebo zbalení podtabulky.",
+        "ClickToEditX": "Klikněte pro úpravu %s",
         "CloseWidgetDirections": "Tento widget můžete zavřít kliknutím na ikonu X na horní části widgetu.",
         "DataForThisReportHasBeenPurged": "Data pro toto hlášení jsou starší než %s měsíců a byla odstraněna.",
         "DataTableExcludeAggregateRows": "Agregované řádky jsou zobrazeny %s Skrýt",
@@ -29,6 +30,7 @@
         "LongWeekFormat": "%dayFrom% %longMonthFrom% - %dayTo% %longMonthTo% %longYearTo%",
         "MakeADifference": "Udělej změnu: %1$sPřispěj na vývoj%2$s nové verze Piwik 2.0",
         "MakeOneTimeDonation": "Provést jednorázový dar.",
+        "Menu": "Menu",
         "NoPrivilegesAskPiwikAdmin": "Jste přihlášen jako '%s' ale zdá se, že nemáte v Piwiku žádná práva. %s Zeptejte se Vašeho Piwik administrátora (klikem na email)%s aby Vám dal 'view' přístup na stránku.",
         "OnlyForSuperUserAccess": "Tento widget je zobrazován pouze uživatelům se super uživatelským přístupem.",
         "PageOf": "%1$s z %2$s",
@@ -42,7 +44,6 @@
         "PeriodYear": "Rok",
         "PeriodYears": "let",
         "PivotBySubtable": "Toto hlášení není zaměřené %s Zaměřit na %s",
-        "PluginDescription": "Struktura hlášení",
         "ReportGeneratedOn": "Hlášení vygenerované %s",
         "ReportGeneratedXAgo": "Hlášení vygenerováno před %s",
         "SharePiwikLong": "Nazdar! Zrovna jsem našel skvělý open source software Piwik!",
@@ -53,6 +54,7 @@
         "ShortMonthFormat": "%shortMonth% %longYear%",
         "ShortWeekFormat": "%dayFrom% %shortMonthFrom% - %dayTo% %shortMonthTo% %shortYearTo%",
         "ShowJSCode": "Zobrazit JavaScriptový kód ke vložení",
+        "SkipToContent": "Přejít k obsahu",
         "SubscribeAndBecomePiwikSupporter": "Pokračujte na zabezpečenou platební stránku (Paypal), pokud se chcete stát podpůrcem Piwiku.",
         "SupportPiwik": "Podpořte Piwik!",
         "TableNoData": "Žádná data",
diff --git a/plugins/CoreHome/lang/da.json b/plugins/CoreHome/lang/da.json
index e62b9fd950..f23975a1c0 100644
--- a/plugins/CoreHome/lang/da.json
+++ b/plugins/CoreHome/lang/da.json
@@ -4,6 +4,7 @@
         "CheckForUpdates": "Søg efter opdateringer",
         "CheckPiwikOut": "Tjek Piwik!",
         "ClickRowToExpandOrContract": "Klik på rækken for at udvide eller sammentrække undertabelen.",
+        "ClickToEditX": "Klik for at redigere %s",
         "CloseWidgetDirections": "Luk modulet ved at klikke på 'X' ikonet øverst.",
         "DataForThisReportHasBeenPurged": "Data til rapporten er er mere end %s måneder gamle og er blevet ryddet op.",
         "DataTableExcludeAggregateRows": "Samlede rækker vises %s Skjul dem",
@@ -42,7 +43,6 @@
         "PeriodYear": "År",
         "PeriodYears": "år",
         "PivotBySubtable": "Rapporten er ikke pivoteret %s Pivoter med %s.",
-        "PluginDescription": "Struktur for webanalyse-rapporter.",
         "ReportGeneratedOn": "Rapport genereret på %s",
         "ReportGeneratedXAgo": "Rapport genereret %s siden",
         "SharePiwikLong": "Hej! Jeg har lige fundet et fantastisk open source program: Piwik!\n\nPiwik kan gratis spore besøgende på din hjemmeside. Du bør helt klart undersøge det!",
diff --git a/plugins/CoreHome/lang/de.json b/plugins/CoreHome/lang/de.json
index 24ca6e25a1..cd94ff96e6 100644
--- a/plugins/CoreHome/lang/de.json
+++ b/plugins/CoreHome/lang/de.json
@@ -4,6 +4,7 @@
         "CheckForUpdates": "Nach Aktualisierungen suchen",
         "CheckPiwikOut": "Sieh dir Piwik an!",
         "ClickRowToExpandOrContract": "Klicken Sie auf diese Zeile um die Untertabelle anzuzeigen oder zu verbergen.",
+        "ClickToEditX": "Klicken Sie um %s zu bearbeiten",
         "CloseWidgetDirections": "Sie können das Widget schließen, indem Sie auf das 'X' oben im Widget klicken.",
         "DataForThisReportHasBeenPurged": "Die Daten für diesen Bericht sind älter als %s Monate und wurden gelöscht",
         "DataTableExcludeAggregateRows": "Aggregierte Zeilen werden angezeigt %s Ausschließen",
@@ -29,6 +30,7 @@
         "LongWeekFormat": "%dayFrom% %longMonthFrom% - %dayTo% %longMonthTo% %longYearTo%",
         "MakeADifference": "Machen Sie den Unterschied: %1$sSpenden Sie jetzt%2$s und unterstützen Sie so Piwik 2.0!",
         "MakeOneTimeDonation": "Stattdessen einmalig spenden.",
+        "Menu": "Menü",
         "NoPrivilegesAskPiwikAdmin": "Sie sind angemeldet als '%s', aber es wurden keine Berechtigungen für diesen Benutzer in Piwik gesetzt. %s Bitte fragen Sie Ihren Piwik Administrator (klicken für E-Mail)%s um Zugriff auf die Webseite zu erhalten.",
         "OnlyForSuperUserAccess": "Dieses Widget wird nur Benutzern mit Hauptadministrator-Berechtigung angezeigt.",
         "PageOf": "%1$s von %2$s",
@@ -42,7 +44,6 @@
         "PeriodYear": "Jahr",
         "PeriodYears": "Jahre",
         "PivotBySubtable": "Kein Pivot erstellt für diesen Bericht %s Pivot erstellen mit %s",
-        "PluginDescription": "Webanalytik Berichts-Struktur",
         "ReportGeneratedOn": "Bericht erzeugt am %s",
         "ReportGeneratedXAgo": "Bericht erzeugt vor %s",
         "SharePiwikLong": "Hi! Ich habe gerade diese großartige Open Soruce Software gefunden: Piwik!\nPiwik ermöglicht es Besucher einer Webseite zu tracken und ist kostenlos. Du solltest es dir unbedingt einmal ansehen!",
@@ -53,6 +54,7 @@
         "ShortMonthFormat": "%shortMonth% %longYear%",
         "ShortWeekFormat": "%dayFrom% %shortMonthFrom% - %dayTo% %shortMonthTo% %shortYearTo%",
         "ShowJSCode": "Den einzufügenden JavaScript-Code anzeigen",
+        "SkipToContent": "Zum Inhalt wechseln",
         "SubscribeAndBecomePiwikSupporter": "Weiter zur sicheren Seite für Kreditkartenzahlung (Paypal) um ein Unterstützer von Piwik zu werden.",
         "SupportPiwik": "Unterstützen Sie Piwik!",
         "TableNoData": "Keine Daten für diese Tabelle.",
diff --git a/plugins/CoreHome/lang/el.json b/plugins/CoreHome/lang/el.json
index 3251141515..6fa64aa5df 100644
--- a/plugins/CoreHome/lang/el.json
+++ b/plugins/CoreHome/lang/el.json
@@ -4,9 +4,10 @@
         "CheckForUpdates": "Έλεγχος για ενημερώσεις",
         "CheckPiwikOut": "Δοκιμάστε το Piwik!",
         "ClickRowToExpandOrContract": "Πατήστε στη γραμμή για να επεκταθεί ή να κρυφτεί ο υποπίνακας.",
+        "ClickToEditX": "Κάντε κλικ για να επεξεργαστείτε το %s",
         "CloseWidgetDirections": "Μπορείτε να κλείσετε αυτή τη λειτουργία κάνοντας κλικ στο εικονίδιο 'X' στην κορυφή του widget.",
         "DataForThisReportHasBeenPurged": "Τα δεδομένα για αυτή την αναφορά είναι περισσότερα από %s μήνες και κόπηκαν.",
-        "DataTableExcludeAggregateRows": "Συγκεντρωτικές εγγραφές είναι ορατές %s Απόκρυωη",
+        "DataTableExcludeAggregateRows": "Οι συγκεντρωτικές εγγραφές είναι ορατές %s Απόκρυψη",
         "DataTableIncludeAggregateRows": "Συγκεντρωτικές εγγραφές είναι κρυφές %s Προβολή",
         "DateFormat": "%longDay% %day% %longMonth% %longYear%",
         "Default": "προεπιλογή",
@@ -29,6 +30,7 @@
         "LongWeekFormat": "%dayFrom% %longMonthFrom% - %dayTo% %longMonthTo% %longYearTo%",
         "MakeADifference": "Κάντε τη διαφορά: %1$sΔωρίστε τώρα%2$s για τη χρηματοδότηση του Piwik 2.0!",
         "MakeOneTimeDonation": "Εναλλακτικά, κάντε μια εφάπαξ δωρεά.",
+        "Menu": "Μενού",
         "NoPrivilegesAskPiwikAdmin": "Έχετε συνδεθεί ως «%s» αλλά φαίνεται να μην έχετε ορισμένα δικαιώματα στο Piwik. %s Ρωτήστε τον διαχειριστή του Piwik (πατήστε για να στείλετε ηλεκτρονική επιστολή)%s για να σας δώσει δικαιώματα προβολή για μια ιστοσελίδα.",
         "OnlyForSuperUserAccess": "Το γραφικό συστατικό εμφανίζεται μόνο σε χρήστες με δικαίωμα Υπερ-Χρήστη.",
         "PageOf": "%1$s από %2$s",
@@ -42,7 +44,6 @@
         "PeriodYear": "Έτος",
         "PeriodYears": "ετών",
         "PivotBySubtable": "Η αναφορά αυτή δεν είναι θεμελιωμένη %s Να θεμελιωθεί από %s",
-        "PluginDescription": "Δομή Αναφορών Ανάλυσης Ιστού.",
         "ReportGeneratedOn": "Η αναφορά δημιουργήθηκε στις %s",
         "ReportGeneratedXAgo": "Η αναφορά δημιουργήθηκε πριν από %s",
         "SharePiwikLong": "Γεια σας! Βρήκα μόνο ένα καταπληκτικό λογισμικό ανοικτού κώδικα: το Piwik!\n\nΤο Piwik θα σας επιτρέψει να παρακολουθείτε τους επισκέπτες στην ιστοσελίδα σας δωρεάν. Καλό θα είναι να το δείτε!",
@@ -53,6 +54,7 @@
         "ShortMonthFormat": "%shortMonth% %longYear%",
         "ShortWeekFormat": "%dayFrom% %shortMonthFrom% - %dayTo% %shortMonthTo% %shortYearTo%",
         "ShowJSCode": "Εμφάνιση του κώδικα της Javascript προς εισαγωγή",
+        "SkipToContent": "Μετάβαση στο περιεχόμενο",
         "SubscribeAndBecomePiwikSupporter": "Προχωρήστε σε μια ασφαλή σελίδα πληρωμής με πιστωτική κάρτα (Paypal) για να γίνετε Υποστηρικτής του Piwik!",
         "SupportPiwik": "Στηρίξτε το Piwik!",
         "TableNoData": "Δεν υπάρχουν δεδομένα για τον πίνακα.",
diff --git a/plugins/CoreHome/lang/en.json b/plugins/CoreHome/lang/en.json
index bcaf3af402..0945d5bb53 100644
--- a/plugins/CoreHome/lang/en.json
+++ b/plugins/CoreHome/lang/en.json
@@ -3,6 +3,7 @@
         "CategoryNoData": "No data in this category. Try to \"Include all population\".",
         "CheckForUpdates": "Check for updates",
         "CheckPiwikOut": "Check Piwik out!",
+        "ClickToEditX": "Click to edit %s",
         "CloseWidgetDirections": "You can close this widget by clicking on the 'X' icon at the top of the widget.",
         "DataForThisReportHasBeenPurged": "The data for this report is more than %s months old and has been purged.",
         "DataTableExcludeAggregateRows": "Aggregate rows are shown %s Hide them",
@@ -28,6 +29,7 @@
         "LongWeekFormat": "%dayFrom% %longMonthFrom% - %dayTo% %longMonthTo% %longYearTo%",
         "MakeADifference": "Make a difference: %1$sDonate now%2$s to fund Piwik 2.0!",
         "MakeOneTimeDonation": "Make a one time donation, instead.",
+        "Menu": "Menu",
         "NoPrivilegesAskPiwikAdmin": "You are logged in as '%s' but it seems you don't have any permission set in Piwik. %s Ask your Piwik administrator (click to email)%s to give you 'view' access to a website.",
         "OnlyForSuperUserAccess": "This widget is only displayed to users having Super User access.",
         "PageOf": "%1$s of %2$s",
@@ -40,7 +42,6 @@
         "PeriodWeeks": "weeks",
         "PeriodYear": "Year",
         "PeriodYears": "years",
-        "PluginDescription": "Web Analytics Reports Structure.",
         "ReportGeneratedOn": "Report generated on %s",
         "ReportGeneratedXAgo": "Report generated %s ago",
         "SharePiwikLong": "Hi! I just found a great piece of free software: Piwik!\n\nPiwik will let you track visitors to your website for free. You should definitely check it out!",
@@ -51,6 +52,7 @@
         "ShortMonthFormat": "%shortMonth% %longYear%",
         "ShortWeekFormat": "%dayFrom% %shortMonthFrom% - %dayTo% %shortMonthTo% %shortYearTo%",
         "ShowJSCode": "Show the JavaScript code to insert",
+	    "SkipToContent": "Skip to content",
         "SubscribeAndBecomePiwikSupporter": "Proceed to a secure credit card payment page (Paypal) to become a Piwik Supporter!",
         "SupportPiwik": "Support Piwik!",
         "TableNoData": "No data for this table.",
@@ -63,4 +65,4 @@
         "UndoPivotBySubtable": "This report has been pivoted %s Undo pivot",
         "PivotBySubtable": "This report is not pivoted %s Pivot by %s"
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/CoreHome/lang/es.json b/plugins/CoreHome/lang/es.json
index 62efd2564b..ee9a178662 100644
--- a/plugins/CoreHome/lang/es.json
+++ b/plugins/CoreHome/lang/es.json
@@ -9,9 +9,9 @@
         "DataTableIncludeAggregateRows": "Filas agregadas están ocultas %s Mostrarlas",
         "DateFormat": "%longDay% %day% %longMonth% %longYear%",
         "Default": "Por defecto",
-        "DonateCall1": "Piwik siempre te costará nada de usar, pero eso no significa que no nos cuesta nada para hacer.",
+        "DonateCall1": "​Piwik siempre será gratis, pero eso no significa que no nos cueste nada hacerlo.",
         "DonateCall2": "Piwik necesita su apoyo para crecer y prosperar.",
-        "DonateCall3": "Si usted siente que Piwik ha añadido un valor significativo a su negocio o empresa, %1$sPlease considere donar!%2$s",
+        "DonateCall3": "Si usted siente que Piwik ha añadido un valor significativo a su negocio o empresa, %1$s​Por favor, considere donar!%2$s",
         "DonateFormInstructions": "Haga clic en el control deslizante para seleccionar una cantidad, luego haga clic en suscribirse para donar.",
         "ExcludeRowsWithLowPopulation": "Mostrar todas las filas %s Excluir baja población",
         "ExternalHelp": "Ayuda (se abre en una nueva pestaña)",
@@ -27,7 +27,7 @@
         "LongMonthFormat": "%longMonth% %longYear%",
         "LongWeekFormat": "%dayFrom% %longMonthFrom% - %dayTo% %longMonthTo% %longYearTo%",
         "MakeADifference": "Causa un impacto positivo: %1$sDona ahora%2$s para financiar Piwik 2.0!",
-        "MakeOneTimeDonation": "Haga una donación de una vez, en su lugar.",
+        "MakeOneTimeDonation": "Si no quieres donar periódicamente, también puedes hacer una donación puntual.",
         "NoPrivilegesAskPiwikAdmin": "Has iniciado sesión como '%s', pero parece que no tienes ningún permiso configurado en Piwik. %s Consulta al administrador de tu Piwik (clic para enviar email)%s para que te de acceso para 'ver' en el sitio web.",
         "OnlyForSuperUserAccess": "Este widget sólo se muestra a los usuarios con acceso Super User.",
         "PageOf": "%1$s de %2$s",
@@ -40,7 +40,6 @@
         "PeriodWeeks": "semanas",
         "PeriodYear": "Año",
         "PeriodYears": "años",
-        "PluginDescription": "Estructura de Reportes de Análisis Web",
         "ReportGeneratedOn": "Reporte generado el %s",
         "ReportGeneratedXAgo": "Reporte generado hace %s",
         "SharePiwikLong": "¡Hola! Yo solo encontré una gran pieza de software de código abierto: Piwik! Piwik te permitirá rastrear visitantes a tu sitio web gratis. ¡Deberías revisarlo definitivamente!",
diff --git a/plugins/CoreHome/lang/et.json b/plugins/CoreHome/lang/et.json
index a91581a1af..2b6d0b09f2 100644
--- a/plugins/CoreHome/lang/et.json
+++ b/plugins/CoreHome/lang/et.json
@@ -25,7 +25,6 @@
         "PeriodWeeks": "nädalat",
         "PeriodYear": "Aasta",
         "PeriodYears": "aastat",
-        "PluginDescription": "Veebianalüütika raportite põhistruktuur.",
         "ReportGeneratedOn": "Raport genereeritud %s",
         "ReportGeneratedXAgo": "Raport genereeritud %s tagasi",
         "SharePiwikShort": "Piwik! Tasuta ja avatud lähtekoodiga veebianalüütika tarkvara. Oma enda andmeid!",
diff --git a/plugins/CoreHome/lang/fa.json b/plugins/CoreHome/lang/fa.json
index 7f560fd9f5..3e27d4f080 100644
--- a/plugins/CoreHome/lang/fa.json
+++ b/plugins/CoreHome/lang/fa.json
@@ -31,7 +31,6 @@
         "PeriodWeeks": "هفته ها",
         "PeriodYear": "سال",
         "PeriodYears": "سال ها",
-        "PluginDescription": "ساختار گزارش های اطلاعات آماری وب.",
         "ReportGeneratedOn": "گزارش تولید شده است در %s",
         "ReportGeneratedXAgo": "گزارش %s قبل تولید شده است",
         "SharePiwikLong": "سلام! من قسمت بزرگی از نرم افزار های متن باز را پیدا کرده ام : Piwik!\n\nPiwik به شما این امکان را می دهد که بازدیدکنندگان سایت خود را به رایگان مشاهده نمایید. شما حتما باید این برنامه را آزمایش نمایید!",
diff --git a/plugins/CoreHome/lang/fi.json b/plugins/CoreHome/lang/fi.json
index 0e439c5499..dc93a3a9d9 100644
--- a/plugins/CoreHome/lang/fi.json
+++ b/plugins/CoreHome/lang/fi.json
@@ -42,7 +42,6 @@
         "PeriodYear": "Vuosi",
         "PeriodYears": "vuodet",
         "PivotBySubtable": "Tämä raportti ei ole käännetty %s:n mukaan. Käännetty %s:llä.",
-        "PluginDescription": "Verkkoanalyysin raporttien sisältö",
         "ReportGeneratedOn": "Raportti luotu %s",
         "ReportGeneratedXAgo": "Raportti luotu %s sitten",
         "SharePiwikLong": "Hei! Löysin juuri mahtavan avoimen lähdekoodin ohjelmiston: Piwik!\n\nPiwikin avulla voit seurata verkkosivusi kävijöitä ilmaiseksi. Kannattaa ehdottomasti tutustua!",
diff --git a/plugins/CoreHome/lang/fr.json b/plugins/CoreHome/lang/fr.json
index 7ee1d79e0c..148ee220bc 100644
--- a/plugins/CoreHome/lang/fr.json
+++ b/plugins/CoreHome/lang/fr.json
@@ -4,6 +4,7 @@
         "CheckForUpdates": "Vérifier les mises à jour",
         "CheckPiwikOut": "Vérifiez sur Piwik!",
         "ClickRowToExpandOrContract": "Cliquez sur cette rangée pour afficher ou masquer le sous-tableau",
+        "ClickToEditX": "Cliquer pour éditer %s",
         "CloseWidgetDirections": "Vous pouvez fermer ce gadget en cliquant sur l'icône en forme de \"X\" en haut du gadget.",
         "DataForThisReportHasBeenPurged": "Les données pour ce rapport ont plus de %s mois et ont été purgées.",
         "DataTableExcludeAggregateRows": "Les lignes agrégées sont affichées %s Les cacher",
@@ -11,7 +12,7 @@
         "DateFormat": "%longDay% %day% %longMonth% %longYear%",
         "Default": "par défaut",
         "DonateCall1": "Piwik ne vous coûtera jamais rien à utiliser, mais cela ne veut pas dire que ça ne nous coûte rien pour le réaliser.",
-        "DonateCall2": "Piwik a besoin de votre support continu pour croître et prospérer.",
+        "DonateCall2": "Piwik a besoin de votre support pour continuer croître et prospérer.",
         "DonateCall3": "Si vous pensez que Piwik a ajouté une valeur significative à votre entreprise ou à votre projet, %1$s pensez à faire un don s'il vous plait ! %2$s",
         "DonateFormInstructions": "Cliquez sur le curseur pour sélectionner un montant, puis cliquez sur s'abonner à faire un don.",
         "ExcludeRowsWithLowPopulation": "Toutes les lignes sont affichées %s Exclure celles peu signifiantes",
@@ -29,6 +30,7 @@
         "LongWeekFormat": "%dayFrom% %longMonthFrom% - %dayTo% %longMonthTo% %longYearTo%",
         "MakeADifference": "Faites une différence : %1$sDonnez Maintenant%2$s pour financer Piwik 2.0!",
         "MakeOneTimeDonation": "Faire un don unique à la place.",
+        "Menu": "Menu",
         "NoPrivilegesAskPiwikAdmin": "Vous êtes connecté en tant que '%s' mais il semble que nous n'ayez aucune permission définie dans Piwik. %s Demandez à votre administrateur (cliquez pour envoyer un e-mail)%s de vous donner l'accès 'Consultation' à un site web.",
         "OnlyForSuperUserAccess": "Ce widget est uniquement affiché aux utilisateurs possédant un accès de type super utilisateur.",
         "PageOf": "%1$s de %2$s",
@@ -41,7 +43,6 @@
         "PeriodWeeks": "semaines",
         "PeriodYear": "Année",
         "PeriodYears": "années",
-        "PluginDescription": "Structure des rapports statistiques web.",
         "ReportGeneratedOn": "Rapport généré le %s",
         "ReportGeneratedXAgo": "Rapport généré il y a %s",
         "SharePiwikLong": "Salut ! Je viens juste de trouver un bon logiciel libre : Piwik !\nPiwik va te permettre de suivre les visiteurs de ton site web gratuitement. Tu devrais vraiment aller voir !",
@@ -52,6 +53,7 @@
         "ShortMonthFormat": "%shortMonth% %longYear%",
         "ShortWeekFormat": "%dayFrom% %shortMonthFrom% - %dayTo% %shortMonthTo% %shortYearTo%",
         "ShowJSCode": "Afficher le code JavaScript à insérer",
+        "SkipToContent": "Passer au contenu",
         "SubscribeAndBecomePiwikSupporter": "Procéder à un paiement par carte de crédit sécurisé (Paypal) pour devenir un bienfaiteur de Piwik!",
         "SupportPiwik": "Supporter Piwik!",
         "TableNoData": "Aucune donnée pour cette table.",
diff --git a/plugins/CoreHome/lang/he.json b/plugins/CoreHome/lang/he.json
index 0d3a631a0b..26330c2260 100644
--- a/plugins/CoreHome/lang/he.json
+++ b/plugins/CoreHome/lang/he.json
@@ -17,7 +17,6 @@
         "PeriodWeeks": "שבועות",
         "PeriodYear": "שנה",
         "PeriodYears": "שנים",
-        "PluginDescription": "מבנה דוחות הפעילות.",
         "SharePiwikShort": "Piwik! ניתוח רשת חינמי ופתוח. שליטה בנתונים של עצמך.",
         "ShowJSCode": "הצגת הJavaScript להטמעה",
         "SupportPiwik": "תמיכה ב-Piwik!",
diff --git a/plugins/CoreHome/lang/hi.json b/plugins/CoreHome/lang/hi.json
index ddfe038eb0..b35d3e9135 100644
--- a/plugins/CoreHome/lang/hi.json
+++ b/plugins/CoreHome/lang/hi.json
@@ -37,7 +37,6 @@
         "PeriodWeeks": "हफ्ते",
         "PeriodYear": "साल",
         "PeriodYears": "साल",
-        "PluginDescription": "वेब विश्लेषिकी रिपोर्टें संरचना.",
         "ReportGeneratedOn": "%s पर उत्पन्न रिपोर्ट",
         "ReportGeneratedXAgo": "%s रिपोर्ट के पहले उत्पन्न",
         "SharePiwikLong": "Piwik आपको मुफ्त अपनी वेबसाइट के आगंतुकों पर नज़र रखने देगा. आपको निश्चित रूप से बाहर की जाँच करनी चाहिए!",
diff --git a/plugins/CoreHome/lang/hu.json b/plugins/CoreHome/lang/hu.json
index 7ce44319cb..b8c6472656 100644
--- a/plugins/CoreHome/lang/hu.json
+++ b/plugins/CoreHome/lang/hu.json
@@ -12,7 +12,6 @@
         "PeriodWeeks": "hetek",
         "PeriodYear": "Év",
         "PeriodYears": "évek",
-        "PluginDescription": "Webanalitikai jelentések struktúrája",
         "ShowJSCode": "Mutasd a JavaScript kódot a beillesztéshez",
         "ThereIsNoDataForThisReport": "Nincs adat ehhez a jelentéshez.",
         "WebAnalyticsReports": "Webanalitikai jelentések"
diff --git a/plugins/CoreHome/lang/id.json b/plugins/CoreHome/lang/id.json
index 792cacc5d4..37aca448c7 100644
--- a/plugins/CoreHome/lang/id.json
+++ b/plugins/CoreHome/lang/id.json
@@ -38,7 +38,6 @@
         "PeriodWeeks": "minggu",
         "PeriodYear": "Tahun",
         "PeriodYears": "tahun",
-        "PluginDescription": "Struktur Laporan Analisis Web.",
         "ReportGeneratedOn": "Laporan dibuat dalam %s",
         "ReportGeneratedXAgo": "Laporan dibuat %s lalu",
         "SharePiwikLong": "Hai! Saya baru saja menemukan sebuah kepingan luar biasa perangkat lunak sumber terbuka: Piwik!\n\nPiwik memungkinkan kamu untuk melacak pengunjung situs kamu secara gratis. Kamu harus segera melihatnya!",
diff --git a/plugins/CoreHome/lang/it.json b/plugins/CoreHome/lang/it.json
index 704abae336..16d8fd3f12 100644
--- a/plugins/CoreHome/lang/it.json
+++ b/plugins/CoreHome/lang/it.json
@@ -4,6 +4,7 @@
         "CheckForUpdates": "Cerca aggiornamenti",
         "CheckPiwikOut": "Controlla Piwik!",
         "ClickRowToExpandOrContract": "Clicca su questa riga per espandere o restringere la sotto-tabella.",
+        "ClickToEditX": "Clicca per modificare %s",
         "CloseWidgetDirections": "Potete chiudere questo widget cliccando sull'icona 'X' nella parte alta del widget stesso.",
         "DataForThisReportHasBeenPurged": "I dati di questo report hanno più di un mese %s e sono stati eliminato.",
         "DataTableExcludeAggregateRows": "Le righe di aggregazione vengono visualizzate %s Nascondile",
@@ -29,6 +30,7 @@
         "LongWeekFormat": "%dayFrom% %longMonthFrom% - %dayTo% %longMonthTo% %longYearTo%",
         "MakeADifference": "Fate la differenza: %1$sDonate adesso%2$s per arrivare a Piwik 2.0!",
         "MakeOneTimeDonation": "Fate una donazione unica.",
+        "Menu": "Menu",
         "NoPrivilegesAskPiwikAdmin": "Sei stato registrato come '%s', ma a quanto pare non si dispone di alcuna autorizzazione in Piwik. %s Contattare l'amministratore Piwik (clicca per e-mail) %s per consentire la visualizzazione di un sito web.",
         "OnlyForSuperUserAccess": "Questo widget è visualizzato solo dagli utenti che hanno un accesso Super User.",
         "PageOf": "%1$s di %2$s",
@@ -42,7 +44,6 @@
         "PeriodYear": "Anno",
         "PeriodYears": "anni",
         "PivotBySubtable": "Questo report non è imperniato al Pivot %s da %s",
-        "PluginDescription": "Struttura di base per i report di Web Analytics.",
         "ReportGeneratedOn": "Report generato il %s",
         "ReportGeneratedXAgo": "Report generato %s fa",
         "SharePiwikLong": "Salve! Ho giusto trovato un bel software open source: Piwik!\n\nPiwik vi permetterà di tracciare i visitatori del vostro sito gratuitamente. Dovreste provarlo!",
@@ -53,6 +54,7 @@
         "ShortMonthFormat": "%shortMonth% %longYear%",
         "ShortWeekFormat": "%dayFrom% %shortMonthFrom% - %dayTo% %shortMonthTo% %shortYearTo%",
         "ShowJSCode": "Mostra il codice JavaScript da inserire",
+        "SkipToContent": "Vai al contenuto",
         "SubscribeAndBecomePiwikSupporter": "Procedete su una pagina sicura di pagamento con carta di credito (Paypal) per diventare un Sostenitore di Piwik!",
         "SupportPiwik": "Sostieni Piwik!",
         "TableNoData": "nessun dato per questa tabella.",
diff --git a/plugins/CoreHome/lang/ja.json b/plugins/CoreHome/lang/ja.json
index 8d7e1f1857..fa554e5070 100644
--- a/plugins/CoreHome/lang/ja.json
+++ b/plugins/CoreHome/lang/ja.json
@@ -42,7 +42,6 @@
         "PeriodYear": "年",
         "PeriodYears": "年",
         "PivotBySubtable": "このレポートは、%s が %s ピボット を旋回していません。",
-        "PluginDescription": "ウェブ解析リポートのストラクチャーです。",
         "ReportGeneratedOn": "%s に生成されたリポート",
         "ReportGeneratedXAgo": "%s 前に生成されたリポート",
         "SharePiwikLong": "素晴らしい無償ソフトウェアが見つかりました ! : Piwik です! Piwik はあなたのウェブサイト訪問者を無料で追跡します。要チェック !",
diff --git a/plugins/CoreHome/lang/ka.json b/plugins/CoreHome/lang/ka.json
index 9b4e6df7ce..2492065340 100644
--- a/plugins/CoreHome/lang/ka.json
+++ b/plugins/CoreHome/lang/ka.json
@@ -11,7 +11,6 @@
         "PeriodWeeks": "კვირა",
         "PeriodYear": "წელი",
         "PeriodYears": "წელი",
-        "PluginDescription": "ვებ ანალიზატორის რეპორტების სტრუქტურა.",
         "ShowJSCode": "JavaScript კოდის ნახვა, რომელიც უნდა ჩაისვას ვებ გვერდზე",
         "ThereIsNoDataForThisReport": "რეპორტისთვის მონაცემები არ არის.",
         "WebAnalyticsReports": "ვებ ანალიზატორის რეპორტები"
diff --git a/plugins/CoreHome/lang/ko.json b/plugins/CoreHome/lang/ko.json
index ee138ec8de..dc84399e81 100644
--- a/plugins/CoreHome/lang/ko.json
+++ b/plugins/CoreHome/lang/ko.json
@@ -38,7 +38,6 @@
         "PeriodWeeks": "주간",
         "PeriodYear": "년간",
         "PeriodYears": "년간",
-        "PluginDescription": "웹 분석 보고서의 구조입니다.",
         "ReportGeneratedOn": "%s에 생성된 보고서",
         "ReportGeneratedXAgo": "%s 전에 생성된 보고서",
         "SharePiwikLong": "Piwik! 이라는 멋진 오픈소스를 발견했습니다. Piwik은 웹사이트의 방문자를 추적할 수 있는 무료 분석 도구입니다. 꼭 확인해 보세요!",
diff --git a/plugins/CoreHome/lang/lt.json b/plugins/CoreHome/lang/lt.json
index f2ff5556b7..dc7ffd0181 100644
--- a/plugins/CoreHome/lang/lt.json
+++ b/plugins/CoreHome/lang/lt.json
@@ -11,7 +11,6 @@
         "PeriodWeeks": "savaitės",
         "PeriodYear": "Metai",
         "PeriodYears": "metai",
-        "PluginDescription": "Žiniatinklio analizės sprendimo ataskaitų struktūra.",
         "ShowJSCode": "Parodyti JavaScript kodą įvedimui",
         "ThereIsNoDataForThisReport": "Nėra duomenų šiai ataskaitai.",
         "WebAnalyticsReports": "Žiniatinklio analizės sprendimo ataskaitos"
diff --git a/plugins/CoreHome/lang/lv.json b/plugins/CoreHome/lang/lv.json
index e53d30d0d2..7e75bb3cd7 100644
--- a/plugins/CoreHome/lang/lv.json
+++ b/plugins/CoreHome/lang/lv.json
@@ -12,7 +12,6 @@
         "PeriodWeeks": "nedēļas",
         "PeriodYear": "Gads",
         "PeriodYears": "gadi",
-        "PluginDescription": "Tīkla analīzes atskaišu struktūra",
         "ShowJSCode": "Rādīt ievietošanai paredzēto JavaScript kodu",
         "ThereIsNoDataForThisReport": "Nav šajai atskaitei vajadzīgo datu.",
         "WebAnalyticsReports": "Tīkla analīzes atskaites"
diff --git a/plugins/CoreHome/lang/nb.json b/plugins/CoreHome/lang/nb.json
index 07ff1177ac..fd2662d62f 100644
--- a/plugins/CoreHome/lang/nb.json
+++ b/plugins/CoreHome/lang/nb.json
@@ -3,6 +3,7 @@
         "CategoryNoData": "Ingen data i denne kategorien. Prøv å velge \"Inkluder hele populasjon\".",
         "CheckForUpdates": "Se etter oppdateringer",
         "CheckPiwikOut": "Sjekk ut Piwik!",
+        "ClickToEditX": "Klikk for å redigere %s",
         "DateFormat": "%longDay% %day% %longMonth% %longYear%",
         "Default": "standard",
         "ExternalHelp": "Hjelp (åpnes i ny fane)",
@@ -12,6 +13,7 @@
         "LongMonthFormat": "%longYear%, %longMonth%",
         "LongWeekFormat": "%dayFrom% %longMonthFrom% - %dayTo% %longMonthTo% %longYearTo%",
         "MakeADifference": "Gjør en forskjell: %1$sDoner nå%2$s for å finansiere Piwik 2.0!",
+        "Menu": "Meny",
         "PageOf": "%1$s av %2$s",
         "PeriodDay": "Dag",
         "PeriodDays": "dager",
@@ -21,7 +23,6 @@
         "PeriodWeeks": "uker",
         "PeriodYear": "År",
         "PeriodYears": "år",
-        "PluginDescription": "Struktur for nettstatistikkrapporter.",
         "ReportGeneratedOn": "Rapport generert %s",
         "ReportGeneratedXAgo": "Rapport generert %s siden",
         "SharePiwikShort": "Piwik! Gratis og åpen kildekode web analyse. Du eier dataene.",
@@ -33,7 +34,7 @@
         "ShowJSCode": "Vis JavaScript-koden til å sette inn på din nettside.",
         "SupportPiwik": "Støtt Piwik!",
         "TableNoData": "Ingen data for denne tabellen.",
-        "ThereIsNoDataForThisReport": "Det fins ingen data for denne rapporten.",
+        "ThereIsNoDataForThisReport": "Det finnes ingen data for denne rapporten.",
         "WebAnalyticsReports": "Nettstatistikkrapporter",
         "YouAreUsingTheLatestVersion": "Du bruker den nyeste versjonen av Piwik!"
     }
diff --git a/plugins/CoreHome/lang/nl.json b/plugins/CoreHome/lang/nl.json
index 64de484c76..10fc899a0f 100644
--- a/plugins/CoreHome/lang/nl.json
+++ b/plugins/CoreHome/lang/nl.json
@@ -3,6 +3,8 @@
         "CategoryNoData": "Geen data in deze categorie. Probeer \"Toon alle data\".",
         "CheckForUpdates": "Controleer op updates",
         "CheckPiwikOut": "Kijk eens naar Piwik!",
+        "ClickRowToExpandOrContract": "Klik deze regel om de tabel te openen of te sluiten.",
+        "ClickToEditX": "Klik om %s te bewerken",
         "CloseWidgetDirections": "Je kunt deze widget sluiten door op het 'X' icoon bovenaan de widget te klikken.",
         "DataForThisReportHasBeenPurged": "De data voor dit rapport was meer dan %s maanden oud en is reeds opgeschoond.",
         "DataTableExcludeAggregateRows": "Geagregeerde rijen worden getoond %s Verberg ze",
@@ -28,6 +30,7 @@
         "LongWeekFormat": "%dayFrom% %longMonthFrom% - %dayTo% %longMonthTo% %longYearTo%",
         "MakeADifference": "Maak een verschil: %1$sDoneer nu%2$s om Piwik 2.0 te steunen!",
         "MakeOneTimeDonation": "Doe een eennmalige donatie in de plaats.",
+        "Menu": "Menu",
         "NoPrivilegesAskPiwikAdmin": "U bent aangemeld as '%s'. Maar het lijkt er op dat u geen rechten hebt op Piwik te bezoeken. %sVraag aan uw webmaster (klik hier voor e-mail)%s of hij u de juiste rechten wilt geven om de statistieken te bekijken.",
         "OnlyForSuperUserAccess": "Deze widget wordt alleen getoond aan superusers.",
         "PageOf": "%1$s of %2$s",
@@ -40,7 +43,6 @@
         "PeriodWeeks": "weken",
         "PeriodYear": "Jaar",
         "PeriodYears": "jaren",
-        "PluginDescription": "Web Analyse rapporteer structuur",
         "ReportGeneratedOn": "Rapport aangemaakt op %s",
         "ReportGeneratedXAgo": "Rapport %s geleden gemaakt",
         "SharePiwikLong": "Hey, Ik heb net een prachtig stukje open source software ontdekt: Piwik!\n\nPiwik laat je toe gratis bezoekers op je website te volgen. Je zou het zeker eens moeten uitproberen!",
@@ -51,6 +53,7 @@
         "ShortMonthFormat": "%shortMonth% %longYear%",
         "ShortWeekFormat": "%dayFrom% %shortMonthFrom% - %dayTo% %shortMonthTo% %shortYearTo%",
         "ShowJSCode": "toon de javascript code",
+        "SkipToContent": "Ga naar de inhoud",
         "SubscribeAndBecomePiwikSupporter": "Ga verder naar een veilige kredietkaart betaalpagina (Paypal) en wordt een Piwik Supporter!",
         "SupportPiwik": "Ondersteun Piwik!",
         "TableNoData": "Geen gegevens voor deze tabel.",
diff --git a/plugins/CoreHome/lang/nn.json b/plugins/CoreHome/lang/nn.json
index aff5dac825..496d1fcb56 100644
--- a/plugins/CoreHome/lang/nn.json
+++ b/plugins/CoreHome/lang/nn.json
@@ -22,7 +22,6 @@
         "PeriodWeeks": "veker",
         "PeriodYear": "År",
         "PeriodYears": "år",
-        "PluginDescription": "Rapportstruktur for nettstatistikk",
         "ReportGeneratedOn": "Rapport generert den %s",
         "ReportGeneratedXAgo": "Rapport generert %s sidan",
         "ShortDateFormat": "%shortDay%. %day% %shortMonth%.",
diff --git a/plugins/CoreHome/lang/pl.json b/plugins/CoreHome/lang/pl.json
index 4f358bc9a3..bac69362f4 100644
--- a/plugins/CoreHome/lang/pl.json
+++ b/plugins/CoreHome/lang/pl.json
@@ -39,7 +39,6 @@
         "PeriodWeeks": "tygodni",
         "PeriodYear": "rok",
         "PeriodYears": "lat",
-        "PluginDescription": "Struktura raportu z analityki statystyk stron.",
         "ReportGeneratedOn": "Raport wygenerowany %s",
         "ReportGeneratedXAgo": "Raport wygenerowany %s temu",
         "SharePiwikLong": "Cześć! Właśnie znalazłem niezły kawałek darmowego oprogramowania: Piwik!\n\nPiwik pozwoli Ci śledzić odwiedzających Twoją stronę za darmo. Powinieneś koniecznie go sprawdzić!",
diff --git a/plugins/CoreHome/lang/pt-br.json b/plugins/CoreHome/lang/pt-br.json
index 7709d841c2..a0e1441456 100644
--- a/plugins/CoreHome/lang/pt-br.json
+++ b/plugins/CoreHome/lang/pt-br.json
@@ -39,7 +39,6 @@
         "PeriodWeeks": "semanas",
         "PeriodYear": "Ano",
         "PeriodYears": "anos",
-        "PluginDescription": "Estrutura de Relatórios Web Analytics",
         "ReportGeneratedOn": "Relatório gerado em %s",
         "ReportGeneratedXAgo": "Relatório gerado %s atrás",
         "SharePiwikLong": "Oi! Acabei de encontrar um grande software open source: Piwik! Ele permite que você rastreie os visitantes do seu site de graça. Você definitivamente deve dar uma olhada nele!",
diff --git a/plugins/CoreHome/lang/pt.json b/plugins/CoreHome/lang/pt.json
index e111bdcb06..cd13be3de7 100644
--- a/plugins/CoreHome/lang/pt.json
+++ b/plugins/CoreHome/lang/pt.json
@@ -8,6 +8,7 @@
         "DonateCall2": "O Piwik presisa do seu contínuo suporte para crescer e brilhar.",
         "DonateCall3": "Se você sente que o Piwik adicionou um valor significante ao seu negócio, %1$spor favor considere realizar um donativo!%2$s",
         "JavascriptDisabled": "JavaScript tem que estar activado para poder usar Piwik no esquema padrão.<br \/>No entanto, parece que JavaScript está desactivado ou não é suportado pelo seu navegador.<br \/>Para usar o esquema padrão, active JavaScript nas opções do seu navegador, depois %1$stente de novo%2$s.<br \/>",
+        "Menu": "Menu",
         "PageOf": "%1$s de %2$s",
         "PeriodDay": "Dia",
         "PeriodDays": "dias",
@@ -17,7 +18,6 @@
         "PeriodWeeks": "semanas",
         "PeriodYear": "Ano",
         "PeriodYears": "anos",
-        "PluginDescription": "Estrutura de Relatórios de Analíticas Web",
         "ShowJSCode": "Mostrar o código JavaScript para inserir",
         "ThereIsNoDataForThisReport": "Não há dados para este relatório.",
         "WebAnalyticsReports": "Relatórios de Analíticas Web"
diff --git a/plugins/CoreHome/lang/ro.json b/plugins/CoreHome/lang/ro.json
index 4b970b6127..ed1170d782 100644
--- a/plugins/CoreHome/lang/ro.json
+++ b/plugins/CoreHome/lang/ro.json
@@ -40,7 +40,6 @@
         "PeriodWeeks": "săptămâni",
         "PeriodYear": "An",
         "PeriodYears": "ani",
-        "PluginDescription": "Structura Raporturilor de Web Analytics",
         "ReportGeneratedOn": "Raport creat la %s",
         "ReportGeneratedXAgo": "Raport creat %s în urmă",
         "SharePiwikLong": "Buna! Tocmai am descoperit acest software open source: Piwik!\n\nPiwik iti va permite sa contorizezi vizitatorii siteului tau gratuit. Cu siguranta trebuie sa vezi despre ce e vorba!",
diff --git a/plugins/CoreHome/lang/ru.json b/plugins/CoreHome/lang/ru.json
index 71fe45c28c..f642a3f20b 100644
--- a/plugins/CoreHome/lang/ru.json
+++ b/plugins/CoreHome/lang/ru.json
@@ -3,6 +3,8 @@
         "CategoryNoData": "Нет данных в этой категории. Попробуйте \"Включить все показатели\".",
         "CheckForUpdates": "Проверить на обновления",
         "CheckPiwikOut": "Проверить Piwik на обновления!",
+        "ClickRowToExpandOrContract": "Нажмите на эту строку, чтобы растянуть или сжать подтаблицу.",
+        "ClickToEditX": "Редактировать %s",
         "CloseWidgetDirections": "Вы можете закрыть этот виджет, нажав на значок 'X' в верхней части виджета.",
         "DataForThisReportHasBeenPurged": "Данные для этого отчета хранятся более %s месяцев и были почищены.",
         "DataTableExcludeAggregateRows": "Выбранные строки отображены %s Скрыть их",
@@ -28,8 +30,9 @@
         "LongWeekFormat": "%dayFrom% %longMonthFrom% - %dayTo% %longMonthTo% %longYearTo%",
         "MakeADifference": "Внесите свой вклад: %1$sПожертвуйте сейчас%2$s для финансирования Piwik 2.0!",
         "MakeOneTimeDonation": "Сделать только пожертвование (без подписки).",
+        "Menu": "Меню",
         "NoPrivilegesAskPiwikAdmin": "Вы авторизованы как '%s', но, кажется, для вас не установлены права в Piwik. %s Попросите вашего администратора (кликните, чтобы написать письмо)%s дать вам доступ на \"просмотр\" к статистике сайта.",
-        "OnlyForSuperUserAccess": "Этот виджет отображается только у супер-пользователей",
+        "OnlyForSuperUserAccess": "Этот виджет отображается только у суперпользователя.",
         "PageOf": "%1$s из %2$s",
         "PeriodDay": "День",
         "PeriodDays": "дней",
@@ -40,7 +43,6 @@
         "PeriodWeeks": "недель",
         "PeriodYear": "Год",
         "PeriodYears": "лет",
-        "PluginDescription": "Структура отчетов веб аналитики.",
         "ReportGeneratedOn": "Отчет был составлен %s",
         "ReportGeneratedXAgo": "Отчет был составлен %s назад",
         "SharePiwikLong": "Привет! Я только что нашел интересный проект с открытым исходным кодом: Piwik! Piwik позволит вам отслеживать посетителей на вашем сайте бесплатно. Вы определенно должны это посмотреть!",
@@ -51,6 +53,7 @@
         "ShortMonthFormat": "%shortMonth% %longYear%",
         "ShortWeekFormat": "%dayFrom% %shortMonthFrom% - %dayTo% %shortMonthTo% %shortYearTo%",
         "ShowJSCode": "Показать JavaScript код для вставки",
+        "SkipToContent": "Перейти к содержимому",
         "SubscribeAndBecomePiwikSupporter": "Приступить к безопасной оплате кредитной картой (Paypal), чтобы стать сторонником Piwik!",
         "SupportPiwik": "Поддержите Piwik!",
         "TableNoData": "Нет данных для этой таблицы.",
diff --git a/plugins/CoreHome/lang/sk.json b/plugins/CoreHome/lang/sk.json
index 2b429a6d7b..71583f3f0c 100644
--- a/plugins/CoreHome/lang/sk.json
+++ b/plugins/CoreHome/lang/sk.json
@@ -13,7 +13,6 @@
         "PeriodWeeks": "týždne",
         "PeriodYear": "Rok",
         "PeriodYears": "roky",
-        "PluginDescription": "Web Analytik report štruktúra.",
         "ReportGeneratedOn": "Report vygenerovaný %s",
         "ReportGeneratedXAgo": "Report vygenerovaný pred %s",
         "ShowJSCode": "Zobraziť javascript kód pre vloženie",
diff --git a/plugins/CoreHome/lang/sq.json b/plugins/CoreHome/lang/sq.json
index b3c34a0f8b..0e9fa1680e 100644
--- a/plugins/CoreHome/lang/sq.json
+++ b/plugins/CoreHome/lang/sq.json
@@ -15,7 +15,6 @@
         "PeriodWeeks": "javë",
         "PeriodYear": "Vit",
         "PeriodYears": "vite",
-        "PluginDescription": "Strukturë Raportesh Analizash Web.",
         "ShortDateFormat": "%shortDay% %day% %shortMonth%",
         "ShowJSCode": "Shfaqe kodin JavaScript që duhet futur",
         "ThereIsNoDataForThisReport": "Nuk ka të dhëna për këtë raport.",
diff --git a/plugins/CoreHome/lang/sr.json b/plugins/CoreHome/lang/sr.json
index 9150eb6d7f..93bcbb73a1 100644
--- a/plugins/CoreHome/lang/sr.json
+++ b/plugins/CoreHome/lang/sr.json
@@ -40,7 +40,6 @@
         "PeriodWeeks": "nedelja",
         "PeriodYear": "Godina",
         "PeriodYears": "godina",
-        "PluginDescription": "Struktura izveštaja web analitike",
         "ReportGeneratedOn": "Izveštaj generisan %s",
         "ReportGeneratedXAgo": "Izveštaj generisan pre %s",
         "SharePiwikLong": "Ćaos! Upravo sam naleteo na strava program: Piwik!\n\nPiwik je besplatan program otvorenog koda za praćenje posetilaca na tvom sajtu. Definitvno moraš da ga isprobaš!",
diff --git a/plugins/CoreHome/lang/sv.json b/plugins/CoreHome/lang/sv.json
index 6fdfc90cc9..52bcb41490 100644
--- a/plugins/CoreHome/lang/sv.json
+++ b/plugins/CoreHome/lang/sv.json
@@ -3,6 +3,8 @@
         "CategoryNoData": "Det finns ingen data i denna kategori. Försök att \"Inkludera alla träffar\".",
         "CheckForUpdates": "Sök efter uppdateringar",
         "CheckPiwikOut": "Kolla in Piwik!",
+        "ClickRowToExpandOrContract": "Klicka på denna rad för att visa eller dölja undertabeller.",
+        "ClickToEditX": "Klicka för att editera %s",
         "CloseWidgetDirections": "Du kan stänga widgeten genom att klicka på (X)-ikonen på widgetens topp.",
         "DataForThisReportHasBeenPurged": "Data för denna rapport är mer än %s månader gammal och har tagits bort.",
         "DataTableExcludeAggregateRows": "Aggregerade rader dolda %s Dölj dem",
@@ -40,7 +42,6 @@
         "PeriodWeeks": "veckor",
         "PeriodYear": "År",
         "PeriodYears": "år",
-        "PluginDescription": "Webbanalys rapporternas struktur.",
         "ReportGeneratedOn": "Rapporten genererades på %s",
         "ReportGeneratedXAgo": "Rapporten genererades för %s sen",
         "SharePiwikLong": "Hej! Jag har just hittat ett fantastiskt öppen källkodsprogram: Piwik!\n\nPiwik hjälper dig spåra besökarna på din hemsida helt gratis. Du borde definitivt kolla in det!",
diff --git a/plugins/CoreHome/lang/ta.json b/plugins/CoreHome/lang/ta.json
index 4bbf308c53..78b5b3f0af 100644
--- a/plugins/CoreHome/lang/ta.json
+++ b/plugins/CoreHome/lang/ta.json
@@ -24,7 +24,6 @@
         "PeriodWeeks": "கிழமைகள்",
         "PeriodYear": "வருடம்",
         "PeriodYears": "வருடங்கள்",
-        "PluginDescription": "வலை பகுப்பாய்வு அறிக்கைகளின் அமைப்பு.",
         "ReportGeneratedOn": "அறிக்கை %s அன்று உருவாக்கப்பட்டது",
         "ReportGeneratedXAgo": "அறிக்கை %s முன் உருவாக்கப்பட்டது",
         "SharePiwikLong": "Hi! Piwik: எனக்கு திறந்த மூல மென்பொருள் மூலம்  ஒரு பெரிய பகுதி கிடைத்தது!\n\nPiwik உங்களுக்கு இலவசமாக உங்கள் இணைய பார்வையாளர்கள் கண்காணிக்க உதவும். நீங்கள் நிச்சயமாக அதை பார்க்க வேண்டும்!",
diff --git a/plugins/CoreHome/lang/th.json b/plugins/CoreHome/lang/th.json
index 2e557c25fb..573c3b32b3 100644
--- a/plugins/CoreHome/lang/th.json
+++ b/plugins/CoreHome/lang/th.json
@@ -13,7 +13,6 @@
         "PeriodWeeks": "สัปดาห์",
         "PeriodYear": "ปี",
         "PeriodYears": "ปี",
-        "PluginDescription": "โครงสร้างการรายงานการวิเคราะห์เว็บไซต์",
         "ShowJSCode": "แสดงรหัส JavaScript เมื่อต้องการแทรก",
         "SupportPiwik": "สนับสนุน Piwik!",
         "ThereIsNoDataForThisReport": "ไม่มีข้อมูลสำหรับรายงานนี้",
diff --git a/plugins/CoreHome/lang/tl.json b/plugins/CoreHome/lang/tl.json
index 02c90848a3..5492f2cd51 100644
--- a/plugins/CoreHome/lang/tl.json
+++ b/plugins/CoreHome/lang/tl.json
@@ -42,7 +42,6 @@
         "PeriodYear": "Taon",
         "PeriodYears": "mga taon",
         "PivotBySubtable": "Ang ulat na ito ay hindi umiikot %s Paikutin ng %s",
-        "PluginDescription": "Istraktura ng mga Ulat ng Analitiko ng Web",
         "ReportGeneratedOn": "Ang ulat ay ginawa sa %s",
         "ReportGeneratedXAgo": "Ang ulat ay ginawa %s na ang nakalilipas",
         "SharePiwikLong": "Hi! Nakakita ako ng isang magandang piraso ng libreng software: Piwik!\n\nHahayaan ka ng Piwil na subaybayan ang mga bisita sa iyong website ng libre. Dapat mo talagang tingan ito!",
diff --git a/plugins/CoreHome/lang/tr.json b/plugins/CoreHome/lang/tr.json
index a59ad9b08a..70e28ccf3b 100644
--- a/plugins/CoreHome/lang/tr.json
+++ b/plugins/CoreHome/lang/tr.json
@@ -35,7 +35,6 @@
         "PeriodWeeks": "hafta",
         "PeriodYear": "Yıl",
         "PeriodYears": "yıl",
-        "PluginDescription": "Web istatistik rapor yapısı.",
         "ReportGeneratedOn": "%s tarihinde oluşturulan Rapor",
         "ReportGeneratedXAgo": "%s kadar önce oluşturulan Rapor",
         "SharePiwikShort": "Piwik! Ücretsiz web takibi ve analizi. Kendi verilerinizle.",
diff --git a/plugins/CoreHome/lang/uk.json b/plugins/CoreHome/lang/uk.json
index 95a688a922..e5d239cb6e 100644
--- a/plugins/CoreHome/lang/uk.json
+++ b/plugins/CoreHome/lang/uk.json
@@ -11,7 +11,6 @@
         "PeriodWeeks": "тижнів",
         "PeriodYear": "Рік",
         "PeriodYears": "років",
-        "PluginDescription": "Структура звітів веб-аналітики",
         "ShowJSCode": "Показати код вставки javascript",
         "ThereIsNoDataForThisReport": "Відсутні дані для даного звіту",
         "WebAnalyticsReports": "Звіти Веб-Аналітики"
diff --git a/plugins/CoreHome/lang/vi.json b/plugins/CoreHome/lang/vi.json
index ebaa74664d..3a068560da 100644
--- a/plugins/CoreHome/lang/vi.json
+++ b/plugins/CoreHome/lang/vi.json
@@ -39,7 +39,6 @@
         "PeriodWeeks": "Số tuần",
         "PeriodYear": "Năm",
         "PeriodYears": "Số năm",
-        "PluginDescription": "Cấu trúc báo cáo Web Analytics",
         "ReportGeneratedOn": "Báo cáo được tạo vào %s",
         "ReportGeneratedXAgo": "Báo cáo được tạo %s trước đây",
         "SharePiwikLong": "Chào bạn! Tôi vừa tìm ra một phần mềm mã nguồn mở rất tuyệt: Piwik!\nPiwik cho phép bạn theo dõi người truy cập vào trang web của bạn một cách hoàn toàn miễn phí. Bạn nên thử nó ngay đi!",
diff --git a/plugins/CoreHome/lang/zh-cn.json b/plugins/CoreHome/lang/zh-cn.json
index 0847d1ae7f..af2fec7f8a 100644
--- a/plugins/CoreHome/lang/zh-cn.json
+++ b/plugins/CoreHome/lang/zh-cn.json
@@ -39,7 +39,6 @@
         "PeriodWeeks": "周",
         "PeriodYear": "按年",
         "PeriodYears": "年",
-        "PluginDescription": "网站分析报表结构。",
         "ReportGeneratedOn": "本报表生成时间 %s",
         "ReportGeneratedXAgo": "本报表在 %s 前生成",
         "SharePiwikLong": "您好！我刚刚发现了一个很棒的开源软件: Piwik！\n\nPiwik 可以免费统计网站的访问情况，您一定要看一看！",
diff --git a/plugins/CoreHome/lang/zh-tw.json b/plugins/CoreHome/lang/zh-tw.json
index 30a60a202f..aadc3ea5a3 100644
--- a/plugins/CoreHome/lang/zh-tw.json
+++ b/plugins/CoreHome/lang/zh-tw.json
@@ -11,7 +11,6 @@
         "PeriodWeeks": "週",
         "PeriodYear": "年統計",
         "PeriodYears": "年",
-        "PluginDescription": "網站分析報告結構。",
         "ShowJSCode": "顯示 JavaScript 追蹤碼以供插入",
         "ThereIsNoDataForThisReport": "此報告項目無資料！",
         "WebAnalyticsReports": "網站分析報告"
diff --git a/plugins/CoreHome/stylesheets/coreHome.less b/plugins/CoreHome/stylesheets/coreHome.less
index e17b56cc94..359487ef93 100644
--- a/plugins/CoreHome/stylesheets/coreHome.less
+++ b/plugins/CoreHome/stylesheets/coreHome.less
@@ -71,6 +71,18 @@ h3 {
     width: auto;
 }
 
+
+.accessibility-skip-to-content{
+position:absolute;
+left:-10000px;
+}
+
+.accessibility-skip-to-content:focus{
+display: block;
+position: absolute;
+left: 50%;
+}
+
 /* Calendar*/
 div.ui-datepicker {
     font-size: 62.5%;
@@ -218,7 +230,7 @@ a.Piwik_Popover_Error_Back {
 }
 
 #userMenu .items {
-  margin-left: -50px;
+  margin-left: -117px;
   width: 160px;
 }
 
@@ -257,4 +269,4 @@ a.Piwik_Popover_Error_Back {
 
 /* Used to link within content text, without adding visual clutter */
 .linkContent { color:#333; text-decoration:none}
-.linkContent:hover { text-decoration:underline;}
\ No newline at end of file
+.linkContent:hover { text-decoration:underline;}
diff --git a/plugins/CoreHome/stylesheets/dataTable/_dataTable.less b/plugins/CoreHome/stylesheets/dataTable/_dataTable.less
index dfc76620d9..b4b6950854 100644
--- a/plugins/CoreHome/stylesheets/dataTable/_dataTable.less
+++ b/plugins/CoreHome/stylesheets/dataTable/_dataTable.less
@@ -79,7 +79,7 @@ table.dataTable th.columnSorted {
 
 table.dataTable td {
   padding: 5px 5px 5px 12px;
-  background: #fff;
+  background: @theme-color-background-base;
   border-left: 1px solid #e7e7e7;
 }
 
@@ -102,11 +102,11 @@ table.dataTable tr.subDataTable:hover > td .dataTableRowActions {
 
 table.dataTable tr:hover > td.cellSubDataTable
 table.dataTable tr:hover > td.cellSubDataTable .dataTableRowActions {
-  background-color: #fff;
+  background-color: @theme-color-background-base;
 }
 
 td.clean {
-  background-color: #fff;
+  background-color: @theme-color-background-base;
 }
 
 table.dataTable td.column {
diff --git a/plugins/CoreHome/stylesheets/dataTable/_limitSelection.less b/plugins/CoreHome/stylesheets/dataTable/_limitSelection.less
index 327d74b243..1e77d030d7 100644
--- a/plugins/CoreHome/stylesheets/dataTable/_limitSelection.less
+++ b/plugins/CoreHome/stylesheets/dataTable/_limitSelection.less
@@ -35,7 +35,7 @@
 .limitSelection > ul {
   margin-top: 1px;
   overflow: visible;
-  background-color: #fff;
+  background-color: @theme-color-background-base;
 }
 
 .limitSelection > ul > li {
@@ -46,7 +46,7 @@
   font-weight: bold;
   height: 20px;
   margin-top: -40px;
-  background-color: #fff;
+  background-color: @theme-color-background-base;
   border-left: 1px solid #DFDFDF;
   border-right: 1px solid #DFDFDF;
   vertical-align: middle;
@@ -65,4 +65,4 @@
 .limitSelection span {
   padding-top: 3px;
   display: inline-block;
-}
\ No newline at end of file
+}
diff --git a/plugins/CoreHome/stylesheets/dataTable/_tableConfiguration.less b/plugins/CoreHome/stylesheets/dataTable/_tableConfiguration.less
index 5f675894d3..a6200d6e8e 100644
--- a/plugins/CoreHome/stylesheets/dataTable/_tableConfiguration.less
+++ b/plugins/CoreHome/stylesheets/dataTable/_tableConfiguration.less
@@ -43,7 +43,7 @@ a.tableConfigurationIcon.highlighted {
   font-size: 1.1em;
   height: 40px;
   margin-top: -80px;
-  background-color: #fff;
+  background-color: @theme-color-background-base;
   border: 1px solid #DFDFDF;
   border-width: 0 1px;
   vertical-align: middle;
@@ -79,4 +79,4 @@ a.tableConfigurationIcon.highlighted {
 
 .tableConfiguration div.configItem span.action {
   color: @dataTable-link-color;
-}
\ No newline at end of file
+}
diff --git a/plugins/CoreHome/stylesheets/menu.less b/plugins/CoreHome/stylesheets/menu.less
index 3a6717a494..703470a956 100644
--- a/plugins/CoreHome/stylesheets/menu.less
+++ b/plugins/CoreHome/stylesheets/menu.less
@@ -45,7 +45,7 @@
 }
 
 .Menu--dashboard > .Menu-tabList ul {
-    background: #fff; /*IE6 needs this*/
+    background: @theme-color-background-base; /*IE6 needs this*/
     float: left;
     position: relative;
 }
@@ -76,7 +76,7 @@
 /* LEVEL1 HOVER */
 .Menu--dashboard > .Menu-tabList > li:hover,
 .Menu--dashboard > .Menu-tabList > li.sfHover {
-    background: #fff;
+    background: @theme-color-background-base;
 }
 
 .Menu--dashboard > .Menu-tabList > li:hover > a,
@@ -136,6 +136,16 @@
   transition: opacity 300ms ease-out 10ms;
 }
 
+/* for screen readers */
+.Menu--dashboard a span.hidden {
+  height: 1px;
+  width: 1px;
+  position: absolute;
+  overflow: hidden;
+  top: 0;
+}
+
+
 .Menu--dashboard > .Menu-tabList > li li:hover > a,
 .Menu--dashboard > .Menu-tabList > li li.sfHover > a {
     color: @theme-color-link;
@@ -164,4 +174,4 @@
   .Menu--dashboard > ul.Menu-tabList > li.sfActive.sfHover > a {
     border-bottom: 0;
   }
-}
+}
\ No newline at end of file
diff --git a/plugins/CoreHome/stylesheets/promo.less b/plugins/CoreHome/stylesheets/promo.less
index bb3a6722c1..6b3641d185 100644
--- a/plugins/CoreHome/stylesheets/promo.less
+++ b/plugins/CoreHome/stylesheets/promo.less
@@ -1,5 +1,5 @@
 #piwik-promo-thumbnail {
-    background: #fff url(plugins/CoreHome/images/promo_splash.png) no-repeat 0 0;
+    background: @theme-color-background-base url(plugins/CoreHome/images/promo_splash.png) no-repeat 0 0;
     background-position: center;
     width: 321px;
     margin: 0 auto 0 auto;
@@ -69,4 +69,4 @@
 
 #piwik-promo-videos-link:hover {
     text-decoration: none;
-}
\ No newline at end of file
+}
diff --git a/plugins/CoreHome/stylesheets/zen-mode.less b/plugins/CoreHome/stylesheets/zen-mode.less
index 54bbbe9bd1..9111e6a238 100644
--- a/plugins/CoreHome/stylesheets/zen-mode.less
+++ b/plugins/CoreHome/stylesheets/zen-mode.less
@@ -80,7 +80,11 @@
     display: none;
   }
 
-  div[data-report="Referrers.getReferrerType"] > .dataTableWrapper {
+  div[data-report="Goals.getItemsSku"] > .dataTableWrapper,
+  div[data-report="Goals.getItemsName"] > .dataTableWrapper,
+  div[data-report="Goals.getItemsCategory"] > .dataTableWrapper,
+  div[data-report="Referrers.getReferrerType"] > .dataTableWrapper,
+  div[data-report="Referrers.getAll"] > .dataTableWrapper {
     width: 800px;
   }
 
diff --git a/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig
index b168f9ef0a..12811eb445 100644
--- a/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig
+++ b/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig
@@ -1,4 +1,4 @@
-<h2 id="{{ reportId }}" style="color: rgb({{ reportTitleTextColor }}); font-size: {{ reportTitleTextSize }}pt;">
+<h2 id="{{ reportId }}" style="color: rgb({{ reportTitleTextColor }}); font-size: {{ reportTitleTextSize }}pt; font-weight:normal;">
     {{ reportName }}
 </h2>
 
@@ -23,16 +23,16 @@
 
     {% if displayTable %}
         <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb({{ tableHeaderBgColor }}); color: rgb({{ tableHeaderTextColor }}); font-size: {{ reportTableHeaderTextSize }}pt;">
+            <thead style="background-color: rgb({{ tableHeaderBgColor }}); color: rgb({{ tableHeaderTextColor }}); font-size: {{ reportTableHeaderTextSize }}pt; text-transform: {{ reportTableHeaderTextTransform }}; line-height:2.5em;">
             {% for columnName in reportColumns %}
-                <th style="padding: 6px 0;">
+                <th style="font-weight: {{ reportTableHeaderTextWeight }}; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;{{ columnName }}&nbsp;&nbsp;
                 </th>
             {% endfor %}
             </thead>
             <tbody>
             {% set cycleValues=['','background-color: rgb('~tableBgColor~')'] %}
-            {% set cycleIndex=0 %}
+            {% set cycleIndex=1 %}
             {% for rowId,row in reportRows %}
                 {% set rowMetrics=row.columns %}
 
@@ -41,10 +41,10 @@
                 {% else %}
                     {% set rowMetadata=null %}
                 {% endif %}
-                <tr style="{{ cycle(cycleValues, cycleIndex) }}">
+                <tr style="{{ cycle(cycleValues, cycleIndex) }};line-height: 22px;">
                     {% set cycleIndex=cycleIndex+1 %}
                     {% for columnId, columnName in reportColumns %}
-                        <td style="font-size: {{ reportTableRowTextSize }}pt; border-bottom: 1px solid rgb({{ tableCellBorderColor }}); padding: 5px 0 5px 5px;">
+                        <td style="font-size: {{ reportTableRowTextSize }}; {% if columnId == 'label' %}border-right: 1px solid rgb({{ tableCellBorderColor }}); {%  else %}border-left: 1px solid rgb({{ tableCellBorderColor }}); {% endif %} padding: 5px 0 5px 5px;">
                             {% if columnId == 'label' %}
                                 {% if rowMetrics[columnId] is defined %}
                                     {% if rowMetadata.logo is defined %}
diff --git a/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig
index a471b38adf..6a4cd06a0e 100644
--- a/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig
+++ b/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig
@@ -2,11 +2,11 @@
 <head>
     <meta charset="utf-8">
 </head>
-<body style="color: rgb({{ reportTextColor }});">
+<body style="font-family: {{ reportFontFamily }}; color: rgb({{ reportTextColor }});line-height: 1.33;">
 
 <a id="reportTop" rel="noreferrer" target="_blank" href="{{ currentPath }}"><img title="{{ 'General_GoTo'|translate("Piwik") }}" border="0" alt="Piwik" src='{{ logoHeader }}'/></a>
 
-<h1 style="color: rgb({{ reportTitleTextColor }}); font-size: {{ reportTitleTextSize }}pt;">
+<h1 style="font-weight:normal; color: rgb({{ reportTitleTextColor }}); font-size: {{ reportTitleTextSize }}pt;">
     {{ reportTitle }}
 </h1>
 
@@ -21,7 +21,7 @@
 {% endif %}
 
 {% if reportMetadata|length > 1 %}
-    <h2 style="color: rgb({{ reportTitleTextColor }}); font-size: {{ reportTitleTextSize }}pt;">
+    <h2 style="font-weight:normal; color: rgb({{ reportTitleTextColor }}); font-size: {{ reportTitleTextSize }}pt;">
         {{ 'ScheduledReports_TableOfContent'|translate }}
     </h2>
     <ul>
diff --git a/plugins/CoreHome/templates/_dataTable.twig b/plugins/CoreHome/templates/_dataTable.twig
index 234d90ea94..6bc35bca9e 100644
--- a/plugins/CoreHome/templates/_dataTable.twig
+++ b/plugins/CoreHome/templates/_dataTable.twig
@@ -7,6 +7,7 @@
 <div class="dataTable {{ visualizationCssClass }} {{ properties.datatable_css_class|default('') }} {% if isSubtable %}subDataTable{% endif %}"
      data-table-type="{{ properties.datatable_js_type }}"
      data-report="{{ properties.report_id }}"
+     data-report-metadata="{{ reportMetdadata|json_encode|e('html_attr') }}"
      data-props="{% if clientSideProperties is empty %}{}{% else %}{{ clientSideProperties|json_encode }}{% endif %}"
      data-params="{% if clientSideParameters is empty %}{}{% else %}{{ clientSideParameters|json_encode }}{% endif %}">
     <div class="reportDocumentation">
diff --git a/plugins/CoreHome/templates/_dataTableFooter.twig b/plugins/CoreHome/templates/_dataTableFooter.twig
index ec2b9fd21c..39ad2b0da0 100644
--- a/plugins/CoreHome/templates/_dataTableFooter.twig
+++ b/plugins/CoreHome/templates/_dataTableFooter.twig
@@ -16,7 +16,8 @@
 
         {% if properties.show_search %}
             <span class="dataTableSearchPattern">
-                <input type="text" class="searchInput" length="15" />
+        <label for="widgetSearch_{{ properties.report_id }}" style="display:none;"> {{ 'General_Search'|translate }} {{ visualization.config.translations.label|default('') }}</label>
+                <input id="widgetSearch_{{ properties.report_id }}" type="text" class="searchInput" length="15" />
                 <input type="submit" value="{{ 'General_Search'|translate }}" />
             </span>
         {% endif %}
@@ -56,20 +57,21 @@
                             <img width="16" height="16" src="plugins/Morpheus/images/export.png" title="{{ 'General_ExportThisReport'|translate }}"/>
                         </a>
                     </span>
-				    <span class="exportToFormatItems" style="display:none;">
-					{{ 'General_Export'|translate }}:
-					<a target="_blank" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="CSV" filter_limit="{{ properties.export_limit }}">CSV</a> |
-					<a target="_blank" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="TSV" filter_limit="{{ properties.export_limit }}">TSV (Excel)</a> |
-					<a target="_blank" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="XML" filter_limit="{{ properties.export_limit }}">XML</a> |
-					<a target="_blank" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="JSON" filter_limit="{{ properties.export_limit }}">Json</a> |
-					<a target="_blank" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="PHP" filter_limit="{{ properties.export_limit }}">Php</a>
+                    <span class="exportToFormatItems" style="display:none;">
+                    {{ 'General_Export'|translate }}:
+                    {% set requestParams = properties.request_parameters_to_modify|json_encode %}
+                    <a target="_blank" requestParams="{{ requestParams|e('html_attr') }}" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="CSV" filter_limit="{{ properties.export_limit }}">CSV</a> |
+                    <a target="_blank" requestParams="{{ requestParams|e('html_attr') }}" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="TSV" filter_limit="{{ properties.export_limit }}">TSV (Excel)</a> |
+                    <a target="_blank" requestParams="{{ requestParams|e('html_attr') }}" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="XML" filter_limit="{{ properties.export_limit }}">XML</a> |
+                    <a target="_blank" requestParams="{{ requestParams|e('html_attr') }}" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="JSON" filter_limit="{{ properties.export_limit }}">Json</a> |
+                    <a target="_blank" requestParams="{{ requestParams|e('html_attr') }}" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="PHP" filter_limit="{{ properties.export_limit }}">Php</a>
                         {% if properties.show_export_as_rss_feed %}
                             |
-                            <a target="_blank" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="RSS" filter_limit="{{ properties.export_limit }}" date="last10">
+                            <a target="_blank" requestParams="{{ requestParams|e('html_attr') }}" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="RSS" filter_limit="{{ properties.export_limit }}" date="last10">
                                 <img border="0" src="plugins/Morpheus/images/feed.png"/>
                             </a>
                         {% endif %}
-				    </span>
+                    </span>
                     {% if properties.show_export_as_image_icon %}
                         <span id="dataTableFooterExportAsImageIcon">
                             <a class="tableIcon" href="#" onclick="$(this).closest('.dataTable').find('div.jqplot-target').trigger('piwikExportAsImage'); return false;">
@@ -81,7 +83,7 @@
 
             </div>
             <div class="limitSelection {% if not properties.show_pagination_control and not properties.show_limit_control %} hidden{% endif %}"
-                 title="{{ 'General_RowsToDisplay'|translate }}"></div>
+                 title="{{ 'General_RowsToDisplay'|translate }}" alt="{{ 'General_RowsToDisplay'|translate }}"></div>
             <div class="tableConfiguration">
                 <a class="tableConfigurationIcon" href="#"></a>
                 <ul>
diff --git a/plugins/CoreHome/templates/_headerMessage.twig b/plugins/CoreHome/templates/_headerMessage.twig
index d3ae43a271..4479e7fced 100644
--- a/plugins/CoreHome/templates/_headerMessage.twig
+++ b/plugins/CoreHome/templates/_headerMessage.twig
@@ -32,12 +32,12 @@
         {% endif %}
         {% if latest_version_available and isSuperUser %}
             {{ 'General_PiwikXIsAvailablePleaseUpdateNow'|translate(latest_version_available,"<br /><a href='index.php?module=CoreUpdater&amp;action=newVersionAvailable'>","</a>","<a href='?module=Proxy&amp;action=redirect&amp;url=http://piwik.org/changelog/' rel='noreferrer' target='_blank'>","</a>")|raw }}
-            <br/>
-            {{ 'General_YouAreCurrentlyUsing'|translate(piwik_version) }}
         {% elseif latest_version_available and not isPiwikDemo and hasSomeViewAccess and not isUserIsAnonymous %}
             {% set updateSubject = 'General_NewUpdatePiwikX'|translate(latest_version_available)|e('url') %}
             {{ 'General_PiwikXIsAvailablePleaseNotifyPiwikAdmin'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/' target='_blank'>Piwik</a> <a href='?module=Proxy&action=redirect&url=http://piwik.org/changelog/' target='_blank'>" ~ latest_version_available ~ "</a>", "<a href='mailto:" ~ superUserEmails ~ "?subject=" ~ updateSubject ~ "'>", "</a>")|raw }}
-        {% elseif isSuperUser and adminMenu is defined and adminMenu %}
+        {% endif %}
+        {% if isSuperUser and adminMenu is defined and adminMenu %}
+            <br />
             {{ updateCheck|raw }}
             <br />
             {{ 'General_YouAreCurrentlyUsing'|translate(piwik_version) }}
diff --git a/plugins/CoreHome/templates/_indexContent.twig b/plugins/CoreHome/templates/_indexContent.twig
index 881c9542a3..c0bc872bd7 100644
--- a/plugins/CoreHome/templates/_indexContent.twig
+++ b/plugins/CoreHome/templates/_indexContent.twig
@@ -1,5 +1,6 @@
 {% import 'ajaxMacros.twig' as ajax %}
 <div class="pageWrap">
+<a name="main"></a>
     {% include "@CoreHome/_notifications.twig" %}
     <div class="top_controls">
         {% include "@CoreHome/_periodSelect.twig" %}
@@ -17,4 +18,4 @@
     <div class="clear"></div>
 </div>
 
-<br/><br/>
\ No newline at end of file
+<br/><br/>
diff --git a/plugins/CoreHome/templates/_menu.twig b/plugins/CoreHome/templates/_menu.twig
index 680825d209..f46264879b 100644
--- a/plugins/CoreHome/templates/_menu.twig
+++ b/plugins/CoreHome/templates/_menu.twig
@@ -42,9 +42,12 @@
         {% for level1,level2 in menu %}
             <li id="{% if level2._url is defined %}{{ _self.getId(level2._url) }}{% endif %}">
                 <a {% if level2._url is defined %}href="#{{ _self.getFirstUrl(level2._url) }}"{% endif %}
-                   onclick="return piwikMenu.onItemClick(this);">{{ level1|translate }}</a>
+                   onclick="return piwikMenu.onItemClick(this);">{{ level1|translate }}
+                   <span class="hidden">
+                     {{ 'CoreHome_Menu'|translate }}
+                   </span>
+                </a>
                 <ul>
-
                 {% for name,urlParameters in level2 %}
                     {% if urlParameters._url is defined and urlParameters._url is not iterable %}
                         {{ _self.groupedItem(name,urlParameters._url) }}
diff --git a/plugins/CoreHome/templates/_periodSelect.twig b/plugins/CoreHome/templates/_periodSelect.twig
index aa6732d664..ed28fbbf7d 100644
--- a/plugins/CoreHome/templates/_periodSelect.twig
+++ b/plugins/CoreHome/templates/_periodSelect.twig
@@ -3,8 +3,6 @@
     <div class="calendar-icon"></div>
     <div id="periodMore">
         <div class="period-date">
-            <h6>{{ 'General_Date'|translate }}</h6>
-
             <div id="datepicker"></div>
         </div>
         <div class="period-range" style="display:none;">
diff --git a/plugins/CoreHome/templates/_topBarTopMenu.twig b/plugins/CoreHome/templates/_topBarTopMenu.twig
index fc09b62f78..459ccb611e 100644
--- a/plugins/CoreHome/templates/_topBarTopMenu.twig
+++ b/plugins/CoreHome/templates/_topBarTopMenu.twig
@@ -1,24 +1,16 @@
 <div id="topRightBar">
-    {% for label,menu in topMenu %}
+
+    {% macro topMenuItem(label, menu, currentModule, currentAction) %}
         {% if menu._html is defined %}
             {{ menu._html|raw }}
         {% elseif (menu._url.module == currentModule and (menu._url.action is empty or menu._url.action == currentAction)) %}
             <span class="topBarElem topBarElemActive"><strong>{{ label|translate }}</strong></span>
         {% else %}
             <span class="topBarElem" {% if menu._tooltip is defined %}title="{{ menu._tooltip }}"{% endif %}>
-                <a id="topmenu-{{ menu._url.module|lower }}" href="index.php{{ menu._url|urlRewriteWithParameters }}">{{ label|translate }}</a>
-            </span>
+            <a id="topmenu-{{ menu._url.module|lower }}" href="index.php{{ menu._url|urlRewriteWithParameters }}">{{ label|translate }}</a>
+        </span>
         {% endif %}
-        |
-    {% endfor %}
-
-    {% set helloAlias %}
-    {% if userAlias is not empty %}
-        {{ userAlias|raw }}
-    {% else %}
-        {{ userLogin|raw }}
-    {% endif %}
-    {% endset %}
+    {% endmacro %}
 
     {% macro userMenuItem(label, menu, currentModule, currentAction) %}
 
@@ -30,38 +22,16 @@
 
     {% endmacro %}
 
-    <span class="topBarElem">
-        <div id="userMenu"
-             tooltip="{{ 'General_HelloUser'|translate(helloAlias|trim)|rawSafeDecoded }}"
-             menu-title="{{ helloAlias|trim }}"
-             piwik-menudropdown>
-
-            {% for lev1UserLabel,lev1UserMenu in userMenu if lev1UserLabel|slice(0,1) != '_' %}
-                {% if not loop.first %}
-                    <hr class="item separator"/>
-                {% endif %}
-
-                {% if lev1UserMenu._hasSubmenu is defined and lev1UserMenu._hasSubmenu %}
-                    {% if lev1UserLabel %}
-                        <a class="item disabled category">{{ lev1UserLabel|translate }}</a>
-                    {% endif %}
-
-                    {% for lev2Label,lev2Menu in lev1UserMenu if lev2Label|slice(0,1) != '_' %}
-                        {{ _self.userMenuItem(lev2Label, lev2Menu, currentModule, currentAction) }}
-                    {% endfor %}
-                {% else %}
-                    {{ _self.userMenuItem(lev1UserLabel, lev1UserMenu, currentModule, currentAction) }}
-                {% endif %}
-
-            {% endfor %}
-        </div>
-    </span>
+    {% if topMenuModule is not defined %}
+        {% set topMenuModule = currentModule %}
+        {% set topMenuAction = currentAction %}
+    {% endif %}
 
-    | <span class="topBarElem">
-        {% if userLogin == 'anonymous' %}
-            <a href='index.php?module={{ loginModule }}'>{{ 'Login_LogIn'|translate }}</a>
-        {% else %}
-            <a href='index.php?module={{ loginModule }}&amp;action=logout'>{{ 'General_Logout'|translate }}</a>
+    {% for label,menu in topMenu %}
+        {% if not loop.first %}
+                |
         {% endif %}
-    </span>
+        {{ _self.topMenuItem(label, menu, topMenuModule, topMenuAction) }}
+    {% endfor %}
+
 </div>
diff --git a/plugins/CoreHome/templates/_topScreen.twig b/plugins/CoreHome/templates/_topScreen.twig
index 1feec9e857..2aebf1254e 100644
--- a/plugins/CoreHome/templates/_topScreen.twig
+++ b/plugins/CoreHome/templates/_topScreen.twig
@@ -1,4 +1,5 @@
 <div id="header">
+    <a href='#main' tabindex="0" class="accessibility-skip-to-content">{{'CoreHome_SkipToContent'|translate}}</a>
     {% include "@CoreHome/_logo.twig" %}
     {% include "@CoreHome/_topBar.twig" %}
 </div>
diff --git a/plugins/CoreHome/templates/_userMenu.twig b/plugins/CoreHome/templates/_userMenu.twig
new file mode 100644
index 0000000000..67076af755
--- /dev/null
+++ b/plugins/CoreHome/templates/_userMenu.twig
@@ -0,0 +1,3 @@
+{% import '@CoreHome/macros.twig' as corehome %}
+
+{{ corehome.sidebarMenu(userMenu, currentModule, currentAction) }}
\ No newline at end of file
diff --git a/plugins/CoreHome/templates/getMultiRowEvolutionPopover.twig b/plugins/CoreHome/templates/getMultiRowEvolutionPopover.twig
index 0b1bd24eda..a43d282492 100644
--- a/plugins/CoreHome/templates/getMultiRowEvolutionPopover.twig
+++ b/plugins/CoreHome/templates/getMultiRowEvolutionPopover.twig
@@ -8,7 +8,7 @@
         <h2>{{ availableRecordsText|translate }}</h2>
         <table class="metrics" border="0" cellpadding="0" cellspacing="0">
             {% for i, metric in metrics %}
-                <tr>
+                <tr {% if metric.hide|default %}style="display:none"{% endif %}>
                     <td class="sparkline">
                         {{ metric.sparkline|raw }}
                     </td>
diff --git a/plugins/CoreHome/templates/getRowEvolutionPopover.twig b/plugins/CoreHome/templates/getRowEvolutionPopover.twig
index a99e95dd5b..5a86f7a101 100644
--- a/plugins/CoreHome/templates/getRowEvolutionPopover.twig
+++ b/plugins/CoreHome/templates/getRowEvolutionPopover.twig
@@ -12,7 +12,7 @@
         </div>
         <table class="metrics" border="0" cellpadding="0" cellspacing="0" data-thing="{{ seriesColorCount }}">
             {% for i, metric in metrics %}
-                <tr data-i="{{ i }}">
+                <tr data-i="{{ i }}" {% if metric.hide|default %}style="display:none"{% endif %}>
                     <td class="sparkline">
                         {{ metric.sparkline|raw }}
                     </td>
diff --git a/plugins/CoreHome/templates/macros.twig b/plugins/CoreHome/templates/macros.twig
new file mode 100644
index 0000000000..0563856856
--- /dev/null
+++ b/plugins/CoreHome/templates/macros.twig
@@ -0,0 +1,26 @@
+{% macro sidebarMenu(sidebarMenu, currentModule, currentAction) %}
+    {% if sidebarMenu|length > 1 %}
+        <div class="Menu Menu--admin">
+            <ul class="Menu-tabList">
+                {% for name,submenu in sidebarMenu %}
+                    {% if submenu._hasSubmenu %}
+                        <li>
+                            <span>{{ name|translate }}</span>
+                            <ul>
+                                {% for sname,url in submenu %}
+                                    {% if sname|slice(0,1) != '_' %}
+                                        <li>
+                                            <a href='index.php{{ url._url|urlRewriteWithParameters }}'
+                                               target="_self"
+                                               {% if url._url.module == currentModule and (url._url.action is empty or url._url.action == currentAction) %}class='active'{% endif %}>{{ sname|translate }}</a>
+                                        </li>
+                                    {% endif %}
+                                {% endfor %}
+                            </ul>
+                        </li>
+                    {% endif %}
+                {% endfor %}
+            </ul>
+        </div>
+    {% endif %}
+{% endmacro %}
diff --git a/plugins/CoreHome/tests/Integration/Column/UserIdTest.php b/plugins/CoreHome/tests/Integration/Column/UserIdTest.php
new file mode 100644
index 0000000000..f2ca415b5a
--- /dev/null
+++ b/plugins/CoreHome/tests/Integration/Column/UserIdTest.php
@@ -0,0 +1,263 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\CoreHome\tests\Integration\Column;
+
+use Piwik\Access;
+use Piwik\Cache;
+use Piwik\DataAccess\ArchiveTableCreator;
+use Piwik\Db;
+use Piwik\Plugins\CoreHome\Columns\UserId;
+use Piwik\Tests\Framework\Fixture;
+use Piwik\Tests\Framework\Mock\FakeAccess;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+use Piwik\DataTable;
+
+/**
+ * @group CoreHome
+ * @group UserIdTest
+ * @group Plugins
+ * @group Column
+ */
+class UserIdTest extends IntegrationTestCase
+{
+    /**
+     * @var UserId
+     */
+    private $userId;
+
+    protected $date = '2014-04-04';
+
+    public function setUp()
+    {
+        parent::setUp();
+        $this->userId = new UserId();
+
+        $this->setSuperUser();
+
+        Fixture::createSuperUser();
+        Fixture::createWebsite('2014-01-01 00:00:00');
+        Fixture::createWebsite('2014-01-01 00:00:00');
+    }
+
+    public function tearDown()
+    {
+        // clean up your test here if needed
+        $tables = ArchiveTableCreator::getTablesArchivesInstalled();
+        if (!empty($tables)) {
+            Db::dropTables($tables);
+        }
+        parent::tearDown();
+    }
+
+    public function test_isUsedInAtLeastOneSite_shouldReturnFalseByDefault_WhenNothingIsTracked()
+    {
+        $this->assertNotUsedInAtLeastOneSite($idSites = array(1), 'day', $this->date);
+    }
+
+    public function test_isUsedInAtLeastOneSite_shouldCache()
+    {
+        $key   = '1.month.' . $this->date;
+        $cache = Cache::getTransientCache();
+        $this->assertFalse($cache->contains($key));
+
+        $this->userId->isUsedInAtLeastOneSite($idSites = array(1), 'day', $this->date);
+
+        $this->assertTrue($cache->contains($key));
+        $this->assertFalse($cache->fetch($key));
+    }
+
+    public function test_isUsedInAtLeastOneSite_shouldDetectUserIdWasUsedInAllSites_WhenOneSiteGiven()
+    {
+        $this->trackPageviewsWithUsers();
+
+        $this->assertUsedInAtLeastOneSite($idSites = array(1), 'day', $this->date);
+    }
+
+    public function test_isUsedInAtLeastOneSite_shouldDetectUserIdWasUsedInAtLeastOneSite_WhenMultipleSitesGiven()
+    {
+        $this->trackPageviewsWithUsers();
+
+        $this->assertUsedInAtLeastOneSite($idSites = array(1,2), 'day', $this->date);
+    }
+
+    public function test_isUsedInAtLeastOneSite_shouldDetectUserIdWasNotUsedInAtLeastOneSite_WhenMultipleSitesGiven()
+    {
+        $this->trackPageviewsWithoutUsers();
+
+        $this->assertNotUsedInAtLeastOneSite($idSites = array(1,2), 'day', $this->date);
+    }
+
+    public function test_isUsedInAtLeastOneSite_shouldDetectUserIdWasNotUsed_WhenOneSiteGiven()
+    {
+        $this->trackPageviewsWithUsers();
+
+        $this->assertNotUsedInAtLeastOneSite($idSites = array(2), 'day', $this->date);
+    }
+
+    public function test_isUsedInAtLeastOneSite_shouldDefaultToMonthPeriodAndDetectUserIdIsUsedAlthoughNotTodayButYesterday()
+    {
+        $this->trackPageviewsWithUsers();
+
+        $this->assertUsedInAtLeastOneSite($idSites = array(1), 'day', '2014-04-03');
+    }
+
+    public function test_isUsedInAtLeastOneSite_shouldDefaultToMonthPeriodAndDetectUserIdIsUsedAlthoughNotTodayButTomorrow()
+    {
+        $this->trackPageviewsWithUsers();
+
+        $this->assertUsedInAtLeastOneSite($idSites = array(1), 'day', '2014-04-05');
+    }
+
+    public function test_isUsedInAtLeastOneSite_shouldDetectItWasNotUsedInMarchAlthoughItWasUsedInApril()
+    {
+        $this->trackPageviewsWithUsers();
+
+        $this->assertNotUsedInAtLeastOneSite($idSites = array(1), 'day', '2014-03-04');
+    }
+
+    public function test_isUsedInAtLeastOneSite_shouldDetectItCorrectWithRangeDates()
+    {
+        $this->trackPageviewsWithUsers();
+
+        $this->assertUsedInAtLeastOneSite($idSites = array(1), 'range', '2014-04-01,2014-05-05');
+
+        // not used in that range date
+        $this->assertNotUsedInAtLeastOneSite($idSites = array(1), 'range', '2014-04-01,2014-04-03');
+    }
+
+    public function test_hasDataTableUsers_shouldReturnFalse_IfEmptyTablesAreGiven()
+    {
+        $this->assertNotDataTableHasUsers(new DataTable\Map());
+        $this->assertNotDataTableHasUsers(new DataTable());
+    }
+
+    public function test_hasDataTableUsers_shouldHandleADataTableMap()
+    {
+        $map = new DataTable\Map();
+        $map->addTable(new DataTable(), 'label1');
+        $map->addTable(new DataTable(), 'label2');
+        $map->addTable($this->getDataTableWithoutUsersColumn(), 'label3');
+
+        $this->assertNotDataTableHasUsers($map);
+
+        $map->addTable($this->getDataTableWithZeroUsers(), 'label4');
+        $map->addTable(new DataTable(), 'label5');
+
+        $this->assertNotDataTableHasUsers($map);
+
+        $map->addTable($this->getDataTableWithUsers(), 'label6');
+
+        $this->assertDataTableHasUsers($map);
+    }
+
+    public function test_hasDataTableUsers_shouldHandleADataTable()
+    {
+        $this->assertNotDataTableHasUsers($this->getDataTableWithoutUsersColumn());
+        $this->assertNotDataTableHasUsers($this->getDataTableWithZeroUsers());
+        $this->assertDataTableHasUsers($this->getDataTableWithUsers());
+    }
+
+    private function getDataTableWithoutUsersColumn()
+    {
+        $tableWithoutUsers = new DataTable();
+        $tableWithoutUsers->addRowFromSimpleArray(array('label' => 'test', 'nb_visits' => 0));
+
+        return $tableWithoutUsers;
+    }
+
+    private function getDataTableWithZeroUsers()
+    {
+        $tableWithZeroUsers = new DataTable();
+        $tableWithZeroUsers->addRowFromSimpleArray(array('label' => 'test', 'nb_users' => 0));
+
+        return $tableWithZeroUsers;
+    }
+
+    private function getDataTableWithUsers()
+    {
+        $tableWithUsers = new DataTable();
+        $tableWithUsers->addRowFromSimpleArray(array('label' => 'test', 'nb_users' => 10));
+
+        return $tableWithUsers;
+    }
+
+    private function assertNotDataTableHasUsers($table)
+    {
+        $has = $this->userId->hasDataTableUsers($table);
+        $this->assertFalse($has);
+    }
+
+    private function assertDataTableHasUsers($table)
+    {
+        $has = $this->userId->hasDataTableUsers($table);
+        $this->assertTrue($has);
+    }
+
+    private function assertUsedInAtLeastOneSite($idSites, $period, $date)
+    {
+        $result = $this->userId->isUsedInAtLeastOneSite($idSites, $period, $date);
+
+        $this->assertTrue($result);
+    }
+
+    private function assertNotUsedInAtLeastOneSite($idSites, $period, $date)
+    {
+        $result = $this->userId->isUsedInAtLeastOneSite($idSites, $period, $date);
+
+        $this->assertFalse($result);
+    }
+
+    private function trackPageviewsWithUsers()
+    {
+        $this->trackPageviewsWithDifferentUsers(array('user1', false, 'user3'));
+    }
+
+    private function trackPageviewsWithoutUsers()
+    {
+        $this->trackPageviewsWithDifferentUsers(array(false, false, false));
+    }
+
+    private function trackPageviewsWithDifferentUsers($userIds)
+    {
+        $tracker = $this->getTracker();
+
+        foreach ($userIds as $index => $userId) {
+            $tracker->setForceNewVisit();
+            $this->trackPageview($tracker, $userId, '/index/' . $index . '.html');
+        }
+    }
+
+    private function trackPageview(\PiwikTracker $tracker, $userId, $url = null)
+    {
+        if (null !== $url) {
+            $tracker->setUrl('http://www.example.org' . $url);
+        }
+
+        $tracker->setUserId($userId);
+
+        $title = $url ? : 'test';
+
+        $tracker->doTrackPageView($title);
+    }
+
+    private function getTracker()
+    {
+        $tracker = Fixture::getTracker(1, $this->date . ' 00:01:01', true, true);
+        $tracker->setTokenAuth(Fixture::getTokenAuth());
+        return $tracker;
+    }
+
+    private function setSuperUser()
+    {
+        $pseudoMockAccess = new FakeAccess();
+        $pseudoMockAccess::setSuperUserAccess(true);
+        Access::setSingletonInstance($pseudoMockAccess);
+    }
+
+}
diff --git a/plugins/CorePluginsAdmin/Commands/ActivatePlugin.php b/plugins/CorePluginsAdmin/Commands/ActivatePlugin.php
new file mode 100644
index 0000000000..7ef3c9bbeb
--- /dev/null
+++ b/plugins/CorePluginsAdmin/Commands/ActivatePlugin.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\CorePluginsAdmin\Commands;
+
+use Piwik\Plugin\ConsoleCommand;
+use Piwik\Plugin\Manager;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * plugin:activate console command.
+ */
+class ActivatePlugin extends ConsoleCommand
+{
+    protected function configure()
+    {
+        $this->setName('plugin:activate');
+        $this->setDescription('Activate a plugin.');
+        $this->addArgument('plugin', InputArgument::REQUIRED, 'The plugin name.');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $pluginManager = Manager::getInstance();
+
+        $plugin = $input->getArgument('plugin');
+
+        if ($pluginManager->isPluginActivated($plugin)) {
+            $output->writeln('<comment>The plugin is already activated.</comment>');
+            return;
+        }
+
+        $pluginManager->activatePlugin($plugin);
+
+        $output->writeln("Activated plugin <info>$plugin</info>");
+    }
+}
diff --git a/plugins/CorePluginsAdmin/Commands/DeactivatePlugin.php b/plugins/CorePluginsAdmin/Commands/DeactivatePlugin.php
new file mode 100644
index 0000000000..33f5671e48
--- /dev/null
+++ b/plugins/CorePluginsAdmin/Commands/DeactivatePlugin.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\CorePluginsAdmin\Commands;
+
+use Piwik\Plugin\ConsoleCommand;
+use Piwik\Plugin\Manager;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * plugin:deactivate console command.
+ */
+class DeactivatePlugin extends ConsoleCommand
+{
+    protected function configure()
+    {
+        $this->setName('plugin:deactivate');
+        $this->setDescription('Deactivate a plugin.');
+        $this->addArgument('plugin', InputArgument::REQUIRED, 'The plugin name.');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $pluginManager = Manager::getInstance();
+
+        $plugin = $input->getArgument('plugin');
+
+        if (!$pluginManager->isPluginActivated($plugin)) {
+            $output->writeln('<comment>The plugin is already deactivated.</comment>');
+            return;
+        }
+
+        $pluginManager->deactivatePlugin($plugin);
+
+        $output->writeln("Deactivated plugin <info>$plugin</info>");
+    }
+}
diff --git a/plugins/CorePluginsAdmin/Commands/ListPlugins.php b/plugins/CorePluginsAdmin/Commands/ListPlugins.php
new file mode 100644
index 0000000000..0fc132e589
--- /dev/null
+++ b/plugins/CorePluginsAdmin/Commands/ListPlugins.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\CorePluginsAdmin\Commands;
+
+use Piwik\Plugin\ConsoleCommand;
+use Piwik\Plugin\Manager;
+use Symfony\Component\Console\Helper\Table;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * plugin:list console command.
+ */
+class ListPlugins extends ConsoleCommand
+{
+    protected function configure()
+    {
+        $this->setName('plugin:list');
+        $this->setDescription('List installed plugins.');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $pluginManager = Manager::getInstance();
+
+        $plugins = $pluginManager->getInstalledPluginsName();
+
+        $plugins = array_map(function ($plugin) use ($pluginManager) {
+            return array(
+                '<info>' . $plugin . '</info>',
+                $pluginManager->isPluginBundledWithCore($plugin) ? 'Core' : 'Optional',
+                $pluginManager->isPluginActivated($plugin) ? 'Activated' : '<comment>Not activated</comment>',
+            );
+        }, $plugins);
+
+        // Sort Core plugins first
+        usort($plugins, function ($a, $b) {
+            return strcmp($a[1], $b[1]);
+        });
+
+        $table = new Table($output);
+        $table
+            ->setHeaders(array('Plugin', 'Core or optional?', 'Status'))
+            ->setRows($plugins)
+        ;
+        $table->render();
+    }
+}
diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php
index 0a7a497d46..e494923f34 100644
--- a/plugins/CorePluginsAdmin/Controller.php
+++ b/plugins/CorePluginsAdmin/Controller.php
@@ -19,12 +19,11 @@ use Piwik\Notification;
 use Piwik\Piwik;
 use Piwik\Plugin;
 use Piwik\Settings\Manager as SettingsManager;
+use Piwik\Translation\Translator;
 use Piwik\Url;
 use Piwik\Version;
 use Piwik\View;
 
-/**
- */
 class Controller extends Plugin\ControllerAdmin
 {
     const UPDATE_NONCE = 'CorePluginsAdmin.updatePlugin';
@@ -36,6 +35,18 @@ class Controller extends Plugin\ControllerAdmin
     private $validSortMethods = array('popular', 'newest', 'alpha');
     private $defaultSortMethod = 'popular';
 
+    /**
+     * @var Translator
+     */
+    private $translator;
+
+    public function __construct(Translator $translator)
+    {
+        $this->translator = $translator;
+
+        parent::__construct();
+    }
+
     private function createUpdateOrInstallView($template, $nonceName)
     {
         static::dieIfMarketplaceIsDisabled();
@@ -89,7 +100,7 @@ class Controller extends Plugin\ControllerAdmin
         $nonce = Common::getRequestVar('nonce', null, 'string');
 
         if (!Nonce::verifyNonce(static::INSTALL_NONCE, $nonce)) {
-            throw new \Exception(Piwik::translate('General_ExceptionNonceMismatch'));
+            throw new \Exception($this->translator->translate('General_ExceptionNonceMismatch'));
         }
 
         Nonce::discardNonce(static::INSTALL_NONCE);
@@ -205,6 +216,13 @@ class Controller extends Plugin\ControllerAdmin
         return $view->render();
     }
 
+    public function userBrowsePlugins()
+    {
+        $view = $this->createBrowsePluginsOrThemesView('browsePlugins', $themesOnly = false);
+        $view->mode = 'user';
+        return $view->render();
+    }
+
     private function createPluginsOrThemesView($template, $themesOnly)
     {
         Piwik::checkUserHasSuperUserAccess();
@@ -232,7 +250,10 @@ class Controller extends Plugin\ControllerAdmin
             try {
                 $marketplace = new Marketplace();
                 $view->marketplacePluginNames = $marketplace->getAvailablePluginNames($themesOnly);
-                $view->pluginsHavingUpdate    = $marketplace->getPluginsHavingUpdate($themesOnly);
+
+                $pluginsHavingUpdate = $marketplace->getPluginsHavingUpdate(true);
+                $themesHavingUpdate  = $marketplace->getPluginsHavingUpdate(false);
+                $view->pluginsHavingUpdate    = $pluginsHavingUpdate + $themesHavingUpdate;
             } catch(Exception $e) {
                 // curl exec connection error (ie. server not connected to internet)
             }
@@ -281,20 +302,21 @@ class Controller extends Plugin\ControllerAdmin
 
             if (!isset($plugin['info'])) {
 
-                $suffix = Piwik::translate('CorePluginsAdmin_PluginNotWorkingAlternative');
+                $suffix = $this->translator->translate('CorePluginsAdmin_PluginNotWorkingAlternative');
                 // If the plugin has been renamed, we do not show message to ask user to update plugin
-                if ($pluginName != Request::renameModule($pluginName)) {
+                list($pluginNameRenamed, $methodName) = Request::getRenamedModuleAndAction($pluginName, 'index');
+                if ($pluginName != $pluginNameRenamed) {
                     $suffix = "You may uninstall the plugin or manually delete the files in piwik/plugins/$pluginName/";
                 }
 
                 $description = '<strong><em>'
-                    . Piwik::translate('CorePluginsAdmin_PluginNotCompatibleWith', array($pluginName, self::getPiwikVersion()))
+                    . $this->translator->translate('CorePluginsAdmin_PluginNotCompatibleWith', array($pluginName, self::getPiwikVersion()))
                     . '</strong><br/>'
                     . $suffix
                     . '</em>';
                 $plugin['info'] = array(
                     'description' => $description,
-                    'version'     => Piwik::translate('General_Unknown'),
+                    'version'     => $this->translator->translate('General_Unknown'),
                     'theme'       => false,
                 );
             }
@@ -393,17 +415,17 @@ class Controller extends Plugin\ControllerAdmin
                 $actionToRedirect = 'themes';
             }
 
-            $message = Piwik::translate('CorePluginsAdmin_SuccessfullyActicated', array($pluginName));
-            if (SettingsManager::hasPluginSettingsForCurrentUser($pluginName)) {
+            $message = $this->translator->translate('CorePluginsAdmin_SuccessfullyActicated', array($pluginName));
+            if (SettingsManager::hasSystemPluginSettingsForCurrentUser($pluginName)) {
                 $target   = sprintf('<a href="index.php%s#%s">',
-                    Url::getCurrentQueryStringWithParametersModified(array('module' => 'CoreAdminHome', 'action' => 'pluginSettings')),
+                    Url::getCurrentQueryStringWithParametersModified(array('module' => 'CoreAdminHome', 'action' => 'adminPluginSettings')),
                     $pluginName);
-                $message .= ' ' . Piwik::translate('CorePluginsAdmin_ChangeSettingsPossible', array($target, '</a>'));
+                $message .= ' ' . $this->translator->translate('CorePluginsAdmin_ChangeSettingsPossible', array($target, '</a>'));
             }
 
             $notification = new Notification($message);
             $notification->raw     = true;
-            $notification->title   = Piwik::translate('General_WellDone');
+            $notification->title   = $this->translator->translate('General_WellDone');
             $notification->context = Notification::CONTEXT_SUCCESS;
             Notification\Manager::notify('CorePluginsAdmin_PluginActivated', $notification);
 
@@ -431,7 +453,7 @@ class Controller extends Plugin\ControllerAdmin
             $path = Filesystem::getPathToPiwikRoot() . '/plugins/' . $pluginName . '/';
             $messagePermissions = Filechecks::getErrorMessageMissingPermissions($path);
 
-            $messageIntro = Piwik::translate("Warning: \"%s\" could not be uninstalled. Piwik did not have enough permission to delete the files in $path. ",
+            $messageIntro = $this->translator->translate("Warning: \"%s\" could not be uninstalled. Piwik did not have enough permission to delete the files in $path. ",
                 $pluginName);
             $exitMessage  = $messageIntro . "<br/><br/>" . $messagePermissions;
             $exitMessage .= "<br> Or manually delete this directory (using FTP or SSH access)";
@@ -452,7 +474,7 @@ class Controller extends Plugin\ControllerAdmin
         $nonce = Common::getRequestVar('nonce', null, 'string');
 
         if (!Nonce::verifyNonce($nonceName, $nonce)) {
-            throw new \Exception(Piwik::translate('General_ExceptionNonceMismatch'));
+            throw new \Exception($this->translator->translate('General_ExceptionNonceMismatch'));
         }
 
         Nonce::discardNonce($nonceName);
@@ -471,7 +493,7 @@ class Controller extends Plugin\ControllerAdmin
 
     private function getPluginNamesHavingSettingsForCurrentUser()
     {
-        return array_keys(SettingsManager::getPluginSettingsForCurrentUser());
+        return SettingsManager::getPluginNamesHavingSystemSettings();
     }
 
     private function tryToRepairPiwik()
diff --git a/plugins/CorePluginsAdmin/Marketplace.php b/plugins/CorePluginsAdmin/Marketplace.php
index 6cb5a28105..b413ddf13b 100644
--- a/plugins/CorePluginsAdmin/Marketplace.php
+++ b/plugins/CorePluginsAdmin/Marketplace.php
@@ -143,8 +143,8 @@ class Marketplace
     {
         $dateFormat = Piwik::translate('CoreHome_ShortDateFormatWithYear');
 
-        $plugin['canBeUpdated'] = $this->hasPluginUpdate($plugin);
         $plugin['isInstalled']  = \Piwik\Plugin\Manager::getInstance()->isPluginLoaded($plugin['name']);
+        $plugin['canBeUpdated'] = $plugin['isInstalled'] && $this->hasPluginUpdate($plugin);
         $plugin['lastUpdated']  = Date::factory($plugin['lastUpdated'])->getLocalized($dateFormat);
 
         if ($plugin['canBeUpdated']) {
diff --git a/plugins/CorePluginsAdmin/MarketplaceApiClient.php b/plugins/CorePluginsAdmin/MarketplaceApiClient.php
index 346b15770f..6472da3dea 100644
--- a/plugins/CorePluginsAdmin/MarketplaceApiClient.php
+++ b/plugins/CorePluginsAdmin/MarketplaceApiClient.php
@@ -8,7 +8,7 @@
  */
 namespace Piwik\Plugins\CorePluginsAdmin;
 
-use Piwik\CacheFile;
+use Piwik\Cache;
 use Piwik\Http;
 use Piwik\Version;
 
@@ -22,20 +22,10 @@ class MarketplaceApiClient
 
     private $domain = 'http://plugins.piwik.org';
 
-    /**
-     * @var CacheFile
-     */
-    private $cache = null;
-
-    public function __construct()
-    {
-        $this->cache = new CacheFile('marketplace', self::CACHE_TIMEOUT_IN_SECONDS);
-    }
-
     public static function clearAllCacheEntries()
     {
-        $cache = new CacheFile('marketplace');
-        $cache->deleteAll();
+        $cache = Cache::getLazyCache();
+        $cache->flushAll();
     }
 
     public function getPluginInfo($name)
@@ -137,7 +127,10 @@ class MarketplaceApiClient
     {
         ksort($params);
         $query = http_build_query($params);
-        $result = $this->getCachedResult($action, $query);
+
+        $cacheId = $this->getCacheKey($action, $query);
+        $cache  = $this->buildCache();
+        $result = $cache->fetch($cacheId);
 
         if (false === $result) {
             $endpoint = $this->domain . '/api/1.0/';
@@ -155,29 +148,20 @@ class MarketplaceApiClient
                 throw new MarketplaceApiException($result['error']);
             }
 
-            $this->cacheResult($action, $query, $result);
+            $cache->save($cacheId, $result, self::CACHE_TIMEOUT_IN_SECONDS);
         }
 
         return $result;
     }
 
-    private function getCachedResult($action, $query)
-    {
-        $cacheKey = $this->getCacheKey($action, $query);
-
-        return $this->cache->get($cacheKey);
-    }
-
-    private function cacheResult($action, $query, $result)
+    private function buildCache()
     {
-        $cacheKey = $this->getCacheKey($action, $query);
-
-        $this->cache->set($cacheKey, $result);
+        return Cache::getLazyCache();
     }
 
     private function getCacheKey($action, $query)
     {
-        return sprintf('api.1.0.%s.%s', str_replace('/', '.', $action), md5($query));
+        return sprintf('marketplace.api.1.0.%s.%s', str_replace('/', '.', $action), md5($query));
     }
 
     /**
diff --git a/plugins/CorePluginsAdmin/Menu.php b/plugins/CorePluginsAdmin/Menu.php
index bda9caa9db..97ec818a59 100644
--- a/plugins/CorePluginsAdmin/Menu.php
+++ b/plugins/CorePluginsAdmin/Menu.php
@@ -25,7 +25,6 @@ class Menu extends \Piwik\Plugin\Menu
         $isMarketplaceEnabled = CorePluginsAdmin::isMarketplaceEnabled();
 
         $pluginsUpdateMessage = '';
-        $themesUpdateMessage  = '';
 
         if ($hasSuperUserAcess && $isMarketplaceEnabled) {
             $marketplace = new Marketplace();
@@ -33,10 +32,7 @@ class Menu extends \Piwik\Plugin\Menu
             $themesHavingUpdate  = $marketplace->getPluginsHavingUpdate($themesOnly = true);
 
             if (!empty($pluginsHavingUpdate)) {
-                $pluginsUpdateMessage = sprintf(' (%d)', count($pluginsHavingUpdate));
-            }
-            if (!empty($themesHavingUpdate)) {
-                $themesUpdateMessage = sprintf(' (%d)', count($themesHavingUpdate));
+                $pluginsUpdateMessage = sprintf(' (%d)', count($pluginsHavingUpdate) + count($themesHavingUpdate));
             }
         }
 
@@ -45,19 +41,16 @@ class Menu extends \Piwik\Plugin\Menu
         }
 
         if ($hasSuperUserAcess) {
-            $menu->addPlatformItem(Piwik::translate('General_Plugins') . $pluginsUpdateMessage,
+            $menu->addManageItem(Piwik::translate('General_Plugins') . $pluginsUpdateMessage,
                                    $this->urlForAction('plugins', array('activated' => '')),
-                                   $order = 1);
-            $menu->addPlatformItem(Piwik::translate('CorePluginsAdmin_Themes') . $themesUpdateMessage,
-                                   $this->urlForAction('themes', array('activated' => '')),
-                                   $order = 3);
+                                   $order = 4);
         }
 
-        if ($this->isAllowedToSeeMarketPlace()) {
-            $menu->addPlatformItem('CorePluginsAdmin_Marketplace',
-                                   $this->urlForAction('browsePlugins', array('activated' => '')),
-                                   $order = 5);
 
+        if (Piwik::hasUserSuperUserAccess() && CorePluginsAdmin::isMarketplaceEnabled()) {
+            $menu->addManageItem('CorePluginsAdmin_Marketplace',
+                $this->urlForAction('browsePlugins', array('activated' => '')),
+                $order = 12);
         }
     }
 
@@ -73,7 +66,7 @@ class Menu extends \Piwik\Plugin\Menu
     {
         if ($this->isAllowedToSeeMarketPlace()) {
             $menu->addPlatformItem('CorePluginsAdmin_Marketplace',
-                                   $this->urlForAction('browsePlugins', array('activated' => '')),
+                                   $this->urlForAction('userBrowsePlugins', array('activated' => '')),
                                    $order = 5);
         }
     }
diff --git a/plugins/CorePluginsAdmin/PluginInstaller.php b/plugins/CorePluginsAdmin/PluginInstaller.php
index e95f7f1d74..ed140d27bc 100644
--- a/plugins/CorePluginsAdmin/PluginInstaller.php
+++ b/plugins/CorePluginsAdmin/PluginInstaller.php
@@ -32,7 +32,7 @@ class PluginInstaller
 
     public function installOrUpdatePluginFromMarketplace()
     {
-        $tmpPluginPath = StaticContainer::getContainer()->get('path.tmp') . '/latest/plugins/';
+        $tmpPluginPath = StaticContainer::get('path.tmp') . '/latest/plugins/';
 
         $tmpPluginZip = $tmpPluginPath . $this->pluginName . '.zip';
         $tmpPluginFolder = $tmpPluginPath . $this->pluginName;
@@ -63,7 +63,7 @@ class PluginInstaller
 
     public function installOrUpdatePluginFromFile($pathToZip)
     {
-        $tmpPluginFolder = StaticContainer::getContainer()->get('path.tmp') . self::PATH_TO_DOWNLOAD . $this->pluginName;
+        $tmpPluginFolder = StaticContainer::get('path.tmp') . self::PATH_TO_DOWNLOAD . $this->pluginName;
 
         try {
             $this->makeSureFoldersAreWritable();
@@ -97,7 +97,7 @@ class PluginInstaller
     private function makeSureFoldersAreWritable()
     {
         Filechecks::dieIfDirectoriesNotWritable(array(
-            StaticContainer::getContainer()->get('path.tmp') . self::PATH_TO_DOWNLOAD,
+            StaticContainer::get('path.tmp') . self::PATH_TO_DOWNLOAD,
             self::PATH_TO_EXTRACT
         ));
     }
diff --git a/plugins/CorePluginsAdmin/lang/ar.json b/plugins/CorePluginsAdmin/lang/ar.json
index 28ecd3ec66..c01ce5ddc6 100644
--- a/plugins/CorePluginsAdmin/lang/ar.json
+++ b/plugins/CorePluginsAdmin/lang/ar.json
@@ -25,10 +25,11 @@
         "MenuPlatform": "المنصة",
         "NoPluginsFound": "لم يتم العثور علي إضافات",
         "NoThemesFound": "لم يتم العثور علي ثيمات",
+        "OncePluginIsInstalledYouMayActivateHere": "ما أن يتم تنصيب تطبيق، يمكنك تفعيل أو تعطيل التطبيق من هنا.",
         "OriginThirdParty": "طرف ثالث",
-        "PluginDescription": "واجهة إدارة التطبيقات",
         "PluginHomepage": "صفحة التطبيقات الرئيسية",
         "PluginKeywords": "كلمات دلالية",
+        "PluginsExtendPiwik": "التطبيقات تزيد من إمكانيات Piwik.",
         "PluginsManagement": "إدارة التطبيقات",
         "PluginUpdateAvailable": "أنت تستخدم الإصدار %s %sويوجد إصدار جديد متاح",
         "PluginWebsite": "الموقع الإلكتروني للإضافة",
diff --git a/plugins/CorePluginsAdmin/lang/be.json b/plugins/CorePluginsAdmin/lang/be.json
index 711ef5001a..e21ba395e4 100644
--- a/plugins/CorePluginsAdmin/lang/be.json
+++ b/plugins/CorePluginsAdmin/lang/be.json
@@ -7,8 +7,9 @@
         "Deactivate": "Дэактываваць",
         "Inactive": "Неактыўныя",
         "LicenseHomepage": "Хатняя старонка ліцэнзіі",
-        "PluginDescription": "Інтэрфейс адміністравання плагінаў",
+        "OncePluginIsInstalledYouMayActivateHere": "Пасля ўсталёўкі плагіна Вы можаце актываваць ці дэактываваць яго тут.",
         "PluginHomepage": "Хатняя старонка плагіна",
+        "PluginsExtendPiwik": "Плагіны пашыраюць функцыянальнасць Piwik.",
         "PluginsManagement": "Кіраванне плагінамі",
         "Status": "Статус",
         "Version": "Версія"
diff --git a/plugins/CorePluginsAdmin/lang/bg.json b/plugins/CorePluginsAdmin/lang/bg.json
index b8184bee90..d5e4e32f58 100644
--- a/plugins/CorePluginsAdmin/lang/bg.json
+++ b/plugins/CorePluginsAdmin/lang/bg.json
@@ -46,15 +46,16 @@
         "NoZipFileSelected": "Моля, изберете zip файл.",
         "NumDownloadsLatestVersion": "Последна версия:%s сваляния",
         "NumUpdatesAvailable": "Налични са обновления %s",
+        "OncePluginIsInstalledYouMayActivateHere": "Веднъж инсталирана, добавката може да бъде активирана (пускана) или деактивирана (спирана).",
         "Origin": "Произход",
         "OriginCore": "Ядро",
         "OriginThirdParty": "Трета страна",
-        "PluginDescription": "Интерфейс за администрация на добавките.",
         "PluginHomepage": "Сайт на добавката",
         "PluginKeywords": "Ключови думи",
         "PluginNotCompatibleWith": "%1$s добавка не е съвместима с %2$s.",
         "PluginNotWorkingAlternative": "Ако сте използвали тази добавка, може би ще намерите по-нова версия в магазина за приложения. В случай, че няма по-нова версия, може би ще желаете да деинсталирате добавката.",
         "PluginRequirement": "%1$s изисква %2$s.",
+        "PluginsExtendPiwik": "Добавките разширяват функционалността на Piwik.",
         "PluginsManagement": "Управление на добавките",
         "PluginUpdateAvailable": "Използва се версия %s и е налична нова версия %s.",
         "PluginVersionInfo": "%1$s от %2$s",
diff --git a/plugins/CorePluginsAdmin/lang/ca.json b/plugins/CorePluginsAdmin/lang/ca.json
index aa08ce09a1..8a932a3eb3 100644
--- a/plugins/CorePluginsAdmin/lang/ca.json
+++ b/plugins/CorePluginsAdmin/lang/ca.json
@@ -10,8 +10,9 @@
         "Deactivate": "Desactiva",
         "Inactive": "Inactiu",
         "LicenseHomepage": "Pàgina de la llicència",
-        "PluginDescription": "Interfíce d'administració d'extensions.",
+        "OncePluginIsInstalledYouMayActivateHere": "Un cop hi ha un connector instal·lat, podeu activar-lo i desactivar-lo aquí.",
         "PluginHomepage": "Pàgina web",
+        "PluginsExtendPiwik": "Els connectors augmenten la funcionalitat del Piwik.",
         "PluginsManagement": "Gestiona els connectors",
         "Status": "Estat",
         "Version": "Versió"
diff --git a/plugins/CorePluginsAdmin/lang/cs.json b/plugins/CorePluginsAdmin/lang/cs.json
index a13f4374f1..b0726509ba 100644
--- a/plugins/CorePluginsAdmin/lang/cs.json
+++ b/plugins/CorePluginsAdmin/lang/cs.json
@@ -16,10 +16,12 @@
         "BeCarefulUsingThemes": "Šablony které nejsou tvořeny týmem Piwiku musí být používány opatrně: nekontrolovali jsme je.",
         "ByXDevelopers": "Od %s vývojářů",
         "Changelog": "Protokol změn",
+        "ChangeLookByManageThemes": "Vzhled Piwiku můžete změnit %sve správě motivů%s.",
         "ChangeSettingsPossible": "Pro tento zásuvný modul můžete změnit %snastavení%s.",
         "CorePluginTooltip": "Jaderné zásuvné moduly nemají verzi, protože jsou distribuovány s Piwikem.",
         "Deactivate": "Zakázat",
         "Developer": "Vývojář",
+        "DevelopersLearnHowToDevelopPlugins": "Vývojáři: naučte se, jak rozšířit Piwik vývojem %szásuvných modulů nebo témat vzhledu%s.",
         "DoMoreContactPiwikAdmins": "Pokud chcete nainstalovat nový zásuvný modul nebo šablonu,, kontaktujte vaše administrátory Piwiku.",
         "EmailToEnquireUpdatedVersion": "Napište e-mail %1$s a požádejte o novější verzi %2$s.",
         "FeaturedPlugin": "Doporučovaný zásuvný modul",
@@ -29,6 +31,7 @@
         "InfoPluginUpdateIsRecommended": "Aktualizujte vaše zásuvné moduly nyní, abyste mohli využít všechna vylepšení.",
         "InfoThemeIsUsedByOtherUsersAsWell": "Poznámka: Ostatní %1$suživatelé registrovaní v tomto Piwiku rovněž používají tuto šablonu %2$s.",
         "InfoThemeUpdateIsRecommended": "Aktualizujte vaše šablony a užívejte si poslední verzi.",
+        "InstallingNewPluginViaMarketplaceOrUpload": "Můžete zásuvný modul nainstalovat automaticky z obchodu, %snebo ho nahrát%s ve formátu .zip.",
         "InstallingPlugin": "Instalování %s",
         "InstallNewPlugins": "Instalovat nové zásuvné moduly",
         "InstallNewThemes": "Instalovat nové šablony",
@@ -39,6 +42,7 @@
         "MarketplaceSellPluginSubject": "Obchod - prodat zásuvný modul",
         "MenuPlatform": "Platforma",
         "MissingRequirementsNotice": "Prosím aktualizujte %1$s%2$s na novější verzi, je vyžadována %1$s %3$s.",
+        "MissingRequirementsPleaseInstallNotice": "Prosím nainstalujte %1$s %2$s, protože je vyžadován %3$s.",
         "NoPluginsFound": "Žádné zásuvné moduly nenalezeny",
         "NotAllowedToBrowseMarketplacePlugins": "Můžete si projít zásuvné moduly, které rozšiřují možnosti Piwik platformy. Pokud některý z nich potřebujete, kontaktujte administrátora.",
         "NotAllowedToBrowseMarketplaceThemes": "Můžete si projít seznam šablon, které mohou být instalovány k přizpůsobení vzhledu Piwik platformy. Pokud nějakou z nich chcete použít, kontaktujte administrátora.",
@@ -46,15 +50,16 @@
         "NoZipFileSelected": "Prosím vyberte soubor .zip.",
         "NumDownloadsLatestVersion": "Poslední verze: %s Stažení",
         "NumUpdatesAvailable": "%s Dostupné aktualizace",
+        "OncePluginIsInstalledYouMayActivateHere": "Po instalaci zásuvného modulu jej můžete povolit nebo zakázat zde.",
         "Origin": "Původ",
         "OriginCore": "Jádro",
         "OriginThirdParty": "Třetí strana",
-        "PluginDescription": "Administrační rozhraní zásuvných modulů",
         "PluginHomepage": "Domovská stránka zásuvného modulu",
         "PluginKeywords": "Klíčová slova",
         "PluginNotCompatibleWith": "%1$s zásuvný modul není kompatibilní s %2$s",
         "PluginNotWorkingAlternative": "Pokud jste tento zásuvný modul používali, možná najdete v obchodě novější verzi. Pokud ne, možná ho chcete odinstalovat.",
         "PluginRequirement": "%1$s vyžaduje %2$s.",
+        "PluginsExtendPiwik": "Zásuvné moduly rozšiřují funkce Piwiku.",
         "PluginsManagement": "Správa zásuvných modulů",
         "PluginUpdateAvailable": "Používáte verzi %s, ale je dostupná novější verze %s.",
         "PluginVersionInfo": "%1$s z %2$s",
diff --git a/plugins/CorePluginsAdmin/lang/da.json b/plugins/CorePluginsAdmin/lang/da.json
index f6e7441402..b377c2a23d 100644
--- a/plugins/CorePluginsAdmin/lang/da.json
+++ b/plugins/CorePluginsAdmin/lang/da.json
@@ -53,7 +53,6 @@
         "Origin": "Kilde",
         "OriginCore": "Kernen",
         "OriginThirdParty": "Tredjeparts",
-        "PluginDescription": "Programudvidelses administration.",
         "PluginHomepage": "Udvidelsesmodul hjemmeside",
         "PluginKeywords": "Nøgleord",
         "PluginNotCompatibleWith": "%1$s udvidelsesmodul er ikke kompatibelt med %2$s.",
diff --git a/plugins/CorePluginsAdmin/lang/de.json b/plugins/CorePluginsAdmin/lang/de.json
index 3e54d75ace..54da752c2d 100644
--- a/plugins/CorePluginsAdmin/lang/de.json
+++ b/plugins/CorePluginsAdmin/lang/de.json
@@ -16,10 +16,12 @@
         "BeCarefulUsingThemes": "Bitte setzen Sie Themes, die nicht vom Piwik Team entwickelt wurden mit Bedacht ein: Diese wurden nicht von uns überprüft.",
         "ByXDevelopers": "von %s Entwicklern",
         "Changelog": "Änderungsprotokoll",
+        "ChangeLookByManageThemes": "Sie können das Erscheinungsbild von Piwik mit dem Einsatz von %sThemes%s ändern.",
         "ChangeSettingsPossible": "Sie können die %sEinstellungen%s für dieses Plugin ändern.",
         "CorePluginTooltip": "Core-Plugins haben keine Version, da diese mit ausgeliefert werden.",
         "Deactivate": "Deaktivieren",
         "Developer": "Entwickler",
+        "DevelopersLearnHowToDevelopPlugins": "Programmierer: Lernen Sie wie Sie Piwik erweitern und personalisieren können, in dem Sie %sPlugins oder Themes entwickeln%s.",
         "DoMoreContactPiwikAdmins": "Um ein neues Plugin oder Theme zu installieren, treten Sie bitte in Kontakt mit Ihren Piwik-Admins.",
         "EmailToEnquireUpdatedVersion": "Bitte schreiben Sie eine E-Mail and %1$s und fragen Sie nach einer aktualisierten Version von %2$s.",
         "FeaturedPlugin": "Top-Plugin",
@@ -52,12 +54,12 @@
         "Origin": "Quelle",
         "OriginCore": "Core",
         "OriginThirdParty": "Dritt-Anbieter",
-        "PluginDescription": "Oberfläche zur Plugin-Verwaltung",
         "PluginHomepage": "Plugin-Webseite",
         "PluginKeywords": "Schlüsselwörter",
         "PluginNotCompatibleWith": "Das Plugin %1$s ist nicht kompatibel mit %2$s.",
         "PluginNotWorkingAlternative": "Wenn Sie dieses Plugin eingesetzt haben, finden Sie möglicherweise eine neuere Version im Marketplace. Wenn nicht, sollten Sie es deinstallieren.",
         "PluginRequirement": "%1$s benötigt %2$s",
+        "PluginsExtendPiwik": "Plugins erweitern die Funktionalität von Piwik.",
         "PluginsManagement": "Pluginverwaltung",
         "PluginUpdateAvailable": "Sie verwenden Version %s und eine neue Version %s is verfügbar.",
         "PluginVersionInfo": "%1$s vom %2$s",
diff --git a/plugins/CorePluginsAdmin/lang/el.json b/plugins/CorePluginsAdmin/lang/el.json
index ba32257721..46ae0d34be 100644
--- a/plugins/CorePluginsAdmin/lang/el.json
+++ b/plugins/CorePluginsAdmin/lang/el.json
@@ -16,10 +16,12 @@
         "BeCarefulUsingThemes": "Θέματα που δεν έχουν αναπτυχθεί από την ομάδα του Piwik πρέπει να χρησιμοποιούνται με προσοχή: δεν τα ελέγξαμε.",
         "ByXDevelopers": "από %s προγραμματιστές",
         "Changelog": "Αρχείο αλλαγών",
+        "ChangeLookByManageThemes": "Μπορείτε να αλλάξετε την εμφάνιση του Piwik από τη %sΔιαχείριση Θεμάτων%s.",
         "ChangeSettingsPossible": "Μπορείτε να αλλάξετε τις %sρυθμίσεις%s για αυτό το πρόσθετο.",
         "CorePluginTooltip": "Τα πρόσθετα του πυρήνα δεν έχουν έκδοση από τη στιγμή που διανέμονται μαζί με το Piwik.",
         "Deactivate": "Απενεργοποίηση",
         "Developer": "Προγραμματιστής",
+        "DevelopersLearnHowToDevelopPlugins": "Προγραμματιστές: Μάθετε πώς μπορείτε να επεκτείνετε και να προσαρμόζετε το Piwik με την %sανάπτυξη πρόσθετων ή θεμάτων%s.",
         "DoMoreContactPiwikAdmins": "Για να εγκαταστήσετε ένα νέο πρόσθετο ή θέμα, ελάτε σε επαφή με τους διαχειριστές του Piwik.",
         "EmailToEnquireUpdatedVersion": "Παρακαλούμε στείλτε email στο %1$s και ζητήστε ενημέρωση της έκδοσης για το %2$s.",
         "FeaturedPlugin": "Προβαλλόμενο πρόσθετο",
@@ -29,6 +31,7 @@
         "InfoPluginUpdateIsRecommended": "Ενημερώστε τα πρόσθετά σας για να κερδίσετε από τις τελευταίες βελτιώσεις.",
         "InfoThemeIsUsedByOtherUsersAsWell": "Σημείωση: οι άλλοι %1$s χρήστες που έχουν εγγραφεί σε αυτό το Piwik επίσης χρησιμοποιούν το θέμα %2$s.",
         "InfoThemeUpdateIsRecommended": "Ενημερώστε τα θέματά σας για να απολαμβάνετε τις τελευταίες εκδόσεις.",
+        "InstallingNewPluginViaMarketplaceOrUpload": "Μπορείτε να εγκαταστήσετε αυτόματα πρόσθετα από την Αγορά ή %sνα ανεβάσετε ένα πρόσθετο%s σε μορφή αρχείου .zip.",
         "InstallingPlugin": "Γίνεται εγκατάσταση του %s",
         "InstallNewPlugins": "Εγκατάσταση νέων πρόσθετων",
         "InstallNewThemes": "Εγκατάσταση νέων θεμάτων",
@@ -47,15 +50,16 @@
         "NoZipFileSelected": "Επιλέξτε ένα αρχείο ZIP.",
         "NumDownloadsLatestVersion": "Τελευταία έκδοση: %s λήψεις",
         "NumUpdatesAvailable": "%s διαθέσιμες ενημερώσεις",
+        "OncePluginIsInstalledYouMayActivateHere": "Αφού εγκατασταθεί ένα πρόσθετο, μπορείτε να το ενεργοποιήσετε ή να το απενεργοποιήσετε εδώ.",
         "Origin": "Προέλευση",
         "OriginCore": "Πυρήνας",
         "OriginThirdParty": "Από τρίτες πηγές",
-        "PluginDescription": "Περιβάλλον εργασίας Διαχείρισης Προσθέτων.",
         "PluginHomepage": "Ιστοσελίδα πρόσθετου",
         "PluginKeywords": "Λέξεις κλειδιά",
         "PluginNotCompatibleWith": "Το πρόσθετο %1$s δεν είναι συμβατό με το %2$s.",
         "PluginNotWorkingAlternative": "Αν χρησιμοποιείτε αυτό το πρόσθετο, ενδέχεται να βρείτε νεότερη έκδοση στην Αγορά. Αν όχι, μπορείτε να το απεγκαταστήσετε.",
         "PluginRequirement": "Το %1$s απαιτεί το %2$s.",
+        "PluginsExtendPiwik": "Τα πρόσθετα (Plugins) επεκτείνουν και διευρύνουν την λειτουργικότητα του Piwik.",
         "PluginsManagement": "Διαχείριση προσθέτων",
         "PluginUpdateAvailable": "Χρησιμοποιείτε την έκδοση %s και υπάρχει διαθέσιμη η έκδοση %s.",
         "PluginVersionInfo": "%1$s από %2$s",
diff --git a/plugins/CorePluginsAdmin/lang/en.json b/plugins/CorePluginsAdmin/lang/en.json
index 6ce90f0e0f..762159c2e2 100644
--- a/plugins/CorePluginsAdmin/lang/en.json
+++ b/plugins/CorePluginsAdmin/lang/en.json
@@ -24,6 +24,7 @@
         "DoMoreContactPiwikAdmins": "To install a new plugin or a new theme, please get in touch with your Piwik admins.",
         "EmailToEnquireUpdatedVersion": "Please email %1$s and enquire an updated version of %2$s.",
         "FeaturedPlugin": "Featured plugin",
+        "ChangeLookByManageThemes": "You can change the appearance of Piwik by %sManaging Themes%s.",
         "GetEarlyAccessForPaidPlugins": "Note: all plugins are available for free at present; in the future we will enable Paid Plugins in the Marketplace (%scontact us%s for early access).",
         "History": "History",
         "Inactive": "Inactive",
@@ -53,7 +54,6 @@
         "Origin": "Origin",
         "OriginCore": "Core",
         "OriginThirdParty": "Third-party",
-        "PluginDescription": "Plugins Administration Interface.",
         "PluginHomepage": "Plugin Homepage",
         "PluginKeywords": "Keywords",
         "PluginNotCompatibleWith": "%1$s plugin is not compatible with %2$s.",
diff --git a/plugins/CorePluginsAdmin/lang/es.json b/plugins/CorePluginsAdmin/lang/es.json
index 3d8250b172..65c452515d 100644
--- a/plugins/CorePluginsAdmin/lang/es.json
+++ b/plugins/CorePluginsAdmin/lang/es.json
@@ -46,15 +46,16 @@
         "NoZipFileSelected": "Por favor selecciona un archivo ZIP.",
         "NumDownloadsLatestVersion": "Última versión: %s Descargas",
         "NumUpdatesAvailable": "%s Actualizaciones(s) disponibles",
+        "OncePluginIsInstalledYouMayActivateHere": "Una vez que el plugin esté instalado, usted puede activarlo o desactivarlo desde aquí.",
         "Origin": "Origen",
         "OriginCore": "Core",
         "OriginThirdParty": "Tercero",
-        "PluginDescription": "Interfaz de Administración de Plugins",
         "PluginHomepage": "Página del Plugin",
         "PluginKeywords": "Palabras claves",
         "PluginNotCompatibleWith": "%1$s complemento no es compatible con %2$s.",
         "PluginNotWorkingAlternative": "Si has estado utilizando este plugin podrás encontrar una versión más reciente en el Marketplace. Si no, quizá es mejor desinstalarlo.",
         "PluginRequirement": "%1$s requiere %2$s.",
+        "PluginsExtendPiwik": "Los plugins extienden y amplían las funcionalidades de Piwik.",
         "PluginsManagement": "Administración de Plugins",
         "PluginUpdateAvailable": "Estás utilizando la versión %s y hay una nueva versión %s disponible.",
         "PluginVersionInfo": "%1$s de %2$s",
diff --git a/plugins/CorePluginsAdmin/lang/et.json b/plugins/CorePluginsAdmin/lang/et.json
index a72557e5e0..d97b7f3d55 100644
--- a/plugins/CorePluginsAdmin/lang/et.json
+++ b/plugins/CorePluginsAdmin/lang/et.json
@@ -32,11 +32,13 @@
         "NoZipFileSelected": "Palun vali ZIP fail.",
         "NumDownloadsLatestVersion": "Viimane versioon: %s allalaadimist",
         "NumUpdatesAvailable": "%s uuendus(t) saadaval",
+        "OncePluginIsInstalledYouMayActivateHere": "Kui plugin on installeeritud ja aktiveeritud saad seda sisse ja välja lülitada siin.",
         "Origin": "Päritolu",
         "OriginCore": "Tuumik",
         "OriginThirdParty": "Kolmanda osapoole",
         "PluginHomepage": "Lisatarkvara koduleht",
         "PluginKeywords": "Võtmesõnad",
+        "PluginsExtendPiwik": "Plugins võimendavad ja suurendavad Piwik-i funktsionaalsust.",
         "PluginsManagement": "Lisatarkvara haldus",
         "PluginWebsite": "Lisatarkvara veebileht",
         "Screenshots": "Ekraanitõmmised",
diff --git a/plugins/CorePluginsAdmin/lang/eu.json b/plugins/CorePluginsAdmin/lang/eu.json
index fa4cc96271..8ee7df8ad8 100644
--- a/plugins/CorePluginsAdmin/lang/eu.json
+++ b/plugins/CorePluginsAdmin/lang/eu.json
@@ -5,7 +5,9 @@
         "Active": "Gaituta",
         "Deactivate": "Ezgaitu",
         "Inactive": "Ezgaituta",
+        "OncePluginIsInstalledYouMayActivateHere": "Plugin bat instalatu ondoren, hemendik gaitu edo ezgaitu dezakezu.",
         "PluginHomepage": "Pluginaren hasiera-orria",
+        "PluginsExtendPiwik": "Piwik-en funtzionaltasunak hedatu eta zabaltzen dituzte pluginek.",
         "PluginsManagement": "Pluginen kudeaketa",
         "Status": "Egoera",
         "Version": "Bertsioa"
diff --git a/plugins/CorePluginsAdmin/lang/fa.json b/plugins/CorePluginsAdmin/lang/fa.json
index 07f8215874..e2c5c66e7a 100644
--- a/plugins/CorePluginsAdmin/lang/fa.json
+++ b/plugins/CorePluginsAdmin/lang/fa.json
@@ -41,14 +41,15 @@
         "NoZipFileSelected": "لطفا یک فایل Zip را انتخاب کنید.",
         "NumDownloadsLatestVersion": "آخرین نسخه: %s دانلودها",
         "NumUpdatesAvailable": "%s آپدیت(ها) موجود است",
+        "OncePluginIsInstalledYouMayActivateHere": "هنگامی که یک افزونه نصب شد , شما می توانید آنها را در اینجا فعال یا غیر فعال کنید.",
         "Origin": "مبدا",
         "OriginCore": "هسته",
         "OriginThirdParty": "شخص ثالث",
-        "PluginDescription": "رابط مدیریت افزونه ها.",
         "PluginHomepage": "صفحه خانگی افزونه",
         "PluginKeywords": "کلیدواژه ها",
         "PluginNotCompatibleWith": "%1$s این پلاگین سازگار نیست با %2$s.",
         "PluginNotWorkingAlternative": "اگر شما از این پلاگین استفاده می نمایید ، می توانید نسخه های جدید آن را در بازار پیدا نمایید. اگر استفاده نمی کنید ، می توانید آن را پاک نمایید.",
+        "PluginsExtendPiwik": "افزونه ها عملکرد و کارایی پیویک را گسترش می دهند.",
         "PluginsManagement": "مدیریت افزونه ها",
         "PluginVersionInfo": "%1$s از %2$s",
         "PluginWebsite": "سایت افزونه",
diff --git a/plugins/CorePluginsAdmin/lang/fi.json b/plugins/CorePluginsAdmin/lang/fi.json
index 456709b0cb..a1e6e13ea0 100644
--- a/plugins/CorePluginsAdmin/lang/fi.json
+++ b/plugins/CorePluginsAdmin/lang/fi.json
@@ -45,15 +45,16 @@
         "NoZipFileSelected": "Ole hyvä ja valitse ZIP-tiedosto.",
         "NumDownloadsLatestVersion": "Viimeisin versio: %s latausta",
         "NumUpdatesAvailable": "%s päivitys\/päivityksiä saaatavilla",
+        "OncePluginIsInstalledYouMayActivateHere": "Kun lisäosa on asennettu, voit aktivoida ja poistaa käytöstä sen täällä.",
         "Origin": "Lähde",
         "OriginCore": "Ydin",
         "OriginThirdParty": "Kolmas osapuoli",
-        "PluginDescription": "Lisäosien hallinta.",
         "PluginHomepage": "Lisäosan kotisivu",
         "PluginKeywords": "Avainsanat",
         "PluginNotCompatibleWith": "%1$s liitännäinen ei sovi yhteen %2$s:n kanssa.",
         "PluginNotWorkingAlternative": "Jos olet käyttänyt tätä liitännäistä, voit ehkä löytää uudemman version kauppatorilta. Muussa tapauksessa haluat ehkä poistaa liitännäisen.",
         "PluginRequirement": "%1$s vaatii %2$s:n.",
+        "PluginsExtendPiwik": "Lisäosilla voi laajentaa ja parantaa Piwikin toiminnallisuutta.",
         "PluginsManagement": "Lisäosien hallinta",
         "PluginUpdateAvailable": "Käytät versiota %s ja uusi versio %s on saatavilla.",
         "PluginVersionInfo": "%1$s %2$s:sta",
diff --git a/plugins/CorePluginsAdmin/lang/fr.json b/plugins/CorePluginsAdmin/lang/fr.json
index 3f539f15fc..94db4b15db 100644
--- a/plugins/CorePluginsAdmin/lang/fr.json
+++ b/plugins/CorePluginsAdmin/lang/fr.json
@@ -29,6 +29,7 @@
         "InfoPluginUpdateIsRecommended": "Mettez à jour vos composants pour bénéficier des dernières améliorations.",
         "InfoThemeIsUsedByOtherUsersAsWell": "Note : %1$s autres utilisateurs utilisant ce Piwik utilisent aussi le thème %2$s.",
         "InfoThemeUpdateIsRecommended": "Mettez à jour vos thèmes pour profiter de la dernière version.",
+        "InstallingNewPluginViaMarketplaceOrUpload": "Vous pouvez installer automatiquement un plugin à partir du Marketplace ou %supload a plugin%s au format .zip.",
         "InstallingPlugin": "Installation de %s",
         "InstallNewPlugins": "Installer les nouveaux composants",
         "InstallNewThemes": "Installer les nouveaux thèmes",
@@ -46,15 +47,16 @@
         "NoZipFileSelected": "Veuillez sélectionner un fichier ZIP.",
         "NumDownloadsLatestVersion": "Dernière version : %s téléchargements.",
         "NumUpdatesAvailable": "%s Mise(s) à jour disponible(s)",
+        "OncePluginIsInstalledYouMayActivateHere": "Une fois un plugin installé, vous pouvez l'activer ou le désactiver ici.",
         "Origin": "Origine",
         "OriginCore": "Principal",
         "OriginThirdParty": "Tierce-Partie",
-        "PluginDescription": "Interface d'administration des plugins.",
         "PluginHomepage": "Page d'accueil du plugin",
         "PluginKeywords": "Mots-clés",
         "PluginNotCompatibleWith": "Le composant %1$s n'est pas compatible avec %2$s.",
         "PluginNotWorkingAlternative": "Si vous avez utilisé ce composant additionnel, peut être pourriez vous trouver une version plus récente sur le Marché. Le cas échéant vous devriez le désinstaller.",
         "PluginRequirement": "%1$s requiert %2$s.",
+        "PluginsExtendPiwik": "Les plugins étendent et ajoutent des fonctionnalités à Piwik.",
         "PluginsManagement": "Gestionnaire de plugins",
         "PluginUpdateAvailable": "Vous utilisez la version %s et une nouvelle version %s est disponible.",
         "PluginVersionInfo": "%1$s de %2$s",
diff --git a/plugins/CorePluginsAdmin/lang/he.json b/plugins/CorePluginsAdmin/lang/he.json
index 8ffbd1a0a2..eed695277f 100644
--- a/plugins/CorePluginsAdmin/lang/he.json
+++ b/plugins/CorePluginsAdmin/lang/he.json
@@ -12,8 +12,9 @@
         "Inactive": "לא פעיל",
         "LicenseHomepage": "אתר רישון השימוש",
         "MenuPlatform": "פלטפורמה",
-        "PluginDescription": "ממשק ניהול תוספים.",
+        "OncePluginIsInstalledYouMayActivateHere": "ברגע שתוסף מותקן, ניתן להפעילו או לבטלו כאן.",
         "PluginHomepage": "אתר התוסף",
+        "PluginsExtendPiwik": "תוספים מרחיבים את היכולות של Piwik.",
         "PluginsManagement": "ניהול תוספים",
         "Status": "מצב",
         "Theme": "ערכת עיצוב",
diff --git a/plugins/CorePluginsAdmin/lang/hi.json b/plugins/CorePluginsAdmin/lang/hi.json
index bb02a5ec21..ac1a3af063 100644
--- a/plugins/CorePluginsAdmin/lang/hi.json
+++ b/plugins/CorePluginsAdmin/lang/hi.json
@@ -8,8 +8,9 @@
         "Inactive": "निष्क्रिय",
         "LicenseHomepage": "लाइसेंस होमपेज",
         "MenuPlatform": "मंच",
-        "PluginDescription": "प्लगइन्स प्रशासन इंटरफ़ेस.",
+        "OncePluginIsInstalledYouMayActivateHere": "एक प्लगइन स्थापित हो जाने के बाद, आप इसे सक्रिय करने या यहाँ इसे निष्क्रिय कर सकते हैं.",
         "PluginHomepage": "प्लगइन होमपेज",
+        "PluginsExtendPiwik": "प्लगइन्स Piwik का विस्तार और कार्यक्षमता का विस्तार करते है.",
         "PluginsManagement": "प्लगइन्स प्रबंधन",
         "Status": "स्थिति",
         "Theme": "विषय",
diff --git a/plugins/CorePluginsAdmin/lang/hu.json b/plugins/CorePluginsAdmin/lang/hu.json
index 0349e9a6ec..8bc9a1c86e 100644
--- a/plugins/CorePluginsAdmin/lang/hu.json
+++ b/plugins/CorePluginsAdmin/lang/hu.json
@@ -7,8 +7,9 @@
         "Deactivate": "Kikapcsol",
         "Inactive": "Kikapcsolt",
         "LicenseHomepage": "Licencinformációk",
-        "PluginDescription": "Bővítmény-adminisztrációs felület",
+        "OncePluginIsInstalledYouMayActivateHere": "A már telepített bővítményeket itt kapcsolhatod ki vagy be.",
         "PluginHomepage": "Bővítmény honlapja",
+        "PluginsExtendPiwik": "A bővítmények kiterjesztik a Piwik alapfunkcióit.",
         "PluginsManagement": "Bővítménykezelés",
         "Status": "Állapot",
         "Version": "Verzió"
diff --git a/plugins/CorePluginsAdmin/lang/id.json b/plugins/CorePluginsAdmin/lang/id.json
index 19ff43807c..e409da4779 100644
--- a/plugins/CorePluginsAdmin/lang/id.json
+++ b/plugins/CorePluginsAdmin/lang/id.json
@@ -7,8 +7,9 @@
         "Deactivate": "Dimatikan",
         "Inactive": "Tak Aktif",
         "LicenseHomepage": "Alamat Lisensi",
-        "PluginDescription": "Antarmuka Pengaturan Pengaya.",
+        "OncePluginIsInstalledYouMayActivateHere": "Sekali pengaya terinstal, Anda dapat mengaktifkan dan mematikan di sini.",
         "PluginHomepage": "Alamat Pengaya",
+        "PluginsExtendPiwik": "Pengaya menambah dan memperluas kegunaan dari Piwik.",
         "PluginsManagement": "Pengatur Pengaya",
         "Status": "Status",
         "Version": "Versi"
diff --git a/plugins/CorePluginsAdmin/lang/is.json b/plugins/CorePluginsAdmin/lang/is.json
index 458e52313a..a59304caad 100644
--- a/plugins/CorePluginsAdmin/lang/is.json
+++ b/plugins/CorePluginsAdmin/lang/is.json
@@ -7,8 +7,9 @@
         "Deactivate": "Slökkva",
         "Inactive": "Slökkt",
         "LicenseHomepage": "Heimasíða hugbúnaðarleyfis",
-        "PluginDescription": "Viðmót fyrir Íbótastjórnun",
+        "OncePluginIsInstalledYouMayActivateHere": "Hérna geturðu kveikteða slökkt á íbót þegar búið er að setja hana inn í kerfið.",
         "PluginHomepage": "Heimasíða íbótar",
+        "PluginsExtendPiwik": "Íbætur auka og víkka virknina í Piwik.",
         "PluginsManagement": "Íbótastjórnun",
         "Status": "Staða",
         "Version": "Útgáfa"
diff --git a/plugins/CorePluginsAdmin/lang/it.json b/plugins/CorePluginsAdmin/lang/it.json
index 7605f5be48..67383df32b 100644
--- a/plugins/CorePluginsAdmin/lang/it.json
+++ b/plugins/CorePluginsAdmin/lang/it.json
@@ -16,6 +16,7 @@
         "BeCarefulUsingThemes": "I temi che non sono stati sviluppati dal team di Piwik devono essere utilizzati con cautela: non li abbiamo verificati.",
         "ByXDevelopers": "tramite %s sviluppatori",
         "Changelog": "Changelog",
+        "ChangeLookByManageThemes": "Puoi cambiare l'aspetto di Piwik tramite %sGestione Temi%s.",
         "ChangeSettingsPossible": "Puoi cambiare le %simpostazioni%s per questo plugin.",
         "CorePluginTooltip": "I plugins di base non hanno versione dato che sono distribuiti con Piweik.",
         "Deactivate": "Disattiva",
@@ -53,7 +54,6 @@
         "Origin": "Origine",
         "OriginCore": "Core",
         "OriginThirdParty": "Terze-parti",
-        "PluginDescription": "Interfaccia di amministrazione plugin.",
         "PluginHomepage": "Homepage Plugin",
         "PluginKeywords": "Keywords",
         "PluginNotCompatibleWith": "Il plugin %1$s non è compatibile con %2$s.",
diff --git a/plugins/CorePluginsAdmin/lang/ja.json b/plugins/CorePluginsAdmin/lang/ja.json
index 6fa682edab..19251d3a55 100644
--- a/plugins/CorePluginsAdmin/lang/ja.json
+++ b/plugins/CorePluginsAdmin/lang/ja.json
@@ -46,15 +46,16 @@
         "NoZipFileSelected": "ZIP ファイルを選択してください。",
         "NumDownloadsLatestVersion": "最新バージョン：%s のダウンロード",
         "NumUpdatesAvailable": "%s アップデートがあります",
+        "OncePluginIsInstalledYouMayActivateHere": "プラグインをインストールすると、ここで有効化と無効化を行うことができます。",
         "Origin": "開発元",
         "OriginCore": "コア",
         "OriginThirdParty": "サードパーティ",
-        "PluginDescription": "プラグイン管理のインターフェースです。",
         "PluginHomepage": "プラグインのホームページ",
         "PluginKeywords": "キーワード",
         "PluginNotCompatibleWith": "%1$s plugin is not compatible with %2$s.",
         "PluginNotWorkingAlternative": "このプラグインを以前から使用している場合、マーケットプレイス上で、より最新のバージョンを見つけることができます。使用していない場合、アンインストールすることをお勧めします。",
         "PluginRequirement": "%1$s requires %2$s.",
+        "PluginsExtendPiwik": "プラグインは Piwik の機能性を拡張します。",
         "PluginsManagement": "プラグインの管理",
         "PluginUpdateAvailable": "あなたは現在、バージョン %s を使用しています。新しいバージョン %s が利用可能です。",
         "PluginVersionInfo": "%1$s from %2$s",
diff --git a/plugins/CorePluginsAdmin/lang/ka.json b/plugins/CorePluginsAdmin/lang/ka.json
index 03d20017b0..88e710e0ff 100644
--- a/plugins/CorePluginsAdmin/lang/ka.json
+++ b/plugins/CorePluginsAdmin/lang/ka.json
@@ -7,8 +7,9 @@
         "Deactivate": "გამორთვა",
         "Inactive": "არააქტიური",
         "LicenseHomepage": "ლიცენზირების სათაო გვერდი",
-        "PluginDescription": "პლაგინების ადმინისტრირების ინტერფეისი",
+        "OncePluginIsInstalledYouMayActivateHere": "აქედან შესაძლებელია ერთხელ დაინსტალირებული პლაგინის ჩართვა და გამორთვა.",
         "PluginHomepage": "პლაგინის სათაო გვერდი",
+        "PluginsExtendPiwik": "პლაგინები აფართოვებენ და ამრავალფეროვნებენ Piwik–ის ფუნქციებს.",
         "PluginsManagement": "პლაგინების მენეჯმენტი",
         "Status": "სტატუსი",
         "Version": "ვერსია"
diff --git a/plugins/CorePluginsAdmin/lang/ko.json b/plugins/CorePluginsAdmin/lang/ko.json
index 3539d67146..3a8fb5f3a1 100644
--- a/plugins/CorePluginsAdmin/lang/ko.json
+++ b/plugins/CorePluginsAdmin/lang/ko.json
@@ -7,8 +7,9 @@
         "Deactivate": "비활성화",
         "Inactive": "비활성",
         "LicenseHomepage": "라이센스 홈페이지",
-        "PluginDescription": "플러그인 관리 인터페이스입니다.",
+        "OncePluginIsInstalledYouMayActivateHere": "플러그인이 한번 설치되면 이곳에서 활성화하거나 비활성화할 수 있습니다.",
         "PluginHomepage": "플러그인 홈페이지",
+        "PluginsExtendPiwik": "플러그인 확장과 Piwik의 기능성 확장페이지입니다.",
         "PluginsManagement": "플러그인 관리",
         "Status": "상태",
         "Version": "버전"
diff --git a/plugins/CorePluginsAdmin/lang/lt.json b/plugins/CorePluginsAdmin/lang/lt.json
index 53964a93f5..73a71215cb 100644
--- a/plugins/CorePluginsAdmin/lang/lt.json
+++ b/plugins/CorePluginsAdmin/lang/lt.json
@@ -5,8 +5,9 @@
         "Active": "Aktyvus",
         "Deactivate": "Pasyvinti",
         "Inactive": "Pasyvus",
-        "PluginDescription": "Papildinių administravimo sąsaja.",
+        "OncePluginIsInstalledYouMayActivateHere": "Įdiegę papildinį, čia galite jį aktyvinti arba pasyvinti",
         "PluginHomepage": "Papildinio svetainė",
+        "PluginsExtendPiwik": "Papildiniai suteikia Piwik papildomų galimybių.",
         "PluginsManagement": "Papildinių valdymas",
         "Status": "Būsena",
         "Version": "Versija"
diff --git a/plugins/CorePluginsAdmin/lang/lv.json b/plugins/CorePluginsAdmin/lang/lv.json
index df5b9fb7ca..ef530cbe72 100644
--- a/plugins/CorePluginsAdmin/lang/lv.json
+++ b/plugins/CorePluginsAdmin/lang/lv.json
@@ -7,8 +7,9 @@
         "Deactivate": "Deaktivizēt",
         "Inactive": "Neaktīvs",
         "LicenseHomepage": "Licences vietne",
-        "PluginDescription": "Spraudņu administrācijas skats",
+        "OncePluginIsInstalledYouMayActivateHere": "Pēc spraudņa instalācijas, Jūs to varat aktivizēt (vai deaktivizēt) šeit.",
         "PluginHomepage": "Spraudņa vietne",
+        "PluginsExtendPiwik": "Spraudņi paplašina Piwik funkcionalitāti.",
         "PluginsManagement": "Spraudņu pārvaldība",
         "Status": "Statuss",
         "Version": "Versija"
diff --git a/plugins/CorePluginsAdmin/lang/nb.json b/plugins/CorePluginsAdmin/lang/nb.json
index 7f1233f81b..36a9e4b06f 100644
--- a/plugins/CorePluginsAdmin/lang/nb.json
+++ b/plugins/CorePluginsAdmin/lang/nb.json
@@ -15,20 +15,29 @@
         "History": "Historikk",
         "Inactive": "Av",
         "InstallingPlugin": "Installerer %s",
+        "InstallNewPlugins": "Installer nye tillegg",
         "LastUpdated": "Sist oppdatert",
         "Marketplace": "Markedsplass",
+        "MenuPlatform": "Platform",
+        "NoPluginsFound": "Ingen tillegg funnet",
+        "NoZipFileSelected": "Vennligst velg en ZIP-fil.",
         "NumDownloadsLatestVersion": "Siste versjon: %s nedlastinger",
         "NumUpdatesAvailable": "%s oppdatering(er) tilgjengelig",
-        "PluginDescription": "Grensesnitt for administrasjon av tillegg",
+        "OncePluginIsInstalledYouMayActivateHere": "Når et tillegg har blitt installert, kan du slå det av eller på her.",
+        "OriginCore": "Kjerne",
+        "OriginThirdParty": "Tredjepart",
         "PluginHomepage": "Hjemmeside for tillegg",
         "PluginKeywords": "Nøkkelord",
         "PluginRequirement": "%1$s krever %2$s.",
+        "PluginsExtendPiwik": "Tillegg kan utvide eller begrense funksjonaliteten i Piwik.",
         "PluginsManagement": "Administrasjon av tillegg",
         "PluginVersionInfo": "%1$s fra %2$s",
         "Screenshots": "Skjermbilder",
         "SortByNewest": "nyeste",
+        "SortByPopular": "Populær",
         "Status": "Status",
         "StepDownloadingPluginFromMarketplace": "Laster ned tillegg fra markedsplassen",
+        "StepUnzippingPlugin": "Pakker ut tillegg",
         "Support": "Støtte",
         "Updated": "Oppdatert",
         "UpdatingPlugin": "Oppdaterer %s",
diff --git a/plugins/CorePluginsAdmin/lang/nl.json b/plugins/CorePluginsAdmin/lang/nl.json
index c4ba550415..c893d8b48a 100644
--- a/plugins/CorePluginsAdmin/lang/nl.json
+++ b/plugins/CorePluginsAdmin/lang/nl.json
@@ -14,14 +14,20 @@
         "BackToExtendPiwik": "Terug naar de Marktplaats",
         "ByXDevelopers": "door %s ontwikkelaars",
         "Changelog": "Wijzigingen",
+        "ChangeLookByManageThemes": "Je kan het uitelijk van Piwik wijzigen %sThema's%s",
         "ChangeSettingsPossible": "U kunt %sinstellingen%s aanpassen voor deze plugin.",
         "CorePluginTooltip": "Kern plugins hebben geen versie omdat deze met Piwik gedistribueerd worden.",
         "Deactivate": "Uitschakelen",
         "Developer": "Ontwikkelaar",
+        "DevelopersLearnHowToDevelopPlugins": "Ontwikkelaars: Leer hoe Piwik kan worden uitgebreid en aangepast door het %sontwikkelen van plugins en thema's%s.",
+        "DoMoreContactPiwikAdmins": "Neem contact op met je Piwik beheerder om een nieuwe plugin of thema te installeren.",
+        "EmailToEnquireUpdatedVersion": "Mail naar %1$s en vraag naar een actuele versie van %2$s.",
         "FeaturedPlugin": "Aanbevolen plugin",
+        "GetEarlyAccessForPaidPlugins": "Opmerking: op het moment zijn alle plugins gratis beschikbaar; in de toekomst activeren we Betaalde Plugins in de Marktplaats (%sneem contact op%s om eerder toegang te krijgen).",
         "History": "Historie",
         "Inactive": "Uitgeschakeld",
         "InfoPluginUpdateIsRecommended": "Update nu uw plugins om van de laatste verbeteringen te profiteren.",
+        "InfoThemeIsUsedByOtherUsersAsWell": "Opmerking: de andere %1$s gebruikers van deze Piwik gebruiken ook het thema %2$s.",
         "InfoThemeUpdateIsRecommended": "Update uw thema's om van de laatste versie te genieten.",
         "InstallingPlugin": "Installeren %s",
         "InstallNewPlugins": "Nieuwe plugins installeren",
@@ -37,14 +43,15 @@
         "NoZipFileSelected": "Selecteer een ZIP-bestand.",
         "NumDownloadsLatestVersion": "Laatste versie: %s Downloads",
         "NumUpdatesAvailable": "%s Update(s) beschikbaar",
+        "OncePluginIsInstalledYouMayActivateHere": "Wanneer een plugin geïnstalleerd is, kan deze hier aan- en uitgeschakeld worden.",
         "Origin": "Herkomst",
         "OriginCore": "Kern",
         "OriginThirdParty": "Derden",
-        "PluginDescription": "Plugin admin interface",
         "PluginHomepage": "Plugins",
         "PluginKeywords": "Sleutelwoorden",
         "PluginNotCompatibleWith": "%1$s plugin is niet compatibel met %2$s.",
         "PluginRequirement": "%1$s vereist %2$s.",
+        "PluginsExtendPiwik": "Met plugins breidt u de functionaliteit van piwik uit.",
         "PluginsManagement": "Plugin manager",
         "PluginUpdateAvailable": "U gebruikt versie %s en een nieuwe versie %s is beschikbaar.",
         "PluginVersionInfo": "%1$s van %2$s",
diff --git a/plugins/CorePluginsAdmin/lang/nn.json b/plugins/CorePluginsAdmin/lang/nn.json
index 84adb114be..02057f8cbe 100644
--- a/plugins/CorePluginsAdmin/lang/nn.json
+++ b/plugins/CorePluginsAdmin/lang/nn.json
@@ -7,8 +7,9 @@
         "Deactivate": "Slå av",
         "Inactive": "Av",
         "LicenseHomepage": "Lisensen til innstikket",
-        "PluginDescription": "Administrasjon av innstikk.",
+        "OncePluginIsInstalledYouMayActivateHere": "Når eit innstikk er lagt til, kan du slå det av og på her.",
         "PluginHomepage": "Nettsida til innstikket",
+        "PluginsExtendPiwik": "Innstikk utvidar funksjonane til Piwik.",
         "PluginsManagement": "Innstikkstyring",
         "Status": "Status",
         "Version": "Versjon"
diff --git a/plugins/CorePluginsAdmin/lang/pl.json b/plugins/CorePluginsAdmin/lang/pl.json
index ea8b93860f..ccb8bee4e8 100644
--- a/plugins/CorePluginsAdmin/lang/pl.json
+++ b/plugins/CorePluginsAdmin/lang/pl.json
@@ -46,15 +46,16 @@
         "NoZipFileSelected": "Proszę wybrać plik ZIP.",
         "NumDownloadsLatestVersion": "Ostatnia wersja: %s Pobrań",
         "NumUpdatesAvailable": "%s aktualizacji dostępnych",
+        "OncePluginIsInstalledYouMayActivateHere": "Po instalacji wtyczki, możesz ją tutaj włączyć lub wyłączyć.",
         "Origin": "Pochodzenie",
         "OriginCore": "Jądro",
         "OriginThirdParty": "osoba trzecia",
-        "PluginDescription": "Interfejs zarządzania wtyczkami.",
-        "PluginHomepage": "Wtyczka strony głównej",
+        "PluginHomepage": "Strona główna Wtyczki",
         "PluginKeywords": "Słowa kluczowe",
         "PluginNotCompatibleWith": "%1$s jest niekompatybilny z %2$s.",
         "PluginNotWorkingAlternative": "Przy użyciu tej wtyczki, może znajdziesz nowszą wersję w Marketplace. Jeśli nie, możesz ją odinstalować.",
         "PluginRequirement": "%1$s wymaga %2$s.",
+        "PluginsExtendPiwik": "Wtyczki zwiększają i rozszerzają funkcjonalność statystyk Piwik.",
         "PluginsManagement": "Zarządzanie wtyczkami",
         "PluginUpdateAvailable": "Używasz wersji %s, nowa wersja %s jest dostępna.",
         "PluginVersionInfo": "%1$s z %2$s",
diff --git a/plugins/CorePluginsAdmin/lang/pt-br.json b/plugins/CorePluginsAdmin/lang/pt-br.json
index 00bc5bb493..8060720c7e 100644
--- a/plugins/CorePluginsAdmin/lang/pt-br.json
+++ b/plugins/CorePluginsAdmin/lang/pt-br.json
@@ -41,13 +41,14 @@
         "NoZipFileSelected": "Por favor, selecione um arquivo ZIP.",
         "NumDownloadsLatestVersion": "Última versão: %s Downloads",
         "NumUpdatesAvailable": "%s Atualização(ões) disponível(is)",
+        "OncePluginIsInstalledYouMayActivateHere": "Uma vez que um plugin for instalado, você pode ativá-lo ou desativá-lo aqui.",
         "Origin": "Origem",
         "OriginCore": "Core",
-        "PluginDescription": "Interface de Administração de Plugins",
         "PluginHomepage": "Página do Plugin",
         "PluginKeywords": "Palavras-chave",
         "PluginNotCompatibleWith": "O plugin %1$s não é compatível com %2$s.",
         "PluginNotWorkingAlternative": "Se você estiver usando este plugin, talvez você possa encontrar uma versão mais recente no Marketplace. Se não, você pode querer desinstalá-lo.",
+        "PluginsExtendPiwik": "Plugins estendem e expandem a funcionalidade do Piwik.",
         "PluginsManagement": "Gerenciamento de plugins",
         "PluginUpdateAvailable": "Você está usando a versão %s e uma nova versão %s está disponível.",
         "Screenshots": "Screenshots",
diff --git a/plugins/CorePluginsAdmin/lang/pt.json b/plugins/CorePluginsAdmin/lang/pt.json
index 660d400a9c..307b83d2bd 100644
--- a/plugins/CorePluginsAdmin/lang/pt.json
+++ b/plugins/CorePluginsAdmin/lang/pt.json
@@ -1,16 +1,36 @@
 {
     "CorePluginsAdmin": {
+        "ActionActivatePlugin": "Ativar plugin",
+        "ActionActivateTheme": "Ativar tema",
+        "ActionInstall": "Instalar",
+        "ActionUninstall": "Desinstalar",
         "Activate": "Activar",
         "Activated": "Activado",
         "Active": "Activo",
+        "Activity": "Atividade",
         "AuthorHomepage": "HomePage do Autor",
         "Deactivate": "Desactivar",
+        "History": "Histórico",
         "Inactive": "Inactivo",
+        "LastUpdated": "Ultima atualização",
         "LicenseHomepage": "Homepage da licença",
-        "PluginDescription": "Interface de Administração de Plugins.",
+        "Marketplace": "Mercado",
+        "MenuPlatform": "Plataforma",
+        "OncePluginIsInstalledYouMayActivateHere": "Quando um plugin é instalado, pode activá-lo ou desactivá-lo aqui.",
+        "Origin": "Origem",
         "PluginHomepage": "Homepage do Plugin",
+        "PluginKeywords": "Palavras chave",
+        "PluginsExtendPiwik": "Plugins estendem e expandem a funcionalidade de Piwik.",
         "PluginsManagement": "Gestão de Plugins",
+        "SortByPopular": "polular",
         "Status": "Estado",
-        "Version": "Versão"
+        "Support": "Suporte",
+        "Theme": "Tema",
+        "Themes": "Temas",
+        "ThemesManagement": "Gestão de temas",
+        "Updated": "Atualizado",
+        "Version": "Versão",
+        "ViewRepositoryChangelog": "Ver alterações",
+        "Websites": "Websites"
     }
 }
\ No newline at end of file
diff --git a/plugins/CorePluginsAdmin/lang/ro.json b/plugins/CorePluginsAdmin/lang/ro.json
index 0e2437c7ef..abce3a3c3f 100644
--- a/plugins/CorePluginsAdmin/lang/ro.json
+++ b/plugins/CorePluginsAdmin/lang/ro.json
@@ -46,15 +46,16 @@
         "NoZipFileSelected": "Va rugam selectati un fisier ZIP.",
         "NumDownloadsLatestVersion": "Ultima versiune: %s descărcări",
         "NumUpdatesAvailable": "%s Update(uri) disponibile",
+        "OncePluginIsInstalledYouMayActivateHere": "Orice plugin instalat, poate fi activat sau dezactivat aici.",
         "Origin": "Origine",
         "OriginCore": "Baza",
         "OriginThirdParty": "Parti terte",
-        "PluginDescription": "Interfaţa de administrare plugin-uri.",
         "PluginHomepage": "Pagina Pluginurilor",
         "PluginKeywords": "Cuvinte cheie",
         "PluginNotCompatibleWith": "%1$s pluginul nu este compatibil cu %2$s.",
         "PluginNotWorkingAlternative": "Daca ati folosit acest plugin, poate gasiti o versiune mai noua in Marketplace. Daca nu, poate doriti sa il dezinstalati.",
         "PluginRequirement": "%1$s cere %2$s.",
+        "PluginsExtendPiwik": "Pluginurile extind functionaliatatea lui Piwik.",
         "PluginsManagement": "Managementul pluginurilor",
         "PluginUpdateAvailable": "Folositi versiunea %s iar o versiune noua %s este disponibila.",
         "PluginVersionInfo": "%1$s de la %2$s",
diff --git a/plugins/CorePluginsAdmin/lang/ru.json b/plugins/CorePluginsAdmin/lang/ru.json
index 60a3dac874..9384326bd3 100644
--- a/plugins/CorePluginsAdmin/lang/ru.json
+++ b/plugins/CorePluginsAdmin/lang/ru.json
@@ -15,10 +15,12 @@
         "BeCarefulUsingPlugins": "Плагины, которые разработаны не командой Piwik должны использоваться с осторожностью: мы не просматриваем их.",
         "BeCarefulUsingThemes": "Темы, которые разработаны не командой Piwik должны использоваться с осторожностью: мы не просматриваем их.",
         "Changelog": "История изменений",
+        "ChangeLookByManageThemes": "Вы можете изменить внешний вид Piwik: %sВыбор Темы%s.",
         "ChangeSettingsPossible": "Вы можете %sизменить настройки%s для этого плагина.",
         "CorePluginTooltip": "Основные плагины не имеют версию, так как они распространяются с Piwik.",
         "Deactivate": "Деактивировать",
         "Developer": "Разработчик",
+        "DoMoreContactPiwikAdmins": "Для установки нового плагина или новой темы, пожалуйста свяжитесь с вашим Piwik-администратором",
         "FeaturedPlugin": "Набирающий популярность плагин",
         "GetEarlyAccessForPaidPlugins": "Примечание: в настоящее время все плагины доступны бесплатно, в будущем мы включим платные плагины на Marketplace (%sсвяжитесь с нами%s для раннего доступа).",
         "History": "История",
@@ -26,13 +28,14 @@
         "InfoPluginUpdateIsRecommended": "Обновите плагины что бы воспользоваться последними улучшениями.",
         "InfoThemeIsUsedByOtherUsersAsWell": "Примечание: другие зарегистрированные пользователи (%1$s) используют эту же тему: %2$s.",
         "InfoThemeUpdateIsRecommended": "Обновите темы что бы насладиться последними улучшениями.",
+        "InstallingNewPluginViaMarketplaceOrUpload": "Вы автоматически можете установить плагины из Marketplace или %sзагрузить плагин%s в формате zip.",
         "InstallingPlugin": "Установка %s",
         "InstallNewPlugins": "Установить новые плагины",
         "InstallNewThemes": "Установить новые темы",
         "LastUpdated": "Последнее обновление",
         "LicenseHomepage": "Дом. страница лицензии",
-        "Marketplace": "Маркет",
-        "MarketplaceSellPluginSubject": "Маркет - Продать плагин",
+        "Marketplace": "Marketplace",
+        "MarketplaceSellPluginSubject": "Marketplace – Продать плагин",
         "MenuPlatform": "Платформа",
         "MissingRequirementsNotice": "Пожалуйста, обновите %1$s %2$s до более новой версии, необходима версия %1$s %3$s.",
         "NoPluginsFound": "Плагины не найдены",
@@ -40,17 +43,19 @@
         "NoZipFileSelected": "Выберете ZIP файл",
         "NumDownloadsLatestVersion": "Последняя версия скачена: %s раз",
         "NumUpdatesAvailable": "%s Обновлений доступно",
+        "OncePluginIsInstalledYouMayActivateHere": "После установки плагина Вы можете активировать или деактивировать его здесь.",
         "Origin": "Происхождение",
         "OriginCore": "Основные",
         "OriginThirdParty": "Сторонние",
-        "PluginDescription": "Админпанель плагинов.",
         "PluginHomepage": "Дом. страница плагина",
         "PluginKeywords": "Ключевые слова",
         "PluginNotCompatibleWith": "Плагин %1$s не совместим с %2$s.",
         "PluginNotWorkingAlternative": "Если вы используете этот плагин, может быть, вы сможете найти более новые версии в Marketplace. Если нет — можете удалить его.",
         "PluginRequirement": "%1$s требуется %2$s.",
+        "PluginsExtendPiwik": "Плагины расширяют функциональность Piwik.",
         "PluginsManagement": "Управление плагинами",
         "PluginUpdateAvailable": "Вы используете версию %s последняя доступная %s",
+        "PluginVersionInfo": "%1$s – %2$s",
         "PluginWebsite": "Сайт плагина",
         "Screenshots": "Скриншоты",
         "SortByAlpha": "по названию",
diff --git a/plugins/CorePluginsAdmin/lang/sk.json b/plugins/CorePluginsAdmin/lang/sk.json
index 843c7d132b..e3be0c8bc4 100644
--- a/plugins/CorePluginsAdmin/lang/sk.json
+++ b/plugins/CorePluginsAdmin/lang/sk.json
@@ -5,8 +5,9 @@
         "Active": "Aktívny",
         "Deactivate": "Deaktivovať",
         "Inactive": "Neaktívny",
-        "PluginDescription": "Pluginy v administračnom rozhraní.",
+        "OncePluginIsInstalledYouMayActivateHere": "Po nainštalovaní modulu ho tu môžete aktivovať, alebo deaktivovať.",
         "PluginHomepage": "Domovská stránka modulu",
+        "PluginsExtendPiwik": "Moduly rozširujú funkcionalitu projektu Piwik.",
         "PluginsManagement": "Správa modulov",
         "Status": "Stav",
         "Theme": "Motív",
diff --git a/plugins/CorePluginsAdmin/lang/sl.json b/plugins/CorePluginsAdmin/lang/sl.json
index bde6a588f1..3b6ee78a16 100644
--- a/plugins/CorePluginsAdmin/lang/sl.json
+++ b/plugins/CorePluginsAdmin/lang/sl.json
@@ -10,7 +10,9 @@
         "Deactivate": "Onemogoči",
         "Inactive": "Neaktivno",
         "LicenseHomepage": "Spletna stran licence",
+        "OncePluginIsInstalledYouMayActivateHere": "Ko je vtičnik enkrat nameščen, ga lahko tukaj aktivirate oziroma deaktivirate.",
         "PluginHomepage": "Spletna stran vtičnika",
+        "PluginsExtendPiwik": "Vtičniki razširjajo Piwik-ovo funkcionalnost.",
         "PluginsManagement": "Urejanje Vtičnikov",
         "Status": "Status",
         "Version": "Različica"
diff --git a/plugins/CorePluginsAdmin/lang/sq.json b/plugins/CorePluginsAdmin/lang/sq.json
index 1f4608ba56..d32af267b3 100644
--- a/plugins/CorePluginsAdmin/lang/sq.json
+++ b/plugins/CorePluginsAdmin/lang/sq.json
@@ -7,8 +7,9 @@
         "Deactivate": "Çaktivizoje",
         "Inactive": "Jovepruese",
         "LicenseHomepage": "Faqja Hyrëse e Lejes",
-        "PluginDescription": "Ndërfaqe Administrimi Shtojcash.",
+        "OncePluginIsInstalledYouMayActivateHere": "Pasi një shtojcë të jetë instaluar, mund ta aktivizoni ose çaktivizoni prej këtu.",
         "PluginHomepage": "Faqe Hyrëse e Shtojcës",
+        "PluginsExtendPiwik": "Shtojcat zgjerojnë dhe thellojnë funksionet e Piwik-ut.",
         "PluginsManagement": "Administrim Shtojcash",
         "Status": "Gjendje",
         "Version": "Version"
diff --git a/plugins/CorePluginsAdmin/lang/sr.json b/plugins/CorePluginsAdmin/lang/sr.json
index 454efedf9b..3e88d0a92c 100644
--- a/plugins/CorePluginsAdmin/lang/sr.json
+++ b/plugins/CorePluginsAdmin/lang/sr.json
@@ -46,15 +46,16 @@
         "NoZipFileSelected": "Molimo vas da izaberete ZIP datoteku.",
         "NumDownloadsLatestVersion": "Poslednja verzija: %s preuzimanja",
         "NumUpdatesAvailable": "Ažuriranja na raspolaganju: %s",
+        "OncePluginIsInstalledYouMayActivateHere": "Jednom instaliran dodatak se ovde može aktivirati ili deaktivirati.",
         "Origin": "Izvor",
         "OriginCore": "Srž",
         "OriginThirdParty": "Treća strana",
-        "PluginDescription": "Interfejs za upravljanje dodacima",
         "PluginHomepage": "Sajt dodatka",
         "PluginKeywords": "Ključne reči",
         "PluginNotCompatibleWith": "%1$s dodatak nije kompatibilan sa %2$s.",
         "PluginNotWorkingAlternative": "Ukoliko ste koristili ovaj dodatak, novu verziju možda možete naći na Marketu. Ukoliko niste, možda želite da ga deinstalirate.",
         "PluginRequirement": "%1$s zahteva %2$s.",
+        "PluginsExtendPiwik": "Dodaci proširuju funkcionalnost Piwik-a.",
         "PluginsManagement": "Upravljanje dodacima",
         "PluginUpdateAvailable": "Koristite verziju %s a novija verzija %s je na raspolaganju.",
         "PluginVersionInfo": "%1$s od %2$s",
diff --git a/plugins/CorePluginsAdmin/lang/sv.json b/plugins/CorePluginsAdmin/lang/sv.json
index edabd93bdf..1437251857 100644
--- a/plugins/CorePluginsAdmin/lang/sv.json
+++ b/plugins/CorePluginsAdmin/lang/sv.json
@@ -39,6 +39,7 @@
         "MarketplaceSellPluginSubject": "Butik- Sälj Plugin",
         "MenuPlatform": "Plattform",
         "MissingRequirementsNotice": "Uppdatera %1$s och %2$s till en nyare version, %1$s %3$s är begärda.",
+        "MissingRequirementsPleaseInstallNotice": "Vänligen installera %1$s %2$s då det krävs av %3$s.",
         "NoPluginsFound": "Inga plugin hittade",
         "NotAllowedToBrowseMarketplacePlugins": "Du kan titta igenom listan med plugin som kan installeras för att skräddarsy eller utöka din Piwik plattform. Var vänlig och kontakta din administratör om du vill installera något av de plugin du hittar.",
         "NotAllowedToBrowseMarketplaceThemes": "Du kan leta i listan efter teman som kan installeras för att skräddarsy din Piwik plattform. Kontakta din administratör så kan denne installera temat åt dig.",
@@ -46,15 +47,16 @@
         "NoZipFileSelected": "Var vänlig och välj en ZIP fil.",
         "NumDownloadsLatestVersion": "Sista versionen: %s Nedladdningar",
         "NumUpdatesAvailable": "%s uppdatering(s) tillgänglig",
+        "OncePluginIsInstalledYouMayActivateHere": "När en plugin är installerad kan du aktivera eller inaktivera den här.",
         "Origin": "Ursprung",
         "OriginCore": "Kärna",
         "OriginThirdParty": "Tredje-part",
-        "PluginDescription": "administrationsgränssnitt för plugins.",
         "PluginHomepage": "Plugin Hemsida",
         "PluginKeywords": "Nyckelord",
         "PluginNotCompatibleWith": "%1$s plugin är inte kompatibelt med %2$s.",
         "PluginNotWorkingAlternative": "Om du använt det här pluginet, kanske du kan hitta en nyare version i vår butik. Om inte så kanske du vill avinstallera det.",
         "PluginRequirement": "%1$s kräver %2$s",
+        "PluginsExtendPiwik": "Plugins breddar och utökar funktionerna i Piwik.",
         "PluginsManagement": "Pluginhantering",
         "PluginUpdateAvailable": "Du använder version %s och en ny version %s finns tillgänglig.",
         "PluginVersionInfo": "%1$s från %2$s",
diff --git a/plugins/CorePluginsAdmin/lang/ta.json b/plugins/CorePluginsAdmin/lang/ta.json
index 85a25ddf0c..0ce3799014 100644
--- a/plugins/CorePluginsAdmin/lang/ta.json
+++ b/plugins/CorePluginsAdmin/lang/ta.json
@@ -7,9 +7,10 @@
         "Inactive": "செயலற்ற",
         "LicenseHomepage": "உரிம முகப்பு",
         "NoZipFileSelected": "தயவு செய்து ZIP கோப்பை தெரிவு செய்யுங்கள்.",
-        "PluginDescription": "சொருகிகள் ஆளுமை இடைமுகம்.",
+        "OncePluginIsInstalledYouMayActivateHere": "ஒரு சொருகியை நிறுவியவுடன், இங்கு அதனை செயல்படுத்த அல்லது செயலிழக்க வைக்க முடியும்.",
         "PluginHomepage": "சொருகி முகப்பு",
         "PluginNotCompatibleWith": "%1$s இந்த செருகி %2$s உடன் பொருத்தமானது இல்லை",
+        "PluginsExtendPiwik": "சொருகிகள் பிவிக்-ன் செயல்பாடுகளை விரிவுபடுத்தவும், மேம்படுத்தவும் பயன்படுகின்றன.",
         "PluginsManagement": "சொருகிகள் மேலாண்மை",
         "Status": "நிலைப்பாடு",
         "Theme": "காட்சியமைப்பு",
diff --git a/plugins/CorePluginsAdmin/lang/th.json b/plugins/CorePluginsAdmin/lang/th.json
index 889f374b84..5adac0841a 100644
--- a/plugins/CorePluginsAdmin/lang/th.json
+++ b/plugins/CorePluginsAdmin/lang/th.json
@@ -7,8 +7,9 @@
         "Deactivate": "ปิดใช้งาน",
         "Inactive": "ไม่ทำงาน",
         "LicenseHomepage": "หน้าแรกใบอนุญาต",
-        "PluginDescription": "การจัดการระบบปลั๊กอิน",
+        "OncePluginIsInstalledYouMayActivateHere": "เมื่อปลั๊กอินที่ติดตั้งอยู่คุณสามารถเปิดใช้งานหรือยกเลิกการใช้งานได้ ที่นี่",
         "PluginHomepage": "หน้าหลักของปลั๊กอิน",
+        "PluginsExtendPiwik": "อธิบายการใช้งานปลั้กอินและแสดงการทำงานของ Piwik.",
         "PluginsManagement": "จัดการปลั้กอิน",
         "Status": "สถานะ",
         "Version": "เวอร์ชั่น"
diff --git a/plugins/CorePluginsAdmin/lang/tl.json b/plugins/CorePluginsAdmin/lang/tl.json
index 47774be25b..e9fa9d3086 100644
--- a/plugins/CorePluginsAdmin/lang/tl.json
+++ b/plugins/CorePluginsAdmin/lang/tl.json
@@ -46,15 +46,16 @@
         "NoZipFileSelected": "Pumili ng ZIP file",
         "NumDownloadsLatestVersion": "Pinakabagong bersyon: %s na mga download",
         "NumUpdatesAvailable": "%s na (mga) Update ang available",
+        "OncePluginIsInstalledYouMayActivateHere": "Sa sandaling ang plugin ay na-install, maari mo itong i-activate o i-deactivate dito.",
         "Origin": "Pinagmulan",
         "OriginCore": "Core",
         "OriginThirdParty": "Third-Party",
-        "PluginDescription": "Administration Interface ng mga Plugin",
         "PluginHomepage": "Homepage ng Plugin",
         "PluginKeywords": "Mga Keyword",
         "PluginNotCompatibleWith": "%1$s ang plugin na to ay hindi compatible sa %2$s.",
         "PluginNotWorkingAlternative": "Kung ginagamit nag plugin na ito, maari mong makita ang pinakabagong bersyon nito sa Marketplace. Kung hindi, maaari mong i-uninstall ito.",
         "PluginRequirement": "%1$s kailangan %2$s.",
+        "PluginsExtendPiwik": "Ang mga plugin ay pinahaba at pinalawak ang functionality ng Piwik.",
         "PluginsManagement": "Pamamahala ng plugin",
         "PluginUpdateAvailable": "Iyong ginagamit ang bersyon %s at ang pinaka bagong bersyon %s ay available.",
         "PluginVersionInfo": "%1$s mula %2$s",
diff --git a/plugins/CorePluginsAdmin/lang/tr.json b/plugins/CorePluginsAdmin/lang/tr.json
index 33e6008a2c..48c27e27a4 100644
--- a/plugins/CorePluginsAdmin/lang/tr.json
+++ b/plugins/CorePluginsAdmin/lang/tr.json
@@ -39,7 +39,6 @@
         "NumUpdatesAvailable": "Uygun %s Güncelleme",
         "OriginCore": "Çekirdek",
         "OriginThirdParty": "Üçüncü parti",
-        "PluginDescription": "Eklenti yönetim arabirimi.",
         "PluginHomepage": "Eklenti Sayfası",
         "PluginKeywords": "Anahtar Kelimeler",
         "PluginsManagement": "Eklenti Yönetimi",
diff --git a/plugins/CorePluginsAdmin/lang/uk.json b/plugins/CorePluginsAdmin/lang/uk.json
index d5670dff36..9b83d723f4 100644
--- a/plugins/CorePluginsAdmin/lang/uk.json
+++ b/plugins/CorePluginsAdmin/lang/uk.json
@@ -7,8 +7,9 @@
         "Deactivate": "Деактивувати",
         "Inactive": "Неактивний",
         "LicenseHomepage": "Сторінка ліцензії",
-        "PluginDescription": "Інтерфейс Адміністрування Плагінів",
+        "OncePluginIsInstalledYouMayActivateHere": "Як тільки плагін встановлено його можна автивувати або деактивувати тут.",
         "PluginHomepage": "Домашня сторінка плагіна",
+        "PluginsExtendPiwik": "Плагіни розширюють та примножують функціонал Piwik.",
         "PluginsManagement": "Керування плагінами",
         "Status": "Статус",
         "Version": "Версія"
diff --git a/plugins/CorePluginsAdmin/lang/vi.json b/plugins/CorePluginsAdmin/lang/vi.json
index 9196c7afb0..645828da76 100644
--- a/plugins/CorePluginsAdmin/lang/vi.json
+++ b/plugins/CorePluginsAdmin/lang/vi.json
@@ -35,13 +35,14 @@
         "NoThemesFound": "Giao diện không tìm thấy",
         "NoZipFileSelected": "Hãy chọn một tập tin ZIP.",
         "NumDownloadsLatestVersion": "Phiên bản mới nhất: %s lượt tải",
+        "OncePluginIsInstalledYouMayActivateHere": "Khi một plugin được cài đặt, bạn có thể kích hoạt hay ngừng kích hoạt nó tại đây.",
         "Origin": "Nguồn gốc",
         "OriginCore": "Lõi",
         "OriginThirdParty": "Bên thứ ba",
-        "PluginDescription": "Giao diện quản trị plugin.",
         "PluginHomepage": "Trang chủ Plugin.",
         "PluginKeywords": "Từ khóa",
         "PluginNotCompatibleWith": "%1$s plugin là không tương thích với %2$s.",
+        "PluginsExtendPiwik": "Bổ sung mở rộng và mở rộng các chức năng của Piwik.",
         "PluginsManagement": "Quản lý các Plugin.",
         "SortByNewest": "mới nhất",
         "SortByPopular": "thông dụng",
diff --git a/plugins/CorePluginsAdmin/lang/zh-cn.json b/plugins/CorePluginsAdmin/lang/zh-cn.json
index de3eaf264b..10c9c6800e 100644
--- a/plugins/CorePluginsAdmin/lang/zh-cn.json
+++ b/plugins/CorePluginsAdmin/lang/zh-cn.json
@@ -30,14 +30,15 @@
         "NoZipFileSelected": "请选择一个ZIP文件",
         "NumDownloadsLatestVersion": "最新版本: %s次下载",
         "NumUpdatesAvailable": "%s 有更新",
+        "OncePluginIsInstalledYouMayActivateHere": "当一个插件安装了以后，您可以在这里启用或停用它。",
         "Origin": "原始",
         "OriginCore": "核心",
         "OriginThirdParty": "第三方",
-        "PluginDescription": "插件管理界面。",
         "PluginHomepage": "插件首页",
         "PluginKeywords": "关键字",
         "PluginNotCompatibleWith": "插件 %1$s 与 %2$s 不兼容。",
         "PluginNotWorkingAlternative": "如果您使用这个插件，可以到商城查找更新的版本。如果没有用，可以卸载。",
+        "PluginsExtendPiwik": "插件延伸并扩展了 Piwik 的功能。",
         "PluginsManagement": "插件管理",
         "PluginVersionInfo": "%1$s 从 %2$s",
         "PluginWebsite": "插件网站",
diff --git a/plugins/CorePluginsAdmin/lang/zh-tw.json b/plugins/CorePluginsAdmin/lang/zh-tw.json
index dc26c93952..4f0a9ef3d5 100644
--- a/plugins/CorePluginsAdmin/lang/zh-tw.json
+++ b/plugins/CorePluginsAdmin/lang/zh-tw.json
@@ -5,8 +5,9 @@
         "Active": "啟用中",
         "Deactivate": "停用",
         "Inactive": "停用中",
-        "PluginDescription": "外掛管理介面。",
+        "OncePluginIsInstalledYouMayActivateHere": "當一個外掛安裝了以後，您可以在這裏啟用或停用它。",
         "PluginHomepage": "外掛首頁",
+        "PluginsExtendPiwik": "外掛延伸並擴展了 Piwik 的功能。",
         "PluginsManagement": "外掛管理",
         "Status": "狀態",
         "Version": "版本"
diff --git a/plugins/CorePluginsAdmin/stylesheets/marketplace.less b/plugins/CorePluginsAdmin/stylesheets/marketplace.less
index 119634da9d..ade3437114 100644
--- a/plugins/CorePluginsAdmin/stylesheets/marketplace.less
+++ b/plugins/CorePluginsAdmin/stylesheets/marketplace.less
@@ -84,7 +84,7 @@
     float: left;
     border: 1px solid #dadada;
     padding: 15px;
-    background-color: #F6F5F3;
+    background-color: #f2f2f2;
     margin-right: 14px;
     margin-bottom: 15px;
     position: relative;
@@ -138,6 +138,9 @@
     .header {
       margin-top: 0px;
       margin-bottom: 15px;
+      h3 {
+        font-size: 16px;
+      }
     }
 
     .description {
@@ -145,17 +148,21 @@
     }
     .install {
       float: right;
+      margin-top: 3px;
     }
     .update {
       .install
     }
     h3 .more {
-      color: @theme-color-text;
-    }
-    .more {
       font-weight: bold;
       text-decoration: none;
-      color: @theme-color-link;
+      &:hover {
+        text-decoration: underline;
+      }
+    }
+    .more {
+      text-decoration: underline;
+      color: @theme-color-text;
     }
     .content {
       margin-bottom: 46px;
@@ -229,16 +236,12 @@
 
 .pluginslistActionBar {
   min-width: 650px;
-  max-width: 980px;
 
   form {
     display: inline;
   }
 
   .sort {
-    a {
-      color: @theme-color-link;
-    }
     .active {
       font-weight: bold;
     }
diff --git a/plugins/CorePluginsAdmin/stylesheets/plugins_admin.less b/plugins/CorePluginsAdmin/stylesheets/plugins_admin.less
index edcc91200b..dc3a4965d7 100644
--- a/plugins/CorePluginsAdmin/stylesheets/plugins_admin.less
+++ b/plugins/CorePluginsAdmin/stylesheets/plugins_admin.less
@@ -1,9 +1,9 @@
 table.dataTable tr.active-plugin > td {
-    background-color:#fff !important;
+    background-color:@theme-color-background-base !important;
 }
 
 table.dataTable tr.active-plugin:hover > td {
-    background-color:#fff !important;
+    background-color:@theme-color-background-base !important;
 }
 
 table.dataTable tr.inactive-plugin > td {
@@ -51,4 +51,4 @@ table.entityTable tr td a.uninstall {
     font-size:80%;
     font-style:italic;
     color:#777;
-}
\ No newline at end of file
+}
diff --git a/plugins/CorePluginsAdmin/templates/browsePlugins.twig b/plugins/CorePluginsAdmin/templates/browsePlugins.twig
index 9259081a0c..068d9e80ab 100644
--- a/plugins/CorePluginsAdmin/templates/browsePlugins.twig
+++ b/plugins/CorePluginsAdmin/templates/browsePlugins.twig
@@ -1,4 +1,4 @@
-{% extends 'admin.twig' %}
+{% extends mode is defined and mode == 'user' ? "user.twig" : "admin.twig" %}
 {% import '@CorePluginsAdmin/macros.twig' as pluginsMacro %}
 
 {% block content %}
diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig
index 3f6ad112c0..6eda0a2d31 100644
--- a/plugins/CorePluginsAdmin/templates/macros.twig
+++ b/plugins/CorePluginsAdmin/templates/macros.twig
@@ -166,7 +166,7 @@
 
                         {% if name in pluginNamesHavingSettings %}
                             <br /><br />
-                            <a href="{{ linkTo({'module':'CoreAdminHome', 'action': 'pluginSettings'}) }}#{{ name|e('html_attr') }}" class="settingsLink">{{ 'General_Settings'|translate }}</a>
+                            <a href="{{ linkTo({'module':'CoreAdminHome', 'action': 'adminPluginSettings'}) }}#{{ name|e('html_attr') }}" class="settingsLink">{{ 'General_Settings'|translate }}</a>
                         {% endif %}
                     </td>
                     <td class="desc">
diff --git a/plugins/CorePluginsAdmin/templates/pluginOverview.twig b/plugins/CorePluginsAdmin/templates/pluginOverview.twig
index b6a81cd901..f49d8878ed 100644
--- a/plugins/CorePluginsAdmin/templates/pluginOverview.twig
+++ b/plugins/CorePluginsAdmin/templates/pluginOverview.twig
@@ -19,7 +19,7 @@
 </h3>
 <p class="description">{{ plugin.description }}
     <br />
-    <a href="javascript:void(0);" title="{{ 'General_MoreDetails'|translate }}" class="more">&gt;&gt; {{ 'General_MoreLowerCase'|translate }}</a>
+    <a href="javascript:void(0);" title="{{ 'General_MoreDetails'|translate }}" class="more">&rsaquo; {{ 'General_MoreLowerCase'|translate }}</a>
 </p>
 
 {% if plugin.canBeUpdated %}
diff --git a/plugins/CorePluginsAdmin/templates/plugins.twig b/plugins/CorePluginsAdmin/templates/plugins.twig
index 4c4b6b1192..7249e45488 100644
--- a/plugins/CorePluginsAdmin/templates/plugins.twig
+++ b/plugins/CorePluginsAdmin/templates/plugins.twig
@@ -3,7 +3,7 @@
 {% import '@CorePluginsAdmin/macros.twig' as plugins %}
 
 {% block content %}
-<div style="max-width:980px;">
+<div>
 
     {% if pluginsHavingUpdate|length %}
         <h2>{{ pluginsHavingUpdate|length }} Update(s) available</h2>
@@ -22,6 +22,11 @@
         <br/>{{ 'CorePluginsAdmin_DoMoreContactPiwikAdmins'|translate }}
     {% endif %}
 
+
+    {% if isMarketplaceEnabled %}
+        <br />
+        {{ 'CorePluginsAdmin_ChangeLookByManageThemes'|translate('<a href="' ~ linkTo({'action': 'themes'}) ~'">', '</a>')|raw }}
+    {% endif %}
     </p>
 
     {{ plugins.pluginsFilter(false, isMarketplaceEnabled) }}
diff --git a/plugins/CorePluginsAdmin/templates/themes.twig b/plugins/CorePluginsAdmin/templates/themes.twig
index 5ac8ff6d9a..b5e52666d9 100644
--- a/plugins/CorePluginsAdmin/templates/themes.twig
+++ b/plugins/CorePluginsAdmin/templates/themes.twig
@@ -5,14 +5,6 @@
 {% block content %}
 <div style="max-width:980px;">
 
-    {% if pluginsHavingUpdate|length %}
-        <h2>{{ 'CorePluginsAdmin_NumUpdatesAvailable'|translate(pluginsHavingUpdate|length) }}</h2>
-
-        <p>{{ 'CorePluginsAdmin_InfoThemeUpdateIsRecommended'|translate }}</p>
-
-        {{ plugins.tablePluginUpdates(pluginsHavingUpdate, updateNonce, true) }}
-    {% endif %}
-
     <h2 piwik-enriched-headline>{{ 'CorePluginsAdmin_ThemesManagement'|translate }}</h2>
 
     <p>{{ 'CorePluginsAdmin_ThemesDescription'|translate }}
diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php
index bbb0cdc7f2..90b0d13aa5 100644
--- a/plugins/CoreUpdater/Controller.php
+++ b/plugins/CoreUpdater/Controller.php
@@ -164,7 +164,7 @@ class Controller extends \Piwik\Plugin\Controller
 
     private function oneClick_Download()
     {
-        $path = StaticContainer::getContainer()->get('path.tmp') . self::PATH_TO_EXTRACT_LATEST_VERSION;
+        $path = StaticContainer::get('path.tmp') . self::PATH_TO_EXTRACT_LATEST_VERSION;
         $this->pathPiwikZip = $path . 'latest.zip';
 
         Filechecks::dieIfDirectoriesNotWritable(array($path));
@@ -172,12 +172,12 @@ class Controller extends \Piwik\Plugin\Controller
         // we catch exceptions in the caller (i.e., oneClickUpdate)
         $url = self::getLatestZipUrl($this->newVersion) . '?cb=' . $this->newVersion;
 
-        Http::fetchRemoteFile($url, $this->pathPiwikZip);
+        Http::fetchRemoteFile($url, $this->pathPiwikZip, 0, 120);
     }
 
     private function oneClick_Unpack()
     {
-        $pathExtracted = StaticContainer::getContainer()->get('path.tmp') . self::PATH_TO_EXTRACT_LATEST_VERSION;
+        $pathExtracted = StaticContainer::get('path.tmp') . self::PATH_TO_EXTRACT_LATEST_VERSION;
 
         $this->pathRootExtractedPiwik = $pathExtracted . 'piwik';
 
diff --git a/plugins/CoreUpdater/CoreUpdater.php b/plugins/CoreUpdater/CoreUpdater.php
index 98d2c7f126..f6f197db5d 100644
--- a/plugins/CoreUpdater/CoreUpdater.php
+++ b/plugins/CoreUpdater/CoreUpdater.php
@@ -15,7 +15,6 @@ use Piwik\Filesystem;
 use Piwik\FrontController;
 use Piwik\Piwik;
 use Piwik\Columns\Updater as ColumnsUpdater;
-use Piwik\ScheduledTime;
 use Piwik\UpdateCheck;
 use Piwik\Updater;
 use Piwik\UpdaterErrorException;
diff --git a/plugins/CoreUpdater/UpdateCommunication.php b/plugins/CoreUpdater/UpdateCommunication.php
index cd52e80a3e..27f253eed4 100644
--- a/plugins/CoreUpdater/UpdateCommunication.php
+++ b/plugins/CoreUpdater/UpdateCommunication.php
@@ -15,6 +15,7 @@ use Piwik\Piwik;
 use Piwik\Plugins\UsersManager\API as UsersManagerApi;
 use Piwik\SettingsPiwik;
 use Piwik\UpdateCheck;
+use Piwik\Version;
 
 /**
  * Class to check and notify users via email if there is a core update available.
@@ -66,9 +67,18 @@ class UpdateCommunication
         $message .= Piwik::translate('CoreUpdater_ThereIsNewVersionAvailableForUpdate');
         $message .= "\n\n";
         $message .= Piwik::translate('CoreUpdater_YouCanUpgradeAutomaticallyOrDownloadPackage', $latestVersion);
-        $message .= "\n\n";
+        $message .= "\n";
         $message .= $host . 'index.php?module=CoreUpdater&action=newVersionAvailable';
         $message .= "\n\n";
+
+        $version = new Version();
+        if ($version->isStableVersion($latestVersion)) {
+            $message .= Piwik::translate('CoreUpdater_ViewVersionChangelog');
+            $message .= "\n";
+            $message .= $this->getLinkToChangeLog($latestVersion);
+            $message .= "\n\n";
+        }
+
         $message .= Piwik::translate('CoreUpdater_FeedbackRequest');
         $message .= "\n";
         $message .= 'http://piwik.org/contact/';
@@ -76,9 +86,13 @@ class UpdateCommunication
         $this->sendEmailNotification($subject, $message);
     }
 
-    protected function isVersionLike($latestVersion)
+    private function getLinkToChangeLog($version)
     {
-        return strlen($latestVersion) < 18;
+        $version = str_replace('.', '-', $version);
+
+        $link = sprintf('http://piwik.org/changelog/piwik-%s/', $version);
+
+        return $link;
     }
 
     /**
@@ -112,7 +126,8 @@ class UpdateCommunication
         }
 
         $latestVersion = self::getLatestVersion();
-        if (!$this->isVersionLike($latestVersion)) {
+        $version = new Version();
+        if (!$version->isVersionNumber($latestVersion)) {
             return false;
         }
 
@@ -135,7 +150,13 @@ class UpdateCommunication
 
     private function getLatestVersion()
     {
-        return UpdateCheck::getLatestVersion();
+        $version = UpdateCheck::getLatestVersion();
+
+        if (!empty($version)) {
+            $version = trim($version);
+        }
+
+        return $version;
     }
 
     private function getLatestVersionSent()
diff --git a/plugins/CoreUpdater/lang/ar.json b/plugins/CoreUpdater/lang/ar.json
index c674bcc644..9e360180aa 100644
--- a/plugins/CoreUpdater/lang/ar.json
+++ b/plugins/CoreUpdater/lang/ar.json
@@ -27,7 +27,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "تم تحديث Piwik بنجاح!",
         "PiwikUpdatedSuccessfully": "تم تحديث Piwik بنجاح!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "ستتم ترقية قاعدة بيانات Piwik من الإصدار %1$s إلى الإصدار الجديد %2$s.",
-        "PluginDescription": "آلية تحديث Piwik",
         "ReadyToGo": "هل أنت مستعد؟",
         "TheFollowingPluginsWillBeUpgradedX": "سيتم تحديث الإضافات التالية: %s.",
         "ThereIsNewVersionAvailableForUpdate": "يوجد إصدار أحدث من Piwik",
diff --git a/plugins/CoreUpdater/lang/be.json b/plugins/CoreUpdater/lang/be.json
index 21b5ca2a6c..13e2678da0 100644
--- a/plugins/CoreUpdater/lang/be.json
+++ b/plugins/CoreUpdater/lang/be.json
@@ -26,7 +26,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik паспяхова абноўлены!",
         "PiwikUpdatedSuccessfully": "Piwik абноўлены паспяхова!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Piwik база будзе абноўлена з версіі %1$s да версіі %2$s.",
-        "PluginDescription": "Механізм абнаўлення Piwik",
         "ReadyToGo": "Гатовы пачаць?",
         "TheFollowingPluginsWillBeUpgradedX": "Наступныя плагіны будуць абноўлены: %s.",
         "ThereIsNewVersionAvailableForUpdate": "Даступная новая версія Piwik",
diff --git a/plugins/CoreUpdater/lang/bg.json b/plugins/CoreUpdater/lang/bg.json
index a2aa8b7fc7..a3699b58a1 100644
--- a/plugins/CoreUpdater/lang/bg.json
+++ b/plugins/CoreUpdater/lang/bg.json
@@ -33,7 +33,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik успешно е обновен!",
         "PiwikUpdatedSuccessfully": "Обновлението на Piwik завърши успешно!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Piwik базата от данни (БД) ще бъде обновена от %1$s версия към %2$s.",
-        "PluginDescription": "Механизъм за актуализиране на Piwik",
         "ReadyToGo": "Готови ли сте?",
         "TheFollowingPluginsWillBeUpgradedX": "Следните добавки ще бъдат обновени: %s.",
         "ThereIsNewPluginVersionAvailableForUpdate": "Някои от добавките, които използвате, са обновени в магазина:",
diff --git a/plugins/CoreUpdater/lang/bs.json b/plugins/CoreUpdater/lang/bs.json
index 4ff2eb0a3b..a53eb582fe 100644
--- a/plugins/CoreUpdater/lang/bs.json
+++ b/plugins/CoreUpdater/lang/bs.json
@@ -2,7 +2,6 @@
     "CoreUpdater": {
         "DownloadX": "Preuzmi %s",
         "ExceptionArchiveEmpty": "Prazna arhiva",
-        "ExceptionArchiveIncompatible": "Nekompatibilna arhiva: %s",
-        "PluginDescription": "Pwikijev mehanizam za ažuriranje"
+        "ExceptionArchiveIncompatible": "Nekompatibilna arhiva: %s"
     }
 }
\ No newline at end of file
diff --git a/plugins/CoreUpdater/lang/ca.json b/plugins/CoreUpdater/lang/ca.json
index 1125a5ecca..53867f0e5a 100644
--- a/plugins/CoreUpdater/lang/ca.json
+++ b/plugins/CoreUpdater/lang/ca.json
@@ -28,7 +28,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "El Piwik s'ha actualitzat amb èxit!",
         "PiwikUpdatedSuccessfully": "El Piwik s'ha actualitzat correctament!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "La base de dades s'actualitzarà de la versió %1$s a la nova %2$s.",
-        "PluginDescription": "Mecanísme d'actualització del Piwik",
         "ReadyToGo": "Preparat?",
         "TheFollowingPluginsWillBeUpgradedX": "Aquests connectors s'actualitzaran: %s.",
         "ThereIsNewVersionAvailableForUpdate": "Hi ha una nova versió del Piwik disponible.",
diff --git a/plugins/CoreUpdater/lang/cs.json b/plugins/CoreUpdater/lang/cs.json
index 7753d8a6bd..aff2914e2d 100644
--- a/plugins/CoreUpdater/lang/cs.json
+++ b/plugins/CoreUpdater/lang/cs.json
@@ -36,7 +36,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik byl úspěšně aktualizován!",
         "PiwikUpdatedSuccessfully": "Piwik úspěšně aktualizován!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Databáze Piwiku bude aktualizována z verze %1$s na novou verzi %2$s.",
-        "PluginDescription": "Mechanismus aktualizace Piwiku",
         "ReadyToGo": "Připraven pokračovat?",
         "TheFollowingDimensionsWillBeUpgradedX": "Následující dimenze budou aktualizovány: %s.e",
         "TheFollowingPluginsWillBeUpgradedX": "Následující zásuvné moduly budou aktualizovány: %s.",
@@ -51,6 +50,7 @@
         "UpgradeComplete": "Aktualizace je kompletní!",
         "UpgradePiwik": "Aktualizovat Piwik",
         "VerifyingUnpackedFiles": "Ověřuji rozbalené soubory",
+        "ViewVersionChangelog": "Zobrazit protokol změn této verze:",
         "WarningMessages": "Hlášky upozornění:",
         "WeAutomaticallyDeactivatedTheFollowingPlugins": "Automaticky jsme zakázali následující zásuvné moduly: %s",
         "YouCanUpgradeAutomaticallyOrDownloadPackage": "Můžete aktualizovat na verzi %s automaticky, nebo si stáhněte balíček a nainstalujte jej manuálně:",
diff --git a/plugins/CoreUpdater/lang/da.json b/plugins/CoreUpdater/lang/da.json
index 4293aa66b3..1c5a93f7f2 100644
--- a/plugins/CoreUpdater/lang/da.json
+++ b/plugins/CoreUpdater/lang/da.json
@@ -36,7 +36,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik blev opdateret!",
         "PiwikUpdatedSuccessfully": "Piwik er opdateret!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Piwik vil blive opgraderet fra version %1$s til den nye version %2$s.",
-        "PluginDescription": "Piwik ajourføringsmekanisme",
         "ReadyToGo": "Klar, parat, start?",
         "TheFollowingDimensionsWillBeUpgradedX": "Følgende mål vil blive opdateret: %s.",
         "TheFollowingPluginsWillBeUpgradedX": "Følgende udvidelsesmoduler vil blive opgraderet: %s.",
diff --git a/plugins/CoreUpdater/lang/de.json b/plugins/CoreUpdater/lang/de.json
index 33144f11b1..1fd500876e 100644
--- a/plugins/CoreUpdater/lang/de.json
+++ b/plugins/CoreUpdater/lang/de.json
@@ -36,7 +36,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik wurde erfolgreich aktualisiert!",
         "PiwikUpdatedSuccessfully": "Piwik wurde erfolgreich aktualisiert!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Die Piwik-Datenbank wird von Version %1$s auf die neue Version %2$s aktualisiert.",
-        "PluginDescription": "Piwik-Aktualisierung",
         "ReadyToGo": "Sind Sie bereit?",
         "TheFollowingDimensionsWillBeUpgradedX": "Die folgenden Dimensionen werden aktualisiert: %s.",
         "TheFollowingPluginsWillBeUpgradedX": "Die folgenden Plugins werden aktualisiert: %s",
@@ -51,6 +50,7 @@
         "UpgradeComplete": "Aktualisierung abgeschlossen!",
         "UpgradePiwik": "Piwik aktualisieren",
         "VerifyingUnpackedFiles": "Die entpackten Dateien werden überprüft",
+        "ViewVersionChangelog": "Änderungen in dieser Version ansehen:",
         "WarningMessages": "Warnhinweise:",
         "WeAutomaticallyDeactivatedTheFollowingPlugins": "Die folgenden Plugins wurden automatisch deaktiviert: %s",
         "YouCanUpgradeAutomaticallyOrDownloadPackage": "Die Aktualisierung auf Version %s kann automatisch ausgeführt werden. Oder Sie laden das Paket herunter und installieren es manuell:",
diff --git a/plugins/CoreUpdater/lang/el.json b/plugins/CoreUpdater/lang/el.json
index 3ecad1186c..b16b8821c6 100644
--- a/plugins/CoreUpdater/lang/el.json
+++ b/plugins/CoreUpdater/lang/el.json
@@ -6,7 +6,7 @@
         "DisablingIncompatiblePlugins": "Απενεργοποίηση των μη συμβατών πρόσθετων: %s",
         "DownloadingUpdateFromX": "Λήψη αναβάθμισης από %s",
         "DownloadX": "Λήψη %s",
-        "EmptyDatabaseError": "Η βάση δεδομένων %s είναι άδεια. Πρέπει να επεξεργαστείτε ή να διαγράψετε το αρχείο ρυθμίσεων του Piwik.",
+        "EmptyDatabaseError": "Η βάση δεδομένων %s είναι κενή. Πρέπει να επεξεργαστείτε ή να διαγράψετε το αρχείο ρυθμίσεων του Piwik.",
         "ErrorDIYHelp": "Αν είστε προχωρημένος χρήστης και εμφανιστεί σφάλμα στην αναβάθμιση της βάσης δεδομένων:",
         "ErrorDIYHelp_1": "Αναγνωρίστε και διορθώστε την προέλευση του προβλήματος (π.χ., memory_limit ή max_execution_time)",
         "ErrorDIYHelp_2": "εκτελέστε τα εναπομείναντα ερωτήματα στην ενημέρωση που απέτυχαν",
@@ -36,7 +36,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Το Piwik αναβαθμίστηκε επιτυχώς!",
         "PiwikUpdatedSuccessfully": "Το Piwik αναβαθμίστηκε επιτυχώς!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Η βάση δεδομένων Piwik θα αναβαθμιστεί από την έκδοση %1$s στην έκδοση %2$s.",
-        "PluginDescription": "Μηχανισμός ενημέρωσης Piwik",
         "ReadyToGo": "Έτοιμοι για να συνεχίσετε;",
         "TheFollowingDimensionsWillBeUpgradedX": "Οι ακόλουθες διαστάσεις θα ενημερωθούν: %s.",
         "TheFollowingPluginsWillBeUpgradedX": "Τα ακόλουθα πρόσθετα θα αναβαθμιστούν: %s.",
@@ -51,6 +50,7 @@
         "UpgradeComplete": "Η αναβάθμιση ολοκληρώθηκε!",
         "UpgradePiwik": "Αναβάθμιση Piwik",
         "VerifyingUnpackedFiles": "Επιβεβαίωση των ασυμπίεστων αρχείων",
+        "ViewVersionChangelog": "Δείτε τις αλλαγές για αυτή την έκδοση:",
         "WarningMessages": "Προειδοποιητικά μηνύματα:",
         "WeAutomaticallyDeactivatedTheFollowingPlugins": "Απενεργοποιήθηκαν τα παρακάτω πρόσθετα: %s",
         "YouCanUpgradeAutomaticallyOrDownloadPackage": "Μπορείτε να αναβαθμίσετε στην έκδοση %s αυτόματα ή λάβετε το πακέτο και εγκαταστήστε τη χειροκίνητα:",
diff --git a/plugins/CoreUpdater/lang/en.json b/plugins/CoreUpdater/lang/en.json
index 1b94754223..67bc20f27b 100644
--- a/plugins/CoreUpdater/lang/en.json
+++ b/plugins/CoreUpdater/lang/en.json
@@ -36,7 +36,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik has been successfully updated!",
         "PiwikUpdatedSuccessfully": "Piwik updated successfully!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Piwik database will be upgraded from version %1$s to the new version %2$s.",
-        "PluginDescription": "Piwik updating mechanism",
         "ReadyToGo": "Ready to go?",
         "TheFollowingPluginsWillBeUpgradedX": "The following plugins will be updated: %s.",
         "TheFollowingDimensionsWillBeUpgradedX": "The following dimensions will be updated: %s.",
@@ -56,6 +55,7 @@
         "YouCanUpgradeAutomaticallyOrDownloadPackage": "You can update to version %s automatically or download the package and install it manually:",
         "YouCouldManuallyExecuteSqlQueries": "If you are not able to use the command line updater and if Piwik fails to upgrade (due to a timeout of the database, a browser timeout, or any other issue), you could manually execute the SQL queries to update Piwik.",
         "YouMustDownloadPackageOrFixPermissions": "Piwik is unable to overwrite your current installation. You can either fix the directory\/file permissions, or download the package and install version %s manually:",
-        "YourDatabaseIsOutOfDate": "Your Piwik database is out-of-date, and must be upgraded before you can continue."
+        "YourDatabaseIsOutOfDate": "Your Piwik database is out-of-date, and must be upgraded before you can continue.",
+        "ViewVersionChangelog": "View the changelog for this version:"
     }
 }
\ No newline at end of file
diff --git a/plugins/CoreUpdater/lang/es.json b/plugins/CoreUpdater/lang/es.json
index 4f1cb647be..a3470502eb 100644
--- a/plugins/CoreUpdater/lang/es.json
+++ b/plugins/CoreUpdater/lang/es.json
@@ -36,7 +36,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "¡Piwik se ha actualizado correctamente!",
         "PiwikUpdatedSuccessfully": "¡Piwik actualizado con éxito!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "La base de datos de Piwik será actualizada desde la versión %1$s a la nueva versión %2$s.",
-        "PluginDescription": "mecanismo de actualización de Piwik",
         "ReadyToGo": "¿Listo?",
         "TheFollowingPluginsWillBeUpgradedX": "Los siguientes plugins serán actualizados: %s.",
         "ThereIsNewPluginVersionAvailableForUpdate": "Algunos plugins que utilizas han sido actualizados en el Marketplace:",
diff --git a/plugins/CoreUpdater/lang/et.json b/plugins/CoreUpdater/lang/et.json
index 62e1e91e75..e67dd67800 100644
--- a/plugins/CoreUpdater/lang/et.json
+++ b/plugins/CoreUpdater/lang/et.json
@@ -19,7 +19,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik edukalt uuendatud!",
         "PiwikUpdatedSuccessfully": "Piwik edukalt uuendatud!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Piwiku andmebaas uuendatakse versioonilt %1$s uuele versioonile %2$s.",
-        "PluginDescription": "Piwiku uuendamise mehhanism",
         "ReadyToGo": "Valmis jätkamiseks?",
         "TheFollowingPluginsWillBeUpgradedX": "Valitud lisatarkvarad uuendatakse: %s.",
         "ThereIsNewVersionAvailableForUpdate": "Uus Piwiku versioon on saadaval",
diff --git a/plugins/CoreUpdater/lang/fa.json b/plugins/CoreUpdater/lang/fa.json
index 9d7dad97d1..53e4b0f2c6 100644
--- a/plugins/CoreUpdater/lang/fa.json
+++ b/plugins/CoreUpdater/lang/fa.json
@@ -30,7 +30,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "پیویک با موفقیت به روزرسانی شد!",
         "PiwikUpdatedSuccessfully": "پیویک با موفقیت به روز رسانی شد!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "پایگاه داده ی پیویک از نسخه ی %1$s به نسخه ی %2$s ارتقا پیدا خواهد کرد.",
-        "PluginDescription": "سازوکار بروزرسانی پیویک",
         "ReadyToGo": "آماده اجرا هستید؟",
         "TheFollowingPluginsWillBeUpgradedX": "این افزونه ها بروزرسانی خواهند شد: %s .",
         "ThereIsNewVersionAvailableForUpdate": "نسخه جدیدی از پیویک برای بروزرسانی آماده است",
diff --git a/plugins/CoreUpdater/lang/fi.json b/plugins/CoreUpdater/lang/fi.json
index 48d6dd4445..2ac7399cce 100644
--- a/plugins/CoreUpdater/lang/fi.json
+++ b/plugins/CoreUpdater/lang/fi.json
@@ -36,7 +36,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik on päivitetty onnistuneesti!",
         "PiwikUpdatedSuccessfully": "Piwik päivitettiin onnistuneesti!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Piwikin tietokanta päivitetään versiosta %1$s versioon %2$s.",
-        "PluginDescription": "Piwikin päivitysjärjestelmä",
         "ReadyToGo": "Valmis jatkamaan?",
         "TheFollowingDimensionsWillBeUpgradedX": "Seuraavat asiat päivitetään: %s.",
         "TheFollowingPluginsWillBeUpgradedX": "Seuraavat lisäosat päivitetään: %s.",
diff --git a/plugins/CoreUpdater/lang/fr.json b/plugins/CoreUpdater/lang/fr.json
index f69376aab3..7ca4f831cd 100644
--- a/plugins/CoreUpdater/lang/fr.json
+++ b/plugins/CoreUpdater/lang/fr.json
@@ -36,7 +36,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik a été mis à jour avec succès !",
         "PiwikUpdatedSuccessfully": "Piwik a été mis à jour avec succès !",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "La base de données de Piwik sera mise à jour depuis la version %1$s vers la version %2$s.",
-        "PluginDescription": "Mécanisme de mise à jour Piwik",
         "ReadyToGo": "Prêt à démarrer?",
         "TheFollowingDimensionsWillBeUpgradedX": "Les dimensions suivantes vont être mises à jour: %s.",
         "TheFollowingPluginsWillBeUpgradedX": "Les plugins suivants seront mis à jour : %s.",
@@ -51,6 +50,7 @@
         "UpgradeComplete": "Mise à jour complète !",
         "UpgradePiwik": "Mettez Piwik à jour",
         "VerifyingUnpackedFiles": "Vérification des fichiers décompressés",
+        "ViewVersionChangelog": "Voir les logs de changement pour cette version :",
         "WarningMessages": "Messages d'avertissement :",
         "WeAutomaticallyDeactivatedTheFollowingPlugins": "Nous avons automatiquement désactivé les plugins suivants : %s",
         "YouCanUpgradeAutomaticallyOrDownloadPackage": "Vous pouvez mettre à jour vers la version %s automatiquement ou télécharger l'archive et l'installer manuellement:",
diff --git a/plugins/CoreUpdater/lang/he.json b/plugins/CoreUpdater/lang/he.json
index 1448ea4d63..7fb4db692f 100644
--- a/plugins/CoreUpdater/lang/he.json
+++ b/plugins/CoreUpdater/lang/he.json
@@ -26,7 +26,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik שודרגה בהצלחה!",
         "PiwikUpdatedSuccessfully": "שדרוג Piwik הושלם בהצלחה!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "מסד הנתונים של Piwik ישודרג מגירסה %1$s לגירסה %2$s.",
-        "PluginDescription": "מנגנון השדרוג של Piwik",
         "ReadyToGo": "שנתחיל?",
         "TheFollowingPluginsWillBeUpgradedX": "התוספים הבאים ישודרגו: %s.",
         "ThereIsNewVersionAvailableForUpdate": "ישנה גירסה חדשה של Piwik זמינה עבורך",
diff --git a/plugins/CoreUpdater/lang/hi.json b/plugins/CoreUpdater/lang/hi.json
index 57f5009694..291197fa95 100644
--- a/plugins/CoreUpdater/lang/hi.json
+++ b/plugins/CoreUpdater/lang/hi.json
@@ -28,7 +28,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik सफलतापूर्वक अद्यतन किया गया है!",
         "PiwikUpdatedSuccessfully": "Piwik सफलतापूर्वक अद्यतन!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Piwik डेटाबेस संस्करण%1$s से नए संस्करण %2$s के लिए उन्नत किया जाएगा",
-        "PluginDescription": "Piwik तंत्र को अद्यतन",
         "ReadyToGo": "जाने के लिए तैयार हैं?",
         "TheFollowingPluginsWillBeUpgradedX": "निम्नलिखित प्लगिन अद्यतन किया जाएगा:%s",
         "ThereIsNewVersionAvailableForUpdate": "नवीनीकरण के लिए उपलब्ध है Piwik का एक नया संस्करण है",
diff --git a/plugins/CoreUpdater/lang/hu.json b/plugins/CoreUpdater/lang/hu.json
index 42320746f6..5d0a852c80 100644
--- a/plugins/CoreUpdater/lang/hu.json
+++ b/plugins/CoreUpdater/lang/hu.json
@@ -26,7 +26,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "A Piwik sikeresen frissült!",
         "PiwikUpdatedSuccessfully": "A Piwik frissítése sikeresen megtörtént!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Piwik adatbázisa frissülni fog %1$s verzióról az új %2$s verzióra.",
-        "PluginDescription": "Piwik frissítésére szolgáló alkalmazás",
         "ReadyToGo": "Készen áll az indulásra?",
         "TheFollowingPluginsWillBeUpgradedX": "A következő bővítmények kerülnek frissítésre: %s.",
         "ThereIsNewVersionAvailableForUpdate": "Új Piwik verzió áll rendelkezésre a frissítéshez",
diff --git a/plugins/CoreUpdater/lang/id.json b/plugins/CoreUpdater/lang/id.json
index 8d498e1f2b..b9d6bea14a 100644
--- a/plugins/CoreUpdater/lang/id.json
+++ b/plugins/CoreUpdater/lang/id.json
@@ -28,7 +28,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik berhasil diperbarui!",
         "PiwikUpdatedSuccessfully": "Pembaruan Piwik berhasil!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "BasisData Piwik akan diperbarui dari versi %1$s ke versi %2$s.",
-        "PluginDescription": "Cara pembaruan Piwik",
         "ReadyToGo": "Sudah siap?",
         "TheFollowingPluginsWillBeUpgradedX": "Pengaya berikut akan diperbarui: %s.",
         "ThereIsNewVersionAvailableForUpdate": "Terdapat versi baru Piwik yang tersedia",
diff --git a/plugins/CoreUpdater/lang/it.json b/plugins/CoreUpdater/lang/it.json
index c7bff9c093..1e29720a21 100644
--- a/plugins/CoreUpdater/lang/it.json
+++ b/plugins/CoreUpdater/lang/it.json
@@ -12,7 +12,7 @@
         "ErrorDIYHelp_2": "esegui le query fallite rimanenti nell'aggiornamento.",
         "ErrorDIYHelp_3": "aggiorna manualmente la tabella 'option' nel tuo database Piwik, settando il valore di version_core alla versione dell'aggiornamento fallito",
         "ErrorDIYHelp_4": "ri-esegui l'aggiornamento (tramite il browser o da riga di comando) per continuare con gli aggiornamenti rimanenti",
-        "ErrorDIYHelp_5": "riporta l'errore (e la soluzione) così che Piwik possa migliorare",
+        "ErrorDIYHelp_5": "restituisce l'errore (e la soluzione) così che Piwik possa migliorare",
         "ErrorDuringPluginsUpdates": "Errore durante l'aggiornamento del plugin:",
         "ExceptionAlreadyLatestVersion": "La tua versione di Piwik %s è aggiornata.",
         "ExceptionArchiveEmpty": "Archivio vuoto.",
@@ -36,7 +36,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik è stato aggiornato con successo!",
         "PiwikUpdatedSuccessfully": "Piwik è stato aggiornato con successo!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Il Database Piwik deve essere aggiornato dalla versione %1$s alla nuova versione %2$s.",
-        "PluginDescription": "Meccanismo di aggiornamento di Piwik",
         "ReadyToGo": "Pronto a partire?",
         "TheFollowingDimensionsWillBeUpgradedX": "Le dimensioni seguenti saranno aggiornate: %s.",
         "TheFollowingPluginsWillBeUpgradedX": "I seguenti plugin saranno aggiornati: %s.",
@@ -51,6 +50,7 @@
         "UpgradeComplete": "Aggiornamento completato!",
         "UpgradePiwik": "Aggiornamento Piwik",
         "VerifyingUnpackedFiles": "Sto verificando i file scompattati",
+        "ViewVersionChangelog": "Guarda il changelog per questa versione:",
         "WarningMessages": "Messaggi di Allerta:",
         "WeAutomaticallyDeactivatedTheFollowingPlugins": "Saranno disattivati in automatico i seguenti plugin: %s",
         "YouCanUpgradeAutomaticallyOrDownloadPackage": "Puoi aggiornare alla versione %s in automatico o scaricare il pacchetto e installarlo manualmente:",
diff --git a/plugins/CoreUpdater/lang/ja.json b/plugins/CoreUpdater/lang/ja.json
index f462cbe36d..4d6c358ed3 100644
--- a/plugins/CoreUpdater/lang/ja.json
+++ b/plugins/CoreUpdater/lang/ja.json
@@ -36,7 +36,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik は正常にアップグレードされました！",
         "PiwikUpdatedSuccessfully": "Piwik は正常にアップデートされました！",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Piwik データベースが %1$s から新バージョン %2$s にアップグレードされます。",
-        "PluginDescription": "Piwik アップデートメカニズム",
         "ReadyToGo": "実行してもよろしいですか？",
         "TheFollowingDimensionsWillBeUpgradedX": "以下の範囲をアップデートします: %s",
         "TheFollowingPluginsWillBeUpgradedX": "次のプラグインはアップグレードされます： %s",
diff --git a/plugins/CoreUpdater/lang/ka.json b/plugins/CoreUpdater/lang/ka.json
index 224b596e3e..246cae26ff 100644
--- a/plugins/CoreUpdater/lang/ka.json
+++ b/plugins/CoreUpdater/lang/ka.json
@@ -26,7 +26,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik წარმატებით განახლდა!",
         "PiwikUpdatedSuccessfully": "Piwik წარმატებით განახლდა!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Piwik მონაცემთა ბაზა განახლდება %1$s ვერსიიდან ახალი %2$s ვერსიამდე.",
-        "PluginDescription": "Piwik-ის განახლების მექანიზმი",
         "ReadyToGo": "მზად ხართ?",
         "TheFollowingPluginsWillBeUpgradedX": "განახლდება შემდეგი პლაგინები: %s.",
         "ThereIsNewVersionAvailableForUpdate": "Piwik–ის ახალი ვერსია გამოსულია, შესაძლებელია განახლება",
diff --git a/plugins/CoreUpdater/lang/ko.json b/plugins/CoreUpdater/lang/ko.json
index 57e4de79ef..a6080aeffe 100644
--- a/plugins/CoreUpdater/lang/ko.json
+++ b/plugins/CoreUpdater/lang/ko.json
@@ -28,7 +28,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik 이 성공적으로 업데이트되었습니다!",
         "PiwikUpdatedSuccessfully": "Piwik 업데이트가 성공적으로 완료되었습니다!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Piwik 데이터베이스가 %1$s 버전에서 %2$s 새 버전으로 업그레이드됩니다.",
-        "PluginDescription": "Piwik 업데이트 메커니즘",
         "ReadyToGo": "실행 하시겠습니까?",
         "TheFollowingPluginsWillBeUpgradedX": "다음의 플러그인들이 업데이트됩니다: %s.",
         "ThereIsNewVersionAvailableForUpdate": "Piwik의 새 버전으로 업데이트 할 수 있습니다.",
diff --git a/plugins/CoreUpdater/lang/lt.json b/plugins/CoreUpdater/lang/lt.json
index 2dbf68d04a..31c4ce4db7 100644
--- a/plugins/CoreUpdater/lang/lt.json
+++ b/plugins/CoreUpdater/lang/lt.json
@@ -26,7 +26,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik sėkmingai atnaujinta!",
         "PiwikUpdatedSuccessfully": "Piwik sėkmingai atnaujinta!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Piwik duombazė bus atnaujinta iš %1$s į %2$s versiją.",
-        "PluginDescription": "Piwik naujinimo įranga",
         "ReadyToGo": "Pasiruošę pradėti?",
         "TheFollowingPluginsWillBeUpgradedX": "Bus atnaujinti šie papildiniai: %s.",
         "ThereIsNewVersionAvailableForUpdate": "Pasirodė nauja Piwik versija",
diff --git a/plugins/CoreUpdater/lang/lv.json b/plugins/CoreUpdater/lang/lv.json
index 0f078b5bb7..909940d7a1 100644
--- a/plugins/CoreUpdater/lang/lv.json
+++ b/plugins/CoreUpdater/lang/lv.json
@@ -14,7 +14,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik tika veiksmīgi atjaunināts",
         "PiwikUpdatedSuccessfully": "Piwik atjaunināts veiksmīgi!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Piwik datubāze tiks atjaunināta no %1$s līdz %2$s versijai.",
-        "PluginDescription": "Piwik atjaunināšanas mehānisms",
         "ReadyToGo": "Esat gatavi?",
         "TheFollowingPluginsWillBeUpgradedX": "Sekojošie spraudņi tiks atjaunināti: %s.",
         "ThereIsNewVersionAvailableForUpdate": "Ir pieejama atjaunināšanai jauna Piwik versija",
diff --git a/plugins/CoreUpdater/lang/nb.json b/plugins/CoreUpdater/lang/nb.json
index 1d5f7e1b85..e9542d5030 100644
--- a/plugins/CoreUpdater/lang/nb.json
+++ b/plugins/CoreUpdater/lang/nb.json
@@ -25,10 +25,10 @@
         "NoteForLargePiwikInstances": "Viktig merknad for store Piwik-installasjoner",
         "NoteItIsExpectedThatQueriesFail": "Merk: Hvis du utfører disse spørringene manuelt, så er det forventet at noen av dem feiler. Hvis det skjer, så skal du bare ignorere det og fortsette med neste spørringen på lista.",
         "NotificationSubjectAvailableCoreUpdate": "Ny Piwik %s er tilgjengelig",
+        "NotificationSubjectAvailablePluginUpdate": "Oppdatering tilgjengelig for dine Piwik tillegg",
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik ble korrekt oppdatert!",
         "PiwikUpdatedSuccessfully": "Piwik ble vellykket oppdatert!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Piwik-databasen blir oppgradert fra versjon %1$s til versjon %2$s .",
-        "PluginDescription": "Piwik-oppdateringsmekanisme",
         "ReadyToGo": "Klar til å starte?",
         "TheFollowingPluginsWillBeUpgradedX": "Følgende tillegg vil nå bli oppdatert: %s.",
         "ThereIsNewVersionAvailableForUpdate": "Du kan oppdatere til en ny versjon av Piwik.",
diff --git a/plugins/CoreUpdater/lang/nl.json b/plugins/CoreUpdater/lang/nl.json
index 4794de88f1..1b1808a1db 100644
--- a/plugins/CoreUpdater/lang/nl.json
+++ b/plugins/CoreUpdater/lang/nl.json
@@ -34,7 +34,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik upgrade was succesvol!",
         "PiwikUpdatedSuccessfully": "Piwik is succesvol geüpdatet!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Piwik Database zal ge-upgrade worden van versie %1$s naar de nieuwe versie %2$s",
-        "PluginDescription": "Piwik updating mechanisme",
         "ReadyToGo": "Klaar om te starten?",
         "TheFollowingDimensionsWillBeUpgradedX": "De volgende onderdelen zullen worden geupdate: %s.",
         "TheFollowingPluginsWillBeUpgradedX": "De volgende plugins zullen ge-upgrade worden: %s.",
@@ -49,6 +48,7 @@
         "UpgradeComplete": "Upgrade voltooid!",
         "UpgradePiwik": "Upgrade Piwik",
         "VerifyingUnpackedFiles": "Bezig met verifiëren van de uitgepakte bestanden",
+        "ViewVersionChangelog": "Bekijk het wijzigingslogboek voor versie:",
         "WarningMessages": "Waarschuwings bericht:",
         "WeAutomaticallyDeactivatedTheFollowingPlugins": "We hebben de volgende plugins gedeactiveerd: %s",
         "YouCanUpgradeAutomaticallyOrDownloadPackage": "U kunt automatisch updaten naar versie %s of het pakket downloaden en handmatig installeren.",
diff --git a/plugins/CoreUpdater/lang/nn.json b/plugins/CoreUpdater/lang/nn.json
index eb7a51437b..6f6659344e 100644
--- a/plugins/CoreUpdater/lang/nn.json
+++ b/plugins/CoreUpdater/lang/nn.json
@@ -26,7 +26,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Oppdateringa var vellykka!",
         "PiwikUpdatedSuccessfully": "Oppdatering av Piwik var vellukka!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Piwik-databasa vil bli oppgradert frå versjon %1$s til den nye versjonen %2$s.",
-        "PluginDescription": "Oppdateraren til Piwik",
         "ReadyToGo": "Er du klar?",
         "TheFollowingPluginsWillBeUpgradedX": "Dei følgjande innstikka vil bli oppdaterte: %s.",
         "ThereIsNewVersionAvailableForUpdate": "Ein ny versjon av Piwik er tilgjengeleg for oppdatering",
diff --git a/plugins/CoreUpdater/lang/pl.json b/plugins/CoreUpdater/lang/pl.json
index fc39332138..779d81458a 100644
--- a/plugins/CoreUpdater/lang/pl.json
+++ b/plugins/CoreUpdater/lang/pl.json
@@ -36,7 +36,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Statystyki Piwik zostały zaktualizowane pomyślnie!",
         "PiwikUpdatedSuccessfully": "Oprogramowanie Piwik zostało zaktualizowane pomyślnie!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Baza danych statystyk Piwik zostanie zaktualizowana z wersji %1$s do nowej wersji %2$s.",
-        "PluginDescription": "Mechanizm aktualizacji Piwik",
         "ReadyToGo": "Gotowy do dalszego działania?",
         "TheFollowingDimensionsWillBeUpgradedX": "Następujące rozmiary zostaną zaaktualizowane: %s.",
         "TheFollowingPluginsWillBeUpgradedX": "Następujące wtyczki zostaną zaktualizowane: %s.",
diff --git a/plugins/CoreUpdater/lang/pt-br.json b/plugins/CoreUpdater/lang/pt-br.json
index a9d756a014..dca9d3d528 100644
--- a/plugins/CoreUpdater/lang/pt-br.json
+++ b/plugins/CoreUpdater/lang/pt-br.json
@@ -29,7 +29,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik foi atualizado com sucesso!",
         "PiwikUpdatedSuccessfully": "Piwik atualizado com sucesso!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "O banco de dados do Piwik será atualizado da versão %1$s para a nova versão %2$s.",
-        "PluginDescription": "Mecanismo de update Piwik",
         "ReadyToGo": "Pronto(a) para ir?",
         "TheFollowingPluginsWillBeUpgradedX": "Os seguintes plugins serão atualizados: %s.",
         "ThereIsNewVersionAvailableForUpdate": "Há uma nova versão do Piwik disponível para atualização",
diff --git a/plugins/CoreUpdater/lang/pt.json b/plugins/CoreUpdater/lang/pt.json
index 44d4270d17..229635cbff 100644
--- a/plugins/CoreUpdater/lang/pt.json
+++ b/plugins/CoreUpdater/lang/pt.json
@@ -26,7 +26,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik foi actualizado com sucesso!",
         "PiwikUpdatedSuccessfully": "Piwik actualizado com sucesso!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "A base de dados Piwik será actualizada da versão %1$s para a nova versão %2$s.",
-        "PluginDescription": "Mecanismo de actualização de Piwik",
         "ReadyToGo": "Pronto?",
         "TheFollowingPluginsWillBeUpgradedX": "Os seguintes plugins serão actualizados: %s.",
         "ThereIsNewVersionAvailableForUpdate": "Há uma nova versão de Piwik disponível para actualizar",
diff --git a/plugins/CoreUpdater/lang/ro.json b/plugins/CoreUpdater/lang/ro.json
index 9901fb4bb8..79c1c625fe 100644
--- a/plugins/CoreUpdater/lang/ro.json
+++ b/plugins/CoreUpdater/lang/ro.json
@@ -36,7 +36,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik a fost actualizat cu succes!",
         "PiwikUpdatedSuccessfully": "Piwik actualizat cu succes!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Baza de date Piwik va fi actualizată de la versiunea %1$s la versiunea nouă %2$s.",
-        "PluginDescription": "Mecanismul de actualizare Piwik",
         "ReadyToGo": "Eşti gata să procedezi?",
         "TheFollowingPluginsWillBeUpgradedX": "Urmatoarele pluginuri vor fi actualizate: %s.",
         "ThereIsNewPluginVersionAvailableForUpdate": "Anumite pluginuri pe care le folositi au fost updatate in Marketplace:",
diff --git a/plugins/CoreUpdater/lang/ru.json b/plugins/CoreUpdater/lang/ru.json
index bba05fe6c0..8fe962222d 100644
--- a/plugins/CoreUpdater/lang/ru.json
+++ b/plugins/CoreUpdater/lang/ru.json
@@ -19,7 +19,7 @@
         "ExceptionArchiveIncompatible": "Несовместимый архив: %s",
         "ExceptionArchiveIncomplete": "Архив поврежден: некоторые файлы отсутствуют (например, %s).",
         "FeedbackRequest": "Не стесняйтесь поделиться вашими идеями и предложениями с командой Piwik здесь:",
-        "HelpMessageContent": "Проверьте %1$s Piwik FAQ %2$s, в котором объясняется большинство известных ошибок, которые могут случится во время обновления. %3$s Обратитесь к системному администратору - он может помочь Вам с решением проблемы на сервере или с настройками MySQL.",
+        "HelpMessageContent": "Проверьте %1$s Piwik FAQ %2$s, в котором объясняется большинство известных ошибок, которые могут случится во время обновления. %3$s Обратитесь к системному администратору – он может помочь Вам с решением проблемы на сервере или с настройками MySQL.",
         "HelpMessageIntroductionWhenError": "Выше подается код ошибки ядра системы. Он поможет Вам объяснить причину ошибки, но если же Вам необходима дополнительная помощь, пожалуйста:",
         "HelpMessageIntroductionWhenWarning": "Обновление завершено успешно, однако в процессе возникло несколько предупреждений. Пожалуйста, прочтите примечания ниже. Для дополнительной помощи:",
         "IncompatbilePluginsWillBeDisabledInfo": "Примечание: некоторые плагины не совместимы с Piwik %s. Они будут отключены при обновлении:",
@@ -35,10 +35,10 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik успешно обновлен!",
         "PiwikUpdatedSuccessfully": "Piwik обновлен успешно!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "База веб-аналитики будет обновлена с версии %1$s до версии %2$s.",
-        "PluginDescription": "Механизм обновления Piwik",
         "ReadyToGo": "Готовы?",
+        "TheFollowingDimensionsWillBeUpgradedX": "Следующие размеры будут обновлены: %s.",
         "TheFollowingPluginsWillBeUpgradedX": "Следующие плагины будут обновлены: %s.",
-        "ThereIsNewPluginVersionAvailableForUpdate": "Некоторые плагины были обновлены с Маркета:",
+        "ThereIsNewPluginVersionAvailableForUpdate": "Некоторые плагины были обновлены на Marketplace:",
         "ThereIsNewVersionAvailableForUpdate": "Доступна новая версия Piwik",
         "TheUpgradeProcessMayFailExecuteCommand": "Если у вас большая база данных Piwik, обновления, запущенные в браузере, могут занять много времени . В данном случае, вы можете выполнить обновление через интерфейс командной строки: %s",
         "TheUpgradeProcessMayTakeAWhilePleaseBePatient": "Обновление базы данных может занять некоторое время, поэтому подождите немного.",
@@ -49,6 +49,7 @@
         "UpgradeComplete": "Обновление завершено!",
         "UpgradePiwik": "Обновить систему Веб-аналитики",
         "VerifyingUnpackedFiles": "Проверяю распакованные файлы",
+        "ViewVersionChangelog": "Просмотр изменений для этой версии:",
         "WarningMessages": "Предупреждения:",
         "WeAutomaticallyDeactivatedTheFollowingPlugins": "Следующие плагины автоматически деактивированы: %s",
         "YouCanUpgradeAutomaticallyOrDownloadPackage": "Вы можете обновиться до версии %s автоматически или скачать установочный пакет и вручную установить его:",
diff --git a/plugins/CoreUpdater/lang/sk.json b/plugins/CoreUpdater/lang/sk.json
index a7994f6fc2..19d65e39a8 100644
--- a/plugins/CoreUpdater/lang/sk.json
+++ b/plugins/CoreUpdater/lang/sk.json
@@ -16,7 +16,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik bol úspešne zaktualizovaný!",
         "PiwikUpdatedSuccessfully": "Piwik bol úspešne zaktualizovaný!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Piwik bude zaktualizovaný z verzie %1$s na verziu %2$s.",
-        "PluginDescription": "Piwik aktualizácia mechanizmu",
         "ReadyToGo": "Pripravený?",
         "TheFollowingPluginsWillBeUpgradedX": "Nasledujúce moduly budú zaktualizované: %s.",
         "ThereIsNewVersionAvailableForUpdate": "Je dostupná nová verzia Piwik na aktualizáciu",
diff --git a/plugins/CoreUpdater/lang/sl.json b/plugins/CoreUpdater/lang/sl.json
index 95b7c1bef5..63e5d63d6f 100644
--- a/plugins/CoreUpdater/lang/sl.json
+++ b/plugins/CoreUpdater/lang/sl.json
@@ -16,7 +16,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik je bil uspešno posodobljen!",
         "PiwikUpdatedSuccessfully": "Piwik je bil uspešno posodobljen!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Piwik-ova podatkovna baza bo nadgrajena iz različice %1$s, na novo različico %2$s.",
-        "PluginDescription": "Piwik-ov mehanizem za posodabljanje",
         "ReadyToGo": "Ste pripravljeni za začetek?",
         "TheFollowingPluginsWillBeUpgradedX": "Sledeči vtičniki bodo posodobljeni: %s",
         "ThereIsNewVersionAvailableForUpdate": "Za posodobitev je na voljo nova različica Piwik-a",
diff --git a/plugins/CoreUpdater/lang/sq.json b/plugins/CoreUpdater/lang/sq.json
index 85e9856f68..a81beb45be 100644
--- a/plugins/CoreUpdater/lang/sq.json
+++ b/plugins/CoreUpdater/lang/sq.json
@@ -26,7 +26,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik-u u përmirësua me sukses!",
         "PiwikUpdatedSuccessfully": "Piwik-u u përditësua me sukses!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Baza e të dhënave për Piwik-un do të përmirësohet prej versionit %1$s te versioni i ri %2$s.",
-        "PluginDescription": "Mekanizmi i përditësimit të Piwik-ut",
         "ReadyToGo": "Gati për t'ia filluar?",
         "TheFollowingPluginsWillBeUpgradedX": "Shtojcat vijuese do të përditësohen: %s.",
         "ThereIsNewVersionAvailableForUpdate": "Mund të kihet një version i ri, i përmirësuar, i Piwik-ut",
diff --git a/plugins/CoreUpdater/lang/sr.json b/plugins/CoreUpdater/lang/sr.json
index 8aa8e33828..da31f1ea9c 100644
--- a/plugins/CoreUpdater/lang/sr.json
+++ b/plugins/CoreUpdater/lang/sr.json
@@ -36,7 +36,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik je uspešno nadograđen!",
         "PiwikUpdatedSuccessfully": "Piwik je uspešno nadograđen!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Piwik baza će biti nadograđena sa verzije %1$s na %2$s.",
-        "PluginDescription": "Sistem za instaliranje novih verzija",
         "ReadyToGo": "Da li ste spremni?",
         "TheFollowingDimensionsWillBeUpgradedX": "Sledeće dimenzije će biti ažurirane: %s.",
         "TheFollowingPluginsWillBeUpgradedX": "Sledeći dodaci će biti nadograđeni: %s.",
diff --git a/plugins/CoreUpdater/lang/sv.json b/plugins/CoreUpdater/lang/sv.json
index c896eca4c2..8dd673b38f 100644
--- a/plugins/CoreUpdater/lang/sv.json
+++ b/plugins/CoreUpdater/lang/sv.json
@@ -36,7 +36,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik har uppdaterats utan problem!",
         "PiwikUpdatedSuccessfully": "Piwik uppdaterades utan problem!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Piwik databasen kommer att uppgraderas från version %1$s till den nya versionen %2$s.",
-        "PluginDescription": "Piwik uppdateringsmekanism",
         "ReadyToGo": "Redo att köra?",
         "TheFollowingPluginsWillBeUpgradedX": "Följande plugins kommer att uppdateras: %s.",
         "ThereIsNewPluginVersionAvailableForUpdate": "Vissa tillägg som du använder har uppdaterats på Marketplace:",
diff --git a/plugins/CoreUpdater/lang/ta.json b/plugins/CoreUpdater/lang/ta.json
index 4f197fc24a..1552ea4a7f 100644
--- a/plugins/CoreUpdater/lang/ta.json
+++ b/plugins/CoreUpdater/lang/ta.json
@@ -21,7 +21,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "பிவிக் வெற்றிகரமாக புதுப்பிக்கப்பட்டுள்ளது!",
         "PiwikUpdatedSuccessfully": "பிவிக் வெற்றிகரமாக புதுபிக்கப்பட்டது!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "பிவிக் தரவுத்தளமானது பதிப்பு %1$s இல் இருந்து %2$s க்கு மேம்படுத்தப்படும்.",
-        "PluginDescription": "பிவிக் மேம்படுத்தபடும் பொறிமுறை",
         "ReadyToGo": "முன்னே செல்ல தயாரா ?",
         "TheFollowingPluginsWillBeUpgradedX": "கீழ்க்கண்ட சொருகிகள் புதுபிக்கபடும்: %s.",
         "ThereIsNewVersionAvailableForUpdate": "பிவிக்-இன் ஒரு புதிய பதிப்பு கிடைக்ககூடிய நிலையிள்ளது.",
diff --git a/plugins/CoreUpdater/lang/th.json b/plugins/CoreUpdater/lang/th.json
index c270bdc090..2c6d703537 100644
--- a/plugins/CoreUpdater/lang/th.json
+++ b/plugins/CoreUpdater/lang/th.json
@@ -26,7 +26,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik ได้รับการอัพเดตเรียบร้อยแล้ว",
         "PiwikUpdatedSuccessfully": "Piwik อัพเดตสมบูรณ์แล้ว",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Piwik จะถูกอัพเกรดจากเวอร์ชั่น %1$s เพื่อให้เป็นเวอร์ชั่นใหม่ %2$s",
-        "PluginDescription": "Piwik กำลังอัพเดตปลั๊กอิน",
         "ReadyToGo": "พร้อมที่จะไปได้อย่างไร",
         "TheFollowingPluginsWillBeUpgradedX": "จะถูกอัพเดตปลั๊กอินต่อไปนี้: %s",
         "ThereIsNewVersionAvailableForUpdate": "มีเวอร์ชั่นของ Piwik ใหม่ รอให้คุณอัพเดต",
diff --git a/plugins/CoreUpdater/lang/tl.json b/plugins/CoreUpdater/lang/tl.json
index 60cb5eba4d..d592e89692 100644
--- a/plugins/CoreUpdater/lang/tl.json
+++ b/plugins/CoreUpdater/lang/tl.json
@@ -36,7 +36,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Ang Piwik ay matagumpay na na-update!",
         "PiwikUpdatedSuccessfully": "Matagumpay na na-update Piwik!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Ang Piwik database ay maa-upgrade mula sa bersyon %1$s sa bagong bersyon %2$s.",
-        "PluginDescription": "Mekanismo ng pag-uupdate ng Piwik",
         "ReadyToGo": "Handa nang umalis?",
         "TheFollowingDimensionsWillBeUpgradedX": "Ang sumusunod na dimensyon ay i-uupdate: %s",
         "TheFollowingPluginsWillBeUpgradedX": "Ang mga sumusunod na plug-in ay iuupdate: %s",
diff --git a/plugins/CoreUpdater/lang/tr.json b/plugins/CoreUpdater/lang/tr.json
index aaa0db860e..1e826a7524 100644
--- a/plugins/CoreUpdater/lang/tr.json
+++ b/plugins/CoreUpdater/lang/tr.json
@@ -22,7 +22,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik başarıyla güncellendi!",
         "PiwikUpdatedSuccessfully": "Piwik başarıyla güncellendi!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Piwik veritabanı %1$s versiyonundan %2$s versiyonuna güncellenecektir.",
-        "PluginDescription": "Piwik güncelleme mekanizması",
         "ReadyToGo": "Hazır mısınız?",
         "TheFollowingPluginsWillBeUpgradedX": "Aşağıdaki eklentiler güncellenecektir: %s.",
         "ThereIsNewPluginVersionAvailableForUpdate": "Kullandığınız ve pazaryerinde yer alıp güncellenmiş bazı eklentiler:",
diff --git a/plugins/CoreUpdater/lang/uk.json b/plugins/CoreUpdater/lang/uk.json
index 8a1507e949..ad06d9a0dc 100644
--- a/plugins/CoreUpdater/lang/uk.json
+++ b/plugins/CoreUpdater/lang/uk.json
@@ -26,7 +26,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik успішно поновлено!",
         "PiwikUpdatedSuccessfully": "Piwik успішно поновлено!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "База даних Piwik буде поновлена з версії %1$s до нової версії %2$s.",
-        "PluginDescription": "Механізм поновлення Piwik",
         "ReadyToGo": "Готові розпочати?",
         "TheFollowingPluginsWillBeUpgradedX": "Наступні плагіни буде поновлено: %s.",
         "ThereIsNewVersionAvailableForUpdate": "Є нова версія Piwik доступна до поновлення",
diff --git a/plugins/CoreUpdater/lang/vi.json b/plugins/CoreUpdater/lang/vi.json
index 4585a0abd6..04958f9f9d 100644
--- a/plugins/CoreUpdater/lang/vi.json
+++ b/plugins/CoreUpdater/lang/vi.json
@@ -28,7 +28,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik vừa được cập nhật thành công!",
         "PiwikUpdatedSuccessfully": "Piwik đã cập nhật thành công!",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Cơ sở dữ liệu Piwik sẽ được nâng cấp từ phiên bản %1$s lên phiên bản mới %2$s.",
-        "PluginDescription": "Cơ chế cập nhật Piwik",
         "ReadyToGo": "Sẵn sàng thực hiện?",
         "TheFollowingPluginsWillBeUpgradedX": "Các plugin sau sẽ được cập nhật: %s",
         "ThereIsNewVersionAvailableForUpdate": "Có phiên bản mới của Piwik để cập nhật",
diff --git a/plugins/CoreUpdater/lang/zh-cn.json b/plugins/CoreUpdater/lang/zh-cn.json
index 84f2a401ae..17333790a4 100644
--- a/plugins/CoreUpdater/lang/zh-cn.json
+++ b/plugins/CoreUpdater/lang/zh-cn.json
@@ -29,7 +29,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik 升级成功！",
         "PiwikUpdatedSuccessfully": "Piwik 升级成功！",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Piwik 数据库将从版本 %1$s 升级到新版本 %2$s。",
-        "PluginDescription": "Piwik 更新机制",
         "ReadyToGo": "准备好了吗？",
         "TheFollowingPluginsWillBeUpgradedX": "以下插件将被升级: %s！",
         "ThereIsNewVersionAvailableForUpdate": "已经有新的Piwik版本可以升级",
diff --git a/plugins/CoreUpdater/lang/zh-tw.json b/plugins/CoreUpdater/lang/zh-tw.json
index fe601a4a16..e6ca86b744 100644
--- a/plugins/CoreUpdater/lang/zh-tw.json
+++ b/plugins/CoreUpdater/lang/zh-tw.json
@@ -26,7 +26,6 @@
         "PiwikHasBeenSuccessfullyUpgraded": "Piwik 已成功更新！",
         "PiwikUpdatedSuccessfully": "Piwik 已成功更新！",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Piwik 資料庫將從版本 %1$s 升級至新版本 %2$s 。",
-        "PluginDescription": "Piwik 更新機制",
         "ReadyToGo": "準備好了嗎？",
         "TheFollowingPluginsWillBeUpgradedX": "以下外掛將被更新：%s 。",
         "ThereIsNewVersionAvailableForUpdate": "已有一個新版的 Piwik 可供更新",
diff --git a/plugins/CoreUpdater/templates/oneClickResults.twig b/plugins/CoreUpdater/templates/oneClickResults.twig
index 555e1ef568..d08378d6c3 100644
--- a/plugins/CoreUpdater/templates/oneClickResults.twig
+++ b/plugins/CoreUpdater/templates/oneClickResults.twig
@@ -3,7 +3,7 @@
 {% block content %}
 <br/>
 {% for message in feedbackMessages %}
-<p>{{ message }}</p>
+<p>&#10003; {{ message }}</p>
 {% endfor %}
 
 {% if coreError %}
diff --git a/plugins/CoreUpdater/tests/Integration/UpdateCommunicationTest.php b/plugins/CoreUpdater/tests/Integration/UpdateCommunicationTest.php
index 8bda8a2699..91b6e2c2a1 100644
--- a/plugins/CoreUpdater/tests/Integration/UpdateCommunicationTest.php
+++ b/plugins/CoreUpdater/tests/Integration/UpdateCommunicationTest.php
@@ -61,7 +61,7 @@ class UpdateCommunicationTest extends IntegrationTestCase
             array(Version::VERSION, false, $this->never(), false), // shouldNotSend_IfNoUpdateAvailable
             array('33.0.0', '33.0.0', $this->never(), '33.0.0'),   // shouldNotSend_IfAlreadyNotified
             array('31.0.0', '33.0.0', $this->never(), '33.0.0'),   // shouldNotSend_IfAlreadyNotifiedAboutLaterRelease
-            array('3333.3333.3333-beta10', '31.0.0', $this->never(), '31.0.0'),  // shouldNotSend_IfLatestVersionIsNotVersionLike,
+            array('3333.3333.3333-bbeta10', '31.0.0', $this->never(), '31.0.0'),  // shouldNotSend_IfLatestVersionIsNotVersionLike,
             array('33.0.0', false,    $this->once(), '33.0.0'),    // shouldSend_IfUpdateAvailableAndNeverSentAnyBefore
             array('33.0.0', '31.0.0', $this->once(), '33.0.0'),    // shouldSend_IfUpdateAvailable
         );
@@ -69,24 +69,47 @@ class UpdateCommunicationTest extends IntegrationTestCase
 
     public function test_sendNotifications_shouldSentCorrectEmail()
     {
-        $this->setLatestVersion('33.0.0');
-
-        $subject = 'CoreUpdater_NotificationSubjectAvailableCoreUpdate';
         $message = 'ScheduledReports_EmailHello
 
 CoreUpdater_ThereIsNewVersionAvailableForUpdate
 
 CoreUpdater_YouCanUpgradeAutomaticallyOrDownloadPackage
+index.php?module=CoreUpdater&action=newVersionAvailable
 
+CoreUpdater_ViewVersionChangelog
+http://piwik.org/changelog/piwik-33-0-0/
+
+CoreUpdater_FeedbackRequest
+http://piwik.org/contact/';
+
+        $this->assertEmailForVersion('33.0.0', $message);
+    }
+
+    public function test_sendNotifications_shouldNotIncludeChangelogIfNotMajorVersionUpdate()
+    {
+        $message = 'ScheduledReports_EmailHello
+
+CoreUpdater_ThereIsNewVersionAvailableForUpdate
+
+CoreUpdater_YouCanUpgradeAutomaticallyOrDownloadPackage
 index.php?module=CoreUpdater&action=newVersionAvailable
 
 CoreUpdater_FeedbackRequest
 http://piwik.org/contact/';
 
+        $this->assertEmailForVersion('33.0.0-b1', $message);
+    }
+
+    private function assertEmailForVersion($version, $expectedMessage)
+    {
+        $this->setLatestVersion($version);
+
+        $subject = 'CoreUpdater_NotificationSubjectAvailableCoreUpdate';
+
         $mock = $this->getCommunicationMock(array('sendEmailNotification'));
         $mock->expects($this->once())
-                   ->method('sendEmailNotification')
-                   ->with($this->equalTo($subject), $this->equalTo($message));
+            ->method('sendEmailNotification')
+            ->with($this->equalTo($subject), $this->equalTo($expectedMessage));
         $mock->sendNotificationIfUpdateAvailable();
     }
 
diff --git a/plugins/CoreVisualizations/Metrics/Formatter/Numeric.php b/plugins/CoreVisualizations/Metrics/Formatter/Numeric.php
new file mode 100644
index 0000000000..c1759735c2
--- /dev/null
+++ b/plugins/CoreVisualizations/Metrics/Formatter/Numeric.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+namespace Piwik\Plugins\CoreVisualizations\Metrics\Formatter;
+
+use Piwik\Common;
+use Piwik\Metrics\Formatter;
+
+/**
+ * A metrics formatter that prettifies metric values without returning string values.
+ * Results of this class can be converted to numeric values and processed further in
+ * some way.
+ */
+class Numeric extends Formatter
+{
+    public function getPrettyNumber($value, $precision = 0)
+    {
+        return round($value, $precision);
+    }
+
+    public function getPrettyTimeFromSeconds($numberOfSeconds, $displayTimeAsSentence = false, $round = false)
+    {
+        return $round ? (int)$numberOfSeconds : (float) Common::forceDotAsSeparatorForDecimalPoint($numberOfSeconds);
+    }
+
+    public function getPrettySizeFromBytes($size, $unit = null, $precision = 1)
+    {
+        list($size, $sizeUnit) = $this->getPrettySizeFromBytesWithUnit($size, $unit, $precision);
+        return $size;
+    }
+
+    public function getPrettyMoney($value, $idSite)
+    {
+        return $value;
+    }
+
+    public function getPrettyPercentFromQuotient($value)
+    {
+        return $value * 100;
+    }
+}
\ No newline at end of file
diff --git a/plugins/CoreVisualizations/Visualizations/Graph.php b/plugins/CoreVisualizations/Visualizations/Graph.php
index d1a8ccd6b7..3e87754817 100644
--- a/plugins/CoreVisualizations/Visualizations/Graph.php
+++ b/plugins/CoreVisualizations/Visualizations/Graph.php
@@ -10,6 +10,7 @@ namespace Piwik\Plugins\CoreVisualizations\Visualizations;
 
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
+use Piwik\Plugins\CoreVisualizations\Metrics\Formatter\Numeric;
 use Piwik\Piwik;
 use Piwik\Plugin\Visualization;
 
@@ -59,7 +60,9 @@ abstract class Graph extends Visualization
         }
 
         $this->requestConfig->request_parameters_to_modify['disable_queued_filters'] = 1;
-        $this->requestConfig->request_parameters_to_modify['format_metrics'] = 0;
+        $this->requestConfig->request_parameters_to_modify['format_metrics'] = 1;
+
+        $this->metricsFormatter = new Numeric();
     }
 
     /**
diff --git a/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php b/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php
index da9a82ac75..1a41a07df3 100644
--- a/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php
+++ b/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php
@@ -61,4 +61,4 @@ class AllColumns extends HtmlTable
             $properties->columns_to_display = $columnsToDisplay;
         });
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/CoreVisualizations/javascripts/jqplotEvolutionGraph.js b/plugins/CoreVisualizations/javascripts/jqplotEvolutionGraph.js
index a776ee7df5..fbcb55d03e 100644
--- a/plugins/CoreVisualizations/javascripts/jqplotEvolutionGraph.js
+++ b/plugins/CoreVisualizations/javascripts/jqplotEvolutionGraph.js
@@ -93,6 +93,7 @@
                         if (url && -1 === url.indexOf('#')) {
                             var module = broadcast.getValueFromHash('module');
                             var action = broadcast.getValueFromHash('action');
+                            var idGoal = broadcast.getValueFromHash('idGoal');
                             var idSite = broadcast.getValueFromUrl('idSite', url);
                             var period = broadcast.getValueFromUrl('period', url);
                             var date   = broadcast.getValueFromUrl('date', url);
@@ -104,6 +105,10 @@
                                     url += '&idSite=' + idSite;
                                 }
 
+                                if (idGoal) {
+                                    url += '&idGoal=' + idGoal;
+                                }
+
                                 if (period) {
                                     url += '&period=' + period;
                                 }
diff --git a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig
index c6de5abdea..1fbbf6517f 100644
--- a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig
+++ b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig
@@ -31,6 +31,8 @@
 
                 {% if showRow %}
                 <tr {% if rowHasSubtable %}id="{{ row.getIdSubDataTable() }}"{% endif %}
+                    {% if row.getMetadata('segment') is not false %} data-segment-filter="{{ row.getMetadata('segment')|e('html_attr') }}"{% endif %}
+                    {% if row.getMetadata('url') is not false %} data-url-label="{{ row.getMetadata('url')|rawSafeDecoded }}"{% endif %}
                     class="{{ row.getMetadata('css_class') }} {% if rowHasSubtable %}subDataTable{% endif %}{% if shouldHighlightRow %} highlight{% endif %}{% if isSummaryRow %} summaryRow{% endif %}"
                     {% if rowHasSubtable %}title="{{ 'CoreHome_ClickRowToExpandOrContract'|translate }}"{% endif %}>
                     {% for column in properties.columns_to_display %}
diff --git a/plugins/CoreVisualizations/templates/_dataTableViz_jqplotGraph.twig b/plugins/CoreVisualizations/templates/_dataTableViz_jqplotGraph.twig
index 5dfd78b1f3..aee1a05241 100644
--- a/plugins/CoreVisualizations/templates/_dataTableViz_jqplotGraph.twig
+++ b/plugins/CoreVisualizations/templates/_dataTableViz_jqplotGraph.twig
@@ -1,3 +1,3 @@
-<div class="jqplot-graph">
+<div alt="{{ 'Mobile_StaticGraph'|translate }}"  class="jqplot-graph">
     <div class="piwik-graph" data-data="{{ visualization.getGraphData(dataTable, properties)|json_encode }}"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts
-Subproject 4d2e05871965cfc3ff1fe295b5dae024ba52d75
+Subproject 40db402aeacae2d911331ec94df5d86df6f8713
diff --git a/plugins/CustomVariables/lang/ar.json b/plugins/CustomVariables/lang/ar.json
index d24289b0a0..8df046f557 100644
--- a/plugins/CustomVariables/lang/ar.json
+++ b/plugins/CustomVariables/lang/ar.json
@@ -2,7 +2,6 @@
     "CustomVariables": {
         "ColumnCustomVariableName": "اسم المتغير المخصص",
         "ColumnCustomVariableValue": "قيمة المتغير المخصص",
-        "CustomVariables": "المتغيرات المخصصة",
-        "PluginDescription": "المتغيرات المخصصة هي أزواج اسم،قيمة يمكنك تعيينها لزيارة باستخدام واجهة تطبيقات كافاسكريبت باستخدام الدالة setVisitCustomVariables(). سيقوم Piwik بعدها عدد الزيارات، الصفحات ومعدلات التحويل لكل من هذه الأسماء والقيم."
+        "CustomVariables": "المتغيرات المخصصة"
     }
 }
\ No newline at end of file
diff --git a/plugins/CustomVariables/lang/be.json b/plugins/CustomVariables/lang/be.json
index 437d101e2e..d2d4b2eab4 100644
--- a/plugins/CustomVariables/lang/be.json
+++ b/plugins/CustomVariables/lang/be.json
@@ -3,7 +3,6 @@
         "ColumnCustomVariableName": "Назва карыстацкай зменнай",
         "ColumnCustomVariableValue": "Значэнне карыстацкай зменнай",
         "CustomVariables": "Карыстацкія зменныя",
-        "CustomVariablesReportDocumentation": "Справаздача змяшчае інфармацыю аб вашых Карыстацкіх зменных. Націсніце на імя зменнай, каб убачыць размеркаванне каштоўнасцяў. %s Дадатковыя звесткі аб карыстацкіх зменных чытайце ў %sДакументацыя аб карыстацкіх зменных на piwik.org%s.",
-        "PluginDescription": "Карыстацкія зменныя - гэта імя, значэнне пары, якія можна ўсталяваць наведванню з выкарыстаннем функціі Java-скрыпт API setVisitCustomVariables()."
+        "CustomVariablesReportDocumentation": "Справаздача змяшчае інфармацыю аб вашых Карыстацкіх зменных. Націсніце на імя зменнай, каб убачыць размеркаванне каштоўнасцяў. %s Дадатковыя звесткі аб карыстацкіх зменных чытайце ў %sДакументацыя аб карыстацкіх зменных на piwik.org%s."
     }
 }
\ No newline at end of file
diff --git a/plugins/CustomVariables/lang/bg.json b/plugins/CustomVariables/lang/bg.json
index 24aa3bc3e7..8444ff47e0 100644
--- a/plugins/CustomVariables/lang/bg.json
+++ b/plugins/CustomVariables/lang/bg.json
@@ -4,7 +4,6 @@
         "ColumnCustomVariableValue": "Съдържание на променлива",
         "CustomVariables": "Променливи",
         "CustomVariablesReportDocumentation": "Този отчет съдържа информация за вашите Персонални променливи. Кликнете върху името на променлива, за да видите разпределението на стойностите. %s За повече информация отностно Персоналните Променливи в общ план, прочетете Документацията за %sПерсонални промеливи на Piwik.org%s",
-        "PluginDescription": "Персоналните променливи са име,стойност двойки данни, които можете да настроите към посещение, използвайки Javascript API и функцията setVisitCustomVariables() . Тогава Piwik ще ви изведе отчет колко посещения, страници, конверсии има за всяка една от тези персонални имена и стойности.",
         "ScopePage": "Разгледай страница",
         "ScopeVisit": "Разгледай посещение"
     }
diff --git a/plugins/CustomVariables/lang/ca.json b/plugins/CustomVariables/lang/ca.json
index 251ae965d6..5578794062 100644
--- a/plugins/CustomVariables/lang/ca.json
+++ b/plugins/CustomVariables/lang/ca.json
@@ -4,7 +4,6 @@
         "ColumnCustomVariableValue": "Valor de la variable personalitzada",
         "CustomVariables": "Variables personalitzades",
         "CustomVariablesReportDocumentation": "Aquest informe conté informació sobre les variables personaltizades. Feu click al nom d'una variable per veure la distribució dels valors. %s Per més informació sobre les variables personalitzades, podeu llegir la %sdocumentació sobre variables peronalitzades a piwik.org%s",
-        "PluginDescription": "Les variables personalitzades són parelles de nom,valor que podeu assignar a una visita utilitzant la funció setVisitCustomVariables() de l'API de Javascript. El piwik us reportarà quantes visites, pàgines, conversions heu tingut per cada un d'aquest noms i valors personaltizats.",
         "ScopePage": "àmbit de la pàgina",
         "ScopeVisit": "àmbit de la visita"
     }
diff --git a/plugins/CustomVariables/lang/cs.json b/plugins/CustomVariables/lang/cs.json
index c6705bf22c..a1bada5dac 100644
--- a/plugins/CustomVariables/lang/cs.json
+++ b/plugins/CustomVariables/lang/cs.json
@@ -4,7 +4,7 @@
         "ColumnCustomVariableValue": "Hodnota vlastní proměnné",
         "CustomVariables": "Vlastní proměnné",
         "CustomVariablesReportDocumentation": "Toto hlášení obsahuje informace o vašich vlastních proměnných. Klikněte na proměnnou pro zobrazení distribuce hodnot. %s Pro více informací si přečtěte %sdokumentaci o vlastních proměnných na piwik.org%s",
-        "PluginDescription": "Vlastní proměnné jsou dvojice klíč, hodnota, které můžete nastavit při návštěvě s použitím funkce setVisitCustomVariables() javascriptového API. Piwik pak zobrazí počty návštěv, stránek a konverzí pro tyto hodnoty.",
+        "PluginDescription": "Vlastní proměnné jsou páry klíč, hodnota, které javascriptové API umožňuje přiřadit návštěvníkům, nebo jejich akcím. Piwik pak zobrazí počet návštěv, stránek a konverzí, kterou má konkrétní pár klíč\/hodnota. Prohlédněte si detailní údaje pro každého návštěvníka a proměnnou v záznamu návštěvníků.",
         "ScopePage": "rozsah stránky",
         "ScopeVisit": "rozsah návštěvy"
     }
diff --git a/plugins/CustomVariables/lang/da.json b/plugins/CustomVariables/lang/da.json
index c236f7bd61..1766c95117 100644
--- a/plugins/CustomVariables/lang/da.json
+++ b/plugins/CustomVariables/lang/da.json
@@ -4,7 +4,6 @@
         "ColumnCustomVariableValue": "Brugerdefineret variabelværdi",
         "CustomVariables": "Brugerdefinerede variabler",
         "CustomVariablesReportDocumentation": "Rapporten indeholder oplysninger om brugerdefinerede variabler. Klik på et variabelnavn se fordeling af værdier. %s Yderligere oplysninger om brugerdefinerede variabler generelt, læs %sBrugerdefinerede variabel dokumentation på piwik.org%s",
-        "PluginDescription": "Brugerdefinerede variabler er navne, værdipar, du kan tildele en besøgende ved hjælp af funktionen Javascript API setVisitCustomVariables(). Piwik vil derefter rapportere hvor mange besøg, sider, konverteringer for hver af disse brugerdefinerede navne og værdier.",
         "ScopePage": "virkefelt side",
         "ScopeVisit": "virkefelt besøg"
     }
diff --git a/plugins/CustomVariables/lang/de.json b/plugins/CustomVariables/lang/de.json
index 4092633a77..1dc86c4039 100644
--- a/plugins/CustomVariables/lang/de.json
+++ b/plugins/CustomVariables/lang/de.json
@@ -4,7 +4,7 @@
         "ColumnCustomVariableValue": "Wert der benutzerdefinierten Variable",
         "CustomVariables": "Benutzerdefinierte Variablen",
         "CustomVariablesReportDocumentation": "Dieser Bericht enthält Informationen über Ihre benutzerdefinierten Variablen. Klicken Sie auf einen Variablennamen, um die Verteilung der Werte zu sehen. %s Für mehr Informationen über benutzerdefinierte Variablen, lesen Sie die %sDokumentation auf piwik.org%s",
-        "PluginDescription": "Benutzerdefinierte Variablen sind Namen-Werte-Paare, die Sie über die setVisitCustomVariables() Funktion der Javascript-API setzen können. Piwik wird dann für jeden dieser Namen und Werte die Anzahl der Besuche, die Seiten sowie die Konversionen erfassen.",
+        "PluginDescription": "Benutzerdefinierte Variablen sind (Namen-, Wert-) Paare, welche Sie mit Hilfe der Javascript API auf Besucher oder deren Aktionen festlegen können. Piwik wird Sie dann über die Menge an Besuchen, Seiten, Konversionen für jede der benutzerdefinierten Variablen und Werte informieren. Die detaillierten benutzerdefinierten Variablen für jeden Benutzer und Aktionen im Besucher-Log einsehbar.",
         "ScopePage": "Anwendungsbereich Seite",
         "ScopeVisit": "Anwendungsbereich Besuch"
     }
diff --git a/plugins/CustomVariables/lang/el.json b/plugins/CustomVariables/lang/el.json
index 3501e56888..66634edc11 100644
--- a/plugins/CustomVariables/lang/el.json
+++ b/plugins/CustomVariables/lang/el.json
@@ -4,7 +4,7 @@
         "ColumnCustomVariableValue": "Τιμή Προσαρμοσμένης Μεταβλητής",
         "CustomVariables": "Προσαρμοσμένες Μεταβλητές",
         "CustomVariablesReportDocumentation": "Αυτή η αναφορά περιέχει πληροφορίες για τις Προσαρμοσμένες Μεταβλητές. Πατήστε σε ένα όνομα μεταβλητής για να δείτε την κατανομή των τιμών. %s Για περισσότερες πληροφορίες για τις Προσαρμοσμένες Μεταβλητές γενικά, διαβάστε την %sτεκμηρίωση Προσαρμοσμένων Μεταβλητών στο piwik.org%s.",
-        "PluginDescription": "Οι Προσαρμοσμένες Μεταβλητές είναι ζεύγη ονομασίας-τιμής που μπορείτε να ορίσετε σε μια Επίσκεψη χρησιμοποιώντας τη συνάρτηση της μικροεφαρμογής Javascript setVisitCustomVariables(). Έτσι, το Piwik θα αναφέρει πόσες επισκέψεις, σελίδες και μετατροπές για κάθε ζεύγος ονομασίας-τιμής.",
+        "PluginDescription": "Οι Προσαρμοσμένες Μεταβλητές (όνομα, τιμή) είναι ζεύγη που μπορείτε να ορίσετε με χρήση του Javascript API για τους επισκέπτες ή οποιαδήποτε από τις ενέργειές τους. Το Piwik στη συνέχεια θα αναφέρει τις επισκέψεις, σελίδες, μετατροπές για κάθε ένα από αυτά τα προσαρμοσμένα ονόματα και τιμές. Δείτε τις λεπτομερείς Προσαρμοσμένες Μεταβλητές για κάθε χρήστη και ενέργεια στο Ημερολόγιο Επισκέπτη.",
         "ScopePage": "σελίδα σκοπού",
         "ScopeVisit": "επίσκεψη σκοπού"
     }
diff --git a/plugins/CustomVariables/lang/en.json b/plugins/CustomVariables/lang/en.json
index 1e1acada51..d97f8e3ead 100644
--- a/plugins/CustomVariables/lang/en.json
+++ b/plugins/CustomVariables/lang/en.json
@@ -4,7 +4,7 @@
         "ColumnCustomVariableValue": "Custom Variable value",
         "CustomVariables": "Custom Variables",
         "CustomVariablesReportDocumentation": "This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. %s For more information about Custom Variables in general, read the %sCustom Variables documentation on piwik.org%s",
-        "PluginDescription": "Custom Variables are name,value pairs that you can set to a Visit using the Javascript API setVisitCustomVariables() function. Piwik will then report how many visits, pages, conversions for each of these custom names and values.",
+        "PluginDescription": "Custom Variables are (name, value) pairs that you can assign using the Javascript API to visitors or any of their action. Piwik will then report how many visits, pages, conversions for each of these custom names and values. View the detailed Custom Variables for each user and action in the Visitor Log.",
         "ScopePage": "scope page",
         "ScopeVisit": "scope visit"
     }
diff --git a/plugins/CustomVariables/lang/es.json b/plugins/CustomVariables/lang/es.json
index bab53a88c4..e1a064d360 100644
--- a/plugins/CustomVariables/lang/es.json
+++ b/plugins/CustomVariables/lang/es.json
@@ -4,7 +4,6 @@
         "ColumnCustomVariableValue": "Valor de la Variable Personalizada",
         "CustomVariables": "Variables Personalizadas",
         "CustomVariablesReportDocumentation": "Este reporte contiene información sobre sus Variables Personalizadas. Haga clic en el nombre de una variable para ver la distribución de los valores. %s Para más información sobre las Variables Personalizadas en general, lea la %sdocumentación de Variables Personalizadas en piwik.org%s",
-        "PluginDescription": "Las Variables Personalizadas son pares del estilo nombre,valor que puede configurar en una visita usando la función setVisitCustomVariables() de la API de Javascript. Piwik reportará cuantas visitas, páginas y conversiones han usado cada una de estos nombres y valores personalizados.",
         "ScopePage": "ámbito de la página",
         "ScopeVisit": "ámbito de la visita"
     }
diff --git a/plugins/CustomVariables/lang/fa.json b/plugins/CustomVariables/lang/fa.json
index ed8b686f54..8bf8706f20 100644
--- a/plugins/CustomVariables/lang/fa.json
+++ b/plugins/CustomVariables/lang/fa.json
@@ -3,7 +3,6 @@
         "ColumnCustomVariableName": "نام متغیر سفارشی",
         "ColumnCustomVariableValue": "مقدار متغیر سفارشی",
         "CustomVariables": "متغیرهای سفارشی",
-        "PluginDescription": "متغیر سفارشی عبارتند از: نام، جفت ارزش است که شما می توانید با بازدید با استفاده از API جاوا اسکریپت setVisitCustomVariables() تابع تعیین کنند. Piwik از آن خواهد شد, که چگونه بسیاری از بازدیدکننده داشته است، صفحات، تبدیل برای هر یک از این اسامی و ارزش های سفارشی را گزارش دهند.",
         "ScopePage": "حوزه صفحه",
         "ScopeVisit": "بازدید دامنه"
     }
diff --git a/plugins/CustomVariables/lang/fi.json b/plugins/CustomVariables/lang/fi.json
index ec25e91309..24559aca12 100644
--- a/plugins/CustomVariables/lang/fi.json
+++ b/plugins/CustomVariables/lang/fi.json
@@ -4,7 +4,6 @@
         "ColumnCustomVariableValue": "Kustomoidun muuttujan arvo",
         "CustomVariables": "Kustomoidut muuttujat",
         "CustomVariablesReportDocumentation": "Tämä raportti sisältää tietoa kustomoiduista muuttujastasi. Voit tarkastella eri arvojen määrää klikkaamalla muuttujan nimeä. %s Saat lisätietoa kustomoiduista muuttujista %sCustom Variables%s-sivulta piwik.orgista (englanninkielinen)",
-        "PluginDescription": "Kustomoidut muuttujat ovat nimi-arvo-pareja, joita voit asettaa käynnin aikana Javascript-API:n setVisitCustomVariables()-funktiolla. Piwik raportoi, kuinka monta käyntiä, sivua ja konversiota jokaisella kustomoidulla muuttujalla oli.",
         "ScopePage": "alueena sivu",
         "ScopeVisit": "alueena käynti"
     }
diff --git a/plugins/CustomVariables/lang/fr.json b/plugins/CustomVariables/lang/fr.json
index 14adb2edb2..d50d1ebc77 100644
--- a/plugins/CustomVariables/lang/fr.json
+++ b/plugins/CustomVariables/lang/fr.json
@@ -4,7 +4,6 @@
         "ColumnCustomVariableValue": "Valeur de la variable personnalisée",
         "CustomVariables": "Variables personnalisées",
         "CustomVariablesReportDocumentation": "Ce rapport contient des informations à propos de vos Variables Personnalisées. Cliquez sur un nom de variable pour voir la répartition de la valeur. %s Pour plus d'informations à propos des variables personnalisées en général, lisez la %s documentation sur les variables personnalisées sur piwik.org%s",
-        "PluginDescription": "Les variables personnalisées sont des paires de nom\/valeur que vous pouvez définir pour une visite en utilisant la fonction de l'API Javascript setVisitCustomVariables(). Piwik vous rapportera alors combien de visites, pages, conversions il y a pour chacun de ces noms et valeurs personnalisés",
         "ScopePage": "Étendue page",
         "ScopeVisit": "Étendue visite"
     }
diff --git a/plugins/CustomVariables/lang/he.json b/plugins/CustomVariables/lang/he.json
index e7fd77075a..89286c388a 100644
--- a/plugins/CustomVariables/lang/he.json
+++ b/plugins/CustomVariables/lang/he.json
@@ -2,7 +2,6 @@
     "CustomVariables": {
         "ColumnCustomVariableName": "שם המשתנה",
         "ColumnCustomVariableValue": "ערך המשתנה",
-        "CustomVariables": "משתנים מותאמים אישים",
-        "PluginDescription": "משתנים מותאמים הם זוגות של שמות וערכים שניתן להגדיר לביקור בעזרת פונקצית setVisitCustomVariables() שבתוך ה-Javascript API. לאחר מכן, Piwik תדווח כמו ביקורים, עמודים, המרות היו לכל אחד מהמשתנים ואת ערכם."
+        "CustomVariables": "משתנים מותאמים אישים"
     }
 }
\ No newline at end of file
diff --git a/plugins/CustomVariables/lang/hi.json b/plugins/CustomVariables/lang/hi.json
index 54f698eed0..22d7393ded 100644
--- a/plugins/CustomVariables/lang/hi.json
+++ b/plugins/CustomVariables/lang/hi.json
@@ -4,7 +4,6 @@
         "ColumnCustomVariableValue": "विशेष चर मूल्य",
         "CustomVariables": "विशेष चर",
         "CustomVariablesReportDocumentation": "यह रिपोर्ट आपके कस्टम चर के बारे में जानकारी शामिल हैं. मूल्यों के वितरण को देखने के लिए एक चर के नाम पर क्लिक करें. %sसामान्य रूप में %sकस्टम चर के बारे में अधिक जानकारी के लिए, piwik.org %s पर कस्टम चर दस्तावेज़ पढ़ें",
-        "PluginDescription": "कस्टम चर नाम, मूल्य जोड़े रहे हैं, आप जावास्क्रिप्ट एपीआई setVisitCustomVariables () फ़ंक्शन का उपयोग कर एक भ्रमण करने के लिए सेट कर सकते हैं.Piwik तो इन कस्टम नाम और मूल्यों से प्रत्येक के लिए कितने यात्राओं, पृष्ठों, रूपांतरण रिपोर्ट देंगे.",
         "ScopePage": "प्रसार पृष्ठ",
         "ScopeVisit": "प्रसार यात्रा"
     }
diff --git a/plugins/CustomVariables/lang/id.json b/plugins/CustomVariables/lang/id.json
index aa1c45bf24..321529a42c 100644
--- a/plugins/CustomVariables/lang/id.json
+++ b/plugins/CustomVariables/lang/id.json
@@ -4,7 +4,6 @@
         "ColumnCustomVariableValue": "Nilai Variabel Kustom",
         "CustomVariables": "Variabel Kustom",
         "CustomVariablesReportDocumentation": "Laporan ini mengandung informasi tentang Variabel Kustom Anda. Klik di nama variabel untuk melihat distribusi nilai. %s Informasi lebih lengkap tentang Vabiabel Kustom, baca %sdokumentasi Vabiabel Kustom di piwik.org%s",
-        "PluginDescription": "Variabel Kustom harus `nama,nilai` terkait yang dapat Anda atur ke `Visit` menggunakan fungsi API Javascript setVisitCustomVariables(). Piwik akan melaporkan jumlah kunjungan, halaman, dan konversi untuk tiap nama dan nilai kustom.",
         "ScopePage": "cakupan halaman",
         "ScopeVisit": "cakupan kunjungan"
     }
diff --git a/plugins/CustomVariables/lang/it.json b/plugins/CustomVariables/lang/it.json
index 3df84fd4af..87faff0b71 100644
--- a/plugins/CustomVariables/lang/it.json
+++ b/plugins/CustomVariables/lang/it.json
@@ -4,7 +4,7 @@
         "ColumnCustomVariableValue": "Valori Variabili Personalizzate",
         "CustomVariables": "Variabili Personalizzate",
         "CustomVariablesReportDocumentation": "Questo report contiene le informazioni sulle variabili personalizzate. Clicca su un nome di variabile per visualizzare la distribuzione dei valori. %s Per ulteriori informazioni sulle variabili personalizzate in generale, leggere il %sCustom Variabili documentazione su piwik.org %s",
-        "PluginDescription": "Le variabili personalizzate sono il nome, coppie di valori che è possibile impostare per una visita con la funzione di Javascript API setVisitCustomVariables(). Piwik poi segnalerà il numero di visite, pagine, conversioni per ciascuno di questi nomi personalizzati e valori.",
+        "PluginDescription": "Le Variabili Personalizzate sono coppie (nome, valore) che puoi assegnare utilizzando le API JavaScript ai visitatori o a una delle loro azioni. Allora Piwik restituirà il numero di visite, pagine, conversioni per ciascuno di questi nomi personalizzati e valori. Guarda nel dettaglio le Variabili Personalizzate per ciascun utente e azione nel Log Visitatori.",
         "ScopePage": "campo di applicazione pagina",
         "ScopeVisit": "ambito visita"
     }
diff --git a/plugins/CustomVariables/lang/ja.json b/plugins/CustomVariables/lang/ja.json
index 83b225ee7a..e528e2c012 100644
--- a/plugins/CustomVariables/lang/ja.json
+++ b/plugins/CustomVariables/lang/ja.json
@@ -4,7 +4,6 @@
         "ColumnCustomVariableValue": "カスタム変数値",
         "CustomVariables": "カスタム変数",
         "CustomVariablesReportDocumentation": "このレポートには、カスタム変数に関する情報が含まれています。値の分布を表示するには、変数名をクリックして下さい。%s 一般的なカスタム変数の詳細については、%sCustom Variables documentation on piwik.org%s をお読み下さい。",
-        "PluginDescription": "カスタム変数は名前と値のペアです。Javascript APIのsetVisitCustomVariables() ファンクションを使ってビジットに設定できます。Piwikはそれらの名前と値に対し、どれだけのビジット、ページ数、コンバージョンがあったかをリポートします。",
         "ScopePage": "スコープはページ",
         "ScopeVisit": "スコープはビジット"
     }
diff --git a/plugins/CustomVariables/lang/ko.json b/plugins/CustomVariables/lang/ko.json
index 050b27abd5..894e4e53ea 100644
--- a/plugins/CustomVariables/lang/ko.json
+++ b/plugins/CustomVariables/lang/ko.json
@@ -4,7 +4,6 @@
         "ColumnCustomVariableValue": "맞춤 변수 값",
         "CustomVariables": "맞춤 변수",
         "CustomVariablesReportDocumentation": "이 보고서는 맞춤 변수에 대한 정보를 포함합니다. 변수 이름을 클릭하여 값의 분포를 확인할 수 있습니다. %s 맞춤 변수에 대한 자세한 내용은 %spiwik.org의 맞춤 변수 설명서%s를 참조하세요.",
-        "PluginDescription": "맞춤 변수는 이름과 값으로 이루어집니다. Javascript API의 setVisitCustomVariables() 함수를 사용하여 방문 수를 설정할 수 있습니다. Piwik은 그 이름과 값에 대한 방문수와 페이지 전환수를 보고합니다.",
         "ScopePage": "페이지 범위",
         "ScopeVisit": "방문 범위"
     }
diff --git a/plugins/CustomVariables/lang/nb.json b/plugins/CustomVariables/lang/nb.json
index 063b569365..7fe6f0850d 100644
--- a/plugins/CustomVariables/lang/nb.json
+++ b/plugins/CustomVariables/lang/nb.json
@@ -1,6 +1,5 @@
 {
     "CustomVariables": {
-        "CustomVariables": "Egendefinerte variabler",
-        "PluginDescription": "Egendefinerte variabler er navn og verdier som du kan sette for en besøkende via funksjonen setVisitCustomVariables() i Javascript API-et. Piwik vil da kunne rapportere hvor mange besøkende, sider, konverteringer som benytter disse egendefinerte variablene og verdiene."
+        "CustomVariables": "Egendefinerte variabler"
     }
 }
\ No newline at end of file
diff --git a/plugins/CustomVariables/lang/nl.json b/plugins/CustomVariables/lang/nl.json
index 9429dbc039..bb4f1dbf98 100644
--- a/plugins/CustomVariables/lang/nl.json
+++ b/plugins/CustomVariables/lang/nl.json
@@ -4,7 +4,6 @@
         "ColumnCustomVariableValue": "Aangepaste variabele waarde",
         "CustomVariables": "Aangepaste variabelen",
         "CustomVariablesReportDocumentation": "Dit rapport bevat informatie over uw aangepaste variabelen. Klik op de naam van een variabele om de verdeling van de waarden te zien. %s voor meer informatie over aangepaste variabelen in het algemeen, lees de %sCustom variabelen documentatie over piwik.org%s",
-        "PluginDescription": "Aangepaste variabelen zijn naam-waarde paren die u zelf kunt instellen om extra informatie te verzamelen tijdens ​bezoek. Dit werkt met behulp van de JavaScript-API setVisitCustomVariables () functie. Piwik zal dan het aantal bezoeken, pagina's en conversies rapporteren voor elk van deze aangepaste namen en waarden.",
         "ScopePage": "omvang pagina",
         "ScopeVisit": "omvang bezoek"
     }
diff --git a/plugins/CustomVariables/lang/pl.json b/plugins/CustomVariables/lang/pl.json
index 8be43d9a03..90c5daab59 100644
--- a/plugins/CustomVariables/lang/pl.json
+++ b/plugins/CustomVariables/lang/pl.json
@@ -4,7 +4,6 @@
         "ColumnCustomVariableValue": "Wartość zmiennej niestandardowej",
         "CustomVariables": "Zmienne niestandardowe",
         "CustomVariablesReportDocumentation": "Raport ten zawiera informacje na temat niestandardowych zmiennych. Kliknij na nazwę zmiennej, aby zobaczyć rozkład wartości. %sAby uzyskać więcej informacji na temat niestandardowych zmiennych, przeczytaj dokumentację Zmienne %sCustom na piwik.org%s",
-        "PluginDescription": "Zmienne niestandardowe to pary nazwa-wartość, które możesz ustawić dla odwiedzin używając javaskryptu przy wykorzystaniu API dla funkcji setVisitCustomVariables(). Piwik będzie raportować ilość odwiedzin, strony, przejścia przez strony za pomocą takich niestandardowych nazw i wartości.",
         "ScopePage": "strona zakresu",
         "ScopeVisit": "zakres wizyt"
     }
diff --git a/plugins/CustomVariables/lang/pt-br.json b/plugins/CustomVariables/lang/pt-br.json
index 3233ec5757..6bce21f4d7 100644
--- a/plugins/CustomVariables/lang/pt-br.json
+++ b/plugins/CustomVariables/lang/pt-br.json
@@ -4,7 +4,6 @@
         "ColumnCustomVariableValue": "Valor de variável personalizado",
         "CustomVariables": "Variáveis personalizadas",
         "CustomVariablesReportDocumentation": "Este relatório contém informações sobre as suas variáveis ​​personalizadas. Clique em um nome de variável para ver a distribuição dos valores. %s para mais informações sobre variáveis ​​personalizadas em geral, leia a documentação %sCustom Variáveis ​​em piwik.org%s",
-        "PluginDescription": "Variáveis ​​personalizados são nome, pares de valores que podem ser definidos para uma visita usando a função setVisitCustomVariables() da API Javascript. Piwik irá relatar quantas visitas, páginas, conversões para cada um desses nomes personalizados e valores.",
         "ScopePage": "página escopo",
         "ScopeVisit": "visita escopo"
     }
diff --git a/plugins/CustomVariables/lang/pt.json b/plugins/CustomVariables/lang/pt.json
index a03f1c8e45..ec40f902c9 100644
--- a/plugins/CustomVariables/lang/pt.json
+++ b/plugins/CustomVariables/lang/pt.json
@@ -4,7 +4,6 @@
         "ColumnCustomVariableValue": "Valor da variável ​​personalizada",
         "CustomVariables": "Variáveis ​​personalizadas",
         "CustomVariablesReportDocumentation": "Este relatório contém informações sobre as variáveis ​​personalizadas. Clique no nome de uma variável para ver a distribuição dos valores. %s Para mais informações sobre variáveis ​​personalizadas em geral, deve ler a %sdocumentação sobre Variáveis Personalizadas em piwik.org %s",
-        "PluginDescription": "Variáveis ​​personalizadas são pares nomes\/valor que podem ser definidas para uma Visita usando a a função setVisitCustomVariables() da API Javascript. Para cada uma das variáveis personalizadas, o Piwik vai reportar quantas visitas, páginas, e conversões.",
         "ScopePage": "Âmbito da página",
         "ScopeVisit": "Âmbito da visita"
     }
diff --git a/plugins/CustomVariables/lang/ro.json b/plugins/CustomVariables/lang/ro.json
index 20a0e45cb1..8394ffd6c8 100644
--- a/plugins/CustomVariables/lang/ro.json
+++ b/plugins/CustomVariables/lang/ro.json
@@ -4,7 +4,6 @@
         "ColumnCustomVariableValue": "Valoarea variabilei personalizate",
         "CustomVariables": "Variabile personalizate",
         "CustomVariablesReportDocumentation": "Acest raport conține informații despre Variabilele Personalizate. Faceți clic pe un nume de variabilă pentru a vedea distribuția valorilor. %s Pentru mai multe informații despre variabile personalizate, în general, citiți %sdocumentatia Variabilelor Personalizate piwik.org%s",
-        "PluginDescription": "Variabilele personalizate sunt nume, perechi de valoare care pot fi setate pentru o vizită folosind Javascript API seteazăVariabileleVizităPersonalizate(funcții). Piwik va raporta apoi cât de multe vizite, pagini, conversii pentru fiecare dintre aceste nume personalizate și valori.",
         "ScopePage": "scop pagină",
         "ScopeVisit": "scop vizită"
     }
diff --git a/plugins/CustomVariables/lang/ru.json b/plugins/CustomVariables/lang/ru.json
index 5f13c9589c..bc30aea1a0 100644
--- a/plugins/CustomVariables/lang/ru.json
+++ b/plugins/CustomVariables/lang/ru.json
@@ -4,7 +4,6 @@
         "ColumnCustomVariableValue": "Значение пользовательской переменной",
         "CustomVariables": "Пользовательские переменные",
         "CustomVariablesReportDocumentation": "Этот отчет отображает информацию по вашим Пользовательским Переменным. Кликните по переменной, чтобы увидеть распределение значений. %s Для большей информации о Пользов. Переменных в общих чертах ознакомьтесь с %sдокументацией по Пользов. переменных на сайте Piwik%s",
-        "PluginDescription": "Пользовательскими переменными являются пары имя,значение, которые вы можете прикрепить к посещению, используя функцию Javascript API setVisitCustomVariables(). Piwik потом сообщит, сколько посещений, страниц, конверсий применено для каждого из этих пользовательских имен и значений.",
         "ScopePage": "scope page",
         "ScopeVisit": "scope visit"
     }
diff --git a/plugins/CustomVariables/lang/sq.json b/plugins/CustomVariables/lang/sq.json
index 268ecb5a27..ac17a0946a 100644
--- a/plugins/CustomVariables/lang/sq.json
+++ b/plugins/CustomVariables/lang/sq.json
@@ -4,7 +4,6 @@
         "ColumnCustomVariableValue": "Vlerë Ndryshoreje të Personalizueshme",
         "CustomVariables": "Ndryshore të Personalizueshme",
         "CustomVariablesReportDocumentation": "Ky raport përmban të dhëna rreth Ndryshoreve tuaja të Personalizuara. Klikoni mbi një emër ndryshoreje që të shihni shpërndarjen e vlerave. %s Për më tepër të dhëna rreth Ndryshoresh të Personalizuara në përgjithësi, lexoni %sdokumentimin e Ndryshoreve të Personalizuara te piwik.org%s",
-        "PluginDescription": "Ndryshoret e personalizueshme janë të trajtës emër,çift vlerash që mund të rregullohen prej jush për një Vizitë duke përdorur funksionin Javascript API setVisitCustomVariables(). Piwik-u mandej do të njoftojë se sa vizita, faqe, shndërrime kanë ndodhur për këto emra dhe vlera të personalizuara.",
         "ScopePage": "faqe me qëllim",
         "ScopeVisit": "vizitë me qëllim"
     }
diff --git a/plugins/CustomVariables/lang/sr.json b/plugins/CustomVariables/lang/sr.json
index adb5db8d1e..e7855e77aa 100644
--- a/plugins/CustomVariables/lang/sr.json
+++ b/plugins/CustomVariables/lang/sr.json
@@ -4,7 +4,6 @@
         "ColumnCustomVariableValue": "Vrednost dodatnog parametra",
         "CustomVariables": "Dodatni parametri",
         "CustomVariablesReportDocumentation": "Ovaj izveštaj sadrži informacije o dodatnim parametrima. Kliknite na ime parametra kako biste videli distribuciju vrednosti. %s Za više informacija o dodatnim parametrima pogledajte %sCustom Variables na piwik.org%s",
-        "PluginDescription": "Dodatni parametri predstavljaju uređene parove ime, vrednost koje možete sami postaviti pomoću JavaScript API funkcije setVisitCustomVariables(). U tom slučaju Piwik će prikazati koliko je bilo poseta, otvaranja stranica i ciljeva za svaki od zadatih parova.",
         "ScopePage": "oblast strana",
         "ScopeVisit": "oblast poseta"
     }
diff --git a/plugins/CustomVariables/lang/sv.json b/plugins/CustomVariables/lang/sv.json
index 160025b6b4..2fc2e7dd6f 100644
--- a/plugins/CustomVariables/lang/sv.json
+++ b/plugins/CustomVariables/lang/sv.json
@@ -4,7 +4,6 @@
         "ColumnCustomVariableValue": "Anpassat variabelvärde",
         "CustomVariables": "Anpassade variabler",
         "CustomVariablesReportDocumentation": "Denna rapport innehåller information om din anpassade variabler. Klicka på ett variabelnamn för att se fördelningen av värdena. %s För mer information om anpassade variabler i allmänhet, läs %sdokumentationen om anpassade variabler på piwik.org%s",
-        "PluginDescription": "Anpassade variabler är namn, värde-par som du kan ange för ett besök med hjälp av JavaScript API setVisitCustomVariables() funktionen. Piwik kommer därefter att rapportera hur många besök, sidor, omvandlingar för vart och ett av dessa anpassade namn och värden.",
         "ScopePage": "omfattning sida",
         "ScopeVisit": "omfattning besök"
     }
diff --git a/plugins/CustomVariables/lang/th.json b/plugins/CustomVariables/lang/th.json
index 2bf08bfb0b..ba77a96d85 100644
--- a/plugins/CustomVariables/lang/th.json
+++ b/plugins/CustomVariables/lang/th.json
@@ -2,7 +2,6 @@
     "CustomVariables": {
         "ColumnCustomVariableName": "ชื่อตัวแปรที่กำหนดเอง",
         "ColumnCustomVariableValue": "ค่าตัวแปรที่กำหนดเอง",
-        "CustomVariables": "ตัวแปรที่กำหนดเอง",
-        "PluginDescription": "ตัวแปรที่กำหนดเองเป็นชื่อ คู่ค่าที่คุณสามารถตั้งค่าการเข้าชมโดยใช้ Javascript API setVisitCustomVariables() Piwik จะรายงานแล้วเยี่ยมชม หน้า การแปลงสำหรับแต่ละค่าและชื่อแบบกำหนดเองเหล่านี้มาก"
+        "CustomVariables": "ตัวแปรที่กำหนดเอง"
     }
 }
\ No newline at end of file
diff --git a/plugins/CustomVariables/lang/tl.json b/plugins/CustomVariables/lang/tl.json
index 9bbbcc286c..f5ecff66e7 100644
--- a/plugins/CustomVariables/lang/tl.json
+++ b/plugins/CustomVariables/lang/tl.json
@@ -4,7 +4,6 @@
         "ColumnCustomVariableValue": "Halaga ng Custom na Variable",
         "CustomVariables": "Mga Custom na Variable",
         "CustomVariablesReportDocumentation": "Ang ulat na ito ay naglalaman ng mga impormasyon tunkol sa iyong mga Custom Variable. E-click ang pangalan ng variable upang makita ang pagkakabahagi ng mga laman nito. %s Upang makita ang pangkalahatang impormasyon tungkol sa Custom Variables basahin ang %sCustom Variables documentation sa piwi.org%s.",
-        "PluginDescription": "Custom Variables ay pangalan ang value pairs na pwede e-set sa isang pagbisita gamit ang Javascript API setVisitCustomVariables() function. At ang piwik ay magbibigay ng ulat kung gaano karami ang iyong bisita pahina conversion bawat isa sa mga custom names at values.",
         "ScopePage": "saklaw na pahina",
         "ScopeVisit": "Saklaw ng pagbisita"
     }
diff --git a/plugins/CustomVariables/lang/vi.json b/plugins/CustomVariables/lang/vi.json
index 44ae22eb30..29b5f4685a 100644
--- a/plugins/CustomVariables/lang/vi.json
+++ b/plugins/CustomVariables/lang/vi.json
@@ -4,7 +4,6 @@
         "ColumnCustomVariableValue": "Giá trị của biến tùy chọn",
         "CustomVariables": "Các biến tùy chọn",
         "CustomVariablesReportDocumentation": "Báo cáo này chứa thông tin về các biến tùy chỉnh. Vui lòng chọn tên biến để xem phân bố của các giá trị. %s Để tìm hiểu thêm thông tin chung về các biến tùy chỉnh, đọc %s Tài liệu hướng dẫn về biến tùy chỉnh trên piwik.org %s",
-        "PluginDescription": "Các biến tùy chỉnh là các cặp tên-giá trị mà bạn sử dụng đối với mỗi lần thăm trang web sử dụng hàm setVisitCustomVariables() trong API. Piwik sau đó sẽ báo cáo có bao nhiêu lượt truy cập, bao nhiêu trang, bao nhiêu lần chuyển đổi trang đối với từng biến.",
         "ScopePage": "Trang phạm vi",
         "ScopeVisit": "sự viếng thăm trong phạm vi nào đó"
     }
diff --git a/plugins/CustomVariables/lang/zh-cn.json b/plugins/CustomVariables/lang/zh-cn.json
index 6352a0baa2..7dca8365ac 100644
--- a/plugins/CustomVariables/lang/zh-cn.json
+++ b/plugins/CustomVariables/lang/zh-cn.json
@@ -4,7 +4,6 @@
         "ColumnCustomVariableValue": "自定义变量值",
         "CustomVariables": "自定义变量",
         "CustomVariablesReportDocumentation": "本报表包含您的自定义变量的资料，点击变量名查看数据。%s 关于自定义变量的详情，请阅读 %spiwik.org 上的自定义变量文档%s",
-        "PluginDescription": "插件描述",
         "ScopePage": "访问页面",
         "ScopeVisit": "访问范围"
     }
diff --git a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml
index da580cc910..3c6da50e62 100644
--- a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml
+++ b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml
@@ -67,8 +67,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -82,6 +80,47 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>4</visitDuration>
 		<visitDurationPretty>4s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>search</referrerType>
+		<referrerTypeName>Search Engines</referrerTypeName>
+		<referrerName>Google</referrerName>
+		<referrerKeyword>this keyword should be ranked</referrerKeyword>
+		<referrerKeywordPosition>1</referrerKeywordPosition>
+		<referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl>
+		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
+		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
+		<browserFamily>Gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browser>Firefox 3.6</browser>
+		<browserName>Firefox</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<events>0</events>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>France</country>
+		<countryCode>fr</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>France</location>
+		<latitude />
+		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
 		<customVariables>
 			<row>
 				<customVariableName1>Name_VISIT_1</customVariableName1>
@@ -116,55 +155,18 @@
 				<customVariableValue8>Val_VISIT8</customVariableValue8>
 			</row>
 		</customVariables>
-		<deviceType>Desktop</deviceType>
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<browser>Firefox 3.6</browser>
-		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
-		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>search</referrerType>
-		<referrerTypeName>Search Engines</referrerTypeName>
-		<referrerName>Google</referrerName>
-		<referrerKeyword>this keyword should be ranked</referrerKeyword>
-		<referrerKeywordPosition>1</referrerKeywordPosition>
-		<referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl>
-		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
-		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>France</country>
-		<countryCode>fr</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>France</location>
-		<latitude />
-		<longitude />
 		<resolution>1024x768</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
diff --git a/plugins/DBStats/lang/ar.json b/plugins/DBStats/lang/ar.json
index e4406352bd..979cf8cbeb 100644
--- a/plugins/DBStats/lang/ar.json
+++ b/plugins/DBStats/lang/ar.json
@@ -7,7 +7,6 @@
         "LearnMore": "للإطلاع على المزيد حول كيفية معالجة Piwik للبيانات وكيفية ضبطه ليعمل على المواقع المتوسطة والكبيرة، انظر مستندات الدعم %s.",
         "MainDescription": "يقوم Piwik بتخزين كافة بيانات تحليلات ويب في قاعدة بيانات MySQL. حالياً، استهلك Piwik %s.",
         "MetricTables": "جداول المعيار",
-        "PluginDescription": "هذا التطبيق يعطيك تقريراً عن مدى استهلاك قاعدة البيانات بواسطة جداول Piwik.",
         "ReportDataByYear": "جداول التقرير بالسنة",
         "RowCount": "عدد السطور",
         "Table": "الجدول",
diff --git a/plugins/DBStats/lang/be.json b/plugins/DBStats/lang/be.json
index a97222489c..b90d70ff89 100644
--- a/plugins/DBStats/lang/be.json
+++ b/plugins/DBStats/lang/be.json
@@ -5,7 +5,6 @@
         "IndexSize": "Памер індэксу",
         "LearnMore": "Каб даведацца больш аб тым, як Piwik апрацоўвае дадзеныя і як налдзцца больш аб тым, як Piwik апрацоўвае дадзеныя і як налдзиціць Piwik для добрага працавання на сайтах з сярэднімі і высокім трафікам, праверце дакументацыю %s.",
         "MainDescription": "Piwik захоўвае ўсю Вашу web статыстыку ў базе MySQL. Выкарыстанне Piwik табліц на дадзены момант %s.",
-        "PluginDescription": "Гэты плагін паведамляе аб выкарыстанні базы дадзеных таблицам Piwik",
         "RowCount": "Колькасць радкоў",
         "Table": "Табліца",
         "TotalSize": "Агульны памер"
diff --git a/plugins/DBStats/lang/bg.json b/plugins/DBStats/lang/bg.json
index b693b3fc5b..381058278b 100644
--- a/plugins/DBStats/lang/bg.json
+++ b/plugins/DBStats/lang/bg.json
@@ -10,7 +10,6 @@
         "MetricDataByYear": "Метрични таблици за година",
         "MetricTables": "Метрични таблици",
         "OtherTables": "Други таблици",
-        "PluginDescription": "Тази добавка докладва за използваното пространство на таблиците от Piwik в MySQL.",
         "ReportDataByYear": "Годишен доклад на таблици",
         "ReportTables": "Докладни таблици",
         "RowCount": "Брой редове",
diff --git a/plugins/DBStats/lang/ca.json b/plugins/DBStats/lang/ca.json
index 23105bea4d..575f040517 100644
--- a/plugins/DBStats/lang/ca.json
+++ b/plugins/DBStats/lang/ca.json
@@ -10,7 +10,6 @@
         "MetricDataByYear": "Taules de mètriques per any.",
         "MetricTables": "Taules de mètriques",
         "OtherTables": "Altres taules",
-        "PluginDescription": "Aquesta extensió mostra l'us de la Base de dades MySQL per les taules del Piwik.",
         "ReportDataByYear": "Taules d'informes per any",
         "ReportTables": "Taules d'informes",
         "RowCount": "Nombre de files",
diff --git a/plugins/DBStats/lang/cs.json b/plugins/DBStats/lang/cs.json
index b72c1f0586..bd3a1b434d 100644
--- a/plugins/DBStats/lang/cs.json
+++ b/plugins/DBStats/lang/cs.json
@@ -10,7 +10,7 @@
         "MetricDataByYear": "Tabulky měření za rok",
         "MetricTables": "Tabulky měření",
         "OtherTables": "Ostatní tabulky",
-        "PluginDescription": "Tento zásuvný modul hlásí využití databáze MySQL tabulkami Piwiku",
+        "PluginDescription": "Poskytuje detailní hlášení o využití Mysql databáze. Dostupné pro super uživatele pod diagnostikou.",
         "ReportDataByYear": "Hlášení tabulek za rok",
         "ReportTables": "Tabulky hlášení",
         "RowCount": "Počet řádků",
diff --git a/plugins/DBStats/lang/da.json b/plugins/DBStats/lang/da.json
index 3c5e6e1315..78187a783d 100644
--- a/plugins/DBStats/lang/da.json
+++ b/plugins/DBStats/lang/da.json
@@ -10,7 +10,6 @@
         "MetricDataByYear": "Målingstabeller fordelt på år",
         "MetricTables": "Målingstabeller",
         "OtherTables": "Andre tabeller",
-        "PluginDescription": "Programudvidelsen viser MySQL-database brugen af Piwik tabeller.",
         "ReportDataByYear": "Rapport tabeller fordelt på år",
         "ReportTables": "Rapport tabeller",
         "RowCount": "Række antal",
diff --git a/plugins/DBStats/lang/de.json b/plugins/DBStats/lang/de.json
index e47a2127f7..c39922e321 100644
--- a/plugins/DBStats/lang/de.json
+++ b/plugins/DBStats/lang/de.json
@@ -10,7 +10,7 @@
         "MetricDataByYear": "Metriktabellen pro Jahr",
         "MetricTables": "Metriktabellen",
         "OtherTables": "Andere Tabellen",
-        "PluginDescription": "Dieses Plugin berichtet über die Nutzung und Auslastung der Piwik-Tabellen in der MySQL Datenbank.",
+        "PluginDescription": "Unterstützt detaillierte MySQL Datenbank Auslastungsberichte. Verfügbar für Administratoren unter Diagnose.",
         "ReportDataByYear": "Berichtstabellen pro Jahr",
         "ReportTables": "Berichtstabellen",
         "RowCount": "Zeilenanzahl",
diff --git a/plugins/DBStats/lang/el.json b/plugins/DBStats/lang/el.json
index cffca89fc8..39909efe6b 100644
--- a/plugins/DBStats/lang/el.json
+++ b/plugins/DBStats/lang/el.json
@@ -10,7 +10,7 @@
         "MetricDataByYear": "Πίνακες Μετρήσεων Κατά Έτος",
         "MetricTables": "Πίνακες Μετρήσεων",
         "OtherTables": "Άλλοι Πίνακες",
-        "PluginDescription": "Αυτό το πρόσθετο δίνει αναφορά για τη χρήση της βάσης δεδομένων MySQL από τους πίνακες του Piwik.",
+        "PluginDescription": "Παρέχει λεπτομερείς αναφορές χρήσης για τη βάση δεδομένων MySQL. Διαθέσιμη για Υπερ-Χρήστες κάτω από τα Διαγνωστικά.",
         "ReportDataByYear": "Πίνακες αναφοράς Κατά Έτος",
         "ReportTables": "Πίνακες Αναφοράς",
         "RowCount": "Αριθμός σειρών",
diff --git a/plugins/DBStats/lang/en.json b/plugins/DBStats/lang/en.json
index 64a6d5a3b1..6214c0183f 100644
--- a/plugins/DBStats/lang/en.json
+++ b/plugins/DBStats/lang/en.json
@@ -10,7 +10,7 @@
         "MetricDataByYear": "Metric Tables By Year",
         "MetricTables": "Metric Tables",
         "OtherTables": "Other Tables",
-        "PluginDescription": "This plugin reports the MySQL database usage by Piwik tables.",
+        "PluginDescription": "Provides detailed MySQL database usage reports. Available for Super Users under Diagnostics. ",
         "ReportDataByYear": "Report Tables By Year",
         "ReportTables": "Report Tables",
         "RowCount": "Row count",
diff --git a/plugins/DBStats/lang/es.json b/plugins/DBStats/lang/es.json
index 055d037d1a..4f6bebdc75 100644
--- a/plugins/DBStats/lang/es.json
+++ b/plugins/DBStats/lang/es.json
@@ -10,7 +10,6 @@
         "MetricDataByYear": "Tablas de Medición Anuales",
         "MetricTables": "Tablas de Medición",
         "OtherTables": "Otras tablas",
-        "PluginDescription": "Este plugin reporta el uso de la base de datos MySQL de las tablas de Piwik.",
         "ReportDataByYear": "Reporte de Tablas Anual",
         "ReportTables": "Tablas de reportes",
         "RowCount": "Cantidad de filas",
diff --git a/plugins/DBStats/lang/et.json b/plugins/DBStats/lang/et.json
index fabc763358..63dc90d01c 100644
--- a/plugins/DBStats/lang/et.json
+++ b/plugins/DBStats/lang/et.json
@@ -10,7 +10,6 @@
         "MetricDataByYear": "Mõõttabelid aasta järgi",
         "MetricTables": "Mõõttabelid",
         "OtherTables": "Muud tabelid",
-        "PluginDescription": "Antud lisatarkvara raporteerib Piwiku tabelite MySQL andmebaasi kasutust.",
         "ReportDataByYear": "Raporti tabelid aasta järgi",
         "ReportTables": "Raporti tabelid",
         "RowCount": "Ridade arv",
diff --git a/plugins/DBStats/lang/fa.json b/plugins/DBStats/lang/fa.json
index c243e98459..21a0c0f5f7 100644
--- a/plugins/DBStats/lang/fa.json
+++ b/plugins/DBStats/lang/fa.json
@@ -10,7 +10,6 @@
         "MetricDataByYear": "جدول های معیار سالیانه",
         "MetricTables": "جدول های معیار",
         "OtherTables": "سایر جدول ها",
-        "PluginDescription": "این افزونه به گزارش استفاده از پایگاه داده MySQL را با استفاده از جداول Piwik.",
         "ReportDataByYear": "جدول گزارش بر اساس سال",
         "ReportTables": "گزارش جدول ها",
         "RowCount": "تعداد سطر",
diff --git a/plugins/DBStats/lang/fi.json b/plugins/DBStats/lang/fi.json
index f8b8453c6f..25f98b2955 100644
--- a/plugins/DBStats/lang/fi.json
+++ b/plugins/DBStats/lang/fi.json
@@ -10,7 +10,6 @@
         "MetricDataByYear": "Metriikat vuosittain",
         "MetricTables": "Metriikkataulut",
         "OtherTables": "Muut taulut",
-        "PluginDescription": "Tämä lisäosa raportoi MySQL-tietokannan käyttöä.",
         "ReportDataByYear": "Raporttitaulut vuosittain",
         "ReportTables": "Raporttitaulut",
         "RowCount": "Rivien määrä",
diff --git a/plugins/DBStats/lang/fr.json b/plugins/DBStats/lang/fr.json
index 2cde3be7af..032c93168f 100644
--- a/plugins/DBStats/lang/fr.json
+++ b/plugins/DBStats/lang/fr.json
@@ -10,7 +10,6 @@
         "MetricDataByYear": "Tables de métriques par année",
         "MetricTables": "Tables de métriques",
         "OtherTables": "Autres tables",
-        "PluginDescription": "Ce plugin effectue des rapports sur l'utilisation de la base de données MySQL par les tables de Piwik.",
         "ReportDataByYear": "Tables de rapports par année",
         "ReportTables": "Tables de rapport",
         "RowCount": "Nombre de lignes",
diff --git a/plugins/DBStats/lang/he.json b/plugins/DBStats/lang/he.json
index e9fba49396..ce98c65914 100644
--- a/plugins/DBStats/lang/he.json
+++ b/plugins/DBStats/lang/he.json
@@ -5,7 +5,6 @@
         "IndexSize": "משקל מפתח (index)",
         "LearnMore": "בכדי ללמוד עוד אודות כיצד Piwik מעבדת מידע וכיצד לשפר את ביצועיה של Piwik עבור אתרים בעלי תעבורה בינונית עד גבוהה, מומלץ להציץ במדריך %s.",
         "MainDescription": "Piwik מאכסנת את כל המידע אודות ניתוח פעילות הרשת במסד נתונים. כרגע, טבלאות Piwik צורכות %s.",
-        "PluginDescription": "תוסף זה מדווח על צריכת מסד הנתונים על ידי הטבלאות של Piwik.",
         "RowCount": "מספר שורות",
         "Table": "טבלה",
         "TotalSize": "משקל כולל"
diff --git a/plugins/DBStats/lang/hi.json b/plugins/DBStats/lang/hi.json
index dcb2afa1ac..a52caee9c9 100644
--- a/plugins/DBStats/lang/hi.json
+++ b/plugins/DBStats/lang/hi.json
@@ -10,7 +10,6 @@
         "MetricDataByYear": "वर्ष द्वारा मीट्रिक तालिकाएँ",
         "MetricTables": "मीट्रिक तालिकाएँ",
         "OtherTables": "अन्य तालिकाएँ",
-        "PluginDescription": "यह प्लगइन Piwik तालिकाएँ से डाटाबेस के उपयोग की रिपोर्ट है",
         "ReportDataByYear": "वर्ष के द्वारा रिपोर्ट तालिकाएँ",
         "ReportTables": "रिपोर्ट तालिकाएँ",
         "RowCount": "गिनती पंक्ति के",
diff --git a/plugins/DBStats/lang/hu.json b/plugins/DBStats/lang/hu.json
index a0f355c6c5..a95f781399 100644
--- a/plugins/DBStats/lang/hu.json
+++ b/plugins/DBStats/lang/hu.json
@@ -5,7 +5,6 @@
         "IndexSize": "Indexméret",
         "LearnMore": "Ha többet szeretnél megtudni arról, hogyan dolgozza fel a Piwik az adatokat, és hogyan lehet mindezt hatékonyan megoldani közepes és nagyobb forgalommal rendelkező weboldalak esetén is, olvasd el a vonatkozó dokumentációt: %s",
         "MainDescription": "A Piwik egy MySQL adatbázisban tárolja a webanalitikai adatokat. Jelenleg a Piwik táblák a következőket használják: %s.",
-        "PluginDescription": "A kiegészítő statisztikákat jelenít meg a Piwik adatbázis-használatáról.",
         "RowCount": "Sorok száma",
         "Table": "Tábla",
         "TotalSize": "Teljes méret"
diff --git a/plugins/DBStats/lang/id.json b/plugins/DBStats/lang/id.json
index 59eb17d532..2f5971feb6 100644
--- a/plugins/DBStats/lang/id.json
+++ b/plugins/DBStats/lang/id.json
@@ -10,7 +10,6 @@
         "MetricDataByYear": "Tabel Metrik berdasarkan Tahun",
         "MetricTables": "Tabel Metrik",
         "OtherTables": "Tabel Lain",
-        "PluginDescription": "Pengaya ini melaporkan pengunaan basisdata MySQL oleh tabel Piwik.",
         "ReportDataByYear": "Tabel Laporan berdasarkan Tahun",
         "ReportTables": "Tabel Laporan",
         "RowCount": "Jumlah Baris",
diff --git a/plugins/DBStats/lang/is.json b/plugins/DBStats/lang/is.json
index 9db4943c9b..af8e6297b4 100644
--- a/plugins/DBStats/lang/is.json
+++ b/plugins/DBStats/lang/is.json
@@ -4,7 +4,6 @@
         "DataSize": "Gagnastærð",
         "IndexSize": "stærð vísitöflu",
         "MainDescription": "Piwik vistar öll vefgreiningagögn inn í MySQL gagnagrunn. Núna eru Piwik töflurnar að nota %s.",
-        "PluginDescription": "Þessi íbót birtir MySQL gagnagrunnsnotkun á töflum Piwik.",
         "RowCount": "Fjöldi raða",
         "Table": "Tafla",
         "TotalSize": "Heildarstærð"
diff --git a/plugins/DBStats/lang/it.json b/plugins/DBStats/lang/it.json
index faf0321f8c..059cac7743 100644
--- a/plugins/DBStats/lang/it.json
+++ b/plugins/DBStats/lang/it.json
@@ -10,7 +10,7 @@
         "MetricDataByYear": "Tabelle metriche per anno",
         "MetricTables": "Tabelle metriche",
         "OtherTables": "Altre tabelle",
-        "PluginDescription": "Questo plugin riporta l'uso di MySQL da parte delle tabelle di Piwik.",
+        "PluginDescription": "Restituisce dei report dettagliati sull'uso del database MySQL. Disponibile in Diagnostica per i Super Users.",
         "ReportDataByYear": "Report tabelle per anno",
         "ReportTables": "Report tabelle",
         "RowCount": "Conteggio delle righe",
diff --git a/plugins/DBStats/lang/ja.json b/plugins/DBStats/lang/ja.json
index 0b871b545e..8ab8f80b45 100644
--- a/plugins/DBStats/lang/ja.json
+++ b/plugins/DBStats/lang/ja.json
@@ -10,7 +10,6 @@
         "MetricDataByYear": "年次のメトリック表",
         "MetricTables": "メトリック表",
         "OtherTables": "その他の表",
-        "PluginDescription": "Piwik テーブルによる MySQL データベースの使用量をリポートします。",
         "ReportDataByYear": "年次のリポート表",
         "ReportTables": "リポート表",
         "RowCount": "行数",
diff --git a/plugins/DBStats/lang/ka.json b/plugins/DBStats/lang/ka.json
index 19de965650..da94decc87 100644
--- a/plugins/DBStats/lang/ka.json
+++ b/plugins/DBStats/lang/ka.json
@@ -5,7 +5,6 @@
         "IndexSize": "ინდექსის ზომა",
         "LearnMore": "დამატებითი ინფორმაციის მისაღებად Piwik–ის მიერ მონაცემთა დამუშავების შესახებ და როგორ ამუშავოთ Piwik საშუალო და მაღალი ტრაფიკის ვებსაიტებზე უკეთესის შედეგის მისაღებად, გაეცანით დოკუმენტაციას %s.",
         "MainDescription": "Piwik ინახავს ვებ ანალიზის ყველა მონაცემს MySQL მონაცემთა ბაზაში. ამჟამად, Piwik ცხრილები იყენებენ %s.",
-        "PluginDescription": "ეს პლაგინი აკეთებს ანგარიშს Piwik ცხრილების მიერ MySQL მონაცემთა ბაზის გამოყენებაზე.",
         "RowCount": "სტრიქონების რაოდენობა",
         "Table": "ცხრილი",
         "TotalSize": "მთლიანი ზომა"
diff --git a/plugins/DBStats/lang/ko.json b/plugins/DBStats/lang/ko.json
index 372c492414..f56a86418f 100644
--- a/plugins/DBStats/lang/ko.json
+++ b/plugins/DBStats/lang/ko.json
@@ -10,7 +10,6 @@
         "MetricDataByYear": "연별 통계 표",
         "MetricTables": "통계표",
         "OtherTables": "기타 표",
-        "PluginDescription": "Piwik 테이블의 MySQL 데이터베이스 사용량을 보고합니다.",
         "ReportDataByYear": "연별 보고표",
         "ReportTables": "보고표",
         "RowCount": "행 수",
diff --git a/plugins/DBStats/lang/lt.json b/plugins/DBStats/lang/lt.json
index 6c966bf6f4..5273b81f3a 100644
--- a/plugins/DBStats/lang/lt.json
+++ b/plugins/DBStats/lang/lt.json
@@ -5,7 +5,6 @@
         "IndexSize": "Indekso dydis",
         "LearnMore": "Norint geriau susipažinti su Piwik duomenų apdorojimu bei kaip priversti Piwik veikti geriau vidutinės ir didelės apkrovos svetainėse, siūlome pastudijuoti dokumentaciją %s.",
         "MainDescription": "Piwik saugo visus Jūsų duomenis MySQL duombazėje. Šiuo metu Piwik lentelės naudoja %s.",
-        "PluginDescription": "Šis papildinys informuoja apie MySQL duombazės užimtumą.",
         "RowCount": "Eilučių kiekis",
         "Table": "Lentelė",
         "TotalSize": "Bendras dydis"
diff --git a/plugins/DBStats/lang/lv.json b/plugins/DBStats/lang/lv.json
index fd450b2bba..1d4ca11212 100644
--- a/plugins/DBStats/lang/lv.json
+++ b/plugins/DBStats/lang/lv.json
@@ -5,7 +5,6 @@
         "IndexSize": "Indeksa izmērs",
         "LearnMore": "Lai uzzinātu vairāk par to, kā Piwik apstrādā datus un kā Piwik tiek galā ar vidēja un augsta apmeklējuma vietnēm, apskatiet dokumentāciju %s.",
         "MainDescription": "Piwik glabā visus Jūsu tīkla analīzes datus MySQL datubāzē. Pašlaik Piwik tabulas lieto %s.",
-        "PluginDescription": "Šis spraudnis sniedz MySQL datubāzes Piwik tabulu lietojuma atskaites.",
         "RowCount": "Rindu skaits",
         "Table": "Tabula",
         "TotalSize": "Kopējais izmērs"
diff --git a/plugins/DBStats/lang/nb.json b/plugins/DBStats/lang/nb.json
index 5dfed0db59..1f212409ee 100644
--- a/plugins/DBStats/lang/nb.json
+++ b/plugins/DBStats/lang/nb.json
@@ -8,7 +8,6 @@
         "LearnMore": "For å lære mer om hvordan Piwik behandler data og hvordan få Piwik til å virke bra for nettsteder med medium og høy trafikk, les dokumentasjonen %s.",
         "MainDescription": "Piwik lagrer all din statistikk i MySQL-databasen. Akkurat nå bruker Piwik-tabellene %s.",
         "OtherTables": "Andre tabeller",
-        "PluginDescription": "Dette tillegget rapporterer MySQL-databasebruk for Piwik-tabeller.",
         "RowCount": "Antall rader",
         "Table": "Tabell",
         "TotalSize": "Total størrelse"
diff --git a/plugins/DBStats/lang/nl.json b/plugins/DBStats/lang/nl.json
index 84323d9e78..e2a939bc23 100644
--- a/plugins/DBStats/lang/nl.json
+++ b/plugins/DBStats/lang/nl.json
@@ -10,7 +10,6 @@
         "MetricDataByYear": "Metric tabellen per jaar",
         "MetricTables": "Metric tabellen",
         "OtherTables": "Andere tabellen",
-        "PluginDescription": "Deze plugin toont het MySQL database verbruik door de Piwik tabellen.",
         "ReportDataByYear": "Rapport tabellen per jaar",
         "ReportTables": "Rapport tabellen",
         "RowCount": "Aantal rijen",
diff --git a/plugins/DBStats/lang/nn.json b/plugins/DBStats/lang/nn.json
index b18b3e635d..dc1b94e4da 100644
--- a/plugins/DBStats/lang/nn.json
+++ b/plugins/DBStats/lang/nn.json
@@ -10,7 +10,6 @@
         "MetricDataByYear": "Verdi-tabellar etter år",
         "MetricTables": "Verdi-tabellar",
         "OtherTables": "Andre tabellar",
-        "PluginDescription": "Dette innstikket rapporterer bruken til Piwik av MySQL-databasen.",
         "ReportDataByYear": "Rapport-tabellar etter år",
         "ReportTables": "Rapport-tabellar",
         "RowCount": "Rad",
diff --git a/plugins/DBStats/lang/pl.json b/plugins/DBStats/lang/pl.json
index 303fb808a6..0d2e546a6f 100644
--- a/plugins/DBStats/lang/pl.json
+++ b/plugins/DBStats/lang/pl.json
@@ -8,7 +8,6 @@
         "LearnMore": "Aby dowiedzieć się więcej o tym, jak Piwik przetwarza dane i jak konfigurować go do pracy z serwisami o średnim i wysokim ruchu na stronach, sprawdź dokumentację %s.",
         "MainDescription": "Piwik przechowuje wszystkie dane analityki statystycznej stron w bazie danych MySQL serwera. Obecnie jego tabele zajmują %s.",
         "OtherTables": "Inne Tabele",
-        "PluginDescription": "Ta wtyczka informuje o stopniu wykorzystania baz danych MySQL przez tabele Piwik.",
         "ReportDataByYear": "Raport Tabele według roku",
         "RowCount": "Liczba wierszy",
         "Table": "Tabela",
diff --git a/plugins/DBStats/lang/pt-br.json b/plugins/DBStats/lang/pt-br.json
index a0b1524c80..39703043c5 100644
--- a/plugins/DBStats/lang/pt-br.json
+++ b/plugins/DBStats/lang/pt-br.json
@@ -10,7 +10,6 @@
         "MetricDataByYear": "Tabelas métricas Por Ano",
         "MetricTables": "Tabelas métricas",
         "OtherTables": "Outras tabelas",
-        "PluginDescription": "Esse plugin relata o banco de dados MySQL usado pelas tabelas Piwik.",
         "ReportDataByYear": "Relatório Quadros por Ano",
         "ReportTables": "Tabelas de relatórios",
         "RowCount": "Contagem de linhas",
diff --git a/plugins/DBStats/lang/pt.json b/plugins/DBStats/lang/pt.json
index 5cb7cf9d4a..36564ac360 100644
--- a/plugins/DBStats/lang/pt.json
+++ b/plugins/DBStats/lang/pt.json
@@ -5,7 +5,6 @@
         "IndexSize": "Tamanho do índice",
         "LearnMore": "Para aprender mais sobre como o Piwik processa dados e como optimizar o Piwik para websites de tráfego médio ou elevado, veja a documentação %s.",
         "MainDescription": "Piwik está a armazenar todos os seus dados de analíticas da web na base de dados MySQL. Actualmente, tabelas Piwik estão a utilizar %s.",
-        "PluginDescription": "Este plugin relata o uso da base de dados MySQL pelas tabelas Piwik.",
         "RowCount": "Número de linhas",
         "Table": "Tabela",
         "TotalSize": "Tamanho total"
diff --git a/plugins/DBStats/lang/ro.json b/plugins/DBStats/lang/ro.json
index ef3b75c2e5..7520dc06c2 100644
--- a/plugins/DBStats/lang/ro.json
+++ b/plugins/DBStats/lang/ro.json
@@ -10,7 +10,6 @@
         "MetricDataByYear": "Tabelele cu Parametri dupa An",
         "MetricTables": "Tabele Metrici",
         "OtherTables": "Alte tablete",
-        "PluginDescription": "Acest plugin arata raportul cu gradul de utilizare a bazei de date MySQL pentru fiecare tabela Piwik in parte",
         "ReportDataByYear": "Tabele din raport pentru anul",
         "ReportTables": "Tabele din raport",
         "RowCount": "Numărul de înregistrări",
diff --git a/plugins/DBStats/lang/ru.json b/plugins/DBStats/lang/ru.json
index a41e86e308..2ce29b2718 100644
--- a/plugins/DBStats/lang/ru.json
+++ b/plugins/DBStats/lang/ru.json
@@ -10,7 +10,6 @@
         "MetricDataByYear": "Таблицы показателей за год",
         "MetricTables": "Таблицы показателей",
         "OtherTables": "Другие таблицы",
-        "PluginDescription": "Этот плагин показывает использование MySQL базы данных таблицами Piwik.",
         "ReportDataByYear": "Таблицы отчетов за год",
         "ReportTables": "Таблицы отчетов",
         "RowCount": "Количество записей",
diff --git a/plugins/DBStats/lang/sl.json b/plugins/DBStats/lang/sl.json
index eef94db3d1..acb90fdbd4 100644
--- a/plugins/DBStats/lang/sl.json
+++ b/plugins/DBStats/lang/sl.json
@@ -6,7 +6,6 @@
         "EstimatedSize": "Ocenjena velikost",
         "IndexSize": "Velikost indeksa",
         "MainDescription": "Piwik shranjuje vse vaše podatke v MySQL bazo podatkov. Trenutna poraba podatkovne baze je %s.",
-        "PluginDescription": "Ta vtičnik poroča o Piwik-ovi uporabi MySQL podatkovne baze.",
         "RowCount": "Število vrst",
         "Table": "Tabela",
         "TotalSize": "Skupna velikost"
diff --git a/plugins/DBStats/lang/sq.json b/plugins/DBStats/lang/sq.json
index 17747b225f..ea9f6824b1 100644
--- a/plugins/DBStats/lang/sq.json
+++ b/plugins/DBStats/lang/sq.json
@@ -5,7 +5,6 @@
         "IndexSize": "Madhësi treguesi",
         "LearnMore": "Për të mësuar më tepër rreth se si i përpunon të dhënat Piwik-u dhe se si ta bëni Piwik-un të punojë mirë me site-e web me trafik mesatar ose të madh, kontrolloni dokumentimin %s.",
         "MainDescription": "Piwik-u po i depoziton krejt të dhënat tuaja për analizë web te baza e të dhënave MySQL. Tani për tani, tabelat e Piwik-ut po përdorin %s.",
-        "PluginDescription": "Kjo shtojcë raporton përdorimin e bazës së të dhënave MySQL nga tabelat e Piwik-ut.",
         "RowCount": "Numërim rreshtash",
         "Table": "Tabelë",
         "TotalSize": "Madhësi gjithsej"
diff --git a/plugins/DBStats/lang/sr.json b/plugins/DBStats/lang/sr.json
index 64d667fb96..6207c78c02 100644
--- a/plugins/DBStats/lang/sr.json
+++ b/plugins/DBStats/lang/sr.json
@@ -10,7 +10,6 @@
         "MetricDataByYear": "Metrika po godinama",
         "MetricTables": "Metrika",
         "OtherTables": "Ostalo",
-        "PluginDescription": "Ovaj dodatak prikazuje iskorišćenost MySQL baze od strane Piwik tabela.",
         "ReportDataByYear": "Izveštaji po godinama",
         "ReportTables": "Izveštaji",
         "RowCount": "Broj redova",
diff --git a/plugins/DBStats/lang/sv.json b/plugins/DBStats/lang/sv.json
index 4ec35929e7..576bbd4d2a 100644
--- a/plugins/DBStats/lang/sv.json
+++ b/plugins/DBStats/lang/sv.json
@@ -10,7 +10,6 @@
         "MetricDataByYear": "Variabler per år",
         "MetricTables": "Variabeltabeller",
         "OtherTables": "Övriga tabeller",
-        "PluginDescription": "Denna plugin rapporterar Piwik's användning av tabeller i MySQL databasen.",
         "ReportDataByYear": "Raporttabeller per år",
         "ReportTables": "Rapporttabeller",
         "RowCount": "Radantal",
diff --git a/plugins/DBStats/lang/ta.json b/plugins/DBStats/lang/ta.json
index 6cabda90b3..f02bc3899f 100644
--- a/plugins/DBStats/lang/ta.json
+++ b/plugins/DBStats/lang/ta.json
@@ -7,7 +7,6 @@
         "IndexSize": "குறியீட்டு அளவு",
         "MetricDataByYear": "ஆண்டு அடிப்படையில் பதின்மான அட்டவணைகள்",
         "MetricTables": "அளவியல் அட்டவணைகள்",
-        "PluginDescription": "இந்த சொருகி Piwk அட்டவனைகளின் MySQL தரவு தள பாவனை பற்றிய அறிக்கையை தரும்",
         "ReportTables": "அட்டவணை அறிக்கை",
         "Table": "அட்டவணை",
         "TotalSize": "மொத்த அளவு"
diff --git a/plugins/DBStats/lang/th.json b/plugins/DBStats/lang/th.json
index bb63ef6e91..d324ccfada 100644
--- a/plugins/DBStats/lang/th.json
+++ b/plugins/DBStats/lang/th.json
@@ -6,7 +6,6 @@
         "IndexSize": "ขนาดของดรรชนี",
         "LearnMore": "เมื่อต้องการเรียนรู้เพิ่มเติมเกี่ยวกับวิธีการประมวลผลข้อมูลของ Piwik และวิธีการทำให้ Piwik ทำงานดีสำหรับเว็บไซต์ขนาดกลาง และจราจรจำนวนสูง อ่านเอกสารการใช้งานได้ที่ %s",
         "MainDescription": "Piwik ได้ทำการเก็บข้อมูลการวิเคราะห์เว็บไซต์ของคุณในฐานข้อมูล MySQL ขณะนี้ตารางฐานข้อมูลของ Piwik มีขนาดทั้งหมด %s",
-        "PluginDescription": "ปลั๊กอินนี้รายงานการใช้งานฐานข้อมูล MySQL โดยตาราง Piwik",
         "RowCount": "จำนวนระเบียน",
         "Table": "ตาราง",
         "TotalSize": "ขนาดรวม"
diff --git a/plugins/DBStats/lang/tl.json b/plugins/DBStats/lang/tl.json
index 2720809061..71dca23594 100644
--- a/plugins/DBStats/lang/tl.json
+++ b/plugins/DBStats/lang/tl.json
@@ -10,7 +10,6 @@
         "MetricDataByYear": "Talaan ng sukatan ayon sa taon",
         "MetricTables": "Table ng sukatan",
         "OtherTables": "Iba pang mga table",
-        "PluginDescription": "Inulat ng plugin ang MySQL database sa paggamit ng talahayanan ng Piwik.",
         "ReportDataByYear": "Ulat talahaan ayon sa taon",
         "ReportTables": "Talaan ng mga table",
         "RowCount": "Bilang ng row",
diff --git a/plugins/DBStats/lang/tr.json b/plugins/DBStats/lang/tr.json
index fb95054e05..14cfbb29f2 100644
--- a/plugins/DBStats/lang/tr.json
+++ b/plugins/DBStats/lang/tr.json
@@ -10,7 +10,6 @@
         "MetricDataByYear": "Yıla Göre Metrik Tablosu",
         "MetricTables": "Metrik Tabloları",
         "OtherTables": "Diğer Tablolar",
-        "PluginDescription": "Bu eklenti Piwik tabloları ile MySQL veritabanı kullanım raporu.",
         "ReportDataByYear": "Yıla Göre Rapor Tabloları",
         "ReportTables": "Rapor Tabloları",
         "RowCount": "Satır sayısı",
diff --git a/plugins/DBStats/lang/uk.json b/plugins/DBStats/lang/uk.json
index 3ad47b803f..08ad26e9e2 100644
--- a/plugins/DBStats/lang/uk.json
+++ b/plugins/DBStats/lang/uk.json
@@ -5,7 +5,6 @@
         "IndexSize": "Розмір індексів",
         "LearnMore": "Щоб зрозуміти більше як Piwik обробляє дані та як покращити роботу Piwik для сайтів з середнім та високим трафіком, перегляньте документацію %s.",
         "MainDescription": "Piwik зберігає всі дані для веб-аналітики в MySQL базі даних. На даний час, таблиці з даними Piwik займають %s",
-        "PluginDescription": "Цей плагін надає звіт про використання бази даних таблицями Piwik.",
         "RowCount": "Перелік рядків",
         "Table": "Таблиця",
         "TotalSize": "Розмір таблиці"
diff --git a/plugins/DBStats/lang/vi.json b/plugins/DBStats/lang/vi.json
index 48911cddb2..183831fcea 100644
--- a/plugins/DBStats/lang/vi.json
+++ b/plugins/DBStats/lang/vi.json
@@ -10,7 +10,6 @@
         "MetricDataByYear": "Bảng thông số theo năm",
         "MetricTables": "Bảng tính",
         "OtherTables": "Bảng khác",
-        "PluginDescription": "Plugin này báo cáo việc sử dụng cơ sở dữ liệu MySQL của bảng Piwik.",
         "ReportDataByYear": "Bảng báo cáo bởi năm",
         "ReportTables": "Bảng báo cáo",
         "RowCount": "Hàng đếm",
diff --git a/plugins/DBStats/lang/zh-cn.json b/plugins/DBStats/lang/zh-cn.json
index b6ddb36aa4..ae8191a87c 100644
--- a/plugins/DBStats/lang/zh-cn.json
+++ b/plugins/DBStats/lang/zh-cn.json
@@ -10,7 +10,6 @@
         "MetricDataByYear": "按年的指标表",
         "MetricTables": "指标表",
         "OtherTables": "其它表",
-        "PluginDescription": "这个插件能报告 Piwik 的数据表使用情况。",
         "ReportDataByYear": "年度报表",
         "ReportTables": "报表",
         "RowCount": "行计算",
diff --git a/plugins/DBStats/lang/zh-tw.json b/plugins/DBStats/lang/zh-tw.json
index e32ed9c5c2..af53e6f555 100644
--- a/plugins/DBStats/lang/zh-tw.json
+++ b/plugins/DBStats/lang/zh-tw.json
@@ -6,7 +6,6 @@
         "IndexSize": "索引大小",
         "LearnMore": "瞭解更多關於 Piwik 如何處理數據以及使 Piwik 在中高流量的網站上運作得宜，請查閱說明文件 %s。",
         "MainDescription": "Piwik 儲存所有你的網站分析資料於 MySQL 資料庫中。目前， Piwik 資料表已經使用了 %s。",
-        "PluginDescription": "這個外掛能回報 Piwik 的資料表使用情形。",
         "RowCount": "資料列計數",
         "Table": "資料表",
         "TotalSize": "總容量"
diff --git a/plugins/Dashboard/API.php b/plugins/Dashboard/API.php
index ec41bb626f..d8994c229e 100644
--- a/plugins/Dashboard/API.php
+++ b/plugins/Dashboard/API.php
@@ -130,7 +130,7 @@ class API extends \Piwik\Plugin\API
 
     private function widgetExists($widget)
     {
-        if (empty($widget->parameters)) {
+        if (empty($widget->parameters->module)) {
             return false;
         }
 
diff --git a/plugins/Dashboard/Dashboard.php b/plugins/Dashboard/Dashboard.php
index bfb3fc9870..a0d08a679b 100644
--- a/plugins/Dashboard/Dashboard.php
+++ b/plugins/Dashboard/Dashboard.php
@@ -81,7 +81,7 @@ class Dashboard extends \Piwik\Plugin
                 ],
                 [
                     {"uniqueId":"widgetUserCountryMapvisitorMap","parameters":{"module":"UserCountryMap","action":"visitorMap"}},
-                    {"uniqueId":"widgetDevicesDetecionGetBrowser","parameters":{"module":"DevicesDetection","action":"getBrowsers"}},
+                    {"uniqueId":"widgetDevicesDetectiongetBrowsers","parameters":{"module":"DevicesDetection","action":"getBrowsers"}},
                     {"uniqueId":"widgetReferrersgetSearchEngines","parameters":{"module":"Referrers","action":"getSearchEngines"}},
                     {"uniqueId":"widgetVisitTimegetVisitInformationPerServerTime","parameters":{"module":"VisitTime","action":"getVisitInformationPerServerTime"}},
                     {"uniqueId":"widgetExampleRssWidgetrssPiwik","parameters":{"module":"ExampleRssWidget","action":"rssPiwik"}}
diff --git a/plugins/Dashboard/lang/ar.json b/plugins/Dashboard/lang/ar.json
index 83f02e418f..d4571952aa 100644
--- a/plugins/Dashboard/lang/ar.json
+++ b/plugins/Dashboard/lang/ar.json
@@ -12,7 +12,6 @@
         "ManageDashboard": "إدارة اللوحة",
         "Maximise": "تكبير",
         "NotUndo": "لن يمكنك التراجع عن هذه العملية.",
-        "PluginDescription": "لوحتك لإدارة تحليلات ويب. يمكنك تخصيص لوحة التحكم، إضافة لوحات أدوات، وتغيير ترتيبها. يمكن لكل مستخدم الوصول للوحة الإدارة الخاصة به.",
         "RemoveDashboard": "إزالة اللوحة",
         "RenameDashboard": "إعادة تسمية اللوحة",
         "ResetDashboardConfirm": "هل ترغب حقاً في تنضيد تخطيط اللوحة الرئيسية ومجموعة التطبيقات المعروضة فيها إلى الافتراضية؟",
diff --git a/plugins/Dashboard/lang/be.json b/plugins/Dashboard/lang/be.json
index 434cb5c85f..f8ddc22855 100644
--- a/plugins/Dashboard/lang/be.json
+++ b/plugins/Dashboard/lang/be.json
@@ -5,7 +5,6 @@
         "DeleteWidgetConfirm": "Вы ўпэўнены, што жадаеце выдаліць гэты віджэт з інфармацыйнай панэлі?",
         "LoadingWidget": "Загрузка віджэта, калі ласка пачакайце...",
         "Maximise": "Максімалізаваць",
-        "PluginDescription": "Ваша галоўная панель Вэб-Аналітыкі. Вы можаце наладжваць панэлі інструментаў: дадаваць новыя віджэты, змяніць парадак вашых віджэтаў. Кожны карыстальнік можа атрымаць доступ да яго ўласнай галоўнай панелі.",
         "SelectWidget": "Абярыце віджэт для дадання на інформпанель",
         "WidgetNotFound": "Віджэт не знойдзены",
         "WidgetPreview": "Прадпрагляд віджэта"
diff --git a/plugins/Dashboard/lang/bg.json b/plugins/Dashboard/lang/bg.json
index b7d1c53d9a..f5a22bd187 100644
--- a/plugins/Dashboard/lang/bg.json
+++ b/plugins/Dashboard/lang/bg.json
@@ -18,7 +18,6 @@
         "Maximise": "Максимизиране",
         "Minimise": "Минимизиране",
         "NotUndo": "Вие няма да можете да отмените тази операция",
-        "PluginDescription": "Табло на вашия уеб анализатор. Можете да настроите таблото си по свой вкус: да добавяте нови джаджи, да променяте подредбата им. Всеки потребител има достъп до своето собствено табло.",
         "RemoveDashboard": "Премахнете таблото",
         "RemoveDashboardConfirm": "Сигурни ли сте че искате да премахнете таблото \"%s\"?",
         "RenameDashboard": "Сменете името на таблото",
diff --git a/plugins/Dashboard/lang/ca.json b/plugins/Dashboard/lang/ca.json
index 045611cd4b..3e239a8467 100644
--- a/plugins/Dashboard/lang/ca.json
+++ b/plugins/Dashboard/lang/ca.json
@@ -18,7 +18,6 @@
         "Maximise": "Maximitza",
         "Minimise": "Minimitza",
         "NotUndo": "No podreu desfer aquesta operació",
-        "PluginDescription": "El teu tauler d'analítica web. Podeu personalitzar el vostre tauler: afegir nous ginys, canviar l'ordre dels ginys. Cada usuari pot accedir al seu propi tauler personalitzat.",
         "RemoveDashboard": "Elimina el tauler",
         "RemoveDashboardConfirm": "Esteu segurs que voleu eliminar el tauler \"%s\"?",
         "RenameDashboard": "Reanomena el tauler",
diff --git a/plugins/Dashboard/lang/cs.json b/plugins/Dashboard/lang/cs.json
index bbca664ea2..226cc33413 100644
--- a/plugins/Dashboard/lang/cs.json
+++ b/plugins/Dashboard/lang/cs.json
@@ -18,7 +18,7 @@
         "Maximise": "Maximalizovat",
         "Minimise": "Minimalizovat",
         "NotUndo": "Tuto operaci nemůžete vrátit zpět.",
-        "PluginDescription": "Vaše nástěnka webové analýzy. Můžete si ji upravit: přidat nové widgety, změnit jejich pořadí. Každý uživatel přistupuje ke své vlastní nástěnce.",
+        "PluginDescription": "Vaše nástěnka analýzy webu. Přizpůsobte si vaši nástěnku přidáním nových widgetů, jejich přesunutím nebo změnou rozvržení sloupců. Každý uživatel může přizpůsobit svou vlastní nástěnku.",
         "RemoveDashboard": "Odstranit nástěnku",
         "RemoveDashboardConfirm": "Opravdu chcete odstranit nástěnku: %s?",
         "RenameDashboard": "Přejmenovat nástěnku",
diff --git a/plugins/Dashboard/lang/da.json b/plugins/Dashboard/lang/da.json
index 81b1742561..73794592d6 100644
--- a/plugins/Dashboard/lang/da.json
+++ b/plugins/Dashboard/lang/da.json
@@ -18,7 +18,6 @@
         "Maximise": "Maksimer",
         "Minimise": "Minimer",
         "NotUndo": "Handlingen kan ikke fortrydes.",
-        "PluginDescription": "Kontrolpanelet kan tilpasses: tilføj nye moduler, ændre rækkefølgen af dem. Hver bruger kan få adgang til sit eget brugerdefinerede kontrolpanel.",
         "RemoveDashboard": "Fjern kontrolpanel",
         "RemoveDashboardConfirm": "Bekræft fjernelse af kontrolpanel \"%s\"?",
         "RenameDashboard": "Omdøb kontrolpanel",
diff --git a/plugins/Dashboard/lang/de.json b/plugins/Dashboard/lang/de.json
index 709982d786..5838d406ad 100644
--- a/plugins/Dashboard/lang/de.json
+++ b/plugins/Dashboard/lang/de.json
@@ -18,7 +18,7 @@
         "Maximise": "Vergrößern",
         "Minimise": "Minimieren",
         "NotUndo": "Sie können diese Aktion nicht rückgängig machen.",
-        "PluginDescription": "Ihr Dashboard. Sie können es sich individuell anpassen: neue Widgets hinzufügen oder deren Reihenfolge ändern. Jeder Benutzer hat ein eigenes Dashboard.",
+        "PluginDescription": "Ihr Web Analyse Dashboard. Personalisieren Sie Ihr Dashboard, in dem Sie neue Widgets hinzufügen, per Drag und Drop herumschieben, und das Dashboard Spaltenlayout ändern. Jeder Benutzer kann sein eigenes personalisiertes Dashboard verwalten.",
         "RemoveDashboard": "Dashboard entfernen",
         "RemoveDashboardConfirm": "Sind Sie sicher, dass Sie das Dashboard \"%s\" löschen möchten?",
         "RenameDashboard": "Dashboard umbenennen",
diff --git a/plugins/Dashboard/lang/el.json b/plugins/Dashboard/lang/el.json
index bcce2b99a7..ec961f3f80 100644
--- a/plugins/Dashboard/lang/el.json
+++ b/plugins/Dashboard/lang/el.json
@@ -18,7 +18,7 @@
         "Maximise": "Μεγιστοποίηση",
         "Minimise": "Ελαχιστοποίηση",
         "NotUndo": "Αυτή η λειτουργεία δεν είναι αναστρέψιμη.",
-        "PluginDescription": "Ο Κεντρικός σας Πίνακας των Στατιστικών Ιστού. Μπορείτε να προσαρμόσετε τον Κεντρικό σας Πίνακα: προσθήκη νέων μικροεφαρμογών, αλλαγή της διάταξης των μικροεφαρμογών σας. Κάθε χρήστης μπορεί να έχει πρόσβαση στον δικό του προσαρμοσμένο Κεντρικό Πίνακα.",
+        "PluginDescription": "Ο κεντρικός πίνακας Αναλυτικών Ιστού. Προσαρμόστε τον πίνακα με την προσθήκη νέων γραφικών συστατικών, σύρτε και αφήστε τα όπου θέλετε και αλλάξτε την διάταξη στήλης του πίνακα. Κάθε χρήστης μπορεί να διαχειρίζεται τον δικό του πίνακα.",
         "RemoveDashboard": "Απομάκρυνση κεντρικού πίνακα",
         "RemoveDashboardConfirm": "Θέλετε, σίγουρα, να απομακρύνετε τον Κεντρικό Πίνακα «%s»;",
         "RenameDashboard": "Μετονομασία κεντρικού πίνακα",
diff --git a/plugins/Dashboard/lang/en.json b/plugins/Dashboard/lang/en.json
index bb818e515a..d5ccd25af8 100644
--- a/plugins/Dashboard/lang/en.json
+++ b/plugins/Dashboard/lang/en.json
@@ -18,7 +18,7 @@
         "Maximise": "Maximise",
         "Minimise": "Minimise",
         "NotUndo": "You will not be able to undo this operation.",
-        "PluginDescription": "Your Web Analytics Dashboard. You can customize Your Dashboard: add new widgets, change the order of your widgets. Each user can access his own custom Dashboard.",
+        "PluginDescription": "Your Web Analytics Dashboard. Customise your dashboard by adding new widgets, drag and drop them around, and change the dashboard column layout. Each user can manage their own custom dashboard.",
         "RemoveDashboard": "Remove dashboard",
         "RemoveDashboardConfirm": "Are you sure you want to remove the dashboard \"%s\"?",
         "RenameDashboard": "Rename dashboard",
diff --git a/plugins/Dashboard/lang/es.json b/plugins/Dashboard/lang/es.json
index 6f18074f68..33246f3d27 100644
--- a/plugins/Dashboard/lang/es.json
+++ b/plugins/Dashboard/lang/es.json
@@ -18,7 +18,6 @@
         "Maximise": "Maximizar",
         "Minimise": "Minimizar",
         "NotUndo": "No podrás deshacer esta operación.",
-        "PluginDescription": "Tu Panel de Análisis Web. Puedes personalizar su Panel: agregar nuevos widgets, cambiar el orden de tus widgets. Cada usuario puede acceder a su propio Panel personalizado.",
         "RemoveDashboard": "Elimina el tablero",
         "RemoveDashboardConfirm": "¿Estás seguro que deseas eliminar el tablero \"%s\"?",
         "RenameDashboard": "Renombrar el tablero",
diff --git a/plugins/Dashboard/lang/fa.json b/plugins/Dashboard/lang/fa.json
index 89a5c08637..3eb0dc8892 100644
--- a/plugins/Dashboard/lang/fa.json
+++ b/plugins/Dashboard/lang/fa.json
@@ -18,7 +18,6 @@
         "Maximise": "ماکسمیاز",
         "Minimise": "حداقل",
         "NotUndo": "شما قادر نخواهد بود برای خنثیسازی این عملیات است.",
-        "PluginDescription": "صفحه آنالیز وب سایت شما. شما می توانید اطلاعات خود را سفارشی: اضافه کردن ویدجت های جدید، تغییر جهت از ویدجت خود را. هر کاربر می تواند صفحه دلخواه خود دسترسی داشته باشید.",
         "RemoveDashboard": "حذف داشبورد",
         "RemoveDashboardConfirm": "آیا شما مطمئن هستید که می خواهید این داشبورد %s را پاک کنید؟",
         "RenameDashboard": "تغییر نام داشبورد",
diff --git a/plugins/Dashboard/lang/fi.json b/plugins/Dashboard/lang/fi.json
index 41fde15f4b..8b24ace67b 100644
--- a/plugins/Dashboard/lang/fi.json
+++ b/plugins/Dashboard/lang/fi.json
@@ -18,7 +18,6 @@
         "Maximise": "Suurenna",
         "Minimise": "Pienennä",
         "NotUndo": "Et voi peruuttaa tätä operaatiota.",
-        "PluginDescription": "Piwikin työpöytä. Voit muokata työpöytääsi: lisätä uusia raportteja, poistaa raportteja ja muuttaa raporttien järjestystä. Jokainen käyttäjä voi käyttää omaa työpöytäänsä.",
         "RemoveDashboard": "Poista näkymä",
         "RemoveDashboardConfirm": "Haluatko varmasti poistaa työpöydän \"%s\"?",
         "RenameDashboard": "Uudelleenimeä näkymä",
diff --git a/plugins/Dashboard/lang/fr.json b/plugins/Dashboard/lang/fr.json
index 4705a96ab7..a885ad897a 100644
--- a/plugins/Dashboard/lang/fr.json
+++ b/plugins/Dashboard/lang/fr.json
@@ -18,7 +18,7 @@
         "Maximise": "Maximiser",
         "Minimise": "Minimiser",
         "NotUndo": "Vous ne pourrez pas annuler cette action.",
-        "PluginDescription": "Votre tableau de bord de statistiques web. Vous pouvez personnaliser votre tableau de bord: ajoutez de nouveaux widgets, changez l'ordre de vos widgets. Chaque utilisateur peut accéder à son propre tableau de bord.",
+        "PluginDescription": "Votre tableau de bord, personnalisez le en ajoutant des widgets, en les déplaçant et en modifiant la disposition des colonnes. Chaque utilisateur possède son propre tableau de bord.",
         "RemoveDashboard": "Supprimer le tableau de bord",
         "RemoveDashboardConfirm": "Êtes vous sûr(e) de vouloir supprimer le tableau de bord \"%s\" ?",
         "RenameDashboard": "Renommer le tableau de bord",
diff --git a/plugins/Dashboard/lang/he.json b/plugins/Dashboard/lang/he.json
index 04709861d4..0de36a1ab0 100644
--- a/plugins/Dashboard/lang/he.json
+++ b/plugins/Dashboard/lang/he.json
@@ -9,7 +9,6 @@
         "LoadingWidget": "טוען יישומון, נא להמתין...",
         "ManageDashboard": "ניהול לוח בקרה",
         "Maximise": "הגדלה",
-        "PluginDescription": "סקירה כללית של ניתוח פעילות אתרך. ניתן להתאים אישית את פאנל הסקירה: הוספת יישומונים, שינוי סדר הופעתם. כל משתמש יכול לגש ללוח סקירה כללית משל עצמו.",
         "RenameDashboard": "שינוי שם לוח בקרה",
         "SelectWidget": "בחירת היישומון להוספה לפאנל הסקירה",
         "WidgetNotFound": "יישומון לא נמצא",
diff --git a/plugins/Dashboard/lang/hi.json b/plugins/Dashboard/lang/hi.json
index 1623a710b2..8c618f305c 100644
--- a/plugins/Dashboard/lang/hi.json
+++ b/plugins/Dashboard/lang/hi.json
@@ -18,7 +18,6 @@
         "Maximise": "अधिकतम",
         "Minimise": "कम से कम",
         "NotUndo": "आप इस कार्रवाई को पूर्ववत् करने सक्षम नहीं होंगे.",
-        "PluginDescription": "आपका वेब विश्लेषिकी डैशबोर्ड. आप अपने डैशबोर्ड को अनुकूलित कर सकते हैं:, नए विगेट्स जोड़ने अपने विगेट्स के क्रम बदल सकते हैं. प्रत्येक उपयोगकर्ता के लिए अपने स्वयं के विशेष डैशबोर्ड का उपयोग कर सकते हैं.",
         "RemoveDashboard": "डैशबोर्ड को हटाएँ",
         "RemoveDashboardConfirm": "आप सुनिश्चित कर रहे हैं, आप \"%s\" डैशबोर्ड को हटाना चाहते हैं?",
         "RenameDashboard": "डैशबोर्ड का नाम बदलें",
diff --git a/plugins/Dashboard/lang/hr.json b/plugins/Dashboard/lang/hr.json
index f63aa4956f..e48b79ac44 100644
--- a/plugins/Dashboard/lang/hr.json
+++ b/plugins/Dashboard/lang/hr.json
@@ -9,7 +9,6 @@
         "ManageDashboard": "Manage dashboard",
         "Maximise": "Uvečaj",
         "Minimise": "Smanji",
-        "PluginDescription": "Vaša kontrolna ploča analize posjete stranice. Možete podesiti nadzornu ploču: dodavanje novih widgeta, mijenjati redoslijed vaših widgeta. Svaki korisnik može pristupiti vlastitoj prilagođenoj nadzornoj ploči.",
         "RemoveDashboard": "Ukloni kontrolnu ploču",
         "RenameDashboard": "Preimenuj kontrolnu ploču",
         "SelectWidget": "Odaberi widget za dodati na kontrolnu ploču",
diff --git a/plugins/Dashboard/lang/hu.json b/plugins/Dashboard/lang/hu.json
index 1b68b58b98..9b974e3bc1 100644
--- a/plugins/Dashboard/lang/hu.json
+++ b/plugins/Dashboard/lang/hu.json
@@ -6,7 +6,6 @@
         "LoadingWidget": "Modul betöltése folyamatban. Kérjük, várj…",
         "Maximise": "Maximalizál",
         "Minimise": "Minimalizál",
-        "PluginDescription": "Webanalitikai vezérlőpultod. Állítsd be ízlésednek megfelelően a saját vezérlőpultod: adj hozzá újabb modulokat vagy változtasd meg azok sorrendjét. Minden felhasználónak saját egyéni vezérlőpultja van.",
         "SelectWidget": "Válaszd ki melyik modult szeretnéd hozzáadni a vezérlőpulthoz!",
         "WidgetNotFound": "A modul nem található",
         "WidgetPreview": "Modul előnézete"
diff --git a/plugins/Dashboard/lang/id.json b/plugins/Dashboard/lang/id.json
index 92e1838c4d..aa027aab1d 100644
--- a/plugins/Dashboard/lang/id.json
+++ b/plugins/Dashboard/lang/id.json
@@ -18,7 +18,6 @@
         "Maximise": "Maksimalkan",
         "Minimise": "Minimalkan",
         "NotUndo": "Anda tak dapat mengembalikan tidakan ini.",
-        "PluginDescription": "Panel Kendali Analisis Ramatraya Anda. Anda dapat meneyesuaikan Panel Kendali Anda: menambah gawit baru, mengubah urutan gawit Anda. Setiap pengguna dapat mengakses Panel Kendali miliknya sendiri.",
         "RemoveDashboard": "Hapus panel kendali",
         "RemoveDashboardConfirm": "Apakah Anda yakin ingin menghapus panel kendali \"%s\"?",
         "RenameDashboard": "Ubah nama panel kendali",
diff --git a/plugins/Dashboard/lang/is.json b/plugins/Dashboard/lang/is.json
index 0401080fc0..7da8b94672 100644
--- a/plugins/Dashboard/lang/is.json
+++ b/plugins/Dashboard/lang/is.json
@@ -5,7 +5,6 @@
         "DeleteWidgetConfirm": "Ertu viss um að þú viljir eyða þessum aukahlut af skjáborðinu.",
         "LoadingWidget": "Hleð inn aukahlut, vinsamlegast bíðið...",
         "Maximise": "Hámarka",
-        "PluginDescription": "Vefgreiningarskjáborðið þitt. Þú getur sérsniðið skjáborðið þitt: bætt við nýjum aukahlutum, breytt uppröðun aukahluta. Sérhver notandi hefur aðgang að sínu eigin sérsniðna skjáborði.",
         "SelectWidget": "Veldu aukahlutinn til að bæta við skjáborðið",
         "WidgetNotFound": "Aukahlutur fannst ekki",
         "WidgetPreview": "Forskoðun á aukahlut"
diff --git a/plugins/Dashboard/lang/it.json b/plugins/Dashboard/lang/it.json
index 664af8b32a..d8f2702148 100644
--- a/plugins/Dashboard/lang/it.json
+++ b/plugins/Dashboard/lang/it.json
@@ -18,7 +18,7 @@
         "Maximise": "Massimizza",
         "Minimise": "Minimizza",
         "NotUndo": "Non sarà possibile annullare questa operazione.",
-        "PluginDescription": "La tua Dashboard di Web Analytics. Puoi personalizzare la TUA Dashboard: puoi aggiungere nuovi widget e cambiarne l'ordine.Ogni utente può accedere alla propria Dashboard personalizzata.",
+        "PluginDescription": "La tua Dashboard delle Statistiche Web. Personalizzala aggiungendo nuovi widgets, trascinandoli e spostandoli e cambiando l'aspetto delle colonne della dashboard. Ciascun utente può gestire una propria dashboard.",
         "RemoveDashboard": "Rimuovi il pannello",
         "RemoveDashboardConfirm": "Sei sicuro di voler rimuovere il pannello \"%s\"?",
         "RenameDashboard": "Rinomina il pannello",
diff --git a/plugins/Dashboard/lang/ja.json b/plugins/Dashboard/lang/ja.json
index 2cd56101d8..80a180ebad 100644
--- a/plugins/Dashboard/lang/ja.json
+++ b/plugins/Dashboard/lang/ja.json
@@ -18,7 +18,6 @@
         "Maximise": "最大化",
         "Minimise": "最小化",
         "NotUndo": "この操作は取り消せません。",
-        "PluginDescription": "ウェブ解析のダッシュボードです。 新しいウィジェットを追加したり、ウィジェットの並び順を変更することで、あなたのダッシュボードをカスタマイズすることができます。 各ユーザーは、ユーザー自身のカスタムダッシュボードにアクセスすることができます。",
         "RemoveDashboard": "ダッシュボードの削除",
         "RemoveDashboardConfirm": "本当にダッシュボード \"%s\" を削除しますか？",
         "RenameDashboard": "ダッシュボードの名称変更",
diff --git a/plugins/Dashboard/lang/ka.json b/plugins/Dashboard/lang/ka.json
index ee4bc8ab1d..223b610fdd 100644
--- a/plugins/Dashboard/lang/ka.json
+++ b/plugins/Dashboard/lang/ka.json
@@ -5,7 +5,6 @@
         "DeleteWidgetConfirm": "დარწმუნებული ხართ, რომ გსურთ ვიჯეტის წაშლა ინსრუმენტთა პანელიდან?",
         "LoadingWidget": "ვიჯეტი იტვირთება, გთხოვთ დაიცადოთ...",
         "Maximise": "მაქსიმალურად გადიდება",
-        "PluginDescription": "თქვენი ვებ ანალიტიკოსის ინსტრუმენტთა პანელი. თქვენ შეგიძლიათ სურვილისამებრ მოაწყოთ თქვენი ინსტრუმენტთა პანელი: დაამატოთ ახალი ვიჯეტები, შეცვალოთ თქვენი ვიჯეტების თანმიმდევრობა. თითოეულ მომხმარებელს შეუძლია ისარგებლოს თავისი მოწყობილი ინსტრუმენტთა პანელით.",
         "SelectWidget": "შეარჩიეთ საინფორმაციო დაფაზე დასამატებელი ვიჯეტი",
         "WidgetNotFound": "ვიჯეტი არ მოიძებნა",
         "WidgetPreview": "ვიჯეტის ნახვა"
diff --git a/plugins/Dashboard/lang/ko.json b/plugins/Dashboard/lang/ko.json
index 92fbc5c515..eef6be6704 100644
--- a/plugins/Dashboard/lang/ko.json
+++ b/plugins/Dashboard/lang/ko.json
@@ -18,7 +18,6 @@
         "Maximise": "최대화",
         "Minimise": "최소화",
         "NotUndo": "이 작업은 취소할 수 없습니다.",
-        "PluginDescription": "웹 분석 대시보드입니다. 새로운 위젯을 추가하거나 위젯의 순서를 변경하여, 당신의 대시보드를 변경할 수 있습니다. 각 사용자마다 자신이 개별적으로 정의한 대시보드를 사용합니다.",
         "RemoveDashboard": "대시보드 삭제",
         "RemoveDashboardConfirm": "정말 대시보드 \"%s\"를 삭제 하시겠습니까?",
         "RenameDashboard": "대시보드 이름 변경",
diff --git a/plugins/Dashboard/lang/lt.json b/plugins/Dashboard/lang/lt.json
index 46287b4058..c19fe2928a 100644
--- a/plugins/Dashboard/lang/lt.json
+++ b/plugins/Dashboard/lang/lt.json
@@ -5,7 +5,6 @@
         "DeleteWidgetConfirm": "Ar tikrai norite pašalinti šį valdiklį iš skydelio?",
         "LoadingWidget": "Įkeliamas valdiklis, luktelėkite...",
         "Maximise": "Padidinti",
-        "PluginDescription": "Jūsų žiniatinklio analizės sprendimo skydelis. Galite pritaikyti skydelį savo poreikiams: pridėti naujų valdiklių, pakeisti jų išdėstymo tvarką. Kiekvienas naudotojas gali susikurti savo asmeninį skydelį.",
         "SelectWidget": "Pasirinkite valdiklį, kurį norite įdėti į skydelį",
         "WidgetNotFound": "Valdiklis nerastas",
         "WidgetPreview": "Valdiklio peržiūra"
diff --git a/plugins/Dashboard/lang/lv.json b/plugins/Dashboard/lang/lv.json
index b6b0bc576c..0367ed07df 100644
--- a/plugins/Dashboard/lang/lv.json
+++ b/plugins/Dashboard/lang/lv.json
@@ -6,7 +6,6 @@
         "LoadingWidget": "Notiek logdaļas ielāde, lūdzu uzgaidiet...",
         "Maximise": "Izvērst",
         "Minimise": "Samazināt",
-        "PluginDescription": "Jūsu tīkla analīzes panelis. Jūs varat pielāgot savu paneli pievienojot logdaļas vai mainot to izkārtojumu. Katram lietotājam var būt savs, pielāgots panelis.",
         "SelectWidget": "Izvēlieties to logdaļu, kuru vēlaties pievienot panelim",
         "WidgetNotFound": "Logdaļa nav atrasta",
         "WidgetPreview": "Logdaļas priekšstatījums"
diff --git a/plugins/Dashboard/lang/nb.json b/plugins/Dashboard/lang/nb.json
index 7be38115ae..a990295713 100644
--- a/plugins/Dashboard/lang/nb.json
+++ b/plugins/Dashboard/lang/nb.json
@@ -11,7 +11,6 @@
         "ManageDashboard": "Administrer oversikt",
         "Maximise": "Maksimer",
         "Minimise": "Minimer",
-        "PluginDescription": "Ditt nettanalyse-oversikt. Du kan tilpasse oversiktspanelet: Legge til nye element, endre rekkefølgene for dine element. Hver bruker kan tilpasse sitt eget oversiktspanel.",
         "RenameDashboard": "Gi nytt navn på oversiktspanelet",
         "ResetDashboard": "Nullstill oversikt",
         "SelectWidget": "Velg hvilket element som du vil legge til oversiktspanelet.",
diff --git a/plugins/Dashboard/lang/nl.json b/plugins/Dashboard/lang/nl.json
index d4cd8ae3a7..46b16edd81 100644
--- a/plugins/Dashboard/lang/nl.json
+++ b/plugins/Dashboard/lang/nl.json
@@ -18,7 +18,6 @@
         "Maximise": "Maximaliseer",
         "Minimise": "Minimaliseer",
         "NotUndo": "U kunt deze verwijdering niet meer ongedaan maken.",
-        "PluginDescription": "Uw Web analyze Dashboard. U kunt uw dashboard aanpassen: nieuwe widgets toevoegen of de volgorde aanpassen. Iedere gebruiker heeft toegang tot zijn eigen Dashboard",
         "RemoveDashboard": "Verwijder dashboard",
         "RemoveDashboardConfirm": "Weet u zeker dat u het dashboard \"%s\" wilt verwijderen?",
         "RenameDashboard": "Hernoem dashboard",
diff --git a/plugins/Dashboard/lang/nn.json b/plugins/Dashboard/lang/nn.json
index 6da8a4e7a8..4468cd34d5 100644
--- a/plugins/Dashboard/lang/nn.json
+++ b/plugins/Dashboard/lang/nn.json
@@ -16,7 +16,6 @@
         "Maximise": "Maksimer",
         "Minimise": "Minimer",
         "NotUndo": "Du kan ikkje angra denne handlinga.",
-        "PluginDescription": "Nettstatistikk-styringspanelet ditt. Du kan tilpassa styringspanelet ditt: leggja til nye småprogram, endra rekkjefølgja på småprogramma dine. Kvar brukar har sitt eige styringspanel.",
         "RemoveDashboard": "Fjern styringspanel",
         "RemoveDashboardConfirm": "Er du sikker på at du vil fjerna styringspanelet \"%s\"?",
         "RenameDashboard": "Lag nytt namn på styringspanel",
diff --git a/plugins/Dashboard/lang/pl.json b/plugins/Dashboard/lang/pl.json
index a1ce14e297..9b939e3d80 100644
--- a/plugins/Dashboard/lang/pl.json
+++ b/plugins/Dashboard/lang/pl.json
@@ -18,7 +18,6 @@
         "Maximise": "Maksymalizuj",
         "Minimise": "Minimalizacja",
         "NotUndo": "Nie będziesz mógł cofnąć tej operacji.",
-        "PluginDescription": "Tablica analityki. Możesz skonfigurować swoją tablicę tak jak zaplanujesz: możesz dodać nowe widżety, zmienić porządek ich wyświetlania. Każdy z uprawnionych użytkowników może posiadać własną zindywidualizowaną tablicę statystyk.",
         "RemoveDashboard": "Usuń tablicę analiz",
         "RemoveDashboardConfirm": "Czy jesteś pewny, że chcesz usunąć panel \"%s\"?",
         "RenameDashboard": "Zmień nawę tablicy analiz",
diff --git a/plugins/Dashboard/lang/pt-br.json b/plugins/Dashboard/lang/pt-br.json
index 46365db16a..4222299c12 100644
--- a/plugins/Dashboard/lang/pt-br.json
+++ b/plugins/Dashboard/lang/pt-br.json
@@ -18,7 +18,6 @@
         "Maximise": "Maximizar",
         "Minimise": "Minimizar",
         "NotUndo": "Você não será capaz de desfazer esta operação.",
-        "PluginDescription": "Seu painel de ferramentas",
         "RemoveDashboard": "Remover painel",
         "RemoveDashboardConfirm": "Tem certeza de que deseja remover o painel \"%s\"?",
         "RenameDashboard": "Renomear painel",
diff --git a/plugins/Dashboard/lang/pt.json b/plugins/Dashboard/lang/pt.json
index 341d26b5e4..370b3d60bf 100644
--- a/plugins/Dashboard/lang/pt.json
+++ b/plugins/Dashboard/lang/pt.json
@@ -6,7 +6,6 @@
         "LoadingWidget": "Carregando widget, por favor aguarde...",
         "Maximise": "Maximizar",
         "Minimise": "Minimizar",
-        "PluginDescription": "O seu Painel de Controlo de Analíticas Web. Pode personalizar o seu Painel de Controlo: adicionar novos widgets, alterar a ordem dos seus widgets. Cada utilizador tem acesso ao seu próprio Painel de Controlo personalizado.",
         "SelectWidget": "Seleccione o widget para adicionar ao painel de controlo",
         "WidgetNotFound": "Widget não encontrado",
         "WidgetPreview": "Pré-visualização do widget"
diff --git a/plugins/Dashboard/lang/ro.json b/plugins/Dashboard/lang/ro.json
index fc1a316892..4d6a339422 100644
--- a/plugins/Dashboard/lang/ro.json
+++ b/plugins/Dashboard/lang/ro.json
@@ -18,7 +18,6 @@
         "Maximise": "Maximizează",
         "Minimise": "Minimizează",
         "NotUndo": "Nu o să poţi revoca acestă operaţie.",
-        "PluginDescription": "Panoul tău de control. Poţi personaliza panoul tău de control: adaugă noi widget-uri, schimbă ordinea widget-urilor. Fiecare utilizator îşi poate accesa panoul său de control personalizat.",
         "RemoveDashboard": "Şterge panoul de control",
         "RemoveDashboardConfirm": "Eşti sigur(ă) că vrei să ştergi panoul de control \"%s\"?",
         "RenameDashboard": "Redenumeşte panoul de control",
diff --git a/plugins/Dashboard/lang/ru.json b/plugins/Dashboard/lang/ru.json
index da99f31e3f..2fc4d95824 100644
--- a/plugins/Dashboard/lang/ru.json
+++ b/plugins/Dashboard/lang/ru.json
@@ -12,13 +12,12 @@
         "DashboardOf": "Панель инструментов %s",
         "DefaultDashboard": "Панель инструментов по умолчанию использует набор виджетов и расположение колонок по умолчанияю.",
         "DeleteWidgetConfirm": "Вы уверены, что хотите удалить этот виджет с информационной панели?",
-        "EmptyDashboard": "Пустая панель инструментов - выберите ваши любимые виджеты",
+        "EmptyDashboard": "Пустая панель инструментов – выберите ваши любимые виджеты",
         "LoadingWidget": "Загрузка виджета, пожалуйста подождите...",
         "ManageDashboard": "Настройки панели инструментов",
         "Maximise": "Развернуть",
         "Minimise": "Свернуть",
         "NotUndo": "Данная операция не обратима.",
-        "PluginDescription": "Информационно-аналитическая панель. Вы можете ее настроить по своему усмотрению: добавить новые виджеты, изменить их порядок и количество. Каждый пользователь может иметь доступ только к своей панели инструментов.",
         "RemoveDashboard": "Удалить панель инструментов",
         "RemoveDashboardConfirm": "Вы уверены, что хотите удалить эту панель инструментов: '%s'?",
         "RenameDashboard": "Переименовать панель инструментов",
@@ -29,7 +28,7 @@
         "SetAsDefaultWidgets": "Установить набор виджетов по умолчанию",
         "SetAsDefaultWidgetsConfirm": "Вы уверены, что хотите установить текущий набор виджетов панели как набор виджетов по умолчанию?",
         "SetAsDefaultWidgetsConfirmHelp": "Выбор виджетов и расположение колонок панели инструменто будет использоваться, когда пользователь создает новую панель инструментов или когда используется '%s'.",
-        "TopLinkTooltip": "Смотреть отчет веб-аналитики за %s.",
+        "TopLinkTooltip": "Посмотреть отчет веб-аналитики для %s.",
         "WidgetNotFound": "Виджет не найден",
         "WidgetPreview": "Предпросмотр виджета",
         "WidgetsAndDashboard": "Виджеты и панель инструментов"
diff --git a/plugins/Dashboard/lang/sk.json b/plugins/Dashboard/lang/sk.json
index 331966cfdd..458eadb9a7 100644
--- a/plugins/Dashboard/lang/sk.json
+++ b/plugins/Dashboard/lang/sk.json
@@ -5,7 +5,6 @@
         "Dashboard": "Nástenka",
         "DeleteWidgetConfirm": "Ste si istý, že chcete odstrániť miniaplikáciu z panela?",
         "LoadingWidget": "Načítavanie miniaplikácie, prosím čakajte…",
-        "PluginDescription": "Váš Web Analytická Nástenka. Môžete si prisp§sobiť Vašu nástenku: Pridať nový nástroj, zmeniť poradie vašich nástrojov. Každý používateľ môže mať prístup k jeho vlastnej nástenke.",
         "SelectWidget": "Vyberte miniaplikáciu, ktorá sa pridá na panel",
         "WidgetNotFound": "Miniaplikácia nebola nájdená",
         "WidgetPreview": "Náhľad na miniaplikáciu"
diff --git a/plugins/Dashboard/lang/sl.json b/plugins/Dashboard/lang/sl.json
index c6853c6954..47ba6b6c28 100644
--- a/plugins/Dashboard/lang/sl.json
+++ b/plugins/Dashboard/lang/sl.json
@@ -10,7 +10,6 @@
         "Maximise": "Povečaj",
         "Minimise": "Pomanjšaj",
         "NotUndo": "Te operacije ne bo mogoče razveljaviti.",
-        "PluginDescription": "Nadzorna plošča vaše spletne analitike. Nadzorno ploščo lahko prilagajate: dodajate nove gradnike, spreminjate njihov vrstni red. Vsak uporabnik lahko dostopa do svoje lastne kontrolne plošče.",
         "ResetDashboard": "Ponastavi kontrolno ploščo",
         "ResetDashboardConfirm": "Ste prepričani da želite ponastaviti postavitev kontrolne plošče na privzeti izbor gradnikov?",
         "SelectDashboardLayout": "Prosimo, izberite vašo novo postavitev nadzorne plošče",
diff --git a/plugins/Dashboard/lang/sq.json b/plugins/Dashboard/lang/sq.json
index 080b40ebb3..ebff5ec850 100644
--- a/plugins/Dashboard/lang/sq.json
+++ b/plugins/Dashboard/lang/sq.json
@@ -8,7 +8,6 @@
         "LoadingWidget": "\"Widget\"-i po ngarkohet, ju lutem prisni...",
         "Maximise": "Maksimizoje",
         "Minimise": "Minimizoje",
-        "PluginDescription": "Pulti Juaj Për Analiza Web. Pultin Tuaj mund ta personalizoni: shtoni \"widget\"-e të rinj, ndryshoni radhën e \"widget\"-eve tuaja. Çdo përdorues mund të hyjë te Pulti i tij i personalizuar.",
         "ResetDashboard": "Riktheje pultin te parazgjedhjet",
         "ResetDashboardConfirm": "Doni vërtet ta riktheni skemën e pultit tuaj te përzgjedhja parazgjedhje për Widget-et?",
         "SelectDashboardLayout": "Ju lutem, përzgjidhni skemën e re për pultin tuaj",
diff --git a/plugins/Dashboard/lang/sr.json b/plugins/Dashboard/lang/sr.json
index 24e334adb8..5c7e242f2c 100644
--- a/plugins/Dashboard/lang/sr.json
+++ b/plugins/Dashboard/lang/sr.json
@@ -18,7 +18,6 @@
         "Maximise": "Povećaj",
         "Minimise": "Smanji",
         "NotUndo": "Nećete moći da poništite ovu operaciju",
-        "PluginDescription": "Vaša Konzola za web analitiku. Ovde možete personalizovati vašu Konzolu: dodajte vidžete ili im izmenite redosled. Svaki korisnik ima sopstvenu Konzolu.",
         "RemoveDashboard": "Ukloni konzolu",
         "RemoveDashboardConfirm": "Da li ste sigurni da želite da uklonite konzolu \"%s\"?",
         "RenameDashboard": "Promena naziva",
diff --git a/plugins/Dashboard/lang/sv.json b/plugins/Dashboard/lang/sv.json
index 07d78a81e6..2b3993adb7 100644
--- a/plugins/Dashboard/lang/sv.json
+++ b/plugins/Dashboard/lang/sv.json
@@ -18,7 +18,6 @@
         "Maximise": "Maximera",
         "Minimise": "Minimera",
         "NotUndo": "Du kommer inte kunna ångra den här åtgärden.",
-        "PluginDescription": "Din Webbanalys Instrumentpanel. Du kan anpassa din instrumentpanel: lägg till nya widgets, ändra ordningen på dina widgets. Varje användare har tillgång till sin egen anpassade instrumentpanel.",
         "RemoveDashboard": "Ta bort instrumentpanel",
         "RemoveDashboardConfirm": "Vill du verkligen radera instrumentpanelen \"%s\"?",
         "RenameDashboard": "Byt namn på instrumentpanelen",
diff --git a/plugins/Dashboard/lang/ta.json b/plugins/Dashboard/lang/ta.json
index da7e7eac56..ae971ea6c5 100644
--- a/plugins/Dashboard/lang/ta.json
+++ b/plugins/Dashboard/lang/ta.json
@@ -15,7 +15,6 @@
         "Maximise": "பெருப்பிக்க",
         "Minimise": "சிறியதாக்க",
         "NotUndo": "உங்களால் இந்த செயற்பாட்டை மீள பின்நோக்கி நகர்த்த முடியாது",
-        "PluginDescription": "உங்கள் வலை பகுப்பாய்வு முகப்புப்பலகை. உங்கள் விருப்பத்திற்கேற்றார்ப்போல் மாற்றியமைக்கலாம்: புதிய விட்ஜெட்டுகளை சேர்க்க, விட்ஜெட்டுகளின் வரிசையை மாற்றியமைக்கவும். ஒவ்வொரு பயனாளரும் அவரின் தனிப்பட்ட முகப்புப்பலகையை அணுகமுடியும்.",
         "RemoveDashboard": "கட்டுப்பாட்டறை அமைப்புபை நீக்க",
         "RemoveDashboardConfirm": "நீங்கள் உறுதியாக முகப்புப்பலகை \"%s\" -ஐ நீக்கச்சொல்கிறீர்களா?",
         "RenameDashboard": "கட்டுப்பாட்டறை அமைப்புபின் பெயரை மாற்ற",
diff --git a/plugins/Dashboard/lang/th.json b/plugins/Dashboard/lang/th.json
index 359bf59b93..6732cca81c 100644
--- a/plugins/Dashboard/lang/th.json
+++ b/plugins/Dashboard/lang/th.json
@@ -15,7 +15,6 @@
         "Maximise": "มากที่สุด",
         "Minimise": "น้อยที่สุด",
         "NotUndo": "คุณจะไม่สามารถย้อนกลับไปดำเนินการในส่วนนี้ได้อีก",
-        "PluginDescription": "แผงควบคุมของการวิเคราะห์เว็บไซต์ คุณสามารถกำหนดเองของคุณกระดาน: เพิ่มเครื่องมือใหม่ เปลี่ยนลำดับของเครื่องมือของคุณได้ แต่ละผู้ใช้สามารถเข้าถึงกระดานข้อมูลแบบกำหนดเองของเขาเอง",
         "RemoveDashboard": "ลบกระดานหลักออก",
         "RemoveDashboardConfirm": "คุณแน่ใจแล้วหรือว่าต้องการลบกระดานหลัก \"%s\" นี้ทิ้งไป?",
         "RenameDashboard": "เปลี่ยนชื่อกระดานหลัก",
diff --git a/plugins/Dashboard/lang/tl.json b/plugins/Dashboard/lang/tl.json
index 9b7be58310..975bff1016 100644
--- a/plugins/Dashboard/lang/tl.json
+++ b/plugins/Dashboard/lang/tl.json
@@ -18,7 +18,6 @@
         "Maximise": "I-maximise",
         "Minimise": "I-minimise",
         "NotUndo": "Hindi mo magagawang i-undo ang operasyon na ito.",
-        "PluginDescription": "Ang iyong Web Analytics Dashboard. Maaari mong i-customize ang iyong Dashboard: magdagdag ng mga bagong widget baguhin ang ayos ng iyong widget. Bawat user ay maaring i-access ang kanyang sariling custom Dashboard.",
         "RemoveDashboard": "Alisin dashboard",
         "RemoveDashboardConfirm": "Sigurado ko bang gusto mong tanggalin ang dashboard \"%s\"?",
         "RenameDashboard": "Palitan ang pangalan ng dashboard",
diff --git a/plugins/Dashboard/lang/tr.json b/plugins/Dashboard/lang/tr.json
index b15e924158..dad1786a7c 100644
--- a/plugins/Dashboard/lang/tr.json
+++ b/plugins/Dashboard/lang/tr.json
@@ -17,7 +17,6 @@
         "Maximise": "Maksimize",
         "Minimise": "Küçült",
         "NotUndo": "Bu eylemi geri alamazsınız.",
-        "PluginDescription": "Web istatistik panonuz. Panonuzu özelleştirebilirsiniz: yeni widget ekleyebilir, bileşen ayarlarınızı değiştirebilirsiniz. Her kullanıcı kendi panosuna ulaşır.",
         "RemoveDashboard": "Paneli kaldır",
         "RemoveDashboardConfirm": "\"%s\" panelini kaldırmak istediğinize emin misiniz?",
         "RenameDashboard": "Panel yeniden adlandır",
diff --git a/plugins/Dashboard/lang/uk.json b/plugins/Dashboard/lang/uk.json
index 43a180a20c..5b2d6ba172 100644
--- a/plugins/Dashboard/lang/uk.json
+++ b/plugins/Dashboard/lang/uk.json
@@ -5,7 +5,6 @@
         "DeleteWidgetConfirm": "Видалити цей віджет з панелі керування?",
         "LoadingWidget": "Завантаження віджету, зачекайте...",
         "Maximise": "Розгорнути",
-        "PluginDescription": "Панель Керування Веб-аналітикою. Ви можете адаптувати Панель Керування: додати нові віджети, змінити порядок відображення віджетів. Кожен користувач може мати Панель Керування на свій смак.",
         "SelectWidget": "Оберіть віджет для розміщення в панелі керування",
         "WidgetNotFound": "Віджет не знайдено",
         "WidgetPreview": "Перегляд віджету"
diff --git a/plugins/Dashboard/lang/vi.json b/plugins/Dashboard/lang/vi.json
index b72175e61c..25f151e55b 100644
--- a/plugins/Dashboard/lang/vi.json
+++ b/plugins/Dashboard/lang/vi.json
@@ -18,7 +18,6 @@
         "Maximise": "Tối đa hóa",
         "Minimise": "Tối thiểu hóa",
         "NotUndo": "Bạn sẽ không thể lùi lại hoạt động này",
-        "PluginDescription": "Bảng điều khiển Web Analytics của bạn. Bạn có thể tùy chỉnh Bảng điều khiển của bạn: thêm các widget mới, thay đổi thứ tự của các widget của bạn. Mỗi người dùng có thể truy cập vào Bảng điều khiển tùy chỉnh của riêng mình.",
         "RemoveDashboard": "Loại bỏ bảng điều khiển",
         "RemoveDashboardConfirm": "Bạn có chắc chắn muốn loại bỏ bảng điều khiển \"%s\"?",
         "RenameDashboard": "Đổi tên bảng điều khiển",
diff --git a/plugins/Dashboard/lang/zh-cn.json b/plugins/Dashboard/lang/zh-cn.json
index 31f5e96a98..ab39a0614f 100644
--- a/plugins/Dashboard/lang/zh-cn.json
+++ b/plugins/Dashboard/lang/zh-cn.json
@@ -18,7 +18,6 @@
         "Maximise": "最大化",
         "Minimise": "最小化",
         "NotUndo": "此操作不可撤消。",
-        "PluginDescription": "您的网站分析面板。您可以定制报表面板: 增加新的小工具、修改小工具排序。每位用户都可以使用他们自定义的报表面板。",
         "RemoveDashboard": "删除面板",
         "RemoveDashboardConfirm": "确认要删除面板\"%s\"吗?",
         "RenameDashboard": "重命名面板",
diff --git a/plugins/Dashboard/lang/zh-tw.json b/plugins/Dashboard/lang/zh-tw.json
index cb4575c15c..e3aeb210c2 100644
--- a/plugins/Dashboard/lang/zh-tw.json
+++ b/plugins/Dashboard/lang/zh-tw.json
@@ -5,7 +5,6 @@
         "DeleteWidgetConfirm": "您確定要從展示板中刪除此組件嗎？",
         "LoadingWidget": "載入組件中，請稍候...",
         "ManageDashboard": "展示板管理",
-        "PluginDescription": "你的網站分析控制台。你可以自動你的控制台：新增新的模組、變更你的模組排序。每位使用者可以存取他們自訂的控制台。",
         "ResetDashboard": "重置展示板",
         "SelectWidget": "請選取欲增加至展示板的組件",
         "WidgetNotFound": "找不到組件",
diff --git a/plugins/Dashboard/stylesheets/dashboard.less b/plugins/Dashboard/stylesheets/dashboard.less
index 4bba174dd2..57a916c010 100644
--- a/plugins/Dashboard/stylesheets/dashboard.less
+++ b/plugins/Dashboard/stylesheets/dashboard.less
@@ -72,7 +72,7 @@
 }
 
 .widget {
-  background: #fff;
+  background: @theme-color-background-base;
   border: 1px solid #bbb6ad;
   margin: 10px 7px;
   border-radius: 4px;
@@ -96,6 +96,8 @@
 .widgetContent.hidden {
   position: absolute;
   top: -5000px;
+  height: 1000px;
+  overflow: hidden;
 }
 
 .widgetContent.loading {
@@ -103,12 +105,6 @@
   background: url(plugins/Morpheus/images/loading-blue.gif) no-repeat top right;
 }
 
-.widget h2 {
-  font-size: 1.2em;
-  margin-left: 10px;
-  font-weight: bold;
-}
-
 .widget p {
   margin-left: 10px;
 }
@@ -116,25 +112,32 @@
 .widgetTop {
   cursor: move;
   font-size: 10pt;
-  font-weight: bold;
+  font-weight: normal;
   padding-bottom: 4px;
 }
 
 .widgetTopHover {
 }
 
-.widgetName {
-  font-size: 18px;
-  padding: 2px 0 0 10px;
+h3.widgetName {
+  font-size: 15px;
+  padding: 0px;
+  margin: 0px;
   font-weight: normal;
-  color: #fff;
-  text-shadow: 1px 1px 2px #7e7363;
+  color: #0D0D0D;
+  text-shadow: none;
+}
+
+.widgetNameOffScreen {
+  overflow: hidden;
+  width:1px;
+  height:1px;
 }
 
 // Overriding some dataTable css for better dashboard display
 .widget .dataTableWrapper {
   width: 100% !important;
-}
+  }
 
 .widgetTop .button {
   cursor: pointer;
@@ -145,7 +148,7 @@
 .ui-confirm {
   display: none;
   width: 630px;
-  background: #fff;
+  background: @theme-color-background-base;
   color: @theme-color-text-light;
   cursor: default;
   font-size: 12px !important;
diff --git a/plugins/Dashboard/templates/_widgetFactoryTemplate.twig b/plugins/Dashboard/templates/_widgetFactoryTemplate.twig
index bbbad28274..0d5b0d6154 100644
--- a/plugins/Dashboard/templates/_widgetFactoryTemplate.twig
+++ b/plugins/Dashboard/templates/_widgetFactoryTemplate.twig
@@ -13,10 +13,14 @@
       <div class="button" id="refresh">
         <img src="plugins/Morpheus/images/refresh.png" title="{{ 'General_Refresh'|translate }}" />
       </div>
-      <div class="widgetName">{% if widgetName is defined %}{{ widgetName }}{% endif %}</div>
+      <h3 class="widgetName">{% if widgetName is defined %}{{ widgetName }}{% endif %}
+        <div class="widgetNameOffScreen">
+          {{ 'General_Widget'|translate }}
+        </div>
+      </h3>
     </div>
     <div class="widgetContent">
       <div class="widgetLoading">{{ 'Dashboard_LoadingWidget'|translate }}</div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/plugins/DevicePlugins/API.php b/plugins/DevicePlugins/API.php
new file mode 100644
index 0000000000..c49839e8ae
--- /dev/null
+++ b/plugins/DevicePlugins/API.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\DevicePlugins;
+
+use Piwik\Archive;
+use Piwik\DataTable;
+use Piwik\Metrics;
+use Piwik\Piwik;
+use Piwik\Plugins\DevicesDetection\Archiver AS DDArchiver;
+use Piwik\Plugins\CoreHome\Columns\Metrics\VisitsPercent;
+
+/**
+ * @see plugins/DevicePlugins/functions.php
+ */
+require_once PIWIK_INCLUDE_PATH . '/plugins/DevicePlugins/functions.php';
+
+/**
+ * The DevicePlugins API lets you access reports about device plugins such as browser plugins.
+ *
+ * @method static \Piwik\Plugins\DevicePlugins\API getInstance()
+ */
+class API extends \Piwik\Plugin\API
+{
+    protected function getDataTable($name, $idSite, $period, $date, $segment)
+    {
+        Piwik::checkUserHasViewAccess($idSite);
+        $archive = Archive::build($idSite, $period, $date, $segment);
+        $dataTable = $archive->getDataTable($name);
+        $dataTable->filter('Sort', array(Metrics::INDEX_NB_VISITS));
+        $dataTable->queueFilter('ReplaceColumnNames');
+        $dataTable->queueFilter('ReplaceSummaryRowLabel');
+        return $dataTable;
+    }
+
+    public function getPlugin($idSite, $period, $date, $segment = false)
+    {
+        // fetch all archive data required
+        $dataTable = $this->getDataTable(Archiver::PLUGIN_RECORD_NAME, $idSite, $period, $date, $segment);
+        $browserTypes = $this->getDataTable(DDArchiver::BROWSER_ENGINE_RECORD_NAME, $idSite, $period, $date, $segment);
+        $archive = Archive::build($idSite, $period, $date, $segment);
+        $visitsSums = $archive->getDataTableFromNumeric('nb_visits');
+
+        // check whether given tables are arrays
+        if ($dataTable instanceof DataTable\Map) {
+            $dataTableMap = $dataTable->getDataTables();
+            $browserTypesArray = $browserTypes->getDataTables();
+            $visitSumsArray = $visitsSums->getDataTables();
+        } else {
+            $dataTableMap = array($dataTable);
+            $browserTypesArray = array($browserTypes);
+            $visitSumsArray = array($visitsSums);
+        }
+
+        // walk through the results and calculate the percentage
+        foreach ($dataTableMap as $key => $table) {
+            // Calculate percentage, but ignore IE users because plugin detection doesn't work on IE
+            $ieVisits = 0;
+
+            $ieStats = $browserTypesArray[$key]->getRowFromLabel('Trident');
+            if ($ieStats !== false) {
+                $ieVisits = $ieStats->getColumn(Metrics::INDEX_NB_VISITS);
+            }
+
+            // get according visitsSum
+            $visits = $visitSumsArray[$key];
+            if ($visits->getRowsCount() == 0) {
+                $visitsSumTotal = 0;
+            } else {
+                $visitsSumTotal = (float) $visits->getFirstRow()->getColumn('nb_visits');
+            }
+
+            $visitsSum = $visitsSumTotal - $ieVisits;
+
+            $extraProcessedMetrics = $table->getMetadata(DataTable::EXTRA_PROCESSED_METRICS_METADATA_NAME);
+            $extraProcessedMetrics[] = new VisitsPercent($visitsSum);
+            $table->setMetadata(DataTable::EXTRA_PROCESSED_METRICS_METADATA_NAME, $extraProcessedMetrics);
+        }
+
+        $dataTable->queueFilter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getPluginsLogo'));
+        $dataTable->queueFilter('ColumnCallbackReplace', array('label', 'ucfirst'));
+
+        return $dataTable;
+    }
+}
diff --git a/plugins/DevicePlugins/Archiver.php b/plugins/DevicePlugins/Archiver.php
new file mode 100644
index 0000000000..1b4b92213e
--- /dev/null
+++ b/plugins/DevicePlugins/Archiver.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\DevicePlugins;
+
+use Piwik\DataAccess\LogAggregator;
+use Piwik\DataTable;
+use Piwik\Metrics;
+
+require_once PIWIK_INCLUDE_PATH . '/plugins/DevicePlugins/functions.php';
+
+/**
+ * Archiver for DevicePlugins Plugin
+ *
+ * @see PluginsArchiver
+ */
+class Archiver extends \Piwik\Plugin\Archiver
+{
+    const PLUGIN_RECORD_NAME = 'DevicePlugins_plugin';
+
+    /**
+     * Daily archive of DevicePlugins report. Processes reports for Visits by plugins.
+     */
+    public function aggregateDayReport()
+    {
+        $this->aggregateByPlugin();
+    }
+
+    /**
+     * Period archiving: simply sums up daily archives
+     */
+    public function aggregateMultipleReports()
+    {
+        $dataTableRecords = array(
+            self::PLUGIN_RECORD_NAME,
+        );
+        $this->getProcessor()->aggregateDataTableRecords($dataTableRecords, $this->maximumRows);
+    }
+
+    protected function aggregateByPlugin()
+    {
+        $selects = array(
+            "sum(case log_visit.config_pdf when 1 then 1 else 0 end) as pdf",
+            "sum(case log_visit.config_flash when 1 then 1 else 0 end) as flash",
+            "sum(case log_visit.config_java when 1 then 1 else 0 end) as java",
+            "sum(case log_visit.config_director when 1 then 1 else 0 end) as director",
+            "sum(case log_visit.config_quicktime when 1 then 1 else 0 end) as quicktime",
+            "sum(case log_visit.config_realplayer when 1 then 1 else 0 end) as realplayer",
+            "sum(case log_visit.config_windowsmedia when 1 then 1 else 0 end) as windowsmedia",
+            "sum(case log_visit.config_gears when 1 then 1 else 0 end) as gears",
+            "sum(case log_visit.config_silverlight when 1 then 1 else 0 end) as silverlight",
+            "sum(case log_visit.config_cookie when 1 then 1 else 0 end) as cookie"
+        );
+
+        $query = $this->getLogAggregator()->queryVisitsByDimension(array(), false, $selects, $metrics = array());
+        $data = $query->fetch();
+        $cleanRow = LogAggregator::makeArrayOneColumn($data, Metrics::INDEX_NB_VISITS);
+        $table = DataTable::makeFromIndexedArray($cleanRow);
+        $this->insertTable(self::PLUGIN_RECORD_NAME, $table);
+    }
+
+    protected function insertTable($recordName, DataTable $table)
+    {
+        $report = $table->getSerialized($this->maximumRows, null, Metrics::INDEX_NB_VISITS);
+        return $this->getProcessor()->insertBlobRecord($recordName, $report);
+    }
+
+}
+
diff --git a/plugins/DevicePlugins/Columns/Plugin.php b/plugins/DevicePlugins/Columns/Plugin.php
new file mode 100644
index 0000000000..0066c5ce19
--- /dev/null
+++ b/plugins/DevicePlugins/Columns/Plugin.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\DevicePlugins\Columns;
+
+use Piwik\Columns\Dimension;
+use Piwik\Piwik;
+
+class Plugin extends Dimension
+{
+    public function getName()
+    {
+        return Piwik::translate('General_Plugin');
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/Columns/PluginCookie.php b/plugins/DevicePlugins/Columns/PluginCookie.php
new file mode 100644
index 0000000000..935bd24333
--- /dev/null
+++ b/plugins/DevicePlugins/Columns/PluginCookie.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\DevicePlugins\Columns;
+
+use Piwik\Common;
+use Piwik\Plugin\Dimension\VisitDimension;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\Visitor;
+use Piwik\Tracker\Action;
+
+class PluginCookie extends VisitDimension
+{
+    protected $columnName = 'config_cookie';
+    protected $columnType = 'TINYINT(1) NOT NULL';
+
+    /**
+     * @param Request $request
+     * @param Visitor $visitor
+     * @param Action|null $action
+     * @return mixed
+     */
+    public function onNewVisit(Request $request, Visitor $visitor, $action)
+    {
+        return Common::getRequestVar('cookie', 0, 'int', $request->getParams());
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/Columns/PluginDirector.php b/plugins/DevicePlugins/Columns/PluginDirector.php
new file mode 100644
index 0000000000..4e5b82d2fd
--- /dev/null
+++ b/plugins/DevicePlugins/Columns/PluginDirector.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\DevicePlugins\Columns;
+
+use Piwik\Common;
+use Piwik\Plugin\Dimension\VisitDimension;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\Visitor;
+use Piwik\Tracker\Action;
+
+class PluginDirector extends VisitDimension
+{
+    protected $columnName = 'config_director';
+    protected $columnType = 'TINYINT(1) NOT NULL';
+
+    /**
+     * @param Request $request
+     * @param Visitor $visitor
+     * @param Action|null $action
+     * @return mixed
+     */
+    public function onNewVisit(Request $request, Visitor $visitor, $action)
+    {
+        return Common::getRequestVar('dir', 0, 'int', $request->getParams());
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/Columns/PluginFlash.php b/plugins/DevicePlugins/Columns/PluginFlash.php
new file mode 100644
index 0000000000..70d9bbfe83
--- /dev/null
+++ b/plugins/DevicePlugins/Columns/PluginFlash.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\DevicePlugins\Columns;
+
+use Piwik\Common;
+use Piwik\Plugin\Dimension\VisitDimension;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\Visitor;
+use Piwik\Tracker\Action;
+
+class PluginFlash extends VisitDimension
+{
+    protected $columnName = 'config_flash';
+    protected $columnType = 'TINYINT(1) NOT NULL';
+
+    /**
+     * @param Request $request
+     * @param Visitor $visitor
+     * @param Action|null $action
+     * @return mixed
+     */
+    public function onNewVisit(Request $request, Visitor $visitor, $action)
+    {
+        return Common::getRequestVar('fla', 0, 'int', $request->getParams());
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/Columns/PluginGears.php b/plugins/DevicePlugins/Columns/PluginGears.php
new file mode 100644
index 0000000000..8d0584a937
--- /dev/null
+++ b/plugins/DevicePlugins/Columns/PluginGears.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\DevicePlugins\Columns;
+
+use Piwik\Common;
+use Piwik\Plugin\Dimension\VisitDimension;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\Visitor;
+use Piwik\Tracker\Action;
+
+class PluginGears extends VisitDimension
+{
+    protected $columnName = 'config_gears';
+    protected $columnType = 'TINYINT(1) NOT NULL';
+
+    /**
+     * @param Request $request
+     * @param Visitor $visitor
+     * @param Action|null $action
+     * @return mixed
+     */
+    public function onNewVisit(Request $request, Visitor $visitor, $action)
+    {
+        return Common::getRequestVar('gears', 0, 'int', $request->getParams());
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/Columns/PluginJava.php b/plugins/DevicePlugins/Columns/PluginJava.php
new file mode 100644
index 0000000000..9b316fda83
--- /dev/null
+++ b/plugins/DevicePlugins/Columns/PluginJava.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\DevicePlugins\Columns;
+
+use Piwik\Common;
+use Piwik\Plugin\Dimension\VisitDimension;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\Visitor;
+use Piwik\Tracker\Action;
+
+class PluginJava extends VisitDimension
+{
+    protected $columnName = 'config_java';
+    protected $columnType = 'TINYINT(1) NOT NULL';
+
+    /**
+     * @param Request $request
+     * @param Visitor $visitor
+     * @param Action|null $action
+     * @return mixed
+     */
+    public function onNewVisit(Request $request, Visitor $visitor, $action)
+    {
+        return Common::getRequestVar('java', 0, 'int', $request->getParams());
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/Columns/PluginPdf.php b/plugins/DevicePlugins/Columns/PluginPdf.php
new file mode 100644
index 0000000000..4f637e6d79
--- /dev/null
+++ b/plugins/DevicePlugins/Columns/PluginPdf.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\DevicePlugins\Columns;
+
+use Piwik\Common;
+use Piwik\Plugin\Dimension\VisitDimension;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\Visitor;
+use Piwik\Tracker\Action;
+
+class PluginPdf extends VisitDimension
+{
+    protected $columnName = 'config_pdf';
+    protected $columnType = 'TINYINT(1) NOT NULL';
+
+    /**
+     * @param Request $request
+     * @param Visitor $visitor
+     * @param Action|null $action
+     * @return mixed
+     */
+    public function onNewVisit(Request $request, Visitor $visitor, $action)
+    {
+        return Common::getRequestVar('pdf', 0, 'int', $request->getParams());
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/Columns/PluginQuickTime.php b/plugins/DevicePlugins/Columns/PluginQuickTime.php
new file mode 100644
index 0000000000..9f74f0191d
--- /dev/null
+++ b/plugins/DevicePlugins/Columns/PluginQuickTime.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\DevicePlugins\Columns;
+
+use Piwik\Common;
+use Piwik\Plugin\Dimension\VisitDimension;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\Visitor;
+use Piwik\Tracker\Action;
+
+class PluginQuickTime extends VisitDimension
+{
+    protected $columnName = 'config_quicktime';
+    protected $columnType = 'TINYINT(1) NOT NULL';
+
+    /**
+     * @param Request $request
+     * @param Visitor $visitor
+     * @param Action|null $action
+     * @return mixed
+     */
+    public function onNewVisit(Request $request, Visitor $visitor, $action)
+    {
+        return Common::getRequestVar('qt', 0, 'int', $request->getParams());
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/Columns/PluginRealPlayer.php b/plugins/DevicePlugins/Columns/PluginRealPlayer.php
new file mode 100644
index 0000000000..902bac086b
--- /dev/null
+++ b/plugins/DevicePlugins/Columns/PluginRealPlayer.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\DevicePlugins\Columns;
+
+use Piwik\Common;
+use Piwik\Plugin\Dimension\VisitDimension;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\Visitor;
+use Piwik\Tracker\Action;
+
+class PluginRealPlayer extends VisitDimension
+{
+    protected $columnName = 'config_realplayer';
+    protected $columnType = 'TINYINT(1) NOT NULL';
+
+    /**
+     * @param Request $request
+     * @param Visitor $visitor
+     * @param Action|null $action
+     * @return mixed
+     */
+    public function onNewVisit(Request $request, Visitor $visitor, $action)
+    {
+        return Common::getRequestVar('realp', 0, 'int', $request->getParams());
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/Columns/PluginSilverlight.php b/plugins/DevicePlugins/Columns/PluginSilverlight.php
new file mode 100644
index 0000000000..a9381a35ee
--- /dev/null
+++ b/plugins/DevicePlugins/Columns/PluginSilverlight.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\DevicePlugins\Columns;
+
+use Piwik\Common;
+use Piwik\Plugin\Dimension\VisitDimension;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\Visitor;
+use Piwik\Tracker\Action;
+
+class PluginSilverlight extends VisitDimension
+{
+    protected $columnName = 'config_silverlight';
+    protected $columnType = 'TINYINT(1) NOT NULL';
+
+    /**
+     * @param Request $request
+     * @param Visitor $visitor
+     * @param Action|null $action
+     * @return mixed
+     */
+    public function onNewVisit(Request $request, Visitor $visitor, $action)
+    {
+        return Common::getRequestVar('ag', 0, 'int', $request->getParams());
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/Columns/PluginWindowsMedia.php b/plugins/DevicePlugins/Columns/PluginWindowsMedia.php
new file mode 100644
index 0000000000..3ae32f8ab3
--- /dev/null
+++ b/plugins/DevicePlugins/Columns/PluginWindowsMedia.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\DevicePlugins\Columns;
+
+use Piwik\Common;
+use Piwik\Plugin\Dimension\VisitDimension;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\Visitor;
+use Piwik\Tracker\Action;
+
+class PluginWindowsMedia extends VisitDimension
+{
+    protected $columnName = 'config_windowsmedia';
+    protected $columnType = 'TINYINT(1) NOT NULL';
+
+    /**
+     * @param Request $request
+     * @param Visitor $visitor
+     * @param Action|null $action
+     * @return mixed
+     */
+    public function onNewVisit(Request $request, Visitor $visitor, $action)
+    {
+        return Common::getRequestVar('wma', 0, 'int', $request->getParams());
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/DevicePlugins.php b/plugins/DevicePlugins/DevicePlugins.php
new file mode 100644
index 0000000000..afe8abf950
--- /dev/null
+++ b/plugins/DevicePlugins/DevicePlugins.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\DevicePlugins;
+
+use Piwik\Piwik;
+use Piwik\Plugins\CoreVisualizations\Visualizations\Graph;
+use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable;
+
+/**
+ *
+ */
+class DevicePlugins extends \Piwik\Plugin
+{
+    /**
+     * @see Piwik\Plugin::getListHooksRegistered
+     */
+    public function getListHooksRegistered()
+    {
+        return array(
+            'Metrics.getDefaultMetricTranslations' => 'addMetricTranslations',
+            'Live.getAllVisitorDetails'            => 'extendVisitorDetails',
+        );
+    }
+
+    public function extendVisitorDetails(&$visitor, $details)
+    {
+        $instance = new Visitor($details);
+
+        $visitor['plugins']                  = $instance->getPlugins();
+        $visitor['pluginsIcons']             = $instance->getPluginIcons();
+    }
+
+    public function addMetricTranslations(&$translations)
+    {
+        $metrics = array(
+            'nb_visits_percentage' => Piwik::translate('General_ColumnPercentageVisits')
+        );
+
+        $translations = array_merge($translations, $metrics);
+    }
+
+}
diff --git a/plugins/DevicePlugins/Reports/Base.php b/plugins/DevicePlugins/Reports/Base.php
new file mode 100644
index 0000000000..81116f4d1d
--- /dev/null
+++ b/plugins/DevicePlugins/Reports/Base.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\DevicePlugins\Reports;
+
+use Piwik\Plugin\ViewDataTable;
+use Piwik\Plugins\CoreVisualizations\Visualizations\Graph;
+
+abstract class Base extends \Piwik\Plugin\Report
+{
+    protected function init()
+    {
+        $this->category = 'General_VisitorSettings';
+    }
+
+    protected function getBasicDevicePluginsDisplayProperties(ViewDataTable $view)
+    {
+        $view->config->show_search = false;
+        $view->config->show_exclude_low_population = false;
+
+        $view->requestConfig->filter_limit = 5;
+
+        if ($view->isViewDataTableId(Graph::ID)) {
+            $view->config->max_graph_elements = 5;
+        }
+    }
+}
diff --git a/plugins/DevicePlugins/Reports/GetPlugin.php b/plugins/DevicePlugins/Reports/GetPlugin.php
new file mode 100644
index 0000000000..151bf3e1a6
--- /dev/null
+++ b/plugins/DevicePlugins/Reports/GetPlugin.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\DevicePlugins\Reports;
+
+use Piwik\Piwik;
+use Piwik\Plugin\ViewDataTable;
+use Piwik\Plugins\DevicePlugins\Columns\Plugin;
+
+class GetPlugin extends Base
+{
+    protected function init()
+    {
+        parent::init();
+        $this->dimension     = new Plugin();
+        $this->name          = Piwik::translate('DevicePlugins_WidgetPlugins');
+        $this->documentation = Piwik::translate('DevicePlugins_WidgetPluginsDocumentation', '<br />');
+        $this->metrics       = array('nb_visits');
+        $this->constantRowsCount = true;
+        $this->processedMetrics = array('nb_visits_percentage');
+        $this->order = 4;
+        $this->widgetTitle  = 'DevicePlugins_WidgetPlugins';
+    }
+
+    public function configureView(ViewDataTable $view)
+    {
+        $this->getBasicDevicePluginsDisplayProperties($view);
+
+        $view->config->addTranslations(array(
+            'label'                => $this->dimension->getName(),
+            'nb_visits_percentage' =>
+            str_replace(' ', '&nbsp;', Piwik::translate('General_ColumnPercentageVisits'))
+        ));
+
+        $view->config->show_offset_information = false;
+        $view->config->show_pagination_control = false;
+        $view->config->show_limit_control      = false;
+        $view->config->show_all_views_icons    = false;
+        $view->config->show_table_all_columns  = false;
+        $view->config->columns_to_display  = array('label', 'nb_visits_percentage', 'nb_visits');
+        $view->config->show_footer_message = Piwik::translate('DevicePlugins_PluginDetectionDoesNotWorkInIE');
+
+        $view->requestConfig->filter_sort_column = 'nb_visits_percentage';
+        $view->requestConfig->filter_sort_order  = 'desc';
+        $view->requestConfig->filter_limit       = 10;
+    }
+
+}
diff --git a/plugins/DevicePlugins/Visitor.php b/plugins/DevicePlugins/Visitor.php
new file mode 100644
index 0000000000..501e241a50
--- /dev/null
+++ b/plugins/DevicePlugins/Visitor.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\DevicePlugins;
+
+require_once PIWIK_INCLUDE_PATH . '/plugins/DevicePlugins/functions.php';
+
+class Visitor
+{
+    const DELIMITER_PLUGIN_NAME = ", ";
+
+    private $details = array();
+
+    public function __construct($details)
+    {
+        $this->details = $details;
+    }
+
+    function getPlugins()
+    {
+        $plugins = array(
+            'config_pdf',
+            'config_flash',
+            'config_java',
+            'config_director',
+            'config_quicktime',
+            'config_realplayer',
+            'config_windowsmedia',
+            'config_gears',
+            'config_silverlight',
+        );
+        $pluginShortNames = array();
+
+        foreach ($plugins as $plugin) {
+            if (array_key_exists($plugin, $this->details) && $this->details[$plugin] == 1) {
+                $pluginShortName    = substr($plugin, 7);
+                $pluginShortNames[] = $pluginShortName;
+            }
+        }
+
+        return implode(self::DELIMITER_PLUGIN_NAME, $pluginShortNames);
+    }
+
+    function getPluginIcons()
+    {
+        $pluginNames = $this->getPlugins();
+        if (!empty($pluginNames)) {
+            $pluginNames = explode(self::DELIMITER_PLUGIN_NAME, $pluginNames);
+            $pluginIcons = array();
+
+            foreach ($pluginNames as $plugin) {
+                $pluginIcons[] = array("pluginIcon" => getPluginsLogo($plugin), "pluginName" => $plugin);
+            }
+
+            return $pluginIcons;
+        }
+
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/functions.php b/plugins/DevicePlugins/functions.php
new file mode 100644
index 0000000000..4cf77ab120
--- /dev/null
+++ b/plugins/DevicePlugins/functions.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\DevicePlugins;
+
+use Piwik\Piwik;
+
+function getPluginsLogo($label)
+{
+    if ($label == Piwik::translate('General_Others')) {
+        return false;
+    }
+    return 'plugins/DevicePlugins/images/plugins/' . $label . '.gif';
+}
diff --git a/plugins/UserSettings/images/plugins/cookie.gif b/plugins/DevicePlugins/images/plugins/cookie.gif
index b2dba70a34..b2dba70a34 100644
--- a/plugins/UserSettings/images/plugins/cookie.gif
+++ b/plugins/DevicePlugins/images/plugins/cookie.gif
diff --git a/plugins/UserSettings/images/plugins/director.gif b/plugins/DevicePlugins/images/plugins/director.gif
index aa77c91cdc..aa77c91cdc 100644
--- a/plugins/UserSettings/images/plugins/director.gif
+++ b/plugins/DevicePlugins/images/plugins/director.gif
diff --git a/plugins/UserSettings/images/plugins/flash.gif b/plugins/DevicePlugins/images/plugins/flash.gif
index d96f58166e..d96f58166e 100644
--- a/plugins/UserSettings/images/plugins/flash.gif
+++ b/plugins/DevicePlugins/images/plugins/flash.gif
diff --git a/plugins/UserSettings/images/plugins/gears.gif b/plugins/DevicePlugins/images/plugins/gears.gif
index 4767112184..4767112184 100644
--- a/plugins/UserSettings/images/plugins/gears.gif
+++ b/plugins/DevicePlugins/images/plugins/gears.gif
diff --git a/plugins/UserSettings/images/plugins/java.gif b/plugins/DevicePlugins/images/plugins/java.gif
index 1606c5f2f7..1606c5f2f7 100644
--- a/plugins/UserSettings/images/plugins/java.gif
+++ b/plugins/DevicePlugins/images/plugins/java.gif
diff --git a/plugins/UserSettings/images/plugins/pdf.gif b/plugins/DevicePlugins/images/plugins/pdf.gif
index 810f75d2bc..810f75d2bc 100644
--- a/plugins/UserSettings/images/plugins/pdf.gif
+++ b/plugins/DevicePlugins/images/plugins/pdf.gif
diff --git a/plugins/UserSettings/images/plugins/quicktime.gif b/plugins/DevicePlugins/images/plugins/quicktime.gif
index cefbbafbb6..cefbbafbb6 100644
--- a/plugins/UserSettings/images/plugins/quicktime.gif
+++ b/plugins/DevicePlugins/images/plugins/quicktime.gif
diff --git a/plugins/UserSettings/images/plugins/realplayer.gif b/plugins/DevicePlugins/images/plugins/realplayer.gif
index 2ed04565ab..2ed04565ab 100644
--- a/plugins/UserSettings/images/plugins/realplayer.gif
+++ b/plugins/DevicePlugins/images/plugins/realplayer.gif
diff --git a/plugins/UserSettings/images/plugins/silverlight.gif b/plugins/DevicePlugins/images/plugins/silverlight.gif
index 2a3a35cacb..2a3a35cacb 100644
--- a/plugins/UserSettings/images/plugins/silverlight.gif
+++ b/plugins/DevicePlugins/images/plugins/silverlight.gif
diff --git a/plugins/UserSettings/images/plugins/windowsmedia.gif b/plugins/DevicePlugins/images/plugins/windowsmedia.gif
index 92e72c9006..92e72c9006 100644
--- a/plugins/UserSettings/images/plugins/windowsmedia.gif
+++ b/plugins/DevicePlugins/images/plugins/windowsmedia.gif
diff --git a/plugins/DevicePlugins/lang/am.json b/plugins/DevicePlugins/lang/am.json
new file mode 100644
index 0000000000..7024f45788
--- /dev/null
+++ b/plugins/DevicePlugins/lang/am.json
@@ -0,0 +1,5 @@
+{
+    "DevicePlugins": {
+        "WidgetPlugins": "የተሰኪዎች ዝርዝር"
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/ar.json b/plugins/DevicePlugins/lang/ar.json
new file mode 100644
index 0000000000..c0e62aa58f
--- /dev/null
+++ b/plugins/DevicePlugins/lang/ar.json
@@ -0,0 +1,6 @@
+{
+    "DevicePlugins": {
+        "PluginDetectionDoesNotWorkInIE": "ملاحظة: اكتشاف الإضافات البرمجية لا تعمل في متصفح إنترنت إكسبلورر. هذه الخاصية ترتكز للمتصفحات من العائلات الأخرى غير إنترنت إكسبلورر.",
+        "WidgetPlugins": "قائمة الإضافات"
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/be.json b/plugins/DevicePlugins/lang/be.json
new file mode 100644
index 0000000000..82f75389a6
--- /dev/null
+++ b/plugins/DevicePlugins/lang/be.json
@@ -0,0 +1,7 @@
+{
+    "DevicePlugins": {
+        "PluginDetectionDoesNotWorkInIE": "Заўважце: Плагіны не вызначаюцца ў Internet Explorer. Гэта справаздача заснавана на не-IE браўзарах.",
+        "WidgetPlugins": "Спіс плагінаў",
+        "WidgetPluginsDocumentation": "Гэтая справаздача паказвае, якія плагіны были ўключаны ў браўзэраў Вашых наведвальнікаў. Гэтая інфармацыя можа мець важнае значэнне для выбару правільнага спосабу дастаўкі кантэнту."
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/bg.json b/plugins/DevicePlugins/lang/bg.json
new file mode 100644
index 0000000000..12e47992f6
--- /dev/null
+++ b/plugins/DevicePlugins/lang/bg.json
@@ -0,0 +1,9 @@
+{
+    "DevicePlugins": {
+        "BrowserWithNoPluginsEnabled": "%1$s без активни добавки",
+        "BrowserWithPluginsEnabled": "%1$s с добавки %2$s активиран",
+        "PluginDetectionDoesNotWorkInIE": "Забележка: Засичането на добавки не работи при Internet Explorer. Този доклад е базиран само на браузъри, различни от IE.",
+        "WidgetPlugins": "Добавки",
+        "WidgetPluginsDocumentation": "Този отчет показва каква добавка на браузъра са използвали вашите посетители. Тази информация може да е важна, за да изберете правилния начин за доставяне на вашето съдържание."
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/ca.json b/plugins/DevicePlugins/lang/ca.json
new file mode 100644
index 0000000000..8ea7576c7c
--- /dev/null
+++ b/plugins/DevicePlugins/lang/ca.json
@@ -0,0 +1,7 @@
+{
+    "DevicePlugins": {
+        "PluginDetectionDoesNotWorkInIE": "Nota: La detecció d'extensions no funciona amb Internet Explorer. L'informe es basa nomes amb navegadors diferents de l'Internet Explorer",
+        "WidgetPlugins": "Llistat de connectors",
+        "WidgetPluginsDocumentation": "Aquest informe mostra quines extensions tenen els vostres visitants activades. Aquesta informació pot ser important per determinar la forma correcta de mostrar el contingut."
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/cs.json b/plugins/DevicePlugins/lang/cs.json
new file mode 100644
index 0000000000..759e2e487c
--- /dev/null
+++ b/plugins/DevicePlugins/lang/cs.json
@@ -0,0 +1,10 @@
+{
+    "DevicePlugins": {
+        "BrowserWithNoPluginsEnabled": "%1$s bez povolených zásuvných modulů",
+        "BrowserWithPluginsEnabled": "%1$s s povolenými zásuvnými moduly %2$s",
+        "PluginDescription": "Hlásí podporované zásuvné moduly v prohlížečích návštěvníků.",
+        "PluginDetectionDoesNotWorkInIE": "Poznámka: Detekce zásuvných modulů nepracuje v prohlížeči Interet Explorer. Toto hlášení je založeno na ostatních prohlížečích",
+        "WidgetPlugins": "Seznam zásuvných modulů",
+        "WidgetPluginsDocumentation": "Toto hlášení zobrazuje zásuvné moduly, které měli vaši návštěvníci povoleny. Tato informace může být důležitá při rozhodování o tom, jakým způsobem prezentovat obsah."
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/da.json b/plugins/DevicePlugins/lang/da.json
new file mode 100644
index 0000000000..13f09e4e7a
--- /dev/null
+++ b/plugins/DevicePlugins/lang/da.json
@@ -0,0 +1,9 @@
+{
+    "DevicePlugins": {
+        "BrowserWithNoPluginsEnabled": "%1$s med ingen aktiverede udvidelsesmoduler",
+        "BrowserWithPluginsEnabled": "%1$s med udvidelsesmoduler %2$s aktiveret",
+        "PluginDetectionDoesNotWorkInIE": "Note: Udvidelsesmodul detektering virker ikke i Internet Explorer. Rapport viser kun ikke-IE browsere.",
+        "WidgetPlugins": "Udvidelsesmoduler",
+        "WidgetPluginsDocumentation": "Rapporten viser, hvilke browserudvidelser de besøgende havde aktiveret. Oplysningerne kan være vigtigt for at vælge den rigtige måde at levere indholdet på."
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/de.json b/plugins/DevicePlugins/lang/de.json
new file mode 100644
index 0000000000..be7bca8f58
--- /dev/null
+++ b/plugins/DevicePlugins/lang/de.json
@@ -0,0 +1,10 @@
+{
+    "DevicePlugins": {
+        "BrowserWithNoPluginsEnabled": "%1$s mit keinen aktivierten Plugins",
+        "BrowserWithPluginsEnabled": "%1$s mit den Plugins %2$s aktiviert",
+        "PluginDescription": "Zeigt die Liste der Plugins an, welche in den Browsern der Benutzer unterstützt werden.",
+        "PluginDetectionDoesNotWorkInIE": "Hinweis: Die Erkennung von Plugins funktioniert nicht im Internet Explorer. Diese Statistik beruht nur auf Nicht-IE Browsern.",
+        "WidgetPlugins": "Liste der Plugins",
+        "WidgetPluginsDocumentation": "Dieser Bericht zeigt Ihnen, welche Plugins Ihre Besucher in Ihren Browser aktiviert haben. Diese Informationen kann Ihnen dabei helfen, die beste Art zu finden, Ihre Inhalte auszuliefern."
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/el.json b/plugins/DevicePlugins/lang/el.json
new file mode 100644
index 0000000000..a9ae56efba
--- /dev/null
+++ b/plugins/DevicePlugins/lang/el.json
@@ -0,0 +1,10 @@
+{
+    "DevicePlugins": {
+        "BrowserWithNoPluginsEnabled": "%1$s με ανενεργά πρόσθετα",
+        "BrowserWithPluginsEnabled": "%1$s με %2$s πρόσθετα ενεργά",
+        "PluginDescription": "Αναφέρει τη λίστα με τα πρόσθετα που υποστηρίζουν τα προγράμματα πλοήγησης των επισκεπτών.",
+        "PluginDetectionDoesNotWorkInIE": "Σημείωση: η ανίχνευση Προσθέτων δεν λειτουργεί στον Internet Explorer. Αυτή η αναφορά βασίζεται μόνο σε μη IE φυλλομετρητές.",
+        "WidgetPlugins": "Λίστα προσθέτων",
+        "WidgetPluginsDocumentation": "Αυτή η αναφορά δείχνει ποια πρόσθετα φυλλομετρητή έχουν ενεργά οι επισκέπτες σας. Αυτή η πληροφορία ίσως είναι σημαντική για την επιλογή του πιο σωστού τρόπου απόδοσης του περιεχομένου σας."
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/en.json b/plugins/DevicePlugins/lang/en.json
new file mode 100644
index 0000000000..92be744c9a
--- /dev/null
+++ b/plugins/DevicePlugins/lang/en.json
@@ -0,0 +1,10 @@
+{
+    "DevicePlugins": {
+        "BrowserWithNoPluginsEnabled": "%1$s with no plugins enabled",
+        "BrowserWithPluginsEnabled": "%1$s with plugins %2$s enabled",
+        "PluginDescription": "Reports the list of plugins that are supported in visitors browsers.",
+        "PluginDetectionDoesNotWorkInIE": "Note: Plugins detection doesn't work in Internet Explorer. This report is only based on non-IE browsers.",
+        "WidgetPlugins": "Browser Plugins",
+        "WidgetPluginsDocumentation": "This report shows which browser plugins your visitors had enabled. This information might be important for choosing the right way to deliver your content."
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/es.json b/plugins/DevicePlugins/lang/es.json
new file mode 100644
index 0000000000..0036691462
--- /dev/null
+++ b/plugins/DevicePlugins/lang/es.json
@@ -0,0 +1,9 @@
+{
+    "DevicePlugins": {
+        "BrowserWithNoPluginsEnabled": "%1$s sin complementos habilitados",
+        "BrowserWithPluginsEnabled": "%1$s con los complementos %2$s habilitados",
+        "PluginDetectionDoesNotWorkInIE": "Nota: la detección de Plugins no funciona con Internet Explorer. Este reporte solo funciona con navegadores no-IE.",
+        "WidgetPlugins": "Lista de Plugins",
+        "WidgetPluginsDocumentation": "Este informe muestra que extensiones del navegador sus visitantes han habilitado. Esta información puede ser importante sea para elegir el método eficiente de enviar su contenido."
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/et.json b/plugins/DevicePlugins/lang/et.json
new file mode 100644
index 0000000000..b6cd3a8379
--- /dev/null
+++ b/plugins/DevicePlugins/lang/et.json
@@ -0,0 +1,6 @@
+{
+    "DevicePlugins": {
+        "PluginDetectionDoesNotWorkInIE": "Märge: Lisatarkvara tuvastamine ei tööta Internet Exploreriga külastajatel. See raport kuvab andmeid mitte-IE veebisirvikute kohta.",
+        "WidgetPlugins": "Sirviku lisatarkvarad"
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/eu.json b/plugins/DevicePlugins/lang/eu.json
new file mode 100644
index 0000000000..ac3dcfee34
--- /dev/null
+++ b/plugins/DevicePlugins/lang/eu.json
@@ -0,0 +1,5 @@
+{
+    "DevicePlugins": {
+        "WidgetPlugins": "Pluginen zerrenda"
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/fa.json b/plugins/DevicePlugins/lang/fa.json
new file mode 100644
index 0000000000..ea9edd5c4c
--- /dev/null
+++ b/plugins/DevicePlugins/lang/fa.json
@@ -0,0 +1,8 @@
+{
+    "DevicePlugins": {
+        "BrowserWithNoPluginsEnabled": "%1$s با هیچ پلاگین را فعال کنید",
+        "PluginDetectionDoesNotWorkInIE": "توجه: تشخیص پلاگین در مرورگر اینترنت اکسپلورر کار نمی کند. این گزارش تنها بر روی مرورگرهای غیر اینترنت اکسپلورر است.",
+        "WidgetPlugins": "لیست افزونه ها",
+        "WidgetPluginsDocumentation": "این گزارش نشان می دهد که پلاگین مرورگر بازدید کننده خود را فعال کرده بود. این اطلاعات ممکن است مهم برای انتخاب راه درست برای ارائه محتوای خود را."
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/fi.json b/plugins/DevicePlugins/lang/fi.json
new file mode 100644
index 0000000000..529fc48f67
--- /dev/null
+++ b/plugins/DevicePlugins/lang/fi.json
@@ -0,0 +1,9 @@
+{
+    "DevicePlugins": {
+        "BrowserWithNoPluginsEnabled": "%1$s ilman liitännäisiä aktivoitu",
+        "BrowserWithPluginsEnabled": "%1$s liitännäisillä %2$s on aktivoitu",
+        "PluginDetectionDoesNotWorkInIE": "Huom: lisäosien tunnistus ei toimi Internet Explorerissa. Tämä raportti perustuu vain ei-IE-selaimiin.",
+        "WidgetPlugins": "Lista lisäosista",
+        "WidgetPluginsDocumentation": "Tämä raportti näyttää, mitä selainlisäosia vierailijoillasi oli käytössä. Tästä tiedosta voi olla hyötyä, kun joudut valitsemaan, miten tietoa esitetään ja välitetään vierailijoille."
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/fr.json b/plugins/DevicePlugins/lang/fr.json
new file mode 100644
index 0000000000..05c67e3f51
--- /dev/null
+++ b/plugins/DevicePlugins/lang/fr.json
@@ -0,0 +1,9 @@
+{
+    "DevicePlugins": {
+        "BrowserWithNoPluginsEnabled": "%1$s avec aucun plugin activé",
+        "BrowserWithPluginsEnabled": "%1$s avec les plugins %2$s activés",
+        "PluginDetectionDoesNotWorkInIE": "Note : La détection des plugins ne fonctionne pas avec Internet Explorer. Ce rapport est basé sur les autres navigateurs.",
+        "WidgetPlugins": "Liste de Plugins",
+        "WidgetPluginsDocumentation": "Ce rapport montre quels plugins du navigateur vos visiteurs ont activés. Cette information peut être importante pour choisir le bon moyen de délivrer le contenu."
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/gl.json b/plugins/DevicePlugins/lang/gl.json
new file mode 100644
index 0000000000..a098f11509
--- /dev/null
+++ b/plugins/DevicePlugins/lang/gl.json
@@ -0,0 +1,5 @@
+{
+    "DevicePlugins": {
+        "WidgetPlugins": "Lista de plugins"
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/hi.json b/plugins/DevicePlugins/lang/hi.json
new file mode 100644
index 0000000000..696fb42938
--- /dev/null
+++ b/plugins/DevicePlugins/lang/hi.json
@@ -0,0 +1,7 @@
+{
+    "DevicePlugins": {
+        "BrowserWithNoPluginsEnabled": "%1$s के साथ प्लगइन सक्रिय नहीं",
+        "BrowserWithPluginsEnabled": "प्लगिन %2$s से %1$s सक्षम",
+        "PluginDetectionDoesNotWorkInIE": "नोट: प्लगइन्स का पता लगाने इंटरनेट एक्सप्लोरर में काम नहीं करता है. यह रिपोर्ट केवल गैर आईई ब्राउज़रों पर आधारित है."
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/hu.json b/plugins/DevicePlugins/lang/hu.json
new file mode 100644
index 0000000000..e68a307f11
--- /dev/null
+++ b/plugins/DevicePlugins/lang/hu.json
@@ -0,0 +1,6 @@
+{
+    "DevicePlugins": {
+        "PluginDetectionDoesNotWorkInIE": "A böngészők bővítményeinek detektálása nem működik az Internet Exlporernél, így ez a jelentés csak a nem Internet Explorert használó látogatók adatait jeleníti meg.",
+        "WidgetPlugins": "Bővítmények listája"
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/id.json b/plugins/DevicePlugins/lang/id.json
new file mode 100644
index 0000000000..4aad881c58
--- /dev/null
+++ b/plugins/DevicePlugins/lang/id.json
@@ -0,0 +1,9 @@
+{
+    "DevicePlugins": {
+        "BrowserWithNoPluginsEnabled": "%1$s dengan tanpa pengaya diaktifkan",
+        "BrowserWithPluginsEnabled": "%1$s dengan %2$s pengaya diaktifkan",
+        "PluginDetectionDoesNotWorkInIE": "Catatan: Pendeteksian pengaya tidak bekerja di Internet Explorer. Laporan ini hanya berdasarkan pada peramban bukan-IE.",
+        "WidgetPlugins": "Daftar Pengaya",
+        "WidgetPluginsDocumentation": "Laporan ini menunjukkan pengaya peramban yang diaktifkan oleh pengunjung. Informasi yang tersedia kemungkinan penting untuk memilih cara terbaik untuk menyampaikan konten Anda."
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/is.json b/plugins/DevicePlugins/lang/is.json
new file mode 100644
index 0000000000..af396fe27e
--- /dev/null
+++ b/plugins/DevicePlugins/lang/is.json
@@ -0,0 +1,6 @@
+{
+    "DevicePlugins": {
+        "PluginDetectionDoesNotWorkInIE": "Ath: uppgötvun á íbótum virkar ekki með Internet Explorer. Þessi skýrsla er aðeins unnin út frá öðrum vöfrum en IE.",
+        "WidgetPlugins": "Listi yfir íbætur"
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/it.json b/plugins/DevicePlugins/lang/it.json
new file mode 100644
index 0000000000..f30e30d19e
--- /dev/null
+++ b/plugins/DevicePlugins/lang/it.json
@@ -0,0 +1,10 @@
+{
+    "DevicePlugins": {
+        "BrowserWithNoPluginsEnabled": "%1$s con nessun plugin abilitato",
+        "BrowserWithPluginsEnabled": "%1$s con plugin %2$s abilitati",
+        "PluginDescription": "Restituisce l'elenco dei plugin supportati dal browser dei visitatori.",
+        "PluginDetectionDoesNotWorkInIE": "N.B.: Questo plugin non funziona su Internet Explorer. Questo report è basato solamente sugli utenti di altri browser.",
+        "WidgetPlugins": "Lista dei Plugin",
+        "WidgetPluginsDocumentation": "Questo report mostra quali plugin del browser i visitatori avevano abilitato. Questa informazione potrebbe essere importante per la scelta del giusto modo di inviare i tuoi contenuti."
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/ja.json b/plugins/DevicePlugins/lang/ja.json
new file mode 100644
index 0000000000..608ed98913
--- /dev/null
+++ b/plugins/DevicePlugins/lang/ja.json
@@ -0,0 +1,9 @@
+{
+    "DevicePlugins": {
+        "BrowserWithNoPluginsEnabled": "%1$s のプラグインが有効ではありません",
+        "BrowserWithPluginsEnabled": "%1$s のプラグイン %2$s は有効",
+        "PluginDetectionDoesNotWorkInIE": "注意： Internet Explorer ではプラグインの検出が動作しません。 このリポートは、非 IE ブラウザのみに基づきます。",
+        "WidgetPlugins": "プラグイン一覧",
+        "WidgetPluginsDocumentation": "ビジターが利用しているブラウザのプラグインについてのリポートです。コンテンツの最適な表示方法を選択するために重要な情報です。"
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/ka.json b/plugins/DevicePlugins/lang/ka.json
new file mode 100644
index 0000000000..2452d64099
--- /dev/null
+++ b/plugins/DevicePlugins/lang/ka.json
@@ -0,0 +1,6 @@
+{
+    "DevicePlugins": {
+        "PluginDetectionDoesNotWorkInIE": "შენიშვნა: პლაგინების ამოცნობა არ ხდება ინტერნეტ ექსპლორერში. ეს რეპორტი მუშაოაბს მხოლოდ არა–IE ბრაუზერებზე.",
+        "WidgetPlugins": "პლაგინების სია"
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/ko.json b/plugins/DevicePlugins/lang/ko.json
new file mode 100644
index 0000000000..35c64c3187
--- /dev/null
+++ b/plugins/DevicePlugins/lang/ko.json
@@ -0,0 +1,7 @@
+{
+    "DevicePlugins": {
+        "PluginDetectionDoesNotWorkInIE": "참고: Internet Explorer에서는 플러그인 검색이 작동하지 않습니다. 이 보고서는 IE 브라우저가 아닌것에 기반합니다.",
+        "WidgetPlugins": "플러그인 목록",
+        "WidgetPluginsDocumentation": "방문자가 사용하는 브라우저의 플러그인에 대한 보고서입니다. 컨텐츠에 대한 최적의 표시 방법을 선택하는 데 중요한 정보입니다."
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/lt.json b/plugins/DevicePlugins/lang/lt.json
new file mode 100644
index 0000000000..12fc5b4d8b
--- /dev/null
+++ b/plugins/DevicePlugins/lang/lt.json
@@ -0,0 +1,6 @@
+{
+    "DevicePlugins": {
+        "PluginDetectionDoesNotWorkInIE": "Pastaba: papildinio aptikimas neveikia Internet Explorer naršyklėje. Ši ataskaita bus sugeneruota tik kitose naršyklėse.",
+        "WidgetPlugins": "Papildinių sąrašas"
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/lv.json b/plugins/DevicePlugins/lang/lv.json
new file mode 100644
index 0000000000..c09ee9a33f
--- /dev/null
+++ b/plugins/DevicePlugins/lang/lv.json
@@ -0,0 +1,7 @@
+{
+    "DevicePlugins": {
+        "PluginDetectionDoesNotWorkInIE": "Piezīme: spraudņu noteikšana nedarbojas Internet Explorer pārlūkā. Šī atskaite ir bāzēta tikai uz ne-IE pārlūkiem.",
+        "WidgetPlugins": "Spraudņu saraksts",
+        "WidgetPluginsDocumentation": "Šajā atskaitē ir redzami pārlūku spraudņi, kuri bija ieslēgti apmeklētāju pārlūkos. Šī informācija ir svarīga, lai izvēlētos vislabāko veidu kā piegādāt saturu apmeklētājiem."
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/nb.json b/plugins/DevicePlugins/lang/nb.json
new file mode 100644
index 0000000000..f7b01e9240
--- /dev/null
+++ b/plugins/DevicePlugins/lang/nb.json
@@ -0,0 +1,5 @@
+{
+    "DevicePlugins": {
+        "WidgetPlugins": "Liste over tillegg"
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/nl.json b/plugins/DevicePlugins/lang/nl.json
new file mode 100644
index 0000000000..f142b6275b
--- /dev/null
+++ b/plugins/DevicePlugins/lang/nl.json
@@ -0,0 +1,9 @@
+{
+    "DevicePlugins": {
+        "BrowserWithNoPluginsEnabled": "%1$s zonder plugins ingeschakeld",
+        "BrowserWithPluginsEnabled": "%1$s met plugins %2$s ingeschakeld",
+        "PluginDetectionDoesNotWorkInIE": "Opmerking: plugin detectie werkt niet in Internet Explorer. Het rapport is alleen gebaseerd op andere browsers dan IE",
+        "WidgetPlugins": "Geïnstalleerde plugins",
+        "WidgetPluginsDocumentation": "Dit rapport laat zien welke browserplugins uw bezoekers haden geïnstalleerd. Deze informatie kan van belang zijn voor het kiezen van de juiste manier om uw content aan te bieden."
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/nn.json b/plugins/DevicePlugins/lang/nn.json
new file mode 100644
index 0000000000..29ffb15b3f
--- /dev/null
+++ b/plugins/DevicePlugins/lang/nn.json
@@ -0,0 +1,6 @@
+{
+    "DevicePlugins": {
+        "PluginDetectionDoesNotWorkInIE": "Merk: Registrering av innstikk virkar ikkje i Internet Explorer. Denne rapporten er berre basert på andre nettlesarar enn IE.",
+        "WidgetPlugins": "Liste over innstikk"
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/pl.json b/plugins/DevicePlugins/lang/pl.json
new file mode 100644
index 0000000000..1efe58f73b
--- /dev/null
+++ b/plugins/DevicePlugins/lang/pl.json
@@ -0,0 +1,6 @@
+{
+    "DevicePlugins": {
+        "PluginDetectionDoesNotWorkInIE": "Uwaga: wykrywanie wtyczek nie działa w przypadku Internet Explorera. Raport ten pokaże tylko wyniki w oparciu o badanie innych przeglądarek, nie opartych na silniku IE.",
+        "WidgetPlugins": "Lista wtyczek"
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/pt-br.json b/plugins/DevicePlugins/lang/pt-br.json
new file mode 100644
index 0000000000..28857e6267
--- /dev/null
+++ b/plugins/DevicePlugins/lang/pt-br.json
@@ -0,0 +1,9 @@
+{
+    "DevicePlugins": {
+        "BrowserWithNoPluginsEnabled": "%1$s sem plugins ativados",
+        "BrowserWithPluginsEnabled": "%1$s com os plugins %2$s ativados",
+        "PluginDetectionDoesNotWorkInIE": "Nota: a detecção de plugins não funciona no Internet Explorer. Esse relatório é baseado apenas em navegadores não IE.",
+        "WidgetPlugins": "Lista de Plugins",
+        "WidgetPluginsDocumentation": "Este relatório mostra quais plugins de navegador seus visitantes tinham ativado. Esta informação pode ser importante para escolher o caminho certo para levar o seu conteúdo."
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/pt.json b/plugins/DevicePlugins/lang/pt.json
new file mode 100644
index 0000000000..9c6ee983ae
--- /dev/null
+++ b/plugins/DevicePlugins/lang/pt.json
@@ -0,0 +1,7 @@
+{
+    "DevicePlugins": {
+        "PluginDetectionDoesNotWorkInIE": "Nota: Detecção de plugins não funciona no Internet Explorer. Este relatório só se baseia em navegadores não-IE.",
+        "WidgetPlugins": "Lista de Plugins",
+        "WidgetPluginsDocumentation": "Este relatório mostra quais os plugin que o navegador dos seus visitantes tinham. Esta informação pode ser importante para a escolha do caminho certo para distribuir o seu conteúdo."
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/ro.json b/plugins/DevicePlugins/lang/ro.json
new file mode 100644
index 0000000000..d8c8b21387
--- /dev/null
+++ b/plugins/DevicePlugins/lang/ro.json
@@ -0,0 +1,9 @@
+{
+    "DevicePlugins": {
+        "BrowserWithNoPluginsEnabled": "%1$s fără plugin-uri activate",
+        "BrowserWithPluginsEnabled": "%1$s cu plugin-uri %2$s activate",
+        "PluginDetectionDoesNotWorkInIE": "Notă: de detectare a plugin-uri nu funcționează în Internet Explorer. Acest raport se bazează doar pe browsere non-IE.",
+        "WidgetPlugins": "Lista pluginurilor",
+        "WidgetPluginsDocumentation": "Acest raport arată ce plugin-uri de browser-ul au activat vizitatorii. Aceste informație ar putea fi importanta pentru a alege modul corect de a livra conținut."
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/ru.json b/plugins/DevicePlugins/lang/ru.json
new file mode 100644
index 0000000000..14dce0cd74
--- /dev/null
+++ b/plugins/DevicePlugins/lang/ru.json
@@ -0,0 +1,7 @@
+{
+    "DevicePlugins": {
+        "PluginDetectionDoesNotWorkInIE": "Учтите: Определение плагинов не работает в Internet Explorer. Этот отчет содержит информацию о не-IE браузерах.",
+        "WidgetPlugins": "Список плагинов",
+        "WidgetPluginsDocumentation": "Этот отчет показывается какие плагины посетители используют в своих браузерах. Эта информация может быть важна для того, чтобы посетители смогли видеть ваш контент должным образом."
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/sk.json b/plugins/DevicePlugins/lang/sk.json
new file mode 100644
index 0000000000..8ef5c5a693
--- /dev/null
+++ b/plugins/DevicePlugins/lang/sk.json
@@ -0,0 +1,6 @@
+{
+    "DevicePlugins": {
+        "PluginDetectionDoesNotWorkInIE": "Poznámka: Plugin detekcia nefunguje v Internet Exploreri. Táto správa je založená len na non-IE prehliadačov.",
+        "WidgetPlugins": "Zoznam modulov"
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/sl.json b/plugins/DevicePlugins/lang/sl.json
new file mode 100644
index 0000000000..1550e85abf
--- /dev/null
+++ b/plugins/DevicePlugins/lang/sl.json
@@ -0,0 +1,7 @@
+{
+    "DevicePlugins": {
+        "BrowserWithNoPluginsEnabled": "%1$s brez omogočenih vtičnikov",
+        "BrowserWithPluginsEnabled": "%1$s z omogočenimi vtičniki %2$s",
+        "WidgetPlugins": "Seznam Vtičnikov"
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/sq.json b/plugins/DevicePlugins/lang/sq.json
new file mode 100644
index 0000000000..1c9ca0ebad
--- /dev/null
+++ b/plugins/DevicePlugins/lang/sq.json
@@ -0,0 +1,7 @@
+{
+    "DevicePlugins": {
+        "PluginDetectionDoesNotWorkInIE": "Shënim: Zbulimi i shtojcave nuk funksionon nën Internet Explorer. Ky raport mund të kihet vetëm nën shfletuesa jo-IE.",
+        "WidgetPlugins": "Listë e Shtojcave",
+        "WidgetPluginsDocumentation": "Ky raport tregon se cilat shtojca shfletuesi kanë të aktivizuara vizitorët tuaj. Ky informacion mund të jetë i vlefshëm për zgjedhjen e mënyrës më të përshtatshme për ofrimin e lëndës suaj."
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/sr.json b/plugins/DevicePlugins/lang/sr.json
new file mode 100644
index 0000000000..07d7e6c81a
--- /dev/null
+++ b/plugins/DevicePlugins/lang/sr.json
@@ -0,0 +1,9 @@
+{
+    "DevicePlugins": {
+        "BrowserWithNoPluginsEnabled": "%1$s sa isključenim dodacima",
+        "BrowserWithPluginsEnabled": "%1$s sa uključenim dodacima %2$s",
+        "PluginDetectionDoesNotWorkInIE": "Pažnja: detekcija dodataka ne radi kod Internet Explorera. Ovaj izveštaj se odnosi samo na brauzere koji nisu Internet Exlorer",
+        "WidgetPlugins": "Lista dodataka",
+        "WidgetPluginsDocumentation": "Ovaj izveštaj prikazuje koje dodatke za brauzere vaši posetioci imaju uključene. Ova informacija može biti od značaja prilikom odabira pravog načina prikaza sadržaja na vašem sajtu."
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/sv.json b/plugins/DevicePlugins/lang/sv.json
new file mode 100644
index 0000000000..d83cd460ee
--- /dev/null
+++ b/plugins/DevicePlugins/lang/sv.json
@@ -0,0 +1,9 @@
+{
+    "DevicePlugins": {
+        "BrowserWithNoPluginsEnabled": "%1$s med inga plugins är aktiverad",
+        "BrowserWithPluginsEnabled": "%1$s med plugins %2$s är aktiverad",
+        "PluginDetectionDoesNotWorkInIE": "Notering: Plugins upptäckt fungerar inte i Internet Explorer. Denna rapport är endast baserad på icke-IE webbläsare.",
+        "WidgetPlugins": "Lista över plugins",
+        "WidgetPluginsDocumentation": "Denna rapport visar vilka plugins i webbläsaren som besökarna hade aktiverat. Denna information kan vara viktig för att välja rätt sätt att leverera ditt innehåll."
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/th.json b/plugins/DevicePlugins/lang/th.json
new file mode 100644
index 0000000000..664c466eb3
--- /dev/null
+++ b/plugins/DevicePlugins/lang/th.json
@@ -0,0 +1,6 @@
+{
+    "DevicePlugins": {
+        "PluginDetectionDoesNotWorkInIE": "หมายเหตุ: ตรวจสอบปลั๊กอินไม่ทำงานใน Internet Explorer รายงานนี้จะอิงตามเฉพาะเบราว์เซอร์ที่ไม่ใช่ IE",
+        "WidgetPlugins": "รายการปลั้กอิน"
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/tl.json b/plugins/DevicePlugins/lang/tl.json
new file mode 100644
index 0000000000..c0ce59acc1
--- /dev/null
+++ b/plugins/DevicePlugins/lang/tl.json
@@ -0,0 +1,9 @@
+{
+    "DevicePlugins": {
+        "BrowserWithNoPluginsEnabled": "%1$s na may plugins na hindi pinapagana",
+        "BrowserWithPluginsEnabled": "%1$s na may mga plugin %2$s na naka-enable",
+        "PluginDetectionDoesNotWorkInIE": "Tandaan: Ang pagtingin ng Plugin ay hindi gumagana sa Internet Explorer. Ang ulat na ito ay batay lamang sa mga browser na hindi-IE.",
+        "WidgetPlugins": "Browser Plugins",
+        "WidgetPluginsDocumentation": "Ang ulat na ito ay ipinapakita kung anong browser plugis ang gumagana sa iyong bisita. Ang impormasyon na ito may maaring mahalaga sa pagpili kung paanu ihahatid ang nilalaman nito."
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/tr.json b/plugins/DevicePlugins/lang/tr.json
new file mode 100644
index 0000000000..94ce8e428e
--- /dev/null
+++ b/plugins/DevicePlugins/lang/tr.json
@@ -0,0 +1,6 @@
+{
+    "DevicePlugins": {
+        "PluginDetectionDoesNotWorkInIE": "Not: Hedeflenen eklenti Internet Explorer çalışmamaktadir. Bu not\/rapor sadece IE içindir.",
+        "WidgetPlugins": "Eklenti Listesi"
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/uk.json b/plugins/DevicePlugins/lang/uk.json
new file mode 100644
index 0000000000..142c1f2e63
--- /dev/null
+++ b/plugins/DevicePlugins/lang/uk.json
@@ -0,0 +1,6 @@
+{
+    "DevicePlugins": {
+        "PluginDetectionDoesNotWorkInIE": "Примітка: Визначення плагінів не працює в Internet Explorer. Цей звіт базується лише на не-IE веб-оглядачах.",
+        "WidgetPlugins": "Список плагінів"
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/vi.json b/plugins/DevicePlugins/lang/vi.json
new file mode 100644
index 0000000000..03098daac0
--- /dev/null
+++ b/plugins/DevicePlugins/lang/vi.json
@@ -0,0 +1,9 @@
+{
+    "DevicePlugins": {
+        "BrowserWithNoPluginsEnabled": "%1$s không có plugin nào được kích hoạt",
+        "BrowserWithPluginsEnabled": "%1$s với plugin %2$s đã kích hoạt",
+        "PluginDetectionDoesNotWorkInIE": "Chú ý: Các Plugin phát hiện không làm việc trên Internet Explorer. Báo cáo này chỉ dựa trên trình duyệt không phải IE.",
+        "WidgetPlugins": "Các Plugin trình duyệt",
+        "WidgetPluginsDocumentation": "Báo cáo này cho thấy các plugin trình duyệt mà khách truy cập của bạn đã kích hoạt. Thông tin này có thể là quan trọng cho việc lựa chọn cách đúng để cung cấp nội dung của bạn."
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/zh-cn.json b/plugins/DevicePlugins/lang/zh-cn.json
new file mode 100644
index 0000000000..94e33f2469
--- /dev/null
+++ b/plugins/DevicePlugins/lang/zh-cn.json
@@ -0,0 +1,9 @@
+{
+    "DevicePlugins": {
+        "BrowserWithNoPluginsEnabled": "%1$s 没有启用插件",
+        "BrowserWithPluginsEnabled": "%1$s 启用插件%2$s",
+        "PluginDetectionDoesNotWorkInIE": "注意: 插件检查无法在 Internet Explorer 上运行。这个报表仅提供非 IE 浏览器。",
+        "WidgetPlugins": "浏览器插件清单",
+        "WidgetPluginsDocumentation": "本报表显示访客使用的浏览器插件，这可能对如何发布您的内容很重要。"
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/zh-tw.json b/plugins/DevicePlugins/lang/zh-tw.json
new file mode 100644
index 0000000000..3525eebf47
--- /dev/null
+++ b/plugins/DevicePlugins/lang/zh-tw.json
@@ -0,0 +1,6 @@
+{
+    "DevicePlugins": {
+        "PluginDetectionDoesNotWorkInIE": "注意：外掛偵測無法在 Internet Explorer 上運作。這個報告僅提供非 IE 瀏覽器。",
+        "WidgetPlugins": "瀏覽器外掛清單"
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicesDetection/API.php b/plugins/DevicesDetection/API.php
index b6c58388b9..36fcd8fb95 100644
--- a/plugins/DevicesDetection/API.php
+++ b/plugins/DevicesDetection/API.php
@@ -53,6 +53,9 @@ class API extends \Piwik\Plugin\API
         $dataTable = $this->getDataTable('DevicesDetection_types', $idSite, $period, $date, $segment);
         // ensure all device types are in the list
         $this->ensureDefaultRowsInTable($dataTable);
+
+        $mapping = DeviceParserAbstract::getAvailableDeviceTypeNames();
+        $dataTable->filter('AddSegmentByLabelMapping', array('deviceType', $mapping));
         $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getDeviceTypeLogo'));
         $dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getDeviceTypeLabel'));
         return $dataTable;
@@ -123,11 +126,65 @@ class API extends \Piwik\Plugin\API
     public function getOsFamilies($idSite, $period, $date, $segment = false)
     {
         $dataTable = $this->getDataTable('DevicesDetection_os', $idSite, $period, $date, $segment);
+        
+        // handle legacy archives
+        if ($dataTable instanceof DataTable\Map || !$dataTable->getRowsCount()) {
+            $versionDataTable = $this->getDataTable('DevicesDetection_osVersions', $idSite, $period, $date, $segment);
+            $dataTable = $this->mergeDataTables($dataTable, $versionDataTable);
+        }
+
         $dataTable->filter('GroupBy', array('label', __NAMESPACE__ . '\getOSFamilyFullName'));
         $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getOsFamilyLogo'));
         return $dataTable;
     }
 
+
+    /**
+     * That methods handles the fallback to version datatables to calculate those without versions.
+     *
+     * Unlike DevicesDetection plugin now, the UserSettings plugin did not store archives holding the os and browser data without
+     * their version number. The "version-less" reports were always generated out of the "version-containing" archives .
+     * For big archives (month/year) that ment that some of the data was truncated, due to the datatable entry limit.
+     * To avoid that data loss / inaccuracy in the future, DevicesDetection plugin will also store archives without the version.
+     * For data archived before DevicesDetection plugin was enabled, those archives do not exist, so we try to calculate
+     * them here from the "version-containing" reports if possible.
+     *
+     * @param DataTable\DataTableInterface $dataTable
+     * @param DataTable\DataTableInterface $dataTable2
+     * @return DataTable\DataTableInterface
+     */
+    protected function mergeDataTables(DataTable\DataTableInterface $dataTable, DataTable\DataTableInterface $dataTable2)
+    {
+        if ($dataTable instanceof DataTable\Map) {
+            $dataTables = $dataTable->getDataTables();
+
+            foreach ($dataTables as $label => $table) {
+
+                $versionDataTables = $dataTable2->getDataTables();
+
+                if (!array_key_exists($label, $versionDataTables)) {
+                    continue;
+                }
+                $newDataTable = $this->mergeDataTables($table, $versionDataTables[$label]);
+                $dataTable->addTable($newDataTable, $label);
+            }
+
+        } else if (!$dataTable->getRowsCount() && $dataTable2->getRowsCount()) {
+            $dataTable2->filter('GroupBy', array('label', function ($label) {
+                if (preg_match("/(.+) [0-9]+(?:\.[0-9]+)?$/", $label, $matches)) {
+                    return $matches[1]; // should match for browsers
+                }
+                if (strpos($label, ';')) {
+                    return substr($label, 0, 3); // should match for os
+                }
+                return $label;
+            }));
+            return $dataTable2;
+        }
+
+        return $dataTable;
+    }
+
     /**
      * Gets datatable displaying number of visits by OS version (eg. Android 4.0, Windows 7)
      * @param int $idSite
@@ -139,6 +196,9 @@ class API extends \Piwik\Plugin\API
     public function getOsVersions($idSite, $period, $date, $segment = false)
     {
         $dataTable = $this->getDataTable('DevicesDetection_osVersions', $idSite, $period, $date, $segment);
+
+        $segments = array('operatingSystemCode', 'operatingSystemVersion');
+        $dataTable->filter('AddSegmentByLabel', array($segments, Archiver::BROWSER_SEPARATOR));
         $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getOsLogo'));
         // use GroupBy filter to avoid duplicate rows if old (UserSettings) and new (DevicesDetection) reports were combined
         $dataTable->filter('GroupBy', array('label', __NAMESPACE__ . '\getOsFullName'));
@@ -171,6 +231,14 @@ class API extends \Piwik\Plugin\API
     public function getBrowsers($idSite, $period, $date, $segment = false)
     {
         $dataTable = $this->getDataTable('DevicesDetection_browsers', $idSite, $period, $date, $segment);
+        $dataTable->filter('AddSegmentValue');
+
+        // handle legacy archives
+        if ($dataTable instanceof DataTable\Map || !$dataTable->getRowsCount()) {
+            $versionDataTable = $this->getDataTable('DevicesDetection_browserVersions', $idSite, $period, $date, $segment);
+            $dataTable = $this->mergeDataTables($dataTable, $versionDataTable);
+        }
+
         $dataTable->filter('GroupBy', array('label', __NAMESPACE__ . '\getBrowserName'));
         $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getBrowserFamilyLogo'));
         return $dataTable;
@@ -187,6 +255,9 @@ class API extends \Piwik\Plugin\API
     public function getBrowserVersions($idSite, $period, $date, $segment = false)
     {
         $dataTable = $this->getDataTable('DevicesDetection_browserVersions', $idSite, $period, $date, $segment);
+
+        $segments = array('browserCode', 'browserVersion');
+        $dataTable->filter('AddSegmentByLabel', array($segments, Archiver::BROWSER_SEPARATOR));
         $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getBrowserLogo'));
         $dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getBrowserNameWithVersion'));
         return $dataTable;
@@ -203,6 +274,7 @@ class API extends \Piwik\Plugin\API
     public function getBrowserEngines($idSite, $period, $date, $segment = false)
     {
         $dataTable = $this->getDataTable('DevicesDetection_browserEngines', $idSite, $period, $date, $segment);
+        $dataTable->filter('AddSegmentValue');
         // use GroupBy filter to avoid duplicate rows if old (UserSettings) and new (DevicesDetection) reports were combined
         $dataTable->filter('GroupBy', array('label',  __NAMESPACE__ . '\getBrowserEngineName'));
         return $dataTable;
diff --git a/plugins/DevicesDetection/Archiver.php b/plugins/DevicesDetection/Archiver.php
index 0d6f40c062..3ecb310028 100644
--- a/plugins/DevicesDetection/Archiver.php
+++ b/plugins/DevicesDetection/Archiver.php
@@ -13,6 +13,7 @@ use Piwik\Metrics;
 
 class Archiver extends \Piwik\Plugin\Archiver
 {
+    const BROWSER_SEPARATOR = ';';
     const DEVICE_TYPE_RECORD_NAME = 'DevicesDetection_types';
     const DEVICE_BRAND_RECORD_NAME = 'DevicesDetection_brands';
     const DEVICE_MODEL_RECORD_NAME = 'DevicesDetection_models';
diff --git a/plugins/DevicesDetection/Columns/DeviceType.php b/plugins/DevicesDetection/Columns/DeviceType.php
index 37b7cc0679..3c7320326b 100644
--- a/plugins/DevicesDetection/Columns/DeviceType.php
+++ b/plugins/DevicesDetection/Columns/DeviceType.php
@@ -61,4 +61,4 @@ class DeviceType extends Base
 
         return $parser->getDevice();
     }
-}
+}
\ No newline at end of file
diff --git a/plugins/DevicesDetection/Columns/Os.php b/plugins/DevicesDetection/Columns/Os.php
index affce6cd6e..f8c66bee3f 100644
--- a/plugins/DevicesDetection/Columns/Os.php
+++ b/plugins/DevicesDetection/Columns/Os.php
@@ -25,7 +25,7 @@ class Os extends Base
         $segment = new Segment();
         $segment->setSegment('operatingSystemCode');
         $segment->setName('DevicesDetection_ColumnOperatingSystem');
-        $segment->setAcceptedValues('WXP, WI7, MAC, LIN, AND, IPD, etc.');
+        $segment->setAcceptedValues('WIN, MAC, LIN, AND, IPD, etc.');
         $this->addSegment($segment);
     }
 
diff --git a/plugins/DevicesDetection/Columns/OsVersion.php b/plugins/DevicesDetection/Columns/OsVersion.php
index e9913f740e..d1c3cb422a 100644
--- a/plugins/DevicesDetection/Columns/OsVersion.php
+++ b/plugins/DevicesDetection/Columns/OsVersion.php
@@ -9,6 +9,7 @@
 namespace Piwik\Plugins\DevicesDetection\Columns;
 
 use Piwik\Piwik;
+use Piwik\Plugins\DevicesDetection\Segment;
 use Piwik\Tracker\Request;
 use Piwik\Tracker\Visitor;
 use Piwik\Tracker\Action;
@@ -18,6 +19,15 @@ class OsVersion extends Base
     protected $columnName = 'config_os_version';
     protected $columnType = 'VARCHAR( 100 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL';
 
+    protected function configureSegments()
+    {
+        $segment = new Segment();
+        $segment->setSegment('operatingSystemVersion');
+        $segment->setName('DevicesDetection_ColumnOperatingSystemVersion');
+        $segment->setAcceptedValues('XP, 7, 2.3, 5.1, ...');
+        $this->addSegment($segment);
+    }
+
     public function getName()
     {
         return Piwik::translate('DevicesDetection_OperatingSystemVersions');
diff --git a/plugins/DevicesDetection/DevicesDetection.php b/plugins/DevicesDetection/DevicesDetection.php
index 6b4e57fe65..8dde8e8e40 100644
--- a/plugins/DevicesDetection/DevicesDetection.php
+++ b/plugins/DevicesDetection/DevicesDetection.php
@@ -49,8 +49,10 @@ class DevicesDetection extends \Piwik\Plugin
 
         $visitor['deviceType']               = $instance->getDeviceType();
         $visitor['operatingSystem']          = $instance->getOperatingSystem();
-        $visitor['operatingSystemCode']      = $instance->getOperatingSystemCode();
+        $visitor['operatingSystemName']      = $instance->getOperatingSystemName();
         $visitor['operatingSystemIcon']      = $instance->getOperatingSystemIcon();
+        $visitor['operatingSystemCode']      = $instance->getOperatingSystemCode();
+        $visitor['operatingSystemVersion']   = $instance->getOperatingSystemVersion();
         $visitor['browserFamily']            = $instance->getBrowserEngine();
         $visitor['browserFamilyDescription'] = $instance->getBrowserEngineDescription();
         $visitor['browser']                  = $instance->getBrowser();
diff --git a/plugins/DevicesDetection/Reports/GetBrand.php b/plugins/DevicesDetection/Reports/GetBrand.php
index b76eb35c7c..070b2d8918 100644
--- a/plugins/DevicesDetection/Reports/GetBrand.php
+++ b/plugins/DevicesDetection/Reports/GetBrand.php
@@ -26,7 +26,7 @@ class GetBrand extends Base
 
     public function configureView(ViewDataTable $view)
     {
-        $view->config->show_search = false;
+        $view->config->show_search = true;
         $view->config->show_exclude_low_population = false;
         $view->config->addTranslation('label', Piwik::translate("DevicesDetection_dataTableLabelBrands"));
     }
diff --git a/plugins/DevicesDetection/Reports/GetBrowserVersions.php b/plugins/DevicesDetection/Reports/GetBrowserVersions.php
index 0e26223d30..77f1541785 100644
--- a/plugins/DevicesDetection/Reports/GetBrowserVersions.php
+++ b/plugins/DevicesDetection/Reports/GetBrowserVersions.php
@@ -26,7 +26,7 @@ class GetBrowserVersions extends Base
 
     public function configureView(ViewDataTable $view)
     {
-        $view->config->show_search = false;
+        $view->config->show_search = true;
         $view->config->show_exclude_low_population = false;
         $view->config->addTranslation('label', $this->dimension->getName());
     }
diff --git a/plugins/DevicesDetection/Reports/GetBrowsers.php b/plugins/DevicesDetection/Reports/GetBrowsers.php
index 82f1677c33..c34c604da8 100644
--- a/plugins/DevicesDetection/Reports/GetBrowsers.php
+++ b/plugins/DevicesDetection/Reports/GetBrowsers.php
@@ -27,7 +27,7 @@ class GetBrowsers extends Base
     public function configureView(ViewDataTable $view)
     {
         $view->config->title = $this->name;
-        $view->config->show_search = false;
+        $view->config->show_search = true;
         $view->config->show_exclude_low_population = false;
         $view->config->addTranslation('label', $this->dimension->getName());
     }
diff --git a/plugins/DevicesDetection/Reports/GetModel.php b/plugins/DevicesDetection/Reports/GetModel.php
index 70fa3a0005..e2241e1ad4 100644
--- a/plugins/DevicesDetection/Reports/GetModel.php
+++ b/plugins/DevicesDetection/Reports/GetModel.php
@@ -26,7 +26,7 @@ class GetModel extends Base
 
     public function configureView(ViewDataTable $view)
     {
-        $view->config->show_search = false;
+        $view->config->show_search = true;
         $view->config->show_exclude_low_population = false;
         $view->config->addTranslation('label', Piwik::translate("DevicesDetection_dataTableLabelModels"));
     }
diff --git a/plugins/DevicesDetection/Reports/GetOsVersions.php b/plugins/DevicesDetection/Reports/GetOsVersions.php
index 4596a4dd74..76ded09255 100644
--- a/plugins/DevicesDetection/Reports/GetOsVersions.php
+++ b/plugins/DevicesDetection/Reports/GetOsVersions.php
@@ -27,7 +27,7 @@ class GetOsVersions extends Base
     public function configureView(ViewDataTable $view)
     {
         $view->config->title = $this->name;
-        $view->config->show_search = false;
+        $view->config->show_search = true;
         $view->config->show_exclude_low_population = false;
         $view->config->addTranslation('label', Piwik::translate("DevicesDetection_dataTableLabelSystemVersion"));
     }
diff --git a/plugins/DevicesDetection/Visitor.php b/plugins/DevicesDetection/Visitor.php
index aa5b16c2ae..25d7a5a89a 100644
--- a/plugins/DevicesDetection/Visitor.php
+++ b/plugins/DevicesDetection/Visitor.php
@@ -31,9 +31,19 @@ class Visitor
 
     public function getOperatingSystem()
     {
+        return getOsFullName($this->details['config_os'] . ";" . $this->details['config_os_version']);
+    }
+
+    public function getOperatingSystemName()
+    {
         return getOsFullName($this->details['config_os']);
     }
 
+    public function getOperatingSystemVersion()
+    {
+        return $this->details['config_os_version'];
+    }
+
     public function getOperatingSystemIcon()
     {
         return getOsLogo($this->details['config_os']);
diff --git a/plugins/DevicesDetection/functions.php b/plugins/DevicesDetection/functions.php
index c8fe989045..9d875b32ab 100644
--- a/plugins/DevicesDetection/functions.php
+++ b/plugins/DevicesDetection/functions.php
@@ -49,7 +49,7 @@ function getBrowserNameWithVersion($label)
     $short = substr($label, 0, 2);
     $ver = substr($label, 3, 10);
     $browsers = BrowserParser::getAvailableBrowsers();
-    if (array_key_exists($short, $browsers)) {
+    if ($short && array_key_exists($short, $browsers)) {
         return trim(ucfirst($browsers[$short]) . ' ' . $ver);
     } else {
         return Piwik::translate('General_Unknown');
@@ -60,7 +60,7 @@ function getBrowserName($label)
 {
     $short = substr($label, 0, 2);
     $browsers = BrowserParser::getAvailableBrowsers();
-    if (array_key_exists($short, $browsers)) {
+    if ($short && array_key_exists($short, $browsers)) {
         return trim(ucfirst($browsers[$short]));
     } else {
         return Piwik::translate('General_Unknown');
@@ -80,7 +80,7 @@ function getBrowserName($label)
  */
 function getBrowserLogo($short)
 {
-    $path = 'plugins/UserSettings/images/browsers/%s.gif';
+    $path = 'plugins/DevicesDetection/images/browsers/%s.gif';
 
     // If name is given instead of short code, try to find matching shortcode
     if (strlen($short) > 2) {
@@ -132,7 +132,8 @@ function getDeviceTypeLabel($label)
         'tv'            => 'DevicesDetection_TV',
         'car browser'   => 'DevicesDetection_CarBrowser',
         'smart display' => 'DevicesDetection_SmartDisplay',
-        'camera'        => 'DevicesDetection_Camera'
+        'camera'        => 'DevicesDetection_Camera',
+        'portable media player' => 'DevicesDetection_PortableMediaPlayer',
     );
 
     $deviceTypes = DeviceParser::getAvailableDeviceTypes();
@@ -240,6 +241,19 @@ function _mapLegacyOsShortCodes($shortCode)
         'DSI' => 'NDS', // Nintendo DSi => Nintendo Mobile
         'PSV' => 'PSP', // PlayStation Vita => PlayStation Portable
         'MAE' => 'SMG', // Maemo => MeeGo
+        'W10' => 'WIN',
+        'W2K' => 'WIN',
+        'W31' => 'WIN',
+        'WI7' => 'WIN',
+        'WI8' => 'WIN',
+        'W81' => 'WIN',
+        'W95' => 'WIN',
+        'W98' => 'WIN',
+        'WME' => 'WIN',
+        'WNT' => 'WIN',
+        'WS3' => 'WIN',
+        'WVI' => 'WIN',
+        'WXP' => 'WIN',
         //'VMS' => '', // OpenVMS => ??
     );
     return array_key_exists($shortCode, $legacyShortCodes) ? $legacyShortCodes[$shortCode] : $shortCode;
@@ -258,7 +272,7 @@ function _mapLegacyOsShortCodes($shortCode)
  */
 function getOsLogo($short)
 {
-    $path = 'plugins/UserSettings/images/os/%s.gif';
+    $path = 'plugins/DevicesDetection/images/os/%s.gif';
 
     $short = _mapLegacyOsShortCodes($short);
 
diff --git a/plugins/DevicesDetection/images/brand/Barnes_&_Noble.ico b/plugins/DevicesDetection/images/brand/Barnes_&_Noble.ico
new file mode 100644
index 0000000000..2eb62cb8e1
--- /dev/null
+++ b/plugins/DevicesDetection/images/brand/Barnes_&_Noble.ico
diff --git a/plugins/DevicesDetection/images/brand/Cherry_Mobile.ico b/plugins/DevicesDetection/images/brand/Cherry_Mobile.ico
new file mode 100644
index 0000000000..393f1ca49d
--- /dev/null
+++ b/plugins/DevicesDetection/images/brand/Cherry_Mobile.ico
diff --git a/plugins/DevicesDetection/images/brand/Compaq.ico b/plugins/DevicesDetection/images/brand/Compaq.ico
new file mode 100644
index 0000000000..b0738259bd
--- /dev/null
+++ b/plugins/DevicesDetection/images/brand/Compaq.ico
diff --git a/plugins/DevicesDetection/images/brand/ConCorde.ico b/plugins/DevicesDetection/images/brand/ConCorde.ico
new file mode 100644
index 0000000000..27efdbab49
--- /dev/null
+++ b/plugins/DevicesDetection/images/brand/ConCorde.ico
diff --git a/plugins/DevicesDetection/images/brand/Coolpad.ico b/plugins/DevicesDetection/images/brand/Coolpad.ico
new file mode 100644
index 0000000000..75caa69358
--- /dev/null
+++ b/plugins/DevicesDetection/images/brand/Coolpad.ico
diff --git a/plugins/DevicesDetection/images/brand/Crius_Mea.ico b/plugins/DevicesDetection/images/brand/Crius_Mea.ico
new file mode 100644
index 0000000000..4c3473a737
--- /dev/null
+++ b/plugins/DevicesDetection/images/brand/Crius_Mea.ico
diff --git a/plugins/DevicesDetection/images/brand/Danew.ico b/plugins/DevicesDetection/images/brand/Danew.ico
new file mode 100644
index 0000000000..373eded938
--- /dev/null
+++ b/plugins/DevicesDetection/images/brand/Danew.ico
diff --git a/plugins/DevicesDetection/images/brand/Easypix.ico b/plugins/DevicesDetection/images/brand/Easypix.ico
new file mode 100644
index 0000000000..a14cd928ba
--- /dev/null
+++ b/plugins/DevicesDetection/images/brand/Easypix.ico
diff --git a/plugins/DevicesDetection/images/brand/Evertek.ico b/plugins/DevicesDetection/images/brand/Evertek.ico
new file mode 100644
index 0000000000..c09bf2c331
--- /dev/null
+++ b/plugins/DevicesDetection/images/brand/Evertek.ico
diff --git a/plugins/DevicesDetection/images/brand/Fujitsu.ico b/plugins/DevicesDetection/images/brand/Fujitsu.ico
new file mode 100644
index 0000000000..e2ac9cae5c
--- /dev/null
+++ b/plugins/DevicesDetection/images/brand/Fujitsu.ico
diff --git a/plugins/DevicesDetection/images/brand/Gigabyte.ico b/plugins/DevicesDetection/images/brand/Gigabyte.ico
new file mode 100644
index 0000000000..ced0200cd8
--- /dev/null
+++ b/plugins/DevicesDetection/images/brand/Gigabyte.ico
diff --git a/plugins/DevicesDetection/images/brand/Gigaset.ico b/plugins/DevicesDetection/images/brand/Gigaset.ico
new file mode 100644
index 0000000000..5ad69fb6d2
--- /dev/null
+++ b/plugins/DevicesDetection/images/brand/Gigaset.ico
diff --git a/plugins/DevicesDetection/images/brand/MSI.ico b/plugins/DevicesDetection/images/brand/MSI.ico
new file mode 100644
index 0000000000..88cb1029d8
--- /dev/null
+++ b/plugins/DevicesDetection/images/brand/MSI.ico
diff --git a/plugins/DevicesDetection/images/brand/Nikon.ico b/plugins/DevicesDetection/images/brand/Nikon.ico
new file mode 100644
index 0000000000..99d714d1bd
--- /dev/null
+++ b/plugins/DevicesDetection/images/brand/Nikon.ico
diff --git a/plugins/DevicesDetection/images/brand/Quechua.ico b/plugins/DevicesDetection/images/brand/Quechua.ico
new file mode 100644
index 0000000000..b720b484b0
--- /dev/null
+++ b/plugins/DevicesDetection/images/brand/Quechua.ico
diff --git a/plugins/DevicesDetection/images/brand/SFR.ico b/plugins/DevicesDetection/images/brand/SFR.ico
new file mode 100644
index 0000000000..59a47182cc
--- /dev/null
+++ b/plugins/DevicesDetection/images/brand/SFR.ico
diff --git a/plugins/DevicesDetection/images/brand/Tecno_Mobile.ico b/plugins/DevicesDetection/images/brand/Tecno_Mobile.ico
new file mode 100644
index 0000000000..7ea787c5ba
--- /dev/null
+++ b/plugins/DevicesDetection/images/brand/Tecno_Mobile.ico
diff --git a/plugins/DevicesDetection/images/brand/Tolino.ico b/plugins/DevicesDetection/images/brand/Tolino.ico
new file mode 100644
index 0000000000..23b44b02b7
--- /dev/null
+++ b/plugins/DevicesDetection/images/brand/Tolino.ico
diff --git a/plugins/DevicesDetection/images/brand/Tunisie_Telecom.ico b/plugins/DevicesDetection/images/brand/Tunisie_Telecom.ico
new file mode 100644
index 0000000000..44e87d65ed
--- /dev/null
+++ b/plugins/DevicesDetection/images/brand/Tunisie_Telecom.ico
diff --git a/plugins/DevicesDetection/images/brand/bq.ico b/plugins/DevicesDetection/images/brand/bq.ico
new file mode 100644
index 0000000000..088f3d1144
--- /dev/null
+++ b/plugins/DevicesDetection/images/brand/bq.ico
diff --git a/plugins/UserSettings/images/browsers/AA.gif b/plugins/DevicesDetection/images/browsers/AA.gif
index 9b78ba7292..9b78ba7292 100644
--- a/plugins/UserSettings/images/browsers/AA.gif
+++ b/plugins/DevicesDetection/images/browsers/AA.gif
diff --git a/plugins/UserSettings/images/browsers/AB.gif b/plugins/DevicesDetection/images/browsers/AB.gif
index 0e277b8e2d..0e277b8e2d 100644
--- a/plugins/UserSettings/images/browsers/AB.gif
+++ b/plugins/DevicesDetection/images/browsers/AB.gif
diff --git a/plugins/UserSettings/images/browsers/AG.gif b/plugins/DevicesDetection/images/browsers/AG.gif
index 151b9a33c6..151b9a33c6 100644
--- a/plugins/UserSettings/images/browsers/AG.gif
+++ b/plugins/DevicesDetection/images/browsers/AG.gif
diff --git a/plugins/UserSettings/images/browsers/AM.gif b/plugins/DevicesDetection/images/browsers/AM.gif
index f38dd45077..f38dd45077 100644
--- a/plugins/UserSettings/images/browsers/AM.gif
+++ b/plugins/DevicesDetection/images/browsers/AM.gif
diff --git a/plugins/UserSettings/images/browsers/AN.gif b/plugins/DevicesDetection/images/browsers/AN.gif
index bf0ade5551..bf0ade5551 100644
--- a/plugins/UserSettings/images/browsers/AN.gif
+++ b/plugins/DevicesDetection/images/browsers/AN.gif
diff --git a/plugins/UserSettings/images/browsers/AR.gif b/plugins/DevicesDetection/images/browsers/AR.gif
index 69c79b25a0..69c79b25a0 100644
--- a/plugins/UserSettings/images/browsers/AR.gif
+++ b/plugins/DevicesDetection/images/browsers/AR.gif
diff --git a/plugins/UserSettings/images/browsers/AV.gif b/plugins/DevicesDetection/images/browsers/AV.gif
index 2bee0af264..2bee0af264 100644
--- a/plugins/UserSettings/images/browsers/AV.gif
+++ b/plugins/DevicesDetection/images/browsers/AV.gif
diff --git a/plugins/UserSettings/images/browsers/AW.gif b/plugins/DevicesDetection/images/browsers/AW.gif
index b7980bce3f..b7980bce3f 100644
--- a/plugins/UserSettings/images/browsers/AW.gif
+++ b/plugins/DevicesDetection/images/browsers/AW.gif
diff --git a/plugins/UserSettings/images/browsers/B2.gif b/plugins/DevicesDetection/images/browsers/B2.gif
index dc732a8462..dc732a8462 100644
--- a/plugins/UserSettings/images/browsers/B2.gif
+++ b/plugins/DevicesDetection/images/browsers/B2.gif
diff --git a/plugins/UserSettings/images/browsers/BB.gif b/plugins/DevicesDetection/images/browsers/BB.gif
index e8316ef586..e8316ef586 100644
--- a/plugins/UserSettings/images/browsers/BB.gif
+++ b/plugins/DevicesDetection/images/browsers/BB.gif
diff --git a/plugins/UserSettings/images/browsers/BD.gif b/plugins/DevicesDetection/images/browsers/BD.gif
index 4f4e740562..4f4e740562 100644
--- a/plugins/UserSettings/images/browsers/BD.gif
+++ b/plugins/DevicesDetection/images/browsers/BD.gif
diff --git a/plugins/UserSettings/images/browsers/BE.gif b/plugins/DevicesDetection/images/browsers/BE.gif
index 317112b4ca..317112b4ca 100644
--- a/plugins/UserSettings/images/browsers/BE.gif
+++ b/plugins/DevicesDetection/images/browsers/BE.gif
diff --git a/plugins/UserSettings/images/browsers/BJ.gif b/plugins/DevicesDetection/images/browsers/BJ.gif
index 5324db57b9..5324db57b9 100644
--- a/plugins/UserSettings/images/browsers/BJ.gif
+++ b/plugins/DevicesDetection/images/browsers/BJ.gif
diff --git a/plugins/UserSettings/images/browsers/BP.gif b/plugins/DevicesDetection/images/browsers/BP.gif
index dc732a8462..dc732a8462 100644
--- a/plugins/UserSettings/images/browsers/BP.gif
+++ b/plugins/DevicesDetection/images/browsers/BP.gif
diff --git a/plugins/UserSettings/images/browsers/BS.gif b/plugins/DevicesDetection/images/browsers/BS.gif
index 6a1d7bd1ed..6a1d7bd1ed 100644
--- a/plugins/UserSettings/images/browsers/BS.gif
+++ b/plugins/DevicesDetection/images/browsers/BS.gif
diff --git a/plugins/UserSettings/images/browsers/BX.gif b/plugins/DevicesDetection/images/browsers/BX.gif
index fde79bdaf3..fde79bdaf3 100644
--- a/plugins/UserSettings/images/browsers/BX.gif
+++ b/plugins/DevicesDetection/images/browsers/BX.gif
diff --git a/plugins/UserSettings/images/browsers/CA.gif b/plugins/DevicesDetection/images/browsers/CA.gif
index 3018ff3855..3018ff3855 100644
--- a/plugins/UserSettings/images/browsers/CA.gif
+++ b/plugins/DevicesDetection/images/browsers/CA.gif
diff --git a/plugins/UserSettings/images/browsers/CD.gif b/plugins/DevicesDetection/images/browsers/CD.gif
index dc98e39307..dc98e39307 100644
--- a/plugins/UserSettings/images/browsers/CD.gif
+++ b/plugins/DevicesDetection/images/browsers/CD.gif
diff --git a/plugins/UserSettings/images/browsers/CF.gif b/plugins/DevicesDetection/images/browsers/CF.gif
index 793e0fad3b..793e0fad3b 100644
--- a/plugins/UserSettings/images/browsers/CF.gif
+++ b/plugins/DevicesDetection/images/browsers/CF.gif
diff --git a/plugins/UserSettings/images/browsers/CH.gif b/plugins/DevicesDetection/images/browsers/CH.gif
index 793e0fad3b..793e0fad3b 100644
--- a/plugins/UserSettings/images/browsers/CH.gif
+++ b/plugins/DevicesDetection/images/browsers/CH.gif
diff --git a/plugins/UserSettings/images/browsers/CK.gif b/plugins/DevicesDetection/images/browsers/CK.gif
index 562a3406d0..562a3406d0 100644
--- a/plugins/UserSettings/images/browsers/CK.gif
+++ b/plugins/DevicesDetection/images/browsers/CK.gif
diff --git a/plugins/UserSettings/images/browsers/CM.gif b/plugins/DevicesDetection/images/browsers/CM.gif
index 793e0fad3b..793e0fad3b 100644
--- a/plugins/UserSettings/images/browsers/CM.gif
+++ b/plugins/DevicesDetection/images/browsers/CM.gif
diff --git a/plugins/UserSettings/images/browsers/CN.gif b/plugins/DevicesDetection/images/browsers/CN.gif
index b3cdc7c202..b3cdc7c202 100644
--- a/plugins/UserSettings/images/browsers/CN.gif
+++ b/plugins/DevicesDetection/images/browsers/CN.gif
diff --git a/plugins/UserSettings/images/browsers/CO.gif b/plugins/DevicesDetection/images/browsers/CO.gif
index 98f684c6c0..98f684c6c0 100644
--- a/plugins/UserSettings/images/browsers/CO.gif
+++ b/plugins/DevicesDetection/images/browsers/CO.gif
diff --git a/plugins/UserSettings/images/browsers/CP.gif b/plugins/DevicesDetection/images/browsers/CP.gif
index cb0b2db808..cb0b2db808 100644
--- a/plugins/UserSettings/images/browsers/CP.gif
+++ b/plugins/DevicesDetection/images/browsers/CP.gif
diff --git a/plugins/UserSettings/images/browsers/CS.gif b/plugins/DevicesDetection/images/browsers/CS.gif
index 10fb8f7bc1..10fb8f7bc1 100644
--- a/plugins/UserSettings/images/browsers/CS.gif
+++ b/plugins/DevicesDetection/images/browsers/CS.gif
diff --git a/plugins/UserSettings/images/browsers/DF.gif b/plugins/DevicesDetection/images/browsers/DF.gif
index 56ce414c2f..56ce414c2f 100644
--- a/plugins/UserSettings/images/browsers/DF.gif
+++ b/plugins/DevicesDetection/images/browsers/DF.gif
diff --git a/plugins/UserSettings/images/browsers/DI.gif b/plugins/DevicesDetection/images/browsers/DI.gif
index 621d12fc0a..621d12fc0a 100644
--- a/plugins/UserSettings/images/browsers/DI.gif
+++ b/plugins/DevicesDetection/images/browsers/DI.gif
diff --git a/plugins/UserSettings/images/browsers/EL.gif b/plugins/DevicesDetection/images/browsers/EL.gif
index f5053e9e0e..f5053e9e0e 100644
--- a/plugins/UserSettings/images/browsers/EL.gif
+++ b/plugins/DevicesDetection/images/browsers/EL.gif
diff --git a/plugins/UserSettings/images/browsers/EP.gif b/plugins/DevicesDetection/images/browsers/EP.gif
index 9759cd60ad..9759cd60ad 100644
--- a/plugins/UserSettings/images/browsers/EP.gif
+++ b/plugins/DevicesDetection/images/browsers/EP.gif
diff --git a/plugins/UserSettings/images/browsers/ES.gif b/plugins/DevicesDetection/images/browsers/ES.gif
index fad9cac483..fad9cac483 100644
--- a/plugins/UserSettings/images/browsers/ES.gif
+++ b/plugins/DevicesDetection/images/browsers/ES.gif
diff --git a/plugins/UserSettings/images/browsers/FB.gif b/plugins/DevicesDetection/images/browsers/FB.gif
index e965479d41..e965479d41 100644
--- a/plugins/UserSettings/images/browsers/FB.gif
+++ b/plugins/DevicesDetection/images/browsers/FB.gif
diff --git a/plugins/UserSettings/images/browsers/FD.gif b/plugins/DevicesDetection/images/browsers/FD.gif
index 2265625c6e..2265625c6e 100644
--- a/plugins/UserSettings/images/browsers/FD.gif
+++ b/plugins/DevicesDetection/images/browsers/FD.gif
diff --git a/plugins/UserSettings/images/browsers/FE.gif b/plugins/DevicesDetection/images/browsers/FE.gif
index 0613d71812..0613d71812 100644
--- a/plugins/UserSettings/images/browsers/FE.gif
+++ b/plugins/DevicesDetection/images/browsers/FE.gif
diff --git a/plugins/UserSettings/images/browsers/FF.gif b/plugins/DevicesDetection/images/browsers/FF.gif
index eb024c408a..eb024c408a 100644
--- a/plugins/UserSettings/images/browsers/FF.gif
+++ b/plugins/DevicesDetection/images/browsers/FF.gif
diff --git a/plugins/UserSettings/images/browsers/FL.gif b/plugins/DevicesDetection/images/browsers/FL.gif
index ed58dab179..ed58dab179 100644
--- a/plugins/UserSettings/images/browsers/FL.gif
+++ b/plugins/DevicesDetection/images/browsers/FL.gif
diff --git a/plugins/UserSettings/images/browsers/FN.gif b/plugins/DevicesDetection/images/browsers/FN.gif
index 183dced4d7..183dced4d7 100644
--- a/plugins/UserSettings/images/browsers/FN.gif
+++ b/plugins/DevicesDetection/images/browsers/FN.gif
diff --git a/plugins/UserSettings/images/browsers/GA.gif b/plugins/DevicesDetection/images/browsers/GA.gif
index 71605dfaeb..71605dfaeb 100644
--- a/plugins/UserSettings/images/browsers/GA.gif
+++ b/plugins/DevicesDetection/images/browsers/GA.gif
diff --git a/plugins/UserSettings/images/browsers/GE.gif b/plugins/DevicesDetection/images/browsers/GE.gif
index 53e8f45f93..53e8f45f93 100644
--- a/plugins/UserSettings/images/browsers/GE.gif
+++ b/plugins/DevicesDetection/images/browsers/GE.gif
diff --git a/plugins/UserSettings/images/browsers/HA.gif b/plugins/DevicesDetection/images/browsers/HA.gif
index 3eb4ac609b..3eb4ac609b 100644
--- a/plugins/UserSettings/images/browsers/HA.gif
+++ b/plugins/DevicesDetection/images/browsers/HA.gif
diff --git a/plugins/UserSettings/images/browsers/HJ.gif b/plugins/DevicesDetection/images/browsers/HJ.gif
index f599043733..f599043733 100644
--- a/plugins/UserSettings/images/browsers/HJ.gif
+++ b/plugins/DevicesDetection/images/browsers/HJ.gif
diff --git a/plugins/UserSettings/images/browsers/IA.gif b/plugins/DevicesDetection/images/browsers/IA.gif
index 83aad8b1c6..83aad8b1c6 100644
--- a/plugins/UserSettings/images/browsers/IA.gif
+++ b/plugins/DevicesDetection/images/browsers/IA.gif
diff --git a/plugins/UserSettings/images/browsers/IB.gif b/plugins/DevicesDetection/images/browsers/IB.gif
index ed3f7f7e07..ed3f7f7e07 100644
--- a/plugins/UserSettings/images/browsers/IB.gif
+++ b/plugins/DevicesDetection/images/browsers/IB.gif
diff --git a/plugins/UserSettings/images/browsers/IC.gif b/plugins/DevicesDetection/images/browsers/IC.gif
index e3e1b69753..e3e1b69753 100644
--- a/plugins/UserSettings/images/browsers/IC.gif
+++ b/plugins/DevicesDetection/images/browsers/IC.gif
diff --git a/plugins/UserSettings/images/browsers/ID.gif b/plugins/DevicesDetection/images/browsers/ID.gif
index b6e614da48..b6e614da48 100644
--- a/plugins/UserSettings/images/browsers/ID.gif
+++ b/plugins/DevicesDetection/images/browsers/ID.gif
diff --git a/plugins/UserSettings/images/browsers/IE.gif b/plugins/DevicesDetection/images/browsers/IE.gif
index 26f2f8fe30..26f2f8fe30 100644
--- a/plugins/UserSettings/images/browsers/IE.gif
+++ b/plugins/DevicesDetection/images/browsers/IE.gif
diff --git a/plugins/UserSettings/images/browsers/IM.gif b/plugins/DevicesDetection/images/browsers/IM.gif
index 26f2f8fe30..26f2f8fe30 100644
--- a/plugins/UserSettings/images/browsers/IM.gif
+++ b/plugins/DevicesDetection/images/browsers/IM.gif
diff --git a/plugins/UserSettings/images/browsers/IR.gif b/plugins/DevicesDetection/images/browsers/IR.gif
index fd58198194..fd58198194 100644
--- a/plugins/UserSettings/images/browsers/IR.gif
+++ b/plugins/DevicesDetection/images/browsers/IR.gif
diff --git a/plugins/UserSettings/images/browsers/IW.gif b/plugins/DevicesDetection/images/browsers/IW.gif
index ef1b5c0711..ef1b5c0711 100644
--- a/plugins/UserSettings/images/browsers/IW.gif
+++ b/plugins/DevicesDetection/images/browsers/IW.gif
diff --git a/plugins/UserSettings/images/browsers/KI.gif b/plugins/DevicesDetection/images/browsers/KI.gif
index 3be12eac66..3be12eac66 100644
--- a/plugins/UserSettings/images/browsers/KI.gif
+++ b/plugins/DevicesDetection/images/browsers/KI.gif
diff --git a/plugins/UserSettings/images/browsers/KM.gif b/plugins/DevicesDetection/images/browsers/KM.gif
index 100e5cbbf5..100e5cbbf5 100644
--- a/plugins/UserSettings/images/browsers/KM.gif
+++ b/plugins/DevicesDetection/images/browsers/KM.gif
diff --git a/plugins/UserSettings/images/browsers/KO.gif b/plugins/DevicesDetection/images/browsers/KO.gif
index 359fd78ec4..359fd78ec4 100644
--- a/plugins/UserSettings/images/browsers/KO.gif
+++ b/plugins/DevicesDetection/images/browsers/KO.gif
diff --git a/plugins/UserSettings/images/browsers/KP.gif b/plugins/DevicesDetection/images/browsers/KP.gif
index 6d54c7f116..6d54c7f116 100644
--- a/plugins/UserSettings/images/browsers/KP.gif
+++ b/plugins/DevicesDetection/images/browsers/KP.gif
diff --git a/plugins/UserSettings/images/browsers/KZ.gif b/plugins/DevicesDetection/images/browsers/KZ.gif
index 76ea10e03f..76ea10e03f 100644
--- a/plugins/UserSettings/images/browsers/KZ.gif
+++ b/plugins/DevicesDetection/images/browsers/KZ.gif
diff --git a/plugins/UserSettings/images/browsers/LB.gif b/plugins/DevicesDetection/images/browsers/LB.gif
index 10379bdd5d..10379bdd5d 100644
--- a/plugins/UserSettings/images/browsers/LB.gif
+++ b/plugins/DevicesDetection/images/browsers/LB.gif
diff --git a/plugins/UserSettings/images/browsers/LG.gif b/plugins/DevicesDetection/images/browsers/LG.gif
index ed8e5c0c22..ed8e5c0c22 100644
--- a/plugins/UserSettings/images/browsers/LG.gif
+++ b/plugins/DevicesDetection/images/browsers/LG.gif
diff --git a/plugins/UserSettings/images/browsers/LI.gif b/plugins/DevicesDetection/images/browsers/LI.gif
index 0dc31911be..0dc31911be 100644
--- a/plugins/UserSettings/images/browsers/LI.gif
+++ b/plugins/DevicesDetection/images/browsers/LI.gif
diff --git a/plugins/UserSettings/images/browsers/LS.gif b/plugins/DevicesDetection/images/browsers/LS.gif
index c5f58ad4f0..c5f58ad4f0 100644
--- a/plugins/UserSettings/images/browsers/LS.gif
+++ b/plugins/DevicesDetection/images/browsers/LS.gif
diff --git a/plugins/UserSettings/images/browsers/LX.gif b/plugins/DevicesDetection/images/browsers/LX.gif
index 0dc31911be..0dc31911be 100644
--- a/plugins/UserSettings/images/browsers/LX.gif
+++ b/plugins/DevicesDetection/images/browsers/LX.gif
diff --git a/plugins/UserSettings/images/browsers/MC.gif b/plugins/DevicesDetection/images/browsers/MC.gif
index a359a22416..a359a22416 100644
--- a/plugins/UserSettings/images/browsers/MC.gif
+++ b/plugins/DevicesDetection/images/browsers/MC.gif
diff --git a/plugins/UserSettings/images/browsers/MF.gif b/plugins/DevicesDetection/images/browsers/MF.gif
index 4d0eef37a7..4d0eef37a7 100644
--- a/plugins/UserSettings/images/browsers/MF.gif
+++ b/plugins/DevicesDetection/images/browsers/MF.gif
diff --git a/plugins/UserSettings/images/browsers/MI.gif b/plugins/DevicesDetection/images/browsers/MI.gif
index ab797816ab..ab797816ab 100644
--- a/plugins/UserSettings/images/browsers/MI.gif
+++ b/plugins/DevicesDetection/images/browsers/MI.gif
diff --git a/plugins/UserSettings/images/browsers/MO.gif b/plugins/DevicesDetection/images/browsers/MO.gif
index 21fad4d28c..21fad4d28c 100644
--- a/plugins/UserSettings/images/browsers/MO.gif
+++ b/plugins/DevicesDetection/images/browsers/MO.gif
diff --git a/plugins/UserSettings/images/browsers/MS.gif b/plugins/DevicesDetection/images/browsers/MS.gif
index cb42ed6892..cb42ed6892 100644
--- a/plugins/UserSettings/images/browsers/MS.gif
+++ b/plugins/DevicesDetection/images/browsers/MS.gif
diff --git a/plugins/DevicesDetection/images/browsers/MU.gif b/plugins/DevicesDetection/images/browsers/MU.gif
new file mode 100644
index 0000000000..bdc98c5f0c
--- /dev/null
+++ b/plugins/DevicesDetection/images/browsers/MU.gif
diff --git a/plugins/UserSettings/images/browsers/MX.gif b/plugins/DevicesDetection/images/browsers/MX.gif
index b775666fa7..b775666fa7 100644
--- a/plugins/UserSettings/images/browsers/MX.gif
+++ b/plugins/DevicesDetection/images/browsers/MX.gif
diff --git a/plugins/UserSettings/images/browsers/NB.gif b/plugins/DevicesDetection/images/browsers/NB.gif
index 3d87e9f4bc..3d87e9f4bc 100644
--- a/plugins/UserSettings/images/browsers/NB.gif
+++ b/plugins/DevicesDetection/images/browsers/NB.gif
diff --git a/plugins/UserSettings/images/browsers/NF.gif b/plugins/DevicesDetection/images/browsers/NF.gif
index 8ad4aff666..8ad4aff666 100644
--- a/plugins/UserSettings/images/browsers/NF.gif
+++ b/plugins/DevicesDetection/images/browsers/NF.gif
diff --git a/plugins/UserSettings/images/browsers/NL.gif b/plugins/DevicesDetection/images/browsers/NL.gif
index a319b89783..a319b89783 100644
--- a/plugins/UserSettings/images/browsers/NL.gif
+++ b/plugins/DevicesDetection/images/browsers/NL.gif
diff --git a/plugins/UserSettings/images/browsers/NP.gif b/plugins/DevicesDetection/images/browsers/NP.gif
index c18d4d31f5..c18d4d31f5 100644
--- a/plugins/UserSettings/images/browsers/NP.gif
+++ b/plugins/DevicesDetection/images/browsers/NP.gif
diff --git a/plugins/UserSettings/images/browsers/NS.gif b/plugins/DevicesDetection/images/browsers/NS.gif
index 5c57cdb283..5c57cdb283 100644
--- a/plugins/UserSettings/images/browsers/NS.gif
+++ b/plugins/DevicesDetection/images/browsers/NS.gif
diff --git a/plugins/UserSettings/images/browsers/OB.gif b/plugins/DevicesDetection/images/browsers/OB.gif
index a9c1a6f413..a9c1a6f413 100644
--- a/plugins/UserSettings/images/browsers/OB.gif
+++ b/plugins/DevicesDetection/images/browsers/OB.gif
diff --git a/plugins/UserSettings/images/browsers/OI.gif b/plugins/DevicesDetection/images/browsers/OI.gif
index 1f5cb3ee3d..1f5cb3ee3d 100644
--- a/plugins/UserSettings/images/browsers/OI.gif
+++ b/plugins/DevicesDetection/images/browsers/OI.gif
diff --git a/plugins/UserSettings/images/browsers/ON.gif b/plugins/DevicesDetection/images/browsers/ON.gif
index 55e2dedb3c..55e2dedb3c 100644
--- a/plugins/UserSettings/images/browsers/ON.gif
+++ b/plugins/DevicesDetection/images/browsers/ON.gif
diff --git a/plugins/UserSettings/images/browsers/OP.gif b/plugins/DevicesDetection/images/browsers/OP.gif
index ec422377da..ec422377da 100644
--- a/plugins/UserSettings/images/browsers/OP.gif
+++ b/plugins/DevicesDetection/images/browsers/OP.gif
diff --git a/plugins/UserSettings/images/browsers/OR.gif b/plugins/DevicesDetection/images/browsers/OR.gif
index 5b18e64798..5b18e64798 100644
--- a/plugins/UserSettings/images/browsers/OR.gif
+++ b/plugins/DevicesDetection/images/browsers/OR.gif
diff --git a/plugins/UserSettings/images/browsers/OV.gif b/plugins/DevicesDetection/images/browsers/OV.gif
index e40a9bc71f..e40a9bc71f 100644
--- a/plugins/UserSettings/images/browsers/OV.gif
+++ b/plugins/DevicesDetection/images/browsers/OV.gif
diff --git a/plugins/UserSettings/images/browsers/OW.gif b/plugins/DevicesDetection/images/browsers/OW.gif
index 44067148ab..44067148ab 100644
--- a/plugins/UserSettings/images/browsers/OW.gif
+++ b/plugins/DevicesDetection/images/browsers/OW.gif
diff --git a/plugins/UserSettings/images/browsers/PL.gif b/plugins/DevicesDetection/images/browsers/PL.gif
index f8b83f26ad..f8b83f26ad 100644
--- a/plugins/UserSettings/images/browsers/PL.gif
+++ b/plugins/DevicesDetection/images/browsers/PL.gif
diff --git a/plugins/UserSettings/images/browsers/PM.gif b/plugins/DevicesDetection/images/browsers/PM.gif
index 69ed94dbaf..69ed94dbaf 100644
--- a/plugins/UserSettings/images/browsers/PM.gif
+++ b/plugins/DevicesDetection/images/browsers/PM.gif
diff --git a/plugins/UserSettings/images/browsers/PO.gif b/plugins/DevicesDetection/images/browsers/PO.gif
index 0747f55675..0747f55675 100644
--- a/plugins/UserSettings/images/browsers/PO.gif
+++ b/plugins/DevicesDetection/images/browsers/PO.gif
diff --git a/plugins/UserSettings/images/browsers/PU.gif b/plugins/DevicesDetection/images/browsers/PU.gif
index 6319ae15cc..6319ae15cc 100644
--- a/plugins/UserSettings/images/browsers/PU.gif
+++ b/plugins/DevicesDetection/images/browsers/PU.gif
diff --git a/plugins/UserSettings/images/browsers/PW.gif b/plugins/DevicesDetection/images/browsers/PW.gif
index 3aae87d27c..3aae87d27c 100644
--- a/plugins/UserSettings/images/browsers/PW.gif
+++ b/plugins/DevicesDetection/images/browsers/PW.gif
diff --git a/plugins/UserSettings/images/browsers/PX.gif b/plugins/DevicesDetection/images/browsers/PX.gif
index 386d46e122..386d46e122 100644
--- a/plugins/UserSettings/images/browsers/PX.gif
+++ b/plugins/DevicesDetection/images/browsers/PX.gif
diff --git a/plugins/UserSettings/images/browsers/RK.gif b/plugins/DevicesDetection/images/browsers/RK.gif
index 72ee74a38d..72ee74a38d 100644
--- a/plugins/UserSettings/images/browsers/RK.gif
+++ b/plugins/DevicesDetection/images/browsers/RK.gif
diff --git a/plugins/UserSettings/images/browsers/SA.gif b/plugins/DevicesDetection/images/browsers/SA.gif
index fb4c89c348..fb4c89c348 100644
--- a/plugins/UserSettings/images/browsers/SA.gif
+++ b/plugins/DevicesDetection/images/browsers/SA.gif
diff --git a/plugins/UserSettings/images/browsers/SE.gif b/plugins/DevicesDetection/images/browsers/SE.gif
index 8603442161..8603442161 100644
--- a/plugins/UserSettings/images/browsers/SE.gif
+++ b/plugins/DevicesDetection/images/browsers/SE.gif
diff --git a/plugins/UserSettings/images/browsers/SF.gif b/plugins/DevicesDetection/images/browsers/SF.gif
index 4d0eef37a7..4d0eef37a7 100644
--- a/plugins/UserSettings/images/browsers/SF.gif
+++ b/plugins/DevicesDetection/images/browsers/SF.gif
diff --git a/plugins/UserSettings/images/browsers/SH.gif b/plugins/DevicesDetection/images/browsers/SH.gif
index 734c53cc43..734c53cc43 100644
--- a/plugins/UserSettings/images/browsers/SH.gif
+++ b/plugins/DevicesDetection/images/browsers/SH.gif
diff --git a/plugins/UserSettings/images/browsers/SL.gif b/plugins/DevicesDetection/images/browsers/SL.gif
index 890dd6d070..890dd6d070 100644
--- a/plugins/UserSettings/images/browsers/SL.gif
+++ b/plugins/DevicesDetection/images/browsers/SL.gif
diff --git a/plugins/UserSettings/images/browsers/SM.gif b/plugins/DevicesDetection/images/browsers/SM.gif
index 83aad8b1c6..83aad8b1c6 100644
--- a/plugins/UserSettings/images/browsers/SM.gif
+++ b/plugins/DevicesDetection/images/browsers/SM.gif
diff --git a/plugins/UserSettings/images/browsers/TB.gif b/plugins/DevicesDetection/images/browsers/TB.gif
index 9c67b76c85..9c67b76c85 100644
--- a/plugins/UserSettings/images/browsers/TB.gif
+++ b/plugins/DevicesDetection/images/browsers/TB.gif
diff --git a/plugins/UserSettings/images/browsers/TI.gif b/plugins/DevicesDetection/images/browsers/TI.gif
index 220c1126e3..220c1126e3 100644
--- a/plugins/UserSettings/images/browsers/TI.gif
+++ b/plugins/DevicesDetection/images/browsers/TI.gif
diff --git a/plugins/UserSettings/images/browsers/TZ.gif b/plugins/DevicesDetection/images/browsers/TZ.gif
index ce4524f4f0..ce4524f4f0 100644
--- a/plugins/UserSettings/images/browsers/TZ.gif
+++ b/plugins/DevicesDetection/images/browsers/TZ.gif
diff --git a/plugins/UserSettings/images/browsers/UC.gif b/plugins/DevicesDetection/images/browsers/UC.gif
index a2129a88fe..a2129a88fe 100644
--- a/plugins/UserSettings/images/browsers/UC.gif
+++ b/plugins/DevicesDetection/images/browsers/UC.gif
diff --git a/plugins/UserSettings/images/browsers/UN.gif b/plugins/DevicesDetection/images/browsers/UN.gif
index 2c44083422..2c44083422 100644
--- a/plugins/UserSettings/images/browsers/UN.gif
+++ b/plugins/DevicesDetection/images/browsers/UN.gif
diff --git a/plugins/UserSettings/images/browsers/UNK.gif b/plugins/DevicesDetection/images/browsers/UNK.gif
index 2c44083422..2c44083422 100644
--- a/plugins/UserSettings/images/browsers/UNK.gif
+++ b/plugins/DevicesDetection/images/browsers/UNK.gif
diff --git a/plugins/DevicesDetection/images/browsers/VI.gif b/plugins/DevicesDetection/images/browsers/VI.gif
new file mode 100644
index 0000000000..15d9d03fe7
--- /dev/null
+++ b/plugins/DevicesDetection/images/browsers/VI.gif
diff --git a/plugins/UserSettings/images/browsers/WE.gif b/plugins/DevicesDetection/images/browsers/WE.gif
index 3f2df63482..3f2df63482 100644
--- a/plugins/UserSettings/images/browsers/WE.gif
+++ b/plugins/DevicesDetection/images/browsers/WE.gif
diff --git a/plugins/UserSettings/images/browsers/WO.gif b/plugins/DevicesDetection/images/browsers/WO.gif
index 6638abccb4..6638abccb4 100644
--- a/plugins/UserSettings/images/browsers/WO.gif
+++ b/plugins/DevicesDetection/images/browsers/WO.gif
diff --git a/plugins/UserSettings/images/browsers/WP.gif b/plugins/DevicesDetection/images/browsers/WP.gif
index 92d9d20f75..92d9d20f75 100644
--- a/plugins/UserSettings/images/browsers/WP.gif
+++ b/plugins/DevicesDetection/images/browsers/WP.gif
diff --git a/plugins/UserSettings/images/browsers/YA.gif b/plugins/DevicesDetection/images/browsers/YA.gif
index 106121224d..106121224d 100644
--- a/plugins/UserSettings/images/browsers/YA.gif
+++ b/plugins/DevicesDetection/images/browsers/YA.gif
diff --git a/plugins/UserSettings/images/os/3DS.gif b/plugins/DevicesDetection/images/os/3DS.gif
index 39e72e68f5..39e72e68f5 100644
--- a/plugins/UserSettings/images/os/3DS.gif
+++ b/plugins/DevicesDetection/images/os/3DS.gif
diff --git a/plugins/UserSettings/images/os/AIX.gif b/plugins/DevicesDetection/images/os/AIX.gif
index 1b8d966190..1b8d966190 100644
--- a/plugins/UserSettings/images/os/AIX.gif
+++ b/plugins/DevicesDetection/images/os/AIX.gif
diff --git a/plugins/UserSettings/images/os/AMG.gif b/plugins/DevicesDetection/images/os/AMG.gif
index 1b9e8a6397..1b9e8a6397 100644
--- a/plugins/UserSettings/images/os/AMG.gif
+++ b/plugins/DevicesDetection/images/os/AMG.gif
diff --git a/plugins/UserSettings/images/os/AMI.gif b/plugins/DevicesDetection/images/os/AMI.gif
index 00242b215c..00242b215c 100644
--- a/plugins/UserSettings/images/os/AMI.gif
+++ b/plugins/DevicesDetection/images/os/AMI.gif
diff --git a/plugins/UserSettings/images/os/AND.gif b/plugins/DevicesDetection/images/os/AND.gif
index bf0ade5551..bf0ade5551 100644
--- a/plugins/UserSettings/images/os/AND.gif
+++ b/plugins/DevicesDetection/images/os/AND.gif
diff --git a/plugins/UserSettings/images/os/ARL.gif b/plugins/DevicesDetection/images/os/ARL.gif
index ac92b2de6b..ac92b2de6b 100644
--- a/plugins/UserSettings/images/os/ARL.gif
+++ b/plugins/DevicesDetection/images/os/ARL.gif
diff --git a/plugins/UserSettings/images/os/BBX.gif b/plugins/DevicesDetection/images/os/BBX.gif
index 295e37eafa..295e37eafa 100644
--- a/plugins/UserSettings/images/os/BBX.gif
+++ b/plugins/DevicesDetection/images/os/BBX.gif
diff --git a/plugins/UserSettings/images/os/BEO.gif b/plugins/DevicesDetection/images/os/BEO.gif
index e22c9437ed..e22c9437ed 100644
--- a/plugins/UserSettings/images/os/BEO.gif
+++ b/plugins/DevicesDetection/images/os/BEO.gif
diff --git a/plugins/UserSettings/images/os/BLB.gif b/plugins/DevicesDetection/images/os/BLB.gif
index e8316ef586..e8316ef586 100644
--- a/plugins/UserSettings/images/os/BLB.gif
+++ b/plugins/DevicesDetection/images/os/BLB.gif
diff --git a/plugins/UserSettings/images/os/BSD.gif b/plugins/DevicesDetection/images/os/BSD.gif
index daeeb84007..daeeb84007 100644
--- a/plugins/UserSettings/images/os/BSD.gif
+++ b/plugins/DevicesDetection/images/os/BSD.gif
diff --git a/plugins/UserSettings/images/os/BTR.gif b/plugins/DevicesDetection/images/os/BTR.gif
index bdba9fad3f..bdba9fad3f 100644
--- a/plugins/UserSettings/images/os/BTR.gif
+++ b/plugins/DevicesDetection/images/os/BTR.gif
diff --git a/plugins/UserSettings/images/os/CES.gif b/plugins/DevicesDetection/images/os/CES.gif
index 028958c94a..028958c94a 100644
--- a/plugins/UserSettings/images/os/CES.gif
+++ b/plugins/DevicesDetection/images/os/CES.gif
diff --git a/plugins/UserSettings/images/os/COS.gif b/plugins/DevicesDetection/images/os/COS.gif
index 793e0fad3b..793e0fad3b 100644
--- a/plugins/UserSettings/images/os/COS.gif
+++ b/plugins/DevicesDetection/images/os/COS.gif
diff --git a/plugins/UserSettings/images/os/DFB.gif b/plugins/DevicesDetection/images/os/DFB.gif
index b869c133f4..b869c133f4 100644
--- a/plugins/UserSettings/images/os/DFB.gif
+++ b/plugins/DevicesDetection/images/os/DFB.gif
diff --git a/plugins/UserSettings/images/os/DSI.gif b/plugins/DevicesDetection/images/os/DSI.gif
index c4030a8f77..c4030a8f77 100644
--- a/plugins/UserSettings/images/os/DSI.gif
+++ b/plugins/DevicesDetection/images/os/DSI.gif
diff --git a/plugins/UserSettings/images/os/FED.gif b/plugins/DevicesDetection/images/os/FED.gif
index 2e49af9d7c..2e49af9d7c 100644
--- a/plugins/UserSettings/images/os/FED.gif
+++ b/plugins/DevicesDetection/images/os/FED.gif
diff --git a/plugins/UserSettings/images/os/FOS.gif b/plugins/DevicesDetection/images/os/FOS.gif
index eb024c408a..eb024c408a 100644
--- a/plugins/UserSettings/images/os/FOS.gif
+++ b/plugins/DevicesDetection/images/os/FOS.gif
diff --git a/plugins/UserSettings/images/os/GNT.gif b/plugins/DevicesDetection/images/os/GNT.gif
index 47558caf9a..47558caf9a 100644
--- a/plugins/UserSettings/images/os/GNT.gif
+++ b/plugins/DevicesDetection/images/os/GNT.gif
diff --git a/plugins/UserSettings/images/os/GTV.gif b/plugins/DevicesDetection/images/os/GTV.gif
index bdc4aefd88..bdc4aefd88 100644
--- a/plugins/UserSettings/images/os/GTV.gif
+++ b/plugins/DevicesDetection/images/os/GTV.gif
diff --git a/plugins/UserSettings/images/os/HPX.gif b/plugins/DevicesDetection/images/os/HPX.gif
index 96ee1c01c3..96ee1c01c3 100644
--- a/plugins/UserSettings/images/os/HPX.gif
+++ b/plugins/DevicesDetection/images/os/HPX.gif
diff --git a/plugins/UserSettings/images/os/IOS.gif b/plugins/DevicesDetection/images/os/IOS.gif
index 17ef80cd53..17ef80cd53 100644
--- a/plugins/UserSettings/images/os/IOS.gif
+++ b/plugins/DevicesDetection/images/os/IOS.gif
diff --git a/plugins/UserSettings/images/os/IPA.gif b/plugins/DevicesDetection/images/os/IPA.gif
index 24a37f246c..24a37f246c 100644
--- a/plugins/UserSettings/images/os/IPA.gif
+++ b/plugins/DevicesDetection/images/os/IPA.gif
diff --git a/plugins/UserSettings/images/os/IPD.gif b/plugins/DevicesDetection/images/os/IPD.gif
index 117b6d2867..117b6d2867 100644
--- a/plugins/UserSettings/images/os/IPD.gif
+++ b/plugins/DevicesDetection/images/os/IPD.gif
diff --git a/plugins/UserSettings/images/os/IPH.gif b/plugins/DevicesDetection/images/os/IPH.gif
index 71ff7d7592..71ff7d7592 100644
--- a/plugins/UserSettings/images/os/IPH.gif
+++ b/plugins/DevicesDetection/images/os/IPH.gif
diff --git a/plugins/UserSettings/images/os/IRI.gif b/plugins/DevicesDetection/images/os/IRI.gif
index 796d547e52..796d547e52 100644
--- a/plugins/UserSettings/images/os/IRI.gif
+++ b/plugins/DevicesDetection/images/os/IRI.gif
diff --git a/plugins/UserSettings/images/os/KBT.gif b/plugins/DevicesDetection/images/os/KBT.gif
index 28ba33292f..28ba33292f 100644
--- a/plugins/UserSettings/images/os/KBT.gif
+++ b/plugins/DevicesDetection/images/os/KBT.gif
diff --git a/plugins/UserSettings/images/os/KNO.gif b/plugins/DevicesDetection/images/os/KNO.gif
index 3433a71a5f..3433a71a5f 100644
--- a/plugins/UserSettings/images/os/KNO.gif
+++ b/plugins/DevicesDetection/images/os/KNO.gif
diff --git a/plugins/UserSettings/images/os/LBT.gif b/plugins/DevicesDetection/images/os/LBT.gif
index 47fad1402a..47fad1402a 100644
--- a/plugins/UserSettings/images/os/LBT.gif
+++ b/plugins/DevicesDetection/images/os/LBT.gif
diff --git a/plugins/UserSettings/images/os/LIN.gif b/plugins/DevicesDetection/images/os/LIN.gif
index c76dfce8ff..c76dfce8ff 100644
--- a/plugins/UserSettings/images/os/LIN.gif
+++ b/plugins/DevicesDetection/images/os/LIN.gif
diff --git a/plugins/UserSettings/images/os/MAC.gif b/plugins/DevicesDetection/images/os/MAC.gif
index 1ef41d5c75..1ef41d5c75 100644
--- a/plugins/UserSettings/images/os/MAC.gif
+++ b/plugins/DevicesDetection/images/os/MAC.gif
diff --git a/plugins/UserSettings/images/os/MAE.gif b/plugins/DevicesDetection/images/os/MAE.gif
index 8573a0dc25..8573a0dc25 100755
--- a/plugins/UserSettings/images/os/MAE.gif
+++ b/plugins/DevicesDetection/images/os/MAE.gif
diff --git a/plugins/UserSettings/images/os/MDR.gif b/plugins/DevicesDetection/images/os/MDR.gif
index b4d8d5e348..b4d8d5e348 100644
--- a/plugins/UserSettings/images/os/MDR.gif
+++ b/plugins/DevicesDetection/images/os/MDR.gif
diff --git a/plugins/UserSettings/images/os/MIN.gif b/plugins/DevicesDetection/images/os/MIN.gif
index 71ce560b25..71ce560b25 100644
--- a/plugins/UserSettings/images/os/MIN.gif
+++ b/plugins/DevicesDetection/images/os/MIN.gif
diff --git a/plugins/UserSettings/images/os/NBS.gif b/plugins/DevicesDetection/images/os/NBS.gif
index d282ad1a44..d282ad1a44 100644
--- a/plugins/UserSettings/images/os/NBS.gif
+++ b/plugins/DevicesDetection/images/os/NBS.gif
diff --git a/plugins/UserSettings/images/os/NDS.gif b/plugins/DevicesDetection/images/os/NDS.gif
index bca132aad7..bca132aad7 100644
--- a/plugins/UserSettings/images/os/NDS.gif
+++ b/plugins/DevicesDetection/images/os/NDS.gif
diff --git a/plugins/UserSettings/images/os/OBS.gif b/plugins/DevicesDetection/images/os/OBS.gif
index 993c8a4ebe..993c8a4ebe 100644
--- a/plugins/UserSettings/images/os/OBS.gif
+++ b/plugins/DevicesDetection/images/os/OBS.gif
diff --git a/plugins/UserSettings/images/os/OS2.gif b/plugins/DevicesDetection/images/os/OS2.gif
index ae96a6972c..ae96a6972c 100644
--- a/plugins/UserSettings/images/os/OS2.gif
+++ b/plugins/DevicesDetection/images/os/OS2.gif
diff --git a/plugins/UserSettings/images/os/POS.gif b/plugins/DevicesDetection/images/os/POS.gif
index f03e0d15f4..f03e0d15f4 100644
--- a/plugins/UserSettings/images/os/POS.gif
+++ b/plugins/DevicesDetection/images/os/POS.gif
diff --git a/plugins/UserSettings/images/os/PPY.gif b/plugins/DevicesDetection/images/os/PPY.gif
index 20e8ef3291..20e8ef3291 100644
--- a/plugins/UserSettings/images/os/PPY.gif
+++ b/plugins/DevicesDetection/images/os/PPY.gif
diff --git a/plugins/UserSettings/images/os/PS3.gif b/plugins/DevicesDetection/images/os/PS3.gif
index f087c11cb8..f087c11cb8 100644
--- a/plugins/UserSettings/images/os/PS3.gif
+++ b/plugins/DevicesDetection/images/os/PS3.gif
diff --git a/plugins/UserSettings/images/os/PSP.gif b/plugins/DevicesDetection/images/os/PSP.gif
index b6003b6498..b6003b6498 100644
--- a/plugins/UserSettings/images/os/PSP.gif
+++ b/plugins/DevicesDetection/images/os/PSP.gif
diff --git a/plugins/UserSettings/images/os/PSV.gif b/plugins/DevicesDetection/images/os/PSV.gif
index 65b4c23871..65b4c23871 100644
--- a/plugins/UserSettings/images/os/PSV.gif
+++ b/plugins/DevicesDetection/images/os/PSV.gif
diff --git a/plugins/UserSettings/images/os/QNX.gif b/plugins/DevicesDetection/images/os/QNX.gif
index 9a2a70f5c3..9a2a70f5c3 100644
--- a/plugins/UserSettings/images/os/QNX.gif
+++ b/plugins/DevicesDetection/images/os/QNX.gif
diff --git a/plugins/UserSettings/images/os/RHT.gif b/plugins/DevicesDetection/images/os/RHT.gif
index 043947cecb..043947cecb 100644
--- a/plugins/UserSettings/images/os/RHT.gif
+++ b/plugins/DevicesDetection/images/os/RHT.gif
diff --git a/plugins/UserSettings/images/os/ROS.gif b/plugins/DevicesDetection/images/os/ROS.gif
index a445b66182..a445b66182 100644
--- a/plugins/UserSettings/images/os/ROS.gif
+++ b/plugins/DevicesDetection/images/os/ROS.gif
diff --git a/plugins/UserSettings/images/os/SAF.gif b/plugins/DevicesDetection/images/os/SAF.gif
index e5fe8a8f45..e5fe8a8f45 100644
--- a/plugins/UserSettings/images/os/SAF.gif
+++ b/plugins/DevicesDetection/images/os/SAF.gif
diff --git a/plugins/UserSettings/images/os/SBA.gif b/plugins/DevicesDetection/images/os/SBA.gif
index 079ccc21d8..079ccc21d8 100644
--- a/plugins/UserSettings/images/os/SBA.gif
+++ b/plugins/DevicesDetection/images/os/SBA.gif
diff --git a/plugins/UserSettings/images/os/SLW.gif b/plugins/DevicesDetection/images/os/SLW.gif
index cf6f2be297..cf6f2be297 100644
--- a/plugins/UserSettings/images/os/SLW.gif
+++ b/plugins/DevicesDetection/images/os/SLW.gif
diff --git a/plugins/UserSettings/images/os/SOS.gif b/plugins/DevicesDetection/images/os/SOS.gif
index 34fc3248e4..34fc3248e4 100644
--- a/plugins/UserSettings/images/os/SOS.gif
+++ b/plugins/DevicesDetection/images/os/SOS.gif
diff --git a/plugins/UserSettings/images/os/SSE.gif b/plugins/DevicesDetection/images/os/SSE.gif
index 3253aa2a75..3253aa2a75 100644
--- a/plugins/UserSettings/images/os/SSE.gif
+++ b/plugins/DevicesDetection/images/os/SSE.gif
diff --git a/plugins/UserSettings/images/os/SYL.gif b/plugins/DevicesDetection/images/os/SYL.gif
index 27bd023afc..27bd023afc 100644
--- a/plugins/UserSettings/images/os/SYL.gif
+++ b/plugins/DevicesDetection/images/os/SYL.gif
diff --git a/plugins/UserSettings/images/os/SYM.gif b/plugins/DevicesDetection/images/os/SYM.gif
index cd174dba19..cd174dba19 100644
--- a/plugins/UserSettings/images/os/SYM.gif
+++ b/plugins/DevicesDetection/images/os/SYM.gif
diff --git a/plugins/UserSettings/images/os/T64.gif b/plugins/DevicesDetection/images/os/T64.gif
index 50b64ba9ec..50b64ba9ec 100644
--- a/plugins/UserSettings/images/os/T64.gif
+++ b/plugins/DevicesDetection/images/os/T64.gif
diff --git a/plugins/UserSettings/images/os/TIZ.gif b/plugins/DevicesDetection/images/os/TIZ.gif
index 7563a5e31d..7563a5e31d 100644
--- a/plugins/UserSettings/images/os/TIZ.gif
+++ b/plugins/DevicesDetection/images/os/TIZ.gif
diff --git a/plugins/UserSettings/images/os/UBT.gif b/plugins/DevicesDetection/images/os/UBT.gif
index c4789e0456..c4789e0456 100644
--- a/plugins/UserSettings/images/os/UBT.gif
+++ b/plugins/DevicesDetection/images/os/UBT.gif
diff --git a/plugins/UserSettings/images/os/UNK.gif b/plugins/DevicesDetection/images/os/UNK.gif
index 2c44083422..2c44083422 100644
--- a/plugins/UserSettings/images/os/UNK.gif
+++ b/plugins/DevicesDetection/images/os/UNK.gif
diff --git a/plugins/UserSettings/images/os/VMS.gif b/plugins/DevicesDetection/images/os/VMS.gif
index 000d08a36f..000d08a36f 100644
--- a/plugins/UserSettings/images/os/VMS.gif
+++ b/plugins/DevicesDetection/images/os/VMS.gif
diff --git a/plugins/UserSettings/images/os/WCE.gif b/plugins/DevicesDetection/images/os/WCE.gif
index db610368b9..db610368b9 100644
--- a/plugins/UserSettings/images/os/WCE.gif
+++ b/plugins/DevicesDetection/images/os/WCE.gif
diff --git a/plugins/UserSettings/images/os/WII.gif b/plugins/DevicesDetection/images/os/WII.gif
index 7957a9106a..7957a9106a 100644
--- a/plugins/UserSettings/images/os/WII.gif
+++ b/plugins/DevicesDetection/images/os/WII.gif
diff --git a/plugins/UserSettings/images/os/WIN.gif b/plugins/DevicesDetection/images/os/WIN.gif
index 486f78064a..486f78064a 100644
--- a/plugins/UserSettings/images/os/WIN.gif
+++ b/plugins/DevicesDetection/images/os/WIN.gif
diff --git a/plugins/UserSettings/images/os/WIU.gif b/plugins/DevicesDetection/images/os/WIU.gif
index 6d7e64e162..6d7e64e162 100644
--- a/plugins/UserSettings/images/os/WIU.gif
+++ b/plugins/DevicesDetection/images/os/WIU.gif
diff --git a/plugins/UserSettings/images/os/WMO.gif b/plugins/DevicesDetection/images/os/WMO.gif
index 773c4d48d1..773c4d48d1 100755
--- a/plugins/UserSettings/images/os/WMO.gif
+++ b/plugins/DevicesDetection/images/os/WMO.gif
diff --git a/plugins/UserSettings/images/os/WOS.gif b/plugins/DevicesDetection/images/os/WOS.gif
index 2717d08226..2717d08226 100644
--- a/plugins/UserSettings/images/os/WOS.gif
+++ b/plugins/DevicesDetection/images/os/WOS.gif
diff --git a/plugins/UserSettings/images/os/WPH.gif b/plugins/DevicesDetection/images/os/WPH.gif
index 3ca9cebca0..3ca9cebca0 100755
--- a/plugins/UserSettings/images/os/WPH.gif
+++ b/plugins/DevicesDetection/images/os/WPH.gif
diff --git a/plugins/UserSettings/images/os/WRT.gif b/plugins/DevicesDetection/images/os/WRT.gif
index 76ffe21587..76ffe21587 100644
--- a/plugins/UserSettings/images/os/WRT.gif
+++ b/plugins/DevicesDetection/images/os/WRT.gif
diff --git a/plugins/UserSettings/images/os/XBT.gif b/plugins/DevicesDetection/images/os/XBT.gif
index a80d2291cc..a80d2291cc 100644
--- a/plugins/UserSettings/images/os/XBT.gif
+++ b/plugins/DevicesDetection/images/os/XBT.gif
diff --git a/plugins/UserSettings/images/os/XBX.gif b/plugins/DevicesDetection/images/os/XBX.gif
index a9d567660e..a9d567660e 100644
--- a/plugins/UserSettings/images/os/XBX.gif
+++ b/plugins/DevicesDetection/images/os/XBX.gif
diff --git a/plugins/UserSettings/images/os/YNS.gif b/plugins/DevicesDetection/images/os/YNS.gif
index 15f4c78e8f..15f4c78e8f 100644
--- a/plugins/UserSettings/images/os/YNS.gif
+++ b/plugins/DevicesDetection/images/os/YNS.gif
diff --git a/plugins/DevicesDetection/lang/am.json b/plugins/DevicesDetection/lang/am.json
index a7169d53ea..05520fd63d 100644
--- a/plugins/DevicesDetection/lang/am.json
+++ b/plugins/DevicesDetection/lang/am.json
@@ -1,5 +1,8 @@
 {
     "DevicesDetection": {
-        "BrowserFamily": "የማሰሻ ቤተሰብ"
+        "BrowserFamily": "የማሰሻ ቤተሰብ",
+        "Browsers": "ማሰሻዎች",
+        "ColumnBrowser": "ማሰሺያ",
+        "WidgetBrowsers": "የጎብኚ ማሰሻዎች"
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/ar.json b/plugins/DevicesDetection/lang/ar.json
index f2ee08d578..996959555b 100644
--- a/plugins/DevicesDetection/lang/ar.json
+++ b/plugins/DevicesDetection/lang/ar.json
@@ -1,6 +1,11 @@
 {
     "DevicesDetection": {
         "BrowserFamily": "عائلة المتصفح",
-        "BrowserVersion": "إصدار المتصفح"
+        "Browsers": "المتصفحات",
+        "BrowserVersion": "إصدار المتصفح",
+        "ColumnBrowser": "المتصفح",
+        "ColumnOperatingSystem": "نظام التشغيل",
+        "OperatingSystems": "أنظمة التشغيل",
+        "WidgetBrowsers": "متصفحات الزوار"
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/be.json b/plugins/DevicesDetection/lang/be.json
index 93276a9c32..b080851826 100644
--- a/plugins/DevicesDetection/lang/be.json
+++ b/plugins/DevicesDetection/lang/be.json
@@ -2,6 +2,12 @@
     "DevicesDetection": {
         "BrowserEngineDocumentation": "Гэты графік паказвае браўзэры наведвальнікаў, разбітыя па сем'ях. %s Найбольш важная інфармацыю для вэб-распрацоўнікаў у тым, што я ны могуць даведацца аб тыпах вэб-рэндэрынгу сваіх наведвальнікаў. Пазнакі ўтрымліваюць імёны рухавікоў найбольш распаўсюджаныя адзначаныя ў браўзэрам дужках.",
         "BrowserFamily": "Сямейства браўзэраў",
-        "BrowserVersion": "Версія браўзэра"
+        "Browsers": "Па браўзарах",
+        "BrowserVersion": "Версія браўзэра",
+        "ColumnBrowser": "Браўзэр",
+        "ColumnOperatingSystem": "Аперацыйная сістэма",
+        "OperatingSystems": "Па аперацыйных сістэмах",
+        "WidgetBrowsers": "Браўзары карыстачоў",
+        "WidgetBrowsersDocumentation": "Гэтая справаздача змяшчае інфармацыю аб тым, які браўзэр выкарыстоўвалі наведвальнікі. Кожная версія браўзэра пералічана асобна."
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/bg.json b/plugins/DevicesDetection/lang/bg.json
index 93ca777067..1df6ada9c4 100644
--- a/plugins/DevicesDetection/lang/bg.json
+++ b/plugins/DevicesDetection/lang/bg.json
@@ -2,10 +2,13 @@
     "DevicesDetection": {
         "BrowserEngineDocumentation": "Тази таблица показва браузърите на вашите потребители ,разделени по фамилии. %s Най-важната информация за уеб разработчиците е какъв тип технология за обработка са използвали посетителите. Етикета показва имената на технологиите, следвани от браузера, който е бил използван, поставен в скоби.",
         "BrowserFamily": "Фамилия браузъри",
+        "Browsers": "Браузъри",
         "BrowserVersion": "Версия на браузъра",
         "BrowserVersions": "Версии на браузъра",
         "Camera": "Камера",
         "CarBrowser": "Браузър, който се използва в кола",
+        "ColumnBrowser": "Браузър и версия",
+        "ColumnOperatingSystem": "Операционна система и версия",
         "Console": "Конзола",
         "dataTableLabelBrands": "Марка",
         "dataTableLabelModels": "Модел",
@@ -18,12 +21,15 @@
         "DevicesDetection": "Устройства, които използва посетителят",
         "DeviceType": "Вид устройство",
         "OperatingSystemFamilies": "Вид операционна система",
+        "OperatingSystemFamily": "Семейство на оперативната система",
+        "OperatingSystems": "Операционни системи",
         "OperatingSystemVersions": "Версия на операционната система",
-        "PluginDescription": "Тази добавка предоставя допълнителна информация относно мобилните устройства: марка (производител), модел (версия на устройството), подобрен механизъм за установяване на типа устройство (телевизор, конзола, смартфон, компютър и др.) и т.н. Тази добавка добавя нов отчет „Посетители > Устройства“.",
         "SmartDisplay": "„Умен“ дисплей",
         "Smartphone": "Смартфон",
         "submenu": "Устройства",
         "Tablet": "Таблет",
-        "TV": "ТВ"
+        "TV": "ТВ",
+        "WidgetBrowsers": "Браузъри на посетителите",
+        "WidgetBrowsersDocumentation": "Този отчет показва информация, за това какъв браузър са използвали вашите потребители. Всеки браузер е показан поотделно."
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/ca.json b/plugins/DevicesDetection/lang/ca.json
index 9899fffa9d..74eaff4951 100644
--- a/plugins/DevicesDetection/lang/ca.json
+++ b/plugins/DevicesDetection/lang/ca.json
@@ -2,6 +2,13 @@
     "DevicesDetection": {
         "BrowserEngineDocumentation": "Aquest gràfic mostra els navegadors dels vostres visitants dividits en famílies. %s La informació més important per als desenvolupadors web es quin tipus de sistema de renderització estan utilitzant els seus visitants. Les etiquetiquetes contenen els noms dels sistemes, seguit pel navegador més comú utilitzant aquest sistema.",
         "BrowserFamily": "Família del navegador",
-        "BrowserVersion": "Versió del navegador"
+        "Browsers": "Navegadors",
+        "BrowserVersion": "Versió del navegador",
+        "ColumnBrowser": "Navegador",
+        "ColumnOperatingSystem": "Sistema operatiu",
+        "OperatingSystemFamily": "Família del Sistema Operatiu",
+        "OperatingSystems": "Sistemes operatius",
+        "WidgetBrowsers": "Navegadors",
+        "WidgetBrowsersDocumentation": "Aquest informe conté informació sobre quin tipus de navegador està utilitzant els vostres visitants. Cada versió del navegador es llista per separat."
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/cs.json b/plugins/DevicesDetection/lang/cs.json
index 141c763064..fc71620cc3 100644
--- a/plugins/DevicesDetection/lang/cs.json
+++ b/plugins/DevicesDetection/lang/cs.json
@@ -4,10 +4,14 @@
         "BrowserEngineDocumentation": "Tento graf zobrazuje prohlížeče vašich návštěvníků odle prodin prohlížečů. %s Nejdůležitější informací pro webové vývojáře je to, jaká vykreslovací jádra návštěvníci používají. Název vykreslovacího jádra je v popisku následován v závorkách nejčastějším prohlížečem, který ho používá.",
         "BrowserEngines": "Vykreslovací jádra",
         "BrowserFamily": "Rodina Web prohlížeče",
+        "Browsers": "Web prohlížeče",
         "BrowserVersion": "Verze prohlížeče",
         "BrowserVersions": "Verze prohlížečů",
         "Camera": "Fotoaparát",
         "CarBrowser": "Prohlížeč v autě",
+        "ColumnBrowser": "Web prohlížeč",
+        "ColumnOperatingSystem": "Operační systém",
+        "ColumnOperatingSystemVersion": "Verze operačního systému",
         "Console": "Konzole",
         "dataTableLabelBrands": "Značka",
         "dataTableLabelModels": "Model",
@@ -21,13 +25,18 @@
         "DeviceType": "Typ zařízení",
         "FeaturePhone": "Ukázkový telefon",
         "OperatingSystemFamilies": "Rodiny operačních systémů",
+        "OperatingSystemFamily": "Operační systém",
+        "OperatingSystems": "Operační systémy",
         "OperatingSystemVersions": "Verze operačního systému",
-        "PluginDescription": "Tento zásuvný modul poskytuje rozšířené informace o mobilních zařízeních, jako např. výrobce, model (verze zařízení), vylepšenou detekci typu zařízení (TV, konzole, Chytré telefony, PC) a další. Tento zásuvný modul přidává nové hlášení v sekci návštěvníci > zařízení.",
+        "PluginDescription": "Poskytuje rozšířené informace o zařízení návštěvníků, jako je značka (výrobce), model (verze zařízení), typ zařízení (tv, konzole, chytré telefony, stolní PC, aj.) a více.",
+        "PortableMediaPlayer": "Přenosný přehrávač médií",
         "SmartDisplay": "Chytrý displej",
         "Smartphone": "Chytrý telefon",
         "submenu": "Zařízení",
         "Tablet": "Tablet",
         "TV": "Tv",
-        "UserAgent": "User-Agent"
+        "UserAgent": "User-Agent",
+        "WidgetBrowsers": "Web prohlížeče návštěvníků",
+        "WidgetBrowsersDocumentation": "Toto hlášení obsahuje informace o tom, jaký druh prohlížeče vaši návštěvníci použili. Každá verze je počítána samostatně."
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/da.json b/plugins/DevicesDetection/lang/da.json
index 6a61ff9696..d7338dcad0 100644
--- a/plugins/DevicesDetection/lang/da.json
+++ b/plugins/DevicesDetection/lang/da.json
@@ -2,12 +2,14 @@
     "DevicesDetection": {
         "BrowserEngine": "Browser",
         "BrowserEngineDocumentation": "Diagrammet viser de besøgendes browsere opdelt i grupper. %s De vigtigste oplysninger for web-udviklere er, hvilken slags rendering motor de besøgende bruger. Etiketterne indeholder navnene på motorerne, efterfulgt af de mest almindelige browsere, der benytter motoren i parentes.",
-        "BrowserEngines": "Browser",
         "BrowserFamily": "Browsertype",
+        "Browsers": "Browsere",
         "BrowserVersion": "Browserversion",
         "BrowserVersions": "Browser-versioner",
         "Camera": "Kamera",
         "CarBrowser": "Bil browser",
+        "ColumnBrowser": "Browser",
+        "ColumnOperatingSystem": "Operativsystem",
         "Console": "Konsol",
         "dataTableLabelBrands": "Mærke",
         "dataTableLabelModels": "Model",
@@ -21,13 +23,16 @@
         "DeviceType": "Enhedstypen",
         "FeaturePhone": "Telefonfunktioner",
         "OperatingSystemFamilies": "Operativsystem familier",
+        "OperatingSystemFamily": "Operativsystemsfamilie",
+        "OperatingSystems": "Operativsystemer",
         "OperatingSystemVersions": "Operativsystem-versioner",
-        "PluginDescription": "Udvidelsen indeholderudvidet information om mobile enheder, såsom mærke (producent), model (enhed version) og bedre enhedstype detektion (tv, konsoller, smartphones, desktop, osv). Programudvidelsen tilføjer en ny rapport i 'Besøgende > Enheder'.",
         "SmartDisplay": "Smart skærm",
         "Smartphone": "Smartphone",
         "submenu": "Enheder",
         "Tablet": "Tablet",
         "TV": "TV",
-        "UserAgent": "Brugeragent"
+        "UserAgent": "Brugeragent",
+        "WidgetBrowsers": "Besøgendes browser",
+        "WidgetBrowsersDocumentation": "Rapporten indeholder oplysninger om hvilken browser de besøgende bruger. Hver version er angivet særskilt."
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/de.json b/plugins/DevicesDetection/lang/de.json
index f9ef47bda5..4c50475af1 100644
--- a/plugins/DevicesDetection/lang/de.json
+++ b/plugins/DevicesDetection/lang/de.json
@@ -2,12 +2,16 @@
     "DevicesDetection": {
         "BrowserEngine": "Browser",
         "BrowserEngineDocumentation": "Dieser Graph zeit Ihnen die Browser Ihrer Besucher aufgeteilt nach Browserfamilien. %s Die wichtigste Information für Webentwickler ist, welche Rendering Engine Besucher verwenden. Die Beschriftungen enthalten den Namen der Engine und in Klammern den Namen des bekanntesten Browsers, der diese verwendet.",
-        "BrowserEngines": "Browser",
+        "BrowserEngines": "Browser-Engines",
         "BrowserFamily": "Browserfamilie",
+        "Browsers": "Browser",
         "BrowserVersion": "Browserversion",
         "BrowserVersions": "Browser Versionen",
         "Camera": "Digitalcamera",
         "CarBrowser": "PKW-Browser",
+        "ColumnBrowser": "Browser",
+        "ColumnOperatingSystem": "Betriebssystem",
+        "ColumnOperatingSystemVersion": "Betriebssystem-Version",
         "Console": "Konsole",
         "dataTableLabelBrands": "Marke",
         "dataTableLabelModels": "Modell",
@@ -21,13 +25,18 @@
         "DeviceType": "Gerätetyp",
         "FeaturePhone": "Feature-Phone",
         "OperatingSystemFamilies": "Betriebssystem Familien",
+        "OperatingSystemFamily": "Betriebssystem-Familie",
+        "OperatingSystems": "Betriebssysteme",
         "OperatingSystemVersions": "Betriebssystem Versionen",
-        "PluginDescription": "Dieses Plugin stellt erweiterte Informationen über mobile Geräte, wie Marke (Hersteller), Modell (Geräteversion), bessere Gerätetyperkennung (TV, Konsolen, Smartphones, Desktop, etc) und mehr bereit. Dieses Plugin fügt einen neuen Bericht unter 'Besucher > Geräte' hinzu.",
+        "PluginDescription": "Unterstützt erweiterte Informationen über Benutzergeräte, wie Marke (Hersteller), Modell (Geräteversion), Gerätetyp (Fernseher, Konsolen, Smartphones, Desktops, usw.) und mehr.",
+        "PortableMediaPlayer": "Portable Mediengeräte",
         "SmartDisplay": "Smart Display",
         "Smartphone": "Smartphone",
         "submenu": "Geräte",
         "Tablet": "Tablet",
         "TV": "TV",
-        "UserAgent": "User-Agent"
+        "UserAgent": "User-Agent",
+        "WidgetBrowsers": "Besucher-Browser",
+        "WidgetBrowsersDocumentation": "Dieser Bericht enthält Informationen über die Browser Ihrer Besucher. Jede Version eines Browsers wird separat aufgelistet."
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/el.json b/plugins/DevicesDetection/lang/el.json
index 49cfa717cf..b8c18a94cb 100644
--- a/plugins/DevicesDetection/lang/el.json
+++ b/plugins/DevicesDetection/lang/el.json
@@ -4,10 +4,14 @@
         "BrowserEngineDocumentation": "Αυτό το διάγραμμα δείχνει τους φυλλομετρητές των επισκεπτών σε οικογένειες φυλλομετρητών. %s Η πιο σημαντική πληροφορία για τους δημιουργούς ιστοσελίδων είναι οι μηχανές μετάφρασης που χρησιμοποιούν οι επισκέπτες. Οι ετικέτες περιέχουν τα ονόματα των μηχανών και σε εισαγωγικά τον πιο κοινό φυλλομετρητή που τη χρησιμοποιεί.",
         "BrowserEngines": "Μηχανές προγράμματος πλοήγησης",
         "BrowserFamily": "Οικογένεια φυλλομετρητών",
+        "Browsers": "Φυλλομετρητές",
         "BrowserVersion": "Έκδοση φυλλομετρητή",
         "BrowserVersions": "Εκδόσεις προγραμμάτων περιήγησης",
         "Camera": "Κάμερα",
         "CarBrowser": "Πρόγραμμα περιήγησης αυτοκινήτου",
+        "ColumnBrowser": "Φυλλομετρητής",
+        "ColumnOperatingSystem": "Λειτουργικό σύστημα",
+        "ColumnOperatingSystemVersion": "Έκδοση του λειτουργικού συστήματος",
         "Console": "Κονσόλα",
         "dataTableLabelBrands": "Μάρκα",
         "dataTableLabelModels": "Μοντέλο",
@@ -21,13 +25,18 @@
         "DeviceType": "Τύπος συσκευής",
         "FeaturePhone": "Τηλέφωνο",
         "OperatingSystemFamilies": "Οικογένειες Λειτουργικών Συστημάτων",
+        "OperatingSystemFamily": "Οικογένεια Λειτουργικού Συστήματος",
+        "OperatingSystems": "Λειτουργικά συστήματα",
         "OperatingSystemVersions": "Εκδόσεις Λειτουργικών Συστημάτων",
-        "PluginDescription": "Το πρόσθετο παρέχει εκτεταμένες πληροφορίες σχετικά με φορητές συσκευές, όπως Μάρκα (κατασκευαστής), Μοντέλο (έκδοση συσκευής), καλύτερο εντοπισμό τύπου συσκευής (τηλεόραση, κονσόλες, έξυπνα τηλέφωνα, επιτραπέζιοι υπολογιστές, κτλ.) και πολλά άλλα. Το πρόσθετο προσθέτει μια νέα αναφορά στους 'Επισκέπτες > Συσκευές'.",
+        "PluginDescription": "Παρέχει εκτεταμένες πληροφορίες σχετικά με τις συσκευές χρήστη, όπως Μάρκα (κατασκευαστής), Μοντέλο (έκδοση συσκευής), τύπος συσκευής (τηλεόραση, κονσόλες, έξυπνα τηλέφωνα, υπολογιστές, κτλ.) και περισσότερα.",
+        "PortableMediaPlayer": "Φορητή συσκευή αναπαραγωγής",
         "SmartDisplay": "Έξυπνη οθόνη",
         "Smartphone": "Έξυπνο κινητό",
         "submenu": "Συσκευές",
         "Tablet": "Ταμπλέτα",
         "TV": "Τηλεόραση",
-        "UserAgent": "Πρόγραμμα πελάτη χρήστη"
+        "UserAgent": "Πρόγραμμα πελάτη χρήστη",
+        "WidgetBrowsers": "Φυλλομετρητές επισκεπτών",
+        "WidgetBrowsersDocumentation": "Αυτή η αναφορά περιέχει πληροφορίες για το φυλλομετρητή που χρησιμοποιούσαν οι επισκέπτες. Κάθε έκδοση φυλλομετρητή κατατάσσεται διαφορετικά."
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/en.json b/plugins/DevicesDetection/lang/en.json
index 30019fe2fc..67aba39280 100644
--- a/plugins/DevicesDetection/lang/en.json
+++ b/plugins/DevicesDetection/lang/en.json
@@ -11,6 +11,7 @@
         "CarBrowser": "Car browser",
         "ColumnBrowser": "Browser",
         "ColumnOperatingSystem": "Operating system",
+        "ColumnOperatingSystemVersion": "Operating system version",
         "Console": "Console",
         "dataTableLabelBrands": "Brand",
         "dataTableLabelModels": "Model",
@@ -27,9 +28,10 @@
         "OperatingSystemFamily": "Operating system family",
         "OperatingSystems": "Operating systems",
         "OperatingSystemVersions": "Operating System versions",
-        "PluginDescription": "This plugin provides extended information about mobile devices, such as Brand (manufacturer), Model (device version), better Device type detection (tv, consoles, smart phones, desktop, etc) and more. This plugin adds a new report in 'Visitors > Devices'.",
+        "PluginDescription": "Provides extended information about user devices, such as Brand (manufacturer), Model (device version), device type (tv, consoles, smart phones, desktop, etc) and more.",
         "SmartDisplay": "Smart display",
         "Smartphone": "Smartphone",
+        "PortableMediaPlayer": "Portable media player",
         "submenu": "Devices",
         "Tablet": "Tablet",
         "TV": "Tv",
diff --git a/plugins/DevicesDetection/lang/es.json b/plugins/DevicesDetection/lang/es.json
index aaa2dce225..84e758345d 100644
--- a/plugins/DevicesDetection/lang/es.json
+++ b/plugins/DevicesDetection/lang/es.json
@@ -2,10 +2,13 @@
     "DevicesDetection": {
         "BrowserEngineDocumentation": "Este cuadro muestra los navegadores de internet de los visitantes divididos en sus respectivas familias. %s La información más importante para los desarrolladores de sitios de internet es conocer que motor de interpretador están utilizando los visitantes. Los rótulos contienen los nombres de los motores seguidos por el navegador más usual utilizando dicho motor entre corchetes.",
         "BrowserFamily": "Buscadores por familia",
+        "Browsers": "Navegadores",
         "BrowserVersion": "Versión del navegador",
         "BrowserVersions": "Versiones de navegadores",
         "Camera": "Cámara",
         "CarBrowser": "Navegador para coche",
+        "ColumnBrowser": "Navegador",
+        "ColumnOperatingSystem": "Sistemas operativos",
         "Console": "Consola",
         "dataTableLabelBrands": "Marca",
         "dataTableLabelModels": "Modelo",
@@ -19,13 +22,16 @@
         "DeviceType": "Tipo de dispositivo",
         "FeaturePhone": "Teléfono principal",
         "OperatingSystemFamilies": "Familia de sistemas operativos",
+        "OperatingSystemFamily": "Familia de sistema operativo",
+        "OperatingSystems": "Sistemas operativos",
         "OperatingSystemVersions": "Versiones de sistema operativo",
-        "PluginDescription": "Este plugin ofrece amplia información sobre dispositivos móviles, como Marca (fabricación), Modelo (versión de dispositivo), una mejor detección de Dispositivo (televisión, consola, smartphone, escritorio, etc.) y más. Este plugin agrega un nuevo informe en la sección ´Visitantes > Dispositivos´.",
         "SmartDisplay": "Pantalla inteligente",
         "Smartphone": "Smartphone",
         "submenu": "Dispositivos",
         "Tablet": "Tablet",
         "TV": "Televisión",
-        "UserAgent": "Agente de usuario"
+        "UserAgent": "Agente de usuario",
+        "WidgetBrowsers": "Navegadores de los visitantes",
+        "WidgetBrowsersDocumentation": "Este informe contiene información acerca de qué tipo de navegador el visitante está utilizando. Cada versión de navegador está alistado separadamente."
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/et.json b/plugins/DevicesDetection/lang/et.json
index d131d98ea5..ee37a7075a 100644
--- a/plugins/DevicesDetection/lang/et.json
+++ b/plugins/DevicesDetection/lang/et.json
@@ -1,10 +1,13 @@
 {
     "DevicesDetection": {
         "BrowserFamily": "Sirvija tüüp",
+        "Browsers": "Veebisirvijad",
         "BrowserVersion": "Sirvija versioon",
         "BrowserVersions": "Brauseri versioonid",
         "Camera": "Kaamera",
         "CarBrowser": "Sõiduki sirvik",
+        "ColumnBrowser": "Veebisirvija",
+        "ColumnOperatingSystem": "Operatsioonisüsteem",
         "Console": "Konsool",
         "dataTableLabelBrands": "Bränd",
         "dataTableLabelModels": "Mudel",
@@ -18,13 +21,15 @@
         "DeviceType": "Seadme tüüp",
         "FeaturePhone": "Tark telefon",
         "OperatingSystemFamilies": "Operatsioonisüsteemide tüübid",
+        "OperatingSystemFamily": "OP-süsteemi tüüp",
+        "OperatingSystems": "Operatsioonisüsteemid",
         "OperatingSystemVersions": "Operatsioonisüsteemide versioonid",
-        "PluginDescription": "Antud plugin annab mobiilsete seadmete kohta detailsemat infot, nagu bränd (tootja), mudel (seadme versioon), täpsema seadmete tuvastuse (tv, konsool, nutitelefon, tahvelarvuti jne). See plugin lisab uue raporti 'Külastajad > Seadmed' alla.",
         "SmartDisplay": "Nutikas kuvar",
         "Smartphone": "Nutitelefon",
         "submenu": "Seadmed",
         "Tablet": "Tahvelarvuti",
         "TV": "Televiisor",
-        "UserAgent": "Veebisirvija tüüp"
+        "UserAgent": "Veebisirvija tüüp",
+        "WidgetBrowsers": "Külastajate veebisirvijad"
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/eu.json b/plugins/DevicesDetection/lang/eu.json
index 41eb078bc1..24a09fef6c 100644
--- a/plugins/DevicesDetection/lang/eu.json
+++ b/plugins/DevicesDetection/lang/eu.json
@@ -1,5 +1,10 @@
 {
     "DevicesDetection": {
-        "BrowserFamily": "Nabigatzaile-familia"
+        "BrowserFamily": "Nabigatzaile-familia",
+        "Browsers": "Nabigatzaileak",
+        "ColumnBrowser": "Nabigatzailea",
+        "ColumnOperatingSystem": "Sistema eragilea",
+        "OperatingSystems": "Sistema eragileak",
+        "WidgetBrowsers": "Bisitarien nabigatzaileak"
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/fa.json b/plugins/DevicesDetection/lang/fa.json
index 6609ec040a..bc69fa5566 100644
--- a/plugins/DevicesDetection/lang/fa.json
+++ b/plugins/DevicesDetection/lang/fa.json
@@ -1,10 +1,13 @@
 {
     "DevicesDetection": {
         "BrowserFamily": "خانواده مرورگر",
+        "Browsers": "مرورگر ها",
         "BrowserVersion": "نسخه مرورگر",
         "BrowserVersions": "نسخه مرورگر",
         "Camera": "دوربین",
         "CarBrowser": "مرورگر خودرو",
+        "ColumnBrowser": "مرورگر",
+        "ColumnOperatingSystem": "پیکربندی سیستم",
         "Console": "کنسول",
         "dataTableLabelBrands": "مارک",
         "dataTableLabelModels": "مدل",
@@ -18,12 +21,16 @@
         "DeviceType": "نوع وسیله",
         "FeaturePhone": "گوشی",
         "OperatingSystemFamilies": "خانواده سیستم عامل",
+        "OperatingSystemFamily": "خانواده سیستم عامل",
+        "OperatingSystems": "سیستم عامل",
         "OperatingSystemVersions": "نسخه سیستم عامل",
         "SmartDisplay": "صفحه نمایش هوشمند",
         "Smartphone": "تلفن هوشمند",
         "submenu": "وسایل",
         "Tablet": "تبلت",
         "TV": "تلویزیون",
-        "UserAgent": "کاربر-نمایندگی"
+        "UserAgent": "کاربر-نمایندگی",
+        "WidgetBrowsers": "مرورگر بازدید کننده",
+        "WidgetBrowsersDocumentation": "این گزارش حاوی اطلاعات در مورد چه نوع مرورگر بازدید کنندگان خود را با استفاده از. هر مرورگر بطور جداگانه ذکر شده است."
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/fi.json b/plugins/DevicesDetection/lang/fi.json
index a560aaaa1f..d8dc002a3d 100644
--- a/plugins/DevicesDetection/lang/fi.json
+++ b/plugins/DevicesDetection/lang/fi.json
@@ -2,10 +2,13 @@
     "DevicesDetection": {
         "BrowserEngineDocumentation": "Tämä kuvaaja näyttää käyttäjien selaimen nimen mukaan. %s Tärkein tieto verkkosivun kehittäjille on käyttäjien selaimen taustajärjestelmä. Taustajärjestelmä löytyy hakasuluissa nimen perästä.",
         "BrowserFamily": "Selainperhe",
+        "Browsers": "Selaimet",
         "BrowserVersion": "Selaimen versio",
         "BrowserVersions": "Selainversiot",
         "Camera": "Kamera",
         "CarBrowser": "Auton selain",
+        "ColumnBrowser": "Selain",
+        "ColumnOperatingSystem": "Käyttöjärjestelmä",
         "Console": "Konsoli",
         "dataTableLabelBrands": "Merkki",
         "dataTableLabelModels": "Malli",
@@ -19,13 +22,16 @@
         "DeviceType": "Laitteen tyyppi",
         "FeaturePhone": "Puhelintoiminto",
         "OperatingSystemFamilies": "Käyttöjärjestelmäperheet",
+        "OperatingSystemFamily": "Käyttöjärjestelmä",
+        "OperatingSystems": "Käyttöjärjestelmä",
         "OperatingSystemVersions": "Käyttöjärjestelmäversiot",
-        "PluginDescription": "Tämä liitännäinen tarjoaa laajennettua tietoa mobiililaitteista, kuten merkki (valmistaja), malli (laitteen malli), paremman laitetyypin tunnistuksen (tv, konsolit, älypuhelimet, tietokoneet jne) sekä muuta. Liitännäinen lisää uuden raportin 'Kävijät > Laitteet'.",
         "SmartDisplay": "Älynäyttö",
         "Smartphone": "Älypuhelin",
         "submenu": "Laitteet",
         "Tablet": "Tabletti",
         "TV": "TV",
-        "UserAgent": "Käyttäjä-Agentti"
+        "UserAgent": "Käyttäjä-Agentti",
+        "WidgetBrowsers": "Kävijöiden selaimet",
+        "WidgetBrowsersDocumentation": "Tämä raportti näyttää, mitä selaimia vierailijoillasi oli. Jokainen selaimen versio näytetään erikseen."
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/fr.json b/plugins/DevicesDetection/lang/fr.json
index 5ae5b3a04d..4e13a0fe6c 100644
--- a/plugins/DevicesDetection/lang/fr.json
+++ b/plugins/DevicesDetection/lang/fr.json
@@ -4,10 +4,14 @@
         "BrowserEngineDocumentation": "Ce tableau affiche les navigateurs de vos visiteurs regroupés par famille. %s L'information la plus importante pour les développeurs est quel type de moteur de rendu utilisent leurs visiteurs. Les labels contiennent les noms des moteurs suivis par les principaux navigateurs les utilisant entre parenthèses.",
         "BrowserEngines": "Moteurs de rendu HTML",
         "BrowserFamily": "Famille de navigateurs",
+        "Browsers": "Navigateurs",
         "BrowserVersion": "Version du navigateur",
         "BrowserVersions": "Versions du navigateur",
         "Camera": "Caméra",
         "CarBrowser": "Navigateur de voiture",
+        "ColumnBrowser": "Navigateur",
+        "ColumnOperatingSystem": "Système d'exploitation",
+        "ColumnOperatingSystemVersion": "Version du système d'exploitation",
         "Console": "Console",
         "dataTableLabelBrands": "Marque",
         "dataTableLabelModels": "Modèle",
@@ -21,13 +25,16 @@
         "DeviceType": "Type du périphérique",
         "FeaturePhone": "Fonctionnalité téléphone",
         "OperatingSystemFamilies": "Familles de systèmes d'exploitations",
+        "OperatingSystemFamily": "Famille de systèmes d'exploitations",
+        "OperatingSystems": "Système d'exploitation",
         "OperatingSystemVersions": "Versions de système d'exploitation",
-        "PluginDescription": "Ce composant additionnel fournit des informations détaillées à propos des périphériques mobiles, telles que la marque (constructeur), le modèle (version du périphérique), une meilleure détection du type de périphérique (tv, consoles, smart phones, pc, etc) et autres. Ce composant additionnel ajoute un nouveau rapport dans Visiteur > Périphériques.",
         "SmartDisplay": "Affichage intelligent",
         "Smartphone": "Téléphone intelligent (smartphone)",
         "submenu": "Périphériques",
         "Tablet": "Tablette",
         "TV": "TV",
-        "UserAgent": "Agent Utilisateur (User-Agent)"
+        "UserAgent": "Agent Utilisateur (User-Agent)",
+        "WidgetBrowsers": "Navigateurs du visiteur",
+        "WidgetBrowsersDocumentation": "Ce rapport contient des informations à propos de quel type de navigateur vos visiteurs utilisent. Chaque version du navigateur est listée séparément."
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/gl.json b/plugins/DevicesDetection/lang/gl.json
new file mode 100644
index 0000000000..ed76d52934
--- /dev/null
+++ b/plugins/DevicesDetection/lang/gl.json
@@ -0,0 +1,7 @@
+{
+    "DevicesDetection": {
+        "Browsers": "Navegadores",
+        "OperatingSystems": "Sistemas Operativos",
+        "WidgetBrowsers": "Navegadores dos visitantes"
+    }
+}
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/he.json b/plugins/DevicesDetection/lang/he.json
index b5f17abc6d..e88f46dc9b 100644
--- a/plugins/DevicesDetection/lang/he.json
+++ b/plugins/DevicesDetection/lang/he.json
@@ -1,6 +1,7 @@
 {
     "DevicesDetection": {
         "BrowserFamily": "משפחת דפדפן",
-        "BrowserVersion": "גרסת דפדפן"
+        "BrowserVersion": "גרסת דפדפן",
+        "ColumnBrowser": "דפדפן"
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/hi.json b/plugins/DevicesDetection/lang/hi.json
index 3aec36c3b7..e2353d36b3 100644
--- a/plugins/DevicesDetection/lang/hi.json
+++ b/plugins/DevicesDetection/lang/hi.json
@@ -1,6 +1,12 @@
 {
     "DevicesDetection": {
         "BrowserFamily": "ब्राउज़र परिवार",
-        "BrowserVersion": "ब्राउज़र संस्करण"
+        "Browsers": "ब्राउज़र्स",
+        "BrowserVersion": "ब्राउज़र संस्करण",
+        "ColumnBrowser": "ब्राउज़र",
+        "ColumnOperatingSystem": "आपरेटिंग सिस्टम",
+        "OperatingSystemFamily": "आपरेटिंग सिस्टम परिवार",
+        "OperatingSystems": "आपरेटिंग सिस्टम",
+        "WidgetBrowsers": "आगंतुक ब्राउज़र"
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/hr.json b/plugins/DevicesDetection/lang/hr.json
index fe10ffccb5..ccd33c0733 100644
--- a/plugins/DevicesDetection/lang/hr.json
+++ b/plugins/DevicesDetection/lang/hr.json
@@ -1,5 +1,8 @@
 {
     "DevicesDetection": {
-        "BrowserVersion": "Verzija pretraživača"
+        "Browsers": "Pretraživači",
+        "BrowserVersion": "Verzija pretraživača",
+        "ColumnOperatingSystem": "Operativni sustav",
+        "WidgetBrowsers": "Pretraživać posjetitelja"
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/hu.json b/plugins/DevicesDetection/lang/hu.json
index f6378de77d..3d2b733b62 100644
--- a/plugins/DevicesDetection/lang/hu.json
+++ b/plugins/DevicesDetection/lang/hu.json
@@ -1,5 +1,10 @@
 {
     "DevicesDetection": {
-        "BrowserFamily": "Böngészőcsalád"
+        "BrowserFamily": "Böngészőcsalád",
+        "Browsers": "Böngészők",
+        "ColumnBrowser": "Böngésző",
+        "ColumnOperatingSystem": "Operációs rendszer",
+        "OperatingSystems": "Operációs rendszerek",
+        "WidgetBrowsers": "Látogatók böngészői"
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/id.json b/plugins/DevicesDetection/lang/id.json
index ca1554bc9f..37772fea64 100644
--- a/plugins/DevicesDetection/lang/id.json
+++ b/plugins/DevicesDetection/lang/id.json
@@ -2,6 +2,13 @@
     "DevicesDetection": {
         "BrowserEngineDocumentation": "Bagan ini menampilkan peramban pengunjung Anda yang dipecah menjadi keluarga peramban. %s Informasi terpenting untuk pengembang ramatraya adalah jenis mesin pembuat yang pengunung gunakan. Etiket mengandung nama mesin diikuti dengan peramban yang umum menggunakan mesin tersebut dalam tanda kurung.",
         "BrowserFamily": "Keluarga Peramban",
-        "BrowserVersion": "Versi Perambang"
+        "Browsers": "Perambang",
+        "BrowserVersion": "Versi Perambang",
+        "ColumnBrowser": "Peramban",
+        "ColumnOperatingSystem": "Sistem Operasi",
+        "OperatingSystemFamily": "Keluarga sistem operasi",
+        "OperatingSystems": "Sistem Operasi",
+        "WidgetBrowsers": "Peramban Pengunjung",
+        "WidgetBrowsersDocumentation": "Laporan ini mengandung informasi tentabg jenis peramban yang pengunjung Anda gunakan. Setiap versi peramban diurutkan terpisah."
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/is.json b/plugins/DevicesDetection/lang/is.json
index b3abd31ab3..29b2961f71 100644
--- a/plugins/DevicesDetection/lang/is.json
+++ b/plugins/DevicesDetection/lang/is.json
@@ -1,5 +1,10 @@
 {
     "DevicesDetection": {
-        "BrowserFamily": "Vafrafjölskylda"
+        "BrowserFamily": "Vafrafjölskylda",
+        "Browsers": "Vafrar",
+        "ColumnBrowser": "Vafri",
+        "ColumnOperatingSystem": "Stýrikerfi",
+        "OperatingSystems": "Stýrikerfi",
+        "WidgetBrowsers": "Vafrar gesta"
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/it.json b/plugins/DevicesDetection/lang/it.json
index d40bccc090..20d91e913a 100644
--- a/plugins/DevicesDetection/lang/it.json
+++ b/plugins/DevicesDetection/lang/it.json
@@ -4,10 +4,14 @@
         "BrowserEngineDocumentation": "Questo grafico mostra i browser dei vostri visitatori suddivisi in famiglie di browser. %s Le informazioni più importanti per gli sviluppatori web sono che tipo di motore di rendering i loro visitatori stanno usando. Le etichette contengono i nomi dei motori seguiti dal browser più comune che utilizza quel motore tra parentesi.",
         "BrowserEngines": "Motori browser",
         "BrowserFamily": "Famiglia del Browser",
+        "Browsers": "Browser",
         "BrowserVersion": "Versione del browser",
         "BrowserVersions": "Versioni browser",
         "Camera": "Fotocamera",
         "CarBrowser": "Browser in auto",
+        "ColumnBrowser": "Browser",
+        "ColumnOperatingSystem": "Sistema operativo",
+        "ColumnOperatingSystemVersion": "Versione sistema operativo",
         "Console": "Console",
         "dataTableLabelBrands": "Marca",
         "dataTableLabelModels": "Modello",
@@ -21,13 +25,18 @@
         "DeviceType": "Tipo dispositivo",
         "FeaturePhone": "Feature phone",
         "OperatingSystemFamilies": "Famiglie Sistema Operativo",
+        "OperatingSystemFamily": "Famiglia sistema operativo",
+        "OperatingSystems": "Sistemi Operativi",
         "OperatingSystemVersions": "Versioni Sistema Operativo",
-        "PluginDescription": "Questo plugin fornisce informazioni estese sui dispositivi mobili, come Marca (costruttore), Modello (versione dispositivo), una migliore individuazione del dispositivo (tv, console, smartphone, desktop, ecc) e altro. Questo plugin aggiunge un nuovo report in 'Visitatori > Dispositivi'.",
+        "PluginDescription": "Fornisce informazioni dettagliate sui dispositivi degli utenti, come marca, modello, tipo di dispositivo (tv, console, smartphone, desktop, ecc.) e altro ancora.",
+        "PortableMediaPlayer": "Media player portabile",
         "SmartDisplay": "Smart display",
         "Smartphone": "Smartphone",
         "submenu": "Dispositivi",
         "Tablet": "Tablet",
         "TV": "Apparecchio TV",
-        "UserAgent": "User-Agent"
+        "UserAgent": "User-Agent",
+        "WidgetBrowsers": "Browser dei visitatori",
+        "WidgetBrowsersDocumentation": "Questo report contiene informazioni sul tipo di browser che i tuoi visitatori hanno utilizzato. Ciascuna versione del browser è elencata separatamente."
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/ja.json b/plugins/DevicesDetection/lang/ja.json
index 72438b2e1f..d5bc232ffd 100644
--- a/plugins/DevicesDetection/lang/ja.json
+++ b/plugins/DevicesDetection/lang/ja.json
@@ -2,10 +2,13 @@
     "DevicesDetection": {
         "BrowserEngineDocumentation": "このチャートは、ビジターのブラウザをブラウザファミリー別に表示します。 %s Web開発者にとって最も重要な情報は、ビジターが使用しているレンダリングエンジンの種類です。ラベルはエンジンの名前で、括弧内にそのエンジンを使う最も一般的なブラウザ名を表示しています。",
         "BrowserFamily": "ブラウザファミリー",
+        "Browsers": "ブラウザ",
         "BrowserVersion": "ブラウザのバージョン",
         "BrowserVersions": "ブラウザのバージョン",
         "Camera": "カメラ",
         "CarBrowser": "車載ブラウザ",
+        "ColumnBrowser": "ブラウザ",
+        "ColumnOperatingSystem": "オペレーティングシステム",
         "Console": "コンソール",
         "dataTableLabelBrands": "ブランド",
         "dataTableLabelModels": "モデル",
@@ -19,13 +22,16 @@
         "DeviceType": "デバイスタイプ",
         "FeaturePhone": "携帯電話",
         "OperatingSystemFamilies": "オペレーティングシステムファミリー",
+        "OperatingSystemFamily": "オペレーティングシステムファミリー",
+        "OperatingSystems": "オペレーティングシステム",
         "OperatingSystemVersions": "オペレーティングシステムのバージョン",
-        "PluginDescription": "このプラグインは、訪問者の使用する接続機器情報を表示します。モバイル端末のブランド（メーカー）やモデル（デバイスのバージョン）や、また多くの機種（テレビ、コンソール、スマートフォン、デスクトップPCなど）も検出します。このプラグインはメニューの「ビジター > デバイス」に新しいレポートが追加されます。",
         "SmartDisplay": "スマートディスプレイ",
         "Smartphone": "スマートフォン",
         "submenu": "デバイス",
         "Tablet": "タブレット",
         "TV": "TV",
-        "UserAgent": "ユーザーエージェント"
+        "UserAgent": "ユーザーエージェント",
+        "WidgetBrowsers": "ブラウザ",
+        "WidgetBrowsersDocumentation": "ビジターがどのブラウザを使っているかについてのリポートです。各ブラウザのバージョンは別途記載されています。"
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/ka.json b/plugins/DevicesDetection/lang/ka.json
index 23c637a318..0260e2691c 100644
--- a/plugins/DevicesDetection/lang/ka.json
+++ b/plugins/DevicesDetection/lang/ka.json
@@ -1,5 +1,10 @@
 {
     "DevicesDetection": {
-        "BrowserFamily": "ბრაუზერის ოჯახი"
+        "BrowserFamily": "ბრაუზერის ოჯახი",
+        "Browsers": "ბრაუზერები",
+        "ColumnBrowser": "ბრაუზერი",
+        "ColumnOperatingSystem": "ოპერაციული სისტემა",
+        "OperatingSystems": "ოპერაციული სიტემები",
+        "WidgetBrowsers": "ვიზიტორის ბრაუზერები"
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/ko.json b/plugins/DevicesDetection/lang/ko.json
index b029b5c279..69b1d36c06 100644
--- a/plugins/DevicesDetection/lang/ko.json
+++ b/plugins/DevicesDetection/lang/ko.json
@@ -2,6 +2,13 @@
     "DevicesDetection": {
         "BrowserEngineDocumentation": "이 차트는 방문자의 브라우저를 제품군별로 표시합니다. %s 웹개발자에게 가장 중요한 정보는 사용자의 렌더링 엔진 종류입니다. 엔진의 이름과 괄호 안에 일반적인 해당 브라우저 이름을 표시하고 있습니다.",
         "BrowserFamily": "브라우저 타입",
-        "BrowserVersion": "브라우저 버전"
+        "Browsers": "브라우저",
+        "BrowserVersion": "브라우저 버전",
+        "ColumnBrowser": "브라우저",
+        "ColumnOperatingSystem": "운영체제",
+        "OperatingSystemFamily": "운영 체제 제품군",
+        "OperatingSystems": "운영체제",
+        "WidgetBrowsers": "방문자 브라우저",
+        "WidgetBrowsersDocumentation": "사용자가 어떤 브라우저를 사용하는지에 대한 보고서입니다. 각 브라우저의 버전은 별도로 기재되어 있습니다."
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/lt.json b/plugins/DevicesDetection/lang/lt.json
index ce2c7bc397..b0fbfe0ff0 100644
--- a/plugins/DevicesDetection/lang/lt.json
+++ b/plugins/DevicesDetection/lang/lt.json
@@ -1,6 +1,11 @@
 {
     "DevicesDetection": {
         "BrowserFamily": "Naršyklių šeimos",
-        "BrowserVersion": "Naršyklės versija"
+        "Browsers": "Naršyklės",
+        "BrowserVersion": "Naršyklės versija",
+        "ColumnBrowser": "Naršyklė",
+        "ColumnOperatingSystem": "Operacinė sistema",
+        "OperatingSystems": "Operacinės sistemos",
+        "WidgetBrowsers": "Lankytojų naršyklės"
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/lv.json b/plugins/DevicesDetection/lang/lv.json
index b35fbb34f6..76778bad86 100644
--- a/plugins/DevicesDetection/lang/lv.json
+++ b/plugins/DevicesDetection/lang/lv.json
@@ -2,6 +2,12 @@
     "DevicesDetection": {
         "BrowserEngineDocumentation": "Šis grafiks rāda apmeklētāju pārlūkus izdalītus pa pārlūku ģimenēm. %s Vissvarīgākā informācija tīkla izstrādātājiem ir kādu atveidojuma dzinēju apmeklētāji izmanto. Etiķetes satur dzinēju nosaukumus, kuriem seko visbiežāk izmantotie dzinēji.",
         "BrowserFamily": "Pārlūku ģimene",
-        "BrowserVersion": "Pārlūka versija"
+        "Browsers": "Pārlūki",
+        "BrowserVersion": "Pārlūka versija",
+        "ColumnBrowser": "Pārlūks",
+        "ColumnOperatingSystem": "Operētājsistēma",
+        "OperatingSystems": "Operētājsistēmas",
+        "WidgetBrowsers": "Apmeklētāju pārlūki",
+        "WidgetBrowsersDocumentation": "Šajā atskaitē ir informācija par to kādus pārlūkus Jūsu apmeklētāji izmanto. Katra pārlūka versija ir izdalīta atsevišķi."
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/nb.json b/plugins/DevicesDetection/lang/nb.json
index ecf797ebfd..470bdbede5 100644
--- a/plugins/DevicesDetection/lang/nb.json
+++ b/plugins/DevicesDetection/lang/nb.json
@@ -1,14 +1,22 @@
 {
     "DevicesDetection": {
         "BrowserFamily": "Nettleserfamilie",
+        "Browsers": "Nettlesere",
         "BrowserVersion": "Nettleserversjon",
         "BrowserVersions": "Nettleser-versjoner",
         "Camera": "Kamera",
+        "CarBrowser": "Nettleser i bil",
+        "ColumnBrowser": "Nettleser",
+        "ColumnOperatingSystem": "Operativsystem",
+        "Console": "Konsoll",
         "dataTableLabelModels": "Modell",
+        "dataTableLabelTypes": "Type",
         "Device": "Enhet",
+        "OperatingSystems": "Operativsystem",
         "Smartphone": "Smarttelefon",
         "submenu": "Enheter",
         "Tablet": "Nettbrett",
-        "TV": "TV"
+        "TV": "TV",
+        "WidgetBrowsers": "Besøkendes nettlesere"
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/nl.json b/plugins/DevicesDetection/lang/nl.json
index 97b7df0ef6..0cd383c194 100644
--- a/plugins/DevicesDetection/lang/nl.json
+++ b/plugins/DevicesDetection/lang/nl.json
@@ -2,10 +2,14 @@
     "DevicesDetection": {
         "BrowserEngineDocumentation": "Deze grafiek toont de browsers van uw bezoekers, verdeeld in browserfamilies. %s De belangrijkste informatie voor webontwikkelaars is wat voor soort renderingengine hun bezoekers gebruiken. De labels bevatten de namen van de engines, gevolgd door de meest voorkomende browsers (tussen haakjes) die deze engine gebruiken.",
         "BrowserFamily": "Browser per Type",
+        "Browsers": "Browser per versie",
         "BrowserVersion": "Browserversie",
         "BrowserVersions": "Browser versies",
         "Camera": "Fototoestel",
         "CarBrowser": "Auto browser",
+        "ColumnBrowser": "Browser",
+        "ColumnOperatingSystem": "Besturingssysteem",
+        "ColumnOperatingSystemVersion": "Besturingssysteem versie",
         "Console": "Console",
         "dataTableLabelBrands": "Merk",
         "dataTableLabelModels": "Model",
@@ -19,13 +23,17 @@
         "DeviceType": "Apparaat type",
         "FeaturePhone": "Toekomstige telefoon",
         "OperatingSystemFamilies": "Besturingssysteem families",
+        "OperatingSystemFamily": "Besturingssyteem familie",
+        "OperatingSystems": "Besturingssystemen",
         "OperatingSystemVersions": "Besturingssysteem versies",
-        "PluginDescription": "Deze plugin geeft uitgebreide informatie over mobile apparaten, zoals Merk (fabrikant), Model (apparaat versie), betere Apparaat type detectie (tv, consoles, smart phones, desktop, enz) en meer. Deze plugin voegt een nieuw rapport toe in 'Bezoekers > Devices'.",
+        "PortableMediaPlayer": "Draagbare mediaspeler",
         "SmartDisplay": "Slim scherm",
         "Smartphone": "Smartphone",
         "submenu": "Apparaten",
         "Tablet": "Tablet",
         "TV": "Tv",
-        "UserAgent": "Gebruikers-agent"
+        "UserAgent": "Gebruikers-agent",
+        "WidgetBrowsers": "Browsers bezoekers",
+        "WidgetBrowsersDocumentation": "Dit rapport bevat informatie over het type browsers dat door door uw bezoekers werd gebruikt. Elke browserversie wordt apart vermeld."
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/nn.json b/plugins/DevicesDetection/lang/nn.json
index d4ad69e659..f5d92db46a 100644
--- a/plugins/DevicesDetection/lang/nn.json
+++ b/plugins/DevicesDetection/lang/nn.json
@@ -1,5 +1,10 @@
 {
     "DevicesDetection": {
-        "BrowserFamily": "Nettlesarfamilar"
+        "BrowserFamily": "Nettlesarfamilar",
+        "Browsers": "Nettlesarar",
+        "ColumnBrowser": "Nettlesar",
+        "ColumnOperatingSystem": "Operativsystem",
+        "OperatingSystems": "Operativsystem",
+        "WidgetBrowsers": "Nytta nettlesarar"
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/pl.json b/plugins/DevicesDetection/lang/pl.json
index 4c3f24ff2a..0b5830980d 100644
--- a/plugins/DevicesDetection/lang/pl.json
+++ b/plugins/DevicesDetection/lang/pl.json
@@ -1,10 +1,15 @@
 {
     "DevicesDetection": {
+        "BrowserEngine": "Silnik przeglądarki",
+        "BrowserEngines": "Silniki przeglądarek",
         "BrowserFamily": "Rodzina przeglądarek",
+        "Browsers": "Przeglądarki",
         "BrowserVersion": "Wersja przeglądarki",
         "BrowserVersions": "Wersje przeglądarek",
         "Camera": "Aparat fotograficzny",
         "CarBrowser": "Przeglądarka samochodowa",
+        "ColumnBrowser": "Przeglądarka",
+        "ColumnOperatingSystem": "System operacyjny",
         "Console": "Konsola",
         "dataTableLabelBrands": "Marka",
         "dataTableLabelModels": "Model",
@@ -18,13 +23,15 @@
         "DeviceType": "Typ urządzenia",
         "FeaturePhone": "Zaawansowany telefon",
         "OperatingSystemFamilies": "Rodzaj systemu operacyjnego",
+        "OperatingSystemFamily": "Rodzina systemu operacyjnego",
+        "OperatingSystems": "Systemy operacyjne",
         "OperatingSystemVersions": "Wersja systemu operacyjnego",
-        "PluginDescription": "Wtyczka zapewnia rozszerzone informacje na temat urządzeń mobilnych , takich jak marki (producenta ) , model (wersja urządzenia), lepsze wykrywanie typu urządzenia (TV, konsole , smartfony, pulpit , etc) i więcej . Wtyczka dodaje nowy raport 'Goście > Urządzenia \" .",
         "SmartDisplay": "Inteligentny wyświetlacz",
         "Smartphone": "Smartfon",
         "submenu": "Urządzenia",
         "Tablet": "Tablet",
         "TV": "TV",
-        "UserAgent": "User-Agent"
+        "UserAgent": "User-Agent",
+        "WidgetBrowsers": "Przeglądarki odwiedzających"
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/pt-br.json b/plugins/DevicesDetection/lang/pt-br.json
index 05d782e027..cdf55cee9a 100644
--- a/plugins/DevicesDetection/lang/pt-br.json
+++ b/plugins/DevicesDetection/lang/pt-br.json
@@ -2,9 +2,12 @@
     "DevicesDetection": {
         "BrowserEngineDocumentation": "Este gráfico mostra os navegadores dos seus visitantes divididos em famílias de navegadores. %s A informação mais importante para os desenvolvedores web é o tipo de motor de renderização que seus visitantes estão usando. As etiquetas contêm os nomes dos motores seguido pelo navegador mais comum usando esse motor entre parênteses.",
         "BrowserFamily": "Família do Navegador",
+        "Browsers": "Navegadores",
         "BrowserVersion": "Versão do Browser",
         "BrowserVersions": "Versões de navegadores",
         "Camera": "Câmera",
+        "ColumnBrowser": "Navegador",
+        "ColumnOperatingSystem": "Sistema Operacional",
         "Console": "Console",
         "dataTableLabelBrands": "Marca",
         "dataTableLabelModels": "Modelo",
@@ -16,11 +19,15 @@
         "DeviceModel": "Modelo do dispositivo",
         "DeviceType": "Tipo de dispositivo",
         "OperatingSystemFamilies": "Famílias de Sistemas Operacionais",
+        "OperatingSystemFamily": "Família de SO",
+        "OperatingSystems": "Sistemas Operacionais",
         "OperatingSystemVersions": "Versões dos Sistemas Operacionais",
         "Smartphone": "Smartphone",
         "submenu": "Dispositivos",
         "Tablet": "Tablet",
         "TV": "Tv",
-        "UserAgent": "User-Agent"
+        "UserAgent": "User-Agent",
+        "WidgetBrowsers": "Navegador dos Visitantes",
+        "WidgetBrowsersDocumentation": "Este relatório contém informações sobre o tipo de navegador que os visitantes estavam usando. Cada versão do navegador é listada separadamente."
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/pt.json b/plugins/DevicesDetection/lang/pt.json
index d9d9ffd92f..1883a2d749 100644
--- a/plugins/DevicesDetection/lang/pt.json
+++ b/plugins/DevicesDetection/lang/pt.json
@@ -1,7 +1,24 @@
 {
     "DevicesDetection": {
+        "BrowserEngine": "Motor de busca",
         "BrowserEngineDocumentation": "Este gráfico mostra os navegadores dos seus visitantes dividido em famílias. %s A informação mais importante para os programadores web é o tipo de motor de renderização que os seus visitantes estão usando. As etiquetas contêm os nomes dos motores seguido pelo navegador mais comum que usa esse motor entre parênteses.",
+        "BrowserEngines": "Motores de busca",
         "BrowserFamily": "Família de navegadores",
-        "BrowserVersion": "Versão do Navegador"
+        "Browsers": "Navegadores",
+        "BrowserVersion": "Versão do Navegador",
+        "ColumnBrowser": "Navegador",
+        "ColumnOperatingSystem": "Sistema operativo",
+        "ColumnOperatingSystemVersion": "Versão do sistema operativo",
+        "Console": "Consola",
+        "dataTableLabelBrands": "Marca",
+        "dataTableLabelModels": "Modelo",
+        "dataTableLabelTypes": "Tipo",
+        "Device": "Dispositivo",
+        "DeviceBrand": "Marca do equipamento",
+        "DeviceModel": "Modelo do dispositivo",
+        "OperatingSystems": "Sistemas Operativos",
+        "TV": "Tv",
+        "WidgetBrowsers": "Navegador dos visitantes",
+        "WidgetBrowsersDocumentation": "Este relatório contém informações sobre o tipo de navegadores os seus visitantes estavam a utilizar. Cada versão do navegador é listada separadamente."
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/ro.json b/plugins/DevicesDetection/lang/ro.json
index 66e3981f5e..44348bc23a 100644
--- a/plugins/DevicesDetection/lang/ro.json
+++ b/plugins/DevicesDetection/lang/ro.json
@@ -2,10 +2,13 @@
     "DevicesDetection": {
         "BrowserEngineDocumentation": "Acest grafic arată browserele vizitatorilor dvs. defalcate în familii browser. %s Cele mai importante informații pentru dezvoltatori web este ce fel de motor de cautare au utilizat vizitatorii lor . Etichetele conțin numele motoarelor urmate de cele mai comune browsere folosind motorul în paranteze.",
         "BrowserFamily": "Browser după familie",
+        "Browsers": "Browsere",
         "BrowserVersion": "Versiunea browser-ului",
         "BrowserVersions": "Versiunile browserului",
         "Camera": "Camera",
         "CarBrowser": "Browser de masina",
+        "ColumnBrowser": "Browser",
+        "ColumnOperatingSystem": "Sistem de operare",
         "Console": "Consola",
         "dataTableLabelBrands": "Brand",
         "dataTableLabelModels": "Model",
@@ -19,13 +22,16 @@
         "DeviceType": "Tipul dispozitivului",
         "FeaturePhone": "Caracteristica telefon",
         "OperatingSystemFamilies": "Familiile Sistemului de Operare",
+        "OperatingSystemFamily": "Sistem de operare după familie",
+        "OperatingSystems": "Sisteme operare",
         "OperatingSystemVersions": "Versiunile Sistemului de Operare",
-        "PluginDescription": "Acest plug-in oferă informații extinse despre dispozitive mobile, cum ar fi marcă (producător), model (versiune dispozitiv), o mai bună detectare tip de dispozitiv (TV, console, telefoane inteligente, desktop, etc), și mai multe. Acest plugin adaugă un nou raport în \"Vizitatori> Devices\".",
         "SmartDisplay": "Display inteligent",
         "Smartphone": "Smartphone",
         "submenu": "Dispozitive",
         "Tablet": "Tableta",
         "TV": "Tv",
-        "UserAgent": "User-Agent"
+        "UserAgent": "User-Agent",
+        "WidgetBrowsers": "Browsere vizitatori",
+        "WidgetBrowsersDocumentation": "Acest raport conține informații cu privire la ce fel de browser utilizeaza de vizitatori . Fiecare versiune de browser este listată separat."
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/ru.json b/plugins/DevicesDetection/lang/ru.json
index 52aa6da25c..ed76c68873 100644
--- a/plugins/DevicesDetection/lang/ru.json
+++ b/plugins/DevicesDetection/lang/ru.json
@@ -1,10 +1,16 @@
 {
     "DevicesDetection": {
+        "BrowserEngine": "Браузерный движок",
         "BrowserEngineDocumentation": "Этот график показывается информацию о браузерах посетителей, разбитую по типу семейства. %s Наиболее важная информация для веб-разработчиков - на каком движке работают браузеры посетителей. Значки содержат имя движка в зависимости от наиболее популярного браузера, который работает на этом движке.",
+        "BrowserEngines": "Браузерные движки",
         "BrowserFamily": "Семейство браузеров",
+        "Browsers": "По браузерам",
         "BrowserVersion": "Версия браузера",
         "BrowserVersions": "Версии браузеров",
+        "Camera": "Камера",
         "CarBrowser": "Автомобильный браузер",
+        "ColumnBrowser": "Браузер",
+        "ColumnOperatingSystem": "Операционная система",
         "Console": "Консоль",
         "dataTableLabelBrands": "Фирма-производитель",
         "dataTableLabelModels": "Модель",
@@ -16,13 +22,19 @@
         "DeviceModel": "Модель устройства",
         "DevicesDetection": "Устройства посетителей",
         "DeviceType": "Тип устройства",
+        "FeaturePhone": "Особенность телефона",
         "OperatingSystemFamilies": "Семейства операционных систем",
+        "OperatingSystemFamily": "Тип операционной системы",
+        "OperatingSystems": "По операционным системам",
         "OperatingSystemVersions": "Версии операционных систем",
-        "PluginDescription": "Этот плагин предоставляет расширенную информацию о мобильных устройствах, таких как фирма-производитель, модель устройства, улучшенное обнаружение типов устройств (телевизор, консоль, смартфон, стационарный компьютер и т.д.) и другое. Этот плагин добавляет новый отчет в 'Посетители > Устройства'.",
+        "PortableMediaPlayer": "Портативный медиа-плеер",
+        "SmartDisplay": "Смарт-дисплей",
         "Smartphone": "Смартфон",
         "submenu": "Устройства",
         "Tablet": "Планшет",
         "TV": "ТВ",
-        "UserAgent": "User-Agent"
+        "UserAgent": "User-Agent",
+        "WidgetBrowsers": "Браузеры посетителей",
+        "WidgetBrowsersDocumentation": "Этот отчет содержит информацию по браузерам, которые используют ваши посетители. Каждая версия браузера отображается отдельно."
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/sk.json b/plugins/DevicesDetection/lang/sk.json
index 742e2162fa..ed152053b3 100644
--- a/plugins/DevicesDetection/lang/sk.json
+++ b/plugins/DevicesDetection/lang/sk.json
@@ -1,5 +1,10 @@
 {
     "DevicesDetection": {
-        "BrowserFamily": "Rodina prehliadača"
+        "BrowserFamily": "Rodina prehliadača",
+        "Browsers": "Prehliadače",
+        "ColumnBrowser": "Prehliadač",
+        "ColumnOperatingSystem": "Operačný systém",
+        "OperatingSystems": "Operačný systém",
+        "WidgetBrowsers": "Prehliadače návštevníkov"
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/sl.json b/plugins/DevicesDetection/lang/sl.json
index 5e1996f207..77f71a8787 100644
--- a/plugins/DevicesDetection/lang/sl.json
+++ b/plugins/DevicesDetection/lang/sl.json
@@ -2,12 +2,17 @@
     "DevicesDetection": {
         "BrowserEngines": "Pogoni brskalnikov",
         "BrowserFamily": "Družina brskalnika",
+        "Browsers": "Brskalniki",
         "BrowserVersion": "Različica brskalnika",
+        "ColumnBrowser": "Brskalnik",
+        "ColumnOperatingSystem": "Operacijski sistem",
         "DeviceBrand": "Znamka naprave",
         "DeviceModel": "Model naprave",
         "DevicesDetection": "Naprave obiskovalcev",
         "DeviceType": "Tip naprave",
         "OperatingSystemFamilies": "Družine operacijskih sistemov",
-        "submenu": "Naprave"
+        "OperatingSystems": "Operacijski sistemi",
+        "submenu": "Naprave",
+        "WidgetBrowsers": "Brskalnik obiskovalca"
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/sq.json b/plugins/DevicesDetection/lang/sq.json
index a76339d249..4e4d936bf3 100644
--- a/plugins/DevicesDetection/lang/sq.json
+++ b/plugins/DevicesDetection/lang/sq.json
@@ -2,6 +2,12 @@
     "DevicesDetection": {
         "BrowserEngineDocumentation": "Ky grafik tregon shfletuesit e vizitorëve tuaj, grupuar sipas familjesh shfletuesish. %s Informacioni më i rëndësishëm për programuesit web është lloji i mekanizmit vizatues që përdor shfletuesi. Etiketat përmbajnë emrat e mekanizmave, pasuar në kllapa nga shfletuesit më të zakonshëm që përdorin secilin prej tyre.",
         "BrowserFamily": "Familje shfletuesi",
-        "BrowserVersion": "Version shfletuesi"
+        "Browsers": "Shfletuesa",
+        "BrowserVersion": "Version shfletuesi",
+        "ColumnBrowser": "Shfletues",
+        "ColumnOperatingSystem": "Sistem operativ",
+        "OperatingSystems": "Sisteme operativë",
+        "WidgetBrowsers": "Shfletuesa vizitorësh",
+        "WidgetBrowsersDocumentation": "Ky raport përmban të dhëna rreth llojeve të shfletuesit që përdornin vizitorët tuaj. Secili version i një shfletuesi tregohet veçmas."
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/sr.json b/plugins/DevicesDetection/lang/sr.json
index 3722cec91e..f148cef960 100644
--- a/plugins/DevicesDetection/lang/sr.json
+++ b/plugins/DevicesDetection/lang/sr.json
@@ -2,10 +2,13 @@
     "DevicesDetection": {
         "BrowserEngineDocumentation": "Ovaj grafikon prikazuje brauzere vaših posetilaca po porodicama. %s Najvažnija informacija za web dizajnere je koju vrstu endžina koriste njihovi posetioci. Naptisi sadrže imena endžina a u zagradi je najčešća lista brauzera koji koriste taj endžin.",
         "BrowserFamily": "Porodica brauzera",
+        "Browsers": "Brauzeri",
         "BrowserVersion": "Verzija brauzera",
         "BrowserVersions": "Verzije pretraživača",
         "Camera": "Kamera",
         "CarBrowser": "Pretraživač za auto",
+        "ColumnBrowser": "Brauzer",
+        "ColumnOperatingSystem": "Operativni sistem",
         "Console": "Konzola",
         "dataTableLabelBrands": "Marka",
         "dataTableLabelModels": "Model",
@@ -19,13 +22,16 @@
         "DeviceType": "Tip uređaja",
         "FeaturePhone": "Telefon",
         "OperatingSystemFamilies": "Porodice operativnih sistema",
+        "OperatingSystemFamily": "Porodica operativnih sistema",
+        "OperatingSystems": "Operativni sistemi",
         "OperatingSystemVersions": "Verzije operativnog sistema",
-        "PluginDescription": "Ovaj dodatak omogućuje dodatne informacije o mobilnim uređajima kao što su marka (proizvođača), model (verzija uređaja), bolju detekciju tipa uređaja (TV, konzola, pametni telefon, stoni računar itd.) i još toga. Ovaj dodatak dodaje novi izveštaj u 'Posetioci > Uređaji'.",
         "SmartDisplay": "Pametan displej",
         "Smartphone": "Pametni telefon",
         "submenu": "Uređaji",
         "Tablet": "Tablet",
         "TV": "TV",
-        "UserAgent": "Korisnički agent"
+        "UserAgent": "Korisnički agent",
+        "WidgetBrowsers": "Brauzeri posetilaca",
+        "WidgetBrowsersDocumentation": "Ovaj izveštaj prikazuje koje brauzere koriste vaši posetioci. Svaka verzija brauzera je prikazana posebno."
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/sv.json b/plugins/DevicesDetection/lang/sv.json
index e7d517f843..c2eac6836f 100644
--- a/plugins/DevicesDetection/lang/sv.json
+++ b/plugins/DevicesDetection/lang/sv.json
@@ -1,11 +1,16 @@
 {
     "DevicesDetection": {
+        "BrowserEngine": "Webbläsarmotor",
         "BrowserEngineDocumentation": "Detta diagram visar besökarnas webbläsare delas upp i webbläsarfamiljer. %s Den viktigaste informationen för webbutvecklare är vilken typ av renderingsmotorn deras besökare använder. Etiketterna innehåller namnen på de motorer som följt av den vanligaste webbläsaren med den motorn inom parentes.",
+        "BrowserEngines": "Webbläsarmotorer",
         "BrowserFamily": "Webbläsarfamilj",
+        "Browsers": "Webbläsare",
         "BrowserVersion": "Webbläsarversion",
         "BrowserVersions": "Version av webbläsare",
         "Camera": "Kamera",
         "CarBrowser": "Car browser",
+        "ColumnBrowser": "Webbläsare",
+        "ColumnOperatingSystem": "Operativsystem",
         "Console": "Konsol",
         "dataTableLabelBrands": "Märke",
         "dataTableLabelModels": "Modell",
@@ -19,13 +24,16 @@
         "DeviceType": "Utrustningstyp",
         "FeaturePhone": "Telefonmodell",
         "OperatingSystemFamilies": "Hanterar System familjer",
+        "OperatingSystemFamily": "Operativsystemsfamilj",
+        "OperatingSystems": "Operativsystem",
         "OperatingSystemVersions": "Nuvarande System version",
-        "PluginDescription": "Det här pluginet innehåller förlängd information om mobilverktyg, så som märke (tillvärkare), modell (modellens version), tv, konsol, smart phones, laptops och annat. Det här pluginet lägger till nya rapporter i 'Visitors > Verktyg'.",
         "SmartDisplay": "Smart skärm",
         "Smartphone": "Smartphone",
         "submenu": "Utrustning",
         "Tablet": "Bord",
         "TV": "TV",
-        "UserAgent": "Användar-Agent"
+        "UserAgent": "Användar-Agent",
+        "WidgetBrowsers": "Webbläsare",
+        "WidgetBrowsersDocumentation": "Denna rapport innehåller information om vilken typ av webbläsare dina besökare använde. Varje version av webbläsare är listad separat."
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/te.json b/plugins/DevicesDetection/lang/te.json
index ff2cbe1e9e..05929af713 100644
--- a/plugins/DevicesDetection/lang/te.json
+++ b/plugins/DevicesDetection/lang/te.json
@@ -1,6 +1,12 @@
 {
     "DevicesDetection": {
         "BrowserFamily": "విహారిణి కుటుంబం",
-        "BrowserVersion": "విహారిణి సంచిక"
+        "Browsers": "విహారిణులు",
+        "BrowserVersion": "విహారిణి సంచిక",
+        "ColumnBrowser": "విహారిణి",
+        "ColumnOperatingSystem": "నిర్వాహక వ్యవస్థ",
+        "OperatingSystemFamily": "నిర్వాహక వ్యవస్థ కుటుంబం",
+        "OperatingSystems": "నిర్వాహక వ్యవస్థలు",
+        "WidgetBrowsers": "సందర్శకుల విహారిణులు"
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/th.json b/plugins/DevicesDetection/lang/th.json
index f498d40013..6aeaf92eca 100644
--- a/plugins/DevicesDetection/lang/th.json
+++ b/plugins/DevicesDetection/lang/th.json
@@ -1,6 +1,11 @@
 {
     "DevicesDetection": {
         "BrowserFamily": "ตระกูลของเบราว์เซอร์",
-        "BrowserVersion": "รุ่นของโปรแกรมบราวเซอร์"
+        "Browsers": "เบราว์เซอร์",
+        "BrowserVersion": "รุ่นของโปรแกรมบราวเซอร์",
+        "ColumnBrowser": "เบราว์เซอร์",
+        "ColumnOperatingSystem": "ระบบปฏิบัติการ",
+        "OperatingSystems": "ระบบปฏิบัติการ",
+        "WidgetBrowsers": "เบราว์เซอร์ของผู้เข้าชม"
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/tl.json b/plugins/DevicesDetection/lang/tl.json
index a67445367a..36564694da 100644
--- a/plugins/DevicesDetection/lang/tl.json
+++ b/plugins/DevicesDetection/lang/tl.json
@@ -2,10 +2,12 @@
     "DevicesDetection": {
         "BrowserEngineDocumentation": "Ipinapakita ng chart na ito ang magkaka hiwa-hiwalay na pamilya ng browser na gamit ng iyong bisita. %s Ang pinakamahalagang impormasyon na kinakailangan ng web developers ay kung anong klaseng rendering engine ang ginagamit ng bisita. Ang mga label ay naglalaman ng mga pangalan ng mga engines na sinusundan ng mga pang-karaniwang browser na gumagamit ng parehas na engine alinsunod sa mga sumusunod na nasa brackets.",
         "BrowserFamily": "Pamilya ng browser",
+        "Browsers": "Mga Browser",
         "BrowserVersion": "bersyon ng browser",
         "BrowserVersions": "mga bersyon ng browser",
         "Camera": "Camera",
         "CarBrowser": "Car browser",
+        "ColumnBrowser": "Browser",
         "Console": "Console",
         "dataTableLabelBrands": "Tatak",
         "dataTableLabelModels": "Modelo",
@@ -19,13 +21,16 @@
         "DeviceType": "Uri ng device",
         "FeaturePhone": "Feature phone",
         "OperatingSystemFamilies": "Mga pamilya ng Operating System",
+        "OperatingSystemFamily": "Pamilya ng Operating system",
+        "OperatingSystems": "Operating systems",
         "OperatingSystemVersions": "Mga bersyon ng Operating System",
-        "PluginDescription": "Ang plugin na ito ay nagbibigay ng malawak na impormasyon tungkol sa mga mobile devices. tulad ng Brand (tagagawa) Model (device version) mas mahusay na uri ng device (tv consoles smart phones atbp) at higit pa. Ang Plugin na ito ay nagdadagdag ng isang bagong ulat sa 'Mga Bisita> Mga Device'.",
         "SmartDisplay": "Smart display",
         "Smartphone": "Smartphone",
         "submenu": "Mga Device",
         "Tablet": "Tableta",
         "TV": "Tv",
-        "UserAgent": "User-Agent"
+        "UserAgent": "User-Agent",
+        "WidgetBrowsers": "Browser ng Bisita",
+        "WidgetBrowsersDocumentation": "Ang ulat na ito ay naglalaman ng mga impormasyon tungkol sa kung anong browser ang gamit ng iyong bisita. Bawat browser bersyon ay magkakahiwalay na naka-lista."
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/tr.json b/plugins/DevicesDetection/lang/tr.json
index 4b08e2906a..ccb1c62e17 100644
--- a/plugins/DevicesDetection/lang/tr.json
+++ b/plugins/DevicesDetection/lang/tr.json
@@ -1,10 +1,13 @@
 {
     "DevicesDetection": {
         "BrowserFamily": "Tarayıcı ailesi",
+        "Browsers": "Tarayıcılar",
         "BrowserVersion": "Tarayıcı sürümü",
         "BrowserVersions": "Tarayıcı versiyonları",
         "Camera": "Kamera",
         "CarBrowser": "Araba tarayıcısı",
+        "ColumnBrowser": "Tarayıcı",
+        "ColumnOperatingSystem": "İşletim sistemi",
         "Console": "Konsol",
         "dataTableLabelBrands": "Marka",
         "dataTableLabelModels": "Model",
@@ -17,12 +20,14 @@
         "DevicesDetection": "Ziyaretçi Cihazları",
         "DeviceType": "Cihaz tipi",
         "OperatingSystemFamilies": "İşletim Sistemi aileleri",
+        "OperatingSystems": "İşletim sistemleri",
         "OperatingSystemVersions": "İşletim Sistemi versiyonları",
         "SmartDisplay": "Akıllı görüntüleme",
         "Smartphone": "Akıllı Telefon",
         "submenu": "Cihazlar",
         "Tablet": "Tablet",
         "TV": "Tv",
-        "UserAgent": "User-Agent"
+        "UserAgent": "User-Agent",
+        "WidgetBrowsers": "Ziyaretçi tarayıcılari"
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/uk.json b/plugins/DevicesDetection/lang/uk.json
index b1f68505c7..9fe3909250 100644
--- a/plugins/DevicesDetection/lang/uk.json
+++ b/plugins/DevicesDetection/lang/uk.json
@@ -1,5 +1,10 @@
 {
     "DevicesDetection": {
-        "BrowserFamily": "Родина веб-оглядача"
+        "BrowserFamily": "Родина веб-оглядача",
+        "Browsers": "Веб-оглядачі",
+        "ColumnBrowser": "Веб-оглядач",
+        "ColumnOperatingSystem": "Операційна система",
+        "OperatingSystems": "Операційні системи",
+        "WidgetBrowsers": "Веб-оглядачі відвідувачів"
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/vi.json b/plugins/DevicesDetection/lang/vi.json
index 05aef21424..69ba23d960 100644
--- a/plugins/DevicesDetection/lang/vi.json
+++ b/plugins/DevicesDetection/lang/vi.json
@@ -2,6 +2,13 @@
     "DevicesDetection": {
         "BrowserEngineDocumentation": "Biểu đồ này cho thấy các trình duyệt khách truy cập của bạn chia thành các họ trình duyệt. %s Thông tin quan trọng nhất đối với nhà phát triển web là loại công cụ rendering nào khách truy cập của họ đang sử dụng. Các nhãn chứa tên của các công cụ tiếp theo của trình duyệt phổ biến nhất đang sử dụng công cụ cho trong giấu ngoặc đơn.",
         "BrowserFamily": "Họ trình duyệt",
-        "BrowserVersion": "Phiên bản trình duyệt"
+        "Browsers": "Các trình duyệt",
+        "BrowserVersion": "Phiên bản trình duyệt",
+        "ColumnBrowser": "Trình duyệt",
+        "ColumnOperatingSystem": "Hệ điều hành",
+        "OperatingSystemFamily": "Hệ điều hành gia đình",
+        "OperatingSystems": "Các hệ điều hành",
+        "WidgetBrowsers": "Trình duyệt khách truy cập",
+        "WidgetBrowsersDocumentation": "Báo cáo này chứa thông tin về loại trình duyệt mà khách truy cập của bạn sử dụng. Mỗi phiên bản trình duyệt được liệt kê một cách riêng biệt."
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/zh-cn.json b/plugins/DevicesDetection/lang/zh-cn.json
index 4a157f5d82..e5f16368a3 100644
--- a/plugins/DevicesDetection/lang/zh-cn.json
+++ b/plugins/DevicesDetection/lang/zh-cn.json
@@ -2,6 +2,13 @@
     "DevicesDetection": {
         "BrowserEngineDocumentation": "本报表显示访客的浏览器分类。%s对网站开发者来说最重要的就是访客使用何种渲染引擎。标签包括引擎名称，加上括号中的使用这种引擎的最常用的浏览器。",
         "BrowserFamily": "浏览器种类",
-        "BrowserVersion": "浏览器版本"
+        "Browsers": "浏览器名称",
+        "BrowserVersion": "浏览器版本",
+        "ColumnBrowser": "浏览器名称",
+        "ColumnOperatingSystem": "操作系统",
+        "OperatingSystemFamily": "操作系统种类",
+        "OperatingSystems": "操作系统",
+        "WidgetBrowsers": "访客浏览器",
+        "WidgetBrowsersDocumentation": "本报表包含访客所用的浏览器信息，每个浏览器版本单独列出。"
     }
 }
\ No newline at end of file
diff --git a/plugins/DevicesDetection/lang/zh-tw.json b/plugins/DevicesDetection/lang/zh-tw.json
index 9006ec8a94..8bf61951dc 100644
--- a/plugins/DevicesDetection/lang/zh-tw.json
+++ b/plugins/DevicesDetection/lang/zh-tw.json
@@ -1,6 +1,12 @@
 {
     "DevicesDetection": {
         "BrowserFamily": "瀏覽器家族",
-        "BrowserVersion": "瀏覽器版本"
+        "Browsers": "使用瀏覽器",
+        "BrowserVersion": "瀏覽器版本",
+        "ColumnBrowser": "瀏覽器",
+        "ColumnOperatingSystem": "作業系統",
+        "OperatingSystemFamily": "作業系統家族",
+        "OperatingSystems": "作業系統",
+        "WidgetBrowsers": "使用瀏覽器"
     }
 }
\ No newline at end of file
diff --git a/plugins/Ecommerce/Columns/BaseConversion.php b/plugins/Ecommerce/Columns/BaseConversion.php
new file mode 100644
index 0000000000..810f4c32a4
--- /dev/null
+++ b/plugins/Ecommerce/Columns/BaseConversion.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Ecommerce\Columns;
+
+use Piwik\Plugin\Dimension\ConversionDimension;
+use Piwik\Tracker\GoalManager;
+
+abstract class BaseConversion extends ConversionDimension
+{
+    /**
+     * Returns rounded decimal revenue, or if revenue is integer, then returns as is.
+     *
+     * @param int|float $revenue
+     * @return int|float
+     */
+    protected function roundRevenueIfNeeded($revenue)
+    {
+        if (false === $revenue) {
+            return false;
+        }
+
+        if (round($revenue) == $revenue) {
+            return $revenue;
+        }
+
+        $value = round($revenue, GoalManager::REVENUE_PRECISION);
+
+        return $value;
+    }
+}
\ No newline at end of file
diff --git a/plugins/Ecommerce/Columns/ProductCategory.php b/plugins/Ecommerce/Columns/ProductCategory.php
new file mode 100644
index 0000000000..1b5aa0b2e2
--- /dev/null
+++ b/plugins/Ecommerce/Columns/ProductCategory.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Ecommerce\Columns;
+
+use Piwik\Columns\Dimension;
+use Piwik\Piwik;
+
+class ProductCategory extends Dimension
+{
+    public function getName()
+    {
+        return Piwik::translate('Goals_ProductCategory');
+    }
+}
\ No newline at end of file
diff --git a/plugins/Ecommerce/Columns/ProductName.php b/plugins/Ecommerce/Columns/ProductName.php
new file mode 100644
index 0000000000..8c9d43c8a6
--- /dev/null
+++ b/plugins/Ecommerce/Columns/ProductName.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Ecommerce\Columns;
+
+use Piwik\Columns\Dimension;
+use Piwik\Piwik;
+
+class ProductName extends Dimension
+{
+    public function getName()
+    {
+        return Piwik::translate('Goals_ProductName');
+    }
+}
\ No newline at end of file
diff --git a/plugins/Ecommerce/Columns/ProductSku.php b/plugins/Ecommerce/Columns/ProductSku.php
new file mode 100644
index 0000000000..c0a53c503b
--- /dev/null
+++ b/plugins/Ecommerce/Columns/ProductSku.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Ecommerce\Columns;
+
+use Piwik\Columns\Dimension;
+use Piwik\Piwik;
+
+class ProductSku extends Dimension
+{
+    public function getName()
+    {
+        return Piwik::translate('Goals_ProductSKU');
+    }
+}
\ No newline at end of file
diff --git a/plugins/Ecommerce/Columns/Revenue.php b/plugins/Ecommerce/Columns/Revenue.php
new file mode 100644
index 0000000000..ae37315ac7
--- /dev/null
+++ b/plugins/Ecommerce/Columns/Revenue.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Ecommerce\Columns;
+
+use Piwik\Tracker\GoalManager;
+use Piwik\Tracker\Action;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\Visitor;
+
+class Revenue extends BaseConversion
+{
+    protected $columnName = 'revenue';
+    protected $columnType = 'float default NULL';
+
+    /**
+     * @param Request $request
+     * @param Visitor $visitor
+     * @param Action|null $action
+     * @param GoalManager $goalManager
+     *
+     * @return mixed|false
+     */
+    public function onGoalConversion(Request $request, Visitor $visitor, $action, GoalManager $goalManager)
+    {
+        $defaultRevenue = $goalManager->getGoalColumn('revenue');
+        $revenue        = $request->getGoalRevenue($defaultRevenue);
+
+        return $this->roundRevenueIfNeeded($revenue);
+    }
+
+    /**
+     * @param Request $request
+     * @param Visitor $visitor
+     * @param Action|null $action
+     * @param GoalManager $goalManager
+     *
+     * @return mixed|false
+     */
+    public function onEcommerceOrderConversion(Request $request, Visitor $visitor, $action, GoalManager $goalManager)
+    {
+        $defaultRevenue = 0;
+        $revenue = $request->getGoalRevenue($defaultRevenue);
+
+        return $this->roundRevenueIfNeeded($revenue);
+    }
+
+    /**
+     * @param Request $request
+     * @param Visitor $visitor
+     * @param Action|null $action
+     * @param GoalManager $goalManager
+     *
+     * @return mixed|false
+     */
+    public function onEcommerceCartUpdateConversion(Request $request, Visitor $visitor, $action, GoalManager $goalManager)
+    {
+        return $this->onEcommerceOrderConversion($request, $visitor, $action, $goalManager);
+    }
+}
\ No newline at end of file
diff --git a/plugins/Ecommerce/Columns/RevenueDiscount.php b/plugins/Ecommerce/Columns/RevenueDiscount.php
new file mode 100644
index 0000000000..679d6c4ac7
--- /dev/null
+++ b/plugins/Ecommerce/Columns/RevenueDiscount.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Ecommerce\Columns;
+
+use Piwik\Tracker\GoalManager;
+use Piwik\Tracker\Action;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\Visitor;
+
+class RevenueDiscount extends BaseConversion
+{
+    protected $columnName = 'revenue_discount';
+    protected $columnType = 'float default NULL';
+
+    /**
+     * @param Request $request
+     * @param Visitor $visitor
+     * @param Action|null $action
+     * @param GoalManager $goalManager
+     *
+     * @return mixed|false
+     */
+    public function onEcommerceOrderConversion(Request $request, Visitor $visitor, $action, GoalManager $goalManager)
+    {
+        return $this->roundRevenueIfNeeded($request->getParam('ec_dt'));
+    }
+}
\ No newline at end of file
diff --git a/plugins/Ecommerce/Columns/RevenueShipping.php b/plugins/Ecommerce/Columns/RevenueShipping.php
new file mode 100644
index 0000000000..41591ca2e1
--- /dev/null
+++ b/plugins/Ecommerce/Columns/RevenueShipping.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Ecommerce\Columns;
+
+use Piwik\Tracker\GoalManager;
+use Piwik\Tracker\Action;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\Visitor;
+
+class RevenueShipping extends BaseConversion
+{
+    protected $columnName = 'revenue_shipping';
+    protected $columnType = 'float default NULL';
+
+    /**
+     * @param Request $request
+     * @param Visitor $visitor
+     * @param Action|null $action
+     * @param GoalManager $goalManager
+     *
+     * @return mixed|false
+     */
+    public function onEcommerceOrderConversion(Request $request, Visitor $visitor, $action, GoalManager $goalManager)
+    {
+        return $this->roundRevenueIfNeeded($request->getParam('ec_sh'));
+    }
+}
\ No newline at end of file
diff --git a/plugins/Ecommerce/Columns/RevenueSubtotal.php b/plugins/Ecommerce/Columns/RevenueSubtotal.php
new file mode 100644
index 0000000000..7b09df0014
--- /dev/null
+++ b/plugins/Ecommerce/Columns/RevenueSubtotal.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Ecommerce\Columns;
+
+use Piwik\Tracker\GoalManager;
+use Piwik\Tracker\Action;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\Visitor;
+
+class RevenueSubtotal extends BaseConversion
+{
+    protected $columnName = 'revenue_subtotal';
+    protected $columnType = 'float default NULL';
+
+    /**
+     * @param Request $request
+     * @param Visitor $visitor
+     * @param Action|null $action
+     * @param GoalManager $goalManager
+     *
+     * @return mixed|false
+     */
+    public function onEcommerceOrderConversion(Request $request, Visitor $visitor, $action, GoalManager $goalManager)
+    {
+        return $this->roundRevenueIfNeeded($request->getParam('ec_st'));
+    }
+}
\ No newline at end of file
diff --git a/plugins/Ecommerce/Columns/RevenueTax.php b/plugins/Ecommerce/Columns/RevenueTax.php
new file mode 100644
index 0000000000..4a2df65d64
--- /dev/null
+++ b/plugins/Ecommerce/Columns/RevenueTax.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Ecommerce\Columns;
+
+use Piwik\Tracker\GoalManager;
+use Piwik\Tracker\Action;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\Visitor;
+
+class RevenueTax extends BaseConversion
+{
+    protected $columnName = 'revenue_tax';
+    protected $columnType = 'float default NULL';
+
+    /**
+     * @param Request $request
+     * @param Visitor $visitor
+     * @param Action|null $action
+     * @param GoalManager $goalManager
+     *
+     * @return mixed|false
+     */
+    public function onEcommerceOrderConversion(Request $request, Visitor $visitor, $action, GoalManager $goalManager)
+    {
+        return $this->roundRevenueIfNeeded($request->getParam('ec_tx'));
+    }
+}
\ No newline at end of file
diff --git a/plugins/Ecommerce/Controller.php b/plugins/Ecommerce/Controller.php
new file mode 100644
index 0000000000..b1ce7cdd4a
--- /dev/null
+++ b/plugins/Ecommerce/Controller.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Ecommerce;
+
+use Exception;
+use Piwik\DataTable;
+use Piwik\FrontController;
+use Piwik\Piwik;
+use Piwik\Translation\Translator;
+use Piwik\View;
+
+class Controller extends \Piwik\Plugins\Goals\Controller
+{
+    /**
+     * @var Translator
+     */
+    private $translator;
+
+    public function __construct(Translator $translator)
+    {
+        $this->translator = $translator;
+
+        parent::__construct($translator);
+    }
+
+    public function ecommerceReport()
+    {
+        if (!\Piwik\Plugin\Manager::getInstance()->isPluginActivated('CustomVariables')) {
+            throw new Exception("Ecommerce Tracking requires that the plugin Custom Variables is enabled. Please enable the plugin CustomVariables (or ask your admin).");
+        }
+
+        $view = $this->getGoalReportView($idGoal = Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER);
+        $view->displayFullReport = false;
+        $view->headline = $this->translator->translate('General_EvolutionOverPeriod');
+
+        return $view->render();
+    }
+
+    public function ecommerceLogReport($fetch = false)
+    {
+        $view = new View('@Ecommerce/ecommerceLog');
+        $this->setGeneralVariablesView($view);
+
+        $view->ecommerceLog = $this->getEcommerceLog($fetch);
+
+        return $view->render();
+    }
+
+    public function getEcommerceLog($fetch = false)
+    {
+        $saveGET = $_GET;
+        $_GET['segment'] = urlencode('visitEcommerceStatus!=none');
+        $_GET['widget'] = 1;
+        $output = FrontController::getInstance()->dispatch('Live', 'getVisitorLog', array($fetch));
+        $_GET   = $saveGET;
+
+        return $output;
+    }
+
+    public function index()
+    {
+        return $this->ecommerceReport();
+    }
+
+    public function products()
+    {
+        $goal = $this->getMetricsForGoal(Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER);
+        $conversions = 0;
+        if (!empty($goal['nb_conversions'])) {
+            $conversions = $goal['nb_conversions'];
+        }
+
+        $goal = $this->getMetricsForGoal(Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART);
+
+        $cartNbConversions = 0;
+        if (!empty($goal) && array_key_exists('nb_conversions', $goal)) {
+            $cartNbConversions = $goal['nb_conversions'];
+        }
+
+        $preloadAbandonedCart = $cartNbConversions !== false && $conversions == 0;
+
+        $goalReportsByDimension = new View\ReportsByDimension('Goals');
+
+        $ecommerceCustomParams = array();
+        if ($preloadAbandonedCart) {
+            $ecommerceCustomParams['abandonedCarts'] = '1';
+        } else {
+            $ecommerceCustomParams['abandonedCarts'] = '0';
+        }
+
+        $goalReportsByDimension->addReport(
+            'Goals_Products', 'Goals_ProductSKU', 'Goals.getItemsSku', $ecommerceCustomParams);
+        $goalReportsByDimension->addReport(
+            'Goals_Products', 'Goals_ProductName', 'Goals.getItemsName', $ecommerceCustomParams);
+        $goalReportsByDimension->addReport(
+            'Goals_Products', 'Goals_ProductCategory', 'Goals.getItemsCategory', $ecommerceCustomParams);
+
+        $view = new View('@Ecommerce/products');
+        $this->setGeneralVariablesView($view);
+
+        $view->productsByDimension = $goalReportsByDimension->render();
+        return $view->render();
+    }
+
+    public function sales()
+    {
+        $viewOverview = $this->getGoalReportView(Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER);
+        $reportsByDimension = $viewOverview->goalReportsByDimension;
+
+        $view = new View('@Ecommerce/sales');
+        $this->setGeneralVariablesView($view);
+
+        $view->goalReportsByDimension = $reportsByDimension;
+        return $view->render();
+    }
+
+}
diff --git a/plugins/Ecommerce/Menu.php b/plugins/Ecommerce/Menu.php
new file mode 100644
index 0000000000..331715be4f
--- /dev/null
+++ b/plugins/Ecommerce/Menu.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Ecommerce;
+
+use Piwik\Common;
+use Piwik\Menu\MenuReporting;
+use Piwik\Menu\MenuUser;
+use Piwik\Piwik;
+use Piwik\Site;
+use Piwik\Url;
+
+/**
+ */
+class Menu extends \Piwik\Plugin\Menu
+{
+
+    public function configureReportingMenu(MenuReporting $menu)
+    {
+        $idSite = Common::getRequestVar('idSite', null, 'int');
+
+        $site = new Site($idSite);
+
+        if ($site->isEcommerceEnabled()) {
+            $ecommerceParams = array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER);
+            $ecommerceUrl    = $this->urlForAction('ecommerceReport', $ecommerceParams);
+
+            $menu->addItem('Goals_Ecommerce', '', $ecommerceUrl, 24);
+            $menu->addItem('Goals_Ecommerce', 'General_Overview', $ecommerceUrl, 1);
+            $menu->addItem('Goals_Ecommerce', 'Goals_EcommerceLog', $this->urlForAction('ecommerceLogReport'), 2);
+            $menu->addItem('Goals_Ecommerce', 'Goals_Products', $this->urlForAction('products', $ecommerceParams), 3);
+            $menu->addItem('Goals_Ecommerce', 'Ecommerce_Sales', $this->urlForAction('sales', $ecommerceParams), 4);
+        }
+
+    }
+}
diff --git a/plugins/Ecommerce/Reports/Base.php b/plugins/Ecommerce/Reports/Base.php
new file mode 100644
index 0000000000..08a766792a
--- /dev/null
+++ b/plugins/Ecommerce/Reports/Base.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Ecommerce\Reports;
+
+use Piwik\API\Proxy;
+use Piwik\Common;
+use Piwik\Piwik;
+use Piwik\Plugin\Report;
+use Piwik\Site;
+use Piwik\ViewDataTable\Factory as ViewDataTableFactory;
+use Piwik\WidgetsList;
+
+abstract class Base extends Report
+{
+    protected function init()
+    {
+        $this->module   = 'Goals';
+        $this->category = 'Goals_Ecommerce';
+    }
+
+    public function isEnabled()
+    {
+        $idSite = Common::getRequestVar('idSite', false, 'int');
+
+        if (empty($idSite)) {
+            return false;
+        }
+
+        return $this->isEcommerceEnabled($idSite);
+    }
+
+    public function checkIsEnabled()
+    {
+        if (!$this->isEnabled()) {
+            $message = Piwik::translate('General_ExceptionReportNotEnabled');
+
+            if (Piwik::hasUserSuperUserAccess()) {
+                $message .= ' Most likely Ecommerce is not enabled for the requested site.';
+            }
+
+            throw new \Exception($message);
+        }
+    }
+
+    public function configureReportMetadata(&$availableReports, $infos)
+    {
+        if ($this->isEcommerceEnabledByInfos($infos)) {
+            $availableReports[] = $this->buildReportMetadata();
+        }
+    }
+
+    private function isEcommerceEnabledByInfos($infos)
+    {
+        $idSites = $infos['idSites'];
+
+        if (count($idSites) != 1) {
+            return false;
+        }
+
+        $idSite = reset($idSites);
+
+        return $this->isEcommerceEnabled($idSite);
+    }
+
+    private function isEcommerceEnabled($idSite)
+    {
+        $site = new Site($idSite);
+
+        return $site->isEcommerceEnabled();
+    }
+
+}
diff --git a/plugins/Ecommerce/Reports/BaseItem.php b/plugins/Ecommerce/Reports/BaseItem.php
new file mode 100644
index 0000000000..693f0074de
--- /dev/null
+++ b/plugins/Ecommerce/Reports/BaseItem.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Ecommerce\Reports;
+
+use Piwik\Common;
+use Piwik\Metrics\Formatter;
+use Piwik\Piwik;
+use Piwik\Plugin\Report;
+use Piwik\Plugin\ViewDataTable;
+use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Evolution;
+use Piwik\Plugins\Goals\Goals;
+use Piwik\Plugins\Goals\Columns\Metrics\AveragePrice;
+use Piwik\Plugins\Goals\Columns\Metrics\AverageQuantity;
+use Piwik\Plugins\Goals\Columns\Metrics\ProductConversionRate;
+
+abstract class BaseItem extends Base
+{
+    protected function init()
+    {
+        parent::init();
+        $this->processedMetrics = array(
+            new AveragePrice(),
+            new AverageQuantity(),
+            new ProductConversionRate()
+        );
+        $this->metrics = array(
+            'revenue', 'quantity', 'orders', 'nb_visits'
+        );
+    }
+
+    public function getMetrics()
+    {
+        $metrics = parent::getMetrics();
+        $metrics['revenue'] = Piwik::translate('General_ProductRevenue');
+        $metrics['orders']  = Piwik::translate('General_UniquePurchases');
+        return $metrics;
+    }
+
+    public function getMetricsDocumentation()
+    {
+        if ($this->isAbandonedCart()) {
+            return array(
+                'revenue'         => Piwik::translate('Goals_ColumnRevenueDocumentation',
+                                            Piwik::translate('Goals_DocumentationRevenueGeneratedByProductSales')),
+                'quantity'        => Piwik::translate('Goals_ColumnQuantityDocumentation', $this->name),
+                'orders'          => Piwik::translate('Goals_ColumnOrdersDocumentation', $this->name),
+                'avg_price'       => Piwik::translate('Goals_ColumnAveragePriceDocumentation', $this->name),
+                'avg_quantity'    => Piwik::translate('Goals_ColumnAverageQuantityDocumentation', $this->name),
+                'nb_visits'       => Piwik::translate('Goals_ColumnVisitsProductDocumentation', $this->name),
+                'conversion_rate' => Piwik::translate('Goals_ColumnConversionRateProductDocumentation', $this->name),
+            );
+        }
+
+        return array();
+    }
+
+    public function configureView(ViewDataTable $view)
+    {
+        $idSite = Common::getRequestVar('idSite');
+
+        $view->config->show_ecommerce = true;
+        $view->config->show_table     = false;
+        $view->config->show_all_views_icons      = false;
+        $view->config->show_exclude_low_population = false;
+        $view->config->show_table_all_columns      = false;
+
+        if (!($view instanceof Evolution)) {
+            $moneyColumns = array('revenue');
+            $formatter    = array(new Formatter(), 'getPrettyMoney');
+            $view->config->filters[] = array('ColumnCallbackReplace', array($moneyColumns, $formatter, array($idSite)));
+        }
+
+        $view->requestConfig->filter_limit       = 10;
+        $view->requestConfig->filter_sort_column = 'revenue';
+        $view->requestConfig->filter_sort_order  = 'desc';
+
+        $view->config->custom_parameters['isFooterExpandedInDashboard'] = true;
+
+        // set columns/translations which differ based on viewDataTable TODO: shouldn't have to do this check...
+        // amount of reports should be dynamic, but metadata should be static
+        $columns = array_merge($this->getMetrics(), $this->getProcessedMetrics());
+        $columnsOrdered = array('label', 'revenue', 'quantity', 'orders', 'avg_price', 'avg_quantity',
+                                'nb_visits', 'conversion_rate');
+
+        // handle old case where viewDataTable is set to ecommerceOrder/ecommerceAbandonedCart. in this case, we
+        // set abandonedCarts accordingly and remove the ecommerceOrder/ecommerceAbandonedCart as viewDataTable.
+        $viewDataTable = Common::getRequestVar('viewDataTable', '');
+        if ($viewDataTable == 'ecommerceOrder') {
+            $view->config->custom_parameters['viewDataTable'] = 'table';
+            $abandonedCart = false;
+        } else if ($viewDataTable == 'ecommerceAbandonedCart') {
+            $view->config->custom_parameters['viewDataTable'] = 'table';
+            $abandonedCart = true;
+        } else {
+            $abandonedCart = $this->isAbandonedCart();
+        }
+
+        if ($abandonedCart) {
+            $columns['abandoned_carts'] = Piwik::translate('General_AbandonedCarts');
+            $columns['revenue'] = Piwik::translate('Goals_LeftInCart', $columns['revenue']);
+            $columns['quantity'] = Piwik::translate('Goals_LeftInCart', $columns['quantity']);
+            $columns['avg_quantity'] = Piwik::translate('Goals_LeftInCart', $columns['avg_quantity']);
+            unset($columns['orders']);
+            unset($columns['conversion_rate']);
+
+            $columnsOrdered = array('label', 'revenue', 'quantity', 'avg_price', 'avg_quantity', 'nb_visits',
+                                    'abandoned_carts');
+
+            $view->config->custom_parameters['abandonedCarts'] = '1';
+        } else {
+            $view->config->custom_parameters['abandonedCarts'] = '0';
+        }
+
+        $view->requestConfig->request_parameters_to_modify['abandonedCarts'] = $view->config->custom_parameters['abandonedCarts'];
+
+        $translations = array_merge(array('label' => $this->name), $columns);
+
+        $view->config->addTranslations($translations);
+        $view->config->columns_to_display = $columnsOrdered;
+    }
+
+    private function isAbandonedCart()
+    {
+        return Common::getRequestVar('abandonedCarts', '0', 'string') == 1;
+    }
+}
diff --git a/plugins/Ecommerce/Reports/GetDaysToConversionAbandonedCart.php b/plugins/Ecommerce/Reports/GetDaysToConversionAbandonedCart.php
new file mode 100644
index 0000000000..e68fbae2e6
--- /dev/null
+++ b/plugins/Ecommerce/Reports/GetDaysToConversionAbandonedCart.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Ecommerce\Reports;
+
+use Piwik\Metrics;
+use Piwik\Piwik;
+use Piwik\Plugins\Goals\Columns\DaysToConversion;
+
+class GetDaysToConversionAbandonedCart extends Base
+{
+    protected function init()
+    {
+        parent::init();
+
+        $this->action = 'getDaysToConversion';
+        $this->name = Piwik::translate('General_AbandonedCarts') . ' - ' . Piwik::translate('Goals_DaysToConv');
+        $this->dimension = new DaysToConversion();
+        $this->constantRowsCount = true;
+        $this->processedMetrics = false;
+        $this->metrics = array('nb_conversions');
+        $this->order = 25;
+
+        $this->parameters =  array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART);
+    }
+
+}
diff --git a/plugins/Ecommerce/Reports/GetDaysToConversionEcommerceOrder.php b/plugins/Ecommerce/Reports/GetDaysToConversionEcommerceOrder.php
new file mode 100644
index 0000000000..5e8bb66417
--- /dev/null
+++ b/plugins/Ecommerce/Reports/GetDaysToConversionEcommerceOrder.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Ecommerce\Reports;
+
+use Piwik\Metrics;
+use Piwik\Piwik;
+use Piwik\Plugins\Goals\Columns\DaysToConversion;
+
+class GetDaysToConversionEcommerceOrder extends Base
+{
+    protected function init()
+    {
+        parent::init();
+
+        $this->action = 'getDaysToConversion';
+        $this->name = Piwik::translate('General_EcommerceOrders') . ' - ' . Piwik::translate('Goals_DaysToConv');
+        $this->dimension = new DaysToConversion();
+        $this->constantRowsCount = true;
+        $this->processedMetrics = false;
+        $this->metrics = array('nb_conversions');
+        $this->order = 12;
+
+        $this->parameters = array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER);
+    }
+
+}
diff --git a/plugins/Ecommerce/Reports/GetEcommerceAbandonedCart.php b/plugins/Ecommerce/Reports/GetEcommerceAbandonedCart.php
new file mode 100644
index 0000000000..e37bb4e7e0
--- /dev/null
+++ b/plugins/Ecommerce/Reports/GetEcommerceAbandonedCart.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Ecommerce\Reports;
+
+use Piwik\Piwik;
+
+class GetEcommerceAbandonedCart extends Base
+{
+    protected function init()
+    {
+        parent::init();
+        $this->action = 'get';
+        $this->name = Piwik::translate('General_AbandonedCarts');
+        $this->processedMetrics = array('avg_order_revenue');
+        $this->order = 15;
+        $this->metrics = array('nb_conversions', 'conversion_rate', 'revenue', 'items');
+
+        $this->parameters = array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART);
+    }
+
+    public function getMetrics() {
+        $metrics = parent::getMetrics();
+
+        $metrics['nb_conversions'] = Piwik::translate('General_AbandonedCarts');
+        $metrics['revenue']        = Piwik::translate('Goals_LeftInCart', Piwik::translate('General_ColumnRevenue'));
+        $metrics['items']          = Piwik::translate('Goals_LeftInCart', Piwik::translate('Goals_Products'));
+
+        return $metrics;
+    }
+}
diff --git a/plugins/Ecommerce/Reports/GetEcommerceOrder.php b/plugins/Ecommerce/Reports/GetEcommerceOrder.php
new file mode 100644
index 0000000000..e954b68724
--- /dev/null
+++ b/plugins/Ecommerce/Reports/GetEcommerceOrder.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Ecommerce\Reports;
+
+use Piwik\Piwik;
+
+class GetEcommerceOrder extends Base
+{
+    protected function init()
+    {
+        parent::init();
+        $this->action = 'get';
+        $this->name = Piwik::translate('General_EcommerceOrders');
+        $this->processedMetrics = array('avg_order_revenue');
+        $this->order = 10;
+        $this->metrics = array(
+            'nb_conversions',
+            'nb_visits_converted',
+            'conversion_rate',
+            'revenue',
+            'revenue_subtotal',
+            'revenue_tax',
+            'revenue_shipping',
+            'revenue_discount'
+        );
+
+        $this->parameters = array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER);
+    }
+
+    public function getMetrics()
+    {
+        $metrics = parent::getMetrics();
+
+        $metrics['nb_conversions'] = Piwik::translate('General_EcommerceOrders');
+        $metrics['items']          = Piwik::translate('General_PurchasedProducts');
+
+        return $metrics;
+    }
+}
diff --git a/plugins/Ecommerce/Reports/GetItemsCategory.php b/plugins/Ecommerce/Reports/GetItemsCategory.php
new file mode 100644
index 0000000000..bf652ca10d
--- /dev/null
+++ b/plugins/Ecommerce/Reports/GetItemsCategory.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Ecommerce\Reports;
+
+use Piwik\Piwik;
+use Piwik\Plugins\Ecommerce\Columns\ProductCategory;
+
+class GetItemsCategory extends BaseItem
+{
+    protected function init()
+    {
+        parent::init();
+
+        $this->name      = Piwik::translate('Goals_ProductCategory');
+        $this->dimension = new ProductCategory();
+        $this->order     = 32;
+        $this->widgetTitle = 'Goals_ProductCategory';
+    }
+}
diff --git a/plugins/Ecommerce/Reports/GetItemsName.php b/plugins/Ecommerce/Reports/GetItemsName.php
new file mode 100644
index 0000000000..a320b760e4
--- /dev/null
+++ b/plugins/Ecommerce/Reports/GetItemsName.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Ecommerce\Reports;
+
+use Piwik\Piwik;
+use Piwik\Plugins\Ecommerce\Columns\ProductName;
+
+class GetItemsName extends BaseItem
+{
+    protected function init()
+    {
+        parent::init();
+
+        $this->name      = Piwik::translate('Goals_ProductName');
+        $this->dimension = new ProductName();
+        $this->order     = 31;
+        $this->widgetTitle = 'Goals_ProductName';
+    }
+}
diff --git a/plugins/Ecommerce/Reports/GetItemsSku.php b/plugins/Ecommerce/Reports/GetItemsSku.php
new file mode 100644
index 0000000000..a2b20eb3f9
--- /dev/null
+++ b/plugins/Ecommerce/Reports/GetItemsSku.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Ecommerce\Reports;
+
+use Piwik\Piwik;
+use Piwik\Plugins\Ecommerce\Columns\ProductSku;
+
+class GetItemsSku extends BaseItem
+{
+
+    protected function init()
+    {
+        parent::init();
+
+        $this->name      = Piwik::translate('Goals_ProductSKU');
+        $this->dimension = new ProductSku();
+        $this->order     = 30;
+        $this->widgetTitle = 'Goals_ProductSKU';
+    }
+
+}
diff --git a/plugins/Ecommerce/Reports/GetVisitsUntilConversionAbandonedCart.php b/plugins/Ecommerce/Reports/GetVisitsUntilConversionAbandonedCart.php
new file mode 100644
index 0000000000..d6d9512625
--- /dev/null
+++ b/plugins/Ecommerce/Reports/GetVisitsUntilConversionAbandonedCart.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Ecommerce\Reports;
+
+use Piwik\Metrics;
+use Piwik\Piwik;
+use Piwik\Plugins\Goals\Columns\VisitsUntilConversion;
+
+class GetVisitsUntilConversionAbandonedCart extends Base
+{
+    protected function init()
+    {
+        parent::init();
+
+        $this->action = 'getVisitsUntilConversion';
+        $this->name = Piwik::translate('General_AbandonedCarts') . ' - ' . Piwik::translate('Goals_VisitsUntilConv');
+        $this->dimension = new VisitsUntilConversion();
+        $this->constantRowsCount = true;
+        $this->processedMetrics = false;
+        $this->metrics = array('nb_conversions');
+        $this->order = 20;
+
+        $this->parameters =  array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART);
+    }
+
+}
diff --git a/plugins/Ecommerce/Reports/GetVisitsUntilConversionEcommerceOrder.php b/plugins/Ecommerce/Reports/GetVisitsUntilConversionEcommerceOrder.php
new file mode 100644
index 0000000000..7084805b44
--- /dev/null
+++ b/plugins/Ecommerce/Reports/GetVisitsUntilConversionEcommerceOrder.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Ecommerce\Reports;
+
+use Piwik\Metrics;
+use Piwik\Piwik;
+use Piwik\Plugins\Goals\Columns\VisitsUntilConversion;
+
+class GetVisitsUntilConversionEcommerceOrder extends Base
+{
+    protected function init()
+    {
+        parent::init();
+
+        $this->action = 'getVisitsUntilConversion';
+        $this->name = Piwik::translate('General_EcommerceOrders') . ' - ' . Piwik::translate('Goals_VisitsUntilConv');
+        $this->dimension = new VisitsUntilConversion();
+        $this->constantRowsCount = true;
+        $this->processedMetrics = array();
+        $this->metrics = array('nb_conversions');
+        $this->order = 11;
+
+        $this->parameters =  array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER);
+    }
+
+}
diff --git a/plugins/Ecommerce/Widgets.php b/plugins/Ecommerce/Widgets.php
new file mode 100644
index 0000000000..e20a73850e
--- /dev/null
+++ b/plugins/Ecommerce/Widgets.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Ecommerce;
+
+use Piwik\Common;
+use Piwik\Site;
+use Piwik\Piwik;
+
+class Widgets extends \Piwik\Plugin\Widgets
+{
+    protected $category = 'Goals_Ecommerce';
+
+    protected function init()
+    {
+        $idSite = $this->getIdSite();
+
+        $site = new Site($idSite);
+        if ($site->isEcommerceEnabled()) {
+            $this->addWidget('General_Overview', 'widgetGoalReport', array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER));
+            $this->addWidget('Goals_EcommerceLog', 'getEcommerceLog');
+        }
+    }
+
+    private function getIdSite()
+    {
+        return Common::getRequestVar('idSite', null, 'int');
+    }
+
+}
diff --git a/plugins/Ecommerce/lang/cs.json b/plugins/Ecommerce/lang/cs.json
new file mode 100644
index 0000000000..e77b6363f3
--- /dev/null
+++ b/plugins/Ecommerce/lang/cs.json
@@ -0,0 +1,6 @@
+{
+    "Ecommerce": {
+        "Sales": "Tržby",
+        "ViewSalesBy": "Zobrazí tržby podle %s"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Ecommerce/lang/da.json b/plugins/Ecommerce/lang/da.json
new file mode 100644
index 0000000000..4076385005
--- /dev/null
+++ b/plugins/Ecommerce/lang/da.json
@@ -0,0 +1,6 @@
+{
+    "Ecommerce": {
+        "Sales": "Salg",
+        "ViewSalesBy": "Vis salg fra %s"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Ecommerce/lang/de.json b/plugins/Ecommerce/lang/de.json
new file mode 100644
index 0000000000..b0607e9bbe
--- /dev/null
+++ b/plugins/Ecommerce/lang/de.json
@@ -0,0 +1,6 @@
+{
+    "Ecommerce": {
+        "Sales": "Umsatz",
+        "ViewSalesBy": "Zeigt Umsätze nach %s"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Ecommerce/lang/el.json b/plugins/Ecommerce/lang/el.json
new file mode 100644
index 0000000000..03666581e6
--- /dev/null
+++ b/plugins/Ecommerce/lang/el.json
@@ -0,0 +1,6 @@
+{
+    "Ecommerce": {
+        "Sales": "Πωλήσεις",
+        "ViewSalesBy": "Εμφανίζει τις πωλήσεις ανά %s"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Ecommerce/lang/en.json b/plugins/Ecommerce/lang/en.json
new file mode 100644
index 0000000000..e84e4092aa
--- /dev/null
+++ b/plugins/Ecommerce/lang/en.json
@@ -0,0 +1,6 @@
+{
+    "Ecommerce": {
+        "Sales": "Sales",
+        "ViewSalesBy": "View sales by %s"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Ecommerce/lang/fr.json b/plugins/Ecommerce/lang/fr.json
new file mode 100644
index 0000000000..f88e15c4da
--- /dev/null
+++ b/plugins/Ecommerce/lang/fr.json
@@ -0,0 +1,5 @@
+{
+    "Ecommerce": {
+        "Sales": "Ventes"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Ecommerce/lang/it.json b/plugins/Ecommerce/lang/it.json
new file mode 100644
index 0000000000..a785043467
--- /dev/null
+++ b/plugins/Ecommerce/lang/it.json
@@ -0,0 +1,6 @@
+{
+    "Ecommerce": {
+        "Sales": "Vendite",
+        "ViewSalesBy": "Vista vendite per %s"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Ecommerce/lang/nb.json b/plugins/Ecommerce/lang/nb.json
new file mode 100644
index 0000000000..a3fdd4bfd2
--- /dev/null
+++ b/plugins/Ecommerce/lang/nb.json
@@ -0,0 +1,6 @@
+{
+    "Ecommerce": {
+        "Sales": "Salg",
+        "ViewSalesBy": "Vis salg etter %s"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Ecommerce/lang/nl.json b/plugins/Ecommerce/lang/nl.json
new file mode 100644
index 0000000000..e1199cf141
--- /dev/null
+++ b/plugins/Ecommerce/lang/nl.json
@@ -0,0 +1,6 @@
+{
+    "Ecommerce": {
+        "Sales": "Verkopen",
+        "ViewSalesBy": "Bekijk verkopen per %s"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Ecommerce/lang/pt.json b/plugins/Ecommerce/lang/pt.json
new file mode 100644
index 0000000000..12586c4b83
--- /dev/null
+++ b/plugins/Ecommerce/lang/pt.json
@@ -0,0 +1,5 @@
+{
+    "Ecommerce": {
+        "Sales": "Vender"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Ecommerce/lang/ru.json b/plugins/Ecommerce/lang/ru.json
new file mode 100644
index 0000000000..8a35e7800e
--- /dev/null
+++ b/plugins/Ecommerce/lang/ru.json
@@ -0,0 +1,5 @@
+{
+    "Ecommerce": {
+        "Sales": "Продажи"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Ecommerce/lang/sv.json b/plugins/Ecommerce/lang/sv.json
new file mode 100644
index 0000000000..157ba3057f
--- /dev/null
+++ b/plugins/Ecommerce/lang/sv.json
@@ -0,0 +1,6 @@
+{
+    "Ecommerce": {
+        "Sales": "Försäljning",
+        "ViewSalesBy": "Visa försäljning genom %s"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Ecommerce/plugin.json b/plugins/Ecommerce/plugin.json
new file mode 100644
index 0000000000..6c5ce77eca
--- /dev/null
+++ b/plugins/Ecommerce/plugin.json
@@ -0,0 +1,3 @@
+{
+    "description": "Ecommerce lets you track when users add products to carts, and when they convert to a ecommerce sale. Also track products and product categories views and abandoned carts. "
+}
\ No newline at end of file
diff --git a/plugins/Ecommerce/templates/ecommerceLog.twig b/plugins/Ecommerce/templates/ecommerceLog.twig
new file mode 100644
index 0000000000..4c40a94d99
--- /dev/null
+++ b/plugins/Ecommerce/templates/ecommerceLog.twig
@@ -0,0 +1,3 @@
+<h2 piwik-enriched-headline>{{ 'Goals_EcommerceLog'|translate }}</h2>
+
+{{ ecommerceLog|raw }}
diff --git a/plugins/Ecommerce/templates/products.twig b/plugins/Ecommerce/templates/products.twig
new file mode 100644
index 0000000000..4cb67d456e
--- /dev/null
+++ b/plugins/Ecommerce/templates/products.twig
@@ -0,0 +1,3 @@
+<h2 piwik-enriched-headline>{{ 'Goals_Products'|translate }}</h2>
+
+{{ productsByDimension|raw }}
diff --git a/plugins/Ecommerce/templates/sales.twig b/plugins/Ecommerce/templates/sales.twig
new file mode 100644
index 0000000000..2809af6581
--- /dev/null
+++ b/plugins/Ecommerce/templates/sales.twig
@@ -0,0 +1,3 @@
+<h2 piwik-enriched-headline>{{ 'Ecommerce_Sales'|translate }}</h2>
+
+{{ goalReportsByDimension|raw }}
diff --git a/plugins/Events/API.php b/plugins/Events/API.php
index d81144f855..bb6584b777 100644
--- a/plugins/Events/API.php
+++ b/plugins/Events/API.php
@@ -154,6 +154,17 @@ class API extends \Piwik\Plugin\API
         $this->checkSecondaryDimension($name, $secondaryDimension);
         $recordName = $this->getRecordNameForAction($name, $secondaryDimension);
         $dataTable = Archive::getDataTableFromArchive($recordName, $idSite, $period, $date, $segment, $expanded, $idSubtable);
+
+        if (empty($idSubtable)) {
+            $dataTable->filter('AddSegmentValue', array(function ($label) {
+                if ($label === Archiver::EVENT_NAME_NOT_SET) {
+                    return false;
+                }
+
+                return $label;
+            }));
+        }
+
         $this->filterDataTable($dataTable);
         return $dataTable;
     }
diff --git a/plugins/Events/Archiver.php b/plugins/Events/Archiver.php
index eb33d4899f..5a5160bdb2 100644
--- a/plugins/Events/Archiver.php
+++ b/plugins/Events/Archiver.php
@@ -179,17 +179,17 @@ class Archiver extends \Piwik\Plugin\Archiver
             $rankingQuery->addColumn(Metrics::INDEX_EVENT_MAX_EVENT_VALUE, 'max');
         }
 
-        $this->archiveDayQueryProcess($select, $from, $where, $orderBy, $groupBy, $rankingQuery);
+        $this->archiveDayQueryProcess($select, $from, $where, $groupBy, $orderBy, $rankingQuery);
     }
 
-    protected function archiveDayQueryProcess($select, $from, $where, $orderBy, $groupBy, RankingQuery $rankingQuery)
+    protected function archiveDayQueryProcess($select, $from, $where, $groupBy, $orderBy, RankingQuery $rankingQuery)
     {
         // get query with segmentation
         $query = $this->getLogAggregator()->generateQuery($select, $from, $where, $groupBy, $orderBy);
 
         // apply ranking query
         if ($rankingQuery) {
-            $query['sql'] = $rankingQuery->generateQuery($query['sql']);
+            $query['sql'] = $rankingQuery->generateRankingQuery($query['sql']);
         }
 
         // get result
diff --git a/plugins/Events/lang/de.json b/plugins/Events/lang/de.json
index 20277ba39f..e814262c4e 100644
--- a/plugins/Events/lang/de.json
+++ b/plugins/Events/lang/de.json
@@ -20,7 +20,7 @@
         "MinValue": "Minimaler Wert",
         "MinValueDocumentation": "Minimaler Wert für dieses Ereignis",
         "SecondaryDimension": "Die sekundäre Dimension ist %s.",
-        "SwitchToSecondaryDimension": "Zu %s wechseln",
+        "SwitchToSecondaryDimension": "Wechseln zu %s",
         "TopEvents": "Häufigste Ereignisse",
         "TotalEvents": "Gesamtzahl an Ereignissen",
         "TotalEventsDocumentation": "Gesamtanzahl der Ereignisse",
diff --git a/plugins/Events/lang/nb.json b/plugins/Events/lang/nb.json
index 62bd660a4c..b4451443fc 100644
--- a/plugins/Events/lang/nb.json
+++ b/plugins/Events/lang/nb.json
@@ -2,6 +2,7 @@
     "Events": {
         "Event": "Hendelse",
         "Events": "Hendelser",
-        "SwitchToSecondaryDimension": "Bytt til %s"
+        "SwitchToSecondaryDimension": "Bytt til %s",
+        "ViewEvents": "Vis hendelser"
     }
 }
\ No newline at end of file
diff --git a/plugins/Events/lang/pt.json b/plugins/Events/lang/pt.json
new file mode 100644
index 0000000000..c77a299090
--- /dev/null
+++ b/plugins/Events/lang/pt.json
@@ -0,0 +1,6 @@
+{
+    "Events": {
+        "AvgValue": "Valor médio",
+        "Event": "Evento"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Events/lang/ru.json b/plugins/Events/lang/ru.json
index 61d63e59c4..03685117f0 100644
--- a/plugins/Events/lang/ru.json
+++ b/plugins/Events/lang/ru.json
@@ -1,10 +1,28 @@
 {
     "Events": {
+        "AvgEventValue": "Среднее значение события: %s",
+        "AvgValue": "Среднее значение",
+        "AvgValueDocumentation": "Среднее всех значений для этого события",
         "Event": "Событие",
+        "EventAction": "Действие события",
+        "EventActions": "Действия событий",
+        "EventCategories": "Категории событий",
+        "EventCategory": "Категория события",
+        "EventName": "Название события",
+        "EventNames": "Названия событий",
+        "Events": "События",
+        "EventsWithValue": "События со значением",
+        "EventsWithValueDocumentation": "Количество событий, где было установлено значение для События",
+        "EventValue": "Значение события",
         "MaxValue": "Максимальное значение",
         "MaxValueDocumentation": "Максимальное значения для этого события",
         "MinValue": "Минимальное значение",
         "MinValueDocumentation": "Минимальное значения для этого события",
+        "TopEvents": "Топ событий",
+        "TotalEvents": "Всего событий",
+        "TotalEventsDocumentation": "Общее количество событий",
+        "TotalValue": "Общее значение",
+        "TotalValueDocumentation": "Сумма значений событий",
         "ViewEvents": "Просмотреть события"
     }
 }
\ No newline at end of file
diff --git a/plugins/Events/plugin.json b/plugins/Events/plugin.json
index 908441b7b5..b76d775e7c 100644
--- a/plugins/Events/plugin.json
+++ b/plugins/Events/plugin.json
@@ -1,6 +1,6 @@
 {
  "name": "Events",
  "version": "1.0",
- "description": "Track Custom Events and get reports on your visitors activity.",
+ "description": "Track Events and get reports on your visitors activity. ",
  "theme": false
 }
\ No newline at end of file
diff --git a/plugins/ExampleAPI/plugin.json b/plugins/ExampleAPI/plugin.json
index 9fd6d7cc55..bf17ca1e07 100644
--- a/plugins/ExampleAPI/plugin.json
+++ b/plugins/ExampleAPI/plugin.json
@@ -1,6 +1,6 @@
 {
     "name": "ExampleAPI",
-    "description": "Example Plugin: How to create an API for your plugin, to export your data in multiple formats without any special coding?",
+    "description": "Piwik Platform showcase: how to create an API for your plugin to let your users export your data in multiple formats.",
     "version": "1.0",
     "keywords": ["example", "api"],
     "homepage": "http://piwik.org",
diff --git a/plugins/ExampleCommand/plugin.json b/plugins/ExampleCommand/plugin.json
index 24cc1735d1..a28f2d2b97 100644
--- a/plugins/ExampleCommand/plugin.json
+++ b/plugins/ExampleCommand/plugin.json
@@ -1,6 +1,6 @@
 {
  "name": "ExampleCommand",
  "version": "0.1.0",
- "description": "Example for console commands",
+ "description": "Piwik Platform showcase: how to create a console command.",
  "theme": false
 }
\ No newline at end of file
diff --git a/plugins/ExamplePlugin/API.php b/plugins/ExamplePlugin/API.php
index 5e9da0364e..b24bd2f4ad 100644
--- a/plugins/ExamplePlugin/API.php
+++ b/plugins/ExamplePlugin/API.php
@@ -47,9 +47,10 @@ class API extends \Piwik\Plugin\API
      */
     public function getExampleReport($idSite, $period, $date, $segment = false)
     {
-        $table = new DataTable();
-
-        $table->addRowFromArray(array(Row::COLUMNS => array('nb_visits' => 5)));
+        $table = DataTable::makeFromSimpleArray(array(
+            array('label' => 'My Label 1', 'nb_visits' => '1'),
+            array('label' => 'My Label 2', 'nb_visits' => '5'),
+        ));
 
         return $table;
     }
diff --git a/plugins/ExamplePlugin/plugin.json b/plugins/ExamplePlugin/plugin.json
index d3b8257e4d..c152b6c269 100644
--- a/plugins/ExamplePlugin/plugin.json
+++ b/plugins/ExamplePlugin/plugin.json
@@ -1,7 +1,7 @@
 {
  "name": "ExamplePlugin",
  "version": "0.1.0",
- "description": "ExampleDescription",
+ "description": "Piwik Platform showcase: how to create widgets, menus, scheduled tasks, a custom archiver, plugin tests, and a AngularJS component.",
  "theme": false,
  "require": {
     "piwik": ">=PIWIK_VERSION"
diff --git a/plugins/ExamplePlugin/tests/UI/.gitignore b/plugins/ExamplePlugin/tests/UI/.gitignore
new file mode 100644
index 0000000000..f39be478e7
--- /dev/null
+++ b/plugins/ExamplePlugin/tests/UI/.gitignore
@@ -0,0 +1,2 @@
+/processed-ui-screenshots
+/screenshot-diffs
\ No newline at end of file
diff --git a/plugins/ExamplePlugin/tests/UI/SimpleUITest_spec.js b/plugins/ExamplePlugin/tests/UI/SimpleUITest_spec.js
new file mode 100644
index 0000000000..bd2cd2da49
--- /dev/null
+++ b/plugins/ExamplePlugin/tests/UI/SimpleUITest_spec.js
@@ -0,0 +1,46 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * Screenshot integration tests.
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+describe("SimpleUITest", function () {
+    this.timeout(0);
+
+    // uncomment this if you want to define a custom fixture to load before the test instead of the default one
+    // this.fixture = "Piwik\\Plugins\\ExamplePlugin\\tests\\Fixtures\\YOUR_FIXTURE_NAME";
+
+    var generalParams = 'idSite=1&period=day&date=2010-01-03',
+        urlBase = 'module=CoreHome&action=index&' + generalParams;
+
+    before(function () {
+        testEnvironment.pluginsToLoad = ['ExamplePlugin'];
+        testEnvironment.save();
+    });
+
+    it('should load a simple page by its module and action and take a full screenshot', function (done) {
+        var screenshotName = 'simplePage';
+        // will take a screenshot and store it in "processed-ui-screenshots/SimpleUITest_simplePage.png"
+        var urlToTest = "?" + generalParams + "&module=ExamplePlugin&action=index";
+
+        expect.screenshot(screenshotName).to.be.capture(function (page) {
+            page.load(urlToTest);
+        }, done);
+    });
+
+    it('should load a simple page by its module and action and take a partial screenshot', function (done) {
+        var screenshotName  = 'simplePagePartial';
+        // will take a screenshot and store it in "processed-ui-screenshots/SimpleUITest_simplePagePartial.png"
+        var contentSelector = '#root,.expandDataTableFooterDrawer';
+        // take a screenshot only of the content of this CSS/jQuery selector
+        var urlToTest       = "?" + generalParams + "&module=ExamplePlugin&action=index";
+        // "?" + urlBase + "#" + generalParams + "&module=ExamplePlugin&action=index"; this defines a URL for a page within the dashboard
+
+        expect.screenshot(screenshotName).to.be.captureSelector(contentSelector, function (page) {
+            page.load(urlToTest);
+        }, done);
+    });
+});
\ No newline at end of file
diff --git a/plugins/UserSettings/tests/System/processed/.gitkeep b/plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/.gitkeep
index e69de29bb2..e69de29bb2 100644
--- a/plugins/UserSettings/tests/System/processed/.gitkeep
+++ b/plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/.gitkeep
diff --git a/plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/SimpleUITest_simplePage.png b/plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/SimpleUITest_simplePage.png
new file mode 100644
index 0000000000..7b84c80fc1
--- /dev/null
+++ b/plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/SimpleUITest_simplePage.png
diff --git a/plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/SimpleUITest_simplePagePartial.png b/plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/SimpleUITest_simplePagePartial.png
new file mode 100644
index 0000000000..386280a3b8
--- /dev/null
+++ b/plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/SimpleUITest_simplePagePartial.png
diff --git a/plugins/ExampleReport/plugin.json b/plugins/ExampleReport/plugin.json
index 92b90becb4..ac9c402e55 100644
--- a/plugins/ExampleReport/plugin.json
+++ b/plugins/ExampleReport/plugin.json
@@ -1,7 +1,7 @@
 {
  "name": "ExampleReport",
  "version": "0.1.0",
- "description": "A plugin that shows how to define a report",
+ "description": "Piwik Platform showcase: how to define and display a data report.",
  "theme": false,
  "authors": [
      {
diff --git a/plugins/ExampleRssWidget/plugin.json b/plugins/ExampleRssWidget/plugin.json
index cbb36f3848..6775022287 100644
--- a/plugins/ExampleRssWidget/plugin.json
+++ b/plugins/ExampleRssWidget/plugin.json
@@ -1,6 +1,6 @@
 {
     "name": "ExampleRssWidget",
-    "description": "Example Plugin: This plugin showcases how to create a new widget that displays a user submitted RSS feed.",
+    "description": "Piwik Platform showcase: how to create a new widget that displays a user submitted RSS feed.",
     "version": "1.0",
     "keywords": ["example", "feed", "widget"],
     "homepage": "http://piwik.org",
diff --git a/plugins/ExampleSettingsPlugin/Settings.php b/plugins/ExampleSettingsPlugin/Settings.php
index 1853873924..7529407b3f 100644
--- a/plugins/ExampleSettingsPlugin/Settings.php
+++ b/plugins/ExampleSettingsPlugin/Settings.php
@@ -53,7 +53,7 @@ class Settings extends \Piwik\Plugin\Settings
         // User setting --> textbox converted to int defining a validator and filter
         $this->createRefreshIntervalSetting();
 
-        // User setting --> readio
+        // User setting --> radio
         $this->createColorSetting();
 
         // System setting --> allows selection of a single value
diff --git a/plugins/ExampleSettingsPlugin/plugin.json b/plugins/ExampleSettingsPlugin/plugin.json
index ca450fd2f4..ced7bea140 100644
--- a/plugins/ExampleSettingsPlugin/plugin.json
+++ b/plugins/ExampleSettingsPlugin/plugin.json
@@ -1,6 +1,6 @@
 {
  "name": "ExampleSettingsPlugin",
  "version": "0.1.0",
- "description": "Plugin to demonstrate how to define and how to access plugin settings",
+ "description": "Piwik Platform showcase: how to define and how to access plugin settings.",
  "theme": false
 }
\ No newline at end of file
diff --git a/plugins/ExampleTheme/plugin.json b/plugins/ExampleTheme/plugin.json
index b43f1a61b2..433b1eac3f 100644
--- a/plugins/ExampleTheme/plugin.json
+++ b/plugins/ExampleTheme/plugin.json
@@ -1,6 +1,6 @@
 {
     "name": "ExampleTheme",
-    "description": "ExampleDescription",
+    "description": "Piwik Platform showcase: example of how to create a simple Theme.",
     "version": "0.1.0",
     "theme": true,
     "stylesheet": "stylesheets/theme.less"
diff --git a/plugins/ExampleTracker/plugin.json b/plugins/ExampleTracker/plugin.json
index 36dcc32096..cbf8ed8b5b 100644
--- a/plugins/ExampleTracker/plugin.json
+++ b/plugins/ExampleTracker/plugin.json
@@ -1,7 +1,7 @@
 {
  "name": "ExampleTracker",
  "version": "0.1.0",
- "description": "A plugin that shows how to track additional data",
+ "description": "Piwik Platform showcase: how to track additional custom data creating new database table columns.",
  "theme": false,
  "authors": [
      {
diff --git a/plugins/ExampleUI/plugin.json b/plugins/ExampleUI/plugin.json
index 6080c51abe..ec2fcfe025 100644
--- a/plugins/ExampleUI/plugin.json
+++ b/plugins/ExampleUI/plugin.json
@@ -1,6 +1,6 @@
 {
     "name": "ExampleUI",
-    "description": "Example Plugin: This plugin showcases the Piwik User Interface framework, how to easily display custom data tables, graphs, and more.",
+    "description": "Piwik Platform showcase: how to display data tables, graphs, and the UI framework.",
     "version": "1.0.1",
     "keywords": ["example", "framework", "platform", "ui", "visualization"],
     "homepage": "http://piwik.org",
diff --git a/plugins/ExampleVisualization/plugin.json b/plugins/ExampleVisualization/plugin.json
index 73a31c9ba5..bcf9f49ce2 100644
--- a/plugins/ExampleVisualization/plugin.json
+++ b/plugins/ExampleVisualization/plugin.json
@@ -1,7 +1,7 @@
 {
     "name": "ExampleVisualization",
     "version": "0.1.0",
-    "description": "Example for generating a simple visualization",
+    "description": "Piwik Platform showcase: how to create a new custom data visualization.",
     "theme": false,
     "license": "GPL v3+",
     "keywords": ["SimpleTable"],
diff --git a/plugins/Feedback/API.php b/plugins/Feedback/API.php
index ce6acdce20..70ba272d4d 100644
--- a/plugins/Feedback/API.php
+++ b/plugins/Feedback/API.php
@@ -80,22 +80,12 @@ class API extends \Piwik\Plugin\API
 
     private function getEnglishTranslationForFeatureName($featureName)
     {
-        $loadedLanguage = Translate::getLanguageLoaded();
-
-        if ($loadedLanguage == 'en') {
+        if (Translate::getLanguageLoaded() == 'en') {
             return $featureName;
         }
 
         $translationKeyForFeature = Translate::findTranslationKeyForTranslation($featureName);
 
-        if (!empty($translationKeyForFeature)) {
-            Translate::reloadLanguage('en');
-
-            $featureName = Piwik::translate($translationKeyForFeature);
-            Translate::reloadLanguage($loadedLanguage);
-            return $featureName;
-        }
-
-        return $featureName;
+        return Piwik::translate($translationKeyForFeature, array(), 'en');
     }
 }
diff --git a/plugins/Feedback/Menu.php b/plugins/Feedback/Menu.php
index acfd55dab1..19d3f62db5 100644
--- a/plugins/Feedback/Menu.php
+++ b/plugins/Feedback/Menu.php
@@ -15,9 +15,8 @@ class Menu extends \Piwik\Plugin\Menu
 {
     public function configureUserMenu(MenuUser $menu)
     {
-        $menu->addItem(
+        $menu->addPlatformItem(
             'General_Help',
-            null,
             $this->urlForAction('index', array('segment' => false)),
             $order = 99,
             $tooltip = Piwik::translate('Feedback_TopLinkTooltip')
diff --git a/plugins/Feedback/lang/ar.json b/plugins/Feedback/lang/ar.json
index 4e34159ac7..a0999b305c 100644
--- a/plugins/Feedback/lang/ar.json
+++ b/plugins/Feedback/lang/ar.json
@@ -5,7 +5,6 @@
         "IWantTo": "أرغب في:",
         "LearnWaysToParticipate": "تعرف على كافة الطرق التي يمكنك %s المساهمة %s بها.",
         "ManuallySendEmailTo": "الرجاء إرسال رسالتك يدوياً إلى",
-        "PluginDescription": "أرسل رأيك وانطباعك إلى فريق Piwik. شاركنا بأفكارك واقتراحاتك!",
         "SendFeedback": "أرسل التغذية الراجعة",
         "SpecialRequest": "هل لديك طلب خاص من فريق Piwik؟",
         "ThankYou": "شكراً لمساعدتك في جعل Piwik أفضل!",
diff --git a/plugins/Feedback/lang/be.json b/plugins/Feedback/lang/be.json
index d58287b407..d6c8eb93e6 100644
--- a/plugins/Feedback/lang/be.json
+++ b/plugins/Feedback/lang/be.json
@@ -5,7 +5,6 @@
         "IWantTo": "Я хачу, каб:",
         "LearnWaysToParticipate": "Даведайцеся пра ўсе спосабы %s ўдзельнічыства %s",
         "ManuallySendEmailTo": "Калі ласка, уручную адпраўце паведамленне да",
-        "PluginDescription": "Водгук для каманды Piwik. Падзяліцеся сваімі ідэямі і прапановамі з намі!",
         "SendFeedback": "Адправіць водгук",
         "SpecialRequest": "У вас ёсць спецыяльны запыт для каманды Piwik?",
         "ThankYou": "Дзякуй за дапамогу нам зрабіць Piwik лепш!",
diff --git a/plugins/Feedback/lang/bg.json b/plugins/Feedback/lang/bg.json
index 49fffeee84..f51adad6c8 100644
--- a/plugins/Feedback/lang/bg.json
+++ b/plugins/Feedback/lang/bg.json
@@ -5,7 +5,6 @@
         "IWantTo": "Желая да:",
         "LearnWaysToParticipate": "Научете повече за начините, как бихте могли да %sучаствате%s",
         "ManuallySendEmailTo": "Моля изпратете ръчно Вашето съобщение до",
-        "PluginDescription": "Изпратете обратна връзка към екипа на Piwik. Споделете вашите идеи и предложения с нас!",
         "RateFeatureThankYouTitle": "Благодарим ви, че оценихте '%s'!",
         "SendFeedback": "Изпрати съобщението",
         "SpecialRequest": "Имате ли специална молба към екипа на Piwik?",
diff --git a/plugins/Feedback/lang/ca.json b/plugins/Feedback/lang/ca.json
index 1cc2c81f82..0883c62268 100644
--- a/plugins/Feedback/lang/ca.json
+++ b/plugins/Feedback/lang/ca.json
@@ -5,7 +5,6 @@
         "IWantTo": "Jo vull:",
         "LearnWaysToParticipate": "Apren sobre les formes en que tu pots %s participar %s",
         "ManuallySendEmailTo": "Siusplau envia el vostre missatge manualmetn a",
-        "PluginDescription": "Envia el teu Feedback a l'equip de Piwik. Comprateix les teves idees i sugestions amb nosaltres!",
         "SendFeedback": "Enviar Feedback",
         "SpecialRequest": "Teniu una sol·licitud especial per l'equip de Piwik?",
         "ThankYou": "Gràcies per ajudar-nos a fer el Piwik millor!",
diff --git a/plugins/Feedback/lang/cs.json b/plugins/Feedback/lang/cs.json
index 10e558ad3d..6bfe80cff9 100644
--- a/plugins/Feedback/lang/cs.json
+++ b/plugins/Feedback/lang/cs.json
@@ -7,7 +7,7 @@
         "IWantTo": "Chci:",
         "LearnWaysToParticipate": "Naučit způsoby jak %s spolupracovat %s",
         "ManuallySendEmailTo": "Prosím pošlete ručně zprávu",
-        "PluginDescription": "Pošlete ohlas teamu Piwiku. Sdílejte s námi vaše nápady a návrhy!",
+        "PluginDescription": "Pošlete tým Piwiku vaši odezvu. Podělte se o své návrhy a nápady a pomozte nám, aby se Piwi stal nejlepší analytickou platformou vůbec.",
         "PrivacyClaim": "Piwik respektuje vaše %1$ssoukromí%2$s a dává vám plnou kontrolu nad vašimi daty.",
         "RateFeatureLeaveMessageDislike": "Je nám líto, že se vám to nelíbí. Řekněte nám, jak se můžeme zlepšit.",
         "RateFeatureLeaveMessageLike": "Jsme rádi, že se vám to líbí. Řekněte nám, co se vám líbí nejvíc, nebo jestli máte nějaký návrh na novou funkci.",
diff --git a/plugins/Feedback/lang/da.json b/plugins/Feedback/lang/da.json
index b570f14af6..882b1072a7 100644
--- a/plugins/Feedback/lang/da.json
+++ b/plugins/Feedback/lang/da.json
@@ -7,7 +7,6 @@
         "IWantTo": "Jeg ønsker at:",
         "LearnWaysToParticipate": "Lær om alle de måder, du kan %s bidrage%s",
         "ManuallySendEmailTo": "Send din besked manuelt til",
-        "PluginDescription": "Send tilbagemelding til Piwik Team med et enkelt klik. Del ideer og forslag med os!",
         "PrivacyClaim": "Piwik respekterer din %1$sprivacy%2$s og giver dig fuld kontrol over dine data.",
         "RateFeatureLeaveMessageDislike": "Vi er kede af at høre, at du ikke kan lide det! Fortæl os, hvad vi kan gøre bedre.",
         "RateFeatureLeaveMessageLike": "Vi er glad for du kan lide det! Fortæl os hvad du kan lide mest eller hvis du har forslag til en ny funktion.",
diff --git a/plugins/Feedback/lang/de.json b/plugins/Feedback/lang/de.json
index 32521e0f14..97ca5fdbcb 100644
--- a/plugins/Feedback/lang/de.json
+++ b/plugins/Feedback/lang/de.json
@@ -7,7 +7,7 @@
         "IWantTo": "Ich möchte:",
         "LearnWaysToParticipate": "Lernen Sie alle Möglichkeiten kennen, wie Sie %s uns unterstützen können%s",
         "ManuallySendEmailTo": "Senden Sie Ihre Nachricht manuell an",
-        "PluginDescription": "Senden Sie Ihr Feedback an das Piwik-Team. Teilen Sie uns Ihre Ideen, Anforderungen und Wünsche mit!",
+        "PluginDescription": "Senden Sie Ihr Feedback ans Piwik Team. Teilen Sie uns Ihre Ideen und Vorschläge mit, um Piwik zur besten Analyseplattform der Welt zu machen.",
         "PrivacyClaim": "Piwik respektiert Ihre %1$sPrivatsphäre%2$s und gibt Ihnen volle Kontrolle über Ihre Daten.",
         "RateFeatureLeaveMessageDislike": "Es tut uns leid zu hören, dass es Ihnen nicht gefällt! Bitte teilen Sie uns mit, wie wir es verbessern können.",
         "RateFeatureLeaveMessageLike": "Wir sind froh, dass Sie es mögen! Bitte teilen Sie uns mit, was sie am meisten mögen oder Sie eine Idee für eine neue Funktion haben.",
diff --git a/plugins/Feedback/lang/el.json b/plugins/Feedback/lang/el.json
index 16bc036855..7533803dc2 100644
--- a/plugins/Feedback/lang/el.json
+++ b/plugins/Feedback/lang/el.json
@@ -7,7 +7,7 @@
         "IWantTo": "Θέλω να:",
         "LearnWaysToParticipate": "Μάθετε όλους του τρόπους που μπορείτε να %sσυμμετέχετε%s",
         "ManuallySendEmailTo": "Στείλτε χειροκίνητα το μήνυμά σας στον\/στην",
-        "PluginDescription": "Στείλτε τις Επισημάνσεις σας στην Ομάδα του Piwik. Μοιραστείτε τις ιδέες σας και τις προτάσεις σας με μας!",
+        "PluginDescription": "Στείλτε τη γνώμη σας στην ομάδα του Piwik. Μοιραστείτε τις ιδέες και τις προτάσεις σας για να κάνετε το Piwik την καλύτερη πλατφόρμα αναλυτικών στον κόσμο!",
         "PrivacyClaim": "Το Piwik σέβεται την %1$sιδιωτικότητά%2$s σας και σας δίνει πλήρη έλεγχο πάνω στα δεδομένα σας.",
         "RateFeatureLeaveMessageDislike": "Λυπούμαστε που μας λέτε ότι δεν σας αρέσει! Παρακαλούμε πείτε μας πώς μπορούμε να βελτιωθούμε.",
         "RateFeatureLeaveMessageLike": "Χαιρόμαστε που σας αρέσει! Πείτε μας τι σας αρέσει περισσότερο ή αν έχετε κάποια επιθυμία για ένα χαρακτηριστικό.",
diff --git a/plugins/Feedback/lang/en.json b/plugins/Feedback/lang/en.json
index 22e3085cc9..28e665f667 100644
--- a/plugins/Feedback/lang/en.json
+++ b/plugins/Feedback/lang/en.json
@@ -7,7 +7,7 @@
         "IWantTo": "I want to:",
         "LearnWaysToParticipate": "Learn about all the ways you can %s participate%s",
         "ManuallySendEmailTo": "Please manually send your message to",
-        "PluginDescription": "Send your Feedback to the Piwik Team. Share your ideas and suggestions with us!",
+        "PluginDescription": "Send your Feedback to the Piwik Team. Share your ideas and suggestions to make Piwik the best analytics platform in the world!",
         "PrivacyClaim": "Piwik respects your %1$sprivacy%2$s and gives you full control over your data.",
         "RateFeatureLeaveMessageDislike": "We are sorry to hear you don't like it! Please let us know how we can improve.",
         "RateFeatureLeaveMessageLike": "We are glad you like it! Please let us know what you like the most or if you have a feature request.",
diff --git a/plugins/Feedback/lang/es.json b/plugins/Feedback/lang/es.json
index f8266d4b37..eb3ef58882 100644
--- a/plugins/Feedback/lang/es.json
+++ b/plugins/Feedback/lang/es.json
@@ -6,7 +6,6 @@
         "IWantTo": "Yo quiero:",
         "LearnWaysToParticipate": "Aprende sobre todas las formas de %sparticipar%s",
         "ManuallySendEmailTo": "Por favor envíe su mensaje manualmente a",
-        "PluginDescription": "Enviar tus comentarios al equipo de Piwik. Comparte tus ideas y sugerencias con nosotros!",
         "PrivacyClaim": "Piwik respeta tu %1$sprivacidad%2$s y te deja controlar todos tus datos.",
         "RateFeatureLeaveMessageDislike": "¡Lamentamos que no te gusta! Por favor déjanos saber cómo podemos mejorar.",
         "RateFeatureLeaveMessageLike": "¡Nos alegra que te gusta! Por favor déjanos saber qué es lo que más te gusta y si hay otras funciones que te gustaría tener.",
diff --git a/plugins/Feedback/lang/fa.json b/plugins/Feedback/lang/fa.json
index b9d9f6586e..a1e46eb536 100644
--- a/plugins/Feedback/lang/fa.json
+++ b/plugins/Feedback/lang/fa.json
@@ -5,7 +5,6 @@
         "IWantTo": "من می خواهم به :",
         "LearnWaysToParticipate": "درباره راه هایی که می توانید %sمشارکت کنید%s بیشتر بدانید.",
         "ManuallySendEmailTo": "لطفا پیام خود را به صورت دستی ارسال کنید به",
-        "PluginDescription": "بازخوردهایتان را به تیم پیویک ارسال کنید. ایده هایتان را با ما در میان بگذارید!",
         "SendFeedback": "ارسال بازخورد",
         "SpecialRequest": "آیا شما درخواست ویژه ای از تیم پیویک دارید؟",
         "ThankYou": "از شما برای کمک به بهتر کردن پیویک متشکریم!",
diff --git a/plugins/Feedback/lang/fi.json b/plugins/Feedback/lang/fi.json
index 2832070b3a..46173ed6a4 100644
--- a/plugins/Feedback/lang/fi.json
+++ b/plugins/Feedback/lang/fi.json
@@ -5,7 +5,6 @@
         "IWantTo": "Haluan:",
         "LearnWaysToParticipate": "Katso erilaisia tapoja %s osallistua%s",
         "ManuallySendEmailTo": "Ole hyvä ja lähetä viesti osoitteeseen",
-        "PluginDescription": "Lähetä palautetta Piwikin tiimille. Jaa ideoita kanssamme!",
         "RateFeatureLeaveMessageDislike": "Harmillista kuulla että et pidä siitä! Voisitko kertoa meille, miten voimme korjata tämän?",
         "RateFeatureLeaveMessageLike": "Olemme iloisia että pidit siitä! Kerro meille mistä pidit eniten tai jos sinulla on ehdotuksia uusiksi ominaisuuksiksi.",
         "RateFeatureThankYouTitle": "Kiitos '%s':n arvostelemisesta!",
diff --git a/plugins/Feedback/lang/fr.json b/plugins/Feedback/lang/fr.json
index ab06a7ad79..52391d6dc7 100644
--- a/plugins/Feedback/lang/fr.json
+++ b/plugins/Feedback/lang/fr.json
@@ -7,11 +7,10 @@
         "IWantTo": "Je veux:",
         "LearnWaysToParticipate": "Renseignez vous sur les manières dont vous pouvez %s participer%s",
         "ManuallySendEmailTo": "Merci d'envoyer manuellement votre message à",
-        "PluginDescription": "Envoie vos retours à l’Équipe Piwik. Partagez vos idées et suggestions avec nous!",
         "PrivacyClaim": "Piwik respecte votre %1$svie privée%2$s et vous donne un contrôle total sur vos données.",
         "RateFeatureLeaveMessageDislike": "Nous sommes désolés de voir que vous n'aimez pas ça. N'hésitez pas à nous dire comme nous pouvons améliorer.",
         "RateFeatureLeaveMessageLike": "Nous sommes heureux de savoir que vous l'aimez ! S'il vous plaît laissez-nous savoir ce que vous aimez le plus ou si vous avez une demande de fonctionnalité.",
-        "RateFeatureSendFeedbackInformation": "Voter installation Piwik nous enverra (l'équipe Piwik) un e-mail (contenant votre adresse e-mail) afin que nous puissions entrer en contact avec vous si vous avez des questions.",
+        "RateFeatureSendFeedbackInformation": "Votre installation Piwik nous enverra (l'équipe Piwik) un e-mail (contenant votre adresse e-mail) afin que nous puissions entrer en contact avec vous si vous avez des questions.",
         "RateFeatureThankYouTitle": "Merci d'avoir noté \"%s\" !",
         "RateFeatureTitle": "Est-ce que vous aimez la fonctionnalité \"%s\" ? Notez la et laissez un commentaire",
         "SendFeedback": "Envoyer le retour",
diff --git a/plugins/Feedback/lang/hi.json b/plugins/Feedback/lang/hi.json
index b7fa99d46a..4664eede3e 100644
--- a/plugins/Feedback/lang/hi.json
+++ b/plugins/Feedback/lang/hi.json
@@ -5,7 +5,6 @@
         "IWantTo": "मैं चाहता हूँ:",
         "LearnWaysToParticipate": "सभी तरीकों के बारे में जानें, आप %s भाग %s ले सकते हैं",
         "ManuallySendEmailTo": "अपने संदेश को स्वेक्षा से भेजने के लिए कृपया",
-        "PluginDescription": "Piwik टीम के लिए अपने प्रतिक्रिया भेजें. हमारे साथ अपने विचारों और सुझावों को साझा करें!",
         "SendFeedback": "प्रतिक्रिया भेजें",
         "SpecialRequest": "आपका Piwik टीम के लिए एक विशेष अनुरोध है?",
         "ThankYou": "Piwik बेहतर बनाने में हमें मदद करने के लिए आपका शुक्रिया",
diff --git a/plugins/Feedback/lang/hu.json b/plugins/Feedback/lang/hu.json
index fd62a3fc7b..4326a6368a 100644
--- a/plugins/Feedback/lang/hu.json
+++ b/plugins/Feedback/lang/hu.json
@@ -5,7 +5,6 @@
         "IWantTo": "A következőt szeretném:",
         "LearnWaysToParticipate": "Győződj meg róla, %shányféleképpen segíthetsz%s",
         "ManuallySendEmailTo": "Kérjük, küldd el manuálisan az üzeneted ide:",
-        "PluginDescription": "Küldd el véleményedet a Piwik fejlesztőinek. Oszd meg ötleteid, javaslataid velük!",
         "SendFeedback": "Visszajelzés elküldése",
         "SpecialRequest": "Valamilyen speciális kérdésed lenne a Piwik fejlesztőkhőz?",
         "ThankYou": "Köszönjük, hogy segítesz jobbá tenni a Piwik-et!",
diff --git a/plugins/Feedback/lang/id.json b/plugins/Feedback/lang/id.json
index 5d63ec8711..25e3a9bb02 100644
--- a/plugins/Feedback/lang/id.json
+++ b/plugins/Feedback/lang/id.json
@@ -5,7 +5,6 @@
         "IWantTo": "Saya ingin:",
         "LearnWaysToParticipate": "Pelajari bagaimana kamu dapat %s berpartisipasi%s",
         "ManuallySendEmailTo": "Silakan kirim manual pesan Anda ke",
-        "PluginDescription": "Kirim Umpanbalik Anda ke Tim Piwik. Bagikan gagasan dan saran Anda dengan kami!",
         "SendFeedback": "Kirim Umpanbalik",
         "SpecialRequest": "Apakah anda memiliki permintaan khusus untuk tim Piwik?",
         "ThankYou": "Terimaksih telah membantu kami menjadikan Piwik lebih baik!",
diff --git a/plugins/Feedback/lang/it.json b/plugins/Feedback/lang/it.json
index b975705c30..714a8219cc 100644
--- a/plugins/Feedback/lang/it.json
+++ b/plugins/Feedback/lang/it.json
@@ -7,7 +7,7 @@
         "IWantTo": "Vorrei:",
         "LearnWaysToParticipate": "Impara tutti i modi attraverso i quali puoi %s partecipare %s",
         "ManuallySendEmailTo": "Perfavore invia manualmente il messaggio a",
-        "PluginDescription": "manda i tuoi suggerimenti al Team Piwik. Condividi le tue idee e suggerimenti con noi!",
+        "PluginDescription": "Invia un Feedback al Team di Piwik. Condividi idee e suggerimenti per rendere Piwik la migliore piattaforma al mondo di statistiche web!",
         "PrivacyClaim": "Piwik rispetta la tua %1$sprivacy%2$s e ti dà il pieno controllo sui tuoi dati.",
         "RateFeatureLeaveMessageDislike": "Ci dispiace sapere che non ti piace! Facci sapere come possiamo migliorare.",
         "RateFeatureLeaveMessageLike": "Siamo felici che tu lo apprezzi! Facci sapere cosa ti piace di più o se hai richieste di altre funzioni.",
diff --git a/plugins/Feedback/lang/ja.json b/plugins/Feedback/lang/ja.json
index ea28e4cdcb..d5e925502a 100644
--- a/plugins/Feedback/lang/ja.json
+++ b/plugins/Feedback/lang/ja.json
@@ -6,7 +6,6 @@
         "IWantTo": "あなたの希望：",
         "LearnWaysToParticipate": "あなたが参加できるすべての方法を%s学んでください%s",
         "ManuallySendEmailTo": "あなたのメッセージを手作業で次のアドレスへ送ってください：",
-        "PluginDescription": "Piwik チームにフィードバックを送信します。 あなたのアイディアや提案を私たちと共有してください！",
         "PrivacyClaim": "Piwik は あなたの %1$sprivacy%2$s を尊重します。あなたのデータに関する全ての管理はあなたにお任せします。",
         "RateFeatureLeaveMessageDislike": "好きではない とのこと、非常に残念です。ぜひどのように改善すべきかお知らせください。",
         "RateFeatureLeaveMessageLike": "気に入った　とのこと、とても嬉しいです !ぜひあなたの最も気に入った内容や今後のリクエストをお知らせください。",
diff --git a/plugins/Feedback/lang/ka.json b/plugins/Feedback/lang/ka.json
index e864338d2c..764dac18a7 100644
--- a/plugins/Feedback/lang/ka.json
+++ b/plugins/Feedback/lang/ka.json
@@ -5,7 +5,6 @@
         "IWantTo": "მე მინდა:",
         "LearnWaysToParticipate": "გაეცანით ინფორმაციას %s მონაწილეობის%s მიღების ყველა გზის შესახებ",
         "ManuallySendEmailTo": "გთხოვთ, ხელით გამოაგზავნეთ წერილი მისამართზე",
-        "PluginDescription": "გამოგვიგზავნეთ თქვენი გამოხმაურება Piwik გუნდს. გაგვიზიარეთ თქვენი იდეები და რეკომენდაციები!",
         "SendFeedback": "გამოხმაურების გაგზავნა",
         "SpecialRequest": "გაქვთ სპეციალური მოთხოვნა Piwik გუნდთან?",
         "ThankYou": "გმადლობთ, რომ გვეხმარებით Piwik გახდეს უკეთესი!",
diff --git a/plugins/Feedback/lang/ko.json b/plugins/Feedback/lang/ko.json
index 649f4aeddb..fc7fa2520e 100644
--- a/plugins/Feedback/lang/ko.json
+++ b/plugins/Feedback/lang/ko.json
@@ -5,7 +5,6 @@
         "IWantTo": "내가 원하는 것은:",
         "LearnWaysToParticipate": "당신이 %s참여%s할 수있는 모든 방법",
         "ManuallySendEmailTo": "당신의 메시지를 다음 주소로 직접 보내주세요:",
-        "PluginDescription": "Piwik 팀에 의견을 제출합니다. 당신의 아이디어와 제안을 우리와 공유하해 주세요!",
         "SendFeedback": "의견 보내기",
         "SpecialRequest": "Piwik 팀에 특별한 요청이 있습니까?",
         "ThankYou": "우리가 Piwik을 향상시키는 데 도움을 주셔서 감사합니다!",
diff --git a/plugins/Feedback/lang/lt.json b/plugins/Feedback/lang/lt.json
index 3581d25cc5..0bb5fe694a 100644
--- a/plugins/Feedback/lang/lt.json
+++ b/plugins/Feedback/lang/lt.json
@@ -5,7 +5,6 @@
         "IWantTo": "Aš noriu:",
         "LearnWaysToParticipate": "Sužinokite kaip galite %s prisijungti%s",
         "ManuallySendEmailTo": "Prašome išsiųsti rankiniu būdu",
-        "PluginDescription": "Siųskite savo atsiliepimus Piwik komandai. Dalinkitės savo idėjomis ir pasiūlymais su mumis!",
         "SendFeedback": "Siųsti atsiliepimą",
         "SpecialRequest": "Gal turite specialių pageidavimų Piwik komandai?",
         "ThankYou": "Dėkojame už pagalbą kuriant tobulesnį Piwik!",
diff --git a/plugins/Feedback/lang/lv.json b/plugins/Feedback/lang/lv.json
index a888a55512..7171a93354 100644
--- a/plugins/Feedback/lang/lv.json
+++ b/plugins/Feedback/lang/lv.json
@@ -5,7 +5,6 @@
         "IWantTo": "Es vēlos:",
         "LearnWaysToParticipate": "Uzzināt vairāk par to, kā Jūs varat %s piedalīties%s",
         "ManuallySendEmailTo": "Lūdzu manuāli nosūtiet savu ziņu uz",
-        "PluginDescription": "Sūtiet savas atsauksmes Piwik komandai. Dalieties ar savām idejām un ieteikumiem ar mums!",
         "SendFeedback": "Sūtīt atsauksmes",
         "SpecialRequest": "Vai Jums ir speciāls pieprasījums Piwik komandai?",
         "ThankYou": "Paldies, ka palīdzat uzlabot Piwik!"
diff --git a/plugins/Feedback/lang/nb.json b/plugins/Feedback/lang/nb.json
index 4f1bff66e4..a2db506f90 100644
--- a/plugins/Feedback/lang/nb.json
+++ b/plugins/Feedback/lang/nb.json
@@ -5,7 +5,6 @@
         "IWantTo": "Jeg vil:",
         "LearnWaysToParticipate": "Lær om alle måtene du kan %s bidra%s",
         "ManuallySendEmailTo": "Send meldingen manuelt til",
-        "PluginDescription": "Send din tilbakemelding til Piwik-laget. Del din ideer og forslag med oss!",
         "SendFeedback": "Send tilbakemelding",
         "SpecialRequest": "Har du en spesiell forespørsel til Piwik-laget?",
         "ThankYou": "Takk for at du hjelper oss å lage Piwik bedre!",
diff --git a/plugins/Feedback/lang/nl.json b/plugins/Feedback/lang/nl.json
index 5957967dcb..b916b19077 100644
--- a/plugins/Feedback/lang/nl.json
+++ b/plugins/Feedback/lang/nl.json
@@ -5,7 +5,6 @@
         "IWantTo": "Ik wil:",
         "LearnWaysToParticipate": "Ontdek op welke manieren je kunt %s bijdragen%s",
         "ManuallySendEmailTo": "Gelieve uw bericht handmatig te zenden naar",
-        "PluginDescription": "Stuur uw feedback naar het Piwik team. Deel uw ideeën en suggesties met ons!",
         "PrivacyClaim": "Piwik respecteert je %1$sprivacy%2$s en geeft je alle controle over jouw data.",
         "RateFeatureLeaveMessageDislike": "We vinden het jammer te horen dat je het niks vind! Laat ons alsjeblieft weten hoe we het kunnen verbeteren.",
         "RateFeatureLeaveMessageLike": "We zijn blij dat je het leuk vind! Laat ons weten wat het leukste vind of als je een goed idee hebt.",
diff --git a/plugins/Feedback/lang/nn.json b/plugins/Feedback/lang/nn.json
index 6a428240c1..4e2b13f950 100644
--- a/plugins/Feedback/lang/nn.json
+++ b/plugins/Feedback/lang/nn.json
@@ -5,7 +5,6 @@
         "IWantTo": "Eg ønskjer:",
         "LearnWaysToParticipate": "Lær om korleis du kan %s medverka%s",
         "ManuallySendEmailTo": "Send meldinga di manuelt til",
-        "PluginDescription": "Send dine attendemeldingar til Piwik. Del dine idear og framlegg med oss!",
         "SendFeedback": "Send attendemelding",
         "SpecialRequest": "Har du ein førespurnad til Piwik?",
         "ThankYou": "Takk for at hjelper oss med å forbetra Piwik!",
diff --git a/plugins/Feedback/lang/pl.json b/plugins/Feedback/lang/pl.json
index 813a4b419a..6e9139d94e 100644
--- a/plugins/Feedback/lang/pl.json
+++ b/plugins/Feedback/lang/pl.json
@@ -6,7 +6,6 @@
         "IWantTo": "Pragnę:",
         "LearnWaysToParticipate": "Poznaj wszystkie sposoby %s uczestnictwa%s",
         "ManuallySendEmailTo": "Prosimy ręcznie wysłać swoją wiadomość",
-        "PluginDescription": "Wyślij swoje opinie do zespołu Piwik. Podziel się swoimi pomysłami i sugestiami z nami!",
         "PrivacyClaim": "Piwik respektuje twoją %1$sprywatność%2$s i oddaje ci pełną kontrolę nad twoimi danymi.",
         "RateFeatureLeaveMessageDislike": "Przykro nam słyszeć, że Tobie się nie podoba! Proszę pozwól nam wiedzieć, jak możemy to poprawić.",
         "RateFeatureSendFeedbackInformation": "Twoja platforma Piwik wyśle nam (Ekipa Piwik) wiadomość email (zawierającą twój adres email), dzięki temu będziemy mogli mieć z toba kontakt jeśli miałbyś jakieś pytania.",
diff --git a/plugins/Feedback/lang/pt-br.json b/plugins/Feedback/lang/pt-br.json
index 644f083a68..aa21148af1 100644
--- a/plugins/Feedback/lang/pt-br.json
+++ b/plugins/Feedback/lang/pt-br.json
@@ -5,7 +5,6 @@
         "IWantTo": "Eu quero:",
         "LearnWaysToParticipate": "Aprenda sobre todas as maneiras que você pode %s participar %s",
         "ManuallySendEmailTo": "Por favor envie manualmente sua mensagem para",
-        "PluginDescription": "Envie seu FeedBack para a Equipe Piwik. Compartilhe suas ideias e sugestões conosco!",
         "SendFeedback": "Envie FeedBack",
         "SpecialRequest": "Você tem algum pedido especial para a equipe do Piwik?",
         "ThankYou": "Obrigado por nos ajudar a fazer o Piwik melhor!",
diff --git a/plugins/Feedback/lang/pt.json b/plugins/Feedback/lang/pt.json
index 01af36b9ec..dc1a045b36 100644
--- a/plugins/Feedback/lang/pt.json
+++ b/plugins/Feedback/lang/pt.json
@@ -5,7 +5,6 @@
         "IWantTo": "Eu quero:",
         "LearnWaysToParticipate": "Aprenda todas as formas como pode %s participar%s",
         "ManuallySendEmailTo": "Por favor envie a sua mensagem manualmente para",
-        "PluginDescription": "Envie a sua opinião à equipa Piwik. Partilhe as suas ideias e sugestões connosco!",
         "SendFeedback": "Enviar Opinião",
         "SpecialRequest": "Tem um pedido especial para a equipa Piwik?",
         "ThankYou": "Obrigado por nos ajudar a melhorar o Piwik!",
diff --git a/plugins/Feedback/lang/ro.json b/plugins/Feedback/lang/ro.json
index 4ec7b1a308..192e7080f9 100644
--- a/plugins/Feedback/lang/ro.json
+++ b/plugins/Feedback/lang/ro.json
@@ -6,7 +6,6 @@
         "IWantTo": "Doresc să:",
         "LearnWaysToParticipate": "Invata despre toate modalitatile in care poti %s participa%s",
         "ManuallySendEmailTo": "Va rugam trimiteti manual mesajul dvs catre",
-        "PluginDescription": "Trimiteti Feedbackul dvs. Echipei Piwik. Impartasiti ideile si sugestiile dvs cu noi!",
         "PrivacyClaim": "Piwik respecta %1$sintimitatea%2$s Dvs. si va acorda control total pentru toate datele.",
         "RateFeatureLeaveMessageDislike": "Ne pare rau sa aflam ca nu va place! Va rugam semnalati-ne cum putem imbunatati.",
         "RateFeatureLeaveMessageLike": "Ne bucuram ca va place! Va rugam semnaati-ne ce va place mai mult sau daca aveti o cerinta pentru o functionalitate noua.",
diff --git a/plugins/Feedback/lang/ru.json b/plugins/Feedback/lang/ru.json
index c39dc81490..7621181d28 100644
--- a/plugins/Feedback/lang/ru.json
+++ b/plugins/Feedback/lang/ru.json
@@ -1,23 +1,22 @@
 {
     "Feedback": {
-        "ContactThePiwikTeam": "Связаться с командой Piwik!",
+        "ContactThePiwikTeam": "Свяжитесь с командой Piwik!",
         "DoYouHaveBugReportOrFeatureRequest": "У вас есть багрепорт, или предложение по улучшению функционала?",
         "GetInTouch": "Мы ценим ваше мнение и всегда читаем все сообщения. Может быть, вы бы хотели нанять консультанта Piwik, рассказать нам историю успеха или просто сказать привет!",
         "IWantTo": "Я хочу:",
         "LearnWaysToParticipate": "Изучить все способы, с помощью которых вы можете %s поучаствовать%s",
         "ManuallySendEmailTo": "Пожалуйста, отправьте ваше сообщение вручную на",
-        "PluginDescription": "Напишите отзыв команде Piwik. Поделитесь с нами вашими идеями и пожеланиями!",
         "PrivacyClaim": "Piwik уважает вашу %1$sконфиденциальность%2$s и дает вам полный контроль над вашими данными.",
         "RateFeatureLeaveMessageDislike": "Мы сожалеем, что вам не понравилось! Пожалуйста, дайте нам знать что мы можем улучшить.",
         "RateFeatureLeaveMessageLike": "Пожалуйста, дайте нам знать, что вам нравится больше всего, или хотите в дальнейшем улучшить.",
         "RateFeatureSendFeedbackInformation": "Ваша система Piwik отправит нам(команде Piwik) email (содержащий ваш email адрес) так что мы сможем связаться с вами, если у вас возникли вопросы.",
         "RateFeatureThankYouTitle": "Спасибо за оценку '%s'!",
-        "RateFeatureTitle": "Вам нравится эта '%s' фича? Пожалуйста оцените и оставьте комментарий",
+        "RateFeatureTitle": "Вам нравится эта возможность: «%s»? Пожалуйста, оцените и оставьте комментарий",
         "SendFeedback": "Отправить отзыв",
         "SpecialRequest": "У вас есть особая просьба или предложение команде Piwik?",
         "ThankYou": "Спасибо за помощь в развитии Piwik!",
         "TopLinkTooltip": "Расскажите о своей проблеме с Piwik или запросите профессиональную помощь.",
-        "ViewAnswersToFAQ": "Посмотреть ответы на %sFrequently Asked Questions%s",
+        "ViewAnswersToFAQ": "Посмотреть ответы на %sЧасто Задаваемые Вопросы%s",
         "VisitTheForums": "Посетить %s Форумы%s",
         "WantToThankConsiderDonating": "Вы думаете Piwik потрясающий и хотите поблагодарить нас?"
     }
diff --git a/plugins/Feedback/lang/sl.json b/plugins/Feedback/lang/sl.json
index c6cd6cd90e..09839ada45 100644
--- a/plugins/Feedback/lang/sl.json
+++ b/plugins/Feedback/lang/sl.json
@@ -5,7 +5,6 @@
         "IWantTo": "Želim:",
         "LearnWaysToParticipate": "Oglejte si vse načine kako lahko %ssodelujete%s",
         "ManuallySendEmailTo": "Prosimo, da sporočilo ročno pošljete",
-        "PluginDescription": "Podajte vašo povratno informacijo ekipi Piwik. Zaupajte nam vaše ideje in predloge!",
         "SendFeedback": "Pošlji povratno informacijo",
         "ThankYou": "Hvala, ker nam pomagate izboljšati Piwik!",
         "VisitTheForums": "Obiščite %sForume%s"
diff --git a/plugins/Feedback/lang/sq.json b/plugins/Feedback/lang/sq.json
index 25b69ae50d..f90dd35605 100644
--- a/plugins/Feedback/lang/sq.json
+++ b/plugins/Feedback/lang/sq.json
@@ -5,7 +5,6 @@
         "IWantTo": "Dua të:",
         "LearnWaysToParticipate": "Njihuni me krejt mënyrat përmes të cilave mund të %s merrni pjesë%s",
         "ManuallySendEmailTo": "Ju lutem, dërgojeni mesazhin tuaj dorazi te",
-        "PluginDescription": "Dërgojini Përshtypjet tuaja Ekipit të Piwik-ut. Ndani me ne idetë dhe sugjerimet tuaja!",
         "SendFeedback": "Dërgoji Përshtypjet",
         "SpecialRequest": "Keni ndonjë kërkesë speciale për ekipin e Piwik-ut?",
         "ThankYou": "Faleminderit që na ndihmoni ta bëjmë më të mirë Piwik-un!",
diff --git a/plugins/Feedback/lang/sr.json b/plugins/Feedback/lang/sr.json
index e49c22fb2a..0fd25040a8 100644
--- a/plugins/Feedback/lang/sr.json
+++ b/plugins/Feedback/lang/sr.json
@@ -7,7 +7,6 @@
         "IWantTo": "Želim da:",
         "LearnWaysToParticipate": "Pogledajte kako sve možete da %s uzmete učešće%s",
         "ManuallySendEmailTo": "Molimo vas da pošaljete poruku na",
-        "PluginDescription": "Pošaljite vaša opažanja Piwik timu. Podelite sa nama vaše ideje i sugestije!",
         "PrivacyClaim": "Piwik poštuje vašu %1$sprivatnost%2$s i daje vam potpunu kontrolu nad vašim podacima.",
         "RateFeatureLeaveMessageDislike": "Šao nam je da vam se ne dopada! Molimo vas da nam javite kako možemo da ga poboljšamo.",
         "RateFeatureLeaveMessageLike": "Drago nam je da vam se dopada! Molimo vas da nam javite šta vam se najviše sviđa ili da li imate neki zahtev.",
diff --git a/plugins/Feedback/lang/sv.json b/plugins/Feedback/lang/sv.json
index b36e0abc88..b32fe3b57f 100644
--- a/plugins/Feedback/lang/sv.json
+++ b/plugins/Feedback/lang/sv.json
@@ -3,10 +3,10 @@
         "ContactThePiwikTeam": "Kontakta Piwikteamet!",
         "DoYouHaveBugReportOrFeatureRequest": "Har du en bugg att rapportera eller en funktionsbegäran?",
         "GetInTouch": "Vi uppskattar din feedback och läser alltid alla meddelanden. Du kanske vill dela en affärsmöjlighet, hyra en Piwik konsult, berätta en framgångssaga eller bara säga Hej!",
+        "HowToCreateTicket": "Vänligen läs rekommendationerna för hur du skriver en bra %1$sfel rapport%2$s eller %3$sfunktionsförfrågan%4$s. Registrera eller logga in på %5$svårt ärendehanteringssystem%6$s och skapa %7$sett nytt ärende%8$s.",
         "IWantTo": "Jag vill:",
         "LearnWaysToParticipate": "Läs om alla sätt du kan %s delta%s",
         "ManuallySendEmailTo": "Vänligen skicka ditt meddelande manuellt till",
-        "PluginDescription": "Skicka din feedback till Piwikteamet. Dela med dig av dina idéer och förslag med oss​​!",
         "PrivacyClaim": "Piwik respekterar din %1$sintegritet%2$s och ger dig full kontroll över din information.",
         "RateFeatureLeaveMessageDislike": "Vi är ledsna över att du inte gillar det! Berätta gärna för oss hur vi kan förbättra Piwik.",
         "RateFeatureLeaveMessageLike": "Vi är glada att du gillar det! Berätta för oss vad du gillar mest med Piwik eller om du har ett förslag på en funktion.",
diff --git a/plugins/Feedback/lang/th.json b/plugins/Feedback/lang/th.json
index 431c83727a..4743f7c2e5 100644
--- a/plugins/Feedback/lang/th.json
+++ b/plugins/Feedback/lang/th.json
@@ -5,7 +5,6 @@
         "IWantTo": "ฉันอยากจะ:",
         "LearnWaysToParticipate": "เรียนรู้เกี่ยวกับทั้งหมดด้วยวิธี %s คุณสามารถ %s มีส่วนร่วมได้",
         "ManuallySendEmailTo": "กรุณาส่งข้อความของคุณด้วยตนเอง",
-        "PluginDescription": "ส่งคำติชมของคุณเพื่อทีมงาน Piwik แบ่งปันทำการความคิดเห็นและข้อเสนอแนะของคุณกับเรา",
         "SendFeedback": "ส่งคำติชม",
         "SpecialRequest": "คุณมีการร้องขอที่พิเศษสำหรับทีม Piwik ได้อย่างไร",
         "ThankYou": "ขอบคุณที่ช่วยให้เราสามารถทำให้ Piwik ดีกว่า",
diff --git a/plugins/Feedback/lang/tl.json b/plugins/Feedback/lang/tl.json
index 78ef4a6436..ec02366cc3 100644
--- a/plugins/Feedback/lang/tl.json
+++ b/plugins/Feedback/lang/tl.json
@@ -7,7 +7,6 @@
         "IWantTo": "Gusto kong:",
         "LearnWaysToParticipate": "Pag-aralan ang lahat ng daan upang %s makasali sa %s",
         "ManuallySendEmailTo": "Mangyaring manu-manong ipadala ang iyong mensahe sa.",
-        "PluginDescription": "Padala ang iyong Feedback sa aming Piwik Team. Ibahagi ang iyong mga ideya at mungkahi sa amin!",
         "PrivacyClaim": "Nirerespeto ng Piwik ang iyong %1$s privacy %2$s at nagbibigay sa iyo ng ganap na kontrol sa iyong data.",
         "RateFeatureLeaveMessageDislike": "Ikinalulungkot namin na hindi mo ito gustong marinig! Mangyaring ipaalam samin kung paano naman ito mapapabuti.",
         "RateFeatureLeaveMessageLike": "Kami ay natutuwa na gusto mo ito! Mangyaring ipaalam sa amin kung ano ang gusto mo ang pinaka o kung mayroon kang gustong feature na pwedeng i-dagdag.",
diff --git a/plugins/Feedback/lang/tr.json b/plugins/Feedback/lang/tr.json
index ac7b15b1ec..3518584769 100644
--- a/plugins/Feedback/lang/tr.json
+++ b/plugins/Feedback/lang/tr.json
@@ -5,7 +5,6 @@
         "IWantTo": "İstiyorum:",
         "LearnWaysToParticipate": "%sOrtak olabileceğiniz%s tüm yolları öğrenin",
         "ManuallySendEmailTo": "Lütfen mesajınızı elle yollayın",
-        "PluginDescription": "Piwik takımına geribildirimlerinizi gönderin. Düşüncelerinizi ve önerilerinizi paylaşın!",
         "RateFeatureLeaveMessageDislike": "Beğenmediğiniz için çok üzgünüz! Lütfen bunu nasıl geliştireceğimiz konusunda yardımcı olun.",
         "RateFeatureThankYouTitle": "Oyladığınız için teşekkürler '%s'!",
         "RateFeatureTitle": "'%s' özelliğini beğendiniz mi? Lütfen oy verip, bir yorum yapın",
diff --git a/plugins/Feedback/lang/uk.json b/plugins/Feedback/lang/uk.json
index 5e07ebe6db..febe706adf 100644
--- a/plugins/Feedback/lang/uk.json
+++ b/plugins/Feedback/lang/uk.json
@@ -5,7 +5,6 @@
         "IWantTo": "Я хочу:",
         "LearnWaysToParticipate": "Дізнатися про всі способи %sдолучитися%s",
         "ManuallySendEmailTo": "Будь-ласка надішліть ваше повідомлення власноручно на",
-        "PluginDescription": "Надішліть свій відгук кодманді Piwik. Поділіться з нами своїми ідеями та пропозиціями!",
         "SendFeedback": "Надіслати відгук",
         "SpecialRequest": "Чи є у вас спеціальне звернення до команди Piwik?",
         "ThankYou": "Дякуємо що допомагаєте робити Piwik кращим!",
diff --git a/plugins/Feedback/lang/vi.json b/plugins/Feedback/lang/vi.json
index 5432abae45..566804f0fa 100644
--- a/plugins/Feedback/lang/vi.json
+++ b/plugins/Feedback/lang/vi.json
@@ -5,7 +5,6 @@
         "IWantTo": "Tôi muốn:",
         "LearnWaysToParticipate": "Tìm hiểu về tất cả các cách bạn có thể %s tham gia %s",
         "ManuallySendEmailTo": "Hãy tự gửi thông điệp của bạn tới",
-        "PluginDescription": "Gửi feedback của bạn tới Piwik Team. Chia sẻ ý tường và gợi ý của bạn với chúng tôi!",
         "SendFeedback": "Gửi feedback",
         "SpecialRequest": "Bạn có yêu cầu đặc biệt cho nhóm Piwik không?",
         "ThankYou": "Cảm ơn bạn đã giúp chúng tôi để làm cho Piwik tốt hơn!",
diff --git a/plugins/Feedback/lang/zh-cn.json b/plugins/Feedback/lang/zh-cn.json
index 25d976f19c..e1ab85e269 100644
--- a/plugins/Feedback/lang/zh-cn.json
+++ b/plugins/Feedback/lang/zh-cn.json
@@ -5,7 +5,6 @@
         "IWantTo": "我想要:",
         "LearnWaysToParticipate": "了解所有您可以 %s 参与%s 的方法",
         "ManuallySendEmailTo": "请手动发送信息至",
-        "PluginDescription": "反馈意见給 Piwik 小组，与我们分享您的点子及建议！",
         "SendFeedback": "提交反馈",
         "SpecialRequest": "您对 Piwik 小组有特别的请求？",
         "ThankYou": "感谢您帮助我们改进 Piwik ！",
diff --git a/plugins/Feedback/lang/zh-tw.json b/plugins/Feedback/lang/zh-tw.json
index 927ecf4c09..096221721a 100644
--- a/plugins/Feedback/lang/zh-tw.json
+++ b/plugins/Feedback/lang/zh-tw.json
@@ -5,7 +5,6 @@
         "IWantTo": "我想要：",
         "LearnWaysToParticipate": "瞭解所有你可以 %s 參與%s 的方法",
         "ManuallySendEmailTo": "請手動寄送你的訊息至",
-        "PluginDescription": "傳送你的意見反應給 Piwik 小組。與我們分享你的點子及建議！",
         "SendFeedback": "送出意見",
         "SpecialRequest": "你對於 Piwik 小組有特殊的請求？",
         "ThankYou": "謝謝你協助我們使 Piwik 變得更好！",
diff --git a/plugins/Feedback/stylesheets/feedback.less b/plugins/Feedback/stylesheets/feedback.less
index 8ac50e8c0b..3a12cb0365 100644
--- a/plugins/Feedback/stylesheets/feedback.less
+++ b/plugins/Feedback/stylesheets/feedback.less
@@ -1,11 +1,4 @@
 #feedback-faq {
-  color: #5e5e5c;
-  width: 675px;
-  font-size: 14px;
-
-   strong {
-    color: #5e5e5c;
-  }
 
   ul {
     list-style: none;
@@ -19,11 +12,6 @@
     line-height: 1.7em;
   }
 
-  a {
-    color: #5176a0;
-    text-decoration: none;
-  }
-
   .piwik-donate-call {
     border: 0px;
     padding-left: 0px;
diff --git a/plugins/Feedback/templates/index.twig b/plugins/Feedback/templates/index.twig
index 97a90ee2a3..7cba7e5b26 100644
--- a/plugins/Feedback/templates/index.twig
+++ b/plugins/Feedback/templates/index.twig
@@ -1,11 +1,11 @@
-{% extends 'dashboard.twig' %}
+{% extends 'user.twig' %}
 
 {% set test_piwikUrl='http://demo.piwik.org/' %}
 {% set isPiwikDemo %}{{ piwikUrl == 'http://demo.piwik.org/' or piwikUrl == 'https://demo.piwik.org/'}}{% endset %}
 
 {% block content %}
 
-    <div id="feedback-faq" class="admin centerLargeDiv">
+    <div id="feedback-faq" class="admin">
         <h2 piwik-enriched-headline
             feature-name="{{ 'General_Help'|translate }}"
             >{{ 'General_AboutPiwikX'|translate(piwikVersion) }}</h2>
diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php
index acd99d9a82..46f521375e 100644
--- a/plugins/Goals/API.php
+++ b/plugins/Goals/API.php
@@ -10,7 +10,8 @@ namespace Piwik\Plugins\Goals;
 
 use Exception;
 use Piwik\Archive;
-use Piwik\Cache\PluginAwareStaticCache;
+use Piwik\CacheId;
+use Piwik\Cache as PiwikCache;
 use Piwik\Common;
 use Piwik\DataTable;
 use Piwik\Db;
@@ -55,8 +56,9 @@ class API extends \Piwik\Plugin\API
      */
     public function getGoals($idSite)
     {
-        $cache = $this->getGoalsInfoStaticCache($idSite);
-        if (!$cache->has()) {
+        $cacheId = self::getCacheId($idSite);
+        $cache = $this->getGoalsInfoStaticCache();
+        if (!$cache->contains($cacheId)) {
             $idSite = Site::getIdSitesFromIdSitesString($idSite);
 
             if (empty($idSite)) {
@@ -77,9 +79,10 @@ class API extends \Piwik\Plugin\API
                 $cleanedGoals[$goal['idgoal']] = $goal;
             }
 
-            $cache->set($cleanedGoals);
+            $cache->save($cacheId, $cleanedGoals);
         }
-        return $cache->get();
+
+        return $cache->fetch($cacheId);
     }
 
     /**
@@ -119,7 +122,7 @@ class API extends \Piwik\Plugin\API
 
         $idGoal = $this->getModel()->createGoalForSite($idSite, $goal);
 
-        $this->getGoalsInfoStaticCache($idSite)->clear();
+        $this->getGoalsInfoStaticCache()->delete(self::getCacheId($idSite));
 
         Cache::regenerateCacheWebsiteAttributes($idSite);
         return $idGoal;
@@ -166,7 +169,7 @@ class API extends \Piwik\Plugin\API
             'revenue'         => $revenue,
         ));
 
-        $this->getGoalsInfoStaticCache($idSite)->clear();
+        $this->getGoalsInfoStaticCache()->delete(self::getCacheId($idSite));
 
         Cache::regenerateCacheWebsiteAttributes($idSite);
     }
@@ -206,7 +209,7 @@ class API extends \Piwik\Plugin\API
         $this->getModel()->deleteGoal($idSite, $idGoal);
         $this->getModel()->deleteGoalConversions($idSite, $idGoal);
 
-        $this->getGoalsInfoStaticCache($idSite)->clear();
+        $this->getGoalsInfoStaticCache()->delete(self::getCacheId($idSite));
 
         Cache::regenerateCacheWebsiteAttributes($idSite);
     }
@@ -357,7 +360,11 @@ class API extends \Piwik\Plugin\API
         }, $columnsToGet);
         $dataTable = $archive->getDataTableFromNumeric($inDbMetricNames);
 
-        $newNameMapping = array_combine($inDbMetricNames, $columnsToGet);
+        if (count($columnsToGet) > 0) {
+            $newNameMapping = array_combine($inDbMetricNames, $columnsToGet);
+        } else {
+            $newNameMapping = array();
+        }
         $dataTable->filter('ReplaceColumnNames', array($newNameMapping));
 
         // TODO: this should be in Goals/Get.php but it depends on idGoal parameter which isn't always in _GET (ie,
@@ -567,8 +574,14 @@ class API extends \Piwik\Plugin\API
         }
     }
 
-    private function getGoalsInfoStaticCache($idSite)
+
+    private function getCacheId($idSite)
+    {
+        return CacheId::pluginAware('Goals.getGoals.' . $idSite);
+    }
+
+    private function getGoalsInfoStaticCache()
     {
-        return new PluginAwareStaticCache("Goals.getGoals.$idSite");
+        return PiwikCache::getTransientCache();
     }
 }
diff --git a/plugins/Goals/Columns/BaseConversion.php b/plugins/Goals/Columns/BaseConversion.php
deleted file mode 100644
index 7d9bf6bc9d..0000000000
--- a/plugins/Goals/Columns/BaseConversion.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\Goals\Columns;
-
-use Piwik\Common;
-use Piwik\Plugin\Dimension\ConversionDimension;
-use Piwik\Tracker\GoalManager;
-
-abstract class BaseConversion extends ConversionDimension
-{
-    /**
-     * Returns rounded decimal revenue, or if revenue is integer, then returns as is.
-     *
-     * @param int|float $revenue
-     * @return int|float
-     */
-    protected function roundRevenueIfNeeded($revenue)
-    {
-        if (false === $revenue) {
-            return false;
-        }
-
-        if (round($revenue) == $revenue) {
-            return $revenue;
-        }
-
-        $value = round($revenue, GoalManager::REVENUE_PRECISION);
-
-        return $value;
-    }
-}
\ No newline at end of file
diff --git a/plugins/Goals/Columns/ProductCategory.php b/plugins/Goals/Columns/ProductCategory.php
deleted file mode 100644
index 8a34edf0e1..0000000000
--- a/plugins/Goals/Columns/ProductCategory.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\Goals\Columns;
-
-use Piwik\Columns\Dimension;
-use Piwik\Piwik;
-
-class ProductCategory extends Dimension
-{
-    public function getName()
-    {
-        return Piwik::translate('Goals_ProductCategory');
-    }
-}
\ No newline at end of file
diff --git a/plugins/Goals/Columns/ProductName.php b/plugins/Goals/Columns/ProductName.php
deleted file mode 100644
index ed3d545543..0000000000
--- a/plugins/Goals/Columns/ProductName.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\Goals\Columns;
-
-use Piwik\Columns\Dimension;
-use Piwik\Piwik;
-
-class ProductName extends Dimension
-{
-    public function getName()
-    {
-        return Piwik::translate('Goals_ProductName');
-    }
-}
\ No newline at end of file
diff --git a/plugins/Goals/Columns/ProductSku.php b/plugins/Goals/Columns/ProductSku.php
deleted file mode 100644
index b44a37ec0b..0000000000
--- a/plugins/Goals/Columns/ProductSku.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\Goals\Columns;
-
-use Piwik\Columns\Dimension;
-use Piwik\Piwik;
-
-class ProductSku extends Dimension
-{
-    public function getName()
-    {
-        return Piwik::translate('Goals_ProductSKU');
-    }
-}
\ No newline at end of file
diff --git a/plugins/Goals/Columns/Revenue.php b/plugins/Goals/Columns/Revenue.php
deleted file mode 100644
index 19a2b0964d..0000000000
--- a/plugins/Goals/Columns/Revenue.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\Goals\Columns;
-
-use Piwik\Tracker\GoalManager;
-use Piwik\Tracker\Action;
-use Piwik\Tracker\Request;
-use Piwik\Tracker\Visitor;
-
-class Revenue extends BaseConversion
-{
-    protected $columnName = 'revenue';
-    protected $columnType = 'float default NULL';
-
-    /**
-     * @param Request $request
-     * @param Visitor $visitor
-     * @param Action|null $action
-     * @param GoalManager $goalManager
-     *
-     * @return mixed|false
-     */
-    public function onGoalConversion(Request $request, Visitor $visitor, $action, GoalManager $goalManager)
-    {
-        $defaultRevenue = $goalManager->getGoalColumn('revenue');
-        $revenue        = $request->getGoalRevenue($defaultRevenue);
-
-        return $this->roundRevenueIfNeeded($revenue);
-    }
-
-    /**
-     * @param Request $request
-     * @param Visitor $visitor
-     * @param Action|null $action
-     * @param GoalManager $goalManager
-     *
-     * @return mixed|false
-     */
-    public function onEcommerceOrderConversion(Request $request, Visitor $visitor, $action, GoalManager $goalManager)
-    {
-        $defaultRevenue = 0;
-        $revenue = $request->getGoalRevenue($defaultRevenue);
-
-        return $this->roundRevenueIfNeeded($revenue);
-    }
-
-    /**
-     * @param Request $request
-     * @param Visitor $visitor
-     * @param Action|null $action
-     * @param GoalManager $goalManager
-     *
-     * @return mixed|false
-     */
-    public function onEcommerceCartUpdateConversion(Request $request, Visitor $visitor, $action, GoalManager $goalManager)
-    {
-        return $this->onEcommerceOrderConversion($request, $visitor, $action, $goalManager);
-    }
-}
\ No newline at end of file
diff --git a/plugins/Goals/Columns/RevenueDiscount.php b/plugins/Goals/Columns/RevenueDiscount.php
deleted file mode 100644
index 516bb86ca6..0000000000
--- a/plugins/Goals/Columns/RevenueDiscount.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\Goals\Columns;
-
-use Piwik\Tracker\GoalManager;
-use Piwik\Tracker\Action;
-use Piwik\Tracker\Request;
-use Piwik\Tracker\Visitor;
-
-class RevenueDiscount extends BaseConversion
-{
-    protected $columnName = 'revenue_discount';
-    protected $columnType = 'float default NULL';
-
-    /**
-     * @param Request $request
-     * @param Visitor $visitor
-     * @param Action|null $action
-     * @param GoalManager $goalManager
-     *
-     * @return mixed|false
-     */
-    public function onEcommerceOrderConversion(Request $request, Visitor $visitor, $action, GoalManager $goalManager)
-    {
-        return $this->roundRevenueIfNeeded($request->getParam('ec_dt'));
-    }
-}
\ No newline at end of file
diff --git a/plugins/Goals/Columns/RevenueShipping.php b/plugins/Goals/Columns/RevenueShipping.php
deleted file mode 100644
index 27a82d96c7..0000000000
--- a/plugins/Goals/Columns/RevenueShipping.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\Goals\Columns;
-
-use Piwik\Tracker\GoalManager;
-use Piwik\Tracker\Action;
-use Piwik\Tracker\Request;
-use Piwik\Tracker\Visitor;
-
-class RevenueShipping extends BaseConversion
-{
-    protected $columnName = 'revenue_shipping';
-    protected $columnType = 'float default NULL';
-
-    /**
-     * @param Request $request
-     * @param Visitor $visitor
-     * @param Action|null $action
-     * @param GoalManager $goalManager
-     *
-     * @return mixed|false
-     */
-    public function onEcommerceOrderConversion(Request $request, Visitor $visitor, $action, GoalManager $goalManager)
-    {
-        return $this->roundRevenueIfNeeded($request->getParam('ec_sh'));
-    }
-}
\ No newline at end of file
diff --git a/plugins/Goals/Columns/RevenueSubtotal.php b/plugins/Goals/Columns/RevenueSubtotal.php
deleted file mode 100644
index a9926238e1..0000000000
--- a/plugins/Goals/Columns/RevenueSubtotal.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\Goals\Columns;
-
-use Piwik\Tracker\GoalManager;
-use Piwik\Tracker\Action;
-use Piwik\Tracker\Request;
-use Piwik\Tracker\Visitor;
-
-class RevenueSubtotal extends BaseConversion
-{
-    protected $columnName = 'revenue_subtotal';
-    protected $columnType = 'float default NULL';
-
-    /**
-     * @param Request $request
-     * @param Visitor $visitor
-     * @param Action|null $action
-     * @param GoalManager $goalManager
-     *
-     * @return mixed|false
-     */
-    public function onEcommerceOrderConversion(Request $request, Visitor $visitor, $action, GoalManager $goalManager)
-    {
-        return $this->roundRevenueIfNeeded($request->getParam('ec_st'));
-    }
-}
\ No newline at end of file
diff --git a/plugins/Goals/Columns/RevenueTax.php b/plugins/Goals/Columns/RevenueTax.php
deleted file mode 100644
index c919103f36..0000000000
--- a/plugins/Goals/Columns/RevenueTax.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\Goals\Columns;
-
-use Piwik\Tracker\GoalManager;
-use Piwik\Tracker\Action;
-use Piwik\Tracker\Request;
-use Piwik\Tracker\Visitor;
-
-class RevenueTax extends BaseConversion
-{
-    protected $columnName = 'revenue_tax';
-    protected $columnType = 'float default NULL';
-
-    /**
-     * @param Request $request
-     * @param Visitor $visitor
-     * @param Action|null $action
-     * @param GoalManager $goalManager
-     *
-     * @return mixed|false
-     */
-    public function onEcommerceOrderConversion(Request $request, Visitor $visitor, $action, GoalManager $goalManager)
-    {
-        return $this->roundRevenueIfNeeded($request->getParam('ec_tx'));
-    }
-}
\ No newline at end of file
diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php
index 7871542675..fe1a648e19 100644
--- a/plugins/Goals/Controller.php
+++ b/plugins/Goals/Controller.php
@@ -13,9 +13,9 @@ use Piwik\API\Request;
 use Piwik\Common;
 use Piwik\DataTable;
 use Piwik\DataTable\Filter\AddColumnsProcessedMetricsGoal;
-use Piwik\FrontController;
 use Piwik\Piwik;
 use Piwik\Plugins\Referrers\API as APIReferrers;
+use Piwik\Translation\Translator;
 use Piwik\View;
 use Piwik\View\ReportsByDimension;
 
@@ -43,6 +43,11 @@ class Controller extends \Piwik\Plugin\Controller
         'items'             => 'General_PurchasedProducts',
     );
 
+    /**
+     * @var Translator
+     */
+    private $translator;
+
     private function formatConversionRate($conversionRate)
     {
         if ($conversionRate instanceof DataTable) {
@@ -60,9 +65,12 @@ class Controller extends \Piwik\Plugin\Controller
         return $conversionRate;
     }
 
-    public function __construct()
+    public function __construct(Translator $translator)
     {
         parent::__construct();
+
+        $this->translator = $translator;
+
         $this->idSite = Common::getRequestVar('idSite', null, 'int');
         $this->goals = API::getInstance()->getGoals($this->idSite);
         foreach ($this->goals as &$goal) {
@@ -87,32 +95,11 @@ class Controller extends \Piwik\Plugin\Controller
         return $view->render();
     }
 
-    public function ecommerceReport()
-    {
-        if (!\Piwik\Plugin\Manager::getInstance()->isPluginActivated('CustomVariables')) {
-            throw new Exception("Ecommerce Tracking requires that the plugin Custom Variables is enabled. Please enable the plugin CustomVariables (or ask your admin).");
-        }
-
-        $view = $this->getGoalReportView($idGoal = Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER);
-        $view->displayFullReport = true;
-        return $view->render();
-    }
-
-    public function getEcommerceLog($fetch = false)
-    {
-        $saveGET = $_GET;
-        $_GET['segment'] = urlencode('visitEcommerceStatus!=none');
-        $_GET['widget'] = 1;
-        $output = FrontController::getInstance()->dispatch('Live', 'getVisitorLog', array($fetch));
-        $_GET = $saveGET;
-        return $output;
-    }
-
     protected function getGoalReportView($idGoal = false)
     {
         $view = new View('@Goals/getGoalReportView');
         if ($idGoal == Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER) {
-            $goalDefinition['name'] = Piwik::translate('Goals_Ecommerce');
+            $goalDefinition['name'] = $this->translator->translate('Goals_Ecommerce');
             $goalDefinition['allow_multiple'] = true;
             $ecommerce = $view->ecommerce = true;
         } else {
@@ -133,6 +120,7 @@ class Controller extends \Piwik\Plugin\Controller
                 $view->$name = $value;
             }
         }
+        $view->showHeadline = false;
         $view->idGoal = $idGoal;
         $view->goalName = $goalDefinition['name'];
         $view->goalAllowMultipleConversionsPerVisit = $goalDefinition['allow_multiple'];
@@ -169,12 +157,41 @@ class Controller extends \Piwik\Plugin\Controller
         }
         $view->goalsJSON = json_encode($goals);
 
-        $view->userCanEditGoals = Piwik::isUserHasAdminAccess($this->idSite);
         $view->ecommerceEnabled = $this->site->isEcommerceEnabled();
         $view->displayFullReport = true;
         return $view->render();
     }
 
+    public function manage()
+    {
+        Piwik::checkUserHasAdminAccess($this->idSite);
+
+        $view = new View('@Goals/manageGoals');
+        $this->setGeneralVariablesView($view);
+
+        $goals = $this->goals;
+        $view->goals = $goals;
+
+        $idGoal = Common::getRequestVar('idGoal', 0, 'int');
+        $view->idGoal = 0;
+        if ($idGoal && array_key_exists($idGoal, $goals)) {
+            $view->idGoal = $idGoal;
+        }
+
+        // unsanitize goal names and other text data (not done in API so as not to break
+        // any other code/cause security issues)
+
+        foreach ($goals as &$goal) {
+            $goal['name'] = Common::unsanitizeInputValue($goal['name']);
+            if (isset($goal['pattern'])) {
+                $goal['pattern'] = Common::unsanitizeInputValue($goal['pattern']);
+            }
+        }
+        $view->goalsJSON = json_encode($goals);
+        $view->ecommerceEnabled = $this->site->isEcommerceEnabled();
+        return $view->render();
+    }
+
     public function widgetGoalsOverview()
     {
         $view = $this->getOverviewView();
@@ -269,10 +286,10 @@ class Controller extends \Piwik\Plugin\Controller
         if ($idGoal == Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER) {
             $nameToLabel['nb_conversions'] = 'General_EcommerceOrders';
         } elseif ($idGoal == Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART) {
-            $nameToLabel['nb_conversions'] = Piwik::translate('General_VisitsWith', Piwik::translate('Goals_AbandonedCart'));
+            $nameToLabel['nb_conversions'] = $this->translator->translate('General_VisitsWith', $this->translator->translate('Goals_AbandonedCart'));
             $nameToLabel['conversion_rate'] = $nameToLabel['nb_conversions'];
-            $nameToLabel['revenue'] = Piwik::translate('Goals_LeftInCart', Piwik::translate('General_ColumnRevenue'));
-            $nameToLabel['items'] = Piwik::translate('Goals_LeftInCart', Piwik::translate('Goals_Products'));
+            $nameToLabel['revenue'] = $this->translator->translate('Goals_LeftInCart', $this->translator->translate('General_ColumnRevenue'));
+            $nameToLabel['items'] = $this->translator->translate('Goals_LeftInCart', $this->translator->translate('Goals_Products'));
         }
 
         $selectableColumns = array('nb_conversions', 'conversion_rate', 'revenue');
@@ -286,14 +303,14 @@ class Controller extends \Piwik\Plugin\Controller
             // find the right translation for this column, eg. find 'revenue' if column is Goal_1_revenue
             foreach ($nameToLabel as $metric => $metricTranslation) {
                 if (strpos($columnName, $metric) !== false) {
-                    $columnTranslation = Piwik::translate($metricTranslation);
+                    $columnTranslation = $this->translator->translate($metricTranslation);
                     break;
                 }
             }
 
             if (!empty($idGoal) && isset($this->goals[$idGoal])) {
                 $goalName = $this->goals[$idGoal]['name'];
-                $columnTranslation = "$columnTranslation (" . Piwik::translate('Goals_GoalX', "$goalName") . ")";
+                $columnTranslation = "$columnTranslation (" . $this->translator->translate('Goals_GoalX', "$goalName") . ")";
             }
             $view->config->translations[$columnName] = $columnTranslation;
         }
@@ -307,7 +324,7 @@ class Controller extends \Piwik\Plugin\Controller
         $view->config->selectable_columns = $selectableColumns;
 
         $langString = $idGoal ? 'Goals_SingleGoalOverviewDocumentation' : 'Goals_GoalsOverviewDocumentation';
-        $view->config->documentation = Piwik::translate($langString, '<br />');
+        $view->config->documentation = $this->translator->translate($langString, '<br />');
 
         return $this->renderView($view);
     }
@@ -434,19 +451,9 @@ class Controller extends \Piwik\Plugin\Controller
             } else {
                 $ecommerceCustomParams['abandonedCarts'] = '0';
             }
-
-            $goalReportsByDimension->addReport(
-                'Goals_EcommerceReports', 'Goals_ProductSKU', 'Goals.getItemsSku', $ecommerceCustomParams);
-            $goalReportsByDimension->addReport(
-                'Goals_EcommerceReports', 'Goals_ProductName', 'Goals.getItemsName', $ecommerceCustomParams);
-            $goalReportsByDimension->addReport(
-                'Goals_EcommerceReports', 'Goals_ProductCategory', 'Goals.getItemsCategory', $ecommerceCustomParams);
-
-            $goalReportsByDimension->addReport(
-                'Goals_EcommerceReports', 'Goals_EcommerceLog', 'Goals.getEcommerceLog', array());
         }
 
-        if ($conversions > 0) {
+        if ($conversions > 0 || $ecommerce) {
             // for non-Goals reports, we show the goals table
             $customParams = $ecommerceCustomParams + array('documentationForGoalsPage' => '1');
 
@@ -457,7 +464,12 @@ class Controller extends \Piwik\Plugin\Controller
 
             $allReports = Goals::getReportsWithGoalMetrics();
             foreach ($allReports as $category => $reports) {
-                $categoryText = Piwik::translate('Goals_ViewGoalsBy', $category);
+                if ($ecommerce) {
+                    $categoryText = $this->translator->translate('Ecommerce_ViewSalesBy', $category);
+                } else {
+                    $categoryText = $this->translator->translate('Goals_ViewGoalsBy', $category);
+                }
+
                 foreach ($reports as $report) {
                     if (empty($report['viewDataTable'])
                         && empty($report['abandonedCarts'])
diff --git a/plugins/Goals/Goals.php b/plugins/Goals/Goals.php
index f6b5e2f0f1..9e28689a8e 100644
--- a/plugins/Goals/Goals.php
+++ b/plugins/Goals/Goals.php
@@ -21,15 +21,6 @@ use Piwik\Translate;
  */
 class Goals extends \Piwik\Plugin
 {
-    public function getInformation()
-    {
-        $suffix = Piwik::translate('SitesManager_PiwikOffersEcommerceAnalytics',
-            array('<a href="http://piwik.org/docs/ecommerce-analytics/" rel="noreferrer"  target="_blank">', '</a>'));
-        $info = parent::getInformation();
-        $info['description'] .= ' ' . $suffix;
-        return $info;
-    }
-
     public static function getReportsWithGoalMetrics()
     {
         $dimensions = self::getAllReportsWithGoalMetrics();
diff --git a/plugins/Goals/Menu.php b/plugins/Goals/Menu.php
index 46b394b067..579aada101 100644
--- a/plugins/Goals/Menu.php
+++ b/plugins/Goals/Menu.php
@@ -11,49 +11,35 @@ namespace Piwik\Plugins\Goals;
 use Piwik\Common;
 use Piwik\Menu\Group;
 use Piwik\Menu\MenuReporting;
+use Piwik\Menu\MenuUser;
 use Piwik\Piwik;
-use Piwik\Site;
+use Piwik\Plugins\UsersManager\UserPreferences;
 use Piwik\Translate;
 
-/**
- */
 class Menu extends \Piwik\Plugin\Menu
 {
-
     public function configureReportingMenu(MenuReporting $menu)
     {
-        $idSite = Common::getRequestVar('idSite', null, 'int');
+        $idSite = $this->getIdSite();
         $goals  = API::getInstance()->getGoals($idSite);
-        $mainGoalMenu = $this->getGoalCategoryName($idSite);
+        $mainGoalMenu = 'Goals_Goals';
 
-        $site = new Site($idSite);
+        $linkToAddNewGoal = $this->urlForAction('addNewGoal', array(
+            'idGoal' => null
+        ));
 
-        if (count($goals) == 0) {
-            $action = $site->isEcommerceEnabled() ? 'ecommerceReport' : 'addNewGoal';
-            $url    = $this->urlForAction($action, array(
-                'idGoal' => ($site->isEcommerceEnabled() ? Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER : null
-            )));
-
-            $menu->addItem($mainGoalMenu, '', $url, 25);
+        $order = 1;
 
-            if ($site->isEcommerceEnabled()) {
-                $menu->addItem($mainGoalMenu, 'Goals_Ecommerce', $this->urlForAction('ecommerceReport', array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER)), 1);
-            }
+        if (count($goals) == 0) {
 
-            $menu->addItem($mainGoalMenu, 'Goals_AddNewGoal', $this->urlForAction('addNewGoal'));
+            $menu->addItem($mainGoalMenu, '', $linkToAddNewGoal, 25);
 
         } else {
 
-            $action = $site->isEcommerceEnabled() ? 'ecommerceReport' : 'index';
-            $url    = $this->urlForAction($action, array('idGoal' => ($site->isEcommerceEnabled() ? Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER : null)));
+            $url = $this->urlForAction('index', array('idGoal' => null));
 
             $menu->addItem($mainGoalMenu, '', $url, 25);
-
-            if ($site->isEcommerceEnabled()) {
-                $menu->addItem($mainGoalMenu, 'Goals_Ecommerce', $this->urlForAction('ecommerceReport', array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER)), 1);
-            }
-
-            $menu->addItem($mainGoalMenu, 'Goals_GoalsOverview', array('module' => 'Goals', 'action' => 'index'), 2);
+            $menu->addItem($mainGoalMenu, 'General_Overview', $url, ++$order);
 
             $group = new Group();
             foreach ($goals as $goal) {
@@ -61,22 +47,37 @@ class Menu extends \Piwik\Plugin\Menu
                 $params      = $this->urlForAction('goalReport', array('idGoal' => $goal['idgoal']));
                 $tooltip     = sprintf('%s (id = %d)', $subMenuName, $goal['idgoal']);
 
-                if (count($goals) <= 3) {
-                    $menu->addItem($mainGoalMenu, $subMenuName, $params, 50, $tooltip);
-                } else {
+                if (count($goals) > 3) {
                     $group->add($subMenuName, $params, $tooltip);
+                } else {
+                    $menu->addItem($mainGoalMenu, $subMenuName, $params, ++$order, $tooltip);
                 }
             }
 
             if (count($goals) > 3) {
-                $menu->addGroup($mainGoalMenu, 'Goals_ChooseGoal', $group, $orderId = 50, $tooltip = false);
+                $menu->addGroup($mainGoalMenu, 'Goals_ChooseGoal', $group, ++$order, $tooltip = false);
             }
+
         }
+
+        $menu->addItem($mainGoalMenu, 'Goals_AddNewGoal', $linkToAddNewGoal, ++$order);
     }
 
-    private function getGoalCategoryName($idSite)
+    public function configureUserMenu(MenuUser $menu)
     {
-        $site = new Site($idSite);
-        return $site->isEcommerceEnabled() ? 'Goals_EcommerceAndGoalsMenu' : 'Goals_Goals';
+        $userPreferences = new UserPreferences();
+        $idSite = $this->getIdSite($userPreferences->getDefaultWebsiteId());
+
+        if (Piwik::isUserHasAdminAccess($idSite)) {
+            $menu->addManageItem('Goals_Goals', $this->urlForAction('manage', array('idSite' => $idSite)), 1);
+        }
+
     }
+
+    private function getIdSite($default = null)
+    {
+        $idSite = Common::getRequestVar('idSite', $default, 'int');
+        return $idSite;
+    }
+
 }
diff --git a/plugins/Goals/Reports/Base.php b/plugins/Goals/Reports/Base.php
new file mode 100644
index 0000000000..fd732035d3
--- /dev/null
+++ b/plugins/Goals/Reports/Base.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Goals\Reports;
+
+use Piwik\Common;
+use Piwik\Plugins\Goals\API;
+use Piwik\Plugins\Goals\Goals;
+
+abstract class Base extends \Piwik\Plugin\Report
+{
+    protected $orderGoal = 50;
+
+    protected function init()
+    {
+        $this->category = 'Goals_Goals';
+    }
+
+    protected function addReportMetadataForEachGoal(&$availableReports, $infos, $goalNameFormatter)
+    {
+        $idSite = $this->getIdSiteFromInfos($infos);
+        $goals  = $this->getGoalsForIdSite($idSite);
+
+        foreach ($goals as $goal) {
+            $goal['name'] = Common::sanitizeInputValue($goal['name']);
+
+            $this->name       = $goalNameFormatter($goal);
+            $this->parameters = array('idGoal' => $goal['idgoal']);
+            $this->order      = $this->orderGoal + $goal['idgoal'] * 3;
+
+            $availableReports[] = $this->buildReportMetadata($availableReports, $infos);
+        }
+
+        $this->init();
+    }
+
+    protected function getIdSiteFromInfos($infos)
+    {
+        $idSites = $infos['idSites'];
+
+        if (count($idSites) != 1) {
+            return null;
+        }
+
+        $idSite = reset($idSites);
+
+        return $idSite;
+    }
+
+    private function getGoalsForIdSite($idSite)
+    {
+        if (empty($idSite)) {
+            return array();
+        }
+
+        return API::getInstance()->getGoals($idSite);
+    }
+}
diff --git a/plugins/Goals/Reports/BaseEcommerce.php b/plugins/Goals/Reports/BaseEcommerce.php
deleted file mode 100644
index c7ee16a01b..0000000000
--- a/plugins/Goals/Reports/BaseEcommerce.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\Goals\Reports;
-
-use Piwik\Common;
-use Piwik\Piwik;
-use Piwik\Plugin\Report;
-use Piwik\Site;
-
-abstract class BaseEcommerce extends Report
-{
-    protected function init()
-    {
-        $this->category = 'Goals_Ecommerce';
-    }
-
-    public function isEnabled()
-    {
-        $idSite = Common::getRequestVar('idSite', false, 'int');
-
-        if (empty($idSite)) {
-            return false;
-        }
-
-        return $this->isEcommerceEnabled($idSite);
-    }
-
-    public function checkIsEnabled()
-    {
-        if (!$this->isEnabled()) {
-            $message = Piwik::translate('General_ExceptionReportNotEnabled');
-
-            if (Piwik::hasUserSuperUserAccess()) {
-                $message .= ' Most likely Ecommerce is not enabled for the requested site.';
-            }
-
-            throw new \Exception($message);
-        }
-    }
-
-    public function configureReportMetadata(&$availableReports, $infos)
-    {
-        if ($this->isEcommerceEnabledByInfos($infos)) {
-            $availableReports[] = $this->buildReportMetadata();
-        }
-    }
-
-    private function isEcommerceEnabledByInfos($infos)
-    {
-        $idSites = $infos['idSites'];
-
-        if (count($idSites) != 1) {
-            return false;
-        }
-
-        $idSite = reset($idSites);
-
-        return $this->isEcommerceEnabled($idSite);
-    }
-
-    private function isEcommerceEnabled($idSite)
-    {
-        $site = new Site($idSite);
-
-        return $site->isEcommerceEnabled();
-    }
-}
diff --git a/plugins/Goals/Reports/BaseEcommerceItem.php b/plugins/Goals/Reports/BaseEcommerceItem.php
deleted file mode 100644
index bfc93fcdd5..0000000000
--- a/plugins/Goals/Reports/BaseEcommerceItem.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\Goals\Reports;
-
-use Piwik\Common;
-use Piwik\Metrics\Formatter;
-use Piwik\Piwik;
-use Piwik\Plugin\Report;
-use Piwik\Plugin\ViewDataTable;
-use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Evolution;
-use Piwik\Plugins\Goals\Goals;
-use Piwik\Plugins\Goals\Columns\Metrics\AveragePrice;
-use Piwik\Plugins\Goals\Columns\Metrics\AverageQuantity;
-use Piwik\Plugins\Goals\Columns\Metrics\ProductConversionRate;
-
-abstract class BaseEcommerceItem extends BaseEcommerce
-{
-    protected function init()
-    {
-        parent::init();
-        $this->processedMetrics = array(
-            new AveragePrice(),
-            new AverageQuantity(),
-            new ProductConversionRate()
-        );
-        $this->metrics = array(
-            'revenue', 'quantity', 'orders', 'nb_visits'
-        );
-    }
-
-    public function getMetrics()
-    {
-        $metrics = parent::getMetrics();
-        $metrics['revenue']         = Piwik::translate('General_ProductRevenue');
-        $metrics['orders']          = Piwik::translate('General_UniquePurchases');
-        return $metrics;
-    }
-
-    public function getMetricsDocumentation()
-    {
-        if ($this->isAbandonedCart()) {
-            return array(
-                'revenue'         => Piwik::translate('Goals_ColumnRevenueDocumentation',
-                                            Piwik::translate('Goals_DocumentationRevenueGeneratedByProductSales')),
-                'quantity'        => Piwik::translate('Goals_ColumnQuantityDocumentation', $this->name),
-                'orders'          => Piwik::translate('Goals_ColumnOrdersDocumentation', $this->name),
-                'avg_price'       => Piwik::translate('Goals_ColumnAveragePriceDocumentation', $this->name),
-                'avg_quantity'    => Piwik::translate('Goals_ColumnAverageQuantityDocumentation', $this->name),
-                'nb_visits'       => Piwik::translate('Goals_ColumnVisitsProductDocumentation', $this->name),
-                'conversion_rate' => Piwik::translate('Goals_ColumnConversionRateProductDocumentation', $this->name),
-            );
-        }
-
-        return array();
-    }
-
-    public function configureView(ViewDataTable $view)
-    {
-        $idSite = Common::getRequestVar('idSite');
-
-        $view->config->show_ecommerce = true;
-        $view->config->show_table     = false;
-        $view->config->show_all_views_icons      = false;
-        $view->config->show_exclude_low_population = false;
-        $view->config->show_table_all_columns      = false;
-
-        if (!($view instanceof Evolution)) {
-            $moneyColumns = array('revenue');
-            $formatter    = array(new Formatter(), 'getPrettyMoney');
-            $view->config->filters[] = array('ColumnCallbackReplace', array($moneyColumns, $formatter, array($idSite)));
-        }
-
-        $view->requestConfig->filter_limit       = 10;
-        $view->requestConfig->filter_sort_column = 'revenue';
-        $view->requestConfig->filter_sort_order  = 'desc';
-
-        $view->config->custom_parameters['isFooterExpandedInDashboard'] = true;
-
-        // set columns/translations which differ based on viewDataTable TODO: shouldn't have to do this check...
-        // amount of reports should be dynamic, but metadata should be static
-        $columns = array_merge($this->getMetrics(), $this->getProcessedMetrics());
-        $columnsOrdered = array('label', 'revenue', 'quantity', 'orders', 'avg_price', 'avg_quantity',
-                                'nb_visits', 'conversion_rate');
-
-        // handle old case where viewDataTable is set to ecommerceOrder/ecommerceAbandonedCart. in this case, we
-        // set abandonedCarts accordingly and remove the ecommerceOrder/ecommerceAbandonedCart as viewDataTable.
-        $viewDataTable = Common::getRequestVar('viewDataTable', '');
-        if ($viewDataTable == 'ecommerceOrder') {
-            $view->config->custom_parameters['viewDataTable'] = 'table';
-            $abandonedCart = false;
-        } else if ($viewDataTable == 'ecommerceAbandonedCart') {
-            $view->config->custom_parameters['viewDataTable'] = 'table';
-            $abandonedCart = true;
-        } else {
-            $abandonedCart = $this->isAbandonedCart();
-        }
-
-        if ($abandonedCart) {
-            $columns['abandoned_carts'] = Piwik::translate('General_AbandonedCarts');
-            $columns['revenue'] = Piwik::translate('Goals_LeftInCart', $columns['revenue']);
-            $columns['quantity'] = Piwik::translate('Goals_LeftInCart', $columns['quantity']);
-            $columns['avg_quantity'] = Piwik::translate('Goals_LeftInCart', $columns['avg_quantity']);
-            unset($columns['orders']);
-            unset($columns['conversion_rate']);
-
-            $columnsOrdered = array('label', 'revenue', 'quantity', 'avg_price', 'avg_quantity', 'nb_visits',
-                                    'abandoned_carts');
-
-            $view->config->custom_parameters['abandonedCarts'] = '1';
-        } else {
-            $view->config->custom_parameters['abandonedCarts'] = '0';
-        }
-
-        $view->requestConfig->request_parameters_to_modify['abandonedCarts'] = $view->config->custom_parameters['abandonedCarts'];
-
-        $translations = array_merge(array('label' => $this->name), $columns);
-
-        $view->config->addTranslations($translations);
-        $view->config->columns_to_display = $columnsOrdered;
-    }
-
-    private function isAbandonedCart()
-    {
-        return Common::getRequestVar('abandonedCarts', '0', 'string') == 1;
-    }
-}
diff --git a/plugins/Goals/Reports/BaseGoal.php b/plugins/Goals/Reports/BaseGoal.php
deleted file mode 100644
index 9e66edee65..0000000000
--- a/plugins/Goals/Reports/BaseGoal.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\Goals\Reports;
-
-use Piwik\Common;
-use Piwik\Plugins\Goals\API;
-use Piwik\Plugins\Goals\Goals;
-
-abstract class BaseGoal extends \Piwik\Plugin\Report
-{
-    protected $orderGoal = 50;
-
-    protected function init()
-    {
-        $this->category = 'Goals_Goals';
-    }
-
-    protected function addReportMetadataForEachGoal(&$availableReports, $infos, $goalNameFormatter)
-    {
-        $idSite = $this->getIdSiteFromInfos($infos);
-        $goals  = $this->getGoalsForIdSite($idSite);
-
-        foreach ($goals as $goal) {
-            $goal['name'] = Common::sanitizeInputValue($goal['name']);
-
-            $this->name       = $goalNameFormatter($goal);
-            $this->parameters = array('idGoal' => $goal['idgoal']);
-            $this->order      = $this->orderGoal + $goal['idgoal'] * 3;
-
-            $availableReports[] = $this->buildReportMetadata($availableReports, $infos);
-        }
-
-        $this->init();
-    }
-
-    protected function getIdSiteFromInfos($infos)
-    {
-        $idSites = $infos['idSites'];
-
-        if (count($idSites) != 1) {
-            return null;
-        }
-
-        $idSite = reset($idSites);
-
-        return $idSite;
-    }
-
-    private function getGoalsForIdSite($idSite)
-    {
-        if (empty($idSite)) {
-            return array();
-        }
-
-        return API::getInstance()->getGoals($idSite);
-    }
-}
diff --git a/plugins/Goals/Reports/Get.php b/plugins/Goals/Reports/Get.php
index 78cf680b66..163d9fe236 100644
--- a/plugins/Goals/Reports/Get.php
+++ b/plugins/Goals/Reports/Get.php
@@ -11,7 +11,7 @@ namespace Piwik\Plugins\Goals\Reports;
 use Piwik\Piwik;
 use Piwik\Plugins\CoreHome\Columns\Metrics\ConversionRate;
 
-class Get extends BaseGoal
+class Get extends Base
 {
     protected function init()
     {
diff --git a/plugins/Goals/Reports/GetDaysToConversion.php b/plugins/Goals/Reports/GetDaysToConversion.php
index de99a04b60..d41f2e8f06 100644
--- a/plugins/Goals/Reports/GetDaysToConversion.php
+++ b/plugins/Goals/Reports/GetDaysToConversion.php
@@ -13,7 +13,7 @@ use Piwik\Plugin\ViewDataTable;
 use Piwik\Plugins\Goals\Columns\DaysToConversion;
 use Piwik\Plugins\Goals\Archiver;
 
-class GetDaysToConversion extends BaseGoal
+class GetDaysToConversion extends Base
 {
     protected function init()
     {
diff --git a/plugins/Goals/Reports/GetDaysToConversionAbandonedCart.php b/plugins/Goals/Reports/GetDaysToConversionAbandonedCart.php
deleted file mode 100644
index 624fdf25c1..0000000000
--- a/plugins/Goals/Reports/GetDaysToConversionAbandonedCart.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\Goals\Reports;
-
-use Piwik\Metrics;
-use Piwik\Piwik;
-use Piwik\Plugins\Goals\Columns\DaysToConversion;
-
-class GetDaysToConversionAbandonedCart extends BaseEcommerce
-{
-    protected function init()
-    {
-        parent::init();
-
-        $this->action = 'getDaysToConversion';
-        $this->name = Piwik::translate('General_AbandonedCarts') . ' - ' . Piwik::translate('Goals_DaysToConv');
-        $this->dimension = new DaysToConversion();
-        $this->constantRowsCount = true;
-        $this->processedMetrics = false;
-        $this->metrics = array('nb_conversions');
-        $this->order = 25;
-
-        $this->parameters =  array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART);
-    }
-
-}
diff --git a/plugins/Goals/Reports/GetDaysToConversionEcommerceOrder.php b/plugins/Goals/Reports/GetDaysToConversionEcommerceOrder.php
deleted file mode 100644
index 1e0ac0bc96..0000000000
--- a/plugins/Goals/Reports/GetDaysToConversionEcommerceOrder.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\Goals\Reports;
-
-use Piwik\Metrics;
-use Piwik\Piwik;
-use Piwik\Plugins\Goals\Columns\DaysToConversion;
-
-class GetDaysToConversionEcommerceOrder extends BaseEcommerce
-{
-    protected function init()
-    {
-        parent::init();
-
-        $this->action = 'getDaysToConversion';
-        $this->name = Piwik::translate('General_EcommerceOrders') . ' - ' . Piwik::translate('Goals_DaysToConv');
-        $this->dimension = new DaysToConversion();
-        $this->constantRowsCount = true;
-        $this->processedMetrics = false;
-        $this->metrics = array('nb_conversions');
-        $this->order = 12;
-
-        $this->parameters = array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER);
-    }
-
-}
diff --git a/plugins/Goals/Reports/GetEcommerceAbandonedCart.php b/plugins/Goals/Reports/GetEcommerceAbandonedCart.php
deleted file mode 100644
index 279de4b940..0000000000
--- a/plugins/Goals/Reports/GetEcommerceAbandonedCart.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\Goals\Reports;
-
-use Piwik\Piwik;
-
-class GetEcommerceAbandonedCart extends BaseEcommerce
-{
-    protected function init()
-    {
-        parent::init();
-        $this->action = 'get';
-        $this->name = Piwik::translate('General_AbandonedCarts');
-        $this->processedMetrics = array('avg_order_revenue');
-        $this->order = 15;
-        $this->metrics = array('nb_conversions', 'conversion_rate', 'revenue', 'items');
-
-        $this->parameters = array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART);
-    }
-
-    public function getMetrics() {
-        $metrics = parent::getMetrics();
-
-        $metrics['nb_conversions'] = Piwik::translate('General_AbandonedCarts');
-        $metrics['revenue']        = Piwik::translate('Goals_LeftInCart', Piwik::translate('General_ColumnRevenue'));
-        $metrics['items']          = Piwik::translate('Goals_LeftInCart', Piwik::translate('Goals_Products'));
-
-        return $metrics;
-    }
-}
diff --git a/plugins/Goals/Reports/GetEcommerceOrder.php b/plugins/Goals/Reports/GetEcommerceOrder.php
deleted file mode 100644
index 95c42ba568..0000000000
--- a/plugins/Goals/Reports/GetEcommerceOrder.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\Goals\Reports;
-
-use Piwik\Piwik;
-
-class GetEcommerceOrder extends BaseEcommerce
-{
-    protected function init()
-    {
-        parent::init();
-        $this->action = 'get';
-        $this->name = Piwik::translate('General_EcommerceOrders');
-        $this->processedMetrics = array('avg_order_revenue');
-        $this->order = 10;
-        $this->metrics = array(
-            'nb_conversions',
-            'nb_visits_converted',
-            'conversion_rate',
-            'revenue',
-            'revenue_subtotal',
-            'revenue_tax',
-            'revenue_shipping',
-            'revenue_discount'
-        );
-
-        $this->parameters = array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER);
-    }
-
-    public function getMetrics()
-    {
-        $metrics = parent::getMetrics();
-
-        $metrics['nb_conversions'] = Piwik::translate('General_EcommerceOrders');
-        $metrics['items']          = Piwik::translate('General_PurchasedProducts');
-
-        return $metrics;
-    }
-}
diff --git a/plugins/Goals/Reports/GetItemsCategory.php b/plugins/Goals/Reports/GetItemsCategory.php
deleted file mode 100644
index adcbd398c6..0000000000
--- a/plugins/Goals/Reports/GetItemsCategory.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\Goals\Reports;
-
-use Piwik\Piwik;
-use Piwik\Plugins\Goals\Columns\ProductCategory;
-
-class GetItemsCategory extends BaseEcommerceItem
-{
-    protected function init()
-    {
-        parent::init();
-
-        $this->name      = Piwik::translate('Goals_ProductCategory');
-        $this->dimension = new ProductCategory();
-        $this->order     = 32;
-        $this->widgetTitle = 'Goals_ProductCategory';
-    }
-}
diff --git a/plugins/Goals/Reports/GetItemsName.php b/plugins/Goals/Reports/GetItemsName.php
deleted file mode 100644
index 93f493d7d2..0000000000
--- a/plugins/Goals/Reports/GetItemsName.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\Goals\Reports;
-
-use Piwik\Piwik;
-use Piwik\Plugins\Goals\Columns\ProductName;
-
-class GetItemsName extends BaseEcommerceItem
-{
-    protected function init()
-    {
-        parent::init();
-
-        $this->name      = Piwik::translate('Goals_ProductName');
-        $this->dimension = new ProductName();
-        $this->order     = 31;
-        $this->widgetTitle = 'Goals_ProductName';
-    }
-}
diff --git a/plugins/Goals/Reports/GetItemsSku.php b/plugins/Goals/Reports/GetItemsSku.php
deleted file mode 100644
index 183162a98a..0000000000
--- a/plugins/Goals/Reports/GetItemsSku.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\Goals\Reports;
-
-use Piwik\Piwik;
-use Piwik\Plugins\Goals\Columns\ProductSku;
-
-class GetItemsSku extends BaseEcommerceItem
-{
-    protected function init()
-    {
-        parent::init();
-
-        $this->name      = Piwik::translate('Goals_ProductSKU');
-        $this->dimension = new ProductSku();
-        $this->order     = 30;
-        $this->widgetTitle = 'Goals_ProductSKU';
-    }
-
-}
diff --git a/plugins/Goals/Reports/GetVisitsUntilConversion.php b/plugins/Goals/Reports/GetVisitsUntilConversion.php
index 8d7c27e027..ddf1da1fd9 100644
--- a/plugins/Goals/Reports/GetVisitsUntilConversion.php
+++ b/plugins/Goals/Reports/GetVisitsUntilConversion.php
@@ -13,7 +13,7 @@ use Piwik\Plugin\ViewDataTable;
 use Piwik\Plugins\Goals\Columns\VisitsUntilConversion;
 use Piwik\Plugins\Goals\Archiver;
 
-class GetVisitsUntilConversion extends BaseGoal
+class GetVisitsUntilConversion extends Base
 {
     protected function init()
     {
diff --git a/plugins/Goals/Reports/GetVisitsUntilConversionAbandonedCart.php b/plugins/Goals/Reports/GetVisitsUntilConversionAbandonedCart.php
deleted file mode 100644
index f28b052f2e..0000000000
--- a/plugins/Goals/Reports/GetVisitsUntilConversionAbandonedCart.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\Goals\Reports;
-
-use Piwik\Metrics;
-use Piwik\Piwik;
-use Piwik\Plugins\Goals\Columns\VisitsUntilConversion;
-
-class GetVisitsUntilConversionAbandonedCart extends BaseEcommerce
-{
-    protected function init()
-    {
-        parent::init();
-
-        $this->action = 'getVisitsUntilConversion';
-        $this->name = Piwik::translate('General_AbandonedCarts') . ' - ' . Piwik::translate('Goals_VisitsUntilConv');
-        $this->dimension = new VisitsUntilConversion();
-        $this->constantRowsCount = true;
-        $this->processedMetrics = false;
-        $this->metrics = array('nb_conversions');
-        $this->order = 20;
-
-        $this->parameters =  array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART);
-    }
-
-}
diff --git a/plugins/Goals/Reports/GetVisitsUntilConversionEcommerceOrder.php b/plugins/Goals/Reports/GetVisitsUntilConversionEcommerceOrder.php
deleted file mode 100644
index 0e5d227e7e..0000000000
--- a/plugins/Goals/Reports/GetVisitsUntilConversionEcommerceOrder.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\Goals\Reports;
-
-use Piwik\Metrics;
-use Piwik\Piwik;
-use Piwik\Plugins\Goals\Columns\VisitsUntilConversion;
-
-class GetVisitsUntilConversionEcommerceOrder extends BaseEcommerce
-{
-    protected function init()
-    {
-        parent::init();
-
-        $this->action = 'getVisitsUntilConversion';
-        $this->name = Piwik::translate('General_EcommerceOrders') . ' - ' . Piwik::translate('Goals_VisitsUntilConv');
-        $this->dimension = new VisitsUntilConversion();
-        $this->constantRowsCount = true;
-        $this->processedMetrics = array();
-        $this->metrics = array('nb_conversions');
-        $this->order = 11;
-
-        $this->parameters =  array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER);
-    }
-
-}
diff --git a/plugins/Goals/Visualizations/Goals.php b/plugins/Goals/Visualizations/Goals.php
index 0703889966..5619e403a6 100644
--- a/plugins/Goals/Visualizations/Goals.php
+++ b/plugins/Goals/Visualizations/Goals.php
@@ -23,7 +23,7 @@ class Goals extends HtmlTable
 {
     const ID = 'tableGoals';
     const FOOTER_ICON       = 'plugins/Morpheus/images/goal.png';
-    const FOOTER_ICON_TITLE = 'General_DisplayTableWithMoreMetrics';
+    const FOOTER_ICON_TITLE = 'General_DisplayTableWithGoalMetrics';
 
     public function beforeLoadDataTable()
     {
diff --git a/plugins/Goals/Widgets.php b/plugins/Goals/Widgets.php
index 30c113e9a2..94d91bda5c 100644
--- a/plugins/Goals/Widgets.php
+++ b/plugins/Goals/Widgets.php
@@ -9,8 +9,6 @@
 namespace Piwik\Plugins\Goals;
 
 use Piwik\Common;
-use Piwik\Site;
-use Piwik\Piwik;
 
 class Widgets extends \Piwik\Plugin\Widgets
 {
@@ -31,12 +29,6 @@ class Widgets extends \Piwik\Plugin\Widgets
                 $this->addWidget($name, 'widgetGoalReport', $params);
             }
         }
-
-        $site = new Site($idSite);
-        if ($site->isEcommerceEnabled()) {
-            $this->addWidgetWithCustomCategory('Goals_Ecommerce', 'Goals_EcommerceOverview', 'widgetGoalReport', array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER));
-            $this->addWidgetWithCustomCategory('Goals_Ecommerce', 'Goals_EcommerceLog', 'getEcommerceLog');
-        }
     }
 
     private function getIdSite()
diff --git a/plugins/Goals/javascripts/goalsForm.js b/plugins/Goals/javascripts/goalsForm.js
index 400f3813c2..86cf500c38 100644
--- a/plugins/Goals/javascripts/goalsForm.js
+++ b/plugins/Goals/javascripts/goalsForm.js
@@ -9,14 +9,15 @@ function showAddNewGoal() {
     hideForms();
     $(".entityAddContainer").show();
     showCancel();
+    hideCreateGoal();
     piwikHelper.lazyScrollTo(".entityContainer", 400);
     return false;
 }
 
 function showEditGoals() {
     hideForms();
+    showCreateGoal();
     $("#entityEditContainer").show();
-    showCancel();
     piwikHelper.lazyScrollTo(".entityContainer", 400);
     return false;
 }
@@ -31,9 +32,18 @@ function showCancel() {
     $('.entityCancelLink').click(function () {
         hideForms();
         $(".entityCancel").hide();
+        showEditGoals();
     });
 }
 
+function showCreateGoal() {
+    $("div[name=linkAddNewGoal]").show();
+}
+
+function hideCreateGoal() {
+    $("div[name=linkAddNewGoal]").hide();
+}
+
 function onMatchAttributeChange(matchAttribute)
 {
     if ('event' === matchAttribute) {
@@ -118,7 +128,7 @@ function bindGoalForm() {
         return false;
     });
 
-    $('a[name=linkAddNewGoal]').click(function () {
+    $('div[name=linkAddNewGoal]').click(function () {
         initAndShowAddGoalForm();
         piwikHelper.lazyScrollTo('#goal_name');
     });
@@ -173,16 +183,23 @@ function ajaxAddGoal() {
     var ajaxRequest = new ajaxHelper();
     ajaxRequest.addParams(parameters, 'get');
     ajaxRequest.setLoadingElement('#goalAjaxLoading');
-    ajaxRequest.setCallback(function () { location.reload(); });
+    ajaxRequest.setCallback(function () {
+        location.reload();
+    });
     ajaxRequest.send(true);
 }
 
+function editGoal(goalId)
+{
+    var goal = piwik.goals[goalId];
+    initGoalForm("Goals.updateGoal", _pk_translate('Goals_UpdateGoal'), goal.name, goal.match_attribute, goal.pattern, goal.pattern_type, (goal.case_sensitive != '0'), goal.revenue, goal.allow_multiple, goalId);
+    showAddNewGoal();
+}
+
 function bindListGoalEdit() {
     $('a[name=linkEditGoal]').click(function () {
         var goalId = $(this).attr('id');
-        var goal = piwik.goals[goalId];
-        initGoalForm("Goals.updateGoal", _pk_translate('Goals_UpdateGoal'), goal.name, goal.match_attribute, goal.pattern, goal.pattern_type, (goal.case_sensitive != '0'), goal.revenue, goal.allow_multiple, goalId);
-        showAddNewGoal();
+        editGoal(goalId);
         return false;
     });
 
diff --git a/plugins/Goals/lang/ar.json b/plugins/Goals/lang/ar.json
index 6b63af1a89..d2bb1b4ef1 100644
--- a/plugins/Goals/lang/ar.json
+++ b/plugins/Goals/lang/ar.json
@@ -31,7 +31,6 @@
         "GoalIsTriggeredWhen": "سيتم تفعيل الهدف عندما",
         "GoalName": "اسم الهدف",
         "Goals": "الأهداف",
-        "GoalsManagement": "إدارة الأهداف",
         "GoalsOverview": "نظرة عامة على الأهداف",
         "GoalX": "الهدف %s",
         "HelpOneConversionPerVisit": "إذا كانت صفحة تضاهي الهدف يتم تحديثها أو مشاهدتها أكثر من مرة في الزيارة، سيتم احتساب الهدف في أول مرة يتم تحميل الصفحة فيها أثناء هذه الزيارة.",
@@ -45,7 +44,6 @@
         "OverallRevenue": "%s ربح إجمالي",
         "PageTitle": "عنوان الصفحة",
         "Pattern": "النمط",
-        "PluginDescription": "أنشأ الأهداف وشاهدة التقارير حول معدلات تحويل الأهداف: التطور مع الوقت، الأرباح لكل زيارة، الأرباح لكل مصدر زيارات، لكل كلمة دلالية، وغيرها.",
         "ReturningVisitorsConversionRateIs": "معدل التحويل للزيارات المتكررة هو %s",
         "UpdateGoal": "تحديث هدف",
         "URL": "الرابط",
diff --git a/plugins/Goals/lang/be.json b/plugins/Goals/lang/be.json
index 8e4c90c576..48574cdbe5 100644
--- a/plugins/Goals/lang/be.json
+++ b/plugins/Goals/lang/be.json
@@ -53,7 +53,6 @@
         "GoalIsTriggeredWhen": "Мэта адбылася калі",
         "GoalName": "Імя Мэты",
         "Goals": "Мэты",
-        "GoalsManagement": "Кіраванне мэтамі",
         "GoalsOverview": "Аглят Мэт",
         "GoalsOverviewDocumentation": "Гэта агляд вашых дасягнутых мэт канверсій. Першапачаткова, графік паказвае суму ўсіх канверсій. %s Ніжэй графік, на якім можна ўбачыць справаздачы канверсій для кожнай з вашых мэтаў. Спарклайны можна павялічыць, націснуўшы на іх.",
         "GoalX": "Мэта %s",
@@ -68,7 +67,6 @@
         "OverallRevenue": "%s агульны прыбытак",
         "PageTitle": "Назва старонкі",
         "Pattern": "Шаблон",
-        "PluginDescription": "Стварэнне мэтаў і прагляд справаздач аб дасягнутых канверсіях мэт: змены ў часе, прыбытак за наведванне, канверсія за спасыльніка, за ключаве слова, г.д.",
         "ProductCategory": "Катэгорыя прадукта",
         "ProductName": "Імя прадукта",
         "Products": "Прадукты",
diff --git a/plugins/Goals/lang/bg.json b/plugins/Goals/lang/bg.json
index 2677f8beea..a3b2001a3c 100644
--- a/plugins/Goals/lang/bg.json
+++ b/plugins/Goals/lang/bg.json
@@ -54,7 +54,6 @@
         "GoalIsTriggeredWhen": "Целта е задействана, когато",
         "GoalName": "Име на цел",
         "Goals": "Цели",
-        "GoalsManagement": "Управление на целите",
         "GoalsOverview": "Общ преглед на целите",
         "GoalsOverviewDocumentation": "Това е преглед на конверсията на вашите цели. Поначало, графиката показва сумата от всички ваши конверсии. %s Под графиката ще видите отчетите за конверсия на всички ваши цели. Блестящите линии можете да уголемите като кликнете върху тях.",
         "GoalX": "Цел %s",
@@ -64,15 +63,12 @@
         "Manually": "ръчно",
         "ManuallyTriggeredUsingJavascriptFunction": "Целта е ръчно задействана с помощта на JavaScript API trackGoal()",
         "MatchesExpression": "съответства на изразените %s",
-        "NewGoalYouWillBeAbleTo": "Вие ще бъдете в състояние да видите и анализирате представянето си за всяка цел, и да научите как да се увеличат реализациите, обменните курсове и приходите на посещение.",
         "NewVisitorsConversionRateIs": "Стойност на конверсията от новите посетители е %s",
-        "NewWhatDoYouWantUsersToDo": "Какво искате потребителите да правят във вашия сайт?",
         "Optional": "(по избор)",
         "OverallConversionRate": "%s цялостно обменния курс (посещения със завършена цел)",
         "OverallRevenue": "%s общи приходи",
         "PageTitle": "Заглавие на страница",
         "Pattern": "Модел",
-        "PluginDescription": "Създай цел и виж докладите на отчетите за Вашата цел по: развитие с течение на времето, приходите на посещение, реализации на референтите, ключови думи и др.",
         "ProductCategory": "Категория на продукт",
         "ProductName": "Име на продукт",
         "Products": "Продукти",
diff --git a/plugins/Goals/lang/ca.json b/plugins/Goals/lang/ca.json
index d6d376de3f..1b56d8e675 100644
--- a/plugins/Goals/lang/ca.json
+++ b/plugins/Goals/lang/ca.json
@@ -55,7 +55,6 @@
         "GoalIsTriggeredWhen": "S'asoleix l'objectiu quan",
         "GoalName": "Nom de l'objectiu",
         "Goals": "Objectius",
-        "GoalsManagement": "Gestió d'objectius",
         "GoalsOverview": "Vista general d'objectius",
         "GoalsOverviewDocumentation": "Això es una vista global de les conversions dels vostres objectius. Inicialment el gràfic mostra la suma de totes les conversions. %s Davalla del gràfic, podeu veure els informes de conversions per cada un dels vostres objectius. Els minigràfics es pot ampliar fent clic sobre ells.",
         "GoalX": "Objectiu %s",
@@ -71,7 +70,6 @@
         "OverallRevenue": "%s ingresssos globals",
         "PageTitle": "Títol de la pàgina",
         "Pattern": "Patró",
-        "PluginDescription": "Creeu Objectius i observeu informes sobre la conversió dels vostres objectius: evolució a través del temps, ingressos per visita, conversions per referent, per paraula clau, etc.",
         "ProductCategory": "Categoria de Producte",
         "ProductName": "Nom del producte",
         "Products": "Productes",
diff --git a/plugins/Goals/lang/cs.json b/plugins/Goals/lang/cs.json
index 2bc783ebec..8ab39b2406 100644
--- a/plugins/Goals/lang/cs.json
+++ b/plugins/Goals/lang/cs.json
@@ -9,6 +9,7 @@
         "BestCountries": "Země s nejvyšším počtem konverzí jsou:",
         "BestKeywords": "Klíčová slova s nejvyšším počtem konverzí jsou:",
         "BestReferrers": "Odkazující stránky s nejvyšším počtem konverzí jsou:",
+        "CancelAndReturnToGoals": "Zrušit a %svrátit se na seznam cílů%s",
         "CaseSensitive": "shoda s velikostí písmen",
         "ChooseGoal": "Vyberte cíl",
         "ClickOutlink": "Kliknout na odkaz na externí web",
@@ -38,6 +39,7 @@
         "DefaultRevenue": "Výchozí příjem cíle je",
         "DefaultRevenueHelp": "Na příklad kontaktní formulář odeslaný návštěvníkem má průměrnou cenu $10. Piwik vám pomůže dobře pochopit chování skupin uživatelů",
         "DeleteGoalConfirm": "Jste si jisti, že chcete vymazat tento cíl %s?",
+        "Details": "Detaily cíle",
         "DocumentationRevenueGeneratedByProductSales": "Tržby produktu. Nepočítají se daně, poplatky za doručení a slevy.",
         "Download": "Stáhnout soubor",
         "Ecommerce": "Obchody",
@@ -56,29 +58,27 @@
         "GoalIsTriggeredWhen": "Cíl je zaznamenáván, když",
         "GoalName": "Jméno cíle",
         "Goals": "Cíle",
-        "GoalsManagement": "Správa cílů",
         "GoalsOverview": "Přehled cílů",
         "GoalsOverviewDocumentation": "Toto je přehled vašich konverzí cílů. VNe vchozím stavu graf zobrazuje součet všech konverzí. %s Pod grafem jsou zobrazena hlášení pro každý cíl. Můžete je zvětšit kliknutím, pokud chcete.",
         "GoalX": "Cíl: %s",
         "HelpOneConversionPerVisit": "Pokud byla stránka odpovídající cíli při návštěvě obnovena nebo zobrazena vícekrát, bude cíl započítán pouze jednou a to při prvním zobrazení.",
         "IsExactly": "je přesně %s",
-        "LearnMoreAboutGoalTrackingDocumentation": "Více o %s sledování cílů %s se dozvíte v uživatelské dokumentaci Piwiku.",
+        "LearnMoreAboutGoalTrackingDocumentation": "Více o sledování cílu se dozvíte v %suživatelské dokumentaci%s.",
         "LeftInCart": "%s Zbylo v košíku",
+        "ManageGoals": "Spravovat cíle",
+        "ManageGoalsOrCreateANewGoal": "%sSpravovat cíle%s nebo ho vytvořte.",
         "Manually": "ručně",
         "ManuallyTriggeredUsingJavascriptFunction": "Cíl je ručně zaznamenáván pomocí JavaScriptového API trackGoal()",
         "MatchesExpression": "odpovídá %s",
-        "NewGoalDescription": "Cíl v Pišiku je vaše strategie, vaše prioria a může to být spousta věcí (stažená brožura, přihlášený odběr spravodaje, stránavštívenánka services.html atd.).",
         "NewGoalIntro": "Sledování konverzního poměru cílů je jeden z nejefektivnějších způsobů měření a zlepšování podnikatelských zájmů.",
-        "NewGoalYouWillBeAbleTo": "Budete schopni zobrazit a analyzovat výsledky pro každý cíl, což vám umožní dozvědět se, jak zvýšit počet konverzí, konverznípoměr a příjem z každé návštěvy.",
         "NewVisitorsConversionRateIs": "Poměr konverze nové příchozích uživatelů je %s",
-        "NewWhatDoYouWantUsersToDo": "Co mají uživatelé na vašich stránkách dělat?",
         "NoGoalsNeedAccess": "Pouze administrátor nebo uživatel s právy super uživatele může přidat cíle pro danou webovou stránku. Požádejte svého administrátora, aby cíl pro vaše webové stránky přidal. <br>Sledování cílů pomáhá porozumět a maximalizovat výkon vašich stránek.",
         "Optional": "(volitelné)",
         "OverallConversionRate": "%s celková frekvence konverzí (návštěv se splněným cílem)",
         "OverallRevenue": "%s celkový příjem",
         "PageTitle": "Titulek stránky",
         "Pattern": "Vzor",
-        "PluginDescription": "Vytvořít cíle a zobrazit hlášení o konverzi cílů: vývoj v čase, příjem za návštěvu, konverze za refereru, klíčové slovo, atd.",
+        "PluginDescription": "Vytvořte cíle a sledujte detailní hlášení o jejich konverzích: vývoj v čase, příjem za návštěvu, konverze prro referrer, pro klíčové slovo a více.",
         "ProductCategory": "Kategorie produktu",
         "ProductName": "Název produktu",
         "Products": "Produktů",
@@ -86,6 +86,7 @@
         "ReturningVisitorsConversionRateIs": "Poměr konverze navracejících se uživatelů je %s",
         "SendEvent": "Poslat událost",
         "SingleGoalOverviewDocumentation": "Toto je přehled konverzí jednoho cíle. %s Linky lze zvětšit kliknutím na ně.",
+        "ThereIsNoGoalToManage": "Pro stránky %s není žádný cíl ke spravování",
         "UpdateGoal": "Aktualizovat cíl",
         "URL": "URL",
         "ViewAndEditGoals": "Zobrazit a editovat cíle",
diff --git a/plugins/Goals/lang/da.json b/plugins/Goals/lang/da.json
index 609f37db45..aba18e322b 100644
--- a/plugins/Goals/lang/da.json
+++ b/plugins/Goals/lang/da.json
@@ -38,6 +38,7 @@
         "DefaultRevenue": "Målets standard indtægter er",
         "DefaultRevenueHelp": "F.eks. en kontaktformular sendt af en besøgende kan være 10 kr. værd i gennemsnit. Piwik vil hjælpe dig med at forstå, hvor godt dine besøgssegmenter klarer sig.",
         "DeleteGoalConfirm": "Bekræft sletning af mål %s?",
+        "Details": "Mål detaljer",
         "DocumentationRevenueGeneratedByProductSales": "Produktsalg. Omfatter ikke moms, forsendelse og rabat",
         "Download": "Henter en fil",
         "Ecommerce": "E-handel",
@@ -56,7 +57,6 @@
         "GoalIsTriggeredWhen": "Målet er opfyldt, når",
         "GoalName": "Navn",
         "Goals": "Mål",
-        "GoalsManagement": "Mål administration",
         "GoalsOverview": "Måloversigt",
         "GoalsOverviewDocumentation": "Oversigt over dine målkonverteringer. I første omgang viser diagrammet summen af alle konverteringer. %s Under diagrammet, kan du se konverteringsrapporter for hvert af dine mål. Minidiagrammer kan udvides ved at klikke på dem.",
         "GoalX": "Mål %s",
@@ -64,21 +64,19 @@
         "IsExactly": "er nøjagtig %s",
         "LearnMoreAboutGoalTrackingDocumentation": "Lær mere om %s sporingsmål i Piwik%s i brugerdokumentationen.",
         "LeftInCart": "%s tilbage i kurven",
+        "ManageGoals": "Administrer mål",
+        "ManageGoalsOrCreateANewGoal": "%sAdministrer mål%s eller opret et nyt mål nu!",
         "Manually": "manuelt",
         "ManuallyTriggeredUsingJavascriptFunction": "Målet udløses manuelt ved hjælp af JavaScript API trackGoal ()",
         "MatchesExpression": "matcher udtrykket %s",
-        "NewGoalDescription": "Et mål i Piwik er din strategi, din prioritet, og kan betyde mange ting: \"Hentet brochure\", \"Registreret nyhedsbrev\", \"Besøgt side services.html\", osv.",
         "NewGoalIntro": "Sporing af målkonvertering er et af de mest effektive måder at måle og forbedre dine forretningsmæssige målsætninger.",
-        "NewGoalYouWillBeAbleTo": "Du vil kunne se og analysere dine præstationer for hvert mål, og lære hvordan man kan øge konverteringer, konverteringsfrekvenser og indtægter pr besøg.",
         "NewVisitorsConversionRateIs": "Nye besøgendes konverteringsrate er %s",
-        "NewWhatDoYouWantUsersToDo": "Hvad vil du have dine brugere til at gøre på din hjemmeside?",
         "NoGoalsNeedAccess": "Kun en administrator eller en bruger med superbruger adgang kan tilføje mål for et bestemt websted. Spørg din Piwik administratore om at opstille et mål for dit websted. <br>Sporing mål er en fantastisk måde til at forstå og maksimere dit websteds effektivitet!",
         "Optional": "(valgfri)",
         "OverallConversionRate": "%s samlet konverteringsrate (besøg med et færdigt mål)",
         "OverallRevenue": "%s samlede indtægter",
         "PageTitle": "sidetitel",
         "Pattern": "Mønster",
-        "PluginDescription": " Opret mål og se rapporter om målkonverteringer: udvikling over tid, indtjening pr besøg, konverteringer pr referer, for hvert enkelt søgeord osv.",
         "ProductCategory": "Produktkategori",
         "ProductName": "Produktnavn",
         "Products": "Produkter",
@@ -86,6 +84,7 @@
         "ReturningVisitorsConversionRateIs": "Tilbagevendende besøgendes konverteringsrate er %s",
         "SendEvent": "Send en hændelse",
         "SingleGoalOverviewDocumentation": "Oversigt over konverteringer for et enkelt mål. %s Minidiagrammer under diagrammet kan forstørres ved at klikke på dem.",
+        "ThereIsNoGoalToManage": "Der er ingen mål at administrere for hjemmeside %s",
         "UpdateGoal": "Opdater mål",
         "URL": "Netadresse",
         "ViewAndEditGoals": "Vis og rediger mål",
diff --git a/plugins/Goals/lang/de.json b/plugins/Goals/lang/de.json
index ce48ac4bea..1de455641d 100644
--- a/plugins/Goals/lang/de.json
+++ b/plugins/Goals/lang/de.json
@@ -9,6 +9,7 @@
         "BestCountries": "Beste Umsätze nach Länder:",
         "BestKeywords": "Beste Umsätze nach Suchbegriffen:",
         "BestReferrers": "Beste Umsätze nach verweisenden Webseiten:",
+        "CancelAndReturnToGoals": "Abbrechen und %szur Liste der Ziele zurückkehren%s",
         "CaseSensitive": "Groß-\/Kleinschreibung beachten",
         "ChooseGoal": "Ziel wählen",
         "ClickOutlink": "auf einen Link zu einer externen Webseite geklickt wird",
@@ -38,6 +39,7 @@
         "DefaultRevenue": "Standard Zielumsatz ist",
         "DefaultRevenueHelp": "Das Absenden eines Kontaktformulars durch einen Besucher kann zum Beispiel durchschnittlich 10 € wert sein. Piwik hilft Ihnen, zu verstehen, wie sich Ihre Besucher-Segmente verhalten.",
         "DeleteGoalConfirm": "Wollen sie wirklich das Ziel %s löschen?",
+        "Details": "Ziel-Details",
         "DocumentationRevenueGeneratedByProductSales": "Verkaufsumsatz ohne Steuer, Versand und Rabatt",
         "Download": "eine Datei herunterladen wird",
         "Ecommerce": "Ecommerce",
@@ -56,7 +58,6 @@
         "GoalIsTriggeredWhen": "Ziel ist erreicht, wenn",
         "GoalName": "Name des Ziels",
         "Goals": "Ziele",
-        "GoalsManagement": "Ziel-Management",
         "GoalsOverview": "Ziel-Übersicht",
         "GoalsOverviewDocumentation": "Dies ist eine Übersicht über die Ziel-Konversionen. Zu Beginn zeigt der Graph die Summe aller Konversionen an. %s Darunter können Sie die Berichte zu Konversionen der einzelnen Ziele sehen. Die Sparklines (kleine Graphen) können durch Klicken vergrößert werden.",
         "GoalX": "Ziel %s",
@@ -64,21 +65,20 @@
         "IsExactly": "ist genau %s",
         "LearnMoreAboutGoalTrackingDocumentation": "Mehr zum Thema %s Erfassen von Zielen in Piwik%s erfahren Sie in der Dokumentation.",
         "LeftInCart": "%s im Warenkorb gelassen",
+        "ManageGoals": "Ziele verwalten",
+        "ManageGoalsOrCreateANewGoal": "%sZiele verwalten%s oder ein neues Ziel erstellen!",
         "Manually": "manuell",
         "ManuallyTriggeredUsingJavascriptFunction": "Ziel wird manuell über die trackGoal() Funktion der Javascript-API auf erfüllt gesetzt",
         "MatchesExpression": "entspricht dem Ausdruck %s",
-        "NewGoalDescription": "Ein Ziel in Piwik ist Ihre Strategie, Ihr angestrebtes Ergebnis, und kann viele Dinge einschliessen: \"Broschüre heruntergeladen\", \"Newsletter registiert\", \"Seite Leistungen.html besucht\", usw.",
         "NewGoalIntro": "Tracken von Konversions-Zielen ist eine der effizientesten Möglichkeiten zur Messung und Verbesserung Ihrer geschäftlichen Ziele.",
-        "NewGoalYouWillBeAbleTo": "Sie werden in der Lage sein, Ihre Performance für jedes Ziel zu sehen und zu analysieren, und zu lernen, wie Konversionen, Konversionsraten und Umsätze pro Besuch gesteigert werden können.",
         "NewVisitorsConversionRateIs": "Umsätze pro neuem Besucher: %s",
-        "NewWhatDoYouWantUsersToDo": "Was möchten Sie, dass die Benutzer auf ihrer Webseite machen?",
         "NoGoalsNeedAccess": "Nur ein (Haupt-)Administrator kann Ziele für eine gegebene Webseite hinzufügen. Bitte fragen Sie ihren Piwik Administrator, um Ziele für ihre Webseite aufzustellen. <br> Tracking Ziele sind ein großartiger Weg, ihre Webseite-Performance zu verstehen und zu maximieren!",
         "Optional": "(optional)",
         "OverallConversionRate": "%s Gesamtkonversionsrate (Besuche mit einem erreichten Ziel)",
         "OverallRevenue": "%s Gesamtumsatz",
         "PageTitle": "Seitentitel",
         "Pattern": "Muster",
-        "PluginDescription": "Erstellen Sie Ziele und schauen Sie sich dann Berichte über Ihre Ziel-Konversion an: Verhalten über die Zeit, Umsatz pro Besuch, Konversion je Zugriff, je Suchbegriff, etc.",
+        "PluginDescription": "Erstellen Sie Ziele und sehen Sie detaililerte Berichte über Ihre Zielkonversionen: Entwicklung über einen bestimmten Zeitrau, Umsatz pro Besuch, Konversionen pro Verweis, pro Suchbegriff, und mehr.",
         "ProductCategory": "Produktkategorie",
         "ProductName": "Produktname",
         "Products": "Produkte",
@@ -86,6 +86,7 @@
         "ReturningVisitorsConversionRateIs": "Umsätze pro wiederkehrendem Besucher: %s",
         "SendEvent": "Ein Ereignis auslösen",
         "SingleGoalOverviewDocumentation": "Dies ist eine Übersicht über die Konversionen eines einzelnen Ziels. %s Die Sparklines (kleine Graphen) können durch Klicken vergrößert werden.",
+        "ThereIsNoGoalToManage": "Es gibt keine zu verwaltende Ziele für dir Webseite %s",
         "UpdateGoal": "Ziel aktualisieren",
         "URL": "URL",
         "ViewAndEditGoals": "Ziele anzeigen und bearbeiten",
diff --git a/plugins/Goals/lang/el.json b/plugins/Goals/lang/el.json
index 4d34457625..9968b8a605 100644
--- a/plugins/Goals/lang/el.json
+++ b/plugins/Goals/lang/el.json
@@ -9,6 +9,7 @@
         "BestCountries": "Οι καλύτερες χώρες μετατροπής είναι:",
         "BestKeywords": "Οι κορυφαίες λέξεις-κλειδιά μετατροπής είναι:",
         "BestReferrers": "Οι καλύτεροι αναφορείς ιστοσελίδων μετατροπής είναι:",
+        "CancelAndReturnToGoals": "Ακύρωση και %sεπιστροφή στη λίστα στόχων%s",
         "CaseSensitive": "Ταίριασμα πεζών-κεφαλαίων",
         "ChooseGoal": "Επιλέξτε Στόχο",
         "ClickOutlink": "Το πάτημα Συνδέσμου προς εξωτερική ιστοσελίδα",
@@ -38,6 +39,7 @@
         "DefaultRevenue": "Η προεπιλεγμένη πρόσοδος του στόχου είναι",
         "DefaultRevenueHelp": "Για παράδειγμα, μια Φόρμα Επικοινωνίας που υποβλήθηκε από έναν επισκέπτη μπορεί να αξίζει 10€ κατά μέσο όρο. Το Piwik θα σας βοηθήσει να καταλάβετε πως λειτουργούν τα τμήματα των χρηστών σας.",
         "DeleteGoalConfirm": "Είστε σίγουροι ότι θέλετε να διαγράψετε το Στόχο %s;",
+        "Details": "Λεπτομέρειες στόχου",
         "DocumentationRevenueGeneratedByProductSales": "Πωλήσεις προϊόντος. Χωρίς φόρο, μεταφορικά και έκπτωση",
         "Download": "Τη λήψη ενός αρχείου",
         "Ecommerce": "Ηλεκτρονικό Εμπόριο",
@@ -56,7 +58,6 @@
         "GoalIsTriggeredWhen": "Ο Στόχος ενεργοποιείτε όταν",
         "GoalName": "Ονομασία Στόχου",
         "Goals": "Στόχοι",
-        "GoalsManagement": "Διαχείριση στόχων",
         "GoalsOverview": "Επισκόπηση στόχων",
         "GoalsOverviewDocumentation": "Αυτό είναι μια επισκόπηση των μετατροπών των στόχων σας. Αρχικά, το διάγραμμα δείχνει το άθροισμα όλων των μετατροπών. %s Κάτω από το διάγραμμα, μπορείτε να αναφορές μετατροπής για κάθε έναν από τους στόχους. Τα μικροδιαγράμματα μπορούν να μεγεθυνθούν πατώντας επάνω τους.",
         "GoalX": "Στόχος %s",
@@ -64,21 +65,20 @@
         "IsExactly": "είναι ακριβώς %s",
         "LearnMoreAboutGoalTrackingDocumentation": "Μάθετε περισσότερα σχετικά με την %sΠαρακολούθηση Στόχων στο Piwik%s στην τεκμηρίωση για το χρήστη.",
         "LeftInCart": "%s απομένουν στο καλάθι",
+        "ManageGoals": "Διαχείριση των Στόχων",
+        "ManageGoalsOrCreateANewGoal": "%sΔιαχειριστείτε τους Στόχους%s ή δημιουργήστε τώρα έναν νέο!",
         "Manually": "χειροκίνητα",
         "ManuallyTriggeredUsingJavascriptFunction": "Ο Στόχος ενεργοποιείτε χειροκίνητα με χρήση του Javascript API trackGoal()",
         "MatchesExpression": "ταιριάζει στην έκφραση %s",
-        "NewGoalDescription": "Ένας Στόχος στο Piwik είναι η στρατηγική σας, η προτεραιότητά σας και μπορεί να σημαίνει πολλά πράματα: \"Κατεβασμένα φυλλάδια\", \"Εγγεγραμμένα νέα\", \"Επισκέψεις στη σελίδα services.html\", κτλ.",
         "NewGoalIntro": "Η παρακολούθηση για τη Μετατροπή Στόχων είναι ένας από τους αποτελεσματικότερους τρόπους για να μετρήσετε και να βελτιώσετε τους στόχους της επιχείρησής σας.",
-        "NewGoalYouWillBeAbleTo": "Θα μπορείτε να δείτε και να αναλύσετε την απόδοση κάθε Στόχου και να μάθετε πως να αυξήσετε τις μετατροπές, ρυθμό μετατροπών και κέρδος ανά επίσκεψη.",
         "NewVisitorsConversionRateIs": "Ο βαθμός μετατροπής νέων επισκεπτών είναι %s",
-        "NewWhatDoYouWantUsersToDo": "Τι θέλετε οι χρήστες σας να κάνουν στον ιστοτόπο σας;",
         "NoGoalsNeedAccess": "Μόνο ο Διαχειριστής ή ένας χρήστης με δικαίωμα Υπερ-Χρήστη μπορεί να προσθέσει Στόχους για ένα συγκεκριμένο ιστοτόπο. Παρακαλούμε ζητήστε από τον διαχειριστή του Piwik να προσθέσει ένα Στόχο για τον ιστοτόπο σας.<br \/>Η Παρακολούθηση Στόχων είναι ένας εξαιρετικός τρόπος για να κατανοήσετε και να μεγιστοποιήσετε την απόδοση του ιστοτόπου σας!",
         "Optional": "(προαιρετικό)",
         "OverallConversionRate": "%s καθολικός βαθμός προσόδου (επισκέψεις με έναν πλήρη στόχο)",
         "OverallRevenue": "%s καθολική πρόσοδος",
         "PageTitle": "Τίτλος Σελίδας",
         "Pattern": "Υπόδειγμα",
-        "PluginDescription": "Δημιουργήστε Στόχους και δείτε αναφορές για τις μετατροπές των στόχων σας: εξέλιξη στο χρόνο, πρόσοδος ανά επίσκεψη, μετατροπές ανά αναφορέα, ανά κλειδί, κλπ.",
+        "PluginDescription": "Δημιουργήστε Στόχους και δείτε λεπτομερείς αναφορές σχετικά με τις μετατροπές Στόχων: εξέλιξη με το χρόνο, μετατροπές ανά αναφορέα, ανά λέξη κλειδί και άλλα πολλά.",
         "ProductCategory": "Κατηγορία Προϊόντος",
         "ProductName": "Όνομα Προϊόντος",
         "Products": "Προϊόντα",
@@ -86,6 +86,7 @@
         "ReturningVisitorsConversionRateIs": "Ο βαθμός μετατροπής επιστρεφόμενων επισκεπτών είναι %s",
         "SendEvent": "Αποστολή συμβάντος",
         "SingleGoalOverviewDocumentation": "Αυτή είναι μια επισκόπηση των μετατροπών για ένα μόνο στόχο. %s Τα μικροδιαγράμματα κάτω από το διάγραμμα μπορούν να μεγεθυνθούν πατώντας επάνω τους.",
+        "ThereIsNoGoalToManage": "Δεν υπάρχει στόχος για να διαχειριστείτε για τον ιστοτόπο %s",
         "UpdateGoal": "Ενημέρωση Στόχου",
         "URL": "URL",
         "ViewAndEditGoals": "Προβολή και Επεξεργασία Στόχων",
diff --git a/plugins/Goals/lang/en.json b/plugins/Goals/lang/en.json
index 89da8e06a6..19dbc0d4c0 100644
--- a/plugins/Goals/lang/en.json
+++ b/plugins/Goals/lang/en.json
@@ -10,6 +10,7 @@
         "BestKeywords": "Your top converting keywords are:",
         "BestReferrers": "Your best converting websites referrers are:",
         "CaseSensitive": "Case sensitive match",
+        "CancelAndReturnToGoals": "Cancel and %sreturn to the list of goals%s",
         "ChooseGoal": "Choose Goal",
         "ClickOutlink": "Click on a Link to an external website",
         "SendEvent": "Send an event",
@@ -35,6 +36,7 @@
         "ConversionsOverviewBy": "Conversions overview by type of visit",
         "CreateNewGOal": "Create a new Goal",
         "DaysToConv": "Days to Conversion",
+        "Details": "Goal details",
         "DefaultGoalConvertedOncePerVisit": "(default) Goal can only be converted once per visit",
         "DefaultRevenue": "Goal default revenue is",
         "DefaultRevenueHelp": "For example, a Contact Form submitted by a visitor may be worth $10 on average. Piwik will help you understand how well your visitors segments are performing.",
@@ -57,35 +59,34 @@
         "GoalIsTriggeredWhen": "Goal is triggered when",
         "GoalName": "Goal Name",
         "Goals": "Goals",
-        "GoalsManagement": "Goals management",
+        "ManageGoals": "Manage Goals",
         "GoalsOverview": "Goals Overview",
         "GoalsOverviewDocumentation": "This is an overview of your goal conversions. Initially, the graph shows the sum of all conversions. %s Below the graph, you can see conversion reports for each of your goals. The sparklines can be enlarged by clicking on them.",
         "GoalX": "Goal %s",
         "HelpOneConversionPerVisit": "If a Page matching this Goal is refreshed or viewed more than once in a Visit, the Goal will only be tracked the first time the page was loaded during this visit.",
         "IsExactly": "is exactly %s",
-        "LearnMoreAboutGoalTrackingDocumentation": "Learn more about %s Tracking Goals in Piwik%s in the user documentation, or create a Goal now!",
+        "LearnMoreAboutGoalTrackingDocumentation": "Learn more about %s Tracking Goals in Piwik%s in the user documentation.",
         "LeftInCart": "%s left in cart",
+        "ManageGoalsOrCreateANewGoal": "%sManage Goals%s or create a new Goal now!",
         "Manually": "manually",
         "ManuallyTriggeredUsingJavascriptFunction": "Goal is manually triggered using the JavaScript API trackGoal()",
         "MatchesExpression": "matches the expression %s",
-        "NewGoalDescription": "A Goal in Piwik is your strategy, your priority, and can entail many things: \"Downloaded brochure\", \"Registered newsletter\", \"Visited page services.html\", etc.",
         "NewGoalIntro": "Goal Conversion tracking is one of the most efficient ways to measure and improve your business objectives.",
-        "NewGoalYouWillBeAbleTo": "You will be able to view and analyse your performance for each Goal, and learn how to increase conversions, conversion rates and revenue per visit.",
         "NewVisitorsConversionRateIs": "New visitors conversion rate is %s",
-        "NewWhatDoYouWantUsersToDo": "What do you want your users to do on your website?",
         "NoGoalsNeedAccess": "Only an Administrator or a user with Super User access can add Goals for a given website. Please ask your Piwik administrator to set up a Goal for your website. <br>Tracking Goals is a great way to help understand and maximize your website performance!",
         "Optional": "(optional)",
         "OverallConversionRate": "%s overall conversion rate (visits with a completed goal)",
         "OverallRevenue": "%s overall revenue",
         "PageTitle": "Page Title",
         "Pattern": "Pattern",
-        "PluginDescription": "Create Goals and see reports about your goal conversions: evolution over time, revenue per visit, conversions per referrer, per keyword, etc.",
+        "PluginDescription": "Create Goals and see detailed reports about your goal conversions: evolution over time, revenue per visit, conversions per referrer, per keyword, and more.",
         "ProductCategory": "Product Category",
         "ProductName": "Product Name",
         "Products": "Products",
         "ProductSKU": "Product SKU",
         "ReturningVisitorsConversionRateIs": "Returning visitors conversion rate is %s",
         "SingleGoalOverviewDocumentation": "This is an overview of the conversions for a single goal. %s The sparklines below the graph can be enlarged by clicking on them.",
+        "ThereIsNoGoalToManage": "There is no goal to manage for website %s",
         "UpdateGoal": "Update Goal",
         "URL": "URL",
         "ViewAndEditGoals": "View and Edit Goals",
diff --git a/plugins/Goals/lang/es.json b/plugins/Goals/lang/es.json
index bd78837b19..5c0976620b 100644
--- a/plugins/Goals/lang/es.json
+++ b/plugins/Goals/lang/es.json
@@ -56,7 +56,6 @@
         "GoalIsTriggeredWhen": "Objetivo activado cuando",
         "GoalName": "Nombre del Objetivo",
         "Goals": "Objetivos",
-        "GoalsManagement": "Administración de objetivos",
         "GoalsOverview": "Vista de objetivos",
         "GoalsOverviewDocumentation": "Esta es la información general de las conversiones de sus objetivos. Inicialmente, el gráfico muestra la suma de todas las conversiones. %s Debajo del gráfico, usted puede ver los reportes de conversiones para cada uno de sus objetivos. Los gráficos pueden ser agrandados haciendo clic en ellos.",
         "GoalX": "Objetivos %s",
@@ -66,18 +65,14 @@
         "Manually": "manualmente",
         "ManuallyTriggeredUsingJavascriptFunction": "Los Objetivos son manualmente activados usando la API Javascript trackGoal()",
         "MatchesExpression": "coincide con la expresión %s",
-        "NewGoalDescription": "Una Meta en Piwik es tu estrategia, tu prioridad, y puede consistir en muchas cosas: \"Folleto descargado\", \"Registro a la Newsletter\", \"Visitas a la página servicios.html\", etc.",
         "NewGoalIntro": "El seguimiento de las conversiones del objetivo es una de las maneras más eficaces para medir y mejorar las metas de negocio.",
-        "NewGoalYouWillBeAbleTo": "Podrás ver y analizar los resultados de cada objetivo y aprender a aumentar las conversiones, la tasa de conversión, e ingresos por visitas.",
         "NewVisitorsConversionRateIs": "La tasa de visitantes nuevos es %s",
-        "NewWhatDoYouWantUsersToDo": "¿Qué quieres que tus usuarios hagan en tu sitio web?",
         "NoGoalsNeedAccess": "Sólo un Administrador o un usuario con acceso Super User puede añadir Objetivos para un determinado sitio web. Pide a tu administrador de Piwik que configure un Objetivo para tu sitio web.<br>El seguimiento de los Objetivos es una buena manera para ayudar a entender y maximizar el rendimiento de tu sitio web!",
         "Optional": "(opcional)",
         "OverallConversionRate": "%s tasa global de la conversión (visitas con un objetivo terminado)",
         "OverallRevenue": "%s ingresos totales",
         "PageTitle": "Título de la Página",
         "Pattern": "Patrón",
-        "PluginDescription": "Crear Objetivos y ver informes acerca de las conversiones de su objetivo: evolución en el tiempo, los ingresos por visita, conversiones por referente, por palabra clave, etc",
         "ProductCategory": "Categoría del Producto",
         "ProductName": "Nombre del Producto",
         "Products": "Productos",
diff --git a/plugins/Goals/lang/et.json b/plugins/Goals/lang/et.json
index 32a485f663..37e9c206fb 100644
--- a/plugins/Goals/lang/et.json
+++ b/plugins/Goals/lang/et.json
@@ -38,7 +38,6 @@
         "GoalIsTriggeredWhen": "Eesmärk käivitub kui",
         "GoalName": "Eesmärgi nimi",
         "Goals": "Eesmärgid",
-        "GoalsManagement": "Eesmärkide haldus",
         "GoalsOverview": "Eesmärkide ülevaade",
         "GoalX": "Eesmärk %s",
         "IsExactly": "on täpselt %s",
diff --git a/plugins/Goals/lang/eu.json b/plugins/Goals/lang/eu.json
index 59e3e2ff87..f9a8ae151d 100644
--- a/plugins/Goals/lang/eu.json
+++ b/plugins/Goals/lang/eu.json
@@ -13,7 +13,6 @@
         "Filename": "fitxategi-izena",
         "GoalName": "Helburu-izena",
         "Goals": "Helburuak",
-        "GoalsManagement": "Helburuen kudeaketa",
         "GoalsOverview": "Helburuen ikuspegi orokorra",
         "GoalX": "%s helburua",
         "Optional": "(aukerazkoa)",
diff --git a/plugins/Goals/lang/fa.json b/plugins/Goals/lang/fa.json
index 464dc1b238..0c25052dc8 100644
--- a/plugins/Goals/lang/fa.json
+++ b/plugins/Goals/lang/fa.json
@@ -48,7 +48,6 @@
         "GoalIsTriggeredWhen": "هدف این است که باعث زمانی که",
         "GoalName": "اسم هدف",
         "Goals": "اهداف",
-        "GoalsManagement": "مدیریت اهداف",
         "GoalsOverview": "بررسی اجمالی اهداف",
         "GoalX": "هدف %s",
         "HelpOneConversionPerVisit": "اگر این صفحه را مطابق این هدف تجدید و یا مشاهده بیش از یک بار در یک دیدار، تنها هدف دنبال می شود اولین بار در طول این سفر پر شد.",
@@ -58,13 +57,11 @@
         "ManuallyTriggeredUsingJavascriptFunction": "هدف این است که دستی باعث شده با استفاده از JavaScript در مرورگر شما API trackGoal ()",
         "MatchesExpression": "با عبارت %s تطابق دارد",
         "NewVisitorsConversionRateIs": "نرخ تبدیلات بازدیدکنندگان جدید %s است",
-        "NewWhatDoYouWantUsersToDo": "شما دوست دارید مخاطبانتان چه کاری را در سایت شما انجام دهند؟",
         "Optional": "(اختیاری)",
         "OverallConversionRate": "%s نرخ تبدیل کلی (بازدید به هدف رسیده)",
         "OverallRevenue": "تمام درآمد %s",
         "PageTitle": "عنوان صفحه",
         "Pattern": "الگو",
-        "PluginDescription": "اهداف را ایجاد کنید و گزارشات را در مورد تبدیلات هدف خود ببینید: تکامل در طول زمان، درآمد در هر بازدید، تبدیلات در هر ارجاع، در هر کلمه کلیدی، و غیره.",
         "ProductCategory": "دسته محصول",
         "ProductName": "نام محصول",
         "Products": "محصولات",
diff --git a/plugins/Goals/lang/fi.json b/plugins/Goals/lang/fi.json
index 24e5751f5b..029e31d32c 100644
--- a/plugins/Goals/lang/fi.json
+++ b/plugins/Goals/lang/fi.json
@@ -56,7 +56,6 @@
         "GoalIsTriggeredWhen": "Tavoite on saavutettu kun",
         "GoalName": "Tavoitteen nimi",
         "Goals": "Tavoitteet",
-        "GoalsManagement": "Tavoitteiden hallinta",
         "GoalsOverview": "Tavoitteiden yleiskatsaus",
         "GoalsOverviewDocumentation": "Tämä on tavoitteiden saavuttamisen yleiskatsaus. Aluksi kuvaaja näyttää kaikkien tavoitteiden saavuttamisten summan. %s Kuvaajan alla näet raportit jokaiselle tavoitteelle. Pienet kuvaajat suurenevat klikkaamalla.",
         "GoalX": "Tavoite %s",
@@ -66,18 +65,14 @@
         "Manually": "manuaalisesti",
         "ManuallyTriggeredUsingJavascriptFunction": "Tavoite on manuaalisesti asetettu JavaScript-API:n trackGoal():lla",
         "MatchesExpression": "täsmää lausekkeseen %s",
-        "NewGoalDescription": "Tavoite Piwikissä on sinun strategiasi ja prioriteettisi ja voi sisältää monia asioita: \"Esitteen lataaminen\", \"Uutiskirjeen tilaus\", \"Kävi sivupalveluissa.html\" jne.",
         "NewGoalIntro": "Konversion seuranta on yksi tehokkaimmista tavoista mitata ja kehittää yrityksesi päämääriä.",
-        "NewGoalYouWillBeAbleTo": "Voit analysoida suoritustasi jokaisen Tavoitteen osalta ja oppia, miten voit lisätä konversioita, konversiolukuja ja tuottoa per käynti.",
         "NewVisitorsConversionRateIs": "Uusien kävijöiden siirtymäaste on %s",
-        "NewWhatDoYouWantUsersToDo": "Mitä haluat kävijöiden tekevän verkkosivullasi?",
         "NoGoalsNeedAccess": "Vain Ylläpitäjä tai Superkäyttäjä voi lisätä Tavoitteita tietylle verkkosivulle. Pyydä Ylläpitäjää asettamaan Tavoite verkkosivullesi. <br>Tavoitteiden seuranta on loistava tapa ymmärtää sekä maksimoida verkkosivusi suoritus!",
         "Optional": "(vapaavalintainen)",
         "OverallConversionRate": "%s yleinen siirtymisaste (käynti jossa täytetään tavoite)",
         "OverallRevenue": "%s yleistuotto",
         "PageTitle": "Sivun otsikko",
         "Pattern": "Malli",
-        "PluginDescription": "Luo tavoitteita ja katso raportteja: muutokset, tulot per käynti, siirtymisiä per viittaaja, per hakusana jne.",
         "ProductCategory": "Tuotteen kategoria",
         "ProductName": "Tuotteen nimi",
         "Products": "Tuotteet",
diff --git a/plugins/Goals/lang/fr.json b/plugins/Goals/lang/fr.json
index 28e8430bea..61b3ccd469 100644
--- a/plugins/Goals/lang/fr.json
+++ b/plugins/Goals/lang/fr.json
@@ -56,29 +56,23 @@
         "GoalIsTriggeredWhen": "L'objectif est déclenché quand",
         "GoalName": "Nom de l'objectif",
         "Goals": "Objectifs",
-        "GoalsManagement": "Gestion des Objectifs",
         "GoalsOverview": "Vue d'ensemble des Objectifs",
         "GoalsOverviewDocumentation": "Ceci est un aperçu de vos conversions d'objectifs. Initialement, le graphique, affiche la somme des conversions. %s Sous le graphique, vous pouvez voir les rapports de conversion pour chacun de vos objectifs. Les lignes de tendance peuvent être agrandies en cliquant dessus.",
         "GoalX": "Objectif %s",
         "HelpOneConversionPerVisit": "Si une page correspondant à cet objectif est actualisée ou vue plus d'une fois lors d'une visite, l'objectif ne pourra être suivi que la première fois la page a été chargée au cours de cette visite.",
         "IsExactly": "est exactement %s",
-        "LearnMoreAboutGoalTrackingDocumentation": "Apprenez en plus sur comment %s Suivre les Objectifs dans Piwik%s dans la documentation utilisateur.",
         "LeftInCart": "%s laissé(s) dans le panier",
         "Manually": "manuellement",
         "ManuallyTriggeredUsingJavascriptFunction": "Les objectifs sont déclenchés manuellement en utilisant l'API Javascript trackGoal()",
         "MatchesExpression": "correspond à l'expression %s",
-        "NewGoalDescription": "Dans Piwik, un objectif représente votre stratégie, votre priorité, et peut comporter plusieurs choses: \"Télécharger la brochure\", \"S'enregistrer à la newsletter\", \"Visiter la page services.html\", etc.",
         "NewGoalIntro": "Le suivi de la conversion des objectifs et une des manières les plus efficaces de mesurer et améliorer vos objectifs d'affaires.",
-        "NewGoalYouWillBeAbleTo": "Vous serez en capacité de visualiser et d'analyser vos performances pour chaque objectif, et d'apprendre comment augmenter vos conversions, taux de conversion et revenu par visite.",
         "NewVisitorsConversionRateIs": "Le taux de conversion des nouveaux visiteurs est %s",
-        "NewWhatDoYouWantUsersToDo": "Que voulez-vous que vos visiteurs accomplissent sur votre site web ?",
         "NoGoalsNeedAccess": "Uniquement un Administrateur ou un utilisateur avec un accès Super Utilisateur peut ajouter des Objectifs à un site donné. Veuillez demander à votre administrateur Piwik de mettre en place un Objectif pour votre site web. <br \/>Le suivit d'Objectifs est une bonne manière de mieux comprendre et de maximiser les performances de votre site web!",
         "Optional": "(optionnel)",
         "OverallConversionRate": "%s taux de conversion global (visites avec un objectif rempli)",
         "OverallRevenue": "%s revenu global",
         "PageTitle": "Titre de la page",
         "Pattern": "Modèle",
-        "PluginDescription": "Créer des objectifs et consulter les rapports sur vos conversions d'objectifs : évolution au cours du temps, revenu par visite, conversion par référent, par mot-clé, etc.",
         "ProductCategory": "Catégorie du produit",
         "ProductName": "Nom du produit",
         "Products": "Produits",
diff --git a/plugins/Goals/lang/hi.json b/plugins/Goals/lang/hi.json
index 51dc3e5e0c..99928dd8cb 100644
--- a/plugins/Goals/lang/hi.json
+++ b/plugins/Goals/lang/hi.json
@@ -55,7 +55,6 @@
         "GoalIsTriggeredWhen": "जब लक्ष्य सक्रिय हो रहा है",
         "GoalName": "लक्ष्य नाम",
         "Goals": "लक्ष्य",
-        "GoalsManagement": "लक्ष्य प्रबंधन",
         "GoalsOverview": "लक्ष्य अवलोकन",
         "GoalsOverviewDocumentation": "यह अपने लक्ष्य रूपांतरण का अवलोकन है. प्रारंभ में, ग्राफ सभी रूपांतरणों की राशि को दर्शाता है. ग्राफ नीचे %s, आप अपने लक्ष्यों में से प्रत्येक के लिए रूपांतरण रिपोर्ट देख सकते हैं. स्पार्कलाइन उन पर क्लिक करके विस्तारित किया जा सकता है.",
         "GoalX": "लक्ष्य %s",
@@ -65,17 +64,13 @@
         "Manually": "मैन्युअल रूप से",
         "ManuallyTriggeredUsingJavascriptFunction": "लक्ष्य मैन्युअली जावास्क्रिप्ट एपीआई trackGoal () का उपयोग शुरू हो रहा है",
         "MatchesExpression": "%s अभिव्यक्ति से मेल खाता है",
-        "NewGoalDescription": "Piwik में एक लक्ष्य अपनी रणनीति, अपनी प्राथमिकता है, और बहुत सी बातें आवश्यक कर सकते हैं: \"डाउनलोड विवरणिका\", \"पंजीकृत समाचार पत्र\", आदि, \"पृष्ठ services.html दौरा\"",
         "NewGoalIntro": "लक्ष्य रूपांतरण ट्रैकिंग अपने व्यापार के लक्ष्यों को मापने के लिए और बेहतर बनाने के लिए सबसे कारगर तरीकों में से एक है.",
-        "NewGoalYouWillBeAbleTo": "यदि आप प्रत्येक लक्ष्य के लिए अपने प्रदर्शन को को देखने और विश्लेषण करने में सक्षम हो जाएगा, और रूपांतरण, रूपांतरण दर और यात्रा के प्रति राजस्व में वृद्धि करने के लिए.",
         "NewVisitorsConversionRateIs": "नई आगंतुक रूपांतरण दर %s है",
-        "NewWhatDoYouWantUsersToDo": "आप अपने उपयोगकर्ताओं को अपनी वेबसाइट पर क्या करना चाहते हो?",
         "Optional": "(वैकल्पिक)",
         "OverallConversionRate": "%s कुल रूपांतरण दर (एक पूरा लक्ष्य के साथ दौरा)",
         "OverallRevenue": "%s कुल राजस्व",
         "PageTitle": "पृष्ठ शीर्षक",
         "Pattern": "प्रतिमान",
-        "PluginDescription": "लक्ष्य बनाएं और अपने लक्ष्य रूपांतरण के बारे में रिपोर्ट देखें: समय के साथ विकास यात्रा के प्रति राजस्व, कीवर्ड प्रति संदर्भ प्रति रूपांतरण, आदि",
         "ProductCategory": "उत्पाद श्रेणी",
         "ProductName": "उत्पाद का नाम",
         "Products": "उत्पाद",
diff --git a/plugins/Goals/lang/hu.json b/plugins/Goals/lang/hu.json
index 0e8db12a69..c9fee744ca 100644
--- a/plugins/Goals/lang/hu.json
+++ b/plugins/Goals/lang/hu.json
@@ -26,7 +26,6 @@
         "GoalIsTriggeredWhen": "Célt teljesítettnek tekintjük, ha",
         "GoalName": "Cél elnevezése",
         "Goals": "Célok",
-        "GoalsManagement": "Célok kezelése",
         "GoalsOverview": "Célok áttekintése",
         "GoalX": "%s nevű cél",
         "IsExactly": "megegyezik ezzel: %s",
@@ -38,7 +37,6 @@
         "OverallConversionRate": "%s az összesített konverziós arány (látogatások, melyek során teljesült a cél)",
         "OverallRevenue": "%s összesített bevétel",
         "Pattern": "Egyezési minta",
-        "PluginDescription": "Hozz létre célokat és hogy részlete jelentésekkel rendelkezz a célkonverziókról: tendenciákat, az egy látogatásra jutó bevételt, a hivatkozó források vagy kulcsszavak szerinti konverziókat, stb.",
         "ReturningVisitorsConversionRateIs": "A visszatérő látogatók konverziós aránya %s",
         "UpdateGoal": "Cél frissítése",
         "URL": "URL",
diff --git a/plugins/Goals/lang/id.json b/plugins/Goals/lang/id.json
index 75d9e245b9..b6324697c1 100644
--- a/plugins/Goals/lang/id.json
+++ b/plugins/Goals/lang/id.json
@@ -55,7 +55,6 @@
         "GoalIsTriggeredWhen": "Tujuan terpicu ketika",
         "GoalName": "Nama Tujuan",
         "Goals": "Tujuan",
-        "GoalsManagement": "Pengatur Tujuan",
         "GoalsOverview": "Iktisar Tujuan",
         "GoalsOverviewDocumentation": "Ini adalah iktisar dari konversi tujuan Anda. Pada mulanya, grafik menunjukkan keseluruhan konversi. %s Di bawah grafik, Anda dapat melihat laporan setiap tujuan Anda. Bagan garis dapat diperbesar dengan mengekliknya.",
         "GoalX": "Tujuan %s",
@@ -65,17 +64,13 @@
         "Manually": "manual",
         "ManuallyTriggeredUsingJavascriptFunction": "Tujuan terpicu secara manual menggunakan API JavaScript trackGoal()",
         "MatchesExpression": "sesuai dengan ekspresi %s",
-        "NewGoalDescription": "Sebuah tujuan di Piwik merupakan strategi Anda, prioritas Anda, dan dapat memerlukan banyak hal: \"Unduh brosur\", \"Mendaftar nawala\", \"Mengunjungi halama layanan.html\", dan lain-lain.",
         "NewGoalIntro": "Pelacakan Konversi Tujuan merupakan salah satu cara efisien untuk mengukur dan memperbaiki tujuan usaha Anda.",
-        "NewGoalYouWillBeAbleTo": "Anda akan mampu untuk menampilkan dan menganalisa kinerja Anda untuk setiap Tujuan, dan mempelajari bagaimana meningkatkan konversi, laju konversi, dan pendapatan tiap kunjungan.",
         "NewVisitorsConversionRateIs": "Tingkat pengunjung baru adalah %s",
-        "NewWhatDoYouWantUsersToDo": "Apa yang ingin pengguna Anda lakukan dalam situs Anda?",
         "Optional": "(pilihan)",
         "OverallConversionRate": "%s keseluruhan tingkat konversi (kunjungan dengan tujuan lengkap)",
         "OverallRevenue": "%s pendapatan keseluruhan",
         "PageTitle": "Judul Halaman",
         "Pattern": "Pola",
-        "PluginDescription": "Buat tujuan an lihat laporan tentang tujuan Anda: evolusi sepanjang waktu, pendapatan tiap kunjungan, konversi tiap pengarah, setiap kata kunci, dsb.",
         "ProductCategory": "Kategori Produk",
         "ProductName": "Nama Produk",
         "Products": "Produk",
diff --git a/plugins/Goals/lang/is.json b/plugins/Goals/lang/is.json
index 77112854c2..7da754085f 100644
--- a/plugins/Goals/lang/is.json
+++ b/plugins/Goals/lang/is.json
@@ -19,7 +19,6 @@
         "GoalIsTriggeredWhen": "Markmiðið er kveikt þegar",
         "GoalName": "Nafn Markmiðs",
         "Goals": "Markmið",
-        "GoalsManagement": "Markmiðastjórnun",
         "GoalsOverview": "Yfirlit Markmiða",
         "GoalX": "Markmið %s",
         "IsExactly": "er nákvæmlega %s",
diff --git a/plugins/Goals/lang/it.json b/plugins/Goals/lang/it.json
index f753b0ed6d..8f7b61685e 100644
--- a/plugins/Goals/lang/it.json
+++ b/plugins/Goals/lang/it.json
@@ -9,6 +9,7 @@
         "BestCountries": "I tuoi stati che convertono meglio sono:",
         "BestKeywords": "Le tue keyword che convertono meglio sono:",
         "BestReferrers": "I tuoi referer che convertono meglio sono:",
+        "CancelAndReturnToGoals": "Annulla e %storna all'elenco dei goal%s",
         "CaseSensitive": "Corrispondenza maiuscole e minuscole",
         "ChooseGoal": "Scegli Goal",
         "ClickOutlink": "Cliccano su un Link a un sito esterno",
@@ -38,6 +39,7 @@
         "DefaultRevenue": "Il ricavo predefinito per l'obiettivo è",
         "DefaultRevenueHelp": "Per esempio, un Form di Contatto inviato da un visitatore può valere mediamente $10. Piwik pu%ograve; aiutarti a capire quanto rendono i tuoi visitatori.",
         "DeleteGoalConfirm": "Sei sicuro di voler cancellare il Goal %s?",
+        "Details": "Dettagli Goal",
         "DocumentationRevenueGeneratedByProductSales": "Vendite prodotti. Escluse tasse, spedizione e sconto",
         "Download": "Scaricano un file",
         "Ecommerce": "Ecommerce",
@@ -56,7 +58,6 @@
         "GoalIsTriggeredWhen": "L'obiettivo si attiva quando",
         "GoalName": "Nome Obiettivo",
         "Goals": "Goals (Obiettivi)",
-        "GoalsManagement": "Gestione Goal",
         "GoalsOverview": "Panoramica Goal",
         "GoalsOverviewDocumentation": "Questa è una panoramica delle vostre conversioni degli obiettivi. Inizialmente il grafico mostra la somma di tutte le conversioni. %sSotto il grafico è possibile vedere i reports di conversione per ciascuno dei tuoi obiettivi. Le sparklines possono essere ingrandite cliccandoci sopra.",
         "GoalX": "Goal %s",
@@ -64,21 +65,20 @@
         "IsExactly": "è esattamente %s",
         "LearnMoreAboutGoalTrackingDocumentation": "Impara di più sul %sTracciamento Goals in Piwik%s nella documentazione per l'utente.",
         "LeftInCart": "%s lasciato nel carrello",
+        "ManageGoals": "Gestione Obiettivi (Goals)",
+        "ManageGoalsOrCreateANewGoal": "%sAmministra i Goal%s o creane ora uno nuovo!",
         "Manually": "manualmente",
         "ManuallyTriggeredUsingJavascriptFunction": "Il Goal si attiva manualmente usando l'API Javascript trackGoal()",
         "MatchesExpression": "soddisfa l'espressione %s",
-        "NewGoalDescription": "Un Goal in Piwik è la vostra strategia, la vostra priorità e può comportare molte cose: \"brochure scaricate\", \"registrazioni alle newsletter\", \"Visite alla pagina servizi.html\", ecc.",
         "NewGoalIntro": "Il tracciamento delle Conversioni Goal è uno dei modi più efficaci per misurare e migliorare i vostri obiettivi di business.",
-        "NewGoalYouWillBeAbleTo": "Sarete in grado di visualizzare e analizzare le prestazioni per ogni Obiettivo e avere informazioni su come aumentare le conversioni, i tassi di conversione e le entrate per visita.",
         "NewVisitorsConversionRateIs": "Il report di conversione dei nuovi visitatori è %s",
-        "NewWhatDoYouWantUsersToDo": "Cosa vuoi che facciano i tuoi utenti sul sito?",
         "NoGoalsNeedAccess": "Solo un Amministratore o un utente con accesso da Super User può aggiungere dei Goal per un determinato sito. Chiedi altuo amministratore di Piwik di impostare un Goal per il tuo sito. <br>Tracciare dei Goal è un buon modo per aiutare a capire e massimizzare le prestazioni del tuo sito web.",
         "Optional": "(opzionale)",
         "OverallConversionRate": "%s report di conversione complessivo (visite con un obiettivo completato)",
         "OverallRevenue": "%s ricavo complessivo",
         "PageTitle": "Titolo pagina",
         "Pattern": "Pattern",
-        "PluginDescription": "Crea dei goal e guarda i report sulle conversioni: evoluzioni durante il tempo, guadagno per visita, conversioni per referer, per parola chiave, ecc.",
+        "PluginDescription": "Crea dei Goal e vedi i report dettagliati sulle tue conversioni dei goal: evoluzione nel tempo, guadagno per visita, conversioni per referrer, per keyword, e altro ancora.",
         "ProductCategory": "Categoria prodotto",
         "ProductName": "Nome prodotto",
         "Products": "Prodotti",
@@ -86,6 +86,7 @@
         "ReturningVisitorsConversionRateIs": "Il report di conversione dei visitatori che tornano è %s",
         "SendEvent": "Invia un evento",
         "SingleGoalOverviewDocumentation": "Questa è una panoramica delle conversioni per un unico obiettivo. %sLe sparklines sotto il grafico possono essere ingrandite cliccandoci sopra.",
+        "ThereIsNoGoalToManage": "Non ci sono goal da gestire per il sito %s",
         "UpdateGoal": "Aggiorna un Goal",
         "URL": "URL",
         "ViewAndEditGoals": "Guarda e Modifica i Goal",
diff --git a/plugins/Goals/lang/ja.json b/plugins/Goals/lang/ja.json
index 52bbf097c2..539322d65c 100644
--- a/plugins/Goals/lang/ja.json
+++ b/plugins/Goals/lang/ja.json
@@ -56,7 +56,6 @@
         "GoalIsTriggeredWhen": "目標のトリガー",
         "GoalName": "目標名",
         "Goals": "目標",
-        "GoalsManagement": "目標の管理",
         "GoalsOverview": "目標の概観",
         "GoalsOverviewDocumentation": "これは目標のコンバージョンの概観です。最初に、グラフは、すべてのコンバージョンの合計を示しています。 %s グラフの下に、それぞれの目標についてのコンバージョンレポートを見ることができます。スパークラインは、クリックして拡大できます。",
         "GoalX": "目標 %s",
@@ -66,18 +65,14 @@
         "Manually": "手動",
         "ManuallyTriggeredUsingJavascriptFunction": "JavaScript API の trackGoal() を使用した手動トリガー",
         "MatchesExpression": "正規表現 %s に一致する",
-        "NewGoalDescription": "Piwik での目標とは、あなたの戦略や優先事項のことです。例えば、以下を含みます。:「パンフレットのダウンロード」、「ニュースレターの登録」、「services.html ページへの訪問」等",
         "NewGoalIntro": "目標コンバージョントラッキングは、あなたのビジネス目標の測定や改善のために、最も効率的な方法の一つです。",
-        "NewGoalYouWillBeAbleTo": "各目標に対するパフォーマンスの確認や分析を行い、コンバージョンやコンバージョンレート、訪問数あたりの収益を上げる方法を知ることができます。",
         "NewVisitorsConversionRateIs": "新規ビジターのコンバージョン率は %s です",
-        "NewWhatDoYouWantUsersToDo": "ウェブサイトビジターに、何をしてもらいたいですか？",
         "NoGoalsNeedAccess": "管理者またはスーパーユーザーアクセス権限を持つユーザーのみが、指定のウェブサイトに目標を追加できます。ウェブサイトに目標を設定するには、Piwik 管理者にお問い合わせください。<br> 目標の追跡は、あなたのウェブサイトへの理解を深め、パフォーマンスを最大化させるために、非常に良い方法です。",
         "Optional": "（オプション）",
         "OverallConversionRate": "%s 総コンバージョン率（目標達成ビジット）",
         "OverallRevenue": "%s 総収益",
         "PageTitle": "ページタイトル",
         "Pattern": "パターン",
-        "PluginDescription": "目標を作成し、目標コンバージョンに関するリポート（一定期間の推移、ビジット単位の収益、参照元やキーワード単位のコンバージョン等）を表示します。",
         "ProductCategory": "製品カテゴリー",
         "ProductName": "製品名",
         "Products": "製品",
diff --git a/plugins/Goals/lang/ka.json b/plugins/Goals/lang/ka.json
index bb4e732a6d..851d355684 100644
--- a/plugins/Goals/lang/ka.json
+++ b/plugins/Goals/lang/ka.json
@@ -26,7 +26,6 @@
         "GoalIsTriggeredWhen": "მიზანი ჩართულია როდესაც",
         "GoalName": "მიზნის სახელი",
         "Goals": "მიზნები",
-        "GoalsManagement": "მიზნების მენეჯმენტი",
         "GoalsOverview": "მიზნების მიმოხილვა",
         "GoalX": "მიზანი %s",
         "IsExactly": "არის ზუსტად %s",
@@ -38,7 +37,6 @@
         "OverallConversionRate": "%s საერთო კონვერსიის მაჩვენებელი (ვიზიტები შესრულებული მიზნებით)",
         "OverallRevenue": "%s საერთო შემოსავალი",
         "Pattern": "ნიმუში",
-        "PluginDescription": "შექმენით მიზანი და იხილეთ რეპორტები თქვენი მიზნის კონვერსიის შესახებ: დროის მიხედვით ევოლუცია, შემოსავალი ვიზიტზე, კონვერსიები რეფერერზე, საკვანძო სიტყვაზე, და სხვ.",
         "ReturningVisitorsConversionRateIs": "დაბრუნებული ვიზიტორების კონვერსიის მაჩვენებელი არის %s",
         "UpdateGoal": "მიზნის რედაქტირება",
         "URL": "URL",
diff --git a/plugins/Goals/lang/ko.json b/plugins/Goals/lang/ko.json
index ea4c4a0b3f..ca30f0984f 100644
--- a/plugins/Goals/lang/ko.json
+++ b/plugins/Goals/lang/ko.json
@@ -55,7 +55,6 @@
         "GoalIsTriggeredWhen": "목표 트리거 시점",
         "GoalName": "목표 이름",
         "Goals": "목표",
-        "GoalsManagement": "목표 관리",
         "GoalsOverview": "목표 개요",
         "GoalsOverviewDocumentation": "이것은 목표 전환 개요입니다. 먼저 그래프는 모든 총 전환을 보여줍니다. %s 그래프 아래에 각각의 목표에 대한 전환 보고서를 볼 수 있습니다. 스파크 라인은 클릭하여 확대 할 수 있습니다.",
         "GoalX": "목표 %s",
@@ -71,7 +70,6 @@
         "OverallRevenue": "%s 총 수익",
         "PageTitle": "페이지 제목",
         "Pattern": "패턴",
-        "PluginDescription": "목표를 만들고 목표 전환에 관한 보고서 (기간 추이, 방문 단위 수익, 검색어 단위 전환 등)를 표시합니다.",
         "ProductCategory": "제품 카테고리",
         "ProductName": "제품 이름",
         "Products": "제품",
diff --git a/plugins/Goals/lang/lt.json b/plugins/Goals/lang/lt.json
index 6a47c61cad..d3effd65f8 100644
--- a/plugins/Goals/lang/lt.json
+++ b/plugins/Goals/lang/lt.json
@@ -25,7 +25,6 @@
         "GoalIsTriggeredWhen": "Uždavinys paleistas kai",
         "GoalName": "Uždavinio pavadinimas",
         "Goals": "Uždaviniai",
-        "GoalsManagement": "Uždavinių valdymas",
         "GoalsOverview": "Uždavinių apžvalga",
         "GoalX": "Uždavinys %s",
         "IsExactly": "yra tiksliai %s",
@@ -37,7 +36,6 @@
         "OverallConversionRate": "%s bendras konversijos koeficientas (apsilankymai su uždavinio užbaigimu)",
         "OverallRevenue": "%s bendros pajamos",
         "Pattern": "Derinys",
-        "PluginDescription": "Sukurkite uždavinius ir stebėkite ataskaitas apie uždavinių konversijas: raidą per laikotarpį, vizito pajamas, nuorodų, raktažodžių konversijas ir t.t.",
         "ReturningVisitorsConversionRateIs": "Sugrįžtančių lankytojų konversijos koeficientas yra %s",
         "UpdateGoal": "Atnaujinti uždavinį",
         "URL": "URL",
diff --git a/plugins/Goals/lang/lv.json b/plugins/Goals/lang/lv.json
index dd8f2b5b8e..94f5ee14fb 100644
--- a/plugins/Goals/lang/lv.json
+++ b/plugins/Goals/lang/lv.json
@@ -26,7 +26,6 @@
         "GoalIsTriggeredWhen": "Mērķis tiek sasniegts, kad",
         "GoalName": "Mērķa nosaukums",
         "Goals": "Mērķi",
-        "GoalsManagement": "Mērķu pārvaldība",
         "GoalsOverview": "Mērķu pārskats",
         "GoalX": "Mērķis %s",
         "IsExactly": "ir precīzi %s",
diff --git a/plugins/Goals/lang/nb.json b/plugins/Goals/lang/nb.json
index 95922d5123..f5d6afcd53 100644
--- a/plugins/Goals/lang/nb.json
+++ b/plugins/Goals/lang/nb.json
@@ -2,6 +2,7 @@
     "Goals": {
         "AddGoal": "Legg til mål",
         "AddNewGoal": "Legg til et nytt mål",
+        "ChooseGoal": "Velg mål",
         "ColumnConversions": "Konvertering",
         "Contains": "inneholder %s",
         "CreateNewGOal": "Opprett et nytt mål",
@@ -11,11 +12,9 @@
         "Filename": "filnavn",
         "GoalName": "Målnavn",
         "Goals": "Mål",
-        "GoalsManagement": "Administrasjon av mål",
         "GoalX": "Mål %s",
         "IsExactly": "er akuratt %s",
         "Manually": "manuelt",
-        "NewGoalYouWillBeAbleTo": "Du vil være i stand til å se og analysere resultatene for hvert mål, og lære hvordan du kan øke konverteringer, konverteringsfrekvenser og inntekter per besøk.",
         "Optional": "(valgfritt)",
         "PageTitle": "Sidetittel",
         "Pattern": "Mønster",
diff --git a/plugins/Goals/lang/nl.json b/plugins/Goals/lang/nl.json
index 6028449782..7c4970c01f 100644
--- a/plugins/Goals/lang/nl.json
+++ b/plugins/Goals/lang/nl.json
@@ -9,6 +9,7 @@
         "BestCountries": "Uw beste presterende landen zijn:",
         "BestKeywords": "Uw beste presterende sleutelwoorden zijn:",
         "BestReferrers": "Uw beste presterende referrers zijn:",
+        "CancelAndReturnToGoals": "Annuleren en %sterugkeren naar de lijst van doelen%s",
         "CaseSensitive": "Hoofdletter gevoelig",
         "ChooseGoal": "Kies het doel",
         "ClickOutlink": "Klik op een link naar een externe website",
@@ -38,6 +39,7 @@
         "DefaultRevenue": "Doelstelling standaard omzet is",
         "DefaultRevenueHelp": "Bijvoorbeeld, een contactformulier dat is verzonden door een bezoeker kan gemiddeld €10,- waard zijn. Met de doelconversies zal Piwik u helpen begrijpen hoe goed de onderdelen van uw website presteren.",
         "DeleteGoalConfirm": "Weet u zeker dat u deze doelstelling wilt verwijderen %s?",
+        "Details": "Doel details",
         "DocumentationRevenueGeneratedByProductSales": "Verkoop van producten. Exclusief belasting, verzendkosten en korting",
         "Download": "Download een bestand",
         "Ecommerce": "E-commerce",
@@ -56,33 +58,31 @@
         "GoalIsTriggeredWhen": "Doelstelling is geactiveerd wanneer",
         "GoalName": "Doelstelling naam",
         "Goals": "Doelen",
-        "GoalsManagement": "Doel beheer",
         "GoalsOverview": "Overzicht van doelen",
         "GoalsOverviewDocumentation": "Dit is een overzicht van uw doelconversies. Het eerste deel van het overzicht toont de som van alle conversies. %s Onder de grafiek ziet u de conversierapporten voor elk van uw doelen. De sparklines kunnen vergroot worden door erop te klikken.",
         "GoalX": "Doel %s",
         "HelpOneConversionPerVisit": "Als een pagina - die dit doel bevat - wordt ververst of meerdere keren wordt opgevraagd in één bezoek, dan wordt de doelconversie geregistreerd tijdens de éérste keer dat de pagina werd opgevraagd.",
         "IsExactly": "is exact %s",
         "LeftInCart": "%s achtergelaten in winkelwagen",
+        "ManageGoals": "Beheer Doelen",
+        "ManageGoalsOrCreateANewGoal": "%sBeheer Doelen%s of maak nu een nieuw Doel!",
         "Manually": "handmatig",
         "ManuallyTriggeredUsingJavascriptFunction": "Doelstelling is handmatig geactiveerd door de Javascript API trackGoal()",
         "MatchesExpression": "Voldoet aan de expressie %s",
-        "NewGoalDescription": "Een doel in Piwik is je strategie, je prioriteit, en kan veel dingen omvatten: \"Downloaded brochure\",\"Registreerde voor nieuwsbrief\", \"Bezocht pagina services.html\", enz.",
         "NewGoalIntro": "Doel Conversie tracking is één van de meest efficiënte manieren om je zaken doelen te meten en te verbeteren.",
-        "NewGoalYouWillBeAbleTo": "Je zult van elk Doel de performantie kunnen analyseren, en leren hoe je conversie ratio's en conversie per bezoek kan verhogen",
         "NewVisitorsConversionRateIs": "Conversiepercentage nieuwe bezoekers is %s",
-        "NewWhatDoYouWantUsersToDo": "Wat wil je je gebruikers laten doen op je website?",
         "Optional": "(optioneel)",
         "OverallConversionRate": "%s Het algehele conversiepercentageDe algehele totaal inkomsten rate (bezoeken met een voltooide doelstelling)",
         "OverallRevenue": "%s totale inkomsten",
         "PageTitle": "Paginatitel",
         "Pattern": "Patroon",
-        "PluginDescription": "Maak doelstellingen aan en zie rapporten over uw doelstelling conversies: evaluatie met de tijd, inkomsten per bezoek, inkomsten per referer, per sleutelwoord, enz.",
         "ProductCategory": "Produktcategorie",
         "ProductName": "Produktnaam",
         "Products": "Produkten",
         "ProductSKU": "Produkt SKU",
         "ReturningVisitorsConversionRateIs": "Conversiepercentage terugkerende bezoekers is %s",
         "SingleGoalOverviewDocumentation": "Dit is een overzicht van de conversies voor een enkel doel. %s De sparklines onder de grafiek kunnen worden vergroot door erop te klikken.",
+        "ThereIsNoGoalToManage": "Er is geen doel om te beheren voor website %s",
         "UpdateGoal": "Update doelstelling",
         "URL": "URL",
         "ViewAndEditGoals": "Bekijk en wijzig doelen.",
diff --git a/plugins/Goals/lang/nn.json b/plugins/Goals/lang/nn.json
index 21747cbb44..7f844c4f96 100644
--- a/plugins/Goals/lang/nn.json
+++ b/plugins/Goals/lang/nn.json
@@ -22,7 +22,6 @@
         "GoalIsTriggeredWhen": "Målet er nådd når",
         "GoalName": "Målnamn",
         "Goals": "Mål",
-        "GoalsManagement": "Målstyring",
         "GoalsOverview": "Måloversyn",
         "GoalX": "Mål %s",
         "IsExactly": "er nøyaktig %s",
diff --git a/plugins/Goals/lang/pl.json b/plugins/Goals/lang/pl.json
index dd07aab0d1..bbe2038895 100644
--- a/plugins/Goals/lang/pl.json
+++ b/plugins/Goals/lang/pl.json
@@ -44,7 +44,6 @@
         "GoalIsTriggeredWhen": "Założenie celu jest uruchomione, gdy",
         "GoalName": "Nazwa trafienia",
         "Goals": "Założenia",
-        "GoalsManagement": "Zarządzanie trafieniami",
         "GoalsOverview": "Przegląd trafień",
         "GoalX": "Trafienie %s",
         "HelpOneConversionPerVisit": "Jeżeli strona pasująca do tego trafienia jest odświeżana lub wyświetlana częściej w trakcie odwiedzin, trafienie będzie śledzić tylko za pierwszym razem, gdy strona była po raz pierwszy wyświetlona w trakcie wizyty.",
@@ -54,13 +53,11 @@
         "ManuallyTriggeredUsingJavascriptFunction": "Założenie osiągnięcia celu jest ręcznie uruchamiane używając API Javascript z funkcją trackGoal()",
         "MatchesExpression": "odpowiada wyrażeniu %s",
         "NewVisitorsConversionRateIs": "Współczynnik przejść dla nowych odwiedzających to %s",
-        "NewWhatDoYouWantUsersToDo": "Co chcesz żeby twoi użytkownicy robili na twojej stronie?",
         "Optional": "(opcjonalnie)",
         "OverallConversionRate": "%s ogólny współczynnik zmian (wizyty z osiągniętym pełnym trafieniem)",
         "OverallRevenue": "%s ogólnych przychodów",
         "PageTitle": "tytuł strony",
         "Pattern": "Wzorzec",
-        "PluginDescription": "Utwórz założenia i zobacz raporty o zmianach: zmianach w czasie, dochody z odwiedzin, zmian wynikających z przekierowań, ze słów kluczowych, itd.",
         "ProductCategory": "Kategoria produktu",
         "ProductName": "Nazwa produktu",
         "Products": "Produkty",
diff --git a/plugins/Goals/lang/pt-br.json b/plugins/Goals/lang/pt-br.json
index 9510c6d047..f48ee5650a 100644
--- a/plugins/Goals/lang/pt-br.json
+++ b/plugins/Goals/lang/pt-br.json
@@ -55,7 +55,6 @@
         "GoalIsTriggeredWhen": "Meta está triggered quando",
         "GoalName": "Nome da meta",
         "Goals": "Metas",
-        "GoalsManagement": "Gerenciamento de metas",
         "GoalsOverview": "Visão geral de metas",
         "GoalsOverviewDocumentation": "Esta é uma visão geral de suas conversões de metas. Inicialmente, o gráfico mostra a soma de todas as conversões. %s abaixo do gráfico, você pode ver relatórios de conversão para cada uma de suas metas. Os minigráficos podem ser ampliados clicando sobre eles.",
         "GoalX": "Metas %s",
@@ -65,17 +64,13 @@
         "Manually": "manualmente",
         "ManuallyTriggeredUsingJavascriptFunction": "A meta é manualmente triggered usando a API do Javascript trackGoal()",
         "MatchesExpression": "corresponde com a expressão %s",
-        "NewGoalDescription": "Uma meta no Piwik é a sua estratégia, a sua prioridade, e pode implicar muitas coisas: \"Downloads de Brochuras\", \"Registro de newsletter\", \"Serviço de páginas visitadas\", etc",
         "NewGoalIntro": "O acompanhamento de conversões de metas é uma das maneiras mais eficientes para medir e melhorar seus objetivos de negócios.",
-        "NewGoalYouWillBeAbleTo": "Você será capaz de ver e analisar o desempenho de cada meta, e aprender a aumentar as conversões, taxas de conversão e receitas por visita.",
         "NewVisitorsConversionRateIs": "Taxa de conversão de novos usuários é %s",
-        "NewWhatDoYouWantUsersToDo": "O que você quer que seus usuários façam em seu site?",
         "Optional": "(opcional)",
         "OverallConversionRate": "%s taxa total de conversão(visitas com uma meta completa)",
         "OverallRevenue": "%s lucro total",
         "PageTitle": "Título da página",
         "Pattern": "modelo",
-        "PluginDescription": "Crie metas e veja relatórios sobre suas metas de conversão: evolução sobre o tempo, lucro por visita, conversões por referencia, por palavra-chave, etc.",
         "ProductCategory": "Categoria de produto",
         "ProductName": "Nome do produto",
         "Products": "Produto SKU",
diff --git a/plugins/Goals/lang/pt.json b/plugins/Goals/lang/pt.json
index 71bf74dfc8..f4189e03e6 100644
--- a/plugins/Goals/lang/pt.json
+++ b/plugins/Goals/lang/pt.json
@@ -55,7 +55,6 @@
         "GoalIsTriggeredWhen": "Objectivo é atingido quando",
         "GoalName": "Nome do Objectivo",
         "Goals": "Objectivos",
-        "GoalsManagement": "Gerir objectivos",
         "GoalsOverview": "Vista geral dos Objectivos",
         "GoalsOverviewDocumentation": "Esta é uma visão geral das suas conversões de objectivos. Inicialmente, o gráfico mostra a soma de todas as conversões. %s Abaixo do gráfico, você pode ver relatórios de conversão para cada um dos seus objetivos. Os gráficos Sparkline podem ser ampliadas clicando sobre eles.",
         "GoalX": "Objectivo %s",
@@ -71,7 +70,6 @@
         "OverallRevenue": "%s rendimento geral",
         "PageTitle": "Título da Página",
         "Pattern": "Padrão",
-        "PluginDescription": "Criar Objectivos e ver relatórios acerca das suas conversões de objectivos: evolução ao longo do tempo, rendimento por visita, conversões por referente, por palavra chave, etc.",
         "ProductCategory": "Categorias de Produtos",
         "ProductName": "Nome do Produto",
         "Products": "Produtos",
diff --git a/plugins/Goals/lang/ro.json b/plugins/Goals/lang/ro.json
index 95dce2db2f..e196bb7500 100644
--- a/plugins/Goals/lang/ro.json
+++ b/plugins/Goals/lang/ro.json
@@ -55,7 +55,6 @@
         "GoalIsTriggeredWhen": "Scopul este declanșat atunci când",
         "GoalName": "Nume ţintă",
         "Goals": "Ţinte",
-        "GoalsManagement": "Gestionarea ţintelor",
         "GoalsOverview": "Rezumat ţinte",
         "GoalsOverviewDocumentation": "Acesta este o prezentare generală a obiectivelor. La început, graficul arată suma tuturor obiectivelor. %s Sub grafic, poți găsi rapoarte pentru fiecare obiectiv. Graficele (sparklines) pot fi mărite dând click pe ele.",
         "GoalX": "Ţinta %s",
@@ -65,18 +64,14 @@
         "Manually": "manual",
         "ManuallyTriggeredUsingJavascriptFunction": "Scopul este declanșat manual folosind JavaScript API trackGoal ()",
         "MatchesExpression": "se portiveşte cu expresia %s",
-        "NewGoalDescription": "Un obiectiv în Piwik este strategia ta, prioritatea ta, și poate implica multe lucruri: \"descarcare broșură \", \"buletin Inregistrat\", \"vizitare pagina servicii.html\", etc",
         "NewGoalIntro": "Urmărirebiectiv conversie este una dintre cele mai eficiente modalități de a măsura și îmbunătăți obiectivele de afaceri.",
-        "NewGoalYouWillBeAbleTo": "Vei putea să vezi și să analizezi randamentul fiecărui obiectiv, și să descoperi cum poți îmbunătăți conversiile, ratele de conversie și venitul per vizită.",
         "NewVisitorsConversionRateIs": "Rata de conversie pentru vizitatorii noi este %s",
-        "NewWhatDoYouWantUsersToDo": "Ce doriti ca vizitatorii sa faca pe siteul Dvs?",
         "NoGoalsNeedAccess": "Numai un administrator sau un utilizator cu acces de Super utilizator poate adăuga Obiective pentru un anumit site web. Vă rugăm să întrebați administratorul Piwik pentru a configura un obiectiv pentru site-ul dumneavoastră. cui Urmărire Obiective este o modalitate foarte bună de a ajuta să înțeleagă și să maximizeze performanța site-ul dvs.!",
         "Optional": "(opţional)",
         "OverallConversionRate": "%s Rata de conversie globală (vizite cu un gol)",
         "OverallRevenue": "%s venit global",
         "PageTitle": "Titlul paginii",
         "Pattern": "Model",
-        "PluginDescription": "Crează obiective și vezi rapoartele despre conversia obiectivelor: evoluția de-a lungul timpului, veniturile pe vizită, conversia per referrer, pe cuvânt cheie, etc.",
         "ProductCategory": "Categorie de produse",
         "ProductName": "Denumirea produsului",
         "Products": "Produse",
diff --git a/plugins/Goals/lang/ru.json b/plugins/Goals/lang/ru.json
index 954038871a..438344e6a8 100644
--- a/plugins/Goals/lang/ru.json
+++ b/plugins/Goals/lang/ru.json
@@ -9,18 +9,20 @@
         "BestCountries": "Наиболее популярные страны:",
         "BestKeywords": "Наиболее популярные ключевые слова:",
         "BestReferrers": "Наиболее популярные источники входа:",
+        "CancelAndReturnToGoals": "Отмена и %sвозврат к списку целей%s",
         "CaseSensitive": "Совпадения являются чувствительными к регистру",
-        "ClickOutlink": "Переходит по ссылке на внешний сайт",
-        "ColumnAverageOrderRevenueDocumentation": "Средняя цена за заказ - общая прибыль за все эл. заказы, разделенная на число заказов.",
+        "ChooseGoal": "Выберите цель",
+        "ClickOutlink": "Переходят по ссылке на внешний сайт",
+        "ColumnAverageOrderRevenueDocumentation": "Средняя цена за заказ – общая прибыль за все эл. заказы, разделенная на число заказов.",
         "ColumnAveragePriceDocumentation": "Средняя прибыль для %s.",
         "ColumnAverageQuantityDocumentation": "Среднее количество %s, проданных через электронные заказы.",
         "ColumnConversionRateDocumentation": "Процент посещений, когда было инициировано выполнение Цели %s.",
-        "ColumnConversionRateProductDocumentation": "Процент конверсии %s - это число заказов, содержащих этот товар и разделенных на число посещений страницы с товаром.",
+        "ColumnConversionRateProductDocumentation": "Процент конверсии %s – это число заказов, содержащих этот товар и разделенных на число посещений страницы с товаром.",
         "ColumnConversions": "Конверсии",
         "ColumnConversionsDocumentation": "Число конверсий для %s.",
         "ColumnOrdersDocumentation": "Общее количество электронных заказов, которые содержали %s хотя бы раз.",
-        "ColumnPurchasedProductsDocumentation": "Число купленных товаров - это сумма числа товаров, проданных с помощью электронных заказов.",
-        "ColumnQuantityDocumentation": "Количество - это общее товаров, проданных для каждого %s.",
+        "ColumnPurchasedProductsDocumentation": "Число купленных товаров – это сумма числа товаров, проданных с помощью электронных заказов.",
+        "ColumnQuantityDocumentation": "Количество – это общее товаров, проданных для каждого %s.",
         "ColumnRevenueDocumentation": "Общая прибыль, полученная %s.",
         "ColumnRevenuePerVisitDocumentation": "Общая прибыль, полученная %s и разделенная на число посещений.",
         "ColumnVisits": "Общее число посещений внезависимости от того, была выполнена Цель или нет.",
@@ -37,6 +39,7 @@
         "DefaultRevenue": "Стоимость цели по умолчанию:",
         "DefaultRevenueHelp": "Например, форма заказа, отправленная посетителем, имеет среднюю цену $10. Тогда Веб-аналитика подсчитает суммарную прибыль за вас",
         "DeleteGoalConfirm": "Вы уверены, что желаете удалить цель %s?",
+        "Details": "Подробнее о цели",
         "DocumentationRevenueGeneratedByProductSales": "Продажи товаров. Без налогов, цены доставки и скидок",
         "Download": "Скачивают файл",
         "Ecommerce": "Эл. коммерция",
@@ -45,52 +48,54 @@
         "EcommerceOrder": "Электронный заказ",
         "EcommerceOverview": "Обзор электронный заказов",
         "EcommerceReports": "Отчеты по электронным заказам",
-        "ExceptionInvalidMatchingString": "Если вы выберите 'совпадает точно', строка для сравнения должна быть URL, начинающийся с %s. Например, '%s'.",
+        "ExceptionInvalidMatchingString": "Если вы выберите «совпадает точно», строка для сравнения должна быть URL'ом, начинающегося с %s. Например, \"%s\".",
         "ExternalWebsiteUrl": "внешняя ссылка выглядит следующим образом:",
         "Filename": "имя файла выглядит следующим образом:",
         "GoalConversion": "Конверсия целей",
         "GoalConversions": "Конверсия целей",
         "GoalConversionsBy": "Конверсия цели %s по типу посещения",
-        "GoalIsTriggered": "Цель засчитывается",
+        "GoalIsTriggered": "Цель засчитывается, если:",
         "GoalIsTriggeredWhen": "когда",
         "GoalName": "Название Цели",
         "Goals": "Цели",
-        "GoalsManagement": "Управления целями",
         "GoalsOverview": "Обзор целей",
         "GoalsOverviewDocumentation": "Это обзор конверсии ваших целей. График показывает сумму всех конверсий. %s Под графиком можно увидеть отчет по конверсиям - по каждой из целей. Графики могут быть увеличены при клике на них.",
         "GoalX": "Цель %s",
-        "HelpOneConversionPerVisit": "Если страница, совпадающая с этой целью перезагружается или просматривается более одного раза за посещение, цель будет засчитана только единожды - при первом визите пользователя на эту страницу.",
+        "HelpOneConversionPerVisit": "Если страница, совпадающая с этой целью перезагружается или просматривается более одного раза за посещение, цель будет засчитана только единожды – при первом визите пользователя на эту страницу.",
         "IsExactly": "точно %s",
+        "LearnMoreAboutGoalTrackingDocumentation": "Узнать больше об %sотслеживании целей в Piwik%s в руководстве пользователя.",
         "LeftInCart": "%s брошено в корзине",
+        "ManageGoals": "Управление целями",
+        "ManageGoalsOrCreateANewGoal": "%sУправляйте целями%s или создайте новую прямо сейчас!",
         "Manually": "ручная настройка",
         "ManuallyTriggeredUsingJavascriptFunction": "Цель вручную стала условной через Javascript API trackGoal()",
         "MatchesExpression": "совпадает с выражением %s",
-        "NewGoalDescription": "Цели в Piwik позволяют фиксировать определённые действия пользователей, например: \"сколько скачано брошюр\", \"зарегистрировано бюллетеней\", \"сколько было посещений страницы services.html\", и т.д.",
         "NewGoalIntro": "Отслеживание достигнутых переходов является одним из наиболее эффективных способов измерить и улучшить свои бизнес-задачи.",
-        "NewGoalYouWillBeAbleTo": "Вы сможете просматривать и анализировать производительность для каждой цели, и узнать, как увеличить количество переходов, коэффициентов конверсии и доходов за одно посещение.",
         "NewVisitorsConversionRateIs": "Коэффициент новых посетителей %s",
+        "NoGoalsNeedAccess": "Только администратор или пользователь с правами суперпользователя может добавлять цели для данного сайта. Пожалуйста, обратитесь к администратору Piwik, чтобы создать цели для вашего сайта.<br>Отслеживания целей является отличным способом, чтобы помочь понять как увеличить и максимизировать эффективность веб-сайта!",
         "Optional": "(необязательно)",
         "OverallConversionRate": "%s общий коэффициент конверсий (переходы с выполненной целью)",
         "OverallRevenue": "%s общая прибыль",
         "PageTitle": "Заголовок страницы",
         "Pattern": "Шаблон",
-        "PluginDescription": "Создавайте цели и изучайте отчеты по их достиению: эволюцию по времени, прибыль за посещение, переходы по источникам, по ключевым словам и т.д.",
         "ProductCategory": "Категория товаров",
         "ProductName": "Наименование товара",
         "Products": "Товары",
         "ProductSKU": "Артикул",
         "ReturningVisitorsConversionRateIs": "Коэффициент наиболее частых вернувшихся посетителей %s",
+        "SendEvent": "Отправляют событие",
         "SingleGoalOverviewDocumentation": "Это обзор конверсий по конкретной цели. %s Графики, показанные ниже, можно увеличить, кликнув по ним.",
+        "ThereIsNoGoalToManage": "Нет целей для редактирования и просмотра для сайта %s",
         "UpdateGoal": "Обновить цель",
         "URL": "URL выглядит следующим образом:",
         "ViewAndEditGoals": "Просмотреть и редактировать цели",
         "ViewGoalsBy": "Смотреть цели по %s",
-        "VisitPageTitle": "Посещает страницу с заголовком (page title)",
+        "VisitPageTitle": "Посещают страницу с заголовком (page title)",
         "VisitsUntilConv": "Сконвертированные посещения",
-        "VisitUrl": "Посещает данный URL (страницу или группу страниц)",
+        "VisitUrl": "Посещают данный URL (страницу или группу страниц)",
         "WhenVisitors": "посетители",
         "WhereThe": "где",
-        "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "Где цель засчитывается с помощью установки вызова функции JavaScript piwikTracker.trackGoal() (%sизучить больше%s)",
+        "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "где цель засчитывается с помощью установки вызова метода JavaScript 'trackGoal' (%sузнать больше%s)",
         "YouCanEnableEcommerceReports": "Вы можете активировать %s для этого сайта на странице %s."
     }
 }
\ No newline at end of file
diff --git a/plugins/Goals/lang/sk.json b/plugins/Goals/lang/sk.json
index 4a75b3b043..604ba42038 100644
--- a/plugins/Goals/lang/sk.json
+++ b/plugins/Goals/lang/sk.json
@@ -29,7 +29,6 @@
         "GoalIsTriggeredWhen": "Cieľ je spustený keď",
         "GoalName": "Názov cieľa",
         "Goals": "Ciele",
-        "GoalsManagement": "Správa cieľov",
         "GoalsOverview": "Prehľad cieľov",
         "GoalX": "Cieľ %s",
         "IsExactly": "je presne %s",
diff --git a/plugins/Goals/lang/sl.json b/plugins/Goals/lang/sl.json
index b7502d639c..8ca36ff191 100644
--- a/plugins/Goals/lang/sl.json
+++ b/plugins/Goals/lang/sl.json
@@ -23,7 +23,6 @@
         "GoalConversions": "Spreobrnitve ciljev",
         "GoalName": "Ime Cilja",
         "Goals": "Cilji",
-        "GoalsManagement": "Upravljanje ciljev",
         "GoalsOverview": "Pregled ciljev",
         "GoalX": "Cilj %s",
         "IsExactly": "je točno %s",
diff --git a/plugins/Goals/lang/sq.json b/plugins/Goals/lang/sq.json
index db6998294b..1cb20cb639 100644
--- a/plugins/Goals/lang/sq.json
+++ b/plugins/Goals/lang/sq.json
@@ -55,7 +55,6 @@
         "GoalIsTriggeredWhen": "Objektivi vihet në punë kur",
         "GoalName": "Emër Objektivi",
         "Goals": "Objektiva",
-        "GoalsManagement": "Administrim objektivash",
         "GoalsOverview": "Përmbledhje objektivash",
         "GoalsOverviewDocumentation": "Kjo është një përmbledhje e shndërrimeve tuaja për objektivat. Fillimisht, grafiku tregon shumën e krejt shndërrimeve. %s Nën grafik, mund të shihni raporte shndërrimesh për secilin prej objektivave tuaj. Grafikët vijëzorë mund të zmadhohen duke klikuar mbi ta.",
         "GoalX": "Objektiv %s",
@@ -71,7 +70,6 @@
         "OverallRevenue": "E ardhur %s e përgjithshme",
         "PageTitle": "Titull Faqeje",
         "Pattern": "Mostër",
-        "PluginDescription": "Krijoni Objektiva dhe shihni raporte rreth shndërrimeve për objektivin tuaj: ecurinë në kohë, të ardhura për vizitë, shndërrime sipas referuesash, sipas fjalëkyçash, etj.",
         "ProductCategory": "Kategori Produkti",
         "ProductName": "Emër Produkti",
         "Products": "Produkte",
diff --git a/plugins/Goals/lang/sr.json b/plugins/Goals/lang/sr.json
index b84b0a0db2..a774b5402b 100644
--- a/plugins/Goals/lang/sr.json
+++ b/plugins/Goals/lang/sr.json
@@ -55,7 +55,6 @@
         "GoalIsTriggeredWhen": "Cilj je dostignut kad",
         "GoalName": "Naziv cilja",
         "Goals": "Ciljevi",
-        "GoalsManagement": "Upravljanje ciljevima",
         "GoalsOverview": "Pregled ciljeva",
         "GoalsOverviewDocumentation": "Ovo je pregled ispunjenja vaših ciljeva. Grafik inicijalno prikazuje sumu svih ispunjenja. %s Ispod grafikona se nalaze izveštaji za svaki od vaših ciljeva. Linijice možete da uvećate klikom na njih.",
         "GoalX": "Cilj %s",
@@ -65,18 +64,14 @@
         "Manually": "ručno",
         "ManuallyTriggeredUsingJavascriptFunction": "Cilj je ručno dostignut pomoću JavaScript API trackGoal()",
         "MatchesExpression": "je u skladu sa izrazom %s",
-        "NewGoalDescription": "Cilj u Piwik-u je vaša strategija, vaš prioritet, i može predstavljati različite stvari: \"Preuzeta brošura\", \"Registracija za listu slanja\", \"Posećena stranica services.html\" itd.",
         "NewGoalIntro": "Praćenje ispunjenja ciljeva je jedan od najefikasnijih načina za merenje i unapređenje vaših poslovnih ciljeva.",
-        "NewGoalYouWillBeAbleTo": "Moći ćete da vidite i analizirate ponašanje svakog cilja i da naučite kako da povećate ispunjenja, stope ispunjenja i zaradu po poseti.",
         "NewVisitorsConversionRateIs": "Stepen ispunjenja od strane novih posetilaca je %s",
-        "NewWhatDoYouWantUsersToDo": "Šta želite da posetioci rade na vašem sajtu?",
         "NoGoalsNeedAccess": "Samo administrator ili superkorisnik može definisati ciljeve za dati sajt. Molimo vas da zatražite od vašeg Piwik administratora da postavi ciljeve za vaš sajt.<br>Praćenje ciljeva je odličan način za razumevanje i maksimiziranje rada vašeg sajta!",
         "Optional": "(opciono)",
         "OverallConversionRate": "%s ukupan stepen ispunjenja (posete sa ispunjenim ciljem)",
         "OverallRevenue": "%s ukupna zarada",
         "PageTitle": "Naslov stranice",
         "Pattern": "Obrazac",
-        "PluginDescription": "Zadajte ciljeve i pogledajte izveštaje o ispunjenju vaših ciljeva: razvoj tokom vremena, zarada po poseti, ispunjenju po referenci, ključnim rečima itd.",
         "ProductCategory": "Kategorija proizvoda",
         "ProductName": "Naziv proizvoda",
         "Products": "Proizvodi",
diff --git a/plugins/Goals/lang/sv.json b/plugins/Goals/lang/sv.json
index c77cc1f8d8..9c9c7aa062 100644
--- a/plugins/Goals/lang/sv.json
+++ b/plugins/Goals/lang/sv.json
@@ -55,7 +55,6 @@
         "GoalIsTriggeredWhen": "Målet utlöses när",
         "GoalName": "Målets namn",
         "Goals": "Mål",
-        "GoalsManagement": "Målhantering",
         "GoalsOverview": "Målöversikt",
         "GoalsOverviewDocumentation": "Detta är en översikt över dina målomvandlingar. Inledningsvis visar grafen summan av alla omvandlingar. %s Nedanför diagrammet kan du se omvandlingsrapporter för varje mål. Miniatyrdiagrammen kan förstoras genom att klicka på dem.",
         "GoalX": "Mål %s",
@@ -65,18 +64,14 @@
         "Manually": "manuellt",
         "ManuallyTriggeredUsingJavascriptFunction": "Målet utlöses manuellt genom att använda JavaScript API trackGoal()",
         "MatchesExpression": "matchar uttrycket %s",
-        "NewGoalDescription": "Ditt mål med Piwik är din strategi och dina prioriteringar, de kan medföra många saker: \"Ladda ner broschyr\", \"Registrera nyhetsbrev\", \"Besökta sidor service.html\" och så vidare.",
         "NewGoalIntro": "Att ha mål för konvertering är ett av de mest effektiva sätten att förbättra din affärsverksamhets mål.",
-        "NewGoalYouWillBeAbleTo": "Du kommer kunna se analysera din prestation för varje Mål, lära dig hur du ökar antalet konverteringar, konverteringsgrad och intäkter per besök",
         "NewVisitorsConversionRateIs": "Nya besökares omvandlingsgrad är %s",
-        "NewWhatDoYouWantUsersToDo": "Vad vill du att dina användare gör på din hemsida?",
         "NoGoalsNeedAccess": "Bara den som är Administratör eller har ett Superaccess konto kan lägga till mål för webbsidan. Fråga din Administratör om han eller hon kan sätta upp mål för din sida. Att ha mål är ett utmärkt sätt att få hjälp att förstå hur du maximerar din webbsidas resultat!",
         "Optional": "(frivilligt)",
         "OverallConversionRate": "%s total omvandlingsgrad (besök med ett uppnått mål)",
         "OverallRevenue": "%s totala intäkter",
         "PageTitle": "Sidtitel",
         "Pattern": "Mönster",
-        "PluginDescription": "Skapa mål och se rapporter om dina målomvandlingar: utveckling över tid, intäkt per besök, omvandlingar per referrer, per sökord, etc.",
         "ProductCategory": "Produktkategori",
         "ProductName": "Produktnamn",
         "Products": "Produkter",
diff --git a/plugins/Goals/lang/te.json b/plugins/Goals/lang/te.json
index 523dc6628c..212ac065df 100644
--- a/plugins/Goals/lang/te.json
+++ b/plugins/Goals/lang/te.json
@@ -3,7 +3,6 @@
         "ColumnConversions": "మార్పిళ్ళు",
         "GoalName": "లక్ష్యపు పేరు",
         "Goals": "లక్ష్యాలు",
-        "GoalsManagement": "లక్ష్యాల నిర్వహణ",
         "Optional": "(ఐచ్చికం)"
     }
 }
\ No newline at end of file
diff --git a/plugins/Goals/lang/th.json b/plugins/Goals/lang/th.json
index 5cd78e9350..89d2a26925 100644
--- a/plugins/Goals/lang/th.json
+++ b/plugins/Goals/lang/th.json
@@ -31,7 +31,6 @@
         "GoalIsTriggeredWhen": "เป้าหมายจะถูกเรียกเมื่อ",
         "GoalName": "ชื่อเป้าหมาย",
         "Goals": "เป้าหมาย",
-        "GoalsManagement": "จัดการเป้าหมาย",
         "GoalsOverview": "ภาพรวมของเป้าหมาย",
         "GoalX": "เป้าหมาย %s",
         "IsExactly": "คือว่า %s",
@@ -44,7 +43,6 @@
         "OverallRevenue": "%s โดยรวมรายได้",
         "PageTitle": "ชื่อหน้าเว็บ",
         "Pattern": "แบบแผน",
-        "PluginDescription": "สร้างเป้าหมาย และดูรายงานเกี่ยวกับการแปลงที่เป้าหมายของคุณ: วิวัฒนาการผ่านเวลา รายได้ต่อเข้าชม การแปลงที่ต่อทำการอ้างอิง ต่อคำสำคัญ ฯลฯ",
         "ProductCategory": "หมวดหมู่สินค้า",
         "ProductName": "ชื่อสินค้า",
         "Products": "รายการ",
diff --git a/plugins/Goals/lang/tr.json b/plugins/Goals/lang/tr.json
index 990965ac3b..ee1fcf040f 100644
--- a/plugins/Goals/lang/tr.json
+++ b/plugins/Goals/lang/tr.json
@@ -19,11 +19,9 @@
         "GoalConversion": "Hedef dönüşümü",
         "GoalName": "Hedef İsmi",
         "Goals": "Goals",
-        "GoalsManagement": "Goals Yönetimi",
         "GoalsOverview": "Hedefe Genel bakış",
         "GoalX": "Hedef '%s'",
         "Manually": "Manuel",
-        "NewWhatDoYouWantUsersToDo": "Ziyaretçilerinizin sitenizde ne yapmasını istiyorsunuz?",
         "Optional": "(opsiyonel)",
         "PageTitle": "Sayfa Başlığı",
         "Pattern": "Model",
diff --git a/plugins/Goals/lang/uk.json b/plugins/Goals/lang/uk.json
index af8091b41a..e9f40df0b1 100644
--- a/plugins/Goals/lang/uk.json
+++ b/plugins/Goals/lang/uk.json
@@ -26,7 +26,6 @@
         "GoalIsTriggeredWhen": "Ціль спрацьовує коли",
         "GoalName": "Назва Цілі",
         "Goals": "Цілі",
-        "GoalsManagement": "Керування цілями",
         "GoalsOverview": "Огляд цілей",
         "GoalX": "Ціль %s",
         "IsExactly": "точно співпадає з %s",
@@ -38,7 +37,6 @@
         "OverallConversionRate": "%s загальний коефіцієнт конверсії (відвідування з завершеними цілями)",
         "OverallRevenue": "%s загальний прибуток",
         "Pattern": "Шаблон",
-        "PluginDescription": "Створюйте цілі та переглядайте звіти про конвертсію ваших цілей: зміну в часі, прибуток на відвідувача, конверсію на джерело трафіку, по ключових словах, тощо...",
         "ReturningVisitorsConversionRateIs": "Коефіцієнт конверсії користувачів що повернулися дорівнює %s",
         "UpdateGoal": "Обновити Ціль",
         "URL": "URL",
diff --git a/plugins/Goals/lang/vi.json b/plugins/Goals/lang/vi.json
index c0a38326f2..7fc584b680 100644
--- a/plugins/Goals/lang/vi.json
+++ b/plugins/Goals/lang/vi.json
@@ -55,7 +55,6 @@
         "GoalIsTriggeredWhen": "Mục tiêu được kích hoạt khi",
         "GoalName": "Tên mục tiêu",
         "Goals": "Các mục tiêu",
-        "GoalsManagement": "Quản lý các mục tiêu",
         "GoalsOverview": "Các mục tiêu tổng quan",
         "GoalsOverviewDocumentation": "Đây là một cái nhìn tổng thể về goal conversions. Thoạt đầu, đồ thị này cho thấy tổng tất cả các lần chuyển đổi. %s Dưới đồ thị này, bạn có thể thấy các báo cáo conversion đối với mỗi goal của bạn. Sparklines có thể được phóng to khi click vào.",
         "GoalX": "Mục tiêu %s",
@@ -65,17 +64,13 @@
         "Manually": "Kiểu thủ công",
         "ManuallyTriggeredUsingJavascriptFunction": "Mục tiêu tự kích hoạt bằng JavaScript API trackGoal()",
         "MatchesExpression": "Làm phù hợp các biểu hiện %s",
-        "NewGoalDescription": "Một mục tiêu trong Piwik là chiến lược của bạn, ưu tiên của bạn, và có thể kéo theo nhiều điều: \"tải tài liệu\", \"bản tin đăng ký\", \"truy cập trang services.html\", vv.",
         "NewGoalIntro": "Theo dõi chuyển đổi mục tiêu là một trong những cách hiệu quả nhất để đo lường và cải thiện các mục tiêu kinh doanh của bạn.",
-        "NewGoalYouWillBeAbleTo": "Bạn sẽ có thể xem và phân tích hiệu suất của bạn cho mỗi mục tiêu, và tìm hiểu cách tăng chuyển đổi, tỷ lệ chuyển đổi và doanh thu cho mỗi truy cập.",
         "NewVisitorsConversionRateIs": "Tỷ lệ chuyển đổi các khách truy cập mới là %s",
-        "NewWhatDoYouWantUsersToDo": "Bạn muốn người dùng làm gì trên website của bạn?",
         "Optional": "(tùy chọn)",
         "OverallConversionRate": "Tỷ lệ chuyển đổi tổng thể %s (truy cập với mục tiêu hoàn thành)",
         "OverallRevenue": "Doanh thu tổng thể %s",
         "PageTitle": "Tiêu đề trang",
         "Pattern": "Mẫu",
-        "PluginDescription": "Tạo mục tiêu và xem báo cáo về chuyển đổi mục tiêu của bạn: sự phát triển theo thời gian, doanh thu trên mỗi chuyến lượt truy cập, chuyển đổi cho mỗi sự giới thiệu, mỗi từ khóa, vv",
         "ProductCategory": "Danh mục sản phẩm",
         "ProductName": "Tên sản phẩm",
         "Products": "Các sản phẩm",
diff --git a/plugins/Goals/lang/zh-cn.json b/plugins/Goals/lang/zh-cn.json
index 4a262a9e91..80ee7fb586 100644
--- a/plugins/Goals/lang/zh-cn.json
+++ b/plugins/Goals/lang/zh-cn.json
@@ -55,7 +55,6 @@
         "GoalIsTriggeredWhen": "目标触发当",
         "GoalName": "目标名称",
         "Goals": "目标分析",
-        "GoalsManagement": "目标管理",
         "GoalsOverview": "目标总表",
         "GoalsOverviewDocumentation": "这是目标转化总表。图形首先显示所有转化总和。%s 在图形下面可以看到每个目标的转化报表，点击波形图可放大。",
         "GoalX": "%s目标",
@@ -65,17 +64,13 @@
         "Manually": "手动触发",
         "ManuallyTriggeredUsingJavascriptFunction": "手动触发的目标是使用 JavaScript API trackGoal()",
         "MatchesExpression": "匹配表达式 %s",
-        "NewGoalDescription": "Piwik 中的目标就是您的规划、优先级，可以包含很多内容: \"下载手册\", \"订阅简报\", \"访问页面 services.html\"，等等。",
         "NewGoalIntro": "目标转化跟踪是最有效的检验和提高商业目标的方法之一。",
-        "NewGoalYouWillBeAbleTo": "您可以查看和分析每个目标的性能，了解如何增加转化、转化率和每次访问收入。",
         "NewVisitorsConversionRateIs": "新访客转化率为 %s",
-        "NewWhatDoYouWantUsersToDo": "您希望访客在您的网站做什么呢?",
         "Optional": "(选项)",
         "OverallConversionRate": "%s 总转化率(访问一个完整的目标)",
         "OverallRevenue": "%s 总收益",
         "PageTitle": "页面标题",
         "Pattern": "模式",
-        "PluginDescription": "建立目标然后查看关于您的目标转化率报表: 时间的演变趋势、每次访问的收入、每个关键词等。",
         "ProductCategory": "产品类别",
         "ProductName": "产品名称",
         "Products": "产品",
diff --git a/plugins/Goals/lang/zh-tw.json b/plugins/Goals/lang/zh-tw.json
index a84fce57df..0c5dd3b540 100644
--- a/plugins/Goals/lang/zh-tw.json
+++ b/plugins/Goals/lang/zh-tw.json
@@ -25,7 +25,6 @@
         "GoalIsTriggeredWhen": "目標觸發當",
         "GoalName": "目標名稱",
         "Goals": "目標",
-        "GoalsManagement": "目標管理",
         "GoalsOverview": "目標總覽",
         "GoalX": "目標 %s",
         "IsExactly": "正是 %s",
@@ -37,7 +36,6 @@
         "OverallConversionRate": "%s 總轉換率（訪問一個完整的目標）",
         "OverallRevenue": "%s 總收益",
         "Pattern": "模式",
-        "PluginDescription": "建立目標然後查看關於你的目標轉換率報表：時間的演變趨勢、每次訪問的收入、每個關鍵字等等。",
         "ReturningVisitorsConversionRateIs": "回訪訪客轉換率為 %s",
         "UpdateGoal": "更新目標",
         "URL": "網址",
diff --git a/plugins/Goals/stylesheets/goals.css b/plugins/Goals/stylesheets/goals.css
index 52602215bb..16f594781a 100644
--- a/plugins/Goals/stylesheets/goals.css
+++ b/plugins/Goals/stylesheets/goals.css
@@ -9,6 +9,14 @@
     width: 614px;
 }
 
+.managegoals .addrow:hover {
+    text-decoration: underline;
+}
+
+.managegoals .addrow {
+    margin-top: 0px;
+}
+
 /* dimension selector */
 #titleGoalsByDimension {
     padding-top: 30px;
diff --git a/plugins/Goals/templates/_addEditGoal.twig b/plugins/Goals/templates/_addEditGoal.twig
index 167dbba7b0..94db74df41 100644
--- a/plugins/Goals/templates/_addEditGoal.twig
+++ b/plugins/Goals/templates/_addEditGoal.twig
@@ -1,37 +1,3 @@
-{% if onlyShowAddNewGoal is defined %}
-    <h2 piwik-enriched-headline>{{ 'Goals_AddNewGoal'|translate }}</h2>
-    <p>{{ 'Goals_NewGoalIntro'|translate }}</p>
-    <p>{{ 'Goals_NewGoalDescription'|translate }}
-        {{ 'Goals_NewWhatDoYouWantUsersToDo'|translate }}
-        {{ 'Goals_NewGoalYouWillBeAbleTo'|translate }}</p>
-    <p>{{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }}
-    </p>
-{% else %}
-    <div class="clear"></div>
-    <h2 piwik-enriched-headline>{{ 'Goals_GoalsManagement'|translate }}</h2>
-    <div class="entityList">
-        <ul class='listCircle'>
-            <li><a onclick='' name='linkAddNewGoal'>{{ 'Goals_CreateNewGOal'|translate }}</a></li>
-            <li><a onclick='' name='linkEditGoals'>{{ 'Goals_ViewAndEditGoals'|translate }}</a></li>
-            <li>{{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }}</li>
-
-            <li>
-                {% if not ecommerceEnabled %}
-                    {% set websiteManageText %}
-                        <a href='{{ linkTo({'module':'SitesManager','action':'index' }) }}'>{{ 'SitesManager_WebsitesManagement'|translate }}</a>
-                    {% endset %}
-                    {% set ecommerceReportText %}
-                        <a href="http://piwik.org/docs/ecommerce-analytics/" rel="noreferrer" target="_blank">{{ 'Goals_EcommerceReports'|translate }}</a>
-                    {% endset %}
-                    {{ 'Goals_Optional'|translate }} {{ 'Goals_Ecommerce'|translate }}: {{ 'Goals_YouCanEnableEcommerceReports'|translate(ecommerceReportText,websiteManageText)|raw }}
-                {% else %}
-                    {{ 'SitesManager_PiwikOffersEcommerceAnalytics'|translate('<a href="http://piwik.org/docs/ecommerce-analytics/" rel="noreferrer" target="_blank">',"</a>")|raw }}
-                {% endif %}
-            </li>
-        </ul>
-    </div>
-    <br/>
-{% endif %}
 
 {% import 'ajaxMacros.twig' as ajax %}
 {{ ajax.errorDiv() }}
@@ -46,10 +12,11 @@
         <div class='entityCancel' style='display:none;'>
             {{ 'General_OrCancel'|translate("<a class='entityCancelLink'>","</a>")|raw }}
         </div>
+
     {% endif %}
     <a id='bottom'></a>
 </div>
-<br/><br/>
+
 <script type="text/javascript">
     var mappingMatchTypeName = {
         "url": "{{ 'Goals_URL'|translate }}",
@@ -78,8 +45,15 @@
     {% if onlyShowAddNewGoal is not defined %}
         piwik.goals = {{ goalsJSON|raw }};
         bindListGoalEdit();
+
+        {% if idGoal %}
+            editGoal({{ idGoal|e('js') }});
+        {% else %}
+            showEditGoals();
+        {% endif %}
     {% else %}
         initAndShowAddGoalForm();
     {% endif %}
 
+
 </script>
diff --git a/plugins/Goals/templates/_formAddGoal.twig b/plugins/Goals/templates/_formAddGoal.twig
index 7bff75f8cb..5e0366fdb8 100644
--- a/plugins/Goals/templates/_formAddGoal.twig
+++ b/plugins/Goals/templates/_formAddGoal.twig
@@ -103,4 +103,5 @@
         <input type="hidden" name="goalIdUpdate" value=""/>
         <input type="submit" value="" name="submit" id="goal_submit" class="submit"/>
     </form>
+
 </div>
diff --git a/plugins/Goals/templates/_listGoalEdit.twig b/plugins/Goals/templates/_listGoalEdit.twig
index 5118cfb72a..62417aa6d8 100644
--- a/plugins/Goals/templates/_listGoalEdit.twig
+++ b/plugins/Goals/templates/_listGoalEdit.twig
@@ -1,4 +1,4 @@
-<div id='entityEditContainer' style="display:none;">
+<div id='entityEditContainer' class="managegoals" style="display:none;">
     <table class="dataTable entityTable">
         <thead>
         <tr>
@@ -10,32 +10,50 @@
             <th>{{ 'General_Delete'|translate }}</th>
         </tr>
         </thead>
-        {% for goal in goals %}
+        {% if goals is empty %}
             <tr>
-                <td class="first">{{ goal.idgoal }}</td>
-                <td>{{ goal.name|raw }}</td>{# NOTE: goal names are escaped in the DB #}
-                <td><span class='matchAttribute'>{{ goal.match_attribute }}</span>
-                    {% if goal.pattern_type is defined %}
-                        <br/>
-                        {{ 'Goals_Pattern'|translate }} {{ goal.pattern_type }}: {{ goal.pattern|raw }}
-                    {% endif %}
-                </td>
-                <td>{% if goal.revenue==0 %}-{% else %}{{ goal.revenue|money(idSite)|raw }}{% endif %}</td>
-                <td>
-                    <a href='#' name="linkEditGoal" id="{{ goal.idgoal }}" class="link_but">
-                        <img src='plugins/Morpheus/images/ico_edit.png' border="0"/>
-                        {{ 'General_Edit'|translate }}
-                    </a>
-                </td>
-                <td>
-                    <a href='#' name="linkDeleteGoal" id="{{ goal.idgoal }}" class="link_but">
-                        <img src='plugins/Morpheus/images/ico_delete.png' border="0"/>
-                        {{ 'General_Delete'|translate }}
-                    </a>
+                <td colspan='7'>
+                    <br/>
+                    {{ 'Goals_ThereIsNoGoalToManage'|translate(siteName)|raw }}.
+                    <br/><br/>
                 </td>
             </tr>
-        {% endfor %}
+        {% else %}
+            {% for goal in goals %}
+                <tr>
+                    <td class="first">{{ goal.idgoal }}</td>
+                    <td>{{ goal.name|raw }}</td>{# NOTE: goal names are escaped in the DB #}
+                    <td><span class='matchAttribute'>{{ goal.match_attribute }}</span>
+                        {% if goal.pattern_type is defined %}
+                            <br/>
+                            {{ 'Goals_Pattern'|translate }} {{ goal.pattern_type }}: {{ goal.pattern|raw }}
+                        {% endif %}
+                    </td>
+                    <td>{% if goal.revenue==0 %}-{% else %}{{ goal.revenue|money(idSite)|raw }}{% endif %}</td>
+                    <td>
+                        <a href='#' name="linkEditGoal" id="{{ goal.idgoal }}" class="link_but withIcon">
+                            <img src='plugins/Morpheus/images/ico_edit.png' border="0"/>
+                            {{ 'General_Edit'|translate }}
+                        </a>
+                    </td>
+                    <td>
+                        <a href='#' name="linkDeleteGoal" id="{{ goal.idgoal }}" class="link_but withIcon">
+                            <img src='plugins/Morpheus/images/ico_delete.png' border="0"/>
+                            {{ 'General_Delete'|translate }}
+                        </a>
+                    </td>
+                </tr>
+            {% endfor %}
+        {% endif %}
     </table>
+
+    {% if onlyShowAddNewGoal is not defined %}
+        <br/>
+        <div name="linkAddNewGoal" class="addrow"><img src='plugins/Morpheus/images/add.png'/> {{ 'Goals_CreateNewGOal'|translate }}</div>
+        <br/>
+        <br/>
+
+    {% endif %}
 </div>
 
 <div class="ui-confirm" id="confirm">
diff --git a/plugins/Goals/templates/_titleAndEvolutionGraph.twig b/plugins/Goals/templates/_titleAndEvolutionGraph.twig
index 4fe5c66dcc..dfd69e9857 100644
--- a/plugins/Goals/templates/_titleAndEvolutionGraph.twig
+++ b/plugins/Goals/templates/_titleAndEvolutionGraph.twig
@@ -1,7 +1,12 @@
 <span data-graph-id="{{ nameGraphEvolution }}"></span>
 
-{% if displayFullReport %}
-    <h2 piwik-enriched-headline>{% if goalName is defined %}{{ 'Goals_GoalX'|translate(goalName)|raw }}{% else %}{{ 'Goals_GoalsOverview'|translate }}{% endif %}</h2>
+{% if displayFullReport or headline is defined %}
+    <h2 piwik-enriched-headline
+        {% if idGoal is defined and idGoal and goalName is defined and not ecommerce is defined %}
+            edit-url="{{ linkTo({'module': 'Goals', 'action': 'manage', 'idGoal': idGoal})|e('html_attr') }}"
+            feature-name="{{ 'Goals_Details'|translate|e('html_attr') }}"
+        {% endif %}
+       >{% if headline is defined %}{{ headline }}{% elseif goalName is defined %}{{ 'Goals_GoalX'|translate(goalName)|raw }}{% else %}{{ 'General_EvolutionOverPeriod'|translate }}{% endif %}</h2>
 {% endif %}
 {{ graphEvolution|raw }}
 
diff --git a/plugins/Goals/templates/addNewGoal.twig b/plugins/Goals/templates/addNewGoal.twig
index e4cbaea787..2dfd23c965 100644
--- a/plugins/Goals/templates/addNewGoal.twig
+++ b/plugins/Goals/templates/addNewGoal.twig
@@ -1,5 +1,14 @@
 {% if userCanEditGoals %}
+    <h2 piwik-enriched-headline>{{ 'Goals_AddNewGoal'|translate }}</h2>
+    <p>{{ 'Goals_NewGoalIntro'|translate }}</p>
+    <p>{{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }}
+       {{ 'Goals_ManageGoalsOrCreateANewGoal'|translate("<a href='" ~ linkTo({'module':'Goals','action':'manage'}) ~ "'>","</a>")|raw }}
+    </p>
+
     {% include "@Goals/_addEditGoal.twig" %}
+
+    <br/><br/>
+
 {% else %}
     <h2>{{ 'Goals_CreateNewGOal'|translate }}</h2>
     <p>
diff --git a/plugins/Goals/templates/getOverviewView.twig b/plugins/Goals/templates/getOverviewView.twig
index 13e275226b..281d65952c 100644
--- a/plugins/Goals/templates/getOverviewView.twig
+++ b/plugins/Goals/templates/getOverviewView.twig
@@ -43,8 +43,4 @@
     </h2>
     {{ goalReportsByDimension|raw }}
     {% endif %}
-
-    {% if userCanEditGoals %}
-        {% include "@Goals/_addEditGoal.twig" %}
-    {% endif %}
 {% endif %}
diff --git a/plugins/Goals/templates/manageGoals.twig b/plugins/Goals/templates/manageGoals.twig
new file mode 100644
index 0000000000..f71cd38300
--- /dev/null
+++ b/plugins/Goals/templates/manageGoals.twig
@@ -0,0 +1,36 @@
+{% extends 'user.twig' %}
+
+{% block content %}
+
+    <h2 piwik-enriched-headline>
+        <div class="inlineHelp">{{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }}
+
+            {% if not ecommerceEnabled %}
+                <br /><br/>
+                {% set websiteManageText %}
+                <a href='{{ linkTo({'module':'SitesManager','action':'index' }) }}'>{{ 'SitesManager_WebsitesManagement'|translate }}</a>
+                {% endset %}
+                {% set ecommerceReportText %}
+                <a href="http://piwik.org/docs/ecommerce-analytics/" rel="noreferrer" target="_blank">{{ 'Goals_EcommerceReports'|translate }}</a>
+                {% endset %}
+                {{ 'Goals_Optional'|translate }} {{ 'Goals_Ecommerce'|translate }}: {{ 'Goals_YouCanEnableEcommerceReports'|translate(ecommerceReportText,websiteManageText)|raw }}
+            {% endif %}</div>
+        {{ 'Goals_ManageGoals'|translate }}
+    </h2>
+
+    {% include "@CoreHome/_siteSelectHeader.twig" %}
+
+    {% include "@Goals/_addEditGoal.twig" %}
+
+    <style type="text/css">
+        .entityAddContainer {
+            position:relative;
+        }
+
+        .entityAddContainer > .entityCancel:first-child {
+            position: absolute;
+            right:0;
+            bottom:100%;
+        }
+    </style>
+{% endblock %}
diff --git a/plugins/Goals/tests/Integration/APITest.php b/plugins/Goals/tests/Integration/APITest.php
index a4e850a51f..5b0d97c9cb 100644
--- a/plugins/Goals/tests/Integration/APITest.php
+++ b/plugins/Goals/tests/Integration/APITest.php
@@ -12,6 +12,7 @@ use Piwik\Access;
 use Piwik\Piwik;
 use Piwik\Plugins\Goals\API;
 use Piwik\Tests\Framework\Fixture;
+use Piwik\Tests\Framework\Mock\FakeAccess;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 
 /**
@@ -224,10 +225,10 @@ class APITest extends IntegrationTestCase
 
     protected function setNonAdminUser()
     {
-        $pseudoMockAccess = new \FakeAccess;
-        \FakeAccess::setSuperUserAccess(false);
-        \FakeAccess::$idSitesView = array(99);
-        \FakeAccess::$identity = 'aUser';
+        $pseudoMockAccess = new FakeAccess;
+        FakeAccess::setSuperUserAccess(false);
+        FakeAccess::$idSitesView = array(99);
+        FakeAccess::$identity = 'aUser';
         Access::setSingletonInstance($pseudoMockAccess);
     }
 
diff --git a/plugins/ImageGraph/API.php b/plugins/ImageGraph/API.php
index 1ce331d9d8..b569f2c9c8 100644
--- a/plugins/ImageGraph/API.php
+++ b/plugins/ImageGraph/API.php
@@ -9,12 +9,12 @@
 namespace Piwik\Plugins\ImageGraph;
 
 use Exception;
+use Piwik\API\Request;
 use Piwik\Archive\DataTableFactory;
 use Piwik\Common;
 use Piwik\Filesystem;
 use Piwik\Period;
 use Piwik\Piwik;
-use Piwik\Plugins\API\API as APIMetadata;
 use Piwik\Plugins\ImageGraph\StaticGraph;
 use Piwik\SettingsServer;
 use Piwik\Translate;
@@ -156,9 +156,19 @@ class API extends \Piwik\Plugin\API
                 $apiParameters = array('idGoal' => $idGoal);
             }
             // Fetch the metadata for given api-action
-            $metadata = APIMetadata::getInstance()->getMetadata(
-                $idSite, $apiModule, $apiAction, $apiParameters, $languageLoaded, $period, $date,
-                $hideMetricsDoc = false, $showSubtableReports = true);
+            $parameters = array(
+                'idSite' => $idSite,
+                'apiModule' => $apiModule,
+                'apiAction' => $apiAction,
+                'apiParameters' => $apiParameters,
+                'language' => $languageLoaded,
+                'period' => $period,
+                'date' => $date,
+                'hideMetricsDoc' => false,
+                'showSubtableReports' => true
+            );
+
+            $metadata = Request::processRequest('API.getMetadata', $parameters);
             if (!$metadata) {
                 throw new Exception('Invalid API Module and/or API Action');
             }
@@ -288,20 +298,21 @@ class API extends \Piwik\Plugin\API
                     }
                 }
 
-                $processedReport = APIMetadata::getInstance()->getRowEvolution(
-                    $idSite,
-                    $period,
-                    $date,
-                    $apiModule,
-                    $apiAction,
-                    $labels,
-                    $segment,
-                    $plottedMetric,
-                    $languageLoaded,
-                    $idGoal,
-                    $legendAppendMetric,
-                    $labelUseAbsoluteUrl = false
+                $parameters = array(
+                    'idSite' => $idSite,
+                    'period' => $period,
+                    'date' => $date,
+                    'apiModule' => $apiModule,
+                    'apiAction' => $apiAction,
+                    'label' => $labels,
+                    'segment' => $segment,
+                    'column' => $plottedMetric,
+                    'language' => $languageLoaded,
+                    'idGoal' => $idGoal,
+                    'legendAppendMetric' => $legendAppendMetric,
+                    'labelUseAbsoluteUrl' => false
                 );
+                $processedReport = Request::processRequest('API.getRowEvolution', $parameters);
 
                 //@review this test will need to be updated after evaluating the @review comment in API/API.php
                 if (!$processedReport) {
@@ -345,22 +356,24 @@ class API extends \Piwik\Plugin\API
                     $ordinateLabels[$plottedMetric] = $processedReport['label'] . ' (' . $metrics[$plottedMetric]['name'] . ')';
                 }
             } else {
-                $processedReport = APIMetadata::getInstance()->getProcessedReport(
-                    $idSite,
-                    $period,
-                    $date,
-                    $apiModule,
-                    $apiAction,
-                    $segment,
-                    $apiParameters = false,
-                    $idGoal,
-                    $languageLoaded,
-                    $showTimer = true,
-                    $hideMetricsDoc = false,
-                    $idSubtable,
-                    $showRawMetrics = false
+                $parameters = array(
+                    'idSite' => $idSite,
+                    'period' => $period,
+                    'date' => $date,
+                    'apiModule' => $apiModule,
+                    'apiAction' => $apiAction,
+                    'segment' => $segment,
+                    'apiParameters' => false,
+                    'idGoal' => $idGoal,
+                    'language' => $languageLoaded,
+                    'showTimer' => true,
+                    'hideMetricsDoc' => false,
+                    'idSubtable' => $idSubtable,
+                    'showRawMetrics' => false
                 );
+                $processedReport = Request::processRequest('API.getProcessedReport', $parameters);
             }
+
             // prepare abscissa and ordinate series
             $abscissaSeries = array();
             $abscissaLogos = array();
@@ -420,6 +433,9 @@ class API extends \Piwik\Plugin\API
                         $rowData = $rows[0]->getColumns(); // associative Array
 
                         foreach ($ordinateColumns as $column) {
+                            if(empty($rowData[$column])) {
+                                continue;
+                            }
                             $ordinateValue = $rowData[$column];
                             $parsedOrdinateValue = $this->parseOrdinateValue($ordinateValue);
 
diff --git a/plugins/ImageGraph/ImageGraph.php b/plugins/ImageGraph/ImageGraph.php
index 5bd61cc6a9..8fcfc501ac 100644
--- a/plugins/ImageGraph/ImageGraph.php
+++ b/plugins/ImageGraph/ImageGraph.php
@@ -11,11 +11,13 @@ namespace Piwik\Plugins\ImageGraph;
 use Piwik\API\Request;
 use Piwik\Common;
 use Piwik\Config;
+use Piwik\Container\StaticContainer;
 use Piwik\Period;
 use Piwik\Period\Range;
+use Piwik\Scheduler\Scheduler;
 use Piwik\Site;
-use Piwik\TaskScheduler;
 use Piwik\Url;
+use Piwik\Period\Factory as PeriodFactory;
 
 class ImageGraph extends \Piwik\Plugin
 {
@@ -88,21 +90,41 @@ class ImageGraph extends \Piwik\Plugin
 
             $piwikSite = new Site($idSite);
             if ($periodForSinglePeriodGraph == 'range') {
+                // for period=range, show the configured sub-periods
                 $periodForMultiplePeriodGraph = Config::getInstance()->General['graphs_default_period_to_plot_when_period_range'];
                 $dateForMultiplePeriodGraph = $dateForSinglePeriodGraph;
-            } else {
-                $periodForMultiplePeriodGraph = $periodForSinglePeriodGraph;
-                $dateForMultiplePeriodGraph = Range::getRelativeToEndDate(
-                    $periodForSinglePeriodGraph,
-                    'last' . self::GRAPH_EVOLUTION_LAST_PERIODS,
-                    $dateForSinglePeriodGraph,
-                    $piwikSite
-                );
+            } else if ($info['period'] == 'day' || !Config::getInstance()->General['graphs_show_evolution_within_selected_period']) {
+                // for period=day, always show the last n days
+                // if graphs_show_evolution_within_selected_period=false, show the last n periods
+				$periodForMultiplePeriodGraph = $periodForSinglePeriodGraph;
+				$dateForMultiplePeriodGraph = Range::getRelativeToEndDate(
+					$periodForSinglePeriodGraph,
+					'last' . self::GRAPH_EVOLUTION_LAST_PERIODS,
+					$dateForSinglePeriodGraph,
+					$piwikSite
+				);
+			} else {
+                // if graphs_show_evolution_within_selected_period=true, show the days withing the period
+                // (except if the period is day, see above)
+				$periodForMultiplePeriodGraph = 'day';
+				$period = PeriodFactory::build($info['period'], $info['date']);
+				$start = $period->getDateStart()->toString();
+				$end = $period->getDateEnd()->toString();
+				$dateForMultiplePeriodGraph = $start . ',' . $end;
             }
         }
 
         $token_auth = Common::getRequestVar('token_auth', false);
 
+        $segment = Request::getRawSegmentFromRequest();
+
+        /** @var Scheduler $scheduler */
+        $scheduler = StaticContainer::getContainer()->get('Piwik\Scheduler\Scheduler');
+        $isRunningTask = $scheduler->isRunningTask();
+
+        // add the idSubtable if it exists
+        $idSubtable = Common::getRequestVar('idSubtable', false);
+
         $urlPrefix = "index.php?";
         foreach ($reports as &$report) {
             $reportModule = $report['module'];
@@ -131,17 +153,14 @@ class ImageGraph extends \Piwik\Plugin
                 $parameters['date'] = $dateForSinglePeriodGraph;
             }
 
-            // add the idSubtable if it exists
-            $idSubtable = Common::getRequestVar('idSubtable', false);
             if ($idSubtable !== false) {
                 $parameters['idSubtable'] = $idSubtable;
             }
 
-            if (!empty($_GET['_restrictSitesToLogin']) && TaskScheduler::isTaskBeingExecuted()) {
+            if (!empty($_GET['_restrictSitesToLogin']) && $isRunningTask) {
                 $parameters['_restrictSitesToLogin'] = $_GET['_restrictSitesToLogin'];
             }
 
-            $segment = Request::getRawSegmentFromRequest();
             if (!empty($segment)) {
                 $parameters['segment'] = $segment;
             }
diff --git a/plugins/ImageGraph/StaticGraph.php b/plugins/ImageGraph/StaticGraph.php
index f9bb63c6bf..a758804779 100644
--- a/plugins/ImageGraph/StaticGraph.php
+++ b/plugins/ImageGraph/StaticGraph.php
@@ -229,7 +229,7 @@ abstract class StaticGraph extends BaseFactory
      */
     protected static function getOutputPath($filename)
     {
-        $outputFilename = StaticContainer::getContainer()->get('path.tmp') . '/assets/' . $filename;
+        $outputFilename = StaticContainer::get('path.tmp') . '/assets/' . $filename;
 
         @chmod($outputFilename, 0600);
         @unlink($outputFilename);
diff --git a/plugins/ImageGraph/lang/bg.json b/plugins/ImageGraph/lang/bg.json
index 8401e5e0bc..e7da535f7b 100644
--- a/plugins/ImageGraph/lang/bg.json
+++ b/plugins/ImageGraph/lang/bg.json
@@ -1,6 +1,5 @@
 {
     "ImageGraph": {
-        "ColumnOrdinateMissing": "Колоната '%s' не е намерена в този доклад. Опитайте с %s",
-        "PluginDescription": "Генерирайте красиви статични PNG графични изображения за всеки Piwik доклад."
+        "ColumnOrdinateMissing": "Колоната '%s' не е намерена в този доклад. Опитайте с %s"
     }
 }
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/ca.json b/plugins/ImageGraph/lang/ca.json
index 8d702e9e90..aa81dbc279 100644
--- a/plugins/ImageGraph/lang/ca.json
+++ b/plugins/ImageGraph/lang/ca.json
@@ -1,6 +1,5 @@
 {
     "ImageGraph": {
-        "ColumnOrdinateMissing": "La columan '%s' no s'ha trobat en aquest informe. Proveu algun dels següents: %s",
-        "PluginDescription": "Generar belles imatges estàtiques en gràfic PNG per qualsevol informe del Piwik."
+        "ColumnOrdinateMissing": "La columan '%s' no s'ha trobat en aquest informe. Proveu algun dels següents: %s"
     }
 }
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/cs.json b/plugins/ImageGraph/lang/cs.json
index 4e05c186df..cbb430459b 100644
--- a/plugins/ImageGraph/lang/cs.json
+++ b/plugins/ImageGraph/lang/cs.json
@@ -1,6 +1,6 @@
 {
     "ImageGraph": {
         "ColumnOrdinateMissing": "Sloupec %s nebyl v tomto hlášení nalezen. Zkuste některé z %s",
-        "PluginDescription": "Generuje nádherné statické PNG grafy pro jakékoli Piwik hlášení."
+        "PluginDescription": "Generujte pěkné statické PNG grafy z jakéhokoliv hlášení."
     }
 }
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/da.json b/plugins/ImageGraph/lang/da.json
index 2bd6b39e32..ec4e208ed5 100644
--- a/plugins/ImageGraph/lang/da.json
+++ b/plugins/ImageGraph/lang/da.json
@@ -1,6 +1,5 @@
 {
     "ImageGraph": {
-        "ColumnOrdinateMissing": "Kolonnen '%s' blev ikke fundet i denne rapport. Prøv en af %s",
-        "PluginDescription": "Generere flotte statiske PNG diagrammer til Piwik rapporter."
+        "ColumnOrdinateMissing": "Kolonnen '%s' blev ikke fundet i denne rapport. Prøv en af %s"
     }
 }
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/de.json b/plugins/ImageGraph/lang/de.json
index c74ed7ea1a..150b572b7d 100644
--- a/plugins/ImageGraph/lang/de.json
+++ b/plugins/ImageGraph/lang/de.json
@@ -1,6 +1,6 @@
 {
     "ImageGraph": {
         "ColumnOrdinateMissing": "Die Spalte '%s' wurde in diesem Bericht nicht gefunden. Probieren Sie es mit einer hiervon: %s",
-        "PluginDescription": "Plugin zum Generieren von statischen Graphen (PNG-Bilder) für jeden Piwik Bericht."
+        "PluginDescription": "Generieren Sie schöne statische PNG Graph Bilder für Ihre Datenberichte."
     }
 }
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/el.json b/plugins/ImageGraph/lang/el.json
index b4a474cc25..6a954ebfd2 100644
--- a/plugins/ImageGraph/lang/el.json
+++ b/plugins/ImageGraph/lang/el.json
@@ -1,6 +1,6 @@
 {
     "ImageGraph": {
         "ColumnOrdinateMissing": "Η στήλη '%s' δε βρέθηκε σε αυτή την αναφορά. Δοκιμάστε ένα από τα %s",
-        "PluginDescription": "Δημιουργία όμορφων στατικών εικόνων PNG Διαγραμμάτων για οποιαδήποτε αναφορά του Piwik."
+        "PluginDescription": "Δημιουργήστε όμορφες στατικές εικόνες γραφικών PNG για κάθε μία από τις αναφορές σας."
     }
 }
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/en.json b/plugins/ImageGraph/lang/en.json
index 29951470d6..f229e539dc 100644
--- a/plugins/ImageGraph/lang/en.json
+++ b/plugins/ImageGraph/lang/en.json
@@ -1,6 +1,6 @@
 {
     "ImageGraph": {
         "ColumnOrdinateMissing": "The column '%s' was not found in this report. Try any of %s",
-        "PluginDescription": "Generate beautiful static PNG Graph images for any Piwik report."
+        "PluginDescription": "Generate beautiful static PNG Graph images for any of your data report."
     }
 }
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/es.json b/plugins/ImageGraph/lang/es.json
index be48a9544c..fea7c2b0fe 100644
--- a/plugins/ImageGraph/lang/es.json
+++ b/plugins/ImageGraph/lang/es.json
@@ -1,6 +1,5 @@
 {
     "ImageGraph": {
-        "ColumnOrdinateMissing": "La columna '%s' no se encontró en este reporte. Intenta alguno de %s",
-        "PluginDescription": "Genera bonitas imágenes estáticas PNG de cualquier reporte Piwik."
+        "ColumnOrdinateMissing": "La columna '%s' no se encontró en este reporte. Intenta alguno de %s"
     }
 }
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/fa.json b/plugins/ImageGraph/lang/fa.json
index 4ab6d4b669..f825ade6e4 100644
--- a/plugins/ImageGraph/lang/fa.json
+++ b/plugins/ImageGraph/lang/fa.json
@@ -1,6 +1,5 @@
 {
     "ImageGraph": {
-        "ColumnOrdinateMissing": "ستون '%s' در این گزارش پیدا نشد. تلاش کنید برای %s",
-        "PluginDescription": "تولید تصاویر زیبا PNG استاتیک نمودار هر گزارش Piwik."
+        "ColumnOrdinateMissing": "ستون '%s' در این گزارش پیدا نشد. تلاش کنید برای %s"
     }
 }
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/fi.json b/plugins/ImageGraph/lang/fi.json
index e50db1ae54..a65b80f8bb 100644
--- a/plugins/ImageGraph/lang/fi.json
+++ b/plugins/ImageGraph/lang/fi.json
@@ -1,6 +1,5 @@
 {
     "ImageGraph": {
-        "ColumnOrdinateMissing": "Kolumnia '%s' ei löydetty tässä raportissa. Kokeile mitä tahansa %s",
-        "PluginDescription": "Luo upeita staattisia PNG-kuvaajia mistä tahansa Piwikin raportista."
+        "ColumnOrdinateMissing": "Kolumnia '%s' ei löydetty tässä raportissa. Kokeile mitä tahansa %s"
     }
 }
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/fr.json b/plugins/ImageGraph/lang/fr.json
index fc34789ac1..5287312b14 100644
--- a/plugins/ImageGraph/lang/fr.json
+++ b/plugins/ImageGraph/lang/fr.json
@@ -1,6 +1,5 @@
 {
     "ImageGraph": {
-        "ColumnOrdinateMissing": "La colonne '%s' n'a pas été trouvée dans ce rapport. Essayez parmi %s",
-        "PluginDescription": "Génère de magnifiques graphiques en image PNG statique pour tous vos rapports Piwik."
+        "ColumnOrdinateMissing": "La colonne '%s' n'a pas été trouvée dans ce rapport. Essayez parmi %s"
     }
 }
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/hi.json b/plugins/ImageGraph/lang/hi.json
index 6c07c2d9e9..59312f09c7 100644
--- a/plugins/ImageGraph/lang/hi.json
+++ b/plugins/ImageGraph/lang/hi.json
@@ -1,6 +1,5 @@
 {
     "ImageGraph": {
-        "ColumnOrdinateMissing": "स्तंभ '%s' इस रिपोर्ट में नहीं मिला था. किसी %sका प्रयास करें",
-        "PluginDescription": "किसी भी Piwik रिपोर्ट के लिए सुंदर स्थिर पीएनजी ग्राफ छवियों को उत्पन्न करता है."
+        "ColumnOrdinateMissing": "स्तंभ '%s' इस रिपोर्ट में नहीं मिला था. किसी %sका प्रयास करें"
     }
 }
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/id.json b/plugins/ImageGraph/lang/id.json
index 6f4825753d..b44d08b89c 100644
--- a/plugins/ImageGraph/lang/id.json
+++ b/plugins/ImageGraph/lang/id.json
@@ -1,6 +1,5 @@
 {
     "ImageGraph": {
-        "ColumnOrdinateMissing": "Kolom '%s' tidak ditemukan dalam laporan ini. Coba salah satu dari %s",
-        "PluginDescription": "Bangkitkan grafik PNG statis indah untuk bermacam laporan Piwik."
+        "ColumnOrdinateMissing": "Kolom '%s' tidak ditemukan dalam laporan ini. Coba salah satu dari %s"
     }
 }
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/it.json b/plugins/ImageGraph/lang/it.json
index db4ec4d0c8..35f181ef9c 100644
--- a/plugins/ImageGraph/lang/it.json
+++ b/plugins/ImageGraph/lang/it.json
@@ -1,6 +1,6 @@
 {
     "ImageGraph": {
         "ColumnOrdinateMissing": "La colonna '%s' non è stato trovata in questo rapporto. Prova una di queste %s",
-        "PluginDescription": "Genera belle immagini PNG statiche dei grafici per qualsiasi report Piwik."
+        "PluginDescription": "Genera delle belle immagini statiche PNG di grafici per ognuno dei tuoi report dati."
     }
 }
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/ja.json b/plugins/ImageGraph/lang/ja.json
index 492ff339e0..7c9fa118eb 100644
--- a/plugins/ImageGraph/lang/ja.json
+++ b/plugins/ImageGraph/lang/ja.json
@@ -1,6 +1,5 @@
 {
     "ImageGraph": {
-        "ColumnOrdinateMissing": "列 '%s' は、このレポートで見つかりませんでした。%s のいずれかをお試しください。",
-        "PluginDescription": "Piwikリポートの美しい静的PNGグラフ画像を生成します。"
+        "ColumnOrdinateMissing": "列 '%s' は、このレポートで見つかりませんでした。%s のいずれかをお試しください。"
     }
 }
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/nl.json b/plugins/ImageGraph/lang/nl.json
index 1d9ec29a1f..81a0c53eeb 100644
--- a/plugins/ImageGraph/lang/nl.json
+++ b/plugins/ImageGraph/lang/nl.json
@@ -1,6 +1,6 @@
 {
     "ImageGraph": {
         "ColumnOrdinateMissing": "De kolom '%s' is niet gevonden in dit rapport. Probeer één van %s",
-        "PluginDescription": "Genereer mooie PNG Grafieken voor elk Piwik rapport."
+        "PluginDescription": "Genereer mooie statische PNG Grafiek afbeeldingen voor elk van uw data rapporten."
     }
 }
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/pt-br.json b/plugins/ImageGraph/lang/pt-br.json
index e6874c08ed..776fa6ee63 100644
--- a/plugins/ImageGraph/lang/pt-br.json
+++ b/plugins/ImageGraph/lang/pt-br.json
@@ -1,6 +1,5 @@
 {
     "ImageGraph": {
-        "ColumnOrdinateMissing": "A coluna '%s' não foi encontrado neste relatório. Tente qualquer um %s",
-        "PluginDescription": "Gerar belas imagens estáticas dos gráfico em PNG para qualquer relatório Piwik."
+        "ColumnOrdinateMissing": "A coluna '%s' não foi encontrado neste relatório. Tente qualquer um %s"
     }
 }
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/ro.json b/plugins/ImageGraph/lang/ro.json
index 40f677a0bb..cc07edab2f 100644
--- a/plugins/ImageGraph/lang/ro.json
+++ b/plugins/ImageGraph/lang/ro.json
@@ -1,6 +1,5 @@
 {
     "ImageGraph": {
-        "ColumnOrdinateMissing": "Coloana '%s' nu a fost gasita in acest raport. Incearca oricare dintre %s",
-        "PluginDescription": "Generează frumoase statice grafice imagini PNG pentru orice raport Piwik."
+        "ColumnOrdinateMissing": "Coloana '%s' nu a fost gasita in acest raport. Incearca oricare dintre %s"
     }
 }
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/ru.json b/plugins/ImageGraph/lang/ru.json
index 68485d0464..c82145f94b 100644
--- a/plugins/ImageGraph/lang/ru.json
+++ b/plugins/ImageGraph/lang/ru.json
@@ -1,6 +1,5 @@
 {
     "ImageGraph": {
-        "ColumnOrdinateMissing": "Колонка ’%s’ не была найдена в этом отчете. Попробуйте что-нибудь из %s",
-        "PluginDescription": "Генерировать красивый статичный PNG-график для всех отчетов Piwik."
+        "ColumnOrdinateMissing": "Колонка ’%s’ не была найдена в этом отчете. Попробуйте что-нибудь из %s"
     }
 }
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/sr.json b/plugins/ImageGraph/lang/sr.json
index 453699aca1..09404d1ea8 100644
--- a/plugins/ImageGraph/lang/sr.json
+++ b/plugins/ImageGraph/lang/sr.json
@@ -1,6 +1,5 @@
 {
     "ImageGraph": {
-        "ColumnOrdinateMissing": "Kolona '%s' nije nađena u ovom izveštaju. Pokušajte bilo koju od %s",
-        "PluginDescription": "Kreirajte statične PNG slike grafika za bilo koji Piwik izveštaj."
+        "ColumnOrdinateMissing": "Kolona '%s' nije nađena u ovom izveštaju. Pokušajte bilo koju od %s"
     }
 }
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/sv.json b/plugins/ImageGraph/lang/sv.json
index 4a742358b6..40983a891d 100644
--- a/plugins/ImageGraph/lang/sv.json
+++ b/plugins/ImageGraph/lang/sv.json
@@ -1,6 +1,5 @@
 {
     "ImageGraph": {
-        "ColumnOrdinateMissing": "Kolumn '%s' var inte hittad i den här rapporten. Pröva någon av %s",
-        "PluginDescription": "Skapa fina statiska grafbilder i PNG-format för någon Piwik rapport."
+        "ColumnOrdinateMissing": "Kolumn '%s' var inte hittad i den här rapporten. Pröva någon av %s"
     }
 }
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/vi.json b/plugins/ImageGraph/lang/vi.json
index 54d8c7d952..540c0a2093 100644
--- a/plugins/ImageGraph/lang/vi.json
+++ b/plugins/ImageGraph/lang/vi.json
@@ -1,6 +1,5 @@
 {
     "ImageGraph": {
-        "ColumnOrdinateMissing": "Cột này '%s' không thấy trong báo cáo này. Thử bất kỳ của %s",
-        "PluginDescription": "Tạo ra hình ảnh đồ họa PNG tĩnh đẹp cho các báo cáo Piwik."
+        "ColumnOrdinateMissing": "Cột này '%s' không thấy trong báo cáo này. Thử bất kỳ của %s"
     }
 }
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/zh-cn.json b/plugins/ImageGraph/lang/zh-cn.json
index 134fb0e044..ea37a3b85c 100644
--- a/plugins/ImageGraph/lang/zh-cn.json
+++ b/plugins/ImageGraph/lang/zh-cn.json
@@ -1,6 +1,5 @@
 {
     "ImageGraph": {
-        "ColumnOrdinateMissing": "报表中没有 '%s' 栏，请试试 %s",
-        "PluginDescription": "为 Piwik 统计报表生成漂亮的PNG图片。"
+        "ColumnOrdinateMissing": "报表中没有 '%s' 栏，请试试 %s"
     }
 }
\ No newline at end of file
diff --git a/plugins/Insights/Visualizations/Insight.php b/plugins/Insights/Visualizations/Insight.php
index a22206d698..7fe304e5be 100644
--- a/plugins/Insights/Visualizations/Insight.php
+++ b/plugins/Insights/Visualizations/Insight.php
@@ -93,6 +93,7 @@ class Insight extends Visualization
         $this->config->show_pagination_control = false;
         $this->config->show_offset_information = false;
         $this->config->show_search = false;
+        $this->config->show_export_as_rss_feed = false;
 
         if (!self::canDisplayViewDataTable($this)) {
             $this->assignTemplateVar('cannotDisplayReport', true);
diff --git a/plugins/Insights/lang/nb.json b/plugins/Insights/lang/nb.json
index fad9cbfa9a..093e760595 100644
--- a/plugins/Insights/lang/nb.json
+++ b/plugins/Insights/lang/nb.json
@@ -2,7 +2,9 @@
     "Insights": {
         "DayComparedToPreviousDay": "forrige dag",
         "DayComparedToPreviousWeek": "samme dag i forrige uke",
+        "DayComparedToPreviousYear": "samme dag i foregående år",
         "MonthComparedToPreviousMonth": "forrige måned",
+        "TitleRowChangeDetails": "'%1$s' endret fra %2$s (%3$s) til %4$s (%5$s) %6$s.",
         "WeekComparedToPreviousWeek": "forrige uke",
         "YearComparedToPreviousYear": "forrige år"
     }
diff --git a/plugins/Insights/lang/ru.json b/plugins/Insights/lang/ru.json
index 85655b5b21..b177158c4f 100644
--- a/plugins/Insights/lang/ru.json
+++ b/plugins/Insights/lang/ru.json
@@ -3,6 +3,7 @@
         "DayComparedToPreviousDay": "предыдущий день",
         "DayComparedToPreviousWeek": "тот же день неделей ранее",
         "DayComparedToPreviousYear": "тот же день в предыдущем году",
+        "Filter": "Фильтр",
         "FilterOnlyNew": "Только новые",
         "MonthComparedToPreviousMonth": "предыдущий месяц",
         "MonthComparedToPreviousYear": "тот же месяц годом ранее",
diff --git a/plugins/Insights/plugin.json b/plugins/Insights/plugin.json
index 985eca4c6d..87171aa815 100644
--- a/plugins/Insights/plugin.json
+++ b/plugins/Insights/plugin.json
@@ -1,7 +1,7 @@
 {
  "name": "Insights",
  "version": "0.1.0",
- "description": "Get insights",
+ "description": "Provides Insights about your traffic. Insights are available as dashboard widgets as well as a new icon in reports to let you see most important trends in your data.",
  "theme": false,
  "license": "GPL v3+",
  "homepage": "http://piwik.org",
diff --git a/plugins/Insights/tests/Integration/ApiTest.php b/plugins/Insights/tests/Integration/ApiTest.php
index dfa76dcde1..56d51add2d 100644
--- a/plugins/Insights/tests/Integration/ApiTest.php
+++ b/plugins/Insights/tests/Integration/ApiTest.php
@@ -8,8 +8,7 @@
 
 namespace Piwik\Plugins\Insights\tests;
 use Piwik\API\Request as ApiRequest;
-use Piwik\Cache\PluginAwareStaticCache;
-use Piwik\Cache\StaticCache;
+use Piwik\Cache as PiwikCache;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 use Piwik\Plugins\Insights\API;
@@ -40,13 +39,19 @@ class ApiTest extends SystemTestCase
     {
         parent::setUp();
 
-        StaticCache::clearAll();
-        PluginAwareStaticCache::clearAll();
+        PiwikCache::flushAll();
 
-        Translate::reloadLanguage('en');
+        Translate::loadAllTranslations();
         $this->api = API::getInstance();
     }
 
+    public function tearDown()
+    {
+        parent::tearDown();
+
+        Translate::reset();
+    }
+
     /**
      * '/Mover1' => 2,    +8  // 400%
      * '/Old1' => 9,      -9  // -100%
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index 9d6244a63c..7641624cb3 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -78,26 +78,20 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
      * Installation Step 1: Welcome
      *
      * Can also display an error message when there is a failure early (eg. DB connection failed)
-     *
-     * @param string Optional error message
      */
-    function welcome($message = false)
+    function welcome()
     {
         // Delete merged js/css files to force regenerations based on updated activated plugin list
         Filesystem::deleteAllCacheOnUpdate();
 
-        if (empty($message)) {
-            $this->checkPiwikIsNotInstalled();
-        }
+        $this->checkPiwikIsNotInstalled();
         $view = new View(
             '@Installation/welcome',
             $this->getInstallationSteps(),
             __FUNCTION__
         );
 
-        $view->newInstall = !SettingsPiwik::isPiwikInstalled();
-        $view->errorMessage = $message;
-        $view->showNextStep = $view->newInstall;
+        $view->showNextStep = true;
         return $view->render();
     }
 
@@ -563,7 +557,8 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
         \Piwik\Plugins\Login\Controller::clearSession();
         $message = Piwik::translate('Installation_InvalidStateError',
             array('<br /><strong>',
-                  '</strong><a href=\'' . Common::sanitizeInputValue(Url::getCurrentUrlWithoutFileName()) . '\'>',
+                  // piwik-is-already-installed is checked against in checkPiwikServerWorking
+                  '</strong><a id="piwik-is-already-installed" href=\'' . Common::sanitizeInputValue(Url::getCurrentUrlWithoutFileName()) . '\'>',
                   '</a>')
         );
         Piwik::exitWithErrorMessage($message);
diff --git a/plugins/Installation/FormSuperUser.php b/plugins/Installation/FormSuperUser.php
index 87adc47259..c3cf89e7c3 100644
--- a/plugins/Installation/FormSuperUser.php
+++ b/plugins/Installation/FormSuperUser.php
@@ -70,7 +70,7 @@ class FormSuperUser extends QuickForm2
         // default values
         $this->addDataSource(new HTML_QuickForm2_DataSource_Array(array(
             'subscribe_newsletter_piwikorg' => 1,
-            'subscribe_newsletter_piwikpro' => 0,
+            'subscribe_newsletter_piwikpro' => 1,
         )));
     }
 }
diff --git a/plugins/Installation/Installation.php b/plugins/Installation/Installation.php
index 427d3d502e..3d501c2627 100644
--- a/plugins/Installation/Installation.php
+++ b/plugins/Installation/Installation.php
@@ -91,8 +91,6 @@ class Installation extends \Piwik\Plugin
             $message = '';
         }
 
-        Translate::reloadLanguage();
-
         $action = Common::getRequestVar('action', 'welcome', 'string');
 
         if ($this->isAllowedAction($action)) {
diff --git a/plugins/Installation/SystemCheck.php b/plugins/Installation/SystemCheck.php
index 55c223cbb8..de55506884 100644
--- a/plugins/Installation/SystemCheck.php
+++ b/plugins/Installation/SystemCheck.php
@@ -129,6 +129,9 @@ class SystemCheck
         }
 
         if (   !empty($infos['missing_desired_extensions'])
+            || !empty($infos['missing_desired_functions'])
+            || !empty($infos['missing_settings'])
+            || !$infos['pagespeed_module_disabled_ok']
             || !$infos['gd_ok']
             || !$infos['memory_ok']
             || !empty($infos['integrityErrorMessages'])
@@ -146,7 +149,7 @@ class SystemCheck
      */
     protected static function getDirectoriesShouldBeWritable()
     {
-        $tmpPath = StaticContainer::getContainer()->get('path.tmp');
+        $tmpPath = StaticContainer::get('path.tmp');
 
         $directoriesToCheck = array(
             $tmpPath,
diff --git a/plugins/Installation/javascripts/installation.js b/plugins/Installation/javascripts/installation.js
index 11e63879c3..43abe2cefd 100644
--- a/plugins/Installation/javascripts/installation.js
+++ b/plugins/Installation/javascripts/installation.js
@@ -1,5 +1,4 @@
 $(function () {
-    $('#toFade').fadeOut(4000, function () { $(this).show().css({visibility: 'hidden'}); });
     $('input:first').focus();
     $('#progressbar').progressbar({
         value: parseInt($('#progressbar').attr('data-progress'))
diff --git a/plugins/Installation/lang/ar.json b/plugins/Installation/lang/ar.json
index faa95b50f0..ad3ad56592 100644
--- a/plugins/Installation/lang/ar.json
+++ b/plugins/Installation/lang/ar.json
@@ -27,7 +27,6 @@
         "PasswordRepeat": "كلمة المرور (تأكيد)",
         "PercentDone": "تم تنفيذ %s %%",
         "PleaseFixTheFollowingErrors": "الرجاء إصلاح الأخطاء التالية",
-        "PluginDescription": "عملية تثبيت Piwik. عملية التثبيت تتم مرة واحدة عادة. إذا تم حذف ملف الإعدادات config\/config.inc.php فستبدأ عملية التثبيت مرة أخرى.",
         "Requirements": "متطلبات Piwik",
         "SetupWebsite": "إعداد موقع ويب",
         "SetupWebsiteError": "حدث خطأ ما أثناء إضافة الموقع",
diff --git a/plugins/Installation/lang/be.json b/plugins/Installation/lang/be.json
index 7cd56849ef..a7eef1b00f 100644
--- a/plugins/Installation/lang/be.json
+++ b/plugins/Installation/lang/be.json
@@ -27,7 +27,6 @@
         "PasswordRepeat": "пароль (яшчэ раз)",
         "PercentDone": "%s %% Завершана",
         "PleaseFixTheFollowingErrors": "Калі ласка, выпраўце наступныя памылкі",
-        "PluginDescription": "Працэс усталёўкі Piwik. Усталёўка звычайна адбывацца толькі адзін раз. Калі канфігурацыйны файл config\/config.inc.php выдалены, ўстаноўка пачнецца зноў.",
         "Requirements": "Патрабаванні Piwik",
         "SetupWebsite": "Дадаць сайт",
         "SetupWebsiteError": "Паўстала памылка пры даданні сайта",
diff --git a/plugins/Installation/lang/bg.json b/plugins/Installation/lang/bg.json
index 66641d5274..c0f48576d9 100644
--- a/plugins/Installation/lang/bg.json
+++ b/plugins/Installation/lang/bg.json
@@ -39,7 +39,6 @@
         "PasswordRepeat": "парола (повторно)",
         "PercentDone": "%s %% развитие",
         "PleaseFixTheFollowingErrors": "Моля, поправете следните грешки",
-        "PluginDescription": "Инсталационния процес на Piwik. Инсталацията обикновено се прави само веднъж. Ако конфигурационния файл config\/ config.inc.php е изтрит, инсталацията ще започне отново.",
         "Requirements": "Piwik Изисквания",
         "RestartWebServer": "След като направите промените, рестартирайте уеб сървара.",
         "SeeBelowForMoreInfo": "Вижте по-долу за повече информация.",
diff --git a/plugins/Installation/lang/ca.json b/plugins/Installation/lang/ca.json
index 23dbc9016c..22e8572b19 100644
--- a/plugins/Installation/lang/ca.json
+++ b/plugins/Installation/lang/ca.json
@@ -35,7 +35,6 @@
         "PasswordRepeat": "Torneu a escriure la contrasenya",
         "PercentDone": "%s%% fet",
         "PleaseFixTheFollowingErrors": "Siusplau corregiu els següents errors",
-        "PluginDescription": "Procès d'instal·lació del Piwik. El procès d'instal·lació només es dur a temre una vegada. Si el fitxer de configuració config\/config.inc.php s'esborrà es tornarà a iniciar la instal·lació.",
         "Requirements": "Requeriments del Piwik",
         "RestartWebServer": "Desprès de fer aquest canvi, reinicieu el vostre servidor web.",
         "SeeBelowForMoreInfo": "Llegiu a continuació per més informació.",
diff --git a/plugins/Installation/lang/cs.json b/plugins/Installation/lang/cs.json
index 75ec851e40..c7a8d61c33 100644
--- a/plugins/Installation/lang/cs.json
+++ b/plugins/Installation/lang/cs.json
@@ -29,6 +29,7 @@
         "InstallationStatus": "Stav instalace",
         "InsufficientPrivilegesHelp": "Tato privilegia můžete přidat v nástroji jako je phpMyAdmin, nebo provedením správných SQL dotazů. Pokud nevíte, jak to udělat, požádejte svého systémového administrátora, aby vám tato privilegia udělil.",
         "InsufficientPrivilegesMain": "Databáze buď neexistuje, a nemohla být vytvořena, nebo má databázový uživatel nedostatečná privilegia. Databázový uživatel musí mít následující privilegia: %s",
+        "InvalidStateError": "Chyba: Piwik je již nainstalován. %1$s Jít zpět %2$s do piwiku%3$s.",
         "JsTagArchivingHelp1": "Pro střední a velké stránky jsou určité optimalizace, které umožňují Piwiku běžet rychleji, jako třeba %1$snastavení automatického archivování%2$s.",
         "JSTracking_EndNote": "Poznámka: Po dokončení procesu instalace můžete vytvořit vlastní sledovací kód na stránce %1$ssledovací kód%2$s.",
         "JSTracking_Intro": "Pokud chcete sledovat Pokud chcete Piwikem sledovat váš provoz na webu, musíte zajistit, že do každé stránky bude přidán extra kód.",
@@ -47,9 +48,8 @@
         "PasswordRepeat": "heslo (opakování)",
         "PercentDone": "%s %% hotovo",
         "PiwikOrgNewsletter": "odesílat e-maily s důležitými událostmi v komunitě Piwiku",
-        "PiwikProNewsletter": "Zajímají mě %spro Piwik%s služby (nejvíše jeden e-mail měsíčně)",
+        "PiwikProNewsletter": "Zasílejte mi informace o službách a nabídkách %sPiwik pro%s",
         "PleaseFixTheFollowingErrors": "Prosím opravte následující chyby",
-        "PluginDescription": "Instalační proces Piwiku. Instalace se obvykle používá jednou. V případě vymazání konfiguračního souboru config\/config.inc.php se instalace zahájí znovu",
         "Requirements": "Požadavky Piwiku",
         "RestartWebServer": "Po uložení změn restartujte Vás web server.",
         "ReusingTables": "Použití existujících tabulek",
@@ -94,10 +94,14 @@
         "SystemCheckOtherExtensions": "Ostatní rozšíření",
         "SystemCheckOtherFunctions": "Ostatní funkce",
         "SystemCheckPackHelp": "Funkce pack() je nutná ke sledování návštěvnosti v Piwiku.",
+        "SystemCheckPageSpeedDisabled": "PageSpeed zakázán",
+        "SystemCheckPageSpeedWarn": "Doporučujeme modul PageSpeed zakázat v konfiguraci webového serveru: %s Bylo hlášeno, že způsobuje problémy s Piwikem.",
         "SystemCheckParseIniFileHelp": "Tato vestavěná funkce byla na vašem hostiteli zakázaná. Piwik se pokusí tuto funkci emulovat, ale můžete zaznamenat další bezpečnostní omezení. Výkonnost trackeru bude také omezena.",
         "SystemCheckPdoAndMysqliHelp": "Na GNU\/Linux systému můžete zkompilovat PHP s následujícími volbami: %1$s Přidejte následující řádky do php.ini: %2$s",
         "SystemCheckPhp": "Verze PHP",
         "SystemCheckPhpPdoAndMysqli": "Více informací na: %1$sPHP PDO%2$s and %3$sMYSQLI%4$s.",
+        "SystemCheckPhpSetting": "Abyste zabránili vážným problémům, ve vašem souboru php.ini musíte nastavit %s",
+        "SystemCheckSettings": "Požadovaná konfigurace PHP (php.ini)",
         "SystemCheckSplHelp": "Musíte překompilovat PHP s povolenou standardní PHP knihovou (ve výchozím stavu povolena).",
         "SystemCheckSummaryNoProblems": "Hurááá! Nejsou zde žádné problémy s nastavením Piwiku. Gratulujeme",
         "SystemCheckSummaryThereWereErrors": "Ajaj! Piwik zjistil %1$skritické problémy%2$s s nastavením instalace Piwiku. %3$sTyto problémy musí být okamžitě vyřešeny.%4$s",
diff --git a/plugins/Installation/lang/da.json b/plugins/Installation/lang/da.json
index e9dab7c093..ff3a59ded4 100644
--- a/plugins/Installation/lang/da.json
+++ b/plugins/Installation/lang/da.json
@@ -47,9 +47,7 @@
         "PasswordRepeat": "Gentag adgangskode",
         "PercentDone": "%s %% udført",
         "PiwikOrgNewsletter": "e-mail mig de vigtigste Piwik community opdateringer",
-        "PiwikProNewsletter": "Jeg er interesseret i %sPiwik PRO%s tjenester (ikke mere end 1 e-mail om måneden)",
         "PleaseFixTheFollowingErrors": "Ret følgende fejl",
-        "PluginDescription": "Installation af Piwik. Installationen sker som regel kun én gang. Hvis konfigurationsfilen config\/config.inc.php slettes starter installationen igen.",
         "Requirements": "Piwik krav",
         "RestartWebServer": "Efter ændringen er have foretaget - genstart webserveren.",
         "ReusingTables": "Genbrug tabellerne",
@@ -94,10 +92,14 @@
         "SystemCheckOtherExtensions": "Andre udvidelser",
         "SystemCheckOtherFunctions": "Andre funktioner",
         "SystemCheckPackHelp": "Funktionen pack() er nødvendig for at spore besøgende i Piwik.",
+        "SystemCheckPageSpeedDisabled": "PageSpeed er deaktiveret",
+        "SystemCheckPageSpeedWarn": "Vi anbefaler at deaktivere PageSpeed modulet i server %s: PageSpeed er blevet rapporteret at forårsage flere problemer med Piwik.",
         "SystemCheckParseIniFileHelp": "Den indbyggede funktion er blevet deaktiveret hos udbyderen. Piwik vil forsøge at efterligne funktionen, men kan støde på yderligere sikkerhed restriktioner. Sporingsydelsen vil også blive påvirket.",
         "SystemCheckPdoAndMysqliHelp": "På en linux-server kan php kompileres med følgende valg: %1$sn i php.ini, tilføj følgende linjer: %2$s",
         "SystemCheckPhp": "PHP version",
         "SystemCheckPhpPdoAndMysqli": "Mere information på: %1$sPHP PDO%2$s og %3$sMYSQLI%4$s.",
+        "SystemCheckPhpSetting": "For at undgå nogle kritiske punkter, skal følgende indstilles i php.ini filen: %s",
+        "SystemCheckSettings": "Obligatorisk PHP konfiguration (php.ini)",
         "SystemCheckSplHelp": "Konfigurer og genstart PHP med standard PHP Biblioteket (SPL) aktiveret (som standard).",
         "SystemCheckSummaryNoProblems": "Sådan! Der er ingen problemer med din Piwik opsætning. Giv dig selv et klap på skulderen.",
         "SystemCheckSummaryThereWereErrors": "Ups! Piwik har opdaget nogle %1$skritiske problemer%2$s med din Piwik opsætning. %3$sDisse problemer skal løses øjeblikkeligt.%4$s",
diff --git a/plugins/Installation/lang/de.json b/plugins/Installation/lang/de.json
index 3daa6bd088..aeed6a9abd 100644
--- a/plugins/Installation/lang/de.json
+++ b/plugins/Installation/lang/de.json
@@ -29,6 +29,7 @@
         "InstallationStatus": "Installationstatus",
         "InsufficientPrivilegesHelp": "Sie können diese Rechte mit einem Tool wie phpMyAdmin oder den entsprechenden SQL Kommandos hinzufügen. Wenn Sie nicht wissen, was zu tun ist, wenden Sie sich bitte an den System Administrator, damit er für Sie diese Rechte setzt.",
         "InsufficientPrivilegesMain": "Entweder existiert die Datenbank nicht (und konnte nicht erstellt werden), oder der angegebene Benutzer hat unzureichende Berechtigungen. Der Datenbankbenutzer muss folgende Berechtigungen besitzen: %s",
+        "InvalidStateError": "Fehler: Piwik ist bereits installiert. %1$s Zurück %2$s zu Piwik%3$s.",
         "JsTagArchivingHelp1": "Für Webseiten mit mittlerem bis hohem Verkehrsaufkommen gibt es einige Optimierungen, die vorgenommen werden sollten, damit Piwik schneller läuft (z.B. %1$sdie Einrichtung von Auto-Archivierung%2$s).",
         "JSTracking_EndNote": "Hinweis: Nach der Installation können Sie sich einen angepassten Tracking Code unter Einstellungen > %1$sTracking Code%2$s erzeugen.",
         "JSTracking_Intro": "Um Ihre Webseite mit Piwik zu überwachen, müssen Sie sicherstellen, dass ein zusätzlicher Quellcode auf jede Ihrer Webseiten eingefügt wurde.",
@@ -47,9 +48,8 @@
         "PasswordRepeat": "Passwort (wiederholen)",
         "PercentDone": "%s %% Fertig",
         "PiwikOrgNewsletter": "Wichtige Piwik Community Updates per Mail zukommen lassen",
-        "PiwikProNewsletter": "Ich interessiere mich für den %sPiwik PRO%s Service (nicht mehr als 1 E-Mail pro Monat)",
+        "PiwikProNewsletter": "Lassen Sie mir Informationen über %sPiwik PRO%s Dienstleistungen und Angebote zukommen.",
         "PleaseFixTheFollowingErrors": "Bitte beheben Sie die folgenden Fehler",
-        "PluginDescription": "Installationsprozess. Die Installation wird einmalig durchgeführt. Wenn die Konfigurationsdatei (config\/config.php) gelöscht wird, startet die Installation erneut.",
         "Requirements": "Anforderungen für die Piwik-Installation",
         "RestartWebServer": "Nach dieser Änderung müssen Sie den Webserver neu starten.",
         "ReusingTables": "Tabellen werden wiederverwendet",
@@ -82,7 +82,7 @@
         "SystemCheckGlobHelp": "Diese eingebaute Funktion ist auf ihrem System deaktiviert. Piwik wird versuchen, diese Funktion zu emulieren, aber dabei möglicherweise auf weitere Sicherheitseinschränkungen stoßen. Die Funktionalität kann beeinträchtigt werden.",
         "SystemCheckGzcompressHelp": "Sie müssen die zlib Erweiterung und die gzcompress Funktion aktivieren.",
         "SystemCheckGzuncompressHelp": "Sie müssen die zlib Erweiterung und die gzuncompress Funktion aktivieren.",
-        "SystemCheckIconvHelp": "Sie müssen PHP mit \"iconv\" Unterstützung konfigurieren und neu übersetzen ( --with-iconv).",
+        "SystemCheckIconvHelp": "Sie müssen PHP mit \"iconv\" Unterstützung konfigurieren und neu bauen ( --with-iconv).",
         "SystemCheckJsonHelp": "Die php5-json Erweiterung wird benötigt, damit Piwik JSON-Daten lesen und schreiben kann.",
         "SystemCheckMailHelp": "Feedback und Nachrichten zu verlorenen Passwörtern können nicht ohne mail() versendet werden.",
         "SystemCheckMbstring": "mbstring",
@@ -94,10 +94,14 @@
         "SystemCheckOtherExtensions": "Andere Erweiterungen",
         "SystemCheckOtherFunctions": "Andere Funktionen",
         "SystemCheckPackHelp": "Die Funktion pack() wird benötigt um Besucher in Piwik tracken zu können.",
+        "SystemCheckPageSpeedDisabled": "PageSpeed deaktiviert",
+        "SystemCheckPageSpeedWarn": "Wir empfehlen, das PageSpeed Modul auf Ihrem Web Server zu deaktivieren %s: PageSpeed wurde als Verursacher diverser Probleme im Zusammenhang mit Piwik gemeldet.",
         "SystemCheckParseIniFileHelp": "Diese Funktion wird von Ihrem System nicht unterstützt. Piwik wird versuchen, diese Funktion zu emulieren, aber es könnte sein, dass dadurch Sicherheitseinstellungen gelockert werden müssen. Die Geschwindigkeit des Tracker könnte auch beeinflußt werden.",
         "SystemCheckPdoAndMysqliHelp": "Auf einem Linux-Server können Sie PHP mit den folgenden Optionen kompilieren: %1$s In Ihrer php.ini fügen Sie dann die folgenden Zeilen ein: %2$s",
         "SystemCheckPhp": "PHP-Version",
         "SystemCheckPhpPdoAndMysqli": "Weitere Informationen unter: %1$sPHP PDO%2$s und %3$sMYSQLI%4$s.",
+        "SystemCheckPhpSetting": "Um schwerwiegende Probleme zu verhinden, sollten Sie Folgendes in Ihrer php.ini setzen: %s",
+        "SystemCheckSettings": "Benötigte PHP Konfiguration (php.ini)",
         "SystemCheckSplHelp": "Sie müssen PHP mit standardmäßig aktivierter Standard PHP Bibliothek (SPL) konfigurieren und neu übersetzen.",
         "SystemCheckSummaryNoProblems": "Gratulation! Es gibt keine Probleme mit Ihrer Piwik Installation. Sie können sich selbst auf die Schulter klopfen.",
         "SystemCheckSummaryThereWereErrors": "Ohje! Piwik hat einige %1$skritische Fehler%2$s mit Ihrer Installation festgestellt. %3$sDiese sollten schnellstmöglich behoben werden.%4$s",
diff --git a/plugins/Installation/lang/el.json b/plugins/Installation/lang/el.json
index cce5dc4d54..44d951060d 100644
--- a/plugins/Installation/lang/el.json
+++ b/plugins/Installation/lang/el.json
@@ -29,6 +29,7 @@
         "InstallationStatus": "Κατάσταση εγκατάστασης",
         "InsufficientPrivilegesHelp": "Μπορείτε να προσθέσετε αυτά τα δικαιώματα χρησιμοποιώντας ένα εργαλείο όπως το phpMyAdmin ή εκτελόντας τα κατάλληλα ερωτήματα SQL. Αν δεν ξέρετε πως τα κάνετε αυτά, ρωτήστε το διαχειριστή του συστήματος για να δώσει αυτά τα δικαιώματα.",
         "InsufficientPrivilegesMain": "Είτε δεν υπάρχει η βάση δεδομένων (και δεν ήταν δυνατή η δημιουργία της), είτε ο συγκεκριμένος χρήστης δεν έχει τα απαραίτητα δικαιώματα. Ο χρήστης της βάσης δεδομένων πρέπει να έχει τα εξής δικαιώματα: %s",
+        "InvalidStateError": "Σφάλμα: Το Piwik έχει ήδη εγκατασταθεί. %1$s Πηγαίνετε πίσω %2$s στο Piwik%3$s.",
         "JsTagArchivingHelp1": "Για ιστοσελίδες μεσαίας και υψηλής επισκεψιμότητας, υπάρχουν ορισμένες βελτιώσεις που πρέπει να γίνουν για να βοηθήσουν το Piwik να τρέξει γρηγορότερα (όπως %1$sρύθμιση αυτόματης αρχειοθέτησης%2$s).",
         "JSTracking_EndNote": "Σημείωση: Μετά τη διαδικασία εγκατάστασης, μπορείτε να δημιουργήσετε ένα προσαρμοσμένο κώδικα παρακολούθησης, από τη διαχειριστική ενότητα %1$sΚωδικός Παρακολούθησης%2$s.",
         "JSTracking_Intro": "Για την παρακολούθηση της κυκλοφορίας της ιστοσελίδας σας με το Piwik, θα πρέπει να προσθέσετε επιπλέον κώδικα σε καθεμία από τις ιστοσελίδες σας.",
@@ -47,9 +48,8 @@
         "PasswordRepeat": "Επανάληψη κωδικού πρόσβασης",
         "PercentDone": "%s %% Ολοκληρώθηκε",
         "PiwikOrgNewsletter": "στείλε μου e-mail για μεγάλες ενημερώσεις της κοινοτικής έκδοσης του Piwik",
-        "PiwikProNewsletter": "Ενδιαφέρομαι για υπηρεσίες του %sPiwik PRO%s (όχι περισσότερα από 1 e-mail το μήνα)",
+        "PiwikProNewsletter": "στείλε μου πληροφορίες σχετικά με τις υπηρεσίες του %sPiwik PRO%s και τις προσφορές του",
         "PleaseFixTheFollowingErrors": "Διορθώστε τα ακόλουθα σφάλματα",
-        "PluginDescription": "Διαδικασία εγκατάστασης του Piwik. Η Εγκατάσταση γίνεται συνήθως μόνο μια φορά. Αν το αρχείο ρυθμίσεων config\/config.inc.php έχει διαγραφεί, η εγκατάσταση θα ξεκινήσει από την αρχή.",
         "Requirements": "Απαιτήσεις Piwik",
         "RestartWebServer": "Μετά από αυτή την αλλαγή, επανεκκινήστε τον διακομιστή σας.",
         "ReusingTables": "Γίνεται χρήση των Πινάκων",
@@ -94,10 +94,14 @@
         "SystemCheckOtherExtensions": "Άλλες επεκτάσεις",
         "SystemCheckOtherFunctions": "Άλλες συναρτήσεις",
         "SystemCheckPackHelp": "Η συνάρτηση pack() απαιτείται για την καταγραφή επισκεπτών στο Piwik.",
+        "SystemCheckPageSpeedDisabled": "Το PageSpeed είναι απενεργοποιημένο",
+        "SystemCheckPageSpeedWarn": "Συνιστούμε την απενεργοποίηση της μονάδας PageSpeed στον διακομιστή ιστού σας %s: Έχει αναφερθεί ότι το PageSpeed δημιουργεί διάφορα προβλήματα στο Piwik.",
         "SystemCheckParseIniFileHelp": "Αυτή η εσωτερική συνάρτηση έχει απενεργοποιηθεί στον διακομιστή σας. Το Piwik θα προσπαθήσει να εξομοιώσει αυτή τη συνάρτηση αλλά ίσως προκύψουν περαιτέρω περιορισμοί ασφάλειας. Η απόδοση της ανίχνευσης θα επηρεαστεί.",
         "SystemCheckPdoAndMysqliHelp": "Σε διακομιστή Linux μπορείτε να ρυθμίσετε την php με τις ακόλουθες επιλογές: %1$s στο αρχείο php.ini, προσθέστε τις ακόλουθες γραμμές: %2$s",
         "SystemCheckPhp": "Έκδοση PHP",
         "SystemCheckPhpPdoAndMysqli": "Περισσότερες πληροφορίες στο: %1$sPHP PDO%2$s και %3$sMYSQLI%4$s.",
+        "SystemCheckPhpSetting": "Για την αποφυγή σημαντικών προβλημάτων, πρέπει να ορίσετε τα παρακάτω στο αρχείο php.ini: %s",
+        "SystemCheckSettings": "Απαιτούμενη παραμετροποίηση PHP (php.ini)",
         "SystemCheckSplHelp": "Πρέπει να ρυθμίσετε και ξαναεγκαταστήσετε την PHP με τη Βασική Βιβλιοθήκη PHP (SPL) ενεργοποιήμένη (ως προεπιλογή).",
         "SystemCheckSummaryNoProblems": "Δεν υπάρχουν προβλήματα με την εγκατάσταση του Piwik. Όλα καλά!",
         "SystemCheckSummaryThereWereErrors": "Ώωχ, το Piwik εντόπισε %1$sκρίσιμα θέματα%2$s με την εγκατάσταση του Piwik. %3$sΑυτά τα θέματα πρέπει να διορθωθούν άμεσα.%4$s",
diff --git a/plugins/Installation/lang/en.json b/plugins/Installation/lang/en.json
index 8a4cf6ec98..9711d997c3 100644
--- a/plugins/Installation/lang/en.json
+++ b/plugins/Installation/lang/en.json
@@ -43,14 +43,13 @@
         "PasswordRepeat": "password (repeat)",
         "PercentDone": "%s %% Done",
         "PleaseFixTheFollowingErrors": "Please fix the following errors",
-        "PluginDescription": "Installation process of Piwik. The Installation is usually done once only. If the configuration file config\/config.inc.php is deleted, the installation will start again.",
         "DefaultSettings": "Default Piwik settings",
         "DefaultSettingsHelp": "Piwik comes with default settings. You can customize them now or do so later in the admin screen.",
         "Requirements": "Piwik Requirements",
         "RestartWebServer": "After making this change, restart your web server.",
         "ReusingTables": "Reusing the Tables",
         "PiwikOrgNewsletter": "email me with major Piwik community updates",
-        "PiwikProNewsletter": "I am interested in %sPiwik PRO%s services (no more than 1 email a month)",
+        "PiwikProNewsletter": "send me information on %sPiwik PRO%s services and offers",
         "SeeBelowForMoreInfo": "See below for more information.",
         "SetupWebsite": "Setup a Website",
         "SetupWebsiteError": "There was an error when adding the website",
diff --git a/plugins/Installation/lang/es.json b/plugins/Installation/lang/es.json
index 2c5971b7c4..13d1eb36d5 100644
--- a/plugins/Installation/lang/es.json
+++ b/plugins/Installation/lang/es.json
@@ -44,7 +44,6 @@
         "PasswordRepeat": "contraseña (repetir)",
         "PercentDone": "%s %% Hecho",
         "PleaseFixTheFollowingErrors": "Por favor solucione los siguientes errores",
-        "PluginDescription": "Proceso de instalación de Piwik. La Instalación es usualmente hecha solo una vez. Si el archivo de configuración config\/config.ini.php se elimina, la instalación comenzará de nuevo.",
         "Requirements": "Requisitos de Piwik",
         "RestartWebServer": "Luego de realizar este cambio renicia tu servidor web.",
         "ReusingTables": "Reutilizando las tablas",
diff --git a/plugins/Installation/lang/et.json b/plugins/Installation/lang/et.json
index af594a07b0..4aa6a42aba 100644
--- a/plugins/Installation/lang/et.json
+++ b/plugins/Installation/lang/et.json
@@ -34,7 +34,6 @@
         "PasswordRepeat": "salasõna kordus",
         "PercentDone": "%s %% Tehtud",
         "PleaseFixTheFollowingErrors": "Palun paranda järgnevad vead",
-        "PluginDescription": "Piwiku paigaldusprotsess. Paigaldust tehakse tavaliselt ainult üks kord. Kui konfiguratsioonifail config\/config.ini.php kustutatakse, siis algab paigaldus uuesti.",
         "Requirements": "Piwiku nõuded",
         "RestartWebServer": "Peale selle muudatuse teostamist, palun taaskäivita oma veebiserver.",
         "SeeBelowForMoreInfo": "Vaata allapoole täpsema info jaoks.",
diff --git a/plugins/Installation/lang/fa.json b/plugins/Installation/lang/fa.json
index 0d0b538952..76d5ca46fb 100644
--- a/plugins/Installation/lang/fa.json
+++ b/plugins/Installation/lang/fa.json
@@ -37,7 +37,6 @@
         "PasswordRepeat": "کلمه عبور مجدد",
         "PercentDone": "%s %% انجام شده",
         "PleaseFixTheFollowingErrors": "لطفا خطاهای زیر را تعمیر کنید",
-        "PluginDescription": "روند نصب و راه اندازی Piwik. نصب و راه اندازی شده است معمولا فقط یک بار انجام می شود. اگر تنظیمات پیکربندی فایل \/ config.inc.php حذف شده، نصب و راه اندازی دوباره شروع خواهد شد.",
         "Requirements": "نیازمندی های پیویک",
         "RestartWebServer": "پس از این تغییر، وب سرورتان را دوباره راه اندازی (restart)کنید",
         "SeeBelowForMoreInfo": "برای اطلاعات بیشتر پایین را ببینید.",
diff --git a/plugins/Installation/lang/fi.json b/plugins/Installation/lang/fi.json
index 3c4bf13dd8..729cdd45d0 100644
--- a/plugins/Installation/lang/fi.json
+++ b/plugins/Installation/lang/fi.json
@@ -45,7 +45,6 @@
         "PercentDone": "%s %% valmiina",
         "PiwikOrgNewsletter": "lähetä minulle sähköpostia isoista Piwikin yhteisön päivityksistä",
         "PleaseFixTheFollowingErrors": "Korjaa seuraavat virheet",
-        "PluginDescription": "Piwikin asennusprosessi. Tämä asennusprosessi suoritetaan yleensä vain kerran. Jos asetustiedosto config\/config.inc.php löytyy, asennus aloitetaan uudelleen.",
         "Requirements": "Piwikin vaatimukset",
         "RestartWebServer": "Käynnistä web-palvelimesi uudelleen näiden muutosten jälkeen.",
         "ReusingTables": "Taulukoiden uudelleenkäyttö",
diff --git a/plugins/Installation/lang/fr.json b/plugins/Installation/lang/fr.json
index 7a2dc6d3d3..64571453e2 100644
--- a/plugins/Installation/lang/fr.json
+++ b/plugins/Installation/lang/fr.json
@@ -47,9 +47,7 @@
         "PasswordRepeat": "Mot de passe (à nouveau)",
         "PercentDone": "%s %% complété",
         "PiwikOrgNewsletter": "Envoyez moi des courriels pour les mises à jour importantes de Piwik",
-        "PiwikProNewsletter": "Je suis intéressé par les services %sPiwik PRO%s (pas plus d'un courriel par mois)",
         "PleaseFixTheFollowingErrors": "Merci de corriger les erreurs suivantes",
-        "PluginDescription": "Procédé d'installation de Piwik. L'installation est effectuée une unique fois. Si le fichier de configuration config\/config.inc.php est supprimé, l'installation recommencera.",
         "Requirements": "Pré requis Piwik",
         "RestartWebServer": "Après avoir effectué ces modifications, redémarrez votre serveur web.",
         "ReusingTables": "Réutilisation des Tables",
@@ -69,7 +67,7 @@
         "SystemCheckAutoUpdateHelp": "Note : La mise à jour de Piwik en un clic requiert une permission en écriture sur le dossier de Piwik et son contenu.",
         "SystemCheckCreateFunctionHelp": "Piwik utilise des fonctions anonymes pour les callbacks.",
         "SystemCheckCronArchiveProcess": "Tâche Cron d'archivage",
-        "SystemCheckCronArchiveProcessCLI": "Gestion des processus la via ligne de commande",
+        "SystemCheckCronArchiveProcessCLI": "Gestion des processus via la ligne de commande",
         "SystemCheckDatabaseHelp": "Piwik requiert ou l'extension mysqli ou les extensions pdo et pdo_mysql.",
         "SystemCheckDebugBacktraceHelp": "View::factory ne pourra pas créer des vues pour le module appelé.",
         "SystemCheckError": "Une erreur s'est produite — elle doit être corrigée avant de pouvoir continuer",
@@ -94,10 +92,12 @@
         "SystemCheckOtherExtensions": "Autres extensions",
         "SystemCheckOtherFunctions": "Autres fonctions",
         "SystemCheckPackHelp": "La fonction pack() est requise pour suivre les visiteurs dans Piwik.",
+        "SystemCheckPageSpeedDisabled": "PageSpeed désactivé",
         "SystemCheckParseIniFileHelp": "Cette fonction incluse a été désactivée sur votre serveur. Piwik va essayer d'émuler cette fonction mais il est possible que vous rencontriez des restrictions de sécurité par la suite. Les performances seront aussi impactées.",
         "SystemCheckPdoAndMysqliHelp": "Sur un serveur linux vous pouvez compiler PHP avec les options suivantes : %1$s Dans votre php.ini, ajoutez les lignes suivantes: %2$s",
         "SystemCheckPhp": "Version PHP",
         "SystemCheckPhpPdoAndMysqli": "Plus d'informations sur: %1$sPHP PDO%2$s et %3$sMYSQLI%4$s.",
+        "SystemCheckSettings": "Configuration PHP requise (php.ini)",
         "SystemCheckSplHelp": "Vous devez configurer et recompiler PHP avec la librairie standard (par défaut).",
         "SystemCheckSummaryNoProblems": "Génial ! Il n'y a aucun problème avec votre installation de Piwik. Donnez-vous une tape dans le dos.",
         "SystemCheckSummaryThereWereErrors": "Oh-oh ! Piwik a détecté des %1$sproblèmes critiques%2$s avec votre installation de Piwik. %3$sCes problèmes critiques doivent être fixés immédiatement.%4$s",
diff --git a/plugins/Installation/lang/hi.json b/plugins/Installation/lang/hi.json
index fa3f8cc234..d5233f2a1e 100644
--- a/plugins/Installation/lang/hi.json
+++ b/plugins/Installation/lang/hi.json
@@ -39,7 +39,6 @@
         "PasswordRepeat": "पासवर्ड (दोहराने)",
         "PercentDone": "%s %% समाप्त",
         "PleaseFixTheFollowingErrors": "निम्न त्रुटियों को ठीक करें",
-        "PluginDescription": "Piwik की स्थापना की प्रक्रिया. स्थापना आमतौर पर केवल एक बार किया जाता है. विन्यास फाइल विन्यास \/ config.inc.php नष्ट कर दिया जाता है, तो स्थापना फिर से शुरू होगा.",
         "Requirements": "Piwik आवश्यकताएँ",
         "RestartWebServer": "यह परिवर्तन करने के बाद, अपने वेब सर्वर को पुनरारंभ करें.",
         "SeeBelowForMoreInfo": "अधिक जानकारी के लिए नीचे देखें.",
diff --git a/plugins/Installation/lang/hu.json b/plugins/Installation/lang/hu.json
index 5cbfa4c809..adcbd65ce7 100644
--- a/plugins/Installation/lang/hu.json
+++ b/plugins/Installation/lang/hu.json
@@ -27,7 +27,6 @@
         "PasswordRepeat": "jelszó (ismét)",
         "PercentDone": "%s %% kész",
         "PleaseFixTheFollowingErrors": "Kérjük, javítsd a következő hibákat",
-        "PluginDescription": "Piwik telepítése. Általában csak egyszer fut le, ha azonban a config\/config.inc.php konfigurációs fájl hiányzik, akkor a telepítés újból fog kezdődni.",
         "Requirements": "Piwik Rendszerkövetelmények",
         "SetupWebsite": "Weboldal beállítása",
         "SetupWebsiteError": "Hiba a weboldal hozzáadása közben!",
diff --git a/plugins/Installation/lang/id.json b/plugins/Installation/lang/id.json
index 08342ee01e..b83f415024 100644
--- a/plugins/Installation/lang/id.json
+++ b/plugins/Installation/lang/id.json
@@ -38,7 +38,6 @@
         "PasswordRepeat": "sandi (ulangi)",
         "PercentDone": "%s%% Selesai",
         "PleaseFixTheFollowingErrors": "Silakan perbaiki galat berikut ini",
-        "PluginDescription": "Proses Instalasi Piwik. Instalasi ini biasanya dilakukan hanya sekali. Bila berkas konfigurasi di config\/config.inc.php terhapus, instalasi akan diulangi.",
         "Requirements": "Persyaratan Piwik",
         "RestartWebServer": "Setelah membuat perubahan tersebut, muat ulang peladen web Anda.",
         "SeeBelowForMoreInfo": "Lihat di bawah untuk informasi selengkapnya.",
diff --git a/plugins/Installation/lang/it.json b/plugins/Installation/lang/it.json
index 3970caefd8..46cfd6d3ce 100644
--- a/plugins/Installation/lang/it.json
+++ b/plugins/Installation/lang/it.json
@@ -47,9 +47,8 @@
         "PasswordRepeat": "Password (ripeti)",
         "PercentDone": "%s %% Fatto",
         "PiwikOrgNewsletter": "Inviami per email gli aggiornamenti importanti della comunità di Piwik",
-        "PiwikProNewsletter": "Sono interessato ai servizi di %sPiwik PRO%s (non più di 1 email al mese)",
+        "PiwikProNewsletter": "inviami informazioni su servizi e offerte di %sPiwik PRO%s",
         "PleaseFixTheFollowingErrors": "Per favore, risolvi i seguenti errori",
-        "PluginDescription": "Processo di installazione di Piwik. L'installazione è di solito fatta una sola volta. Se il file di configurazione (config\/config.inc.php) viene cancellato, l'installazione partirà di nuovo.",
         "Requirements": "Requisiti di Piwik",
         "RestartWebServer": "Dopo aver fatto questa modifica, riavviare il server web.",
         "ReusingTables": "Riutilizzo delle Tabelle",
diff --git a/plugins/Installation/lang/ja.json b/plugins/Installation/lang/ja.json
index 05af9b1516..47d54a5519 100644
--- a/plugins/Installation/lang/ja.json
+++ b/plugins/Installation/lang/ja.json
@@ -45,9 +45,7 @@
         "PasswordRepeat": "パスワード（再入力）",
         "PercentDone": "%s %% 完了",
         "PiwikOrgNewsletter": "私に Piwik コミュニティの最新情報をメールで送る",
-        "PiwikProNewsletter": "%sPiwik PRO%s サービス( 月1回以下のメール受信 ) に興味があります。",
         "PleaseFixTheFollowingErrors": "次のエラーを修正してください",
-        "PluginDescription": "Piwik のインストール処理を行います。 インストールは通常1回のみですが、設定ファイル（config\/config.inc.php）が削除された場合は、インストールが再度開始されます。",
         "Requirements": "Piwik の動作環境",
         "RestartWebServer": "この変更を行った後、ウェブサーバーを再起動してください。",
         "ReusingTables": "表の再利用",
diff --git a/plugins/Installation/lang/ka.json b/plugins/Installation/lang/ka.json
index d0317bdf13..ccea04fd0c 100644
--- a/plugins/Installation/lang/ka.json
+++ b/plugins/Installation/lang/ka.json
@@ -27,7 +27,6 @@
         "PasswordRepeat": "პაროლი (განმეორებით)",
         "PercentDone": "%s %% შესრულდა",
         "PleaseFixTheFollowingErrors": "გთხოვთ, შეასწოროთ შემდეგი შეცდომები",
-        "PluginDescription": "Piwik–ის დაინსტალირება. ინსტალირება ჩვეულებრივ ხდება მხოლოდ ერთხელ. თუ კონფიგურაციის ფაილი config\/config.inc.php წაიშლება, ინსტალირება თავიდან დაიწყება.",
         "Requirements": "Piwik მოთხოვნები",
         "SetupWebsite": "ვებ საიტის მოწყობა",
         "SetupWebsiteError": "ვებ საიტის დამატების დროს მოხდა შეცდომა",
diff --git a/plugins/Installation/lang/ko.json b/plugins/Installation/lang/ko.json
index 412ccd846f..8b5e747c2e 100644
--- a/plugins/Installation/lang/ko.json
+++ b/plugins/Installation/lang/ko.json
@@ -35,7 +35,6 @@
         "PasswordRepeat": "비밀번호 (반복)",
         "PercentDone": "%s %% 완료",
         "PleaseFixTheFollowingErrors": "다음 오류를 수정하세요",
-        "PluginDescription": "Piwik 설치 작업을 수행합니다. 설치는 보통 한 번 하지만 설정 파일 (config\/config.inc.php)이 삭제된 경우 설치가 다시 시작됩니다.",
         "Requirements": "Piwik 요구 사항",
         "RestartWebServer": "변경한 후 웹서버를 다시 시작하세요.",
         "SeeBelowForMoreInfo": "자세한 내용은 아래를 참조하세요.",
diff --git a/plugins/Installation/lang/lt.json b/plugins/Installation/lang/lt.json
index 89a4a82dd7..c36b4e9648 100644
--- a/plugins/Installation/lang/lt.json
+++ b/plugins/Installation/lang/lt.json
@@ -27,7 +27,6 @@
         "PasswordRepeat": "pakartoti slaptažodį",
         "PercentDone": "%s %% Atlikta",
         "PleaseFixTheFollowingErrors": "Prašome ištaisyti šias klaidas",
-        "PluginDescription": "Piwik diegimo procesas. Diegimas paprastai atliekamas vieną kartą. Jei konfigūracijos failas config\/config.inc.php ištrinamas, bus paleistas papildomas diegimas.",
         "Requirements": "Piwik reikalavimai sistemai",
         "SetupWebsite": "Svetainės nustatymai",
         "SetupWebsiteError": "Rasta klaidų pridedant svetainę",
diff --git a/plugins/Installation/lang/nb.json b/plugins/Installation/lang/nb.json
index 00f50e0669..3a8348fb89 100644
--- a/plugins/Installation/lang/nb.json
+++ b/plugins/Installation/lang/nb.json
@@ -1,5 +1,6 @@
 {
     "Installation": {
+        "CannotConnectToDb": "Kan ikke koble til databasen",
         "ConfirmDeleteExistingTables": "Er du sikker på at du vil slette tabellene %s fra databasen din? ADVARSEL: DATA FRA DISSE TABELLENE KAN IKKE GJENOPPRETTES!",
         "Congratulations": "Gratulerer",
         "CongratulationsHelp": "<p>Gratulerer! Din Piwik installasjon er fullført.<\/p><p>Sørg for at JavaScript-koden er lagt inn på dine sider, og vent på dine første besøkende!<\/p>",
@@ -61,6 +62,7 @@
         "SystemCheckOtherExtensions": "Andre utvidelser",
         "SystemCheckOtherFunctions": "Andre funksjoner",
         "SystemCheckPackHelp": "pack()-funksjonen er nødvendig for å spore besøkende i Piwik.",
+        "SystemCheckPageSpeedDisabled": "PageSpeed deaktivert",
         "SystemCheckParseIniFileHelp": "Denne innebygde funksjonen har blitt deaktivert på verten. Piwik vil forsøke å etterligne denne funksjonen, men kan møte ytterligere sikkerhetsbegrensninger. Sporingsytelsen vil også bli påvirket.",
         "SystemCheckPhp": "PHP-versjon",
         "SystemCheckPhpPdoAndMysqli": "Mer informasjon om: %1$sPHP PDO%2$s og %3$sMYSQLI%4$s.",
@@ -79,6 +81,7 @@
         "TablesDeletedSuccess": "Eksisterende Piwik-tabeller ble vellykket slettet",
         "TablesFound": "Følgende tabeller ble funnet i databasen",
         "TablesReuse": "Bruk de eksisterende tabellene",
+        "TablesUpdatedSuccess": "Databasen er oppdatert fra %1$s til %2$s!",
         "TablesWarningHelp": "Enten velg å bruke de eksisterende tabellene eller velg en ren installasjon for å slette all eksisterende data i databasen.",
         "TablesWithSameNamesFound": "Noen %1$s tabeller i databasen din %2$s har samme navn som de tabellene Piwik prøver å opprette",
         "Timezone": "tidssone for nettsted",
diff --git a/plugins/Installation/lang/nl.json b/plugins/Installation/lang/nl.json
index 72ad18a355..ad3ec5a7d5 100644
--- a/plugins/Installation/lang/nl.json
+++ b/plugins/Installation/lang/nl.json
@@ -16,6 +16,7 @@
         "DatabaseSetupLogin": "login",
         "DatabaseSetupServer": "database server",
         "DatabaseSetupTablePrefix": "tabel voorvoegsel",
+        "DefaultSettings": "Standaard Piwik instellingen",
         "Email": "email",
         "Extension": "extensie",
         "Filesystem": "Bestandsssysteem",
@@ -42,7 +43,6 @@
         "PasswordRepeat": "wachtwoord (herhaal)",
         "PercentDone": "%s %% Gereed",
         "PleaseFixTheFollowingErrors": "Los de volgende problemen op",
-        "PluginDescription": "Installatieproces van Piwik. De installatie wordt meestal maar éénmaal uitgevoerd. Als het configuratie bestand config\/config.inc.php is verwijderd, zal de installatie opnieuw beginnen.",
         "Requirements": "Piwik vereisten",
         "RestartWebServer": "Herstart uw webserver na deze aanpassing.",
         "ReusingTables": "Hergebruik de tabellen",
diff --git a/plugins/Installation/lang/nn.json b/plugins/Installation/lang/nn.json
index b2b8012de7..7081eb3561 100644
--- a/plugins/Installation/lang/nn.json
+++ b/plugins/Installation/lang/nn.json
@@ -25,7 +25,6 @@
         "PasswordRepeat": "passord (gjenteken)",
         "PercentDone": "%s %% Ferdig",
         "PleaseFixTheFollowingErrors": "Rett på følgjande feil",
-        "PluginDescription": "Installasjonsprosessen til Piwik. Installasjonen er vanlegvis utførd berre ein gong. Viss konfigurasjonsfila config\/config.inc.php er sletta, vil installasjonen starta på nytt.",
         "Requirements": "Piwik-krav",
         "RestartWebServer": "Etter denne endringa, start vevtenaren din på nytt.",
         "SetupWebsite": "Sett opp ein nettstad",
diff --git a/plugins/Installation/lang/pl.json b/plugins/Installation/lang/pl.json
index 9ebd0af394..f87e8ab244 100644
--- a/plugins/Installation/lang/pl.json
+++ b/plugins/Installation/lang/pl.json
@@ -34,7 +34,6 @@
         "PercentDone": "%s %% wykonano",
         "PiwikOrgNewsletter": "Wyślij mi wiadomość email z głównymi aktualizacjami społeczności Piwik",
         "PleaseFixTheFollowingErrors": "Prosimy naprawić następujące błędy",
-        "PluginDescription": "Proces instalacji statystyk Piwik. Instalację wykonuje się zazwyczaj tylko raz. Jeżeli plik konfiguracyjny znajdujący się w config\/config.inc.php zostaje skasowany, proces instalacji rozpocznie się od nowa.",
         "Requirements": "Wymagania systemu Piwik",
         "RestartWebServer": "Po dokonaniu tych zmian, zrestartuj swój serwer.",
         "ReusingTables": "Ponowne użycie Tabel",
@@ -44,6 +43,7 @@
         "SetupWebSiteName": "nazwa portalu",
         "SetupWebsiteSetupSuccess": "Serwis %s utworzono pomyślnie!",
         "SetupWebSiteURL": "adres URL portalu",
+        "SiteSetup": "Proszę utworzyć pierwszą stronę, która miała by być anmalizowana prze Piwik'a:",
         "SiteSetupFootnote": "UWAGA: Nowe strony do śledzenia będzie mozna dodawać dopiero po zakończeniu instalacji Piwik'a",
         "SuperUser": "Super Użytkownik",
         "SuperUserLogin": "login super użytkownika",
@@ -66,6 +66,7 @@
         "SystemCheckGzcompressHelp": "Musisz włączyć rozszerzenie zlib i funkcję gzcompress.",
         "SystemCheckGzuncompressHelp": "Musisz włączyć rozszerzenie zlib i funkcję gzuncompress.",
         "SystemCheckIconvHelp": "Potrzebujesz skonfigurować i przebudować środowisko PHP, z włączonym wsparciem dla \"iconv\", --with-iconv.",
+        "SystemCheckJsonHelp": "Rozszeżenie php5-json jest wymagane by Piwik był w stanie czytać i zapisywać dane typu JSON.",
         "SystemCheckMailHelp": "Informacje zwrotne i wiadomości o utraconych hasłach nie będą mogły zostać wysłane przy pomocy funkcji mail().",
         "SystemCheckMbstring": "mbstring",
         "SystemCheckMbstringHelp": "Rozszerzenie mbstring jest wymagane do obsługi znaków wielobajtowych w interfejsie użytkownika i API odpowiedzi. Ponadto należy sprawdzić, mbstring.func_overload jest ustawiony na \"0\" w pliku php.ini.",
diff --git a/plugins/Installation/lang/pt-br.json b/plugins/Installation/lang/pt-br.json
index cce97fbd9a..03b8902dd5 100644
--- a/plugins/Installation/lang/pt-br.json
+++ b/plugins/Installation/lang/pt-br.json
@@ -42,7 +42,6 @@
         "PasswordRepeat": "senha (repetir)",
         "PercentDone": "%s %% Completo",
         "PleaseFixTheFollowingErrors": "Por favor, corrija os seguintes erros",
-        "PluginDescription": "Processo de instalação do Piwik. A instalação normalmente é feita apenas uma vez. Se o arquivo de configuração config\/config.inc.php é deletado, a instalação começará novamente.",
         "Requirements": "Requerimentos do Piwik",
         "RestartWebServer": "Depois de fazer essa alteração, reinicie o seu servidor web.",
         "SeeBelowForMoreInfo": "Veja abaixo para mais informações.",
diff --git a/plugins/Installation/lang/pt.json b/plugins/Installation/lang/pt.json
index 70cdc4078e..3e2e461e18 100644
--- a/plugins/Installation/lang/pt.json
+++ b/plugins/Installation/lang/pt.json
@@ -27,7 +27,6 @@
         "PasswordRepeat": "palavra passe (repetir)",
         "PercentDone": "%s %% Completado",
         "PleaseFixTheFollowingErrors": "Por favor corrija os seguintes erros",
-        "PluginDescription": "Processo de instalação de Piwik. A Instalação é executada só uma vez. Se o ficheiro de configuração config\/config.inc.php for eliminado, a instalação recomeça.",
         "Requirements": "Requisitos do Piwik",
         "SetupWebsite": "Configurar um Website",
         "SetupWebsiteError": "Ocorreu um erro ao tentar adicionar o website",
diff --git a/plugins/Installation/lang/ro.json b/plugins/Installation/lang/ro.json
index d5e7695ccc..4129444de9 100644
--- a/plugins/Installation/lang/ro.json
+++ b/plugins/Installation/lang/ro.json
@@ -43,9 +43,7 @@
         "PasswordRepeat": "Parolă (repetă)",
         "PercentDone": "%s %% Done",
         "PiwikOrgNewsletter": "trimite-mi email-uri cu noutăți importante legate de comunitatea Piwik",
-        "PiwikProNewsletter": "Sunt interesat(ă) de serviciile %sPiwik PRO%s (nu mai mult de 1 email pe lună)",
         "PleaseFixTheFollowingErrors": "Vă rugăm să reparati următoarele erori",
-        "PluginDescription": "Procesul de instalare a Piwik.Instalarea se face de obicei o singură dată. În cazul în care fișierul de configurare de configurare\/config.inc.php este șters, instalarea va începe din nou.",
         "Requirements": "Piwik Cerințe",
         "RestartWebServer": "Dupa ce faci aceasta schimbare, reporniți serverul de web.",
         "ReusingTables": "Reutilizare Tabele",
diff --git a/plugins/Installation/lang/ru.json b/plugins/Installation/lang/ru.json
index fc49c6d634..ebda4f78f7 100644
--- a/plugins/Installation/lang/ru.json
+++ b/plugins/Installation/lang/ru.json
@@ -1,5 +1,7 @@
 {
     "Installation": {
+        "CannotConnectToDb": "Не удается подключиться к базе данных",
+        "CannotConnectToDbResolvingExplanation": "Это может быть временная проблема, попробуйте %1$sобновить страницу%2$s. Если проблема не исчезнет, обратитесь к администратору Piwik.",
         "CollaborativeProject": "Piwik является совместным проектом, построенный с любовью людей со всего мира.",
         "ConfigurationHelp": "Похоже, конфигурационный файл Piwik не сконфигурирован надлежащим образом. Вы можете удалить config\/config.ini.php, и продолжить установку, или исправить настройки соединения с базой данных.",
         "ConfirmDeleteExistingTables": "Вы действительно хотите удалить таблицы: %s из базы данных? ВНИМАНИЕ: УДАЛЕННЫЕ ДАННЫЕ НЕВОЗМОЖНО ВОССТАНОВИТЬ!",
@@ -15,6 +17,8 @@
         "DatabaseSetupLogin": "логин",
         "DatabaseSetupServer": "сервер баз данных",
         "DatabaseSetupTablePrefix": "префикс таблиц",
+        "DefaultSettings": "Настройки Piwik по умолчанию",
+        "DefaultSettingsHelp": "Piwik поставляется с настройками по умолчанию. Вы можете настроить их сейчас или сделать это позже в настройках администратора.",
         "Email": "Адрес электронной почты (email)",
         "Extension": "модуль",
         "Filesystem": "Файловая система",
@@ -39,7 +43,6 @@
         "PasswordRepeat": "Пароль (еще раз)",
         "PercentDone": "%s %% Завершено",
         "PleaseFixTheFollowingErrors": "Пожалуйста, исправьте следующие ошибки",
-        "PluginDescription": "Процесс установки Piwik. Установка обычно осуществляется единожды. Если же конфигурационный файл config\/config.inc.php удален, установка начнется снова.",
         "Requirements": "Требования Piwik",
         "RestartWebServer": "После этих изменений перезапустите браузер.",
         "SeeBelowForMoreInfo": "Смотрите ниже для получения дополнительной информации.",
@@ -49,21 +52,22 @@
         "SetupWebsiteSetupSuccess": "Сайт %s создан успешно!",
         "SetupWebSiteURL": "URL сайта",
         "SiteSetup": "Пожалуйста, добавьте первый сайт, который вы хотите отслеживать и анализировать с помощью Piwik:",
-        "SiteSetupFootnote": "Подсказка: Если установка Piwik авершена, вы сможете добавить больше сайтов для отслеживания!",
-        "SuperUser": "Супер Администратор",
+        "SiteSetupFootnote": "Подсказка: Если установка Piwik завершена, вы сможете добавить больше сайтов для отслеживания!",
+        "SuperUser": "Суперпользователь",
         "SuperUserLogin": "Логин суперпользователя",
-        "SuperUserSetupError": "Был ошибка при добавлении Суперпользователя",
+        "SuperUserSetupError": "Был ошибка при добавлении суперпользователя",
         "SuperUserSetupSuccess": "Суперпользователь успешно создан!",
         "SystemCheck": "Проверка системы",
         "SystemCheckAutoUpdateHelp": "Учтите: Piwik One Click Update требует прав записи в папку Piwik и в папки компонентов.",
         "SystemCheckCreateFunctionHelp": "Piwik использует анонимные функции для колбэков.",
+        "SystemCheckCronArchiveProcess": "Cron для архивации",
         "SystemCheckCronArchiveProcessCLI": "Управление процессами через консоль",
         "SystemCheckDatabaseHelp": "Piwik для своей работы требует модуль mysqli, или оба модуля: PDO и pdo_mysql.",
         "SystemCheckDebugBacktraceHelp": "View::factory не может сгенерировать просмотры для вызвавшего модуля.",
         "SystemCheckError": "Возникла ошибка, которая должна быть исправлена перед продолжением",
         "SystemCheckEvalHelp": "Необходимо для HTML QuickForm и шаблонизатора Smarty.",
         "SystemCheckExtensions": "Необходимые модули",
-        "SystemCheckFileIntegrity": "Целостность файла",
+        "SystemCheckFileIntegrity": "Целостность файлов",
         "SystemCheckFunctions": "Необходимые функции",
         "SystemCheckGDFreeType": "GD > 2.x + Freetype (graphics)",
         "SystemCheckGDHelp": "Отображение тонких (нитчатых) графиков не будет работать.",
@@ -81,10 +85,13 @@
         "SystemCheckOtherExtensions": "Другие модули",
         "SystemCheckOtherFunctions": "Другие функции",
         "SystemCheckPackHelp": "Функиця pack() необходима для отслеживания действий Piwik.",
+        "SystemCheckPageSpeedDisabled": "Выключен PageSpeed",
         "SystemCheckParseIniFileHelp": "Эта встроенная функция отключена на сервере. Piwik попытается сэмулировать ее вызов, но могут возникнуть ограничения безопасности. Это также может нанести вред общей производительности системы.",
         "SystemCheckPdoAndMysqliHelp": "На сервере с Linux вы можете откомпилировать php со следующими опциями: %1$s В вашем php.ini добавьте следующие строки: %2$s",
         "SystemCheckPhp": "Версия PHP",
         "SystemCheckPhpPdoAndMysqli": "Узнайте больше на страница: %1$sPHP PDO%2$s и %3$sMYSQLI%4$s.",
+        "SystemCheckPhpSetting": "Для предотвращения критической проблемы необходимо установить следующее значение в вашем файле php.ini: %s",
+        "SystemCheckSettings": "Требуется настройка PHP (php.ini)",
         "SystemCheckSplHelp": "Вам необходимо сконфигурировать или перекомпилировать PHP со включенной стандартной библиотекой PHP (SPL), обычно включенной по умолчанию.",
         "SystemCheckSummaryNoProblems": "Ура! Нет никаких проблем с настройками Piwik. Молодец, возьми с полки пирожок.",
         "SystemCheckSummaryThereWereErrors": "Ой-ой! Piwik обнаружил некоторые %1$sкритические ошибки%2$s. %3$sЭти ошибки должны быть исправленные немедленно.%4$s",
@@ -113,7 +120,7 @@
         "Timezone": "Зона времени сайта",
         "WeHopeYouWillEnjoyPiwik": "Мы надеемся, что вам понравится использовать Piwik настолько, насколько мы любим создавать его.",
         "Welcome": "Добро пожаловать!",
-        "WelcomeHelp": "<p>Piwik - это открытое программное обеспечение, позволяющее вам вести статистический учет посещений ваших сайтов и анализировать полученную информацию о посетителях. Этот процесс состоит из %s простых шагов и занимает около пяти минут времени.<\/p>",
+        "WelcomeHelp": "<p>Piwik – это открытое программное обеспечение, позволяющее вам вести статистический учет посещений ваших сайтов и анализировать полученную информацию о посетителях. Этот процесс состоит из %s простых шагов и занимает около пяти минут времени.<\/p>",
         "WelcomeToCommunity": "Добро пожаловать в сообщество Piwik!"
     }
 }
\ No newline at end of file
diff --git a/plugins/Installation/lang/sq.json b/plugins/Installation/lang/sq.json
index d5373ee796..29fb583895 100644
--- a/plugins/Installation/lang/sq.json
+++ b/plugins/Installation/lang/sq.json
@@ -27,7 +27,6 @@
         "PasswordRepeat": "fjalëkalim (rijepeni)",
         "PercentDone": "Plotësuar %s %%",
         "PleaseFixTheFollowingErrors": "Ju lutem, ndreqni gabimet vijuese",
-        "PluginDescription": "Procesi i instalimit të Piwik-ut. Instalimi zakonisht bëhet vetëm një herë. Po u fshi kartela e formësimit config\/config.inc.php, instalimi duhet nisur nga e para.",
         "Requirements": "Të domosdoshme për Piwik-un",
         "SetupWebsite": "Caktoni një \"site\" web",
         "SetupWebsiteError": "Pati një gabim gjatë shtimit të një \"site\"-i web",
diff --git a/plugins/Installation/lang/sr.json b/plugins/Installation/lang/sr.json
index 588fb2d8fd..60a1cd7185 100644
--- a/plugins/Installation/lang/sr.json
+++ b/plugins/Installation/lang/sr.json
@@ -45,9 +45,7 @@
         "PasswordRepeat": "lozinka (ponovo)",
         "PercentDone": "%s %% Završeno",
         "PiwikOrgNewsletter": "pošalji mi mejl kada dođe do značajne Piwik izmene",
-        "PiwikProNewsletter": "Zainteresovan sam za %sPiwik PRO%s usluge (ne više od jednog mejla mesečno)",
         "PleaseFixTheFollowingErrors": "Molimo vas da ispravite sledeće greške",
-        "PluginDescription": "Proces instalacije Piwik-a. Instalacija se obično vrši samo jednom. Ukoliko datoteku sa podešavanjima config\/config.inc.php obrišete, instalacija će početi ispočetka.",
         "Requirements": "Piwik zahtevi",
         "RestartWebServer": "Nakon ovih izmena restartujte vaš web server",
         "ReusingTables": "Ponovna upotreba tabela",
diff --git a/plugins/Installation/lang/sv.json b/plugins/Installation/lang/sv.json
index 062dbffa24..c43689b862 100644
--- a/plugins/Installation/lang/sv.json
+++ b/plugins/Installation/lang/sv.json
@@ -43,9 +43,7 @@
         "PasswordRepeat": "lösenord (bekräfta)",
         "PercentDone": "%s %% Klar",
         "PiwikOrgNewsletter": "maila mig vid större Piwik community uppdateringar",
-        "PiwikProNewsletter": "Jag är intresserad av %sPiwik PRO%s tjänster (inte mer än ett mail per månad)",
         "PleaseFixTheFollowingErrors": "Vänligen fixa följande fel",
-        "PluginDescription": "Installationsprocessen av Piwik. Installationen görs vanligtvis endast en gång. Om konfigurationsfilen config\/config.inc.php tas bort, kommer installationen börja om igen.",
         "Requirements": "Piwik Krav",
         "RestartWebServer": "När du har gjort den här ändringen, starta om din webbserver.",
         "ReusingTables": "Återanvänder tabellerna",
diff --git a/plugins/Installation/lang/th.json b/plugins/Installation/lang/th.json
index 20671ca513..4a6dd97234 100644
--- a/plugins/Installation/lang/th.json
+++ b/plugins/Installation/lang/th.json
@@ -29,7 +29,6 @@
         "PasswordRepeat": "รหัสผ่าน(อีกครั้ง)",
         "PercentDone": "ติดตั้งเสร็จไปแล้ว %s %%",
         "PleaseFixTheFollowingErrors": "กรุณาแก้ไขข้อผิดพลาดต่อไปนี้",
-        "PluginDescription": "กระบวนการติดตั้งของ Piwik ที่การติดตั้งมักจะทำเพียงครั้งเดียวเท่านั้น ถ้า config\/config.inc.php ไฟล์การตั้งค่าคอนฟิกจะถูกลบออก การติดตั้งจะเริ่มทำงานอีกครั้ง",
         "Requirements": "ความต้องการของ Piwik",
         "SeeBelowForMoreInfo": "ดูด้านล่างสำหรับรายละเอียดเพิ่มเติม",
         "SetupWebsite": "ติดตั้งเว็บไซต์",
diff --git a/plugins/Installation/lang/tl.json b/plugins/Installation/lang/tl.json
index c640386a9c..07df57b66a 100644
--- a/plugins/Installation/lang/tl.json
+++ b/plugins/Installation/lang/tl.json
@@ -42,9 +42,7 @@
         "PasswordDoNotMatch": "password ay hindi tumutugma",
         "PercentDone": "%s %% Tapos na",
         "PiwikOrgNewsletter": "I-email sa akin ang mga pangunahing update sa komunidad ng Piwik",
-        "PiwikProNewsletter": "Interesado ako sa mga %s Piwik PRO %s na serbisyo (hindi hihigit sa 1 email sa isang buwan)",
         "PleaseFixTheFollowingErrors": "Mangyaring ayusin ang mga sumusunod na error",
-        "PluginDescription": "Ang pag proseso sa piwik installation. Ang installation ay kadalasang ginawa isang beses lamang. Kung ang configuration file config\/config.inc.php ay binura",
         "Requirements": "Mga kailangan ng Piwik",
         "RestartWebServer": "Pagkatapos gawin ang pagbabagong ito i-restart ang iyong web browser",
         "ReusingTables": "Muling pag-gamit sa mga table",
diff --git a/plugins/Installation/lang/uk.json b/plugins/Installation/lang/uk.json
index 96d3e89e43..ea0d161ad6 100644
--- a/plugins/Installation/lang/uk.json
+++ b/plugins/Installation/lang/uk.json
@@ -27,7 +27,6 @@
         "PasswordRepeat": "пароль (повторно)",
         "PercentDone": "%s %% Завершено",
         "PleaseFixTheFollowingErrors": "Виправте наступні помилки",
-        "PluginDescription": "Процес інсталяції Piwik. Інсталяція зазвичай виконується тільки один раз. Якщо файл конфігурації config\/config.inc.php видалено, інсталяція розпочнеться знову.",
         "Requirements": "Системні вимоги Piwik",
         "SetupWebsite": "Налаштувати веб-сайт",
         "SetupWebsiteError": "Виникла помилка при додаванні веб-сайту",
diff --git a/plugins/Installation/lang/vi.json b/plugins/Installation/lang/vi.json
index fb7bc1b423..6c69bbaa98 100644
--- a/plugins/Installation/lang/vi.json
+++ b/plugins/Installation/lang/vi.json
@@ -39,7 +39,6 @@
         "PasswordRepeat": "Mật khẩu (lặp lại)",
         "PercentDone": "%s %% thực hiện",
         "PleaseFixTheFollowingErrors": "Hãy sửa các lỗi sau đây",
-        "PluginDescription": "Quá trình cài đặt của Piwik. Cài đặt thường được thực hiện một lần duy nhất. Nếu các tập tin cấu hình config\/config.inc.php bị xóa, việc cài đặt sẽ bắt đầu lại.",
         "Requirements": "Piwik yêu cầu",
         "RestartWebServer": "Sau khi tạo ra sự thay đổi này, khởi động lại máy chủ web của bạn",
         "SeeBelowForMoreInfo": "Xêm thêm thông tin ở dưới đây",
diff --git a/plugins/Installation/lang/zh-cn.json b/plugins/Installation/lang/zh-cn.json
index 647ed1be5a..10372362f2 100644
--- a/plugins/Installation/lang/zh-cn.json
+++ b/plugins/Installation/lang/zh-cn.json
@@ -40,7 +40,6 @@
         "PasswordRepeat": "密码(重复)",
         "PercentDone": "%s %% 已完成",
         "PleaseFixTheFollowingErrors": "请修复以下错误",
-        "PluginDescription": "Piwik 的安裝程序。通常只需要安裝一次。如果配置文件 config\/config.inc.php 被刪除，那么将会重新安裝。",
         "Requirements": "Piwik 需求",
         "RestartWebServer": "做过这个改动之后，请重新启动网络服务器。",
         "SeeBelowForMoreInfo": "更详细的信息请看下面",
diff --git a/plugins/Installation/lang/zh-tw.json b/plugins/Installation/lang/zh-tw.json
index d3a3828c56..410c1fb53d 100644
--- a/plugins/Installation/lang/zh-tw.json
+++ b/plugins/Installation/lang/zh-tw.json
@@ -26,7 +26,6 @@
         "PasswordRepeat": "密碼 （再輸入一次確認）",
         "PercentDone": "%s %% 已完成",
         "PleaseFixTheFollowingErrors": "請修復以下錯誤",
-        "PluginDescription": "Piwik 的安裝程式。通常只需要安裝一次。如果設定檔 config\/config.inc.php 被刪除，那麼將會重新安裝。",
         "Requirements": "Piwik 需求",
         "SetupWebsite": "設定一個網站",
         "SetupWebsiteError": "當增加此網站時發生了一個錯誤",
diff --git a/plugins/Installation/stylesheets/installation.css b/plugins/Installation/stylesheets/installation.css
index 68ec544bb4..e8475c2549 100644
--- a/plugins/Installation/stylesheets/installation.css
+++ b/plugins/Installation/stylesheets/installation.css
@@ -3,7 +3,7 @@ div.both {
 }
 
 body {
-    background-color: #FFFBF9;
+    background-color: #fff;
     text-align: center;
     font-family: Arial, Georgia, "Times New Roman", Times, serif;
     font-size: 17px;
@@ -41,18 +41,25 @@ p {
 }
 
 h2 {
-    font-size: 20px;
-    color: #666666;
+    font-size: 24px;
+    font-family: Verdana, sans-serif;
+    color: #0d0d0d;
     border-bottom: 1px solid #DADADA;
     padding: 0 0 7px;
+    font-weight: normal;
+    margin-bottom: 15px;
 }
 
 h3 {
     margin-top: 10px;
-    font-size: 17px;
-    color: #3F5163;
+    font-family: Verdana, sans-serif;
+    color: #0d0d0d;
+    font-weight: normal;
+    font-size: 20px;
 }
 
+
+
 code {
     font-size: 80%;
 }
@@ -124,7 +131,8 @@ code {
     font-size: 90%;
     line-height: 1.4em;
     width: 860px;
-    border: 1px solid #7A5A3F;
+    border: 1px solid #d9d9d9;
+    box-shadow: 0 1px 1px rgba(204,204,204,0.5);
     margin: auto;
     background: #FFFFFF;
     padding: 0.2em 2em 2em 2em;
@@ -170,7 +178,7 @@ p.nextStep a {
 }
 
 td {
-    border: 1px solid rgb(198, 205, 216);
+    background-color: #f2f2f2;
     border-top-color: #FFF;
     color: #444;
     padding: 0.5em 0.5em 0.5em 0.8em;
@@ -248,3 +256,8 @@ input {
     color: red;
     font-weight: bold;
 }
+
+#feedback {
+    margin-bottom:30px;
+    display: inline-block;
+}
\ No newline at end of file
diff --git a/plugins/Installation/stylesheets/systemCheckPage.less b/plugins/Installation/stylesheets/systemCheckPage.less
index 579bd888ae..3c5f6ddfa0 100755
--- a/plugins/Installation/stylesheets/systemCheckPage.less
+++ b/plugins/Installation/stylesheets/systemCheckPage.less
@@ -1,6 +1,5 @@
 #systemCheckOptional,
 #systemCheckRequired {
-    border: 1px solid #dadada;
     width: 100%;
     max-width: 900px;
 }
@@ -13,18 +12,13 @@
 #systemCheckRequired td {
     padding: 1em .5em 1em 2em;
     vertical-align: middle;
-    font-size: 1.2em;
     margin: 0;
+    min-width: 200px;
 }
 
-#systemCheckOptional tr:nth-child(even),
-#systemCheckRequired tr:nth-child(even) {
-    background-color: #EFEEEC;
-}
-
-#systemCheckOptional tr:nth-child(odd),
-#systemCheckRequired tr:nth-child(odd) {
-    background-color: #F6F5F3;
+#systemCheckOptional tr,
+#systemCheckRequired tr {
+    background-color: #f2f2f2;
 }
 
 .error {
diff --git a/plugins/Installation/templates/_systemCheckSection.twig b/plugins/Installation/templates/_systemCheckSection.twig
index a3b34e4f70..f797d18969 100755
--- a/plugins/Installation/templates/_systemCheckSection.twig
+++ b/plugins/Installation/templates/_systemCheckSection.twig
@@ -10,7 +10,7 @@
 
         <td>
             {% if infos.phpVersion_ok %}
-                {{ ok }}
+                {{ ok }} {{ infos.phpVersion }}
             {% else %}
                 {{ error }} <span class="err">{{ 'General_Error'|translate }}: {{ 'General_Required'|translate(MinPHP)|raw }}</span>
             {% endif %}
@@ -151,7 +151,7 @@
 </table>
 <br/>
 
-<h2>{{ 'Installation_Optional'|translate }}</h2>
+<h3>{{ 'Installation_Optional'|translate }}</h3>
 <table class="infos" id="systemCheckOptional">
     <tr>
         <td class="label">{{ 'Installation_SystemCheckFileIntegrity'|translate }}</td>
@@ -350,7 +350,7 @@
                         <em><strong>{{ 'General_Error'|translate }}:</strong></em>
                         {{ infos.extra.load_data_infile_error|raw }}
                     {% endif %}
-                    <p>Troubleshooting: <a rel='noreferrer' target='_blank' href="?module=Proxy&action=redirect&url=http://piwik.org/faq/troubleshooting/%23faq_194">FAQ on piwik.org</a></p>
+                    <p>Troubleshooting: <a target='_blank' href="?module=Proxy&action=redirect&url=http://piwik.org/faq/troubleshooting/%23faq_194">FAQ on piwik.org</a></p>
                 {% endif %}
             </td>
         </tr>
diff --git a/plugins/Installation/templates/firstWebsiteSetup.twig b/plugins/Installation/templates/firstWebsiteSetup.twig
index 0095fe9b8f..24352cbb69 100644
--- a/plugins/Installation/templates/firstWebsiteSetup.twig
+++ b/plugins/Installation/templates/firstWebsiteSetup.twig
@@ -2,7 +2,7 @@
 
 {% block content %}
 {% if displayGeneralSetupSuccess is defined %}
-    <span id="toFade" class="success">
+    <span id="feedback" class="success">
 	    {{ 'Installation_SuperUserSetupSuccess'|translate }}
         <img src="plugins/Morpheus/images/success_medium.png"/>
     </span>
diff --git a/plugins/Installation/templates/layout.twig b/plugins/Installation/templates/layout.twig
index 4a114f292d..43f469efbf 100644
--- a/plugins/Installation/templates/layout.twig
+++ b/plugins/Installation/templates/layout.twig
@@ -50,7 +50,7 @@
         <div id="detailInstall">
             {% set nextButton %}
             <p class="nextStep">
-                <a class="submit" href="{{ linkTo({'action':nextModuleName, 'token_auth':null, 'method':null }) }}">{{ 'General_Next'|translate }} &raquo;</a>
+                <a style="margin-top: -5px;" class="submit" href="{{ linkTo({'action':nextModuleName, 'token_auth':null, 'method':null }) }}">{{ 'General_Next'|translate }} &raquo;</a>
             </p>
             {%  endset %}
             {% if showNextStepAtTop is defined and showNextStepAtTop %}
@@ -67,7 +67,7 @@
         <br/>
         <br/>
 
-        <h3>{{ 'Installation_InstallationStatus'|translate }}</h3>
+        <h4>{{ 'Installation_InstallationStatus'|translate }}</h4>
 
         <div id="progressbar" data-progress="{{ percentDone }}"></div>
         {{ 'Installation_PercentDone'|translate(percentDone) }}
diff --git a/plugins/Installation/templates/systemCheck.twig b/plugins/Installation/templates/systemCheck.twig
index f142e4edef..eb0357fbf6 100644
--- a/plugins/Installation/templates/systemCheck.twig
+++ b/plugins/Installation/templates/systemCheck.twig
@@ -16,7 +16,7 @@
     <br style="clear:both;">
 {% endif %}
 
-<h3>{{ 'Installation_SystemCheck'|translate }}</h3>
+<h2>{{ 'Installation_SystemCheck'|translate }}</h2>
 <br/>
 {% include "@Installation/_systemCheckSection.twig" %}
 
@@ -28,4 +28,4 @@
     </p>
     {% include "@Installation/_systemCheckLegend.twig" %}
 {% endif %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/plugins/Installation/templates/systemCheckPage.twig b/plugins/Installation/templates/systemCheckPage.twig
index 1d214ba395..b66c493eea 100755
--- a/plugins/Installation/templates/systemCheckPage.twig
+++ b/plugins/Installation/templates/systemCheckPage.twig
@@ -3,7 +3,7 @@
 {% block content %}
 {% if isSuperUser %}
     <h2 piwik-enriched-headline>{{ 'Installation_SystemCheck'|translate }}</h2>
-    <p style="margin-left:1em;">
+    <p style="margin-left:0.2em;">
         {% if infos.has_errors %}
             <img src="plugins/Morpheus/images/error.png"/>
             {{ 'Installation_SystemCheckSummaryThereWereErrors'|translate('<strong>','</strong>','<strong><em>','</em></strong>')|raw }} {{ 'Installation_SeeBelowForMoreInfo'|translate }}
diff --git a/plugins/Installation/templates/trackingCode.twig b/plugins/Installation/templates/trackingCode.twig
index 08e78abeda..b7e676aa16 100644
--- a/plugins/Installation/templates/trackingCode.twig
+++ b/plugins/Installation/templates/trackingCode.twig
@@ -2,7 +2,7 @@
 
 {% block content %}
 {% if displayfirstWebsiteSetupSuccess is defined %}
-    <span id="toFade" class="success">
+    <span id="feedback" class="success">
 	{{ 'Installation_SetupWebsiteSetupSuccess'|translate(displaySiteName) }}
         <img src="plugins/Morpheus/images/success_medium.png"/>
 </span>
diff --git a/plugins/Installation/templates/welcome.twig b/plugins/Installation/templates/welcome.twig
index 89df7ac8aa..e879b5319e 100644
--- a/plugins/Installation/templates/welcome.twig
+++ b/plugins/Installation/templates/welcome.twig
@@ -3,15 +3,7 @@
 {% block content %}
 <h2>{{ 'Installation_Welcome'|translate }}</h2>
 
-{% if newInstall %}
-    {{ 'Installation_WelcomeHelp'|translate(totalNumberOfSteps)|raw }}
-{% else %}
-    <p>{{ 'Installation_ConfigurationHelp'|translate }}</p>
-    <br/>
-    <div class="error">
-        {{ errorMessage }}
-    </div>
-{% endif %}
+{{ 'Installation_WelcomeHelp'|translate(totalNumberOfSteps)|raw }}
 
 <script type="text/javascript">
     <!--
diff --git a/plugins/LanguagesManager/API.php b/plugins/LanguagesManager/API.php
index 2c8d74978a..ca491892ed 100644
--- a/plugins/LanguagesManager/API.php
+++ b/plugins/LanguagesManager/API.php
@@ -9,11 +9,13 @@
  */
 namespace Piwik\Plugins\LanguagesManager;
 
-use Piwik\Cache\PersistentCache;
 use Piwik\Db;
+use Piwik\Development;
 use Piwik\Filesystem;
 use Piwik\Piwik;
+use Piwik\Cache as PiwikCache;
 use Piwik\Plugin\Manager as PluginManager;
+use Piwik\Translation\Loader\DevelopmentLoader;
 
 /**
  * The LanguagesManager API lets you access existing Piwik translations, and change Users languages preferences.
@@ -66,6 +68,8 @@ class API extends \Piwik\Plugin\API
             }
         }
 
+        $this->enableDevelopmentLanguageInDevEnvironment($languages);
+
         /**
          * Hook called after loading available language files.
          *
@@ -272,10 +276,11 @@ class API extends \Piwik\Plugin\API
             return;
         }
 
-        $cache = new PersistentCache('availableLanguages');
+        $cacheId = 'availableLanguages';
+        $cache = PiwikCache::getEagerCache();
 
-        if ($cache->has()) {
-            $languagesInfo = $cache->get();
+        if ($cache->contains($cacheId)) {
+            $languagesInfo = $cache->fetch($cacheId);
         } else {
             $filenames = $this->getAvailableLanguages();
             $languagesInfo = array();
@@ -289,9 +294,19 @@ class API extends \Piwik\Plugin\API
                 );
             }
 
-            $cache->set($languagesInfo);
+            $cache->save($cacheId, $languagesInfo);
         }
 
         $this->availableLanguageNames = $languagesInfo;
     }
+
+    private function enableDevelopmentLanguageInDevEnvironment(&$languages)
+    {
+        if (!Development::isEnabled()) {
+            $key = array_search(DevelopmentLoader::LANGUAGE_ID, $languages);
+            if ($key) {
+                unset($languages[$key]);
+            }
+        }
+    }
 }
diff --git a/plugins/LanguagesManager/Commands/CompareKeys.php b/plugins/LanguagesManager/Commands/CompareKeys.php
index 26c9a737f3..fbbe803a6e 100644
--- a/plugins/LanguagesManager/Commands/CompareKeys.php
+++ b/plugins/LanguagesManager/Commands/CompareKeys.php
@@ -9,7 +9,8 @@
 
 namespace Piwik\Plugins\LanguagesManager\Commands;
 
-use Piwik\Translate;
+use Piwik\Container\StaticContainer;
+use Piwik\Translation\Translator;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -49,8 +50,10 @@ class CompareKeys extends TranslationBase
 
         $englishFromOTrance = json_decode(file_get_contents($englishFromOTrance), true);
 
-        Translate::reloadLanguage('en');
-        $availableTranslations = $GLOBALS['Piwik_translations'];
+        /** @var Translator $translator */
+        $translator = StaticContainer::get('Piwik\Translation\Translator');
+        $translator->setCurrentLanguage('en');
+        $availableTranslations = $translator->getAllTranslations();
 
         $categories = array_unique(array_merge(array_keys($englishFromOTrance), array_keys($availableTranslations)));
         sort($categories);
diff --git a/plugins/LanguagesManager/Commands/CreatePull.php b/plugins/LanguagesManager/Commands/CreatePull.php
index 356f4e213f..bf208ac332 100644
--- a/plugins/LanguagesManager/Commands/CreatePull.php
+++ b/plugins/LanguagesManager/Commands/CreatePull.php
@@ -49,7 +49,7 @@ class CreatePull extends TranslationBase
         chdir(PIWIK_DOCUMENT_ROOT);
 
         shell_exec('
-            git checkout master > /dev/null 2>&1
+            git checkout -f master > /dev/null 2>&1
             git pull > /dev/null 2>&1
             git submodule init > /dev/null 2>&1
             git submodule update > /dev/null 2>&1
@@ -75,7 +75,7 @@ class CreatePull extends TranslationBase
 
         // switch to branch and update it to latest master
         shell_exec('
-            git checkout translationupdates > /dev/null 2>&1
+            git checkout -f translationupdates > /dev/null 2>&1
             git merge master > /dev/null 2>&1
             git push origin translationupdates > /dev/null 2>&1
         ');
diff --git a/plugins/LanguagesManager/Commands/FetchFromOTrance.php b/plugins/LanguagesManager/Commands/FetchFromOTrance.php
index a28f62df23..8802209ced 100644
--- a/plugins/LanguagesManager/Commands/FetchFromOTrance.php
+++ b/plugins/LanguagesManager/Commands/FetchFromOTrance.php
@@ -11,6 +11,8 @@ namespace Piwik\Plugins\LanguagesManager\Commands;
 
 use Piwik\Container\StaticContainer;
 use Piwik\Unzip;
+use Symfony\Component\Console\Helper\DialogHelper;
+use Symfony\Component\Console\Helper\ProgressHelper;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -23,7 +25,7 @@ class FetchFromOTrance extends TranslationBase
 
     protected function configure()
     {
-        $path = StaticContainer::getContainer()->get('path.tmp') . self::DOWNLOAD_PATH;
+        $path = StaticContainer::get('path.tmp') . self::DOWNLOAD_PATH;
 
         $this->setName('translations:fetch')
              ->setDescription('Fetches translations files from oTrance to ' . $path)
@@ -36,6 +38,7 @@ class FetchFromOTrance extends TranslationBase
     {
         $output->writeln("Starting to fetch latest language pack");
 
+        /** @var DialogHelper $dialog */
         $dialog = $this->getHelperSet()->get('dialog');
 
         $cookieFile = self::getDownloadPath() . DIRECTORY_SEPARATOR . 'cookie.txt';
@@ -139,6 +142,7 @@ class FetchFromOTrance extends TranslationBase
 
         $output->writeln("Converting downloaded php files to json");
 
+        /** @var ProgressHelper $progress */
         $progress = $this->getHelperSet()->get('progress');
 
         $progress->start($output, count($filesToConvert));
@@ -167,7 +171,7 @@ class FetchFromOTrance extends TranslationBase
 
     public static function getDownloadPath()
     {
-        $path = StaticContainer::getContainer()->get('path.tmp') . self::DOWNLOAD_PATH;
+        $path = StaticContainer::get('path.tmp') . self::DOWNLOAD_PATH;
 
         if (!is_dir($path)) {
             mkdir($path);
diff --git a/plugins/LanguagesManager/Commands/SetTranslations.php b/plugins/LanguagesManager/Commands/SetTranslations.php
index 89a4994670..ef4ebdc22a 100644
--- a/plugins/LanguagesManager/Commands/SetTranslations.php
+++ b/plugins/LanguagesManager/Commands/SetTranslations.php
@@ -10,20 +10,19 @@
 namespace Piwik\Plugins\LanguagesManager\Commands;
 
 use Piwik\Plugins\LanguagesManager\API;
-use Piwik\Translate\Filter\ByBaseTranslations;
-use Piwik\Translate\Filter\ByParameterCount;
-use Piwik\Translate\Filter\EmptyTranslations;
-use Piwik\Translate\Filter\EncodedEntities;
-use Piwik\Translate\Filter\UnnecassaryWhitespaces;
-use Piwik\Translate\Validate\CoreTranslations;
-use Piwik\Translate\Validate\NoScripts;
-use Piwik\Translate\Writer;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\ByBaseTranslations;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\ByParameterCount;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\EmptyTranslations;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\EncodedEntities;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\UnnecassaryWhitespaces;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Validate\CoreTranslations;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Validate\NoScripts;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Writer;
+use Symfony\Component\Console\Helper\DialogHelper;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-/**
- */
 class SetTranslations extends TranslationBase
 {
     protected function configure()
@@ -37,6 +36,7 @@ class SetTranslations extends TranslationBase
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        /** @var DialogHelper $dialog */
         $dialog = $this->getHelperSet()->get('dialog');
 
         $languageCode = $input->getOption('code');
diff --git a/plugins/LanguagesManager/Commands/Update.php b/plugins/LanguagesManager/Commands/Update.php
index 7014ab7241..4d0c28bd76 100644
--- a/plugins/LanguagesManager/Commands/Update.php
+++ b/plugins/LanguagesManager/Commands/Update.php
@@ -10,6 +10,8 @@
 namespace Piwik\Plugins\LanguagesManager\Commands;
 
 use Piwik\Plugins\LanguagesManager\API;
+use Symfony\Component\Console\Helper\DialogHelper;
+use Symfony\Component\Console\Helper\ProgressHelper;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -31,6 +33,7 @@ class Update extends TranslationBase
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        /** @var DialogHelper $dialog */
         $dialog = $this->getHelperSet()->get('dialog');
 
         $command = $this->getApplication()->find('translations:fetch');
@@ -60,6 +63,7 @@ class Update extends TranslationBase
             $output->writeln("(!) Non interactive mode: New languages will be skipped");
         }
 
+        /** @var ProgressHelper $progress */
         $progress = $this->getHelperSet()->get('progress');
 
         $progress->start($output, count($files));
diff --git a/plugins/LanguagesManager/LanguagesManager.php b/plugins/LanguagesManager/LanguagesManager.php
index 6a0fcf10e1..9c977d2bab 100644
--- a/plugins/LanguagesManager/LanguagesManager.php
+++ b/plugins/LanguagesManager/LanguagesManager.php
@@ -12,10 +12,13 @@ namespace Piwik\Plugins\LanguagesManager;
 use Exception;
 use Piwik\Common;
 use Piwik\Config;
+use Piwik\Container\StaticContainer;
 use Piwik\Cookie;
 use Piwik\Db;
+use Piwik\Intl\Locale;
 use Piwik\Piwik;
 use Piwik\Translate;
+use Piwik\Translation\Translator;
 use Piwik\View;
 
 /**
@@ -29,12 +32,13 @@ class LanguagesManager extends \Piwik\Plugin
     public function getListHooksRegistered()
     {
         return array(
-            'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
-            'AssetManager.getJavaScriptFiles' => 'getJsFiles',
-            'User.getLanguage'                => 'getLanguageToLoad',
-            'UsersManager.deleteUser'         => 'deleteUserLanguage',
-            'Template.topBar'                 => 'addLanguagesManagerToOtherTopBar',
-            'Template.jsGlobalVariables'      => 'jsGlobalVariables'
+            'AssetManager.getStylesheetFiles'            => 'getStylesheetFiles',
+            'AssetManager.getJavaScriptFiles'            => 'getJsFiles',
+            'Request.dispatchCoreAndPluginUpdatesScreen' => 'initLanguage',
+            'Platform.initialized'                       => 'initLanguage',
+            'UsersManager.deleteUser'                    => 'deleteUserLanguage',
+            'Template.topBar'                            => 'addLanguagesManagerToOtherTopBar',
+            'Template.jsGlobalVariables'                 => 'jsGlobalVariables'
         );
     }
 
@@ -89,14 +93,24 @@ class LanguagesManager extends \Piwik\Plugin
         return $view->render();
     }
 
-    function getLanguageToLoad(&$language)
+    public function initLanguage()
     {
+        /** @var Translator $translator */
+        $translator = StaticContainer::get('Piwik\Translation\Translator');
+
+        $language = Common::getRequestVar('language', '', 'string');
         if (empty($language)) {
-            $language = self::getLanguageCodeForCurrentUser();
+            $userLanguage = self::getLanguageCodeForCurrentUser();
+            if (API::getInstance()->isLanguageAvailable($userLanguage)) {
+                $language = $userLanguage;
+            }
         }
-        if (!API::getInstance()->isLanguageAvailable($language)) {
-            $language = Translate::getLanguageDefault();
+        if (!empty($language) && API::getInstance()->isLanguageAvailable($language)) {
+            $translator->setCurrentLanguage($language);
         }
+
+        $locale = $translator->translate('General_Locale');
+        Locale::setLocale($locale);
     }
 
     public function deleteUserLanguage($userLogin)
diff --git a/plugins/LanguagesManager/Test/Integration/LanguagesManagerTest.php b/plugins/LanguagesManager/Test/Integration/LanguagesManagerTest.php
new file mode 100755
index 0000000000..1573d4ec37
--- /dev/null
+++ b/plugins/LanguagesManager/Test/Integration/LanguagesManagerTest.php
@@ -0,0 +1,187 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\LanguagesManager\Test\Integration;
+
+use Piwik\Container\StaticContainer;
+use Piwik\Intl\Data\Provider\LanguageDataProvider;
+use Piwik\Plugins\LanguagesManager\API;
+use \Exception;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\ByParameterCount;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\EmptyTranslations;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\EncodedEntities;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\UnnecassaryWhitespaces;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Validate\CoreTranslations;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Validate\NoScripts;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Writer;
+
+/**
+ * @group LanguagesManager
+ */
+class LanguagesManagerTest extends \PHPUnit_Framework_TestCase
+{
+    function getTestDataForLanguageFiles()
+    {
+        // we also test that none of the language php files outputs any character on the screen (eg. space before the <?php)
+        $languages = API::getInstance()->getAvailableLanguages();
+
+        $plugins = \Piwik\Plugin\Manager::getInstance()->readPluginsDirectory();
+
+        $pluginsWithTranslation = array();
+
+        foreach ($plugins as $plugin) {
+
+            if (API::getInstance()->getPluginTranslationsForLanguage($plugin, 'en')) {
+
+                $pluginsWithTranslation[] = $plugin;
+            }
+        }
+
+        $return = array();
+        foreach ($languages as $language) {
+            if ($language != 'en') {
+                $return[] = array($language, null);
+
+                foreach ($pluginsWithTranslation as $plugin) {
+
+                    $return[] = array($language, $plugin);
+                }
+            }
+        }
+
+        return $return;
+    }
+
+    /**
+     * test all languages
+     *
+     * @group Plugins
+     *
+     * @dataProvider getTestDataForLanguageFiles
+     */
+    function testGetTranslationsForLanguages($language, $plugin)
+    {
+        $translationWriter = new Writer($language, $plugin);
+
+        $baseTranslations = $translationWriter->getTranslations('en');
+
+        $translationWriter->addValidator(new NoScripts());
+        if (empty($plugin)) {
+            $translationWriter->addValidator(new CoreTranslations($baseTranslations));
+        }
+
+        // prevent build from failing when translations string have been deleted
+//        $translationWriter->addFilter(new ByBaseTranslations($baseTranslations));
+        $translationWriter->addFilter(new EmptyTranslations());
+        $translationWriter->addFilter(new ByParameterCount($baseTranslations));
+        $translationWriter->addFilter(new UnnecassaryWhitespaces($baseTranslations));
+        $translationWriter->addFilter(new EncodedEntities());
+
+        $translations = $translationWriter->getTranslations($language);
+
+        if (empty($translations)) {
+            return; // skip language / plugin combinations that aren't present
+        }
+
+        $translationWriter->setTranslations($translations);
+
+        $this->assertTrue($translationWriter->isValid(), $translationWriter->getValidationMessage());
+
+        if ($translationWriter->wasFiltered()) {
+
+            $translationWriter->saveTemporary();
+            $this->markTestSkipped(implode("\n", $translationWriter->getFilterMessages()) . "\n"
+                . 'Translation file errors detected in ' . $language . "...\n"
+                . "To synchronise the language files with the english strings, you can manually edit the language files or run the following command may work if you have access to oTrance: \n"
+                . "$ ./console translations:update [--plugin=XYZ] \n"
+            );
+        }
+    }
+
+    /**
+     * test language when it's not defined
+     *
+     * @group Plugins
+     *
+     * @expectedException Exception
+     */
+    function testWriterInvalidPlugin()
+    {
+        new Writer('de', 'iNvaLiDPluGin'); // invalid plugin throws exception
+    }
+
+    /**
+     * test language when it's not defined
+     *
+     * @group Plugins
+     */
+    function testGetTranslationsForLanguagesNot()
+    {
+        $this->assertFalse(API::getInstance()->getTranslationsForLanguage("../no-language"));
+    }
+
+    /**
+     * test English short name for language
+     *
+     * @group Plugins
+     */
+    function testGetLanguageNamesInEnglish()
+    {
+        $languages = API::getInstance()->getAvailableLanguages();
+
+        /** @var LanguageDataProvider $dataProvider */
+        $dataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\LanguageDataProvider');
+        $languagesReference = $dataProvider->getLanguageList();
+
+        foreach ($languages as $language) {
+            $data = file_get_contents(PIWIK_INCLUDE_PATH . "/lang/$language.json");
+            $translations = json_decode($data, true);
+            $name = $translations['General']['EnglishLanguageName'];
+
+            if ($language != 'en') {
+                $this->assertFalse($name == 'English', "for $language");
+            }
+
+            $languageCode = substr($language, 0, 2);
+            $this->assertTrue(isset($languagesReference[$languageCode]));
+            $names = $languagesReference[$languageCode];
+
+            if (isset($languagesReference[$language])) {
+                if (is_array($names)) {
+                    $this->assertTrue(in_array($name, $names), "$language: failed because $name not a known language name");
+                } else {
+                    $this->assertTrue($name == $names, "$language: failed because $name == $names");
+                }
+            } else {
+                if (is_array($names)) {
+                    $this->assertTrue(strpos($name, $names[0]) !== false);
+                } else {
+                    $this->fail("$language: expected an array of language names");
+                }
+            }
+        }
+    }
+
+    /**
+     * test format of DataFile/Languages.php
+     *
+     * @group Plugins
+     */
+    public function testGetLanguagesList()
+    {
+        /** @var LanguageDataProvider $languageDataProvider */
+        $languageDataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\LanguageDataProvider');
+
+        $languages = $languageDataProvider->getLanguageList();
+        $this->assertTrue(count($languages) > 0);
+        foreach ($languages as $langCode => $langs) {
+            $this->assertTrue(strlen($langCode) == 2, "$langCode length = 2");
+            $this->assertTrue(is_array($langs) && count($langs) >= 1, "$langCode array(names) >= 1");
+        }
+    }
+}
diff --git a/plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/ByBaseTranslationsTest.php b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/ByBaseTranslationsTest.php
new file mode 100644
index 0000000000..aba41991b6
--- /dev/null
+++ b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/ByBaseTranslationsTest.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\LanguagesManager\Test\Unit\TranslationWriter\Filter;
+
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\ByBaseTranslations;
+
+/**
+ * @group LanguagesManager
+ */
+class ByBaseTranslationsTest extends \PHPUnit_Framework_TestCase
+{
+    public function getFilterTestData()
+    {
+        return array(
+            // empty stays empty
+            array(
+                array(),
+                array(),
+                array(),
+                array()
+            ),
+            // empty plugin is removed
+            array(
+                array(
+                    'test' => array()
+                ),
+                array(),
+                array(),
+                array(
+                    'test' => array()
+                ),
+            ),
+            // not existing values/plugins are removed
+            array(
+                array(
+                    'test' => array(
+                        'key' => 'value',
+                        'test' => 'test'
+                    )
+                ),
+                array(
+                    'test' => array(
+                        'key' => 'value',
+                        'x'   => 'y'
+                    )
+                ),
+                array(
+                    'test' => array(
+                        'key' => 'value',
+                    )
+                ),
+                array(
+                    'test' => array(
+                        'test' => 'test',
+                    )
+                ),
+            ),
+            // no change if all exist
+            array(
+                array(
+                    'test' => array(
+                        'test' => 'test'
+                    )
+                ),
+                array(
+                    'test' => array(
+                        'test' => 'test'
+                    )
+                ),
+                array(
+                    'test' => array(
+                        'test' => 'test'
+                    )
+                ),
+                array()
+            ),
+            // unavailable removed, others stay
+            array(
+                array(
+                    'empty' => array(
+                        'test' => 'test'
+                    ),
+                    'test' => array(
+                        'test' => 'test',
+                        'empty' => '     ',
+                    )
+                ),
+                array(
+                    'empty' => array(
+                        'test' => 'test'
+                    ),
+                    'test' => array(
+                        'test' => 'test',
+                    )
+                ),
+                array(
+                    'empty' => array(
+                        'test' => 'test'
+                    ),
+                    'test' => array(
+                        'test' => 'test'
+                    )
+                ),
+                array(
+                    'test' => array(
+                        'empty' => '     ',
+                    )
+                )
+            ),
+            array(
+                array(
+                    'empty' => array(
+                        'test' => 'test'
+                    ),
+                    'test' => array(
+                        'test' => 'test',
+                        'empty' => '     ',
+                    )
+                ),
+                array(
+                    'empty' => array(
+                        'bla' => 'test'
+                    ),
+                    'test' => array(
+                        'test' => 'test',
+                    )
+                ),
+                array(
+                    'test' => array(
+                        'test' => 'test'
+                    )
+                ),
+                array(
+                    'empty' => array(
+                        'test' => 'test'
+                    ),
+                    'test' => array(
+                        'empty' => '     ',
+                    )
+                )
+            ),
+        );
+    }
+
+    /**
+     * @dataProvider getFilterTestData
+     * @group Core
+     */
+    public function testFilter($translations, $baseTranslations, $expected, $filteredData)
+    {
+        $filter = new ByBaseTranslations($baseTranslations);
+        $result = $filter->filter($translations);
+        $this->assertEquals($expected, $result);
+        $this->assertEquals($filteredData, $filter->getFilteredData());
+    }
+}
diff --git a/plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/ByParameterCountTest.php b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/ByParameterCountTest.php
new file mode 100644
index 0000000000..f8b57e9106
--- /dev/null
+++ b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/ByParameterCountTest.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\LanguagesManager\Test\Unit\TranslationWriter\Filter;
+
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\ByParameterCount;
+
+/**
+ * @group LanguagesManager
+ */
+class ByParameterCountTest extends \PHPUnit_Framework_TestCase
+{
+    public function getFilterTestData()
+    {
+        return array(
+            // empty stays empty - nothing to filter
+            array(
+                array(),
+                array(),
+                array(),
+                array()
+            ),
+            // empty plugin is removed
+            array(
+                array(
+                    'test' => array()
+                ),
+                array(),
+                array(),
+                array(),
+            ),
+            // value with %s will be removed, as it isn't there in base
+            array(
+                array(
+                    'test' => array(
+                        'key' => 'val%sue',
+                        'test' => 'test'
+                    )
+                ),
+                array(
+                    'test' => array(
+                        'key' => 'value',
+                    )
+                ),
+                array(),
+                array(
+                    'test' => array(
+                        'key' => 'val%sue',
+                    )
+                ),
+            ),
+            // no change if placeholder count is the same
+            array(
+                array(
+                    'test' => array(
+                        'test' => 'te%sst'
+                    )
+                ),
+                array(
+                    'test' => array(
+                        'test' => 'test%s'
+                    )
+                ),
+                array(
+                    'test' => array(
+                        'test' => 'te%sst'
+                    )
+                ),
+                array()
+            ),
+            // missing placeholder will be removed
+            array(
+                array(
+                    'empty' => array(
+                        'test' => 't%1$sest'
+                    ),
+                    'test' => array(
+                        'test' => '%1$stest',
+                        'empty' => '     ',
+                    )
+                ),
+                array(
+                    'empty' => array(
+                        'test' => 'test%1$s'
+                    ),
+                    'test' => array(
+                        'test' => '%1$stest%2$s',
+                    )
+                ),
+                array(
+                    'empty' => array(
+                        'test' => 't%1$sest'
+                    ),
+                ),
+                array(
+                    'test' => array(
+                        'test' => '%1$stest',
+                    )
+                )
+            ),
+        );
+    }
+
+    /**
+     * @dataProvider getFilterTestData
+     * @group Core
+     */
+    public function testFilter($translations, $baseTranslations, $expected, $filteredData)
+    {
+        $filter = new ByParameterCount($baseTranslations);
+        $result = $filter->filter($translations);
+        $message = sprintf("got %s but expected %s", var_export($result, true), var_export($expected, true));
+        $this->assertEquals($expected, $result, $message);
+        $this->assertEquals($filteredData, $filter->getFilteredData());
+    }
+}
diff --git a/plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/EmptyTranslationsTest.php b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/EmptyTranslationsTest.php
new file mode 100644
index 0000000000..da250c0d79
--- /dev/null
+++ b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/EmptyTranslationsTest.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\LanguagesManager\Test\Unit\TranslationWriter\Filter;
+
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\EmptyTranslations;
+
+/**
+ * @group LanguagesManager
+ */
+class EmptyTranslationsTest extends \PHPUnit_Framework_TestCase
+{
+    public function getFilterTestData()
+    {
+        return array(
+            // empty stays empty
+            array(
+                array(),
+                array(),
+                array()
+            ),
+            // empty plugin is removed
+            array(
+                array(
+                    'test' => array()
+                ),
+                array(),
+                array(),
+            ),
+            // empty values/plugins are removed
+            array(
+                array(
+                    'test' => array(
+                        'empty' => '',
+                        'whitespace' => '    '
+                    )
+                ),
+                array(),
+                array(
+                    'test' => array(
+                        'empty' => '',
+                        'whitespace' => '    '
+                    )
+                ),
+            ),
+            // no change if no empty value
+            array(
+                array(
+                    'test' => array(
+                        'test' => 'test'
+                    )
+                ),
+                array(
+                    'test' => array(
+                        'test' => 'test'
+                    )
+                ),
+                array()
+            ),
+            // empty values are removed, others stay
+            array(
+                array(
+                    'empty' => array(),
+                    'test' => array(
+                        'test' => 'test',
+                        'empty' => '     ',
+                    )
+                ),
+                array(
+                    'test' => array(
+                        'test' => 'test'
+                    )
+                ),
+                array(
+                    'test' => array(
+                        'empty' => '     ',
+                    )
+                )
+            ),
+        );
+    }
+
+    /**
+     * @dataProvider getFilterTestData
+     * @group Core
+     */
+    public function testFilter($translations, $expected, $filteredData)
+    {
+        $filter = new EmptyTranslations();
+        $result = $filter->filter($translations);
+        $this->assertEquals($expected, $result);
+        $this->assertEquals($filteredData, $filter->getFilteredData());
+    }
+}
diff --git a/plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/EncodedEntitiesTest.php b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/EncodedEntitiesTest.php
new file mode 100644
index 0000000000..9411a65124
--- /dev/null
+++ b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/EncodedEntitiesTest.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\LanguagesManager\Test\Unit\TranslationWriter\Filter;
+
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\EncodedEntities;
+
+/**
+ * @group LanguagesManager
+ */
+class EncodedEntitiesTest extends \PHPUnit_Framework_TestCase
+{
+    public function getFilterTestData()
+    {
+        return array(
+            // empty stays empty - nothing to filter
+            array(
+                array(),
+                array(),
+                array()
+            ),
+            // empty plugin is removed
+            array(
+                array(
+                    'test' => array()
+                ),
+                array(
+                    'test' => array()
+                ),
+                array(),
+            ),
+            // no entites - nothing to filter
+            array(
+                array(
+                    'test' => array(
+                        'key' => 'val%sue',
+                        'test' => 'test'
+                    )
+                ),
+                array(
+                    'test' => array(
+                        'key' => 'val%sue',
+                        'test' => 'test'
+                    )
+                ),
+                array(),
+            ),
+            // entities needs to be decodded
+            array(
+                array(
+                    'test' => array(
+                        'test' => 'te&amp;st'
+                    )
+                ),
+                array(
+                    'test' => array(
+                        'test' => 'te&st'
+                    )
+                ),
+                array(
+                    'test' => array(
+                        'test' => 'te&amp;st'
+                    )
+                ),
+            ),
+            array(
+                array(
+                    'empty' => array(
+                        'test' => 't&uuml;sest'
+                    ),
+                    'test' => array(
+                        'test' => '%1$stest',
+                        'empty' => '&tilde;',
+                    )
+                ),
+                array(
+                    'empty' => array(
+                        'test' => 'tüsest'
+                    ),
+                    'test' => array(
+                        'test' => '%1$stest',
+                        'empty' => '˜',
+                    )
+                ),
+                array(
+                    'empty' => array(
+                        'test' => 't&uuml;sest'
+                    ),
+                    'test' => array(
+                        'empty' => '&tilde;',
+                    )
+                ),
+            ),
+        );
+    }
+
+    /**
+     * @dataProvider getFilterTestData
+     * @group Core
+     */
+    public function testFilter($translations, $expected, $filteredData)
+    {
+        $filter = new EncodedEntities();
+        $result = $filter->filter($translations);
+        $this->assertEquals($expected, $result);
+        $this->assertEquals($filteredData, $filter->getFilteredData());
+    }
+}
diff --git a/plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/UnnecassaryWhitespacesTest.php b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/UnnecassaryWhitespacesTest.php
new file mode 100644
index 0000000000..701df50144
--- /dev/null
+++ b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/UnnecassaryWhitespacesTest.php
@@ -0,0 +1,158 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\LanguagesManager\Test\Unit\TranslationWriter\Filter;
+
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\UnnecassaryWhitespaces;
+
+/**
+ * @group LanguagesManager
+ */
+class UnnecassaryWhitepsacesTest extends \PHPUnit_Framework_TestCase
+{
+    public function getFilterTestData()
+    {
+        return array(
+            // empty stays empty - nothing to filter
+            array(
+                array(),
+                array(),
+                array(),
+                array()
+            ),
+            // no entites - nothing to filter
+            array(
+                array(
+                    'test' => array(
+                        'key' => "val\n\n\r\n\nue",
+                        'test' => 'test'
+                    )
+                ),
+                array(
+                    'test' => array(
+                        'key' => "base val\n\nue",
+                        'test' => 'test'
+                    )
+                ),
+                array(
+                    'test' => array(
+                        'key' => "val\n\nue",
+                        'test' => 'test'
+                    )
+                ),
+                array(
+                    'test' => array(
+                        'key' => "val\n\n\r\n\nue",
+                    )
+
+                ),
+            ),
+            // entities needs to be decodded
+            array(
+                array(
+                    'test' => array(
+                        'test' => 'test                        palim'
+                    )
+                ),
+                array(
+                    'test' => array(
+                        'test' => 'no line breaks'
+                    )
+                ),
+                array(
+                    'test' => array(
+                        'test' => 'test palim'
+                    )
+                ),
+                array(
+                    'test' => array(
+                        'test' => 'test                        palim'
+                    )
+                ),
+            ),
+            array(
+                array(
+                    'empty' => array(
+                        'test' => "test\n\n\ntest"
+                    ),
+                ),
+                array(
+                    'empty' => array(
+                        'test' => 'no line break'
+                    ),
+                ),
+                array(
+                    'empty' => array(
+                        'test' => 'test test'
+                    ),
+                ),
+                array(
+                    'empty' => array(
+                        'test' => "test\n\n\ntest"
+                    ),
+                ),
+            ),
+            array(
+                array(
+                    'empty' => array(
+                        'test' => "test\n         \n\n      test"
+                    ),
+                ),
+                array(
+                    'empty' => array(
+                        'test' => 'no line break'
+                    ),
+                ),
+                array(
+                    'empty' => array(
+                        'test' => 'test test'
+                    ),
+                ),
+                array(
+                    'empty' => array(
+                        'test' => "test\n         \n\n      test"
+                    ),
+                ),
+            ),
+            array(
+                array(
+                    'empty' => array(
+                        'test' => "test\n         \n\n      test"
+                    ),
+                ),
+                array(
+                    'empty' => array(
+                        'test' => "line\n break"
+                    ),
+                ),
+                array(
+                    'empty' => array(
+                        'test' => "test\n\ntest"
+                    ),
+                ),
+                array(
+                    'empty' => array(
+                        'test' => "test\n         \n\n      test"
+                    ),
+                ),
+            ),
+        );
+    }
+
+    /**
+     * @dataProvider getFilterTestData
+     * @group Core
+     */
+    public function testFilter($translations, $baseTranslations, $expected, $filteredData)
+    {
+        $filter = new UnnecassaryWhitespaces($baseTranslations);
+        $result = $filter->filter($translations);
+        $this->assertEquals($expected, $result);
+        $this->assertEquals($filteredData, $filter->getFilteredData());
+    }
+}
diff --git a/plugins/LanguagesManager/Test/Unit/TranslationWriter/Validate/CoreTranslationsTest.php b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Validate/CoreTranslationsTest.php
new file mode 100644
index 0000000000..cd0ed02093
--- /dev/null
+++ b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Validate/CoreTranslationsTest.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\LanguagesManager\Test\Unit\TranslationWriter\Validate;
+
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Validate\CoreTranslations;
+
+/**
+ * @group LanguagesManager
+ */
+class CoreTranslationsTest extends \PHPUnit_Framework_TestCase
+{
+    public function getFilterTestDataValid()
+    {
+        return array(
+            array(
+                array(
+                    'General' => array_merge(array_fill(0, 251, 'test'), array(
+                                                                              'Locale'          => 'de_DE.UTF-8',
+                                                                              'TranslatorName'  => 'name',
+                                                                              'TranslatorEmail' => 'email',
+                                                                         )
+                    )
+                ),
+            )
+        );
+    }
+
+    /**
+     * @dataProvider getFilterTestDataValid
+     * @group Core
+     */
+    public function testFilterValid($translations)
+    {
+        $filter = new CoreTranslations();
+        $result = $filter->isValid($translations);
+        $this->assertTrue($result);
+    }
+
+    public function getFilterTestDataInvalid()
+    {
+        return array(
+            array(
+                array(
+                    'General' => array(
+                        'bla' => 'test text'
+                    )
+                ),
+                CoreTranslations::ERRORSTATE_LOCALEREQUIRED
+            ),
+            array(
+                array(
+                    'General' => array(
+                        'Locale' => 'de_DE.UTF-8'
+                    )
+                ),
+                CoreTranslations::ERRORSTATE_TRANSLATORINFOREQUIRED
+            ),
+            array(
+                array(
+                    'General' => array(
+                        'Locale' => 'de_DE.UTF-8',
+                        'TranslatorName' => 'name',
+                    )
+                ),
+                CoreTranslations::ERRORSTATE_TRANSLATOREMAILREQUIRED
+            ),
+            array(
+                array(
+                    'General' => array(
+                        'Locale' => 'de_DE.UTF-8',
+                        'TranslatorName' => 'name',
+                        'TranslatorEmail' => 'emails',
+                        'LayoutDirection' => 'afd'
+                    )
+                ),
+                CoreTranslations::ERRORSTATE_LAYOUTDIRECTIONINVALID
+            ),
+            array(
+                array(
+                    'General' => array(
+                        'Locale' => 'invalid',
+                        'TranslatorName' => 'name',
+                        'TranslatorEmail' => 'emails',
+                        'LayoutDirection' => 'ltr'
+                    )
+                ),
+                CoreTranslations::ERRORSTATE_LOCALEINVALID
+            ),
+            array(
+                array(
+                    'General' => array(
+                        'Locale' => 'xx_DE.UTF-8',
+                        'TranslatorName' => 'name',
+                        'TranslatorEmail' => 'emails',
+                        'LayoutDirection' => 'ltr'
+                    )
+                ),
+                CoreTranslations::ERRORSTATE_LOCALEINVALIDLANGUAGE
+            ),
+            array(
+                array(
+                    'General' => array(
+                        'Locale' => 'de_XX.UTF-8',
+                        'TranslatorName' => 'name',
+                        'TranslatorEmail' => 'emails',
+                        'LayoutDirection' => 'ltr'
+                    )
+                ),
+                CoreTranslations::ERRORSTATE_LOCALEINVALIDCOUNTRY
+            ),
+        );
+    }
+
+    /**
+     * @dataProvider getFilterTestDataInvalid
+     * @group Core
+     */
+    public function testFilterInvalid($translations, $msg)
+    {
+        $filter = new CoreTranslations();
+        $result = $filter->isValid($translations);
+        $this->assertFalse($result);
+        $this->assertEquals($msg, $filter->getMessage());
+    }
+}
diff --git a/plugins/LanguagesManager/Test/Unit/TranslationWriter/Validate/NoScriptsTest.php b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Validate/NoScriptsTest.php
new file mode 100644
index 0000000000..fcf5201d76
--- /dev/null
+++ b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Validate/NoScriptsTest.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\LanguagesManager\Test\Unit\TranslationWriter\Validate;
+
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Validate\NoScripts;
+
+/**
+ * @group LanguagesManager
+ */
+class NoScriptsTest extends \PHPUnit_Framework_TestCase
+{
+    public function getFilterTestDataValid()
+    {
+        return array(
+            array(
+                array(),
+            ),
+            array(
+                array(
+                    'test' => array()
+                ),
+            ),
+            array(
+                array(
+                    'test' => array(
+                        'key' => 'val%sue',
+                        'test' => 'test'
+                    )
+                ),
+            ),
+        );
+    }
+
+    /**
+     * @dataProvider getFilterTestDataValid
+     * @group Core
+     */
+    public function testFilterValid($translations)
+    {
+        $filter = new NoScripts();
+        $result = $filter->isValid($translations);
+        $this->assertTrue($result);
+    }
+
+    public function getFilterTestDataInvalid()
+    {
+        return array(
+            array(
+                array(
+                    'test' => array(
+                        'test' => 'test text <script'
+                    )
+                ),
+            ),
+            array(
+                array(
+                    'empty' => array(
+                        'test' => 't&uuml;sest'
+                    ),
+                    'test' => array(
+                        'test' => 'bla <a href="javascript:alert();"> link </a>',
+                        'empty' => '&tilde;',
+                    )
+                ),
+            ),
+            array(
+                array(
+                    'test' => array(
+                        'test' => 'bla <a onload="alert(\'test\');">link</a>'
+                    )
+                ),
+            ),
+            array(
+                array(
+                    'test' => array(
+                        'test' => 'no <img src="test" />'
+                    )
+                ),
+            ),
+            array(
+                array(
+                    'test' => array(
+                        'test' => 'that will fail on document. or not?'
+                    )
+                ),
+            ),
+            array(
+                array(
+                    'test' => array(
+                        'test' => 'bla <a background="yellow">link</a>'
+                    )
+                ),
+            ),
+        );
+    }
+
+    /**
+     * @dataProvider getFilterTestDataInvalid
+     * @group Core
+     */
+    public function testFilterInvalid($translations)
+    {
+        $filter = new NoScripts();
+        $result = $filter->isValid($translations);
+        $this->assertFalse($result);
+    }
+}
diff --git a/plugins/LanguagesManager/Test/Unit/TranslationWriter/WriterTest.php b/plugins/LanguagesManager/Test/Unit/TranslationWriter/WriterTest.php
new file mode 100644
index 0000000000..00966cbe95
--- /dev/null
+++ b/plugins/LanguagesManager/Test/Unit/TranslationWriter/WriterTest.php
@@ -0,0 +1,276 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\LanguagesManager\Test\Unit\TranslationWriter;
+
+use Piwik\Container\StaticContainer;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\ByBaseTranslations;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\ByParameterCount;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\UnnecassaryWhitespaces;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Validate\CoreTranslations;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Validate\NoScripts;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Writer;
+
+/**
+ * @group LanguagesManager
+ */
+class WriterTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @group Core
+     *
+     * @dataProvider getValidConstructorData
+     */
+    public function testConstructorValid($language, $plugin)
+    {
+        $translationWriter = new Writer($language, $plugin);
+        $this->assertEquals($language, $translationWriter->getLanguage());
+        $this->assertFalse($translationWriter->hasTranslations());
+    }
+
+    public function getValidConstructorData()
+    {
+        return array(
+            array('en', ''),
+            array('de', ''),
+            array('en', 'ExamplePlugin'),
+        );
+    }
+
+    /**
+     * @group Core
+     *
+     * @expectedException \Exception
+     */
+    public function testConstructorInvalid()
+    {
+        new Writer('en', 'InValIdPlUGin');
+    }
+
+    /**
+     * @group Core
+     */
+    public function testHasTranslations()
+    {
+        $writer = new Writer('de');
+        $writer->setTranslations(array('General' => array('test' => 'test')));
+        $this->assertTrue($writer->hasTranslations());
+    }
+
+    /**
+     * @group Core
+     */
+    public function testHasNoTranslations()
+    {
+        $writer = new Writer('de');
+        $this->assertFalse($writer->hasTranslations());
+    }
+
+    /**
+     * @group Core
+     */
+    public function testSetTranslationsEmpty()
+    {
+        $writer = new Writer('de');
+        $writer->setTranslations(array());
+        $this->assertTrue($writer->isValid());
+        $this->assertFalse($writer->hasTranslations());
+    }
+
+    /**
+     * @group Core
+     *
+     * @dataProvider getInvalidTranslations
+     */
+    public function testSetTranslationsInvalid($translations, $error)
+    {
+        $writer = new Writer('de');
+        $writer->setTranslations($translations);
+        $writer->addValidator(new NoScripts());
+        $writer->addValidator(new CoreTranslations());
+        $this->assertFalse($writer->isValid());
+        $this->assertEquals($error, $writer->getValidationMessage());
+    }
+
+    public function getInvalidTranslations()
+    {
+        $translations = json_decode(file_get_contents(PIWIK_INCLUDE_PATH.'/lang/de.json'), true);
+        return array(
+            array(array('General' => array('Locale' => '')) + $translations, CoreTranslations::ERRORSTATE_LOCALEREQUIRED),
+            array(array('General' => array('Locale' => 'de_DE.UTF-8')) + $translations, CoreTranslations::ERRORSTATE_TRANSLATORINFOREQUIRED),
+            array(array('General' => array('Locale' => 'de_DE.UTF-8',
+                                           'TranslatorName' => 'name')) + $translations, CoreTranslations::ERRORSTATE_TRANSLATOREMAILREQUIRED),
+            array(array('General' => array('Locale' => 'de_DE.UTF-8',
+                                           'TranslatorName' => 'name',
+                                           'TranslatorEmail' => 'name@domain.com',
+                                           'LayoutDirection' => 'fail')) + $translations, CoreTranslations::ERRORSTATE_LAYOUTDIRECTIONINVALID),
+            array(array('General' => array('Locale' => 'invalid',
+                                           'TranslatorName' => 'name',
+                                           'TranslatorEmail' => 'name@domain.com')) + $translations, CoreTranslations::ERRORSTATE_LOCALEINVALID),
+            array(array('General' => array('Locale' => 'xx_DE.UTF-8',
+                                           'TranslatorName' => 'name',
+                                           'TranslatorEmail' => 'name@domain.com',)) + $translations, CoreTranslations::ERRORSTATE_LOCALEINVALIDLANGUAGE),
+            array(array('General' => array('Locale' => 'de_XX.UTF-8',
+                                           'TranslatorName' => 'name',
+                                           'TranslatorEmail' => 'name@domain.com',)) + $translations, CoreTranslations::ERRORSTATE_LOCALEINVALIDCOUNTRY),
+            array(array('General' => array('Locale' => '<script>')) + $translations, 'script tags restricted for language files'),
+        );
+    }
+
+    /**
+     * @group Core
+     *
+     * @expectedException \Exception
+     */
+    public function testSaveException()
+    {
+        $writer = new Writer('it');
+        $writer->save();
+    }
+
+    /**
+     * @group Core
+     *
+     * @expectedException \Exception
+     */
+    public function testSaveTemporaryException()
+    {
+        $writer = new Writer('it');
+        $writer->saveTemporary();
+    }
+
+    /**
+     * @group Core
+     */
+    public function testSaveTranslation()
+    {
+        $translations = json_decode(file_get_contents(PIWIK_INCLUDE_PATH.'/lang/en.json'), true);
+
+        $translationsToWrite = array();
+        $translationsToWrite['General'] = $translations['General'];
+        $translationsToWrite['Mobile'] = $translations['Mobile'];
+
+        $translationsToWrite['General']['Yes'] = 'string with %1$s';
+        $translationsToWrite['Plugin'] = array(
+            'Body' => "Message\nBody"
+        );
+
+        $translationWriter = new Writer('fr');
+
+        $translationWriter->addFilter(new UnnecassaryWhitespaces($translations));
+        $translationWriter->addFilter(new ByBaseTranslations($translations));
+        $translationWriter->addFilter(new ByParameterCount($translations));
+
+        $translationWriter->setTranslations($translationsToWrite);
+
+        $rc = $translationWriter->saveTemporary();
+
+        @unlink(PIWIK_INCLUDE_PATH.'/tmp/fr.json');
+
+        $this->assertGreaterThan(25000, $rc);
+
+        $this->assertCount(4, $translationWriter->getFilterMessages());
+    }
+
+    /**
+     * @group Core
+     *
+     * @dataProvider getTranslationPathTestData
+     */
+    public function testGetTranslationsPath($language, $plugin, $path)
+    {
+        $writer = new Writer($language, $plugin);
+        $this->assertEquals($path, $writer->getTranslationPath());
+    }
+
+    public function getTranslationPathTestData()
+    {
+        return array(
+            array('de', null, PIWIK_INCLUDE_PATH . '/lang/de.json'),
+            array('te', null, PIWIK_INCLUDE_PATH . '/lang/te.json'),
+            array('de', 'CoreHome', PIWIK_INCLUDE_PATH . '/plugins/CoreHome/lang/de.json'),
+            array('pt-br', 'Actions', PIWIK_INCLUDE_PATH . '/plugins/Actions/lang/pt-br.json'),
+        );
+    }
+
+    /**
+     * @group Core
+     *
+     * @dataProvider getTranslationPathTemporaryTestData
+     */
+    public function testGetTemporaryTranslationPath($language, $plugin, $path)
+    {
+        $writer = new Writer($language, $plugin);
+        $this->assertEquals($path, $writer->getTemporaryTranslationPath());
+    }
+
+    public function getTranslationPathTemporaryTestData()
+    {
+        $tmpPath = StaticContainer::get('path.tmp');
+
+        return array(
+            array('de', null, $tmpPath . '/de.json'),
+            array('te', null, $tmpPath . '/te.json'),
+            array('de', 'CoreHome', $tmpPath . '/plugins/CoreHome/lang/de.json'),
+            array('pt-br', 'Actions', $tmpPath . '/plugins/Actions/lang/pt-br.json'),
+        );
+    }
+
+    /**
+     * @group Core
+     *
+     * @dataProvider getValidLanguages
+     */
+    public function testSetLanguageValid($language)
+    {
+        $writer = new Writer('en', null);
+        $writer->setLanguage($language);
+        $this->assertEquals(strtolower($language), $writer->getLanguage());
+    }
+
+    public function getValidLanguages()
+    {
+        return array(
+            array('de'),
+            array('te'),
+            array('pt-br'),
+            array('tzm'),
+            array('abc'),
+            array('de-de'),
+            array('DE'),
+            array('DE-DE'),
+            array('DE-de'),
+        );
+    }
+    /**
+     * @group Core
+     *
+     * @expectedException \Exception
+     * @dataProvider getInvalidLanguages
+     */
+    public function testSetLanguageInvalid($language)
+    {
+        $writer = new Writer('en', null);
+        $writer->setLanguage($language);
+    }
+
+    public function getInvalidLanguages()
+    {
+        return array(
+            array(''),
+            array('abcd'),
+            array('pt-brfr'),
+            array('00'),
+            array('a-b'),
+            array('x3'),
+            array('X4-fd'),
+            array('12-34'),
+            array('$§'),
+        );
+    }
+}
diff --git a/plugins/LanguagesManager/TranslationWriter/Filter/ByBaseTranslations.php b/plugins/LanguagesManager/TranslationWriter/Filter/ByBaseTranslations.php
new file mode 100644
index 0000000000..1504f49e0d
--- /dev/null
+++ b/plugins/LanguagesManager/TranslationWriter/Filter/ByBaseTranslations.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\LanguagesManager\TranslationWriter\Filter;
+
+class ByBaseTranslations extends FilterAbstract
+{
+    protected $baseTranslations = array();
+
+    /**
+     * Sets base translations
+     *
+     * @param array $baseTranslations
+     */
+    public function __construct($baseTranslations = array())
+    {
+        $this->baseTranslations = $baseTranslations;
+    }
+
+    /**
+     * Removes all translations that aren't present in the base translations set in constructor
+     *
+     * @param  array $translations
+     *
+     * @return array   filtered translations
+     */
+    public function filter($translations)
+    {
+        $cleanedTranslations = array();
+
+        foreach ($translations as $pluginName => $pluginTranslations) {
+
+            if (empty($this->baseTranslations[$pluginName])) {
+                $this->filteredData[$pluginName] = $pluginTranslations;
+                continue;
+            }
+
+            foreach ($pluginTranslations as $key => $translation) {
+                if (isset($this->baseTranslations[$pluginName][$key])) {
+                    $cleanedTranslations[$pluginName][$key] = $translation;
+                }
+            }
+
+            if (!empty($cleanedTranslations[$pluginName])) {
+                $diff = array_diff($translations[$pluginName], $cleanedTranslations[$pluginName]);
+            } else {
+                $diff = $translations[$pluginName];
+            }
+            if (!empty($diff)) {
+                $this->filteredData[$pluginName] = $diff;
+            }
+        }
+
+        return $cleanedTranslations;
+    }
+}
diff --git a/plugins/LanguagesManager/TranslationWriter/Filter/ByParameterCount.php b/plugins/LanguagesManager/TranslationWriter/Filter/ByParameterCount.php
new file mode 100644
index 0000000000..0d8a3cd482
--- /dev/null
+++ b/plugins/LanguagesManager/TranslationWriter/Filter/ByParameterCount.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\LanguagesManager\TranslationWriter\Filter;
+
+class ByParameterCount extends FilterAbstract
+{
+    protected $baseTranslations = array();
+
+    /**
+     * Sets base translations
+     *
+     * @param array $baseTranslations
+     */
+    public function __construct($baseTranslations = array())
+    {
+        $this->baseTranslations = $baseTranslations;
+    }
+
+    /**
+     * Removes all translations where the placeholder parameter count differs to base translation
+     *
+     * @param  array $translations
+     *
+     * @return array   filtered translations
+     */
+    public function filter($translations)
+    {
+        $cleanedTranslations = array();
+
+        foreach ($translations as $pluginName => $pluginTranslations) {
+
+            foreach ($pluginTranslations as $key => $translation) {
+
+                if (isset($this->baseTranslations[$pluginName][$key])) {
+                    $baseTranslation = $this->baseTranslations[$pluginName][$key];
+                } else {
+                    // english string was deleted, do not error
+                    continue;
+                }
+
+                // ensure that translated strings have the same number of %s as the english source strings
+                $baseCount = $this->_getParametersCountToReplace($baseTranslation);
+                $translationCount = $this->_getParametersCountToReplace($translation);
+
+                if ($baseCount != $translationCount) {
+
+                    $this->filteredData[$pluginName][$key] = $translation;
+                    continue;
+                }
+
+                $cleanedTranslations[$pluginName][$key] = $translation;
+            }
+        }
+
+        return $cleanedTranslations;
+    }
+
+    /**
+     * Counts the placeholder parameters n given string
+     *
+     * @param string $string
+     * @return array
+     */
+    protected function _getParametersCountToReplace($string)
+    {
+        $sprintfParameters = array('%s', '%1$s', '%2$s', '%3$s', '%4$s', '%5$s', '%6$s', '%7$s', '%8$s', '%9$s');
+        $count = array();
+        foreach ($sprintfParameters as $parameter) {
+
+            $placeholderCount = substr_count($string, $parameter);
+            if ($placeholderCount > 0) {
+
+                $count[$parameter] = $placeholderCount;
+            }
+        }
+        return $count;
+    }
+}
diff --git a/plugins/LanguagesManager/TranslationWriter/Filter/EmptyTranslations.php b/plugins/LanguagesManager/TranslationWriter/Filter/EmptyTranslations.php
new file mode 100644
index 0000000000..15e17b2cc9
--- /dev/null
+++ b/plugins/LanguagesManager/TranslationWriter/Filter/EmptyTranslations.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\LanguagesManager\TranslationWriter\Filter;
+
+class EmptyTranslations extends FilterAbstract
+{
+    /**
+     * Removes all empty translations
+     *
+     * @param array $translations
+     *
+     * @return array   filtered translations
+     */
+    public function filter($translations)
+    {
+        $translationsBefore = $translations;
+
+        foreach ($translations as $plugin => &$pluginTranslations) {
+
+            $pluginTranslations = array_filter($pluginTranslations, function ($value) {
+                return !empty($value) && '' != trim($value);
+            });
+
+            $diff = array_diff($translationsBefore[$plugin], $pluginTranslations);
+            if (!empty($diff)) {
+                $this->filteredData[$plugin] = $diff;
+            }
+        }
+
+        // remove plugins without translations
+        $translations = array_filter($translations, function ($value) {
+            return !empty($value) && count($value);
+        });
+
+        return $translations;
+    }
+}
diff --git a/plugins/LanguagesManager/TranslationWriter/Filter/EncodedEntities.php b/plugins/LanguagesManager/TranslationWriter/Filter/EncodedEntities.php
new file mode 100644
index 0000000000..492ad6953a
--- /dev/null
+++ b/plugins/LanguagesManager/TranslationWriter/Filter/EncodedEntities.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\LanguagesManager\TranslationWriter\Filter;
+
+use Piwik\Translate;
+
+class EncodedEntities extends FilterAbstract
+{
+    /**
+     * Decodes all encoded entities in the given translations
+     *
+     * @param array $translations
+     *
+     * @return array   filtered translations
+     */
+    public function filter($translations)
+    {
+        foreach ($translations as $pluginName => $pluginTranslations) {
+            foreach ($pluginTranslations as $key => $translation) {
+
+                // remove encoded entities
+                $decoded = Translate::clean($translation);
+                if ($translation != $decoded) {
+                    $this->filteredData[$pluginName][$key] = $translation;
+                    $translations[$pluginName][$key] = $decoded;
+                    continue;
+                }
+
+            }
+        }
+
+        return $translations;
+    }
+}
diff --git a/plugins/LanguagesManager/TranslationWriter/Filter/FilterAbstract.php b/plugins/LanguagesManager/TranslationWriter/Filter/FilterAbstract.php
new file mode 100644
index 0000000000..0f157fa5cc
--- /dev/null
+++ b/plugins/LanguagesManager/TranslationWriter/Filter/FilterAbstract.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\LanguagesManager\TranslationWriter\Filter;
+
+abstract class FilterAbstract
+{
+    protected $filteredData = array();
+
+    /**
+     * Filter the given translations
+     *
+     * @param array $translations
+     *
+     * @return array   filtered translations
+     */
+    abstract public function filter($translations);
+
+    /**
+     * Returnes the data filtered out by the filter
+     *
+     * @return array
+     */
+    public function getFilteredData()
+    {
+        return $this->filteredData;
+    }
+}
diff --git a/plugins/LanguagesManager/TranslationWriter/Filter/UnnecassaryWhitespaces.php b/plugins/LanguagesManager/TranslationWriter/Filter/UnnecassaryWhitespaces.php
new file mode 100644
index 0000000000..ce665b165a
--- /dev/null
+++ b/plugins/LanguagesManager/TranslationWriter/Filter/UnnecassaryWhitespaces.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\LanguagesManager\TranslationWriter\Filter;
+
+class UnnecassaryWhitespaces extends FilterAbstract
+{
+    protected $baseTranslations = array();
+
+    /**
+     * Sets base translations
+     *
+     * @param array $baseTranslations
+     */
+    public function __construct($baseTranslations = array())
+    {
+        $this->baseTranslations = $baseTranslations;
+    }
+
+    /**
+     * Removes all unnecassary whitespaces and newlines from the given translations
+     *
+     * @param array $translations
+     *
+     * @return array   filtered translations
+     */
+    public function filter($translations)
+    {
+        foreach ($translations as $pluginName => $pluginTranslations) {
+            foreach ($pluginTranslations as $key => $translation) {
+
+                $baseTranslation = '';
+                if (isset($this->baseTranslations[$pluginName][$key])) {
+                    $baseTranslation = $this->baseTranslations[$pluginName][$key];
+                }
+
+                // remove excessive line breaks (and leading/trailing whitespace) from translations
+                $stringNoLineBreak = trim($translation);
+                $stringNoLineBreak = str_replace("\r", "", $stringNoLineBreak); # remove useless carrige renturns
+                $stringNoLineBreak = preg_replace('/(\n[ ]+)/', "\n", $stringNoLineBreak); # remove useless white spaces after line breaks
+                $stringNoLineBreak = preg_replace('/([\n]{2,})/', "\n\n", $stringNoLineBreak); # remove excessive line breaks
+                if (empty($baseTranslation) || !substr_count($baseTranslation, "\n")) {
+                    $stringNoLineBreak = preg_replace("/[\n]+/", " ", $stringNoLineBreak); # remove all line breaks if english string doesn't contain any
+                }
+                $stringNoLineBreak = preg_replace('/([ ]{2,})/', " ", $stringNoLineBreak); # remove excessive white spaces again as there might be any now, after removing line breaks
+                if ($translation !== $stringNoLineBreak) {
+                    $this->filteredData[$pluginName][$key] = $translation;
+                    $translations[$pluginName][$key] = $stringNoLineBreak;
+                    continue;
+                }
+            }
+        }
+
+        return $translations;
+    }
+}
diff --git a/plugins/LanguagesManager/TranslationWriter/Validate/CoreTranslations.php b/plugins/LanguagesManager/TranslationWriter/Validate/CoreTranslations.php
new file mode 100644
index 0000000000..5da73db3f1
--- /dev/null
+++ b/plugins/LanguagesManager/TranslationWriter/Validate/CoreTranslations.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\LanguagesManager\TranslationWriter\Validate;
+
+use Piwik\Container\StaticContainer;
+use Piwik\Intl\Data\Provider\LanguageDataProvider;
+use Piwik\Intl\Data\Provider\RegionDataProvider;
+
+class CoreTranslations extends ValidateAbstract
+{
+    /**
+     * Error States
+     */
+    const ERRORSTATE_LOCALEREQUIRED = 'Locale required';
+    const ERRORSTATE_TRANSLATORINFOREQUIRED = 'Translator info required';
+    const ERRORSTATE_TRANSLATOREMAILREQUIRED = 'Translator email required';
+    const ERRORSTATE_LAYOUTDIRECTIONINVALID = 'Layout direction must be rtl or ltr';
+    const ERRORSTATE_LOCALEINVALID = 'Locale is invalid';
+    const ERRORSTATE_LOCALEINVALIDLANGUAGE = 'Locale is invalid - invalid language code';
+    const ERRORSTATE_LOCALEINVALIDCOUNTRY = 'Locale is invalid - invalid country code';
+
+    protected $baseTranslations = array();
+
+    /**
+     * Sets base translations
+     *
+     * @param array $baseTranslations
+     */
+    public function __construct($baseTranslations = array())
+    {
+        $this->baseTranslations = $baseTranslations;
+    }
+
+    /**
+     * Validates the given translations
+     *  * There need to be more than 250 translations presen
+     *  * Locale, TranslatorName and TranslatorEmail needs to be set in plugin General
+     *  * LayoutDirection needs to be ltr or rtl if present
+     *  * Locale must be valid (format, language & country)
+     *
+     * @param array $translations
+     *
+     * @return boolean
+     */
+    public function isValid($translations)
+    {
+        $this->message = null;
+
+        if (empty($translations['General']['Locale'])) {
+            $this->message = self::ERRORSTATE_LOCALEREQUIRED;
+            return false;
+        }
+
+        if (empty($translations['General']['TranslatorName'])) {
+            $this->message = self::ERRORSTATE_TRANSLATORINFOREQUIRED;
+            return false;
+        }
+
+        if (empty($translations['General']['TranslatorEmail'])) {
+            $this->message = self::ERRORSTATE_TRANSLATOREMAILREQUIRED;
+            return false;
+        }
+
+        if (!empty($translations['General']['LayoutDirection']) &&
+            !in_array($translations['General']['LayoutDirection'], array('ltr', 'rtl'))
+        ) {
+            $this->message = self::ERRORSTATE_LAYOUTDIRECTIONINVALID;
+            return false;
+        }
+
+        /** @var LanguageDataProvider $languageDataProvider */
+        $languageDataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\LanguageDataProvider');
+        /** @var RegionDataProvider $regionDataProvider */
+        $regionDataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\RegionDataProvider');
+
+        $allLanguages = $languageDataProvider->getLanguageList();
+        $allCountries = $regionDataProvider->getCountryList();
+
+        if (!preg_match('/^([a-z]{2})_([A-Z]{2})\.UTF-8$/', $translations['General']['Locale'], $matches)) {
+            $this->message = self::ERRORSTATE_LOCALEINVALID;
+            return false;
+        } else if (!array_key_exists($matches[1], $allLanguages)) {
+            $this->message = self::ERRORSTATE_LOCALEINVALIDLANGUAGE;
+            return false;
+        } else if (!array_key_exists(strtolower($matches[2]), $allCountries)) {
+            $this->message = self::ERRORSTATE_LOCALEINVALIDCOUNTRY;
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/plugins/LanguagesManager/TranslationWriter/Validate/NoScripts.php b/plugins/LanguagesManager/TranslationWriter/Validate/NoScripts.php
new file mode 100644
index 0000000000..7705cd02d7
--- /dev/null
+++ b/plugins/LanguagesManager/TranslationWriter/Validate/NoScripts.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\LanguagesManager\TranslationWriter\Validate;
+
+class NoScripts extends ValidateAbstract
+{
+    /**
+     * Validates the given translations
+     *  * No script like parts should be present in any part of the translations
+     *
+     * @param array $translations
+     *
+     * @return boolean
+     */
+    public function isValid($translations)
+    {
+        $this->message = null;
+
+        // check if any translation contains restricted script tags
+        $serializedStrings = serialize($translations);
+        $invalids = array("<script", 'document.', 'javascript:', 'src=', 'background=', 'onload=');
+
+        foreach ($invalids as $invalid) {
+            if (stripos($serializedStrings, $invalid) !== false) {
+                $this->message = 'script tags restricted for language files';
+                return false;
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/plugins/LanguagesManager/TranslationWriter/Validate/ValidateAbstract.php b/plugins/LanguagesManager/TranslationWriter/Validate/ValidateAbstract.php
new file mode 100644
index 0000000000..df36123839
--- /dev/null
+++ b/plugins/LanguagesManager/TranslationWriter/Validate/ValidateAbstract.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\LanguagesManager\TranslationWriter\Validate;
+
+abstract class ValidateAbstract
+{
+    protected $message = null;
+
+    /**
+     * Returns if the given translations are valid
+     *
+     * @param array $translations
+     *
+     * @return boolean
+     */
+    abstract public function isValid($translations);
+
+    /**
+     * Returns an array of messages that explain why the most recent isValid()
+     * call returned false.
+     *
+     * @return array
+     */
+    public function getMessage()
+    {
+        return $this->message;
+    }
+}
diff --git a/plugins/LanguagesManager/TranslationWriter/Writer.php b/plugins/LanguagesManager/TranslationWriter/Writer.php
new file mode 100644
index 0000000000..6095f5a982
--- /dev/null
+++ b/plugins/LanguagesManager/TranslationWriter/Writer.php
@@ -0,0 +1,387 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\LanguagesManager\TranslationWriter;
+
+use Exception;
+use Piwik\Container\StaticContainer;
+use Piwik\Filesystem;
+use Piwik\Piwik;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\FilterAbstract;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Validate\ValidateAbstract;
+
+/**
+ * Writes translations to file.
+ */
+class Writer
+{
+    /**
+     * current language to write files for
+     *
+     * @var string
+     */
+    protected $language = '';
+
+    /**
+     * Name of a plugin (if set in constructor)
+     *
+     * @var string|null
+     */
+    protected $pluginName = null;
+
+    /**
+     * translations to write to file
+     *
+     * @var array
+     */
+    protected $translations = array();
+
+    /**
+     * Validators to check translations with
+     *
+     * @var ValidateAbstract[]
+     */
+    protected $validators = array();
+
+    /**
+     * Message why validation failed
+     *
+     * @var string|null
+     */
+    protected $validationMessage = null;
+
+    /**
+     * Filters to to apply to translations
+     *
+     * @var FilterAbstract[]
+     */
+    protected $filters = array();
+
+    /**
+     * Messages which filter changed the data
+     *
+     * @var array
+     */
+    protected $filterMessages = array();
+
+    const UNFILTERED = 'unfiltered';
+    const FILTERED   = 'filtered';
+
+    protected $currentState = self::UNFILTERED;
+
+    /**
+     * If $pluginName is given, Writer will be initialized for the given plugin if it exists
+     * Otherwise it will be initialized for core translations
+     *
+     * @param string $language ISO 639-1 alpha-2 language code
+     * @param string $pluginName optional plugin name
+     * @throws \Exception
+     */
+    public function __construct($language, $pluginName = null)
+    {
+        $this->setLanguage($language);
+
+        if (!empty($pluginName)) {
+            $installedPlugins = \Piwik\Plugin\Manager::getInstance()->readPluginsDirectory();
+
+            if (!in_array($pluginName, $installedPlugins)) {
+
+                throw new Exception(Piwik::translate('General_ExceptionLanguageFileNotFound', array($pluginName)));
+            }
+
+            $this->pluginName = $pluginName;
+        }
+    }
+
+    /**
+     * @param string $language ISO 639-1 alpha-2 language code
+     *
+     * @throws \Exception
+     */
+    public function setLanguage($language)
+    {
+        if (!preg_match('/^([a-z]{2,3}(-[a-z]{2,3})?)$/i', $language)) {
+            throw new Exception(Piwik::translate('General_ExceptionLanguageFileNotFound', array($language)));
+        }
+
+        $this->language = strtolower($language);
+    }
+
+    /**
+     * @return string ISO 639-1 alpha-2 language code
+     */
+    public function getLanguage()
+    {
+        return $this->language;
+    }
+
+    /**
+     * Returns if there are translations available or not
+     * @return bool
+     */
+    public function hasTranslations()
+    {
+        return !empty($this->translations);
+    }
+
+    /**
+     * Set the translations to write (and cleans them)
+     *
+     * @param $translations
+     */
+    public function setTranslations($translations)
+    {
+        $this->currentState = self::UNFILTERED;
+        $this->translations = $translations;
+        $this->applyFilters();
+    }
+
+    /**
+     * Get translations from file
+     *
+     * @param  string $lang ISO 639-1 alpha-2 language code
+     * @throws Exception
+     * @return array   Array of translations ( plugin => ( key => translated string ) )
+     */
+    public function getTranslations($lang)
+    {
+        $path = $this->getTranslationPathBaseDirectory('lang', $lang);
+
+        if (!is_readable($path)) {
+            return array();
+        }
+
+        $data = file_get_contents($path);
+        $translations = json_decode($data, true);
+
+        return $translations;
+    }
+
+    /**
+     * Returns the temporary path for translations
+     *
+     * @return string
+     */
+    public function getTemporaryTranslationPath()
+    {
+        return $this->getTranslationPathBaseDirectory('tmp');
+    }
+
+    /**
+     * Returns the path to translation files
+     *
+     * @return string
+     */
+    public function getTranslationPath()
+    {
+        return $this->getTranslationPathBaseDirectory('lang');
+    }
+
+    /**
+     * Get translation file path based on given params
+     *
+     * @param string $base Optional base directory (either 'lang' or 'tmp')
+     * @param string|null $lang forced language
+     * @throws \Exception
+     * @return string path
+     */
+    protected function getTranslationPathBaseDirectory($base, $lang = null)
+    {
+        if (empty($lang)) {
+            $lang = $this->getLanguage();
+        }
+
+        if (!empty($this->pluginName)) {
+
+            if ($base == 'tmp') {
+                return sprintf('%s/plugins/%s/lang/%s.json', StaticContainer::get('path.tmp'), $this->pluginName, $lang);
+            } else {
+                return sprintf('%s/plugins/%s/lang/%s.json', PIWIK_INCLUDE_PATH, $this->pluginName, $lang);
+            }
+        }
+
+        if ($base == 'tmp') {
+            return sprintf('%s/%s.json', StaticContainer::get('path.tmp'), $lang);
+        }
+
+        return sprintf('%s/%s/%s.json', PIWIK_INCLUDE_PATH, $base, $lang);
+    }
+
+    /**
+     * Converts translations to a string that can be written to a file
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        /*
+         * Use JSON_UNESCAPED_UNICODE and JSON_PRETTY_PRINT for PHP >= 5.4
+         */
+        $options = 0;
+        if (defined('JSON_UNESCAPED_UNICODE')) {
+            $options |= JSON_UNESCAPED_UNICODE;
+        }
+        if (defined('JSON_PRETTY_PRINT')) {
+            $options |= JSON_PRETTY_PRINT;
+        }
+
+        return json_encode($this->translations, $options);
+    }
+
+    /**
+     * Save translations to file; translations should already be cleaned.
+     *
+     * @throws \Exception
+     * @return bool|int  False if failure, or number of bytes written
+     */
+    public function save()
+    {
+        $this->applyFilters();
+
+        if (!$this->hasTranslations() || !$this->isValid()) {
+            throw new Exception('unable to save empty or invalid translations');
+        }
+
+        $path = $this->getTranslationPath();
+
+        Filesystem::mkdir(dirname($path));
+
+        return file_put_contents($path, $this->__toString());
+    }
+
+    /**
+     * Save translations to  temporary file; translations should already be cleansed.
+     *
+     * @throws \Exception
+     * @return bool|int False if failure, or number of bytes written
+     */
+    public function saveTemporary()
+    {
+        $this->applyFilters();
+
+        if (!$this->hasTranslations() || !$this->isValid()) {
+            throw new Exception('unable to save empty or invalid translations');
+        }
+
+        $path = $this->getTemporaryTranslationPath();
+
+        Filesystem::mkdir(dirname($path));
+
+        return file_put_contents($path, $this->__toString());
+    }
+
+    /**
+     * Adds an validator to check before saving
+     *
+     * @param ValidateAbstract $validator
+     */
+    public function addValidator(ValidateAbstract $validator)
+    {
+        $this->validators[] = $validator;
+    }
+
+    /**
+     * Returns if translations are valid to save or not
+     *
+     * @return bool
+     */
+    public function isValid()
+    {
+        $this->applyFilters();
+
+        $this->validationMessage = null;
+
+        foreach ($this->validators as $validator) {
+            if (!$validator->isValid($this->translations)) {
+                $this->validationMessage = $validator->getMessage();
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns last validation message
+     *
+     * @return null|string
+     */
+    public function getValidationMessage()
+    {
+        return $this->validationMessage;
+    }
+
+    /**
+     * Returns if the were translations removed while cleaning
+     *
+     * @return bool
+     */
+    public function wasFiltered()
+    {
+        return !empty($this->filterMessages);
+    }
+
+    /**
+     * Returns the cleaning errors
+     *
+     * @return array
+     */
+    public function getFilterMessages()
+    {
+        return $this->filterMessages;
+    }
+
+    /**
+     * @param FilterAbstract $filter
+     */
+    public function addFilter(FilterAbstract $filter)
+    {
+        $this->filters[] = $filter;
+    }
+
+    /**
+     * @throws \Exception
+     *
+     * @return bool   error state
+     */
+    protected function applyFilters()
+    {
+        // skip if already cleaned
+        if ($this->currentState == self::FILTERED) {
+            return $this->wasFiltered();
+        }
+
+        $this->filterMessages = array();
+
+        // skip if not translations available
+        if (!$this->hasTranslations()) {
+            $this->currentState = self::FILTERED;
+            return false;
+        }
+
+        $cleanedTranslations = $this->translations;
+
+        foreach ($this->filters as $filter) {
+
+            $cleanedTranslations = $filter->filter($cleanedTranslations);
+            $filteredData = $filter->getFilteredData();
+            if (!empty($filteredData)) {
+                $this->filterMessages[] = get_class($filter) . " changed: " . var_export($filteredData, 1);
+            }
+        }
+
+        $this->currentState = self::FILTERED;
+
+        if ($cleanedTranslations != $this->translations) {
+            $this->filterMessages[] = 'translations have been cleaned';
+        }
+
+        $this->translations = $cleanedTranslations;
+        return $this->wasFiltered();
+    }
+}
diff --git a/plugins/LanguagesManager/lang/ar.json b/plugins/LanguagesManager/lang/ar.json
index 9cfcecd8b8..e0c52451cc 100644
--- a/plugins/LanguagesManager/lang/ar.json
+++ b/plugins/LanguagesManager/lang/ar.json
@@ -1,6 +1,5 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "حول ترجمة Piwik",
-        "PluginDescription": "هذا التطبيق يعرض قائمة باللغات المتوفر لواجهة Piwik. سيتم حفظ اللغة المحددة في تفضيلات كل مستخدم."
+        "AboutPiwikTranslations": "حول ترجمة Piwik"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/be.json b/plugins/LanguagesManager/lang/be.json
index cf73033099..cc497911f0 100644
--- a/plugins/LanguagesManager/lang/be.json
+++ b/plugins/LanguagesManager/lang/be.json
@@ -1,6 +1,5 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "Аб перакладах Piwik",
-        "PluginDescription": "Гэты плагін будзе адлюстроўваць спіс даступных моў інтэрфейсу Piwik. Абраная мова, будзе захавана ў наладках для кожнага карыстальніка."
+        "AboutPiwikTranslations": "Аб перакладах Piwik"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/bg.json b/plugins/LanguagesManager/lang/bg.json
index edfa106f59..6aee877e77 100644
--- a/plugins/LanguagesManager/lang/bg.json
+++ b/plugins/LanguagesManager/lang/bg.json
@@ -1,6 +1,5 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "За Piwik преводите",
-        "PluginDescription": "Тази добавка ще покаже списък с наличните езици за интерфейса на Piwik. Избраният език ще бъде записан в предпочитанията за всеки потребител."
+        "AboutPiwikTranslations": "За Piwik преводите"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/ca.json b/plugins/LanguagesManager/lang/ca.json
index d6914a360a..f1841e1d7b 100644
--- a/plugins/LanguagesManager/lang/ca.json
+++ b/plugins/LanguagesManager/lang/ca.json
@@ -1,6 +1,5 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "Quant a les traduccions del Piwik",
-        "PluginDescription": "Aquesta extensió mostrarà una llista dels idiomes disponibles per l'interfície de Piwik. L'idioma seleccionat es guardarà com a preferència per a cada usuari."
+        "AboutPiwikTranslations": "Quant a les traduccions del Piwik"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/cs.json b/plugins/LanguagesManager/lang/cs.json
index 4e4fd73019..7f98d7c008 100644
--- a/plugins/LanguagesManager/lang/cs.json
+++ b/plugins/LanguagesManager/lang/cs.json
@@ -1,7 +1,6 @@
 {
     "LanguagesManager": {
         "AboutPiwikTranslations": "O překladech Piwiku",
-        "PluginDescription": "Tento zásuvný modul zobrazí seznam jazyků pro rozhraní Piwiku. Vybraný jazyk bude uložen v nastaveních každého uživatele",
         "TranslationSearch": "Vyhledávání v překladech"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/da.json b/plugins/LanguagesManager/lang/da.json
index 73c7d89a84..8b92cb1030 100644
--- a/plugins/LanguagesManager/lang/da.json
+++ b/plugins/LanguagesManager/lang/da.json
@@ -1,7 +1,6 @@
 {
     "LanguagesManager": {
         "AboutPiwikTranslations": "Om Piwik oversættelser",
-        "PluginDescription": " Programudvidelsen viser en liste over de tilgængelige sprog for Piwik brugerflade. Det valgte sprog vil blive gemt i præferencer for hver bruger.",
         "TranslationSearch": "Oversættelse søgning"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/de.json b/plugins/LanguagesManager/lang/de.json
index c106885c87..d5ca837500 100644
--- a/plugins/LanguagesManager/lang/de.json
+++ b/plugins/LanguagesManager/lang/de.json
@@ -1,7 +1,6 @@
 {
     "LanguagesManager": {
         "AboutPiwikTranslations": "Über Piwik Übersetzungen",
-        "PluginDescription": "Dieses Plugin zeigt eine Liste aller verfügbaren Sprachen für die Piwik-Oberfläche. Die ausgewählte Sprache wird in den Benutzereinstellungen jedes Benutzers gespeichert.",
         "TranslationSearch": "Übersetzungssuche"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/el.json b/plugins/LanguagesManager/lang/el.json
index f9fb4b5730..c22bc0a193 100644
--- a/plugins/LanguagesManager/lang/el.json
+++ b/plugins/LanguagesManager/lang/el.json
@@ -1,7 +1,6 @@
 {
     "LanguagesManager": {
         "AboutPiwikTranslations": "Πληροφόρηση",
-        "PluginDescription": "Αυτό το πρόσθετο θα προβάλει μια λίστα με τις διαθέσιμες γλώσσες για το περιβάλλον του Piwik. Η επιλεχθείσα γλώσσα θα αποθηκευτεί στις προτιμήσεις κάθε χρήστη.",
         "TranslationSearch": "Αναζήτηση Μετάφρασης"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/en.json b/plugins/LanguagesManager/lang/en.json
index d3a27068a9..e15454bd13 100644
--- a/plugins/LanguagesManager/lang/en.json
+++ b/plugins/LanguagesManager/lang/en.json
@@ -1,7 +1,6 @@
 {
     "LanguagesManager": {
         "AboutPiwikTranslations": "About Piwik translations",
-        "TranslationSearch": "Translation Search",
-        "PluginDescription": "This plugin will display a list of the available languages for the Piwik interface. The language selected will be saved in the preferences for each user."
+        "TranslationSearch": "Translation Search"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/es.json b/plugins/LanguagesManager/lang/es.json
index a325856016..aead2344fb 100644
--- a/plugins/LanguagesManager/lang/es.json
+++ b/plugins/LanguagesManager/lang/es.json
@@ -1,6 +1,5 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "Acerca de las traducciones de Piwik",
-        "PluginDescription": "Este plugin mostrará una lista de idiomas para la interfaz de Piwik. Esta selección de idioma será grabada en las preferencias de cada usuario."
+        "AboutPiwikTranslations": "Acerca de las traducciones de Piwik"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/fa.json b/plugins/LanguagesManager/lang/fa.json
index b8dc955a53..5136a704c4 100644
--- a/plugins/LanguagesManager/lang/fa.json
+++ b/plugins/LanguagesManager/lang/fa.json
@@ -1,7 +1,6 @@
 {
     "LanguagesManager": {
         "AboutPiwikTranslations": "درباره ترجمه های پیویک",
-        "PluginDescription": "این پلاگین یک لیست از زبانهای در دسترس برای رابط Piwik را نمایش می دهد. زبان انتخاب شده در تنظیمات برای هر کاربر ذخیره خواهد شد.",
         "TranslationSearch": "جستجوی ترجمه"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/fi.json b/plugins/LanguagesManager/lang/fi.json
index 431af42db5..50cdb290ab 100644
--- a/plugins/LanguagesManager/lang/fi.json
+++ b/plugins/LanguagesManager/lang/fi.json
@@ -1,7 +1,6 @@
 {
     "LanguagesManager": {
         "AboutPiwikTranslations": "Tietoja Piwikin käännöksistä",
-        "PluginDescription": "Tämä lisäosa listaa saatavilla olevat kielet Piwikin käyttöliittymässä. Valittu kieli tallennetaan käyttäjäkohtaisesti.",
         "TranslationSearch": "Käännösten haku"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/fr.json b/plugins/LanguagesManager/lang/fr.json
index 01070b5d08..f0f115695c 100644
--- a/plugins/LanguagesManager/lang/fr.json
+++ b/plugins/LanguagesManager/lang/fr.json
@@ -1,7 +1,6 @@
 {
     "LanguagesManager": {
         "AboutPiwikTranslations": "À propos des traductions de Piwik",
-        "PluginDescription": "Ce plugin affichera la liste des langues disponibles pour l'interface de Piwik. Le langage sélectionné sera sauvegardé dans les préférences de chaque utilisateur.",
         "TranslationSearch": "Recherche de traduction"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/hi.json b/plugins/LanguagesManager/lang/hi.json
index 094c4c6fc3..bf63808cd9 100644
--- a/plugins/LanguagesManager/lang/hi.json
+++ b/plugins/LanguagesManager/lang/hi.json
@@ -1,6 +1,5 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "Piwik अनुवाद के बारे में",
-        "PluginDescription": "यह प्लगइन Piwik इंटरफेस के लिए उपलब्ध भाषाओं की सूची प्रदर्शित करेगा. चयनित भाषा प्रत्येक उपयोगकर्ता के लिए वरीयताओं से सहेजा जाएगा."
+        "AboutPiwikTranslations": "Piwik अनुवाद के बारे में"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/hu.json b/plugins/LanguagesManager/lang/hu.json
index 1dbde3ba51..7413658873 100644
--- a/plugins/LanguagesManager/lang/hu.json
+++ b/plugins/LanguagesManager/lang/hu.json
@@ -1,6 +1,5 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "A Piwik fordításokról",
-        "PluginDescription": "Ez a kiegészítő a Piwik felhasználói felület megtekintéséhez elérhető nyelvek listáját jeleníti meg. A kiválasztott nyelv a felhasználóhoz kötötten rögzítésre kerül."
+        "AboutPiwikTranslations": "A Piwik fordításokról"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/id.json b/plugins/LanguagesManager/lang/id.json
index e07551f5e5..bf93465f66 100644
--- a/plugins/LanguagesManager/lang/id.json
+++ b/plugins/LanguagesManager/lang/id.json
@@ -1,6 +1,5 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "Tentang penerjemahan Piwik",
-        "PluginDescription": "Pengaya ini akan menampilkan daftar bahasa yang tersedia dalam antarmuka Piwik. Bahasa yang dipilih akan tersimpan dalam pengaturan setiap pengguna."
+        "AboutPiwikTranslations": "Tentang penerjemahan Piwik"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/is.json b/plugins/LanguagesManager/lang/is.json
index 09dd137640..bee30d2e80 100644
--- a/plugins/LanguagesManager/lang/is.json
+++ b/plugins/LanguagesManager/lang/is.json
@@ -1,6 +1,5 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "Um Þýðendur Piwik",
-        "PluginDescription": "Þessi íbót sýnir lista yfir öll tiltæk tungumál fyrir Piwik viðmótið. Tungumálið sem valið er, verður vistað í stillingum fyrir hvern notanda."
+        "AboutPiwikTranslations": "Um Þýðendur Piwik"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/it.json b/plugins/LanguagesManager/lang/it.json
index ba239fe715..739a408ef9 100644
--- a/plugins/LanguagesManager/lang/it.json
+++ b/plugins/LanguagesManager/lang/it.json
@@ -1,7 +1,6 @@
 {
     "LanguagesManager": {
         "AboutPiwikTranslations": "Riguardo alle traduzioni di Piwik",
-        "PluginDescription": "Questo plugin mostrerà la lista delle lingue disponibili per l'interfaccia Piwik. La lingua selezionata sarà salvata nelle preferenze per ciascun utente.",
         "TranslationSearch": "Ricerca Traduzione"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/ja.json b/plugins/LanguagesManager/lang/ja.json
index 60c20f7dcc..98102b35eb 100644
--- a/plugins/LanguagesManager/lang/ja.json
+++ b/plugins/LanguagesManager/lang/ja.json
@@ -1,7 +1,6 @@
 {
     "LanguagesManager": {
         "AboutPiwikTranslations": "Piwik の翻訳について",
-        "PluginDescription": "Piwik インターフェイスで利用可能な言語リストを表示します。 選択された言語は、各ユーザーの優先設定に保存されます。",
         "TranslationSearch": "翻訳の検索"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/ka.json b/plugins/LanguagesManager/lang/ka.json
index 12052139df..fab224424a 100644
--- a/plugins/LanguagesManager/lang/ka.json
+++ b/plugins/LanguagesManager/lang/ka.json
@@ -1,6 +1,5 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "Piwik თარგმანების შესახებ",
-        "PluginDescription": "ეს პლაგინი აჩვენებს სიას იმ ენებისა, რომლებზეც შესაძლებელია Piwik ინტერფეისის წარმოდგენა. თითოეული მომხმარებლისთვის შეინახება შერჩეული ენა."
+        "AboutPiwikTranslations": "Piwik თარგმანების შესახებ"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/ko.json b/plugins/LanguagesManager/lang/ko.json
index ad2e26b842..f5485e3a35 100644
--- a/plugins/LanguagesManager/lang/ko.json
+++ b/plugins/LanguagesManager/lang/ko.json
@@ -1,6 +1,5 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "Piwik 번역에 대해",
-        "PluginDescription": "Piwik 인터페이스에서 사용 가능한 언어 목록을 표시합니다. 선택된 언어는 각 사용자의 기본 설정에 저장됩니다."
+        "AboutPiwikTranslations": "Piwik 번역에 대해"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/lt.json b/plugins/LanguagesManager/lang/lt.json
index 721c9fec82..5b4e18bd6d 100644
--- a/plugins/LanguagesManager/lang/lt.json
+++ b/plugins/LanguagesManager/lang/lt.json
@@ -1,6 +1,5 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "Apie Piwik vertimus",
-        "PluginDescription": "Šis papildinys pateikia visų prieinamų kalbų Piwik vartotojo sąsajai sąrašą. Kiekvienas naudotojas gali pasirinkti savo kalbą."
+        "AboutPiwikTranslations": "Apie Piwik vertimus"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/lv.json b/plugins/LanguagesManager/lang/lv.json
index 9b761fabfd..3dcf3dbddb 100644
--- a/plugins/LanguagesManager/lang/lv.json
+++ b/plugins/LanguagesManager/lang/lv.json
@@ -1,6 +1,5 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "Par Piwik tulkojumiem",
-        "PluginDescription": "Šis spraudnis rāda visu pieejamo Piwik interfeisa valodu sarakstu. Izvēlētā valoda tiks saglabāta katra lietotāja iestatījumos."
+        "AboutPiwikTranslations": "Par Piwik tulkojumiem"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/nb.json b/plugins/LanguagesManager/lang/nb.json
index 91b00c1859..fbe1e317b4 100644
--- a/plugins/LanguagesManager/lang/nb.json
+++ b/plugins/LanguagesManager/lang/nb.json
@@ -1,6 +1,5 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "Om Piwik-oversettelser",
-        "PluginDescription": "Dette tillegg viser en liste med tilgjengelige språk for Piwik-grensesnittet. Språket som velges lagres i innstillingene for hver bruker."
+        "AboutPiwikTranslations": "Om Piwik-oversettelser"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/nl.json b/plugins/LanguagesManager/lang/nl.json
index 76a2d35af8..ba75bcdf2f 100644
--- a/plugins/LanguagesManager/lang/nl.json
+++ b/plugins/LanguagesManager/lang/nl.json
@@ -1,6 +1,6 @@
 {
     "LanguagesManager": {
         "AboutPiwikTranslations": "Over de Piwik vertalingen",
-        "PluginDescription": "Deze plugin zal een lijst weergeven van de beschikbare talen voor de Piwik interface. De geselecteerde taal zal opgeslagen worden in de voorkeuren voor elke gebruiker."
+        "TranslationSearch": "Vertaling Zoeken"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/nn.json b/plugins/LanguagesManager/lang/nn.json
index bea60ecdbb..a553e5bde1 100644
--- a/plugins/LanguagesManager/lang/nn.json
+++ b/plugins/LanguagesManager/lang/nn.json
@@ -1,6 +1,5 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "Om Piwik-omsetjingane",
-        "PluginDescription": "Dette innstikket vil visa ei liste over tilgjengelege språk for Piwik-brukargrensesnittet. Det valde språket vil lagrast i innstillingane til kvar enkelt brukar."
+        "AboutPiwikTranslations": "Om Piwik-omsetjingane"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/pl.json b/plugins/LanguagesManager/lang/pl.json
index 9b58986960..464d8da898 100644
--- a/plugins/LanguagesManager/lang/pl.json
+++ b/plugins/LanguagesManager/lang/pl.json
@@ -1,6 +1,5 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "O tłumaczeniach Piwik",
-        "PluginDescription": "Ta wtyczka będzie wyświetlać listę osiągalnych tłumaczeń interfejsu Piwik. Wybrany język zostanie zapisany w konfiguracji każdego z użytkowników."
+        "AboutPiwikTranslations": "O tłumaczeniach Piwik"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/pt-br.json b/plugins/LanguagesManager/lang/pt-br.json
index 2bd8d0df27..eecfabe550 100644
--- a/plugins/LanguagesManager/lang/pt-br.json
+++ b/plugins/LanguagesManager/lang/pt-br.json
@@ -1,6 +1,5 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "Sobre traduções Piwik.",
-        "PluginDescription": "Esse plugin mostrará uma lista de idiomas disponíveis para a interface do Piwik. O idioma selecionado salvará as preferencias para cada usuário."
+        "AboutPiwikTranslations": "Sobre traduções Piwik."
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/pt.json b/plugins/LanguagesManager/lang/pt.json
index e93d8a98ba..de8ecd211a 100644
--- a/plugins/LanguagesManager/lang/pt.json
+++ b/plugins/LanguagesManager/lang/pt.json
@@ -1,6 +1,5 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "Acerca das traduções Piwik",
-        "PluginDescription": "Este plugin mostra uma lista dos idiomas disponíveis para a interface Piwik. O idioma seleccionado será guardado nas preferências de cada utilizador."
+        "AboutPiwikTranslations": "Acerca das traduções Piwik"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/ro.json b/plugins/LanguagesManager/lang/ro.json
index 4458b26d96..9c7be49e94 100644
--- a/plugins/LanguagesManager/lang/ro.json
+++ b/plugins/LanguagesManager/lang/ro.json
@@ -1,6 +1,5 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "Despre traduceri Piwik",
-        "PluginDescription": "Acest plugin va afișa o listă a limbilor disponibile pentru interfața Piwik. Limba selectată va fi salvată în preferințele fiecarui utilizator."
+        "AboutPiwikTranslations": "Despre traduceri Piwik"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/ru.json b/plugins/LanguagesManager/lang/ru.json
index c0d6ff2043..5d0aa50bfd 100644
--- a/plugins/LanguagesManager/lang/ru.json
+++ b/plugins/LanguagesManager/lang/ru.json
@@ -1,6 +1,5 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "О переводах Piwik",
-        "PluginDescription": "Этот плагин будет отображать список языков, доступных для интерфейса Piwik. Выбранный язык будет сохранен в настройках для каждого пользователя."
+        "AboutPiwikTranslations": "О переводах Piwik"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/sl.json b/plugins/LanguagesManager/lang/sl.json
index c8cb3da902..08d2f3a534 100644
--- a/plugins/LanguagesManager/lang/sl.json
+++ b/plugins/LanguagesManager/lang/sl.json
@@ -1,6 +1,5 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "O prevodih Piwik-a",
-        "PluginDescription": "Ta vtičnik bo prikazoval seznam vseh jezikov, ki so na voljo za Piwik-ov vmesnik. Izbrani jezik bo shranjen v nastavitvah vsakega uporabnika."
+        "AboutPiwikTranslations": "O prevodih Piwik-a"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/sq.json b/plugins/LanguagesManager/lang/sq.json
index 1630eb6776..44f1ff8f52 100644
--- a/plugins/LanguagesManager/lang/sq.json
+++ b/plugins/LanguagesManager/lang/sq.json
@@ -1,6 +1,5 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "Mbi përkthimet e Piwik-ut",
-        "PluginDescription": "Kjo shtojcë do të shfaqë një listë të gjuhëve të mundshme për ndërfaqen e Piwik-ut. Gjuha e përzgjedhur do të ruhet te parapëlqimet e çdo përdoruesi."
+        "AboutPiwikTranslations": "Mbi përkthimet e Piwik-ut"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/sr.json b/plugins/LanguagesManager/lang/sr.json
index 3fffc8b70b..cc3a748f15 100644
--- a/plugins/LanguagesManager/lang/sr.json
+++ b/plugins/LanguagesManager/lang/sr.json
@@ -1,7 +1,6 @@
 {
     "LanguagesManager": {
         "AboutPiwikTranslations": "O Piwik prevodima",
-        "PluginDescription": "Ovaj dodatak prikazuje sve raspoložive jezike za Piwik interfejs. Izabrani jezik će biti sačuvan za svakog korisnika ponaosob.",
         "TranslationSearch": "Pretraživanje prevoda"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/sv.json b/plugins/LanguagesManager/lang/sv.json
index 32167f63b3..128aef9334 100644
--- a/plugins/LanguagesManager/lang/sv.json
+++ b/plugins/LanguagesManager/lang/sv.json
@@ -1,6 +1,5 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "Om Piwik's översättningar",
-        "PluginDescription": "Denna plugin kommer att visa en lista över tillgängliga språk för Piwik's gränssnitt. Det valda språket kommer att sparas i inställningarna för varje användare."
+        "AboutPiwikTranslations": "Om Piwik's översättningar"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/th.json b/plugins/LanguagesManager/lang/th.json
index 630ecccc15..53f805be47 100644
--- a/plugins/LanguagesManager/lang/th.json
+++ b/plugins/LanguagesManager/lang/th.json
@@ -1,6 +1,5 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "เกี่ยวกับการแปล Piwik",
-        "PluginDescription": "ปลั๊กอินนี้จะแสดงรายการของภาษาพร้อมใช้งานสำหรับอินเทอร์เฟซสำหรับ Piwik ภาษาเลือกไว้จะถูกบันทึกไว้ในการกำหนดลักษณะสำหรับแต่ละผู้ใช้"
+        "AboutPiwikTranslations": "เกี่ยวกับการแปล Piwik"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/tl.json b/plugins/LanguagesManager/lang/tl.json
index 35b78fceb3..f2937bf277 100644
--- a/plugins/LanguagesManager/lang/tl.json
+++ b/plugins/LanguagesManager/lang/tl.json
@@ -1,7 +1,6 @@
 {
     "LanguagesManager": {
         "AboutPiwikTranslations": "Tungkol sa pagsasaling ng Piwik",
-        "PluginDescription": "Ang plugin na ito ay pinapakita ng mga listahan ng mga pwedeng wika para sa Piwik Interface. Ang wika na mapipili ay ma-sasave sa bawat mapipili ng user.",
         "TranslationSearch": "Paghahanap ng Pagsasalin"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/uk.json b/plugins/LanguagesManager/lang/uk.json
index a057d00320..63f18a97ce 100644
--- a/plugins/LanguagesManager/lang/uk.json
+++ b/plugins/LanguagesManager/lang/uk.json
@@ -1,6 +1,5 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "Про переклади Piwik",
-        "PluginDescription": "Цей плагін показуватиме перелік наявних мов для інтерфейсу Piwik. Вибрана мова буде збережена в налаштуваннях для кожного користувача."
+        "AboutPiwikTranslations": "Про переклади Piwik"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/vi.json b/plugins/LanguagesManager/lang/vi.json
index b01e75fdf5..70adc1c259 100644
--- a/plugins/LanguagesManager/lang/vi.json
+++ b/plugins/LanguagesManager/lang/vi.json
@@ -1,6 +1,5 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "Về Piwik dịch",
-        "PluginDescription": "Plugin này sẽ hiển thị một danh sách các ngôn ngữ có sẵn cho giao diện Piwik. Ngôn ngữ được chọn sẽ được lưu lại trong các quyền ưu tiên cho mỗi người dùng."
+        "AboutPiwikTranslations": "Về Piwik dịch"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/zh-cn.json b/plugins/LanguagesManager/lang/zh-cn.json
index 698f6f88d7..da769379c1 100644
--- a/plugins/LanguagesManager/lang/zh-cn.json
+++ b/plugins/LanguagesManager/lang/zh-cn.json
@@ -1,7 +1,6 @@
 {
     "LanguagesManager": {
         "AboutPiwikTranslations": "关于 Piwik 翻译",
-        "PluginDescription": "这个插件会显示 Piwik 页面可以使用的语言列表。选择的语言将会被保存在每个用户的偏好里。",
         "TranslationSearch": "交易搜索"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/zh-tw.json b/plugins/LanguagesManager/lang/zh-tw.json
index 17c7f8da00..5698c9b0ad 100644
--- a/plugins/LanguagesManager/lang/zh-tw.json
+++ b/plugins/LanguagesManager/lang/zh-tw.json
@@ -1,6 +1,5 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "關於 Piwik 翻譯",
-        "PluginDescription": "這個外掛會顯示 Piwik 介面可以使用的語系列表。選擇的語言將會被保存在每個使用者的偏好裡。"
+        "AboutPiwikTranslations": "關於 Piwik 翻譯"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/tests/Integration/LanguagesManagerTest.php b/plugins/LanguagesManager/tests/Integration/LanguagesManagerTest.php
deleted file mode 100755
index 7b41c3f55e..0000000000
--- a/plugins/LanguagesManager/tests/Integration/LanguagesManagerTest.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link    http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-namespace Piwik\Plugins\LanguagesManager\tests;
-
-use Piwik\Common;
-use Piwik\Plugins\LanguagesManager\API;
-use Piwik\Translate\Filter\ByParameterCount;
-use Piwik\Translate\Filter\EmptyTranslations;
-use Piwik\Translate\Filter\EncodedEntities;
-use Piwik\Translate\Filter\UnnecassaryWhitespaces;
-use Piwik\Translate\Validate\CoreTranslations;
-use Piwik\Translate\Validate\NoScripts;
-use Piwik\Translate\Writer;
-use \Exception;
-
-require_once PIWIK_INCLUDE_PATH . '/plugins/LanguagesManager/API.php';
-
-class LanguagesManagerTest extends \PHPUnit_Framework_TestCase
-{
-    public function setUp()
-    {
-        parent::setUp();
-        include PIWIK_INCLUDE_PATH . '/core/DataFiles/Languages.php';
-    }
-
-    function getTestDataForLanguageFiles()
-    {
-        // we also test that none of the language php files outputs any character on the screen (eg. space before the <?php)
-        $languages = API::getInstance()->getAvailableLanguages();
-
-        $plugins = \Piwik\Plugin\Manager::getInstance()->readPluginsDirectory();
-
-        $pluginsWithTranslation = array();
-
-        foreach ($plugins as $plugin) {
-
-            if (API::getInstance()->getPluginTranslationsForLanguage($plugin, 'en')) {
-
-                $pluginsWithTranslation[] = $plugin;
-            }
-        }
-
-        $return = array();
-        foreach ($languages as $language) {
-            if ($language != 'en') {
-                $return[] = array($language, null);
-
-                foreach ($pluginsWithTranslation as $plugin) {
-
-                    $return[] = array($language, $plugin);
-                }
-            }
-        }
-
-        return $return;
-    }
-
-    /**
-     * test all languages
-     *
-     * @group Plugins
-     *
-     * @dataProvider getTestDataForLanguageFiles
-     */
-    function testGetTranslationsForLanguages($language, $plugin)
-    {
-        $translationWriter = new Writer($language, $plugin);
-
-        $baseTranslations = $translationWriter->getTranslations('en');
-
-        $translationWriter->addValidator(new NoScripts());
-        if (empty($plugin)) {
-            $translationWriter->addValidator(new CoreTranslations($baseTranslations));
-        }
-
-        // prevent build from failing when translations string have been deleted
-//        $translationWriter->addFilter(new ByBaseTranslations($baseTranslations));
-        $translationWriter->addFilter(new EmptyTranslations());
-        $translationWriter->addFilter(new ByParameterCount($baseTranslations));
-        $translationWriter->addFilter(new UnnecassaryWhitespaces($baseTranslations));
-        $translationWriter->addFilter(new EncodedEntities());
-
-        $translations = $translationWriter->getTranslations($language);
-
-        if (empty($translations)) {
-            return; // skip language / plugin combinations that aren't present
-        }
-
-        $translationWriter->setTranslations($translations);
-
-        $this->assertTrue($translationWriter->isValid(), $translationWriter->getValidationMessage());
-
-        if ($translationWriter->wasFiltered()) {
-
-            $translationWriter->saveTemporary();
-            $this->markTestSkipped(implode("\n", $translationWriter->getFilterMessages()) . "\n"
-                . 'Translation file errors detected in ' . $language . "...\n"
-                . "To synchronise the language files with the english strings, you can manually edit the language files or run the following command may work if you have access to oTrance: \n"
-                . "$ ./console translations:update [--plugin=XYZ] \n"
-            );
-        }
-    }
-
-    /**
-     * test language when it's not defined
-     *
-     * @group Plugins
-     *
-     * @expectedException Exception
-     */
-    function testWriterInvalidPlugin()
-    {
-        new Writer('de', 'iNvaLiDPluGin'); // invalid plugin throws exception
-    }
-
-    /**
-     * test language when it's not defined
-     *
-     * @group Plugins
-     */
-    function testGetTranslationsForLanguagesNot()
-    {
-        $this->assertFalse(API::getInstance()->getTranslationsForLanguage("../no-language"));
-    }
-
-    /**
-     * test English short name for language
-     *
-     * @group Plugins
-     */
-    function testGetLanguageNamesInEnglish()
-    {
-        $languages = API::getInstance()->getAvailableLanguages();
-        foreach ($languages as $language) {
-            $data = file_get_contents(PIWIK_INCLUDE_PATH . "/lang/$language.json");
-            $translations = json_decode($data, true);
-            $name = $translations['General']['EnglishLanguageName'];
-
-            if ($language != 'en') {
-                $this->assertFalse($name == 'English', "for $language");
-            }
-
-            $languageCode = substr($language, 0, 2);
-            $this->assertTrue(isset($GLOBALS['Piwik_LanguageList'][$languageCode]));
-            $names = $GLOBALS['Piwik_LanguageList'][$languageCode];
-
-            if (isset($GLOBALS['Piwik_LanguageList'][$language])) {
-                if (is_array($names)) {
-                    $this->assertTrue(in_array($name, $names), "$language: failed because $name not a known language name");
-                } else {
-                    $this->assertTrue($name == $names, "$language: failed because $name == $names");
-                }
-            } else {
-                if (is_array($names)) {
-                    $this->assertTrue(strpos($name, $names[0]) !== false);
-                } else {
-                    $this->fail("$language: expected an array of language names");
-                }
-            }
-        }
-    }
-
-    /**
-     * test format of DataFile/Languages.php
-     *
-     * @group Plugins
-     */
-    function testGetLanguagesList()
-    {
-        $languages = Common::getLanguagesList();
-        $this->assertTrue(count($languages) > 0);
-        foreach ($languages as $langCode => $langs) {
-            $this->assertTrue(strlen($langCode) == 2, "$langCode length = 2");
-            $this->assertTrue(is_array($langs) && count($langs) >= 1, "$langCode array(names) >= 1");
-        }
-    }
-}
diff --git a/plugins/LeftMenu/lang/de.json b/plugins/LeftMenu/lang/de.json
index 68f1e8efd3..a2ff86656a 100644
--- a/plugins/LeftMenu/lang/de.json
+++ b/plugins/LeftMenu/lang/de.json
@@ -1,10 +1,10 @@
 {
     "LeftMenu": {
-        "GlobalSettingDescription": "Legt die Standarteinstellung für alle Benutzer fest.",
+        "GlobalSettingDescription": "Legt die Standardeinstellung für alle Benutzer fest.",
         "GlobalSettingInlineHelp": "Die Benutzer können es unabhängig von der Vorgabe aktivieren\/deaktivieren.",
         "GlobalSettingTitle": "LeftMenu aktiviert als Voreinstellung",
         "SettingsIntroduction": "Das LeftMenu Plug-In verschiebt die Menüs für die Reporte auf die linke Seite. Dies ist für umfangreiche Reporte hilfreich.",
-        "UserSettingInlineHelp": "Legt die Einstellung für den aktuellen Benutzer fest, ob LeftMenu aktiviert oder deaktiviert sein soll. Ein Administrator kann die Standarteinstellung für alle Nutzer festlegen.",
+        "UserSettingInlineHelp": "Legt die Einstellung für den aktuellen Benutzer fest, ob LeftMenu aktiviert oder deaktiviert sein soll. Ein Administrator kann die Standardeinstellung für alle Benutzer festlegen.",
         "UserSettingTitle": "LeftMenu aktiviert"
     }
 }
\ No newline at end of file
diff --git a/plugins/LeftMenu/lang/ru.json b/plugins/LeftMenu/lang/ru.json
index d5e8adfcdc..e970c5b45b 100644
--- a/plugins/LeftMenu/lang/ru.json
+++ b/plugins/LeftMenu/lang/ru.json
@@ -1,5 +1,9 @@
 {
     "LeftMenu": {
-        "GlobalSettingTitle": "Левое меню включено поумолчанию"
+        "GlobalSettingDescription": "Определяет значение по умолчанию для всех пользователей.",
+        "GlobalSettingInlineHelp": "Пользователи имеют возможность отключить\/включить левое меню независимо от значения по умолчанию.",
+        "GlobalSettingTitle": "Левое меню включено поумолчанию",
+        "SettingsIntroduction": "Если включить плагин LeftMenu, он переместит главное меню сверху налево. Это будет удобно для больших экранов.",
+        "UserSettingInlineHelp": "Это включает или отключает левое меню только для вас и не влияет на других пользователей. Суперпользователь может изменить настройки по умолчанию для всех пользователей."
     }
 }
\ No newline at end of file
diff --git a/plugins/LeftMenu/plugin.json b/plugins/LeftMenu/plugin.json
index b5b74fce8f..dbbbace989 100644
--- a/plugins/LeftMenu/plugin.json
+++ b/plugins/LeftMenu/plugin.json
@@ -1,4 +1,4 @@
 {
-    "description": "Position the dashboard menu to the left.",
+    "description": "Position the dashboard menu to the left. ",
     "theme": false
 }
\ No newline at end of file
diff --git a/plugins/LeftMenu/stylesheets/theme.less b/plugins/LeftMenu/stylesheets/theme.less
index 6f1bef2a34..8e9ea0eab8 100644
--- a/plugins/LeftMenu/stylesheets/theme.less
+++ b/plugins/LeftMenu/stylesheets/theme.less
@@ -113,6 +113,7 @@
 
   .top_controls {
     clear: none;
+    left: 34px;
   }
 
   .nav_sep {
diff --git a/plugins/LeftMenu/tests/Integration/APITest.php b/plugins/LeftMenu/tests/Integration/APITest.php
index 00bf03830f..1a86a6b0f7 100644
--- a/plugins/LeftMenu/tests/Integration/APITest.php
+++ b/plugins/LeftMenu/tests/Integration/APITest.php
@@ -11,7 +11,7 @@ namespace Piwik\Plugins\LeftMenu\tests\Integration;
 use Piwik\Access;
 use Piwik\Plugins\LeftMenu\API;
 use Piwik\Plugins\LeftMenu\Settings;
-use \FakeAccess;
+use Piwik\Tests\Framework\Mock\FakeAccess;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 
 /**
diff --git a/plugins/Live/API.php b/plugins/Live/API.php
index 7a36822534..ed11c6c277 100644
--- a/plugins/Live/API.php
+++ b/plugins/Live/API.php
@@ -16,10 +16,8 @@ use Piwik\DataTable\Row;
 use Piwik\Date;
 use Piwik\Db;
 use Piwik\Metrics\Formatter;
-use Piwik\Period\Range;
 use Piwik\Period;
 use Piwik\Piwik;
-use Piwik\Plugins\Referrers\API as APIReferrers;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
 use Piwik\Segment;
 use Piwik\Site;
@@ -55,8 +53,6 @@ require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/functions.php';
 class API extends \Piwik\Plugin\API
 {
     const VISITOR_PROFILE_MAX_VISITS_TO_AGGREGATE = 100;
-    const VISITOR_PROFILE_MAX_VISITS_TO_SHOW = 10;
-    const VISITOR_PROFILE_DATE_FORMAT = '%day% %shortMonth% %longYear%';
 
     /**
      * This will return simple counters, for a given website ID, for visits over the last N minutes
@@ -69,49 +65,8 @@ class API extends \Piwik\Plugin\API
     public function getCounters($idSite, $lastMinutes, $segment = false)
     {
         Piwik::checkUserHasViewAccess($idSite);
-        $lastMinutes = (int) $lastMinutes;
-
-        $counters = array(
-            'visits'   => 0,
-            'actions'  => 0,
-            'visitors' => 0,
-            'visitsConverted' => 0,
-        );
-
-        if (empty($lastMinutes)) {
-            return array($counters);
-        }
-
-        list($whereIdSites, $idSites) = $this->getIdSitesWhereClause($idSite);
-
-        $select  = "count(*) as visits, COUNT(DISTINCT log_visit.idvisitor) as visitors";
-        $where   = $whereIdSites . "AND log_visit.visit_last_action_time >= ?";
-        $bind    = $idSites;
-        $bind[]  = Date::factory(time() - $lastMinutes * 60)->toString('Y-m-d H:i:s');
-
-        $segment = new Segment($segment, $idSite);
-        $query   = $segment->getSelectQuery($select, 'log_visit', $where, $bind);
-
-        $data    = Db::fetchAll($query['sql'], $query['bind']);
-
-        $counters['visits']   = $data[0]['visits'];
-        $counters['visitors'] = $data[0]['visitors'];
-
-        $select = "count(*)";
-        $from   = 'log_link_visit_action';
-        list($whereIdSites) = $this->getIdSitesWhereClause($idSite, $from);
-        $where  = $whereIdSites . "AND log_link_visit_action.server_time >= ?";
-        $query  = $segment->getSelectQuery($select, $from, $where, $bind);
-        $counters['actions'] = Db::fetchOne($query['sql'], $query['bind']);
-
-        $select = "count(*)";
-        $from   = 'log_conversion';
-        list($whereIdSites) = $this->getIdSitesWhereClause($idSite, $from);
-        $where  = $whereIdSites . "AND log_conversion.server_time >= ?";
-        $query  = $segment->getSelectQuery($select, $from, $where, $bind);
-        $counters['visitsConverted'] = Db::fetchOne($query['sql'], $query['bind']);
-
-        return array($counters);
+        $model = new Model();
+        return $model->queryCounters($idSite, $lastMinutes, $segment);
     }
 
     /**
@@ -183,11 +138,9 @@ class API extends \Piwik\Plugin\API
      * @param int $idSite Site ID
      * @param bool|false|string $visitorId The ID of the visitor whose profile to retrieve.
      * @param bool|false|string $segment
-     * @param bool $checkForLatLong If true, hasLatLong will appear in the output and be true if
-     *                              one of the first 100 visits has a latitude/longitude.
      * @return array
      */
-    public function getVisitorProfile($idSite, $visitorId = false, $segment = false, $checkForLatLong = false)
+    public function getVisitorProfile($idSite, $visitorId = false, $segment = false)
     {
         Piwik::checkUserHasViewAccess($idSite);
 
@@ -207,190 +160,8 @@ class API extends \Piwik\Plugin\API
             return array();
         }
 
-        $isEcommerceEnabled = Site::isEcommerceEnabledFor($idSite);
-
-        $result = array();
-        $result['totalVisits'] = 0;
-        $result['totalVisitDuration'] = 0;
-        $result['totalActions'] = 0;
-        $result['totalSearches'] = 0;
-        $result['totalPageViews'] = 0;
-        $result['totalGoalConversions'] = 0;
-        $result['totalConversionsByGoal'] = array();
-
-        if ($isEcommerceEnabled) {
-            $result['totalEcommerceConversions'] = 0;
-            $result['totalEcommerceRevenue'] = 0;
-            $result['totalEcommerceItems'] = 0;
-            $result['totalAbandonedCarts'] = 0;
-            $result['totalAbandonedCartsRevenue'] = 0;
-            $result['totalAbandonedCartsItems'] = 0;
-        }
-
-        $countries  = array();
-        $continents = array();
-        $cities     = array();
-        $siteSearchKeywords = array();
-
-        $pageGenerationTimeTotal = 0;
-
-        // aggregate all requested visits info for total_* info
-        foreach ($visits->getRows() as $visit) {
-            ++$result['totalVisits'];
-
-            $result['totalVisitDuration'] += $visit->getColumn('visitDuration');
-            $result['totalActions'] += $visit->getColumn('actions');
-            $result['totalGoalConversions'] += $visit->getColumn('goalConversions');
-
-            // individual goal conversions are stored in action details
-            foreach ($visit->getColumn('actionDetails') as $action) {
-                if ($action['type'] == 'goal') {
-                    // handle goal conversion
-                    $idGoal = $action['goalId'];
-                    $idGoalKey = 'idgoal=' . $idGoal;
-
-                    if (!isset($result['totalConversionsByGoal'][$idGoalKey])) {
-                        $result['totalConversionsByGoal'][$idGoalKey] = 0;
-                    }
-                    ++$result['totalConversionsByGoal'][$idGoalKey];
-
-                    if (!empty($action['revenue'])) {
-                        if (!isset($result['totalRevenueByGoal'][$idGoalKey])) {
-                            $result['totalRevenueByGoal'][$idGoalKey] = 0;
-                        }
-                        $result['totalRevenueByGoal'][$idGoalKey] += $action['revenue'];
-                    }
-                } else if ($action['type'] == Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER // handle ecommerce order
-                    && $isEcommerceEnabled
-                ) {
-                    ++$result['totalEcommerceConversions'];
-                    $result['totalEcommerceRevenue'] += $action['revenue'];
-                    $result['totalEcommerceItems'] += $action['items'];
-                } else if ($action['type'] == Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART // handler abandoned cart
-                    && $isEcommerceEnabled
-                ) {
-                    ++$result['totalAbandonedCarts'];
-                    $result['totalAbandonedCartsRevenue'] += $action['revenue'];
-                    $result['totalAbandonedCartsItems'] += $action['items'];
-                }
-
-                if (isset($action['siteSearchKeyword'])) {
-                    $keyword = $action['siteSearchKeyword'];
-
-                    if (!isset($siteSearchKeywords[$keyword])) {
-                        $siteSearchKeywords[$keyword] = 0;
-                        ++$result['totalSearches'];
-                    }
-                    ++$siteSearchKeywords[$keyword];
-                }
-
-                if (isset($action['generationTime'])) {
-                    $pageGenerationTimeTotal += $action['generationTime'];
-                    ++$result['totalPageViews'];
-                }
-            }
-
-            $countryCode = $visit->getColumn('countryCode');
-            if (!isset($countries[$countryCode])) {
-                $countries[$countryCode] = 0;
-            }
-            ++$countries[$countryCode];
-
-            $continentCode = $visit->getColumn('continentCode');
-            if (!isset($continents[$continentCode])) {
-                $continents[$continentCode] = 0;
-            }
-            ++$continents[$continentCode];
-
-            if ($countryCode && !array_key_exists($countryCode, $cities)) {
-                $cities[$countryCode] = array();
-            }
-            $city = $visit->getColumn('city');
-            if (!empty($city)) {
-                $cities[$countryCode][] = $city;
-            }
-        }
-
-        // sort countries/continents/search keywords by visit/action
-        asort($countries);
-        asort($continents);
-        arsort($siteSearchKeywords);
-
-        // transform country/continents/search keywords into something that will look good in XML
-        $result['countries'] = $result['continents'] = $result['searches'] = array();
-
-        foreach ($countries as $countryCode => $nbVisits) {
-
-            $countryInfo = array('country'    => $countryCode,
-                                   'nb_visits'  => $nbVisits,
-                                   'flag'       => \Piwik\Plugins\UserCountry\getFlagFromCode($countryCode),
-                                   'prettyName' => \Piwik\Plugins\UserCountry\countryTranslate($countryCode));
-            if (!empty($cities[$countryCode])) {
-                $countryInfo['cities'] = array_unique($cities[$countryCode]);
-            }
-            $result['countries'][] = $countryInfo;
-        }
-        foreach ($continents as $continentCode => $nbVisits) {
-            $result['continents'][] = array('continent'  => $continentCode,
-                                            'nb_visits'  => $nbVisits,
-                                            'prettyName' => \Piwik\Plugins\UserCountry\continentTranslate($continentCode));
-        }
-        foreach ($siteSearchKeywords as $keyword => $searchCount) {
-            $result['searches'][] = array('keyword'  => $keyword,
-                                          'searches' => $searchCount);
-        }
-
-        if ($result['totalPageViews']) {
-            $result['averagePageGenerationTime'] =
-                round($pageGenerationTimeTotal / $result['totalPageViews'], $precision = 2);
-        }
-
-        $formatter = new Formatter();
-        $result['totalVisitDurationPretty'] = $formatter->getPrettyTimeFromSeconds($result['totalVisitDuration'], true);
-
-        // use requested visits for first/last visit info
-        $rows = $visits->getRows();
-        $result['firstVisit'] = $this->getVisitorProfileVisitSummary(end($rows));
-        $result['lastVisit'] = $this->getVisitorProfileVisitSummary(reset($rows));
-
-        // check if requested visits have lat/long
-        if ($checkForLatLong) {
-            $result['hasLatLong'] = false;
-            foreach ($rows as $visit) {
-                if ($visit->getColumn('latitude') !== false) { // realtime map only checks for latitude
-                    $result['hasLatLong'] = true;
-                    break;
-                }
-            }
-        }
-
-        // save count of visits we queries
-        $result['visitsAggregated'] = count($rows);
-
-        // use N most recent visits for last_visits
-        $visits->deleteRowsOffset(self::VISITOR_PROFILE_MAX_VISITS_TO_SHOW);
-        $result['lastVisits'] = $visits;
-
-        // use the right date format for the pretty server date
-        $timezone = Site::getTimezoneFor($idSite);
-        foreach ($result['lastVisits']->getRows() as $visit) {
-            $dateTimeVisitFirstAction = Date::factory($visit->getColumn('firstActionTimestamp'), $timezone);
-
-            $datePretty = $dateTimeVisitFirstAction->getLocalized(self::VISITOR_PROFILE_DATE_FORMAT);
-            $visit->setColumn('serverDatePrettyFirstAction', $datePretty);
-
-            $dateTimePretty = $datePretty . ' ' . $visit->getColumn('serverTimePrettyFirstAction');
-            $visit->setColumn('serverDateTimePrettyFirstAction', $dateTimePretty);
-        }
-
-        $result['userId'] = $visit->getColumn('userId');
-
-        // get visitor IDs that are adjacent to this one in log_visit
-        // TODO: make sure order of visitor ids is not changed if a returning visitor visits while the user is
-        //       looking at the popup.
-        $latestVisitTime = reset($rows)->getColumn('lastActionDateTime');
-        $result['nextVisitorId'] = $this->getAdjacentVisitorId($idSite, $visitorId, $latestVisitTime, $segment, $getNext = true);
-        $result['previousVisitorId'] = $this->getAdjacentVisitorId($idSite, $visitorId, $latestVisitTime, $segment, $getNext = false);
+        $profile = new VisitorProfile($idSite);
+        $result = $profile->makeVisitorProfile($visits, $visitorId, $segment);
 
         /**
          * Triggered in the Live.getVisitorProfile API method. Plugins can use this event
@@ -439,107 +210,6 @@ class API extends \Piwik\Plugin\API
         return $visitor->getVisitorId();
     }
 
-    /**
-     * Returns the ID of a visitor that is adjacent to another visitor (by time of last action)
-     * in the log_visit table.
-     *
-     * @param int $idSite The ID of the site whose visits should be looked at.
-     * @param string $visitorId The ID of the visitor to get an adjacent visitor for.
-     * @param string $visitLastActionTime The last action time of the latest visit for $visitorId.
-     * @param string $segment
-     * @param bool $getNext Whether to retrieve the next visitor or the previous visitor. The next
-     *                      visitor will be the visitor that appears chronologically later in the
-     *                      log_visit table. The previous visitor will be the visitor that appears
-     *                      earlier.
-     * @return string The hex visitor ID.
-     */
-    private function getAdjacentVisitorId($idSite, $visitorId, $visitLastActionTime, $segment, $getNext)
-    {
-        if ($getNext) {
-            $visitLastActionTimeCondition = "sub.visit_last_action_time <= ?";
-            $orderByDir = "DESC";
-        } else {
-            $visitLastActionTimeCondition = "sub.visit_last_action_time >= ?";
-            $orderByDir = "ASC";
-        }
-
-        $visitLastActionDate = Date::factory($visitLastActionTime);
-        $dateOneDayAgo       = $visitLastActionDate->subDay(1);
-        $dateOneDayInFuture  = $visitLastActionDate->addDay(1);
-
-        $select = "log_visit.idvisitor, MAX(log_visit.visit_last_action_time) as visit_last_action_time";
-        $from = "log_visit";
-        $where = "log_visit.idsite = ? AND log_visit.idvisitor <> ? AND visit_last_action_time >= ? and visit_last_action_time <= ?";
-        $whereBind = array($idSite, @Common::hex2bin($visitorId), $dateOneDayAgo->toString('Y-m-d H:i:s'), $dateOneDayInFuture->toString('Y-m-d H:i:s'));
-        $orderBy = "MAX(log_visit.visit_last_action_time) $orderByDir";
-        $groupBy = "log_visit.idvisitor";
-
-        $segment = new Segment($segment, $idSite);
-        $queryInfo = $segment->getSelectQuery($select, $from, $where, $whereBind, $orderBy, $groupBy);
-
-        $sql = "SELECT sub.idvisitor, sub.visit_last_action_time FROM ({$queryInfo['sql']}) as sub
-                 WHERE $visitLastActionTimeCondition
-                 LIMIT 1";
-        $bind = array_merge($queryInfo['bind'], array($visitLastActionTime));
-
-        $visitorId = Db::fetchOne($sql, $bind);
-        if (!empty($visitorId)) {
-            $visitorId = bin2hex($visitorId);
-        }
-        return $visitorId;
-    }
-
-    /**
-     * Returns a summary for an important visit. Used to describe the first & last visits of a visitor.
-     *
-     * @param Row $visit
-     * @return array
-     */
-    private function getVisitorProfileVisitSummary($visit)
-    {
-        $today = Date::today();
-
-        $serverDate = $visit->getColumn('firstActionTimestamp');
-        return array(
-            'date'            => $serverDate,
-            'prettyDate'      => Date::factory($serverDate)->getLocalized(self::VISITOR_PROFILE_DATE_FORMAT),
-            'daysAgo'         => (int)Date::secondsToDays($today->getTimestamp() - Date::factory($serverDate)->getTimestamp()),
-            'referrerType'    => $visit->getColumn('referrerType'),
-            'referralSummary' => self::getReferrerSummaryForVisit($visit),
-        );
-    }
-
-    /**
-     * Returns a summary for a visit's referral.
-     *
-     * @param Row $visit
-     * @return bool|mixed|string
-     * @ignore
-     */
-    public static function getReferrerSummaryForVisit($visit)
-    {
-        $referrerType = $visit->getColumn('referrerType');
-        if ($referrerType === false
-            || $referrerType == 'direct'
-        ) {
-            $result = Piwik::translate('Referrers_DirectEntry');
-        } else if ($referrerType == 'search') {
-            $result = $visit->getColumn('referrerName');
-
-            $keyword = $visit->getColumn('referrerKeyword');
-            if ($keyword !== false
-                && $keyword != APIReferrers::getKeywordNotDefinedString()
-            ) {
-                $result .= ' (' . $keyword . ')';
-            }
-        } else if ($referrerType == 'campaign') {
-            $result = Piwik::translate('Referrers_ColumnCampaign') . ' (' . $visit->getColumn('referrerName') . ')';
-        } else {
-            $result = $visit->getColumn('referrerName');
-        }
-
-        return $result;
-    }
 
     /**
      * @deprecated
@@ -614,112 +284,20 @@ class API extends \Piwik\Plugin\API
 
     private function loadLastVisitorDetailsFromDatabase($idSite, $period, $date, $segment = false, $countVisitorsToFetch = 100, $visitorId = false, $minTimestamp = false, $filterSortOrder = false)
     {
-        $where = $whereBind = array();
-
-        list($whereClause, $idSites) = $this->getIdSitesWhereClause($idSite);
-
-        $where[] = $whereClause;
-        $whereBind = $idSites;
-
-        if (strtolower($filterSortOrder) !== 'asc') {
-            $filterSortOrder = 'DESC';
-        }
-
-        $orderBy = "idsite, visit_last_action_time " . $filterSortOrder;
-        $orderByParent = "sub.visit_last_action_time " . $filterSortOrder;
-
-        if (!empty($visitorId)) {
-            $where[] = "log_visit.idvisitor = ? ";
-            $whereBind[] = @Common::hex2bin($visitorId);
-        }
-
-        if (!empty($minTimestamp)) {
-            $where[] = "log_visit.visit_last_action_time > ? ";
-            $whereBind[] = date("Y-m-d H:i:s", $minTimestamp);
-        }
-
-        // If no other filter, only look at the last 24 hours of stats
-        if (empty($visitorId)
-            && empty($countVisitorsToFetch)
-            && empty($period)
-            && empty($date)
-        ) {
-            $period = 'day';
-            $date = 'yesterdaySameTime';
-        }
-
-        // SQL Filter with provided period
-        if (!empty($period) && !empty($date)) {
-            $currentSite = new Site($idSite);
-            $currentTimezone = $currentSite->getTimezone();
-
-            $dateString = $date;
-            if ($period == 'range') {
-                $processedPeriod = new Range('range', $date);
-                if ($parsedDate = Range::parseDateRange($date)) {
-                    $dateString = $parsedDate[2];
-                }
-            } else {
-                $processedDate = Date::factory($date);
-                if ($date == 'today'
-                    || $date == 'now'
-                    || $processedDate->toString() == Date::factory('now', $currentTimezone)->toString()
-                ) {
-                    $processedDate = $processedDate->subDay(1);
-                }
-                $processedPeriod = Period\Factory::build($period, $processedDate);
-            }
-            $dateStart = $processedPeriod->getDateStart()->setTimezone($currentTimezone);
-            $where[] = "log_visit.visit_last_action_time >= ?";
-            $whereBind[] = $dateStart->toString('Y-m-d H:i:s');
-
-            if (!in_array($date, array('now', 'today', 'yesterdaySameTime'))
-                && strpos($date, 'last') === false
-                && strpos($date, 'previous') === false
-                && Date::factory($dateString)->toString('Y-m-d') != Date::factory('now', $currentTimezone)->toString()
-            ) {
-                $dateEnd = $processedPeriod->getDateEnd()->setTimezone($currentTimezone);
-                $where[] = " log_visit.visit_last_action_time <= ?";
-                $dateEndString = $dateEnd->addDay(1)->toString('Y-m-d H:i:s');
-                $whereBind[] = $dateEndString;
-            }
-        }
-
-        if (count($where) > 0) {
-            $where = join("
-				AND ", $where);
-        } else {
-            $where = false;
-        }
-
-        $segment = new Segment($segment, $idSite);
-
-        // Subquery to use the indexes for ORDER BY
-        $select = "log_visit.*";
-        $from = "log_visit";
-        $subQuery = $segment->getSelectQuery($select, $from, $where, $whereBind, $orderBy);
-
-        $sqlLimit = $countVisitorsToFetch >= 1 ? " LIMIT 0, " . (int)$countVisitorsToFetch : "";
-
-        // Group by idvisit so that a visitor converting 2 goals only appears once
-        $sql = "
-			SELECT sub.* FROM (
-				" . $subQuery['sql'] . "
-				$sqlLimit
-			) AS sub
-			GROUP BY sub.idvisit
-			ORDER BY $orderByParent
-		";
-        try {
-            $data = Db::fetchAll($sql, $subQuery['bind']);
-        } catch (Exception $e) {
-            echo $e->getMessage();
-            exit;
-        }
+        $model = new Model();
+        $data = $model->queryLogVisits($idSite, $period, $date, $segment, $countVisitorsToFetch, $visitorId, $minTimestamp, $filterSortOrder);
+        return $this->makeVisitorTableFromArray($data);
+    }
 
+    /**
+     * @param $data
+     * @return DataTable
+     * @throws Exception
+     */
+    private function makeVisitorTableFromArray($data)
+    {
         $dataTable = new DataTable();
         $dataTable->addRowsFromSimpleArray($data);
-       // $dataTable->disableFilter('Truncate');
 
         if (!empty($data[0])) {
             $columnsToNotAggregate = array_map(function () {
@@ -732,18 +310,5 @@ class API extends \Piwik\Plugin\API
         return $dataTable;
     }
 
-    /**
-     * @param $idSite
-     * @param string $table
-     * @return array
-     */
-    private function getIdSitesWhereClause($idSite, $table = 'log_visit')
-    {
-        $idSites = array($idSite);
-        Piwik::postEvent('Live.API.getIdSitesString', array(&$idSites));
 
-        $idSitesBind = Common::getSqlStringFieldsArray($idSites);
-        $whereClause = $table . ".idsite in ($idSitesBind) ";
-        return array($whereClause, $idSites);
-    }
 }
diff --git a/plugins/Live/Controller.php b/plugins/Live/Controller.php
index 9df3e26ff8..421a0afb62 100644
--- a/plugins/Live/Controller.php
+++ b/plugins/Live/Controller.php
@@ -109,7 +109,7 @@ class Controller extends \Piwik\Plugin\Controller
         $view = new View('@Live/getVisitorProfilePopup.twig');
         $view->idSite = $idSite;
         $view->goals = APIGoals::getInstance()->getGoals($idSite);
-        $view->visitorData = Request::processRequest('Live.getVisitorProfile', array('checkForLatLong' => true));
+        $view->visitorData = Request::processRequest('Live.getVisitorProfile');
         $view->exportLink = $this->getVisitorProfileExportLink();
 
         if (Common::getRequestVar('showMap', 1) == 1
@@ -133,7 +133,7 @@ class Controller extends \Piwik\Plugin\Controller
                                                                             'date'    => false
                                                                        ));
         $view->visitData = $visits->getFirstRow()->getColumns();
-        $view->visitReferralSummary = API::getReferrerSummaryForVisit($visits->getFirstRow());
+        $view->visitReferralSummary = VisitorProfile::getReferrerSummaryForVisit($visits->getFirstRow());
         $view->showLocation = true;
         $this->setWidgetizedVisitorProfileUrl($view);
         $view->exportLink = $this->getVisitorProfileExportLink();
@@ -145,7 +145,7 @@ class Controller extends \Piwik\Plugin\Controller
         $startCounter = Common::getRequestVar('filter_offset', 0, 'int');
         $nextVisits = Request::processRequest('Live.getLastVisitsDetails', array(
                                                                                 'segment'                 => self::getSegmentWithVisitorId(),
-                                                                                'filter_limit'            => API::VISITOR_PROFILE_MAX_VISITS_TO_SHOW,
+                                                                                'filter_limit'            => VisitorProfile::VISITOR_PROFILE_MAX_VISITS_TO_SHOW,
                                                                                 'filter_offset'           => $startCounter,
                                                                                 'period'                  => false,
                                                                                 'date'                    => false
diff --git a/plugins/Live/Live.php b/plugins/Live/Live.php
index aaddca1f22..3dbe242b78 100644
--- a/plugins/Live/Live.php
+++ b/plugins/Live/Live.php
@@ -42,6 +42,7 @@ class Live extends \Piwik\Plugin
         $jsFiles[] = "plugins/Live/javascripts/live.js";
         $jsFiles[] = "plugins/Live/javascripts/visitorProfile.js";
         $jsFiles[] = "plugins/Live/javascripts/visitorLog.js";
+        $jsFiles[] = "plugins/Live/javascripts/rowaction.js";
     }
 
     public function getClientSideTranslationKeys(&$translationKeys)
@@ -51,5 +52,9 @@ class Live extends \Piwik\Plugin
         $translationKeys[] = "Live_ShowMap";
         $translationKeys[] = "Live_HideMap";
         $translationKeys[] = "Live_PageRefreshed";
+        $translationKeys[] = "Live_RowActionTooltipTitle";
+        $translationKeys[] = "Live_RowActionTooltipDefault";
+        $translationKeys[] = "Live_RowActionTooltipWithDimension";
+        $translationKeys[] = "Live_SegmentedVisitorLogTitle";
     }
 }
\ No newline at end of file
diff --git a/plugins/Live/Model.php b/plugins/Live/Model.php
new file mode 100644
index 0000000000..19a44ba1d6
--- /dev/null
+++ b/plugins/Live/Model.php
@@ -0,0 +1,457 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\Live;
+
+use Exception;
+use Piwik\Common;
+use Piwik\DataAccess\LogAggregator;
+use Piwik\Date;
+use Piwik\Db;
+use Piwik\Period;
+use Piwik\Period\Range;
+use Piwik\Piwik;
+use Piwik\Plugins\CustomVariables\CustomVariables;
+use Piwik\Segment;
+use Piwik\Site;
+use Piwik\Tracker\GoalManager;
+
+class Model
+{
+
+    /**
+     * @param $idVisit
+     * @param $actionsLimit
+     * @return array
+     * @throws \Exception
+     */
+    public function queryActionsForVisit($idVisit, $actionsLimit)
+    {
+        $maxCustomVariables = CustomVariables::getMaxCustomVariables();
+
+        $sqlCustomVariables = '';
+        for ($i = 1; $i <= $maxCustomVariables; $i++) {
+            $sqlCustomVariables .= ', custom_var_k' . $i . ', custom_var_v' . $i;
+        }
+        // The second join is a LEFT join to allow returning records that don't have a matching page title
+        // eg. Downloads, Outlinks. For these, idaction_name is set to 0
+        $sql = "
+				SELECT
+					COALESCE(log_action_event_category.type, log_action.type, log_action_title.type) AS type,
+					log_action.name AS url,
+					log_action.url_prefix,
+					log_action_title.name AS pageTitle,
+					log_action.idaction AS pageIdAction,
+					log_link_visit_action.idlink_va,
+					log_link_visit_action.server_time as serverTimePretty,
+					log_link_visit_action.time_spent_ref_action as timeSpentRef,
+					log_link_visit_action.idlink_va AS pageId,
+					log_link_visit_action.custom_float
+					" . $sqlCustomVariables . ",
+					log_action_event_category.name AS eventCategory,
+					log_action_event_action.name as eventAction
+				FROM " . Common::prefixTable('log_link_visit_action') . " AS log_link_visit_action
+					LEFT JOIN " . Common::prefixTable('log_action') . " AS log_action
+					ON  log_link_visit_action.idaction_url = log_action.idaction
+					LEFT JOIN " . Common::prefixTable('log_action') . " AS log_action_title
+					ON  log_link_visit_action.idaction_name = log_action_title.idaction
+					LEFT JOIN " . Common::prefixTable('log_action') . " AS log_action_event_category
+					ON  log_link_visit_action.idaction_event_category = log_action_event_category.idaction
+					LEFT JOIN " . Common::prefixTable('log_action') . " AS log_action_event_action
+					ON  log_link_visit_action.idaction_event_action = log_action_event_action.idaction
+				WHERE log_link_visit_action.idvisit = ?
+				ORDER BY server_time ASC
+				LIMIT 0, $actionsLimit
+				 ";
+        $actionDetails = Db::fetchAll($sql, array($idVisit));
+        return $actionDetails;
+    }
+
+    /**
+     * @param $idVisit
+     * @param $limit
+     * @return array
+     * @throws \Exception
+     */
+    public function queryGoalConversionsForVisit($idVisit, $limit)
+    {
+        $sql = "
+				SELECT
+						'goal' as type,
+						goal.name as goalName,
+						goal.idgoal as goalId,
+						goal.revenue as revenue,
+						log_conversion.idlink_va,
+						log_conversion.idlink_va as goalPageId,
+						log_conversion.server_time as serverTimePretty,
+						log_conversion.url as url
+				FROM " . Common::prefixTable('log_conversion') . " AS log_conversion
+				LEFT JOIN " . Common::prefixTable('goal') . " AS goal
+					ON (goal.idsite = log_conversion.idsite
+						AND
+						goal.idgoal = log_conversion.idgoal)
+					AND goal.deleted = 0
+				WHERE log_conversion.idvisit = ?
+					AND log_conversion.idgoal > 0
+                ORDER BY server_time ASC
+				LIMIT 0, $limit
+			";
+        $goalDetails = Db::fetchAll($sql, array($idVisit));
+        return $goalDetails;
+    }
+
+    /**
+     * @param $idVisit
+     * @param $limit
+     * @return array
+     * @throws \Exception
+     */
+    public function queryEcommerceConversionsForVisit($idVisit, $limit)
+    {
+        $sql = "SELECT
+						case idgoal when " . GoalManager::IDGOAL_CART
+                            . " then '" . Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART
+                            . "' else '" . Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER . "' end as type,
+						idorder as orderId,
+						" . LogAggregator::getSqlRevenue('revenue') . " as revenue,
+						" . LogAggregator::getSqlRevenue('revenue_subtotal') . " as revenueSubTotal,
+						" . LogAggregator::getSqlRevenue('revenue_tax') . " as revenueTax,
+						" . LogAggregator::getSqlRevenue('revenue_shipping') . " as revenueShipping,
+						" . LogAggregator::getSqlRevenue('revenue_discount') . " as revenueDiscount,
+						items as items,
+						log_conversion.server_time as serverTimePretty,
+						log_conversion.idlink_va
+					FROM " . Common::prefixTable('log_conversion') . " AS log_conversion
+					WHERE idvisit = ?
+						AND idgoal <= " . GoalManager::IDGOAL_ORDER . "
+					ORDER BY server_time ASC
+					LIMIT 0, $limit";
+        $ecommerceDetails = Db::fetchAll($sql, array($idVisit));
+        return $ecommerceDetails;
+    }
+
+
+    /**
+     * @param $idVisit
+     * @param $idOrder
+     * @param $actionsLimit
+     * @return array
+     * @throws \Exception
+     */
+    public function queryEcommerceItemsForOrder($idVisit, $idOrder, $actionsLimit)
+    {
+        $sql = "SELECT
+							log_action_sku.name as itemSKU,
+							log_action_name.name as itemName,
+							log_action_category.name as itemCategory,
+							" . LogAggregator::getSqlRevenue('price') . " as price,
+							quantity as quantity
+						FROM " . Common::prefixTable('log_conversion_item') . "
+							INNER JOIN " . Common::prefixTable('log_action') . " AS log_action_sku
+							ON  idaction_sku = log_action_sku.idaction
+							LEFT JOIN " . Common::prefixTable('log_action') . " AS log_action_name
+							ON  idaction_name = log_action_name.idaction
+							LEFT JOIN " . Common::prefixTable('log_action') . " AS log_action_category
+							ON idaction_category = log_action_category.idaction
+						WHERE idvisit = ?
+							AND idorder = ?
+							AND deleted = 0
+						LIMIT 0, $actionsLimit
+				";
+
+        $bind = array($idVisit, $idOrder);
+
+        $itemsDetails = Db::fetchAll($sql, $bind);
+        return $itemsDetails;
+    }
+
+    /**
+     * @param $idSite
+     * @param $period
+     * @param $date
+     * @param $segment
+     * @param $countVisitorsToFetch
+     * @param $visitorId
+     * @param $minTimestamp
+     * @param $filterSortOrder
+     * @return array
+     * @throws Exception
+     */
+    public function queryLogVisits($idSite, $period, $date, $segment, $countVisitorsToFetch, $visitorId, $minTimestamp, $filterSortOrder)
+    {
+        list($sql, $bind) = $this->makeLogVisitsQueryString($idSite, $period, $date, $segment, $countVisitorsToFetch, $visitorId, $minTimestamp, $filterSortOrder);
+
+        try {
+            $data = Db::fetchAll($sql, $bind);
+            return $data;
+        } catch (Exception $e) {
+            echo $e->getMessage();
+            exit;
+        }
+        return $data;
+    }
+
+    /**
+     * @param $idSite
+     * @param $lastMinutes
+     * @param $segment
+     * @return array
+     * @throws Exception
+     */
+    public function queryCounters($idSite, $lastMinutes, $segment)
+    {
+        $lastMinutes = (int)$lastMinutes;
+
+        $counters = array(
+            'visits' => 0,
+            'actions' => 0,
+            'visitors' => 0,
+            'visitsConverted' => 0,
+        );
+
+        if (empty($lastMinutes)) {
+            return array($counters);
+        }
+
+        list($whereIdSites, $idSites) = $this->getIdSitesWhereClause($idSite);
+
+        $select = "count(*) as visits, COUNT(DISTINCT log_visit.idvisitor) as visitors";
+        $where = $whereIdSites . "AND log_visit.visit_last_action_time >= ?";
+        $bind = $idSites;
+        $bind[] = Date::factory(time() - $lastMinutes * 60)->toString('Y-m-d H:i:s');
+
+        $segment = new Segment($segment, $idSite);
+        $query = $segment->getSelectQuery($select, 'log_visit', $where, $bind);
+
+        $data = Db::fetchAll($query['sql'], $query['bind']);
+
+        $counters['visits'] = $data[0]['visits'];
+        $counters['visitors'] = $data[0]['visitors'];
+
+        $select = "count(*)";
+        $from = 'log_link_visit_action';
+        list($whereIdSites) = $this->getIdSitesWhereClause($idSite, $from);
+        $where = $whereIdSites . "AND log_link_visit_action.server_time >= ?";
+        $query = $segment->getSelectQuery($select, $from, $where, $bind);
+        $counters['actions'] = Db::fetchOne($query['sql'], $query['bind']);
+
+        $select = "count(*)";
+        $from = 'log_conversion';
+        list($whereIdSites) = $this->getIdSitesWhereClause($idSite, $from);
+        $where = $whereIdSites . "AND log_conversion.server_time >= ?";
+        $query = $segment->getSelectQuery($select, $from, $where, $bind);
+        $counters['visitsConverted'] = Db::fetchOne($query['sql'], $query['bind']);
+
+        return array($counters);
+    }
+
+
+
+    /**
+     * @param $idSite
+     * @param string $table
+     * @return array
+     */
+    private function getIdSitesWhereClause($idSite, $table = 'log_visit')
+    {
+        $idSites = array($idSite);
+        Piwik::postEvent('Live.API.getIdSitesString', array(&$idSites));
+
+        $idSitesBind = Common::getSqlStringFieldsArray($idSites);
+        $whereClause = $table . ".idsite in ($idSitesBind) ";
+        return array($whereClause, $idSites);
+    }
+
+
+    /**
+     * Returns the ID of a visitor that is adjacent to another visitor (by time of last action)
+     * in the log_visit table.
+     *
+     * @param int $idSite The ID of the site whose visits should be looked at.
+     * @param string $visitorId The ID of the visitor to get an adjacent visitor for.
+     * @param string $visitLastActionTime The last action time of the latest visit for $visitorId.
+     * @param string $segment
+     * @param bool $getNext Whether to retrieve the next visitor or the previous visitor. The next
+     *                      visitor will be the visitor that appears chronologically later in the
+     *                      log_visit table. The previous visitor will be the visitor that appears
+     *                      earlier.
+     * @return string The hex visitor ID.
+     * @throws Exception
+     */
+    public function queryAdjacentVisitorId($idSite, $visitorId, $visitLastActionTime, $segment, $getNext)
+    {
+        if ($getNext) {
+            $visitLastActionTimeCondition = "sub.visit_last_action_time <= ?";
+            $orderByDir = "DESC";
+        } else {
+            $visitLastActionTimeCondition = "sub.visit_last_action_time >= ?";
+            $orderByDir = "ASC";
+        }
+
+        $visitLastActionDate = Date::factory($visitLastActionTime);
+        $dateOneDayAgo = $visitLastActionDate->subDay(1);
+        $dateOneDayInFuture = $visitLastActionDate->addDay(1);
+
+        $select = "log_visit.idvisitor, MAX(log_visit.visit_last_action_time) as visit_last_action_time";
+        $from = "log_visit";
+        $where = "log_visit.idsite = ? AND log_visit.idvisitor <> ? AND visit_last_action_time >= ? and visit_last_action_time <= ?";
+        $whereBind = array($idSite, @Common::hex2bin($visitorId), $dateOneDayAgo->toString('Y-m-d H:i:s'), $dateOneDayInFuture->toString('Y-m-d H:i:s'));
+        $orderBy = "MAX(log_visit.visit_last_action_time) $orderByDir";
+        $groupBy = "log_visit.idvisitor";
+
+        $segment = new Segment($segment, $idSite);
+        $queryInfo = $segment->getSelectQuery($select, $from, $where, $whereBind, $orderBy, $groupBy);
+
+        $sql = "SELECT sub.idvisitor, sub.visit_last_action_time FROM ({$queryInfo['sql']}) as sub
+                 WHERE $visitLastActionTimeCondition
+                 LIMIT 1";
+        $bind = array_merge($queryInfo['bind'], array($visitLastActionTime));
+
+        $visitorId = Db::fetchOne($sql, $bind);
+        if (!empty($visitorId)) {
+            $visitorId = bin2hex($visitorId);
+        }
+        return $visitorId;
+    }
+
+    /**
+     * @param $idSite
+     * @param $period
+     * @param $date
+     * @param $segment
+     * @param $countVisitorsToFetch
+     * @param $visitorId
+     * @param $minTimestamp
+     * @param $filterSortOrder
+     * @return array
+     * @throws Exception
+     */
+    public function makeLogVisitsQueryString($idSite, $period, $date, $segment, $countVisitorsToFetch, $visitorId, $minTimestamp, $filterSortOrder)
+    {
+        // If no other filter, only look at the last 24 hours of stats
+        if (empty($visitorId)
+            && empty($countVisitorsToFetch)
+            && empty($period)
+            && empty($date)
+        ) {
+            $period = 'day';
+            $date = 'yesterdaySameTime';
+        }
+
+        list($whereBind, $where) = $this->getWhereClauseAndBind($idSite, $period, $date, $visitorId, $minTimestamp);
+
+        if (strtolower($filterSortOrder) !== 'asc') {
+            $filterSortOrder = 'DESC';
+        }
+        $segment = new Segment($segment, $idSite);
+
+        // Subquery to use the indexes for ORDER BY
+        $select = "log_visit.*";
+        $from = "log_visit";
+        $groupBy = false;
+        $limit = $countVisitorsToFetch >= 1 ? (int)$countVisitorsToFetch : 0;
+        $orderBy = "idsite, visit_last_action_time " . $filterSortOrder;
+        $orderByParent = "sub.visit_last_action_time " . $filterSortOrder;
+
+        $subQuery = $segment->getSelectQuery($select, $from, $where, $whereBind, $orderBy, $groupBy, $limit);
+
+        $bind = $subQuery['bind'];
+        // Group by idvisit so that a visitor converting 2 goals only appears once
+        $sql = "
+			SELECT sub.* FROM (
+				" . $subQuery['sql'] . "
+			) AS sub
+			GROUP BY sub.idvisit
+			ORDER BY $orderByParent
+		";
+        return array($sql, $bind);
+    }
+
+    /**
+     * @param $idSite
+     * @return Site
+     */
+    protected function makeSite($idSite)
+    {
+        return new Site($idSite);
+    }
+
+    /**
+     * @param $idSite
+     * @param $period
+     * @param $date
+     * @param $visitorId
+     * @param $minTimestamp
+     * @return array
+     * @throws Exception
+     */
+    private function getWhereClauseAndBind($idSite, $period, $date, $visitorId, $minTimestamp)
+    {
+        list($whereClause, $bindIdSites) = $this->getIdSitesWhereClause($idSite);
+
+        $where = array();
+        $where[] = $whereClause;
+        $whereBind = $bindIdSites;
+
+        if (!empty($visitorId)) {
+            $where[] = "log_visit.idvisitor = ? ";
+            $whereBind[] = @Common::hex2bin($visitorId);
+        }
+
+        if (!empty($minTimestamp)) {
+            $where[] = "log_visit.visit_last_action_time > ? ";
+            $whereBind[] = date("Y-m-d H:i:s", $minTimestamp);
+        }
+
+        // SQL Filter with provided period
+        if (!empty($period) && !empty($date)) {
+            $currentSite = $this->makeSite($idSite);
+            $currentTimezone = $currentSite->getTimezone();
+
+            $dateString = $date;
+            if ($period == 'range') {
+                $processedPeriod = new Range('range', $date);
+                if ($parsedDate = Range::parseDateRange($date)) {
+                    $dateString = $parsedDate[2];
+                }
+            } else {
+                $processedDate = Date::factory($date);
+                if ($date == 'today'
+                    || $date == 'now'
+                    || $processedDate->toString() == Date::factory('now', $currentTimezone)->toString()
+                ) {
+                    $processedDate = $processedDate->subDay(1);
+                }
+                $processedPeriod = Period\Factory::build($period, $processedDate);
+            }
+            $dateStart = $processedPeriod->getDateStart()->setTimezone($currentTimezone);
+            $where[] = "log_visit.visit_last_action_time >= ?";
+            $whereBind[] = $dateStart->toString('Y-m-d H:i:s');
+
+            if (!in_array($date, array('now', 'today', 'yesterdaySameTime'))
+                && strpos($date, 'last') === false
+                && strpos($date, 'previous') === false
+                && Date::factory($dateString)->toString('Y-m-d') != Date::factory('now', $currentTimezone)->toString()
+            ) {
+                $dateEnd = $processedPeriod->getDateEnd()->setTimezone($currentTimezone);
+                $where[] = " log_visit.visit_last_action_time <= ?";
+                $dateEndString = $dateEnd->addDay(1)->toString('Y-m-d H:i:s');
+                $whereBind[] = $dateEndString;
+            }
+        }
+
+        if (count($where) > 0) {
+            $where = join("
+				AND ", $where);
+        } else {
+            $where = false;
+        }
+        return array($whereBind, $where);
+    }
+} 
\ No newline at end of file
diff --git a/plugins/Live/Reports/GetLastVisitsDetails.php b/plugins/Live/Reports/GetLastVisitsDetails.php
index 9c2b4373e3..7d5318b588 100644
--- a/plugins/Live/Reports/GetLastVisitsDetails.php
+++ b/plugins/Live/Reports/GetLastVisitsDetails.php
@@ -27,6 +27,11 @@ class GetLastVisitsDetails extends Base
         return VisitorLog::ID;
     }
 
+    public function alwaysUseDefaultViewDataTable()
+    {
+        return true;
+    }
+
     public function configureReportingMenu(MenuReporting $menu)
     {
         if ($this->isEnabled()) {
diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php
index 5cbe823cd9..84f1ef8177 100644
--- a/plugins/Live/Visitor.php
+++ b/plugins/Live/Visitor.php
@@ -246,44 +246,11 @@ class Visitor implements VisitorInterface
     {
         $idVisit = $visitorDetailsArray['idVisit'];
 
-        $maxCustomVariables = CustomVariables::getMaxCustomVariables();
-
-        $sqlCustomVariables = '';
-        for ($i = 1; $i <= $maxCustomVariables; $i++) {
-            $sqlCustomVariables .= ', custom_var_k' . $i . ', custom_var_v' . $i;
-        }
-        // The second join is a LEFT join to allow returning records that don't have a matching page title
-        // eg. Downloads, Outlinks. For these, idaction_name is set to 0
-        $sql = "
-				SELECT
-					COALESCE(log_action_event_category.type, log_action.type, log_action_title.type) AS type,
-					log_action.name AS url,
-					log_action.url_prefix,
-					log_action_title.name AS pageTitle,
-					log_action.idaction AS pageIdAction,
-					log_link_visit_action.server_time as serverTimePretty,
-					log_link_visit_action.time_spent_ref_action as timeSpentRef,
-					log_link_visit_action.idlink_va AS pageId,
-					log_link_visit_action.custom_float
-					". $sqlCustomVariables . ",
-					log_action_event_category.name AS eventCategory,
-					log_action_event_action.name as eventAction
-				FROM " . Common::prefixTable('log_link_visit_action') . " AS log_link_visit_action
-					LEFT JOIN " . Common::prefixTable('log_action') . " AS log_action
-					ON  log_link_visit_action.idaction_url = log_action.idaction
-					LEFT JOIN " . Common::prefixTable('log_action') . " AS log_action_title
-					ON  log_link_visit_action.idaction_name = log_action_title.idaction
-					LEFT JOIN " . Common::prefixTable('log_action') . " AS log_action_event_category
-					ON  log_link_visit_action.idaction_event_category = log_action_event_category.idaction
-					LEFT JOIN " . Common::prefixTable('log_action') . " AS log_action_event_action
-					ON  log_link_visit_action.idaction_event_action = log_action_event_action.idaction
-				WHERE log_link_visit_action.idvisit = ?
-				ORDER BY server_time ASC
-				LIMIT 0, $actionsLimit
-				 ";
-        $actionDetails = Db::fetchAll($sql, array($idVisit));
+        $model = new Model();
+        $actionDetails = $model->queryActionsForVisit($idVisit, $actionsLimit);
 
         $formatter = new Formatter();
+        $maxCustomVariables = CustomVariables::getMaxCustomVariables();
 
         foreach ($actionDetails as $actionIdx => &$actionDetail) {
             $actionDetail =& $actionDetails[$actionIdx];
@@ -353,46 +320,9 @@ class Visitor implements VisitorInterface
         }
 
         // If the visitor converted a goal, we shall select all Goals
-        $sql = "
-				SELECT
-						'goal' as type,
-						goal.name as goalName,
-						goal.idgoal as goalId,
-						goal.revenue as revenue,
-						log_conversion.idlink_va as goalPageId,
-						log_conversion.server_time as serverTimePretty,
-						log_conversion.url as url
-				FROM " . Common::prefixTable('log_conversion') . " AS log_conversion
-				LEFT JOIN " . Common::prefixTable('goal') . " AS goal
-					ON (goal.idsite = log_conversion.idsite
-						AND
-						goal.idgoal = log_conversion.idgoal)
-					AND goal.deleted = 0
-				WHERE log_conversion.idvisit = ?
-					AND log_conversion.idgoal > 0
-                ORDER BY server_time ASC
-				LIMIT 0, $actionsLimit
-			";
-        $goalDetails = Db::fetchAll($sql, array($idVisit));
-
-        $sql = "SELECT
-						case idgoal when " . GoalManager::IDGOAL_CART . " then '" . Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART . "' else '" . Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER . "' end as type,
-						idorder as orderId,
-						" . LogAggregator::getSqlRevenue('revenue') . " as revenue,
-						" . LogAggregator::getSqlRevenue('revenue_subtotal') . " as revenueSubTotal,
-						" . LogAggregator::getSqlRevenue('revenue_tax') . " as revenueTax,
-						" . LogAggregator::getSqlRevenue('revenue_shipping') . " as revenueShipping,
-						" . LogAggregator::getSqlRevenue('revenue_discount') . " as revenueDiscount,
-						items as items,
-
-						log_conversion.server_time as serverTimePretty
-					FROM " . Common::prefixTable('log_conversion') . " AS log_conversion
-					WHERE idvisit = ?
-						AND idgoal <= " . GoalManager::IDGOAL_ORDER . "
-					ORDER BY server_time ASC
-					LIMIT 0, $actionsLimit";
-        $ecommerceDetails = Db::fetchAll($sql, array($idVisit));
+        $goalDetails = $model->queryGoalConversionsForVisit($idVisit, $actionsLimit);
 
+        $ecommerceDetails = $model->queryEcommerceConversionsForVisit($idVisit, $actionsLimit);
         foreach ($ecommerceDetails as &$ecommerceDetail) {
             if ($ecommerceDetail['type'] == Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART) {
                 unset($ecommerceDetail['orderId']);
@@ -415,30 +345,9 @@ class Visitor implements VisitorInterface
         // Enrich ecommerce carts/orders with the list of products
         usort($ecommerceDetails, array('static', 'sortByServerTime'));
         foreach ($ecommerceDetails as &$ecommerceConversion) {
-            $sql = "SELECT
-							log_action_sku.name as itemSKU,
-							log_action_name.name as itemName,
-							log_action_category.name as itemCategory,
-							" . LogAggregator::getSqlRevenue('price') . " as price,
-							quantity as quantity
-						FROM " . Common::prefixTable('log_conversion_item') . "
-							INNER JOIN " . Common::prefixTable('log_action') . " AS log_action_sku
-							ON  idaction_sku = log_action_sku.idaction
-							LEFT JOIN " . Common::prefixTable('log_action') . " AS log_action_name
-							ON  idaction_name = log_action_name.idaction
-							LEFT JOIN " . Common::prefixTable('log_action') . " AS log_action_category
-							ON idaction_category = log_action_category.idaction
-						WHERE idvisit = ?
-							AND idorder = ?
-							AND deleted = 0
-						LIMIT 0, $actionsLimit
-				";
-            $bind = array($idVisit, isset($ecommerceConversion['orderId'])
-                ? $ecommerceConversion['orderId']
-                : GoalManager::ITEM_IDORDER_ABANDONED_CART
-            );
-
-            $itemsDetails = Db::fetchAll($sql, $bind);
+            $idOrder = isset($ecommerceConversion['orderId']) ? $ecommerceConversion['orderId'] : GoalManager::ITEM_IDORDER_ABANDONED_CART;
+
+            $itemsDetails = $model->queryEcommerceItemsForOrder($idVisit, $idOrder, $actionsLimit);
             foreach ($itemsDetails as &$detail) {
                 if ($detail['price'] == round($detail['price'])) {
                     $detail['price'] = round($detail['price']);
@@ -451,6 +360,10 @@ class Visitor implements VisitorInterface
 
         usort($actions, array('static', 'sortByServerTime'));
 
+        foreach ($actions as &$action) {
+            unset($action['idlink_va']);
+        }
+
         $visitorDetailsArray['actionDetails'] = $actions;
         foreach ($visitorDetailsArray['actionDetails'] as &$details) {
             switch ($details['type']) {
@@ -485,6 +398,7 @@ class Visitor implements VisitorInterface
             // Convert datetimes to the site timezone
             $dateTimeVisit = Date::factory($details['serverTimePretty'], $timezone);
             $details['serverTimePretty'] = $dateTimeVisit->getLocalized(Piwik::translate('CoreHome_ShortDateFormat') . ' %time%');
+            $details['timestamp'] = $dateTimeVisit->getTimestamp();
         }
         $visitorDetailsArray['goalConversions'] = count($goalDetails);
         return $visitorDetailsArray;
@@ -506,10 +420,19 @@ class Visitor implements VisitorInterface
     {
         $ta = strtotime($a['serverTimePretty']);
         $tb = strtotime($b['serverTimePretty']);
-        return $ta < $tb
-            ? -1
-            : ($ta == $tb
-                ? 0
-                : 1);
+
+        if ($ta < $tb) {
+            return -1;
+        }
+
+        if ($ta == $tb) {
+            if ($a['idlink_va'] > $b['idlink_va']) {
+               return 1;
+            }
+
+            return -1;
+        }
+
+        return 1;
     }
 }
diff --git a/plugins/Live/VisitorLog.php b/plugins/Live/VisitorLog.php
index d3d93c2dd4..821873926d 100644
--- a/plugins/Live/VisitorLog.php
+++ b/plugins/Live/VisitorLog.php
@@ -74,6 +74,7 @@ class VisitorLog extends Visualization
         // set a very high row count so that the next link in the footer of the data table is always shown
         $this->config->custom_parameters['totalRows'] = 10000000;
         $this->config->custom_parameters['smallWidth'] = (1 == Common::getRequestVar('small', 0, 'int'));
+        $this->config->custom_parameters['hideProfileLink'] = (1 == Common::getRequestVar('hideProfileLink', 0, 'int'));
         $this->config->custom_parameters['pageUrlNotDefined'] = Piwik::translate('General_NotDefined', Piwik::translate('Actions_ColumnPageURL'));
 
         $this->config->footer_icons = array(
diff --git a/plugins/Live/VisitorProfile.php b/plugins/Live/VisitorProfile.php
new file mode 100644
index 0000000000..d52adbf076
--- /dev/null
+++ b/plugins/Live/VisitorProfile.php
@@ -0,0 +1,361 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\Live;
+
+use Exception;
+use Piwik\DataTable;
+use Piwik\Date;
+use Piwik\Metrics\Formatter;
+use Piwik\Piwik;
+use Piwik\Site;
+use Piwik\Plugins\Referrers\API as APIReferrers;
+
+class VisitorProfile
+{
+    const VISITOR_PROFILE_MAX_VISITS_TO_SHOW = 10;
+    const VISITOR_PROFILE_DATE_FORMAT = '%day% %shortMonth% %longYear%';
+
+    protected $profile = array();
+    private $siteSearchKeywords = array();
+    private $continents = array();
+    private $countries = array();
+    private $cities = array();
+    private $pageGenerationTimeTotal = 0;
+
+    public function __construct($idSite)
+    {
+        $this->idSite = $idSite;
+        $this->isEcommerceEnabled = Site::isEcommerceEnabledFor($this->idSite);
+    }
+
+    /**
+     * @param $visits
+     * @param $visitorId
+     * @param $segment
+     * @return array
+     * @throws Exception
+     */
+    public function makeVisitorProfile(DataTable $visits, $visitorId, $segment)
+    {
+        $this->initVisitorProfile();
+
+        /** @var DataTable\Row $visit */
+        foreach ($visits->getRows() as $visit) {
+            ++$this->profile['totalVisits'];
+
+            $this->profile['totalVisitDuration'] += $visit->getColumn('visitDuration');
+            $this->profile['totalActions'] += $visit->getColumn('actions');
+            $this->profile['totalGoalConversions'] += $visit->getColumn('goalConversions');
+
+            // individual goal conversions are stored in action details
+            foreach ($visit->getColumn('actionDetails') as $action) {
+                $this->handleIfGoalAction($action);
+                $this->handleIfEcommerceAction($action);
+                $this->handleIfSiteSearchAction($action);
+                $this->handleIfPageGenerationTime($action);
+            }
+            $this->handleGeoLocation($visit);
+        }
+
+        $this->handleGeoLocationCountries();
+        $this->handleGeoLocationContinents();
+        $this->handleSiteSearches();
+        $this->handleAveragePageGenerationTime();
+
+        $formatter = new Formatter();
+        $this->profile['totalVisitDurationPretty'] = $formatter->getPrettyTimeFromSeconds($this->profile['totalVisitDuration'], true);
+
+        $this->handleVisitsSummary($visits);
+        $this->handleAdjacentVisitorIds($visits, $visitorId, $segment);
+
+        // use N most recent visits for last_visits
+        $visits->deleteRowsOffset(self::VISITOR_PROFILE_MAX_VISITS_TO_SHOW);
+
+        $this->enrichVisitsWithFirstActionDatetime($visits);
+
+        $this->profile['lastVisits'] = $visits;
+
+        $this->profile['userId'] = $visit->getColumn('userId');
+
+        return $this->profile;
+    }
+
+    /**
+     * Returns a summary for an important visit. Used to describe the first & last visits of a visitor.
+     *
+     * @param DataTable\Row $visit
+     * @return array
+     */
+    private function getVisitorProfileVisitSummary($visit)
+    {
+        $today = Date::today();
+
+        $serverDate = $visit->getColumn('firstActionTimestamp');
+        return array(
+            'date'            => $serverDate,
+            'prettyDate'      => Date::factory($serverDate)->getLocalized(self::VISITOR_PROFILE_DATE_FORMAT),
+            'daysAgo'         => (int)Date::secondsToDays($today->getTimestamp() - Date::factory($serverDate)->getTimestamp()),
+            'referrerType'    => $visit->getColumn('referrerType'),
+            'referralSummary' => self::getReferrerSummaryForVisit($visit),
+        );
+    }
+
+
+    /**
+     * Returns a summary for a visit's referral.
+     *
+     * @param DataTable\Row $visit
+     * @return bool|mixed|string
+     */
+    public static function getReferrerSummaryForVisit($visit)
+    {
+        $referrerType = $visit->getColumn('referrerType');
+        if ($referrerType === false
+            || $referrerType == 'direct'
+        ) {
+            return Piwik::translate('Referrers_DirectEntry');
+        }
+
+        if ($referrerType == 'search') {
+            $referrerName = $visit->getColumn('referrerName');
+
+            $keyword = $visit->getColumn('referrerKeyword');
+            if ($keyword !== false
+                && $keyword != APIReferrers::getKeywordNotDefinedString()
+            ) {
+                $referrerName .= ' (' . $keyword . ')';
+            }
+            return $referrerName;
+        }
+
+        if ($referrerType == 'campaign') {
+            return Piwik::translate('Referrers_ColumnCampaign') . ' (' . $visit->getColumn('referrerName') . ')';
+        }
+
+        return $visit->getColumn('referrerName');
+    }
+
+    private function isEcommerceEnabled()
+    {
+        return $this->isEcommerceEnabled;
+    }
+
+    /**
+     * @param $action
+     */
+    private function handleIfEcommerceAction($action)
+    {
+        if (!$this->isEcommerceEnabled()) {
+            return;
+        }
+        if ($action['type'] == Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER) {
+            ++$this->profile['totalEcommerceConversions'];
+            $this->profile['totalEcommerceRevenue'] += $action['revenue'];
+            $this->profile['totalEcommerceItems'] += $action['items'];
+        } else if ($action['type'] == Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART) {
+            ++$this->profile['totalAbandonedCarts'];
+            $this->profile['totalAbandonedCartsRevenue'] += $action['revenue'];
+            $this->profile['totalAbandonedCartsItems'] += $action['items'];
+        }
+    }
+
+    private function handleIfGoalAction($action)
+    {
+        if ($action['type'] != 'goal') {
+            return;
+        }
+        $idGoal = $action['goalId'];
+        $idGoalKey = 'idgoal=' . $idGoal;
+
+        if (!isset($this->profile['totalConversionsByGoal'][$idGoalKey])) {
+            $this->profile['totalConversionsByGoal'][$idGoalKey] = 0;
+        }
+        ++$this->profile['totalConversionsByGoal'][$idGoalKey];
+
+        if (!empty($action['revenue'])) {
+            if (!isset($this->profile['totalRevenueByGoal'][$idGoalKey])) {
+                $this->profile['totalRevenueByGoal'][$idGoalKey] = 0;
+            }
+            $this->profile['totalRevenueByGoal'][$idGoalKey] += $action['revenue'];
+        }
+    }
+
+    private function handleIfSiteSearchAction($action)
+    {
+        if (!isset($action['siteSearchKeyword'])) {
+            return;
+        }
+        $keyword = $action['siteSearchKeyword'];
+
+        if (!isset($this->siteSearchKeywords[$keyword])) {
+            $this->siteSearchKeywords[$keyword] = 0;
+            ++$this->profile['totalSearches'];
+        }
+        ++$this->siteSearchKeywords[$keyword];
+    }
+
+    private function handleGeoLocation(DataTable\Row $visit)
+    {
+        // realtime map only checks for latitude
+        $hasLatitude = $visit->getColumn('latitude') !== false;
+        if ($hasLatitude) {
+            $this->profile['hasLatLong'] = true;
+        }
+
+        $countryCode = $visit->getColumn('countryCode');
+        if (!isset($this->countries[$countryCode])) {
+            $this->countries[$countryCode] = 0;
+        }
+        ++$this->countries[$countryCode];
+
+        $continentCode = $visit->getColumn('continentCode');
+        if (!isset($this->continents[$continentCode])) {
+            $this->continents[$continentCode] = 0;
+        }
+        ++$this->continents[$continentCode];
+
+        if ($countryCode && !array_key_exists($countryCode, $this->cities)) {
+            $this->cities[$countryCode] = array();
+        }
+        $city = $visit->getColumn('city');
+        if (!empty($city)) {
+            $this->cities[$countryCode][] = $city;
+        }
+    }
+
+    private function handleSiteSearches()
+    {
+        // sort by visit/action
+        arsort($this->siteSearchKeywords);
+
+        foreach ($this->siteSearchKeywords as $keyword => $searchCount) {
+            $this->profile['searches'][] = array('keyword' => $keyword,
+                'searches' => $searchCount);
+        }
+    }
+
+    private function handleGeoLocationContinents()
+    {
+        // sort by visit/action
+        asort($this->continents);
+        foreach ($this->continents as $continentCode => $nbVisits) {
+            $this->profile['continents'][] = array('continent' => $continentCode,
+                'nb_visits' => $nbVisits,
+                'prettyName' => \Piwik\Plugins\UserCountry\continentTranslate($continentCode));
+        }
+    }
+
+    private function handleGeoLocationCountries()
+    {
+        // sort by visit/action
+        asort($this->countries);
+
+        // transform country/continents/search keywords into something that will look good in XML
+        $this->profile['countries'] = $this->profile['continents'] = $this->profile['searches'] = array();
+
+        foreach ($this->countries as $countryCode => $nbVisits) {
+
+            $countryInfo = array('country' => $countryCode,
+                'nb_visits' => $nbVisits,
+                'flag' => \Piwik\Plugins\UserCountry\getFlagFromCode($countryCode),
+                'prettyName' => \Piwik\Plugins\UserCountry\countryTranslate($countryCode));
+            if (!empty($this->cities[$countryCode])) {
+                $countryInfo['cities'] = array_unique($this->cities[$countryCode]);
+            }
+            $this->profile['countries'][] = $countryInfo;
+        }
+    }
+
+    private function initVisitorProfile()
+    {
+        $this->profile['totalVisits'] = 0;
+        $this->profile['totalVisitDuration'] = 0;
+        $this->profile['totalActions'] = 0;
+        $this->profile['totalSearches'] = 0;
+        $this->profile['totalPageViewsWithTiming'] = 0;
+        $this->profile['totalGoalConversions'] = 0;
+        $this->profile['totalConversionsByGoal'] = array();
+        $this->profile['hasLatLong'] = false;
+
+        if ($this->isEcommerceEnabled()) {
+            $this->profile['totalEcommerceConversions'] = 0;
+            $this->profile['totalEcommerceRevenue'] = 0;
+            $this->profile['totalEcommerceItems'] = 0;
+            $this->profile['totalAbandonedCarts'] = 0;
+            $this->profile['totalAbandonedCartsRevenue'] = 0;
+            $this->profile['totalAbandonedCartsItems'] = 0;
+        }
+    }
+
+    private function handleAveragePageGenerationTime()
+    {
+        if ($this->profile['totalPageViewsWithTiming']) {
+            $this->profile['averagePageGenerationTime'] =
+                round($this->pageGenerationTimeTotal / $this->profile['totalPageViewsWithTiming'], $precision = 2);
+        }
+    }
+
+    private function handleIfPageGenerationTime($action)
+    {
+        if (isset($action['generationTime'])) {
+            $this->pageGenerationTimeTotal += $action['generationTime'];
+            ++$this->profile['totalPageViewsWithTiming'];
+        }
+    }
+
+    /**
+     * @param DataTable $visits
+     * @param $visitorId
+     * @param $segment
+     */
+    private function handleAdjacentVisitorIds(DataTable $visits, $visitorId, $segment)
+    {
+        // get visitor IDs that are adjacent to this one in log_visit
+        // TODO: make sure order of visitor ids is not changed if a returning visitor visits while the user is
+        //       looking at the popup.
+        $rows = $visits->getRows();
+        $latestVisitTime = reset($rows)->getColumn('lastActionDateTime');
+
+        $model = new Model();
+        $this->profile['nextVisitorId'] = $model->queryAdjacentVisitorId($this->idSite, $visitorId, $latestVisitTime, $segment, $getNext = true);
+        $this->profile['previousVisitorId'] = $model->queryAdjacentVisitorId($this->idSite, $visitorId, $latestVisitTime, $segment, $getNext = false);
+    }
+
+    /**
+     * @param DataTable $visits
+     */
+    private function handleVisitsSummary(DataTable $visits)
+    {
+        $rows = $visits->getRows();
+        $this->profile['firstVisit'] = $this->getVisitorProfileVisitSummary(end($rows));
+        $this->profile['lastVisit'] = $this->getVisitorProfileVisitSummary(reset($rows));
+        $this->profile['visitsAggregated'] = count($rows);
+    }
+
+    /**
+     * @param DataTable $visits
+     * @return DataTable\Row
+     * @throws Exception
+     */
+    private function enrichVisitsWithFirstActionDatetime(DataTable $visits)
+    {
+        $timezone = Site::getTimezoneFor($this->idSite);
+        foreach ($visits->getRows() as $visit) {
+            $dateTimeVisitFirstAction = Date::factory($visit->getColumn('firstActionTimestamp'), $timezone);
+
+            $datePretty = $dateTimeVisitFirstAction->getLocalized(self::VISITOR_PROFILE_DATE_FORMAT);
+            $visit->setColumn('serverDatePrettyFirstAction', $datePretty);
+
+            $dateTimePretty = $datePretty . ' ' . $visit->getColumn('serverTimePrettyFirstAction');
+            $visit->setColumn('serverDateTimePrettyFirstAction', $dateTimePretty);
+        }
+    }
+
+} 
\ No newline at end of file
diff --git a/plugins/Live/images/visitorlog-hover.png b/plugins/Live/images/visitorlog-hover.png
new file mode 100644
index 0000000000..523a8ac6b4
--- /dev/null
+++ b/plugins/Live/images/visitorlog-hover.png
diff --git a/plugins/Live/images/visitorlog.png b/plugins/Live/images/visitorlog.png
new file mode 100644
index 0000000000..423392db75
--- /dev/null
+++ b/plugins/Live/images/visitorlog.png
diff --git a/plugins/Live/javascripts/rowaction.js b/plugins/Live/javascripts/rowaction.js
new file mode 100644
index 0000000000..8baba18a2d
--- /dev/null
+++ b/plugins/Live/javascripts/rowaction.js
@@ -0,0 +1,268 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+/**
+ * This file registers the Overlay row action on the pages report.
+ */
+
+(function () {
+    
+    var actionName = 'SegmentVisitorLog';
+
+    function getLabelFromTr ($tr, apiMethod) {
+        var label;
+
+        if (apiMethod && 0 === apiMethod.indexOf('Actions.')) {
+            // for now only use this for Actions... I know a hack :( Otherwise in Search Engines
+            // it would show "http://www.searchenginename.org" instead of "SearchEngineName"
+            label = $tr.attr('data-url-label');
+        }
+
+        if (!label) {
+            label = $tr.find('.label .value').text();
+        }
+
+        if (label) {
+            label = $.trim(label);
+        }
+
+        return label;
+    }
+
+    function getRawSegmentValueFromRow(tr)
+    {
+        return $(tr).attr('data-segment-filter');
+    }
+
+    function findTitleOfRowHavingRawSegmentValue(apiMethod, rawSegmentValue)
+    {
+        var $tr = $('[data-report="' + apiMethod + '"] tr[data-segment-filter="' + rawSegmentValue + '"]').first();
+
+        return getLabelFromTr($tr, apiMethod);
+    }
+
+    function getDataTableFromApiMethod(apiMethod)
+    {
+        var div = $(require('piwik/UI').DataTable.getDataTableByReport(apiMethod));
+        if (div.size() > 0 && div.data('uiControlObject')) {
+            return div.data('uiControlObject');
+        }
+    }
+
+    function getMetadataFromDataTable(dataTable)
+    {
+        if (dataTable) {
+
+            return dataTable.getReportMetadata();
+        }
+    }
+
+    function getDimensionFromApiMethod(apiMethod)
+    {
+        if (!apiMethod) {
+            return;
+        }
+
+        var dataTable = getDataTableFromApiMethod(apiMethod);
+        var metadata  = getMetadataFromDataTable(dataTable);
+
+        if (metadata && metadata.dimension) {
+            return metadata.dimension;
+        }
+    }
+
+    function DataTable_RowActions_SegmentVisitorLog(dataTable) {
+        this.dataTable = dataTable;
+        this.actionName = actionName;
+
+        // has to be overridden in subclasses
+        this.trEventName = 'piwikTriggerSegmentVisitorLogAction';
+
+        this.segmentComparison = '==';
+    }
+
+    DataTable_RowActions_SegmentVisitorLog.prototype = new DataTable_RowAction();
+
+    DataTable_RowActions_SegmentVisitorLog.prototype.openPopover = function (apiMethod, segment, extraParams) {
+        var urlParam = apiMethod + ':' + encodeURIComponent(segment) + ':' + encodeURIComponent(JSON.stringify(extraParams));
+
+        broadcast.propagateNewPopoverParameter('RowAction', actionName + ':' + urlParam);
+    };
+
+    DataTable_RowActions_SegmentVisitorLog.prototype.trigger = function (tr, e, subTableLabel) {
+        var segment = getRawSegmentValueFromRow(tr);
+
+        this.performAction(segment, tr, e);
+    };
+
+    DataTable_RowActions_SegmentVisitorLog.prototype.performAction = function (segment, tr, e) {
+
+        var apiMethod = this.dataTable.param.module + '.' + this.dataTable.param.action;
+
+        this.openPopover(apiMethod, segment, {});
+    };
+
+    DataTable_RowActions_SegmentVisitorLog.prototype.doOpenPopover = function (urlParam) {
+        var urlParamParts = urlParam.split(':');
+
+        var apiMethod = urlParamParts.shift();
+        var segment = decodeURIComponent(urlParamParts.shift());
+
+        var extraParamsString = urlParamParts.shift(),
+            extraParams = {}; // 0/1 or "0"/"1"
+
+        try {
+            extraParams = JSON.parse(decodeURIComponent(extraParamsString));
+        } catch (e) {
+            // assume the parameter is an int/string describing whether to use multi row evolution
+        }
+
+        this.showVisitorLog(apiMethod, segment, extraParams);
+    };
+
+    DataTable_RowActions_SegmentVisitorLog.prototype.showVisitorLog = function (apiMethod, segment, extraParams) {
+
+        var self = this;
+
+        // open the popover
+        var box = Piwik_Popover.showLoading('Segmented Visitor Log');
+        box.addClass('segmentedVisitorLogPopover');
+
+        function setPopoverTitle(apiMethod, index)
+        {
+            var dataTable = getDataTableFromApiMethod(apiMethod);
+
+            if (!dataTable) {
+                if (index < 15) {
+                    // this is needed when the popover is opened before the dataTable is there which can often
+                    // happen when opening the popover directly via URL (broadcast.popoverHandler)
+                    setTimeout(function () {
+                        setPopoverTitle(apiMethod, index + 1);
+                    }, 150);
+                }
+                return;
+            }
+
+            var segmentName  = getDimensionFromApiMethod(apiMethod);
+            var segmentValue = findTitleOfRowHavingRawSegmentValue(apiMethod, segment);
+
+            segmentName  = piwikHelper.escape(segmentName);
+            segmentName  = piwikHelper.htmlEntities(segmentName);
+            segmentValue = piwikHelper.escape(segmentValue);
+            segmentValue = piwikHelper.htmlEntities(segmentValue);
+            segmentName  = segmentName.replace(/(&amp;)(#[0-9]{2,5};)/g, '&$2')
+            segmentValue = segmentValue.replace(/(&amp;)(#[0-9]{2,5};)/g, '&$2')
+
+            var title = _pk_translate('Live_SegmentedVisitorLogTitle', [segmentName, segmentValue]);
+
+            Piwik_Popover.setTitle(title);
+        }
+
+        var callback = function (html) {
+            Piwik_Popover.setContent(html);
+
+            // remove title returned from the server
+            var title = box.find('h2[piwik-enriched-headline]');
+            var defaultTitle = title.text();
+
+            if (title.size() > 0) {
+                title.remove();
+            }
+
+            Piwik_Popover.setTitle(defaultTitle);
+
+            setPopoverTitle(apiMethod, 0);
+        };
+
+        // prepare loading the popover contents
+        var requestParams = {
+            module: 'Live',
+            action: 'indexVisitorLog',
+            segment: segment,
+            disableLink: 1,
+            small: 1,
+            hideProfileLink: 1
+        };
+
+        $.extend(requestParams, extraParams);
+
+        var ajaxRequest = new ajaxHelper();
+        ajaxRequest.addParams(requestParams, 'get');
+        ajaxRequest.setCallback(callback);
+        ajaxRequest.setFormat('html');
+        ajaxRequest.send(false);
+    };
+
+    DataTable_RowActions_Registry.register({
+
+        name: actionName,
+
+        dataTableIcon: 'plugins/Live/images/visitorlog.png',
+        dataTableIconHover: 'plugins/Live/images/visitorlog-hover.png',
+
+        order: 30,
+
+        dataTableIconTooltip: [
+            _pk_translate('Live_RowActionTooltipTitle'),
+            _pk_translate('Live_RowActionTooltipDefault')
+        ],
+
+        isAvailableOnReport: function (dataTableParams, undefined) {
+            return true;
+        },
+
+        isAvailableOnRow: function (dataTableParams, tr) {
+            var value = getRawSegmentValueFromRow(tr)
+            if ('undefined' === (typeof value)) {
+                return false;
+            }
+
+            var reportTitle = null;
+
+            var apiMethod = $(tr).parents('div.dataTable').last().attr('data-report');
+            var dimension = getDimensionFromApiMethod(apiMethod);
+
+            if (dimension) {
+                reportTitle = _pk_translate('Live_RowActionTooltipWithDimension', [dimension])
+            } else {
+                reportTitle = _pk_translate('Live_RowActionTooltipDefault');
+            }
+
+            this.dataTableIconTooltip[1] = reportTitle;
+
+            return true;
+        },
+
+        createInstance: function (dataTable, param) {
+            if (dataTable !== null && typeof dataTable.segmentVisitorLogInstance != 'undefined') {
+                return dataTable.segmentVisitorLogInstance;
+            }
+
+            if (dataTable === null && param) {
+                // when segmented visitor log is triggered from the url (not a click on the data table)
+                // we look for the data table instance in the dom
+                var report = param.split(':')[0];
+                var tempTable = getDataTableFromApiMethod(report);
+                if (tempTable) {
+                    dataTable = tempTable;
+                    if (typeof dataTable.segmentVisitorLogInstance != 'undefined') {
+                        return dataTable.segmentVisitorLogInstance;
+                    }
+                }
+            }
+
+            var instance = new DataTable_RowActions_SegmentVisitorLog(dataTable);
+            if (dataTable !== null) {
+                dataTable.segmentVisitorLogInstance = instance;
+            }
+
+            return instance;
+        }
+
+    });
+
+})();
\ No newline at end of file
diff --git a/plugins/Live/lang/ar.json b/plugins/Live/lang/ar.json
index c9243d8414..00912435d0 100644
--- a/plugins/Live/lang/ar.json
+++ b/plugins/Live/lang/ar.json
@@ -5,7 +5,6 @@
         "LastHours": "آخر %s ساعة",
         "LastMinutes": "آخر %s دقيقة",
         "LinkVisitorLog": "مشاهدة سجل تفصيلي للزائر",
-        "PluginDescription": "تابع وتجسس على زوارك مباشر وفي الوقت الحقيقي!",
         "Referrer_URL": "جاء من",
         "VisitorLog": "سجل الزائر",
         "VisitorsInRealTime": "الزوار في الوقت الحقيقي"
diff --git a/plugins/Live/lang/be.json b/plugins/Live/lang/be.json
index a102dafa0b..7746b4ec90 100644
--- a/plugins/Live/lang/be.json
+++ b/plugins/Live/lang/be.json
@@ -5,7 +5,6 @@
         "LastHours": "Апошніх %s гадзін",
         "LastMinutes": "Апошніх %s хвілін",
         "LinkVisitorLog": "Паглядзець падрабязны запіс наведвальнікаў",
-        "PluginDescription": "Сачыце за наведвальнікамі, у рэжыме рэальнага часу!",
         "Referrer_URL": "URL спасыльніка",
         "VisitorLog": "Запіс наведвальнікаў",
         "VisitorLogDocumentation": "Гэтая табліца паказвае апошнія наведванні ў межах выбранага дыяпазону дат. %s Калі дыяпазон дат ўключае ў сябе сёння, то вы можаце ўбачыць вашых наведвальнікаў у рэжыме рэальнага часу! %s Дадзеныя, якія адлюстроўваюцца тут заўсёды \"жывыя\", незалежна ад таго, і як часта вы карыстаецеся cron архіваваннем.",
diff --git a/plugins/Live/lang/bg.json b/plugins/Live/lang/bg.json
index eced458f3b..97e23787e3 100644
--- a/plugins/Live/lang/bg.json
+++ b/plugins/Live/lang/bg.json
@@ -18,7 +18,6 @@
         "NextVisitor": "Следващ посетител",
         "NoMoreVisits": "Няма повече посещения за този посетител.",
         "PageRefreshed": "Броят пъти, които тази страница е гледана \/ обновена в ред.",
-        "PluginDescription": "Следете Вашите посетители, на живо, в реално време!",
         "PreviousVisitor": "Предишен посетител",
         "RealTimeVisitorCount": "Броене на посетителите в реално време",
         "Referrer_URL": "URL Референции",
diff --git a/plugins/Live/lang/ca.json b/plugins/Live/lang/ca.json
index c35fc0b421..8fd7d2f561 100644
--- a/plugins/Live/lang/ca.json
+++ b/plugins/Live/lang/ca.json
@@ -7,7 +7,6 @@
         "LinkVisitorLog": "Veure registre detallat del visitant",
         "MorePagesNotDisplayed": "No es mostre més pàgines per aquest visitant",
         "PageRefreshed": "Nombre de vegades que s'ha vist\/refrescat una pàgina",
-        "PluginDescription": "Mireu els vostres visitants en temps real!",
         "Referrer_URL": "URL del referent",
         "VisitorLog": "Registre de visitants",
         "VisitorLogDocumentation": "Aquesta taula mostra les últimes visites pel període de temps seleccionat. Podeu veure quan s'ha produït l'últim accès d'un visitant pasant per damunt de la data de visita. %s Si el període de temps inclou avui, podeu veure els visitants en temps real! %s La informació que es mostra és sempre en directa, sense dependre de cada quan executeu el treball programat d'arxivat.",
diff --git a/plugins/Live/lang/cs.json b/plugins/Live/lang/cs.json
index 90799cd357..e61ccd1f42 100644
--- a/plugins/Live/lang/cs.json
+++ b/plugins/Live/lang/cs.json
@@ -21,10 +21,14 @@
         "NextVisitor": "Další návštěvník",
         "NoMoreVisits": "Pro tohoto návštěvníka už nejsou k dispozici další návštěvy.",
         "PageRefreshed": "Počet po sobě jdoucích zobrazení\/obnovení stránky",
-        "PluginDescription": "Sledujte Vaše uživatele živě v reálném čase",
+        "PluginDescription": "Poskytuje živý záznam návštěvníků a ve widgetu na nástěnce vám umožňuje ho sledovat živě v reálném čase. Zásuvný modul také umožňuje zobrazit profil pro každého návštěvníka.",
         "PreviousVisitor": "Předchozí návštěvník",
         "RealTimeVisitorCount": "Počet návštěvníků v reálném čase",
         "Referrer_URL": "Odkazující URL",
+        "RowActionTooltipDefault": "Zobrazit záznam návštěvníků rozdělený podle tohoto řádku",
+        "RowActionTooltipTitle": "Otevřít rozdělený záznam návštěvníků",
+        "RowActionTooltipWithDimension": "Zobrazit záznam návštěvníků rozdělený podle %s",
+        "SegmentedVisitorLogTitle": "Záznam návštěvníků zobrazuje návštěvy, kde %s je \\\"%s\\\"",
         "ShowMap": "Zobrazit mapu",
         "SimpleRealTimeWidget_Message": "%s a %s v posledních %s.",
         "ViewVisitorProfile": "Zobrazit profil návštěvníka",
diff --git a/plugins/Live/lang/da.json b/plugins/Live/lang/da.json
index f2019edf12..d9cfd462cc 100644
--- a/plugins/Live/lang/da.json
+++ b/plugins/Live/lang/da.json
@@ -21,7 +21,6 @@
         "NextVisitor": "Næste besøgende",
         "NoMoreVisits": "Der er ikke flere besøg fra denne besøgende.",
         "PageRefreshed": "Antal gange siden er blevet vist \/ opdateret i træk.",
-        "PluginDescription": "Besøgende her og nu!",
         "PreviousVisitor": "Forrige besøgende",
         "RealTimeVisitorCount": "Tidstro besøgsantal",
         "Referrer_URL": "Henvisning netadresse",
diff --git a/plugins/Live/lang/de.json b/plugins/Live/lang/de.json
index 2b150c9da0..a547492428 100644
--- a/plugins/Live/lang/de.json
+++ b/plugins/Live/lang/de.json
@@ -21,10 +21,14 @@
         "NextVisitor": "Nächster Besucher",
         "NoMoreVisits": "Für diesen Besucher sind keine weiteren Besuche vorhanden.",
         "PageRefreshed": "Die Anzahl wie oft diese Seite hintereinander angeschaut\/aktualisiert worden ist.",
-        "PluginDescription": "Überwacht Ihre Besucher, live und in Echtzeit können Sie die Besucher auf Ihrer Webseite beobachten",
+        "PluginDescription": "Unterstützt den Live Besucher-Log und lässt Sie Ihre Besucher live im Echtzeit-Dashboard-Widget anzeigen. Das Plugin lässt Sie auch ein Besucherprofil für einen vorgegebenen Benutzer anzeigen.",
         "PreviousVisitor": "Vorheriger Besucher",
         "RealTimeVisitorCount": "Echtzeit-Besucherzähler",
         "Referrer_URL": "Herkunftsseite",
+        "RowActionTooltipDefault": "Zeige Besucher-Log aufgeteilt durch diese Zeile",
+        "RowActionTooltipTitle": "Log segmentierter Besucher öffnen",
+        "RowActionTooltipWithDimension": "Zeige Besucher-Log segmentiert durch %s",
+        "SegmentedVisitorLogTitle": "Besucher-Log zeigt Besuche bei denen gilt: %s ist \\\"%s\\\"",
         "ShowMap": "Karte einblenden",
         "SimpleRealTimeWidget_Message": "%s und %s in den letzten %s.",
         "ViewVisitorProfile": "Besucherprofil ansehen",
diff --git a/plugins/Live/lang/el.json b/plugins/Live/lang/el.json
index e7f67ab57f..bf2230d3d3 100644
--- a/plugins/Live/lang/el.json
+++ b/plugins/Live/lang/el.json
@@ -21,10 +21,14 @@
         "NextVisitor": "Επόμενος επισκέπτης",
         "NoMoreVisits": "Δεν υπάρχουν άλλες επισκέψεις για αυτόν τον επισκέπτη.",
         "PageRefreshed": "Φορές που η σελίδα προβλήθηκε \/ ανανεώθηκε στη σειρά.",
-        "PluginDescription": "Κατασκοπεύστε τους επισκέπτες σας, ζωντανά και σε πραγματικό χρόνο!",
+        "PluginDescription": "Παρέχει ζωντανό Ημερολόγιο Επισκεπτών και επιτρέπει να παρακολουθείτε τους επισκέπτες στο γραφικό συστατικό πραγματικού χρόνου του πίνακα. Το πρόσθετο επίσης επιτρέπει να δείτε οποιοδήποτε προφίλ Επισκέπτη για οποιοδήποτε χρήστη.",
         "PreviousVisitor": "Προηγούμενος επισκέπτης",
         "RealTimeVisitorCount": "Αριθμός επισκεπτών σε πραγματικό χρόνο",
         "Referrer_URL": "Διεύθυνση URL παραπομπού",
+        "RowActionTooltipDefault": "Εμφάνιση του Ημερολογίου Επισκεπτών κατατμημένο σε αυτή τη γραμμή",
+        "RowActionTooltipTitle": "Άνοιγμα κατετμημένου Ημερολογίου Επισκεπτών",
+        "RowActionTooltipWithDimension": "Εμφάνιση του Ημερολογίου Επισκεπτών κατατμημένο με αυτό το %s",
+        "SegmentedVisitorLogTitle": "Το Ημερολόγιο Επισκεπτών εμφανίζει επισκέψεις όπου το %s είναι \\\"%s\\\"",
         "ShowMap": "εμφάνιση χάρτη",
         "SimpleRealTimeWidget_Message": "%s και %s στα τελευταία %s.",
         "ViewVisitorProfile": "Εμφάνιση του προφίλ επισκέπτη",
diff --git a/plugins/Live/lang/en.json b/plugins/Live/lang/en.json
index 6a40a35ded..9ae4fd7a14 100644
--- a/plugins/Live/lang/en.json
+++ b/plugins/Live/lang/en.json
@@ -21,7 +21,7 @@
         "NextVisitor": "Next visitor",
         "NoMoreVisits": "There are no more visits for this visitor.",
         "PageRefreshed": "Number of times this page was viewed \/ refreshed in a row.",
-        "PluginDescription": "Watch your visitors live in real-time!",
+        "PluginDescription": "Provides the live Visitor Log and lets you watch your visitors live in the real-time dashboard widget. The plugin also lets you see a Visitor profile for any given user.",
         "PreviousVisitor": "Previous visitor",
         "RealTimeVisitorCount": "Real Time Visitor Count",
         "Referrer_URL": "Referrer URL",
@@ -35,6 +35,10 @@
         "VisitorsInRealTime": "Visitors in Real-time",
         "VisitorsLastVisit": "This visitor's last visit was %s days ago.",
         "VisitsFrom": "%1$s%2$s visits%3$s from",
-        "VisitSummary": "Spent a total of %1$s%2$s on the website%3$s, and %4$sviewed %5$s pages in %6$s visits.%7$s"
+        "VisitSummary": "Spent a total of %1$s%2$s on the website%3$s, and %4$sviewed %5$s pages in %6$s visits.%7$s",
+        "RowActionTooltipDefault": "Show Visitor Log segmented by this row",
+        "RowActionTooltipWithDimension": "Show Visitor Log segmented by this %s",
+        "RowActionTooltipTitle": "Open segmented Visitor Log",
+        "SegmentedVisitorLogTitle": "Visitor Log showing visits where %s is \"%s\""
     }
 }
\ No newline at end of file
diff --git a/plugins/Live/lang/es.json b/plugins/Live/lang/es.json
index cbf5df7eb0..64d16b9245 100644
--- a/plugins/Live/lang/es.json
+++ b/plugins/Live/lang/es.json
@@ -21,7 +21,6 @@
         "NextVisitor": "Siguiente visitante",
         "NoMoreVisits": "No hay más visitas de este visitante.",
         "PageRefreshed": "Número de veces que esta página ha sido vista \/ refrescada en una fila",
-        "PluginDescription": "Espiar a tus visitantes, en vivo, en tiempo real!",
         "PreviousVisitor": "Visitante anterior",
         "RealTimeVisitorCount": "Tiempo Real Contador de Visitantes",
         "Referrer_URL": "URL de referencia",
diff --git a/plugins/Live/lang/et.json b/plugins/Live/lang/et.json
index 3d45763f00..d5543f23db 100644
--- a/plugins/Live/lang/et.json
+++ b/plugins/Live/lang/et.json
@@ -18,7 +18,6 @@
         "NextVisitor": "Järgmine külastaja",
         "NoMoreVisits": "Antud külastajalt rohkem külastusi ei leitud.",
         "PageRefreshed": "Arv, mitu korda antud lehte vaadati \/ värskendati järjest",
-        "PluginDescription": "Kuva oma külastused reaal-ajas!",
         "PreviousVisitor": "Eelmine külastaja",
         "RealTimeVisitorCount": "Reaalajas külastuste arv",
         "Referrer_URL": "Viitaja URL",
diff --git a/plugins/Live/lang/fa.json b/plugins/Live/lang/fa.json
index b451d71f73..0fd46235fe 100644
--- a/plugins/Live/lang/fa.json
+++ b/plugins/Live/lang/fa.json
@@ -18,7 +18,6 @@
         "NextVisitor": "دیدن کننده بعدی",
         "NoMoreVisits": "این بازدید کننده، بازدید دیگری نداشته است.",
         "PageRefreshed": "تعداد بار این صفحه \/ مشاهده شده در یک ردیف تجدید شد.",
-        "PluginDescription": "!نظارت بر روی بازدید کنندگان خود را، زنده، در زمان واقعی!",
         "PreviousVisitor": "دیدن کننده قبلی",
         "RealTimeVisitorCount": "زمان واقعی تعداد بازدید کنندگان",
         "Referrer_URL": "URL بازگشتی",
diff --git a/plugins/Live/lang/fi.json b/plugins/Live/lang/fi.json
index 746f4114a8..3d68a9466b 100644
--- a/plugins/Live/lang/fi.json
+++ b/plugins/Live/lang/fi.json
@@ -21,7 +21,6 @@
         "NextVisitor": "Seuraava kävijä",
         "NoMoreVisits": "Ei enempää käyntejä tälle kävijälle.",
         "PageRefreshed": "Montako kertaa tätä sivua katsottiin \/ päivitettiin peräkkäin.",
-        "PluginDescription": "Vakoile kävijöitäsi reaaliaikaisesti!",
         "PreviousVisitor": "Edellinen kävijä",
         "RealTimeVisitorCount": "Reaaliaikainen kävijälaskuri",
         "Referrer_URL": "Saapumisosoite",
diff --git a/plugins/Live/lang/fr.json b/plugins/Live/lang/fr.json
index 80e9d2c65a..fa410b92cd 100644
--- a/plugins/Live/lang/fr.json
+++ b/plugins/Live/lang/fr.json
@@ -21,7 +21,6 @@
         "NextVisitor": "Visiteur suivant",
         "NoMoreVisits": "Il n'y a pas d'autres visites pour ce visiteur.",
         "PageRefreshed": "Nombre de fois où cette page a été vue \/ rafraîchie d'affilée.",
-        "PluginDescription": "Espionnez vos visiteurs, en temps réel!",
         "PreviousVisitor": "Visiteur précédent",
         "RealTimeVisitorCount": "Décompte des visiteurs en temps réel",
         "Referrer_URL": "URL du référent",
diff --git a/plugins/Live/lang/hi.json b/plugins/Live/lang/hi.json
index 6e47fd373f..3ac0210a14 100644
--- a/plugins/Live/lang/hi.json
+++ b/plugins/Live/lang/hi.json
@@ -13,7 +13,6 @@
         "NbVisitor": "1 आगंतुक",
         "NbVisitors": "%s आगंतुकों",
         "PageRefreshed": "यह पृष्ठ देखा गया था \/ एक पंक्ति में रिफ्रेश की संख्या।",
-        "PluginDescription": "अपने दर्शकों के वास्तविक समय में रहते देखो!",
         "RealTimeVisitorCount": "रीयल टाइम आगंतुक गणना",
         "Referrer_URL": "संदर्भ URL",
         "ShowMap": "नक्शा दिखाना",
diff --git a/plugins/Live/lang/hu.json b/plugins/Live/lang/hu.json
index cd56ee8ef5..c798b9f486 100644
--- a/plugins/Live/lang/hu.json
+++ b/plugins/Live/lang/hu.json
@@ -5,7 +5,6 @@
         "LastHours": "Legutóbbi %s óra",
         "LastMinutes": "Legutóbbi %s perc",
         "LinkVisitorLog": "Részletes látogatói adatok megtekintése",
-        "PluginDescription": "Kövesd nyomon látogatóid valós időben!",
         "Referrer_URL": "Hivatkozó URL",
         "VisitorLog": "Látogatói adatok",
         "VisitorLogDocumentation": "Ez a táblázat a legutolsó látogatásokat mutatja a kiválasztott időintervallumon belül.%s Ha az időintervallum tartalmazz a mai napot is, akkor élőben láthatod látogatóid! %s Az itt kijelzett adatok mindig élőek maradnak, függetlenül, hogy hogyan és milyen gyakran használod az archiválásra szolgáló cron job-ot.",
diff --git a/plugins/Live/lang/id.json b/plugins/Live/lang/id.json
index 8e410ade27..3a75b77885 100644
--- a/plugins/Live/lang/id.json
+++ b/plugins/Live/lang/id.json
@@ -9,7 +9,6 @@
         "NbVisitor": "1 pengunjung",
         "NbVisitors": "%s pengunjung",
         "PageRefreshed": "Jumlah kali halaman ini ditampilkan \/ disegarkan berurutan.",
-        "PluginDescription": "Mengintai pengunjung Anda, langsung, secara waktu-nyata!",
         "RealTimeVisitorCount": "Jumlah Pengunjung Waktu Nyata",
         "Referrer_URL": "URL Pengarah",
         "SimpleRealTimeWidget_Message": "%s dan %s dalam %s terakhir.",
diff --git a/plugins/Live/lang/is.json b/plugins/Live/lang/is.json
index ba28df6401..07b0984410 100644
--- a/plugins/Live/lang/is.json
+++ b/plugins/Live/lang/is.json
@@ -4,7 +4,6 @@
         "LastHours": "Síðustu %s klukkustundir",
         "LastMinutes": "Síðustu %s mínútur",
         "LinkVisitorLog": "Skoða nákvæman heimsóknaannál",
-        "PluginDescription": "Njósnaðu um gestina þína, í rauntíma!",
         "Referrer_URL": "URL Sendanda",
         "VisitorLog": "Heimsóknaannáll",
         "VisitorsInRealTime": "Gestir í rauntíma"
diff --git a/plugins/Live/lang/it.json b/plugins/Live/lang/it.json
index b7e44161f8..776da28c8a 100644
--- a/plugins/Live/lang/it.json
+++ b/plugins/Live/lang/it.json
@@ -21,10 +21,14 @@
         "NextVisitor": "Visitatore successivo",
         "NoMoreVisits": "Non ci sono più visite per questo visitatore.",
         "PageRefreshed": "Numero di volte che la pagina è stata visitata \/ aggiornata in una riga.",
-        "PluginDescription": "Osserva i tuoi visitatori, dal vivo, in tempo reale!",
+        "PluginDescription": "Fornisce un log dei visitatori \\\"live\\\" e ti permette di vedere i tuoi visitatori in tempo reale in un widget della dashboard. Il plugin ti permette anche di vedere un profilo visitatore per ciascuno degli utenti.",
         "PreviousVisitor": "Visitatore precedente",
         "RealTimeVisitorCount": "Conteggio Visitatori in Tempo Reale",
         "Referrer_URL": "URL del referer",
+        "RowActionTooltipDefault": "Mostra Log Visitatori segmentato per questa riga",
+        "RowActionTooltipTitle": "Apri il log segmentato dei visitatori",
+        "RowActionTooltipWithDimension": "Mostra Log Visitatori segmentato per questo %s",
+        "SegmentedVisitorLogTitle": "Log Visitatore che mostra le visite dove %s è \\\"%s\\\"",
         "ShowMap": "mostra mappa",
         "SimpleRealTimeWidget_Message": "%s e %s negli ultimi %s",
         "ViewVisitorProfile": "Guarda profilo visitatore",
diff --git a/plugins/Live/lang/ja.json b/plugins/Live/lang/ja.json
index cb64183bd6..ff86e8e1de 100644
--- a/plugins/Live/lang/ja.json
+++ b/plugins/Live/lang/ja.json
@@ -21,7 +21,6 @@
         "NextVisitor": "次のビジター",
         "NoMoreVisits": "この訪問者のさらなる訪問はありません。",
         "PageRefreshed": "このページが見られた\/更新された回数",
-        "PluginDescription": "ビジターをリアルタイムにライブでスパイします！",
         "PreviousVisitor": "前のビジター",
         "RealTimeVisitorCount": "リアルタイムのビジター数",
         "Referrer_URL": "参照元 URL",
diff --git a/plugins/Live/lang/ka.json b/plugins/Live/lang/ka.json
index 743149197c..3a3123b9c5 100644
--- a/plugins/Live/lang/ka.json
+++ b/plugins/Live/lang/ka.json
@@ -4,7 +4,6 @@
         "LastHours": "ბოლო %s საათი",
         "LastMinutes": "ბოლო %s წუთი",
         "LinkVisitorLog": "იხილეთ ვიზიტორების ჟურნალი დეტალურად",
-        "PluginDescription": "ადევნეთ თვალი თქვენს ვიზიტორებს, ცოცხლად, რეალურ დროში!",
         "Referrer_URL": "რეფერერის URL",
         "VisitorLog": "ვიზიტორების ჟურნალი",
         "VisitorsInRealTime": "ვიზიტორები რეალურ დროში"
diff --git a/plugins/Live/lang/ko.json b/plugins/Live/lang/ko.json
index 10e8b0c22f..e6c78b24d0 100644
--- a/plugins/Live/lang/ko.json
+++ b/plugins/Live/lang/ko.json
@@ -7,7 +7,6 @@
         "LinkVisitorLog": "방문자 기록 자세히 보기",
         "MorePagesNotDisplayed": "이 방문객의 표시는 더이상 없습니다",
         "PageRefreshed": "이 페이지를 볼 수 있음 \/ 업데이트된 횟수",
-        "PluginDescription": "방문자를 실시간 라이브로 관찰합니다!",
         "Referrer_URL": "참조 URL",
         "VisitorLog": "방문자 기록",
         "VisitorLogDocumentation": "이 표는 선택한 날짜 기간 내에 최신 방문에 표시하고 있습니다. 방문 날짜 위로 마우스를 이동하고, 그 방문자의 마지막 방문이 며칠 전인지 볼 수 있습니다. %s 기간내에 오늘이 포함되어 있으면, 방문객을 실시간으로 볼 수 있습니다! %s 여기에 표시되는 것은 보관을위한 cron 작업 설정 빈도에 상관없는 라이브 데이터입니다.",
diff --git a/plugins/Live/lang/lt.json b/plugins/Live/lang/lt.json
index 95ff7bcbfa..6dfd7f07f3 100644
--- a/plugins/Live/lang/lt.json
+++ b/plugins/Live/lang/lt.json
@@ -5,7 +5,6 @@
         "LastHours": "Paskutinės %s valandos",
         "LastMinutes": "Paskutinės %s minutės",
         "LinkVisitorLog": "Peržiūrėti išsamų apsilankymų žurnalą",
-        "PluginDescription": "Sekite savo lankytojus gyvai, realiu laiku!",
         "Referrer_URL": "Persiunčiančiojo URL",
         "VisitorLog": "Apsilankymų žurnalas",
         "VisitorsInRealTime": "Lankytojai realiuoju laiku"
diff --git a/plugins/Live/lang/lv.json b/plugins/Live/lang/lv.json
index f0e4838373..e75bddf313 100644
--- a/plugins/Live/lang/lv.json
+++ b/plugins/Live/lang/lv.json
@@ -5,7 +5,6 @@
         "LastHours": "Pēdējās %s stundas",
         "LastMinutes": "Pēdējās %s minūtes",
         "LinkVisitorLog": "Apskatīt detalizētu apmeklētāju žurnālu",
-        "PluginDescription": "Izspiego savus apmeklētājus, dzīvajā, reāllaikā!",
         "Referrer_URL": "Atsauces URL",
         "VisitorLog": "Apmeklētāju žurnāls",
         "VisitorLogDocumentation": "Šī tabula atspoguļo pēdējos apmeklējumus izvēlētajā datumu intervālā. Jūs varat apskatīt pēdējo apmeklētāja apmeklējuma laiku kursoru uzbīdot uz apmeklējuma datuma. %s Ja datumu intervāls iekļauj šodienu, Jūs varat skatīt apmeklētājus reāllaikā! %s Dati, kas apskatāmi šeit, ir vienmēr aktuālie, neatkarīgi no tā vai lietojat arhivēšanas darbu, vai nē.",
diff --git a/plugins/Live/lang/nb.json b/plugins/Live/lang/nb.json
index e548e3c2a0..01f31cf72c 100644
--- a/plugins/Live/lang/nb.json
+++ b/plugins/Live/lang/nb.json
@@ -7,10 +7,11 @@
         "LinkVisitorLog": "Vis detaljert logg over besøkende",
         "NbVisitor": "1 besøkende",
         "NbVisitors": "%s besøkende",
-        "PluginDescription": "Spioner på dine besøkende, live, i sanntid!",
         "RealTimeVisitorCount": "Besøkstall i sanntid",
         "Referrer_URL": "Henvisnings-URL",
         "ShowMap": "vis kart",
-        "VisitorLog": "Logg over besøkende"
+        "SimpleRealTimeWidget_Message": "%s og %s i de siste %s",
+        "VisitorLog": "Logg over besøkende",
+        "VisitsFrom": "%1$s%2$s besøk%3$s fra"
     }
 }
\ No newline at end of file
diff --git a/plugins/Live/lang/nl.json b/plugins/Live/lang/nl.json
index e186d67515..4d81101471 100644
--- a/plugins/Live/lang/nl.json
+++ b/plugins/Live/lang/nl.json
@@ -19,7 +19,6 @@
         "NextVisitor": "Volgende bezoeker",
         "NoMoreVisits": "Er zijn niet meer bezoeken van deze bezoeker.",
         "PageRefreshed": "Aantal keren dat deze pagina werd bekeken \/ ververst in een rij.",
-        "PluginDescription": "Volg uw bezoekers live in realtime!",
         "PreviousVisitor": "Vorige bezoeker",
         "RealTimeVisitorCount": "Real Time bezoekers aantal",
         "Referrer_URL": "Referrer URL",
diff --git a/plugins/Live/lang/nn.json b/plugins/Live/lang/nn.json
index fd862bc5ed..02bc75a333 100644
--- a/plugins/Live/lang/nn.json
+++ b/plugins/Live/lang/nn.json
@@ -6,7 +6,6 @@
         "LinkVisitorLog": "Vis detaljert vitjarlogg",
         "MorePagesNotDisplayed": "fleire sider av denne vitjaren er ikkje vist",
         "PageRefreshed": "Tal på gonger denne sida var vist \/ oppdatert.",
-        "PluginDescription": "Spioner på vitjarane dine i sanntid!",
         "VisitorLog": "Vitjarlogg",
         "VisitorLogDocumentation": "Denne tabellen visar dei seinaste vitjingane innan tidsperioden. Du kan sjå den førre vitjinga til ein vitjar ved å halda peikaren over datoen til ei vitjing. %s Viss tidsperioden inkluderer idag, kan du sjå vitjarane dine i sanntid! %s Data her er alltid i sanntid, same om og kor ofte Piwik arkiverer dei.",
         "VisitorsInRealTime": "Vitjarar i sanntid",
diff --git a/plugins/Live/lang/pl.json b/plugins/Live/lang/pl.json
index 0ba5e1dcfc..a0ca6439b3 100644
--- a/plugins/Live/lang/pl.json
+++ b/plugins/Live/lang/pl.json
@@ -15,7 +15,6 @@
         "NbVisitors": "%s gości",
         "NextVisitor": "Następny gość",
         "PageRefreshed": "Ile razy ta strona została oglądana\/ odświeżana z rzędu.",
-        "PluginDescription": "Szpieguje odwiedzających, na żywo, w czasie rzeczywistym!",
         "PreviousVisitor": "Poprzedni odwiedzający",
         "Referrer_URL": "Przysyłający adres URL",
         "ShowMap": "Pokaż mapę",
diff --git a/plugins/Live/lang/pt-br.json b/plugins/Live/lang/pt-br.json
index 7b1f664773..8aaebea0b4 100644
--- a/plugins/Live/lang/pt-br.json
+++ b/plugins/Live/lang/pt-br.json
@@ -20,7 +20,6 @@
         "NextVisitor": "Próximo visitante",
         "NoMoreVisits": "Não existem mais visitas para este visitante.",
         "PageRefreshed": "Número de vezes que esta página foi vista\/atualizada em um registro.",
-        "PluginDescription": "Espie seus visitantes, ao vivo, em tempo real!",
         "PreviousVisitor": "Visitante anterior",
         "RealTimeVisitorCount": "Contagem de visitantes em tempo real",
         "Referrer_URL": "URL de encaminhamento",
diff --git a/plugins/Live/lang/pt.json b/plugins/Live/lang/pt.json
index 54d5a79da3..f91c27b754 100644
--- a/plugins/Live/lang/pt.json
+++ b/plugins/Live/lang/pt.json
@@ -5,7 +5,6 @@
         "LastHours": "Últimas %s horas",
         "LastMinutes": "Últimos %s minutos",
         "LinkVisitorLog": "Ver registo de visitantes detalhado",
-        "PluginDescription": "Espie nos seus visitantes, ao vivo, em tempo-real!",
         "Referrer_URL": "Endereço do Referente",
         "VisitorLog": "Registo de Visitantes",
         "VisitorLogDocumentation": "Esta tabela mostra as últimas visitas dentro do período selecionado. Você pode ver quando a última visita de um visitante ocorreu passando o cursor sobre os dados de uma visita. %s Se o intervalo de datas incluir hoje, você pode ver os seus visitantes em tempo real! %s Os dados apresentados aqui são sempre em tempo real, independentemente de quantas vezes você está usando o cron job de arquivamento.",
diff --git a/plugins/Live/lang/ro.json b/plugins/Live/lang/ro.json
index 5458d02724..8df0a174bb 100644
--- a/plugins/Live/lang/ro.json
+++ b/plugins/Live/lang/ro.json
@@ -21,7 +21,6 @@
         "NextVisitor": "Urmatorul vizitator",
         "NoMoreVisits": "Nu există mai multe vizite pentru acest vizitator.",
         "PageRefreshed": "De cate ori aceasta pagina a fost vizualizata \/ reincarcata într-un rând.",
-        "PluginDescription": "Urmariti vizitatori in timp real!",
         "PreviousVisitor": "Vizitatorul anterior",
         "RealTimeVisitorCount": "Numărul vizitatori în timp real",
         "Referrer_URL": "Referal URL",
diff --git a/plugins/Live/lang/ru.json b/plugins/Live/lang/ru.json
index e17493b3df..6b4545aeed 100644
--- a/plugins/Live/lang/ru.json
+++ b/plugins/Live/lang/ru.json
@@ -1,6 +1,8 @@
 {
     "Live": {
         "AveragePageGenerationTime": "В среднем требовалось %1$s у этого посетителя для полной загрузки страницы.",
+        "CalculatedOverNPageViews": "Рассчитано на основе этого посетителя с %1$s просмотром страниц(ы).",
+        "ClickToViewMoreAboutVisit": "Посмотреть более подробную информацию об этом визите",
         "ConvertedNGoals": "Целей достигнуто: %s",
         "FirstVisit": "Первое посещение",
         "GoalType": "Тип",
@@ -17,10 +19,13 @@
         "NextVisitor": "Следующий посетитель",
         "NoMoreVisits": "Больше нет посещений у этого посетителя.",
         "PageRefreshed": "Сколько раз эта страница была просмотрена \/ обновлена несколько ряд подряд.",
-        "PluginDescription": "Сладите за вашими пользователями на сайте прямо сейчас!",
+        "PluginDescription": "Показывает актуальный журнал посетителей и позволяет смотреть ваших посетителей в режиме реального времени на приборной панели виджетов. Плагин также позволяет просматривать профиль посетитель данного пользователя.",
         "PreviousVisitor": "Предыдущий посетитель",
         "RealTimeVisitorCount": "Счётчик посетителей в реальном времени",
         "Referrer_URL": "URL источника",
+        "RowActionTooltipDefault": "Показать журнал посетителей, сегментированный по этой строке",
+        "RowActionTooltipTitle": "Открыть сегментированный журнал посетителей",
+        "SegmentedVisitorLogTitle": "Просмотр посещений где %s равно \\\"%s\\\"",
         "ShowMap": "показать карту",
         "SimpleRealTimeWidget_Message": "%s и %s за последние %s",
         "ViewVisitorProfile": "Посмотреть профиль посетителя",
@@ -30,6 +35,7 @@
         "VisitorProfile": "Профиль посетителя",
         "VisitorsInRealTime": "Посетители в реальном времени",
         "VisitorsLastVisit": "Последнее посещение этого пользователя было %s дней назад.",
+        "VisitsFrom": "%1$s%2$s визитов%3$s от",
         "VisitSummary": "Провёл в общей сложности %1$s%2$s на этом сайте%3$s, и %4$sпросмотрел %5$s страниц за %6$s посещений%7$s."
     }
 }
\ No newline at end of file
diff --git a/plugins/Live/lang/sk.json b/plugins/Live/lang/sk.json
index 0869c9bd64..2a970e79e0 100644
--- a/plugins/Live/lang/sk.json
+++ b/plugins/Live/lang/sk.json
@@ -2,7 +2,6 @@
     "Live": {
         "GoalType": "Typ",
         "LinkVisitorLog": "Zobraziť podrobný záznam návštevníkov",
-        "PluginDescription": "Spy na svojich návštevníkov, naživo, v reálnom čase!",
         "Referrer_URL": "Referenčné URL",
         "VisitorLog": "Záznam návštevníka"
     }
diff --git a/plugins/Live/lang/sl.json b/plugins/Live/lang/sl.json
index 52f8e72eb9..7c32b66f4a 100644
--- a/plugins/Live/lang/sl.json
+++ b/plugins/Live/lang/sl.json
@@ -6,7 +6,6 @@
         "LinkVisitorLog": "Ogled podrobnega dnevnika obiskovalcev",
         "NbVisitor": "1 obiskovalec",
         "NbVisitors": "%s obiskovalcev",
-        "PluginDescription": "Opazujte vaše obiskovalce v živo!",
         "VisitorLog": "Dnevnik obiskovalcev",
         "VisitorsInRealTime": "Obiskovalci v živo",
         "VisitorsLastVisit": "Zadnji obisk tega obiskovalce je bil pred %s dnevi."
diff --git a/plugins/Live/lang/sq.json b/plugins/Live/lang/sq.json
index 328fd947e0..dc43082b48 100644
--- a/plugins/Live/lang/sq.json
+++ b/plugins/Live/lang/sq.json
@@ -6,7 +6,6 @@
         "LastMinutes": "%s minutat e fundit",
         "LinkVisitorLog": "Shihni regjistër të hollësishëm të përdoruesit",
         "PageRefreshed": "Sa herë rresht është parë \/ rifreskuar kjo faqew.",
-        "PluginDescription": "Gjurmoni vizitorët tuaj, live, në kohë reale!",
         "Referrer_URL": "URL Referuesi",
         "VisitorLog": "Regjistër Vizitori",
         "VisitorLogDocumentation": "Kjo tabelë tregon vizitat e fundit brenda intervalit kohor të përzgjedhur. Se kur u bë vizita e fundit nga një vizitor mund ta shihni duke kaluar kursorin përsipër datës së një vizite. %s Nëse intervali kohor e përfshin ditën e sotme, mund t’i shihni vizitorët aty për aty! %s Të dhënat e shfaqura këtu janë përherë më të rejat, pavarësisht nëse e përdorni a jo dhe se sa shpesh funksionin cron për arkivim.",
diff --git a/plugins/Live/lang/sr.json b/plugins/Live/lang/sr.json
index c37f993cfb..94a3ea3058 100644
--- a/plugins/Live/lang/sr.json
+++ b/plugins/Live/lang/sr.json
@@ -21,7 +21,6 @@
         "NextVisitor": "Sledeći posetilac",
         "NoMoreVisits": "Nema više poseta ovog posetioca.",
         "PageRefreshed": "Broj prikaza ove stranice zaredom.",
-        "PluginDescription": "Pratite vaše posetioce uživo i u realnom vremenu!",
         "PreviousVisitor": "Prethodni posetilac",
         "RealTimeVisitorCount": "Brojač posetilaca u realnom vremenu",
         "Referrer_URL": "Referenca",
diff --git a/plugins/Live/lang/sv.json b/plugins/Live/lang/sv.json
index 486fa5be65..0a2674369e 100644
--- a/plugins/Live/lang/sv.json
+++ b/plugins/Live/lang/sv.json
@@ -21,7 +21,6 @@
         "NextVisitor": "Nästa besökare",
         "NoMoreVisits": "Det finns inga fler besök för den här besökaren.",
         "PageRefreshed": "Antal gånger denna sida har besökts \/ uppdateras i rad.",
-        "PluginDescription": "Spionera på dina besökare i realtid!",
         "PreviousVisitor": "Förgående besökare",
         "RealTimeVisitorCount": "Besöksräknare i realtid",
         "Referrer_URL": "Hänvisningsadress",
diff --git a/plugins/Live/lang/th.json b/plugins/Live/lang/th.json
index 754e2de64c..cc8ca1e901 100644
--- a/plugins/Live/lang/th.json
+++ b/plugins/Live/lang/th.json
@@ -5,7 +5,6 @@
         "LastHours": "%s ชั่วโมงที่ผ่านมา",
         "LastMinutes": "%s นาทีที่ผ่านมา",
         "LinkVisitorLog": "ดูไฟล์ประวัติผู้เข้าชม",
-        "PluginDescription": "ติดตามผู้เข้าชมในแบบเรียลไทม์",
         "Referrer_URL": "ที่มา URL",
         "VisitorLog": "ประวัติผู้เข้าชม",
         "VisitorLogDocumentation": "ตารางนี้แสดงการเข้าชมล่าสุดภายในช่วงวันที่ที่เลือก %s หากช่วงวันที่ที่รวมถึงวันนี้คุณสามารถเห็นผู้เข้าชมของคุณเวลาจริง! %s ข้อมูลที่แสดงที่นี่อยู่เสมอโดยไม่คำนึงว่าและความถี่ที่คุณกำลังใช้ cron job",
diff --git a/plugins/Live/lang/tl.json b/plugins/Live/lang/tl.json
index 23f606bad1..75df40235b 100644
--- a/plugins/Live/lang/tl.json
+++ b/plugins/Live/lang/tl.json
@@ -19,7 +19,6 @@
         "NextVisitor": "Susunod na bisita",
         "NoMoreVisits": "Wala nang bumisita para sa bisitang ito.",
         "PageRefreshed": "Dami ng beses na binuksan ang pahinang ito \/ ni-refresh sa isang hilera.",
-        "PluginDescription": "Panoorin ang iyong mga bisita sa real-time!",
         "PreviousVisitor": "nakaraang bisita",
         "RealTimeVisitorCount": "Real Time na bilang ng mga bisita",
         "Referrer_URL": "Referrer URL",
diff --git a/plugins/Live/lang/tr.json b/plugins/Live/lang/tr.json
index 6b6a0328ce..a1008f18de 100644
--- a/plugins/Live/lang/tr.json
+++ b/plugins/Live/lang/tr.json
@@ -13,7 +13,6 @@
         "NbVisitors": "%s ziyaretçi",
         "NextVisitor": "Sonraki ziyaretçi",
         "NoMoreVisits": "Bu ziyaretçi için daha fazla ziyaret bilgisi yok.",
-        "PluginDescription": "Ziyaretçilerinizi gözleyin, canlı, gerçek zamanlı!",
         "PreviousVisitor": "Önceki ziyaretçi",
         "RealTimeVisitorCount": "Gerçek Zamanlı Ziyaretçi Sayacı",
         "Referrer_URL": "Yönlendirme Siteleri",
diff --git a/plugins/Live/lang/uk.json b/plugins/Live/lang/uk.json
index f767c720d0..862b663062 100644
--- a/plugins/Live/lang/uk.json
+++ b/plugins/Live/lang/uk.json
@@ -4,7 +4,6 @@
         "LastHours": "Останні %s годин(и)",
         "LastMinutes": "Останні %s хвилин(и)",
         "LinkVisitorLog": "Переглянути детальний протокол відвідувача",
-        "PluginDescription": "Слідкуйте за своїми користувачами в живу, у реальному часі!",
         "Referrer_URL": "URL-адреса джерело переходів",
         "VisitorLog": "Протокол відвідувача",
         "VisitorsInRealTime": "Відвідувачі в реальному часі"
diff --git a/plugins/Live/lang/vi.json b/plugins/Live/lang/vi.json
index 63430369d7..10697bbe84 100644
--- a/plugins/Live/lang/vi.json
+++ b/plugins/Live/lang/vi.json
@@ -21,7 +21,6 @@
         "NextVisitor": "Khách truy cập tiếp theo",
         "NoMoreVisits": "Không có nhiều truy cập bởi khách này",
         "PageRefreshed": "Số lần trang này được xem\/làm mới liên tiếp.",
-        "PluginDescription": "Xem khách truy cập của bạn trong thời gian thực!",
         "PreviousVisitor": "Khách truy cập trước",
         "RealTimeVisitorCount": "Số lượt khách truy cập thời gian thực",
         "Referrer_URL": "URL tham chiếu",
diff --git a/plugins/Live/lang/zh-cn.json b/plugins/Live/lang/zh-cn.json
index f23a73aef6..b3e36afbe4 100644
--- a/plugins/Live/lang/zh-cn.json
+++ b/plugins/Live/lang/zh-cn.json
@@ -21,7 +21,6 @@
         "NextVisitor": "下一个访问者",
         "NoMoreVisits": "这个访客没有其它的访问了。",
         "PageRefreshed": "这个页面被查看 \/ 刷新的次数。",
-        "PluginDescription": "实时查看您的访客！",
         "PreviousVisitor": "前个访客",
         "RealTimeVisitorCount": "实时访客计数",
         "Referrer_URL": "来源网址",
diff --git a/plugins/Live/lang/zh-tw.json b/plugins/Live/lang/zh-tw.json
index b178f5a62c..6cce2d6c2e 100644
--- a/plugins/Live/lang/zh-tw.json
+++ b/plugins/Live/lang/zh-tw.json
@@ -3,7 +3,6 @@
         "LastHours": "最近 %s 小時內",
         "LastMinutes": "最近 %s 分鐘內",
         "LinkVisitorLog": "查看詳細的訪客記錄",
-        "PluginDescription": "窺視你的訪客，即時！",
         "Referrer_URL": "推薦連結",
         "VisitorLog": "訪客記錄",
         "VisitorsInRealTime": "目前正在參觀網站的訪客",
diff --git a/plugins/Live/stylesheets/live.less b/plugins/Live/stylesheets/live.less
index cb76a1078a..d84db8aea5 100644
--- a/plugins/Live/stylesheets/live.less
+++ b/plugins/Live/stylesheets/live.less
@@ -18,7 +18,7 @@
 }
 
 #visitsLive .country {
-    background: #FFF url(plugins/CoreHome/images/bullet1.gif) no-repeat scroll 0 0;
+    background: @theme-color-background-base url(plugins/CoreHome/images/bullet1.gif) no-repeat scroll 0 0;
 }
 
 #visitsLive .referrer {
@@ -35,7 +35,7 @@
 }
 
 #visitsLive .settings {
-    background: #FFF none repeat scroll 0 0;
+    background: @theme-color-background-base none repeat scroll 0 0;
 }
 
 #visitsLive .settings a {
@@ -58,6 +58,17 @@
     margin: 0 3px 0 0;
 }
 
+.ui-dialog.ui-widget {
+  .dataTableVizVisitorLog {
+    .dataTableFeatures {
+      border-bottom: 0px;
+    }
+    .expandDataTableFooterDrawer {
+      display: none;
+    }
+  }
+}
+
 .visitsLiveFooter a.rightLink {
     float: right;
     padding-right: 20px;
@@ -82,6 +93,11 @@ ol.visitorLog {
     display:inline-block;
     max-width:90%;
     overflow: -moz-hidden-unscrollable;
+
+    &.event {
+      margin-top: 1px;
+      margin-right: 15px;
+    }
 }
 
 ol.visitorLog li {
@@ -207,7 +223,7 @@ a.visitor-log-visitor-profile-link {
 .visitorLog,.visitor-profile-actions {
     > li > div {
         display:inline-block;
-        width:85%;
+        width:90%;
         vertical-align:top;
     }
 }
@@ -215,6 +231,10 @@ a.visitor-log-visitor-profile-link {
 .action-list-action-icon {
     float:left;
     margin-top:6px;
+
+    &.event {
+      margin-top: 1px;
+    }
 }
 
 .action-list-url {
diff --git a/plugins/Live/stylesheets/visitor_profile.less b/plugins/Live/stylesheets/visitor_profile.less
index f449b8f488..517fb2f42c 100644
--- a/plugins/Live/stylesheets/visitor_profile.less
+++ b/plugins/Live/stylesheets/visitor_profile.less
@@ -37,6 +37,9 @@
 
     span.truncated-text-line {
         display:inline-block;
+        &.event {
+          max-width: 89%;
+        }
     }
 }
 
diff --git a/plugins/Live/templates/_actionsList.twig b/plugins/Live/templates/_actionsList.twig
index 0598c2608f..a2bce2ab9a 100644
--- a/plugins/Live/templates/_actionsList.twig
+++ b/plugins/Live/templates/_actionsList.twig
@@ -88,8 +88,8 @@
                 <span class="truncated-text-line">{{ action.siteSearchKeyword }}</span>
             {% endif %}
             {% if action.eventCategory|default(false) is not empty %}
-                <img src='{{ action.icon }}' title='{{ 'Events_Event'|translate }}' class="action-list-action-icon">
-                <span class="truncated-text-line">{{ action.eventCategory|rawSafeDecoded }} - {{ action.eventAction|rawSafeDecoded }} {% if action.eventName is defined %}- {{ action.eventName|rawSafeDecoded }}{% endif %} {% if action.eventValue is defined %}[{{ action.eventValue }}]{% endif %}</span>
+                <img src='{{ action.icon }}' title='{{ 'Events_Event'|translate }}' class="action-list-action-icon event">
+                <span class="truncated-text-line event">{{ action.eventCategory|rawSafeDecoded }} - {{ action.eventAction|rawSafeDecoded }} {% if action.eventName is defined %}- {{ action.eventName|rawSafeDecoded }}{% endif %} {% if action.eventValue is defined %}[{{ action.eventValue }}]{% endif %}</span>
             {% endif %}
             {% if action.url is not empty %}
                 {% if action.type == 'action' and action.pageTitle|default(false) is not empty %}<p>{% endif %}
diff --git a/plugins/Live/templates/_dataTableViz_visitorLog.twig b/plugins/Live/templates/_dataTableViz_visitorLog.twig
index a0a0d99716..394b0be4d8 100644
--- a/plugins/Live/templates/_dataTableViz_visitorLog.twig
+++ b/plugins/Live/templates/_dataTableViz_visitorLog.twig
@@ -30,14 +30,16 @@
     {% set visitorColumnContent %}
         {% if visitor.getColumn('countryFlag') %}<img src="{{ visitor.getColumn('countryFlag') }}" title="{{ visitor.getColumn('location') }}, Provider {{ visitor.getColumn('providerName') }}"/>{% endif %}
         &nbsp;
-        {% if visitor.getColumn('plugins') %}
-            {% if visitor.getColumn('browserIcon') %}<img src="{{ visitor.getColumn('browserIcon') }}" title="{{ 'UserSettings_BrowserWithPluginsEnabled'|translate(visitor.getColumn('browserName'),visitor.getColumn('plugins')) }}"/>{% endif %}
+        {% if not visitor.hasColumn('plugins') %}
+            {% if visitor.getColumn('browserIcon') %}<img src="{{ visitor.getColumn('browserIcon') }}" title="{{ visitor.getColumn('browser') }}"/>{% endif %}
+        {% elseif visitor.getColumn('plugins') %}
+            {% if visitor.getColumn('browserIcon') %}<img src="{{ visitor.getColumn('browserIcon') }}" title="{{ 'DevicePlugins_BrowserWithPluginsEnabled'|translate(visitor.getColumn('browser'),visitor.getColumn('plugins')) }}"/>{% endif %}
         {% else %}
-            {% if visitor.getColumn('browserIcon') %}<img src="{{ visitor.getColumn('browserIcon') }}" title="{{ 'UserSettings_BrowserWithNoPluginsEnabled'|translate(visitor.getColumn('browserName')) }}"/>{% endif %}
+            {% if visitor.getColumn('browserIcon') %}<img src="{{ visitor.getColumn('browserIcon') }}" title="{{ 'DevicePlugins_BrowserWithNoPluginsEnabled'|translate(visitor.getColumn('browser')) }}"/>{% endif %}
         {% endif %}
         {% if visitor.getColumn('operatingSystemIcon') %}&nbsp;
         <img src="{{ visitor.getColumn('operatingSystemIcon') }}"
-             title="{{ visitor.getColumn('operatingSystem') }}, {{ visitor.getColumn('resolution') }}"/>{% endif %}
+             title="{{ visitor.getColumn('operatingSystem') }}{% if visitor.getColumn('resolution') %}, {{ visitor.getColumn('resolution') }}{% endif %}"/>{% endif %}
         {% if visitor.getColumn('visitorTypeIcon') %}
             {% if visitor.getColumn('visitorTypeIcon') %}&nbsp;-
             <img src="{{ visitor.getColumn('visitorTypeIcon') }}"
@@ -181,7 +183,7 @@ GPS (lat/long): {{ visitor.getColumn('latitude') }},{{ visitor.getColumn('longit
 
             <td class="column {% if visitor.getColumn('visitConverted') and not isWidget %}highlightField{% endif %}">
                 <div class="visitor-log-page-list">
-                    {% if visitor.getColumn('visitorId') is not empty %}
+                    {% if visitor.getColumn('visitorId') is not empty and not clientSideParameters.hideProfileLink %}
                     <a class="visitor-log-visitor-profile-link" title="{{ 'Live_ViewVisitorProfile'|translate }}" data-visitor-id="{{ visitor.getColumn("visitorId") }}">
                         <img src="plugins/Live/images/visitorProfileLaunch.png"/> <span>{{ 'Live_ViewVisitorProfile'|translate }}
                             {%- if visitor.getColumn('userId') is not empty %}: {{ visitor.getColumn('userId')|raw }}{% endif %}</span>
diff --git a/plugins/Live/templates/getLastVisitsStart.twig b/plugins/Live/templates/getLastVisitsStart.twig
index 7b9f6a4d9d..99fc0f903e 100644
--- a/plugins/Live/templates/getLastVisitsStart.twig
+++ b/plugins/Live/templates/getLastVisitsStart.twig
@@ -9,8 +9,8 @@
                 <span style="display:none;" class="serverTimestamp">{{ visitor.serverTimestamp|raw }}</span>
                 {{ visitor.serverDatePretty }} - {{ visitor.serverTimePretty }} {% if visitor.visitDuration > 0 %}<em>({{ visitor.visitDurationPretty|raw }})</em>{% endif %}
                 {% if visitor.countryFlag is defined %}&nbsp;<img src="{{ visitor.countryFlag }}" title="{{ visitor.location }}, {{ 'Provider_ColumnProvider'|translate }} {% if visitor.providerName is defined %}{{ visitor.providerName }}{% endif %}"/>{% endif %}
-                {% if visitor.browserIcon is defined %}&nbsp;<img src="{{ visitor.browserIcon }}" title="{{ visitor.browserName }}, {{ 'General_Plugins'|translate }}: {{ visitor.plugins }}"/>{% endif %}
-                {% if visitor.operatingSystemIcon is defined %}&nbsp;<img src="{{ visitor.operatingSystemIcon }}" title="{{ visitor.operatingSystem }}, {{ visitor.resolution }}"/>{% endif %}
+                {% if visitor.browserIcon is defined %}&nbsp;<img src="{{ visitor.browserIcon }}" title="{{ visitor.browser }}{% if visitor.plugins is defined %}, {{ 'General_Plugins'|translate }}: {{ visitor.plugins }}{% endif %}"/>{% endif %}
+                {% if visitor.operatingSystemIcon is defined %}&nbsp;<img src="{{ visitor.operatingSystemIcon }}" title="{{ visitor.operatingSystem }}{% if visitor.resolution is defined %}, {{ visitor.resolution }}{% endif %}"/>{% endif %}
                 &nbsp;
                 {% if visitor.visitConverted %}
                 <span title="{{ 'General_VisitConvertedNGoals'|translate(visitor.goalConversions) }}" class='visitorRank'>
diff --git a/plugins/Live/templates/getSingleVisitSummary.twig b/plugins/Live/templates/getSingleVisitSummary.twig
index 77f1c8f2bb..7a24a6606f 100644
--- a/plugins/Live/templates/getSingleVisitSummary.twig
+++ b/plugins/Live/templates/getSingleVisitSummary.twig
@@ -25,7 +25,7 @@
         </li>
         <li>
             {% if visitData.browserName is defined %}
-            <div class="visitor-profile-browser" title="{% if visitData.plugins is defined %}{{ 'UserSettings_BrowserWithPluginsEnabled'|translate(visitData.browserName, visitData.plugins) }}{% else %}{{ 'UserSettings_BrowserWithNoPluginsEnabled'|translate(visitData.browserName) }}{% endif %}">
+            <div class="visitor-profile-browser" title="{% if visitData.plugins is not defined %}{{ visitData.browser }}{% elseif visitData.plugins %}{{ 'DevicePlugins_BrowserWithPluginsEnabled'|translate(visitData.browser, visitData.plugins) }}{% else %}{{ 'DevicePlugins_BrowserWithNoPluginsEnabled'|translate(visitData.browser) }}{% endif %}">
                 {% if visitData.browserIcon is defined %}<img src="{{ visitData.browserIcon }}"/>{% endif %}<span>{{ visitData.browserName|split(' ')[0] }}</span>
             </div>
             {% endif %}
@@ -34,7 +34,7 @@
                 {% if visitData.operatingSystemIcon is defined %}<img src="{{ visitData.operatingSystemIcon }}"/>{% endif %}{% if visitData.operatingSystem is defined %}<span>{{ visitData.operatingSystem }}</span>{% endif %}
             </div>
         </li>
-        {% if visitData.resolution is defined %}<li><span>{{ 'UserSettings_ColumnResolution'|translate }}</span><strong>{{ visitData.resolution }}</strong></li>{% endif %}
+        {% if visitData.resolution is defined %}<li><span>{{ 'Resolution_ColumnResolution'|translate }}</span><strong>{{ visitData.resolution }}</strong></li>{% endif %}
         {% if visitData.userId is not empty %}<li><span>{{ 'General_UserId'|translate }}</span><strong>{{ visitData.userId|raw }}</strong></li>{% endif %}
         {% if visitReferralSummary is defined %}
         {%- set keywordNotDefined = 'General_NotDefined'|translate('General_ColumnKeyword'|translate) -%}
diff --git a/plugins/Live/templates/getVisitorProfilePopup.twig b/plugins/Live/templates/getVisitorProfilePopup.twig
index 0a25de6a39..c33f2d2181 100644
--- a/plugins/Live/templates/getVisitorProfilePopup.twig
+++ b/plugins/Live/templates/getVisitorProfilePopup.twig
@@ -61,7 +61,7 @@
                         </p>
                         {% endif %}
                         {% if visitorData.averagePageGenerationTime is defined %}
-                        <p title="{{ 'Live_CalculatedOverNPageViews'|translate(visitorData.totalPageViews) }}">
+                        <p title="{{ 'Live_CalculatedOverNPageViews'|translate(visitorData.totalPageViewsWithTiming) }}">
                             {{ 'Live_AveragePageGenerationTime'|translate('<strong>' ~ visitorData.averagePageGenerationTime ~ 's</strong>')|raw }}
                         </p>
                         {% endif %}
@@ -141,7 +141,7 @@
                     </ol>
                 </div>
                 <div class="visitor-profile-more-info">
-                    {% if visitorData.lastVisits.getRowsCount() >= constant("Piwik\\Plugins\\Live\\API::VISITOR_PROFILE_MAX_VISITS_TO_SHOW") %}
+                    {% if visitorData.lastVisits.getRowsCount() >= constant("Piwik\\Plugins\\Live\\VisitorProfile::VISITOR_PROFILE_MAX_VISITS_TO_SHOW") %}
                     <a href="#">{{ 'Live_LoadMoreVisits'|translate }}</a> <img class="loadingPiwik" style="display:none;" src="plugins/Morpheus/images/loading-blue.gif"/>
                     {% else %}
                     <span class="visitor-profile-no-visits">{{ 'Live_NoMoreVisits'|translate }}</span>
diff --git a/plugins/Live/tests/Integration/APITest.php b/plugins/Live/tests/System/APITest.php
index 2c85088a19..2c85088a19 100644
--- a/plugins/Live/tests/Integration/APITest.php
+++ b/plugins/Live/tests/System/APITest.php
diff --git a/plugins/Live/tests/System/ModelTest.php b/plugins/Live/tests/System/ModelTest.php
new file mode 100644
index 0000000000..80f1c8d86f
--- /dev/null
+++ b/plugins/Live/tests/System/ModelTest.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\Live\tests\Integration;
+
+use Piwik\Access;
+use Piwik\Common;
+use Piwik\Plugins\Live\Model;
+use Piwik\Tests\Framework\Fixture;
+use Piwik\Tests\Framework\Mock\FakeAccess;
+use Piwik\Tests\Framework\TestCase\SystemTestCase;
+use Piwik\Tests\Integration\SegmentTest;
+
+/**
+ * @group Live
+ * @group ModelTest
+ * @group Plugins
+ */
+class ModelTest extends SystemTestCase
+{
+    function setUp()
+    {
+        $this->setSuperUser();
+        Fixture::createWebsite('2010-01-01');
+    }
+
+    public function test_makeLogVisitsQueryString()
+    {
+        $model = new Model();
+        list($sql, $bind) = $model->makeLogVisitsQueryString(
+                $idSite = 1,
+                $period = 'month',
+                $date = '2010-01-01',
+                $segment = false,
+                $countVisitorsToFetch = 100,
+                $visitorId = false,
+                $minTimestamp = false,
+                $filterSortOrder = false
+        );
+        $expectedSql = ' SELECT sub.* FROM
+                (
+                    SELECT log_visit.*
+                    FROM ' . Common::prefixTable('log_visit') . ' AS log_visit
+                    WHERE log_visit.idsite in (?)
+                      AND log_visit.visit_last_action_time >= ?
+                      AND log_visit.visit_last_action_time <= ?
+                    ORDER BY idsite, visit_last_action_time DESC
+                    LIMIT 100
+                 ) AS sub
+                 GROUP BY sub.idvisit
+                 ORDER BY sub.visit_last_action_time DESC
+        ';
+        $expectedBind = array(
+            '1',
+            '2010-01-01 00:00:00',
+            '2010-02-01 00:00:00',
+        );
+        $this->assertEquals(SegmentTest::removeExtraWhiteSpaces($expectedSql), SegmentTest::removeExtraWhiteSpaces($sql));
+        $this->assertEquals(SegmentTest::removeExtraWhiteSpaces($expectedBind), SegmentTest::removeExtraWhiteSpaces($bind));
+    }
+
+
+    public function test_makeLogVisitsQueryString_whenSegment()
+    {
+        $model = new Model();
+        list($sql, $bind) = $model->makeLogVisitsQueryString(
+            $idSite = 1,
+            $period = 'month',
+            $date = '2010-01-01',
+            $segment = 'customVariablePageName1==Test',
+            $countVisitorsToFetch = 100,
+            $visitorId = 'abc',
+            $minTimestamp = false,
+            $filterSortOrder = false
+        );
+        $expectedSql = ' SELECT sub.* FROM
+                (
+
+                    SELECT log_inner.*
+                    FROM (
+                        SELECT log_visit.*
+                        FROM ' . Common::prefixTable('log_visit') . ' AS log_visit
+                          LEFT JOIN ' . Common::prefixTable('log_link_visit_action') . ' AS log_link_visit_action
+                          ON log_link_visit_action.idvisit = log_visit.idvisit
+                        WHERE ( log_visit.idsite in (?)
+                          AND log_visit.idvisitor = ?
+                          AND log_visit.visit_last_action_time >= ?
+                          AND log_visit.visit_last_action_time <= ? )
+                          AND ( log_link_visit_action.custom_var_k1 = ? )
+                        ORDER BY idsite, visit_last_action_time DESC
+                        LIMIT 100
+                        ) AS log_inner
+                    ORDER BY idsite, visit_last_action_time DESC
+                    LIMIT 100
+                 ) AS sub
+                 GROUP BY sub.idvisit
+                 ORDER BY sub.visit_last_action_time DESC
+        ';
+        $expectedBind = array(
+            '1',
+            Common::hex2bin('abc'),
+            '2010-01-01 00:00:00',
+            '2010-02-01 00:00:00',
+            'Test',
+        );
+        $this->assertEquals(SegmentTest::removeExtraWhiteSpaces($expectedSql), SegmentTest::removeExtraWhiteSpaces($sql));
+        $this->assertEquals(SegmentTest::removeExtraWhiteSpaces($expectedBind), SegmentTest::removeExtraWhiteSpaces($bind));
+    }
+
+
+    protected function setSuperUser()
+    {
+        $pseudoMockAccess = new FakeAccess();
+        FakeAccess::$superUser = true;
+        Access::setSingletonInstance($pseudoMockAccess);
+    }
+
+}
\ No newline at end of file
diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php
index 62c8b40740..270b788380 100644
--- a/plugins/Login/Controller.php
+++ b/plugins/Login/Controller.php
@@ -13,6 +13,7 @@ use Piwik\Access;
 use Piwik\Auth as AuthInterface;
 use Piwik\Common;
 use Piwik\Config;
+use Piwik\Container\StaticContainer;
 use Piwik\Cookie;
 use Piwik\Log;
 use Piwik\Nonce;
@@ -60,7 +61,7 @@ class Controller extends \Piwik\Plugin\Controller
         $this->passwordResetter = $passwordResetter;
 
         if (empty($auth)) {
-            $auth = \Piwik\Registry::get('auth');
+            $auth = StaticContainer::get('Piwik\Auth');
         }
         $this->auth = $auth;
 
@@ -276,13 +277,7 @@ class Controller extends \Piwik\Plugin\Controller
         }
 
         if (is_null($errorMessage)) { // if success, show login w/ success message
-            // have to do this as super user since redirectToIndex checks if there's a default website ID for
-            // the current user and if not, doesn't redirect to the requested action. TODO: this behavior is wrong. somehow.
-            $self = $this;
-            Access::doAsSuperUser(function () use ($self) {
-                $self->redirectToIndex(Piwik::getLoginPluginName(), 'resetPasswordSuccess');
-            });
-            return null;
+            return $this->resetPasswordSuccess();
         } else {
             // show login page w/ error. this will keep the token in the URL
             return $this->login($errorMessage);
diff --git a/plugins/Login/Login.php b/plugins/Login/Login.php
index 8b65e2e175..ccaa203112 100644
--- a/plugins/Login/Login.php
+++ b/plugins/Login/Login.php
@@ -10,6 +10,7 @@ namespace Piwik\Plugins\Login;
 
 use Exception;
 use Piwik\Config;
+use Piwik\Container\StaticContainer;
 use Piwik\Cookie;
 use Piwik\FrontController;
 use Piwik\Option;
@@ -31,7 +32,8 @@ class Login extends \Piwik\Plugin
             'Request.initAuthenticationObject' => 'initAuthenticationObject',
             'User.isNotAuthorized'             => 'noAccess',
             'API.Request.authenticate'         => 'ApiRequestAuthenticate',
-            'AssetManager.getJavaScriptFiles'  => 'getJsFiles'
+            'AssetManager.getJavaScriptFiles'  => 'getJsFiles',
+            'AssetManager.getStylesheetFiles'  => 'getStylesheetFiles'
         );
         return $hooks;
     }
@@ -41,6 +43,12 @@ class Login extends \Piwik\Plugin
         $jsFiles[] = "plugins/Login/javascripts/login.js";
     }
 
+   public function getStylesheetFiles(&$stylesheetFiles)
+    {
+        $stylesheetFiles[] = "plugins/Login/stylesheets/login.less";
+        $stylesheetFiles[] = "plugins/Login/stylesheets/variables.less";
+    }
+
     /**
      * Redirects to Login form with error message.
      * Listens to User.isNotAuthorized hook.
@@ -58,8 +66,10 @@ class Login extends \Piwik\Plugin
      */
     public function ApiRequestAuthenticate($tokenAuth)
     {
-        \Piwik\Registry::get('auth')->setLogin($login = null);
-        \Piwik\Registry::get('auth')->setTokenAuth($tokenAuth);
+        /** @var \Piwik\Auth $auth */
+        $auth = StaticContainer::get('Piwik\Auth');
+        $auth->setLogin($login = null);
+        $auth->setTokenAuth($tokenAuth);
     }
 
     protected static function isModuleIsAPI()
@@ -75,7 +85,7 @@ class Login extends \Piwik\Plugin
     function initAuthenticationObject($activateCookieAuth = false)
     {
         $auth = new Auth();
-        \Piwik\Registry::set('auth', $auth);
+        StaticContainer::getContainer()->set('Piwik\Auth', $auth);
 
         $this->initAuthenticationFromCookie($auth, $activateCookieAuth);
     }
diff --git a/plugins/Login/lang/cs.json b/plugins/Login/lang/cs.json
index 8bf4831d94..311341374e 100644
--- a/plugins/Login/lang/cs.json
+++ b/plugins/Login/lang/cs.json
@@ -16,7 +16,7 @@
         "PasswordChanged": "Vaše heslo bylo změněno.",
         "PasswordRepeat": "Heslo (pro kontrolu)",
         "PasswordsDoNotMatch": "Hesla si neodpovídají",
-        "PluginDescription": "Zásuvný modul přihlašování, který pro prvotního super uživatele čte údaje ze souboru config\/config.ini.php a pro další uživatele z databáze. Může být jednoduše nahrazen jinou metodou autentizace (OpenId, htaccess atd.).",
+        "PluginDescription": "Poskytuje autentizaci jménem a heslem a funkcionalitu obnovy hesla. Metodu přihlašování můžete změnit pomocí zásuvného modulu přihlašování, kterým je například LoginLdap dostupný z obchodu.",
         "RememberMe": "Zapamatovat si",
         "ResetPasswordInstructions": "Zadejte nové heslo k Vašemu účtu."
     }
diff --git a/plugins/Login/lang/da.json b/plugins/Login/lang/da.json
index b636a2a026..e64a368a62 100644
--- a/plugins/Login/lang/da.json
+++ b/plugins/Login/lang/da.json
@@ -16,7 +16,6 @@
         "PasswordChanged": "Din adgangskode er blevet ændret.",
         "PasswordRepeat": "Adgangskode (gentag)",
         "PasswordsDoNotMatch": "Adgangskoder er ikke ens.",
-        "PluginDescription": "Udvidelsen Login-godkendelse , læser legitimationsoplysningerne fra filen config\/config.ini.php for den oprindelige superbruger, og fra databasen for andre brugere. Kan let udskiftes for at indføre en ny godkendelses metode (OpenID, htaccess, brugerdefinerede Auth, osv.).",
         "RememberMe": "Husk mig",
         "ResetPasswordInstructions": "Indtast en ny adgangskode til din konto."
     }
diff --git a/plugins/Login/lang/de.json b/plugins/Login/lang/de.json
index 64c5c2892f..8154e07b42 100644
--- a/plugins/Login/lang/de.json
+++ b/plugins/Login/lang/de.json
@@ -16,7 +16,7 @@
         "PasswordChanged": "Das Passwort wurde geändert.",
         "PasswordRepeat": "Passwort (wiederholen)",
         "PasswordsDoNotMatch": "Die Passwörter stimmen nicht überein.",
-        "PluginDescription": "Anmelde-Authentifizierungs-Plugin, welches die Anmeldedaten aus der config\/config.ini.php-Datei ausliest, um einen initialen Hauptadministrator zu erstellen und aus der Datebank, um andere Nutzer zu erstellen. Kann problemlos ausgetauscht werden, um einen neuen Authentifizierungsmechanismus (OpenID, htaccess, custom Auth, etc.) zu nutzen.",
+        "PluginDescription": "Unterstützt Authentifizierung via Benutzername und Passwort sowie Password Reset Funktionalität. Die Authentifizierungsmethode kann durch ein anderes Login Plugin wie LoginLdap (verfügbar im Marketplace) geändert werden.",
         "RememberMe": "Angemeldet bleiben",
         "ResetPasswordInstructions": "Geben Sie ein neues Passwort für Ihren Account ein."
     }
diff --git a/plugins/Login/lang/el.json b/plugins/Login/lang/el.json
index 01b4d07777..b68a6f18ab 100644
--- a/plugins/Login/lang/el.json
+++ b/plugins/Login/lang/el.json
@@ -16,7 +16,7 @@
         "PasswordChanged": "Ο κωδικός σας έχει αλλάξει.",
         "PasswordRepeat": "Κωδικός (επανάληψη)",
         "PasswordsDoNotMatch": "Οι κωδικοί δεν ταιριάζουν.",
-        "PluginDescription": "Πρόσθετο Πιστοποίησης Εισόδου, διαβάζει τα διαπιστευτήρια από το αρχείο config\/config.ini.php για τον αρχικό Υπερ-Χρήστη και από τη βάση δεδομένων για τους άλλους χρήστες. Μπορεί εύκολα να αντικατασταθεί από ένα νέο μηχανισμό Πιστοποίησης (OpenID, htacces, προσαρμοσμένη Πιστοποίηση, κτλ.).",
+        "PluginDescription": "Παρέχει αυθεντικοποίηση μέσω ονόματος χρήστη και συνθηματικού όπως επίσης και λειτουργικότητα επαναφοράς συνθηματικού. Η μέθοδος αυθεντικοποίησης μπορεί να αλλαχθεί χρησιμοποιώντας άλλο πρόσθετο, όπως το LoginLdap που υπάρχει διαθέσιμο στην Αγορά.",
         "RememberMe": "Απομνημόνευση",
         "ResetPasswordInstructions": "Εισάγετε έναν νέο κωδικό για τον λογαριασμό σας."
     }
diff --git a/plugins/Login/lang/en.json b/plugins/Login/lang/en.json
index 9bacf9b7e7..d43d85c212 100644
--- a/plugins/Login/lang/en.json
+++ b/plugins/Login/lang/en.json
@@ -16,7 +16,7 @@
         "PasswordChanged": "Your password has been changed.",
         "PasswordRepeat": "Password (repeat)",
         "PasswordsDoNotMatch": "Passwords do not match.",
-        "PluginDescription": "Login Authentication plugin, reading the credentials from the config\/config.ini.php file for the initial Super User, and from the Database for the other users. Can be easily replaced to introduce a new Authentication mechanism (OpenID, htaccess, custom Auth, etc.).",
+        "PluginDescription": "Provides authentication via username and password as well as password reset functionnality. Authentication method can be changed by using another Login plugin such as LoginLdap available on the Marketplace.",
         "RememberMe": "Remember Me",
         "ResetPasswordInstructions": "Enter a new password for your account."
     }
diff --git a/plugins/Login/lang/es.json b/plugins/Login/lang/es.json
index 537bfce48d..bf3be7b0e5 100644
--- a/plugins/Login/lang/es.json
+++ b/plugins/Login/lang/es.json
@@ -16,7 +16,6 @@
         "PasswordChanged": "Tu contraseña ha sido modificada.",
         "PasswordRepeat": "Contraseña (repetir)",
         "PasswordsDoNotMatch": "Las contraseñas no coinciden.",
-        "PluginDescription": "El plugin de Autenticación lee las credenciales del archivo config\/config.ini.php para el Super User inicial, y de la base de datos para otros usuarios. Puede fácilmente ser sustituido para introducir un mecanismo nuevo de autenticación (OpenID, htaccess, custom Auth, etc.).",
         "RememberMe": "Recuerdeme",
         "ResetPasswordInstructions": "Ingresa una nueva contraseña para tu cuenta."
     }
diff --git a/plugins/Login/lang/fi.json b/plugins/Login/lang/fi.json
index d77ff4326f..782204bc2e 100644
--- a/plugins/Login/lang/fi.json
+++ b/plugins/Login/lang/fi.json
@@ -16,7 +16,6 @@
         "PasswordChanged": "Salasana on vaihdettu.",
         "PasswordRepeat": "Salasana (uudelleen)",
         "PasswordsDoNotMatch": "Salasanat eivät täsmää.",
-        "PluginDescription": "Login todennus -liitännäinen, lukee suositukset config\/config.ini.php tiedostosta alkuperäiselle Superkäyttäjälle ja tietokannasta muille käyttäjille. Voidaan vaihtaa helposti esittelemällä uusi todennusmekanismi (OpenID, htaccess, custom Auth, jne).",
         "RememberMe": "Muista minut",
         "ResetPasswordInstructions": "Anna uusi salasana."
     }
diff --git a/plugins/Login/lang/fr.json b/plugins/Login/lang/fr.json
index ac12cab079..5d06a91d34 100644
--- a/plugins/Login/lang/fr.json
+++ b/plugins/Login/lang/fr.json
@@ -16,7 +16,6 @@
         "PasswordChanged": "Votre mot de passe a été modifié",
         "PasswordRepeat": "Mot de passe (répétez)",
         "PasswordsDoNotMatch": "Les mots de passe ne correspondent pas.",
-        "PluginDescription": "Composant d'authentification, qui se sert des identifiants contenu dans config\/config.ini.php pour le super utilisateur initial et depuis la base de donnés pour les autres utilisateurs. Peut être facilement remplacé pour incorporer d'autres méthodes d'authentification (OpenID, htaccess, authentification personnalisée, etc.).",
         "RememberMe": "Se souvenir de moi",
         "ResetPasswordInstructions": "Entrez un nouveau mot de passe pour votre compte."
     }
diff --git a/plugins/Login/lang/it.json b/plugins/Login/lang/it.json
index 47df559476..69c496169c 100644
--- a/plugins/Login/lang/it.json
+++ b/plugins/Login/lang/it.json
@@ -16,7 +16,7 @@
         "PasswordChanged": "La tua password è stata cambiata.",
         "PasswordRepeat": "Password (ripeti)",
         "PasswordsDoNotMatch": "La password non combacia.",
-        "PluginDescription": "Plugin di Autenticazione Login, legge le creadenziali dal file config\/config.ini.php per il Super User iniziale, e dal database per gli altri utenti. Può essere sostituito con facilità per introdurre un nuovo meccanismo di autenticazione (OpenID, htaccess, custom Auth, ecc.).",
+        "PluginDescription": "Fornisce l'autenticazione tramite user name e password, e anche la funzione di reset della password. Il metodo di autenticazione può essere cambiato utilizzando un altro plugin di accesso, come LoginLdap disponibile nel Marketplace.",
         "RememberMe": "Ricordami",
         "ResetPasswordInstructions": "Immetti una nuova password per il tuo account."
     }
diff --git a/plugins/Login/lang/ja.json b/plugins/Login/lang/ja.json
index 8997f9110c..cf5ebbbed0 100644
--- a/plugins/Login/lang/ja.json
+++ b/plugins/Login/lang/ja.json
@@ -16,7 +16,6 @@
         "PasswordChanged": "パスワードが変更されました。",
         "PasswordRepeat": "パスワード（再入力）",
         "PasswordsDoNotMatch": "パスワードが一致しません。",
-        "PluginDescription": "初期スーパーユーザーのための config\/config.ini.php ファイルと、他のユーザーのためのデータベースから認証情報を読み、認証プラグインにログインしてください。新しい認証メカニズム(オープン ID 、htaccess 、カスタム Auth 等)の導入が簡単に行うことができます。",
         "RememberMe": "次回の入力を省略",
         "ResetPasswordInstructions": "あなたのアカウントの新しいパスワードを入力してください。"
     }
diff --git a/plugins/Login/lang/nb.json b/plugins/Login/lang/nb.json
index d0b62fe98c..48e9068f1c 100644
--- a/plugins/Login/lang/nb.json
+++ b/plugins/Login/lang/nb.json
@@ -6,6 +6,7 @@
         "LoginOrEmail": "Brukernavn eller e-post",
         "LoginPasswordNotCorrect": "Brukernavn og passord er ikke korrekt",
         "LostYourPassword": "Glemt passord?",
+        "MailTopicPasswordChange": "Bekreft passordendring",
         "PasswordChanged": "Passordet er endret.",
         "PasswordRepeat": "Passord (gjenta)",
         "PasswordsDoNotMatch": "Passordene stemmer ikke overens.",
diff --git a/plugins/Login/lang/ro.json b/plugins/Login/lang/ro.json
index a5c13f806c..746eb60cb9 100644
--- a/plugins/Login/lang/ro.json
+++ b/plugins/Login/lang/ro.json
@@ -16,7 +16,6 @@
         "PasswordChanged": "Parola ta a fost schimbată",
         "PasswordRepeat": "Parolă (repetă)",
         "PasswordsDoNotMatch": "Parolele nu se potrivesc.",
-        "PluginDescription": "Logare Autentificare plugin, citind scrisorile de acreditare de la fișierul de configurare \/ config.ini.php pentru Super utilizator, și baza de date pentru alți utilizatori. Poate fi înlocuit cu ușurință pentru a introduce un nou mecanism de autentificare (OpenID, htaccess, personalizate Auth, etc).",
         "RememberMe": "Ţine-mă minte",
         "ResetPasswordInstructions": "Introduce o parolă nouă pentru contul tău."
     }
diff --git a/plugins/Login/lang/ru.json b/plugins/Login/lang/ru.json
index 86cd93e6d8..49f3ab5b94 100644
--- a/plugins/Login/lang/ru.json
+++ b/plugins/Login/lang/ru.json
@@ -2,6 +2,7 @@
     "Login": {
         "ConfirmationLinkSent": "Ссылка с подтверждением была отправлена на ваш e-mail. Проверьте свой e-mail и перейдите по отправленной вам ссылке.",
         "ContactAdmin": "Возможная причина: функция mail() отключена. <br \/>Пожалуйста, свяжитесь с администратором.",
+        "ExceptionInvalidSuperUserAccessAuthenticationMethod": "Пользователь с правами суперпользователя не может пройти проверку подлинности с помощью данного механизма: '%s'.",
         "ExceptionPasswordMD5HashExpected": "Параметр пароля вероятно является MD5-хэшем пароля.",
         "InvalidNonceOrHeadersOrReferrer": "Ошибка при загрузки формы безопасности. Пожалуйста, обновите форму и проверьте, что ваши cookies включены. Если вы используете прокси-сервер, вы должны %s настроить принятие прокси-заголовков в Piwik%s, которые следуют за названием хоста. Также убедитесь, что заголовки источника трафика отправляются верно.",
         "InvalidOrExpiredToken": "Код неправильный или просрочен.",
diff --git a/plugins/Login/lang/sr.json b/plugins/Login/lang/sr.json
index 69df39d81a..90b771efa3 100644
--- a/plugins/Login/lang/sr.json
+++ b/plugins/Login/lang/sr.json
@@ -16,7 +16,6 @@
         "PasswordChanged": "Vaša lozinka je promenjena.",
         "PasswordRepeat": "Lozinka (ponovo)",
         "PasswordsDoNotMatch": "Lozinka se ne poklapa",
-        "PluginDescription": "Dodatak za autentifikaciju prijave na sistem, služi za čitanje podataka za prijavu na sistem iz datoteke config\/config.ini.php kao i iz baze. Može lako biti zamenjen novim mehanizmom autentifikacije (OpenID, htaccess itd.).",
         "RememberMe": "Zapamti me",
         "ResetPasswordInstructions": "Upišite novu lozinku za vaš nalog."
     }
diff --git a/plugins/Login/lang/sv.json b/plugins/Login/lang/sv.json
index d89012ef49..69be38d4e3 100644
--- a/plugins/Login/lang/sv.json
+++ b/plugins/Login/lang/sv.json
@@ -16,7 +16,6 @@
         "PasswordChanged": "Ditt lösenord har ändrats.",
         "PasswordRepeat": "Lösenord (bekräfta)",
         "PasswordsDoNotMatch": "Lösenorden matchar inte.",
-        "PluginDescription": "Login autentiseringstillägget, läser referenserna från konfigurationen\/config.ini.php filen för den första Administratören, och från databasen för övriga användare. Kan enkelt ersättas för att hantera en ny autentiseringsmekanism (OpenID, htaccess, custom Auth, etc.).",
         "RememberMe": "Kom ihåg mig",
         "ResetPasswordInstructions": "Skriv in ett nytt lösenord för ditt konto."
     }
diff --git a/plugins/Login/lang/tl.json b/plugins/Login/lang/tl.json
index 743e7e46a0..949573351e 100644
--- a/plugins/Login/lang/tl.json
+++ b/plugins/Login/lang/tl.json
@@ -15,7 +15,6 @@
         "PasswordChanged": "Ang iyong password ay nabago na.",
         "PasswordRepeat": "Password (ulitin)",
         "PasswordsDoNotMatch": "Ang mga password ay hindi tugma.",
-        "PluginDescription": "Login Authentication plugin binabasa ang credentials mula sa config\/config.ini php file para sa initial na Super User at mula sa Database para sa iba pang mga user. Ito ay madaling mapapalitan upang maipapakilala sa isang bagong Authentication mechanism (OpenID htaccess custom Auth atbp.",
         "RememberMe": "Tandaan Ako",
         "ResetPasswordInstructions": "Magpasok ng isang bagong password para sa iyong account."
     }
diff --git a/plugins/Login/stylesheets/login.css b/plugins/Login/stylesheets/login.css
deleted file mode 100644
index 930663027e..0000000000
--- a/plugins/Login/stylesheets/login.css
+++ /dev/null
@@ -1,195 +0,0 @@
-/* LOGO
-***********************/
-#logo {
-    float: none;
-    margin: 100px auto 0 auto;
-    width: 240px;
-    position: relative;
-}
-
-#logo .description {
-    position: absolute;
-    left: -40px !important;
-    top: -30px !important;
-    -webkit-transform: rotate(-6deg);
-    -moz-transform: rotate(-6deg);
-    -ms-transform: rotate(-6deg);
-    -o-transform: rotate(-6deg);
-}
-
-#logo .description a {
-    font: 16px/16px 'Patrick Hand';
-    color: #666666;
-    right: auto;
-    text-decoration: none;
-}
-
-#logo .description .arrow {
-    background: url(../../Morpheus/images/affix-arrow.png);
-    width: 50px;
-    height: 68px;
-    position: absolute;
-    left: -35px;
-}
-
-#logo img {
-    border: 0;
-    vertical-align: bottom;
-    height: auto;
-    width: 240px;
-    margin-right: 20px;
-}
-
-#logo .h1 {
-    font-family: Georgia, "Times New Roman", Times, serif;
-    font-weight: normal;
-    color: #136F8B;
-    font-size: 45pt;
-    text-transform: none;
-}
-
-/* LAYOUT
-***********************/
-#loginPage a {
-    text-decoration: none;
-}
-
-.loadingPiwik {
-    float: left;
-    margin-left: 16px;
-}
-
-.loginSection {
-    background-color: #fafafa;
-    width: 360px;
-    padding: 30px;
-    margin: 50px auto 0 auto;
-    border-radius: 3px;
-    -webkit-box-shadow: 0 0 2px rgba(0, 0, 0, 0.2), 0 1px 1px rgba(0, 0, 0, .2);
-    -moz-box-shadow: 0 0 2px rgba(0, 0, 0, 0.2), 1px 1px 0 rgba(0, 0, 0, .1);
-    box-shadow: 0 0 2px rgba(0, 0, 0, 0.2), 0 1px 1px rgba(0, 0, 0, .2);
-}
-
-.loginSection h1 {
-    text-align: center;
-    color: #666;
-    margin: 0 0 30px 0;
-    font-style: normal;
-    font-weight: normal;
-    font-size: 26px;
-    line-height: 1;
-    position: relative;
-}
-
-/* FORM
-***********************/
-.loginSection form {
-    margin: 0 5px;
-    padding: 15px;
-    position: relative;
-}
-
-.loginSection form div {
-    margin-bottom: 24px;
-}
-
-.loginSection .submit {
-    margin-top: 0;
-}
-
-.loginSection fieldset {
-    border: 0;
-}
-
-.loginSection fieldset.actions {
-    line-height: 35px;
-    width: 315px;
-    margin-top: 10px;
-}
-
-#login_form_rememberme {
-    vertical-align: middle;
-}
-
-/* FIELDS
-***********************/
-.loginSection form input[type="text"],
-.loginSection form input[type="password"] {
-    font-size: 20px;
-    padding: 10px 15px 10px 45px;
-    margin: 0 0 15px 0;
-    width: 253px; /* 258 + 2 + 55 = 315 */
-    border: 1px solid #ccc;
-    border-radius: 5px;
-    color: #555;
-    -moz-box-shadow: 0 1px 1px #ccc inset, 0 1px 0 #fff;
-    -webkit-box-shadow: 0 1px 1px #ccc inset, 0 1px 0 #fff;
-    box-shadow: 0 1px 1px #ccc inset, 0 1px 0 #fff;
-}
-
-#login_form_password,
-#reset_form_password,
-#reset_form_password_bis,
-#login_form_login,
-#reset_form_login {
-    background: #fff url(../../Morpheus/images/login-sprite.png) no-repeat;
-}
-
-#login_form_password,
-#reset_form_password,
-#reset_form_password_bis {
-    background-position: 10px -51px;
-}
-
-#login_form_login,
-#reset_form_login {
-    background-position: 10px 11px;
-}
-
-/* MESSAGE
-***********************/
-#loginPage .message_error,
-#loginPage .message {
-    margin: 0 auto;
-    border: 1px solid;
-    padding: 12px;
-}
-
-#loginPage .message_error {
-    background-color: #ffebe8;
-    border-color: #c00;
-}
-
-#loginPage .message {
-    background-color: #ffffe0;
-    border-color: #e6db55;
-}
-
-/* NAVIGATION
-***********************/
-#nav,
-#piwik {
-    margin: 0 0 0 8px;
-    padding: 16px;
-}
-
-#nav {
-    text-align: center;
-}
-
-#nav a:hover {
-    text-decoration: underline;
-}
-
-#loginPage #nav a {
-    color: #777;
-}
-
-#loginPage #piwik a {
-    color: #CDCDCD;
-}
-
-/* IE < 9 will use this */
-body.old-ie .ie-hide {
-    display: none;
-}
diff --git a/plugins/Login/stylesheets/login.less b/plugins/Login/stylesheets/login.less
new file mode 100644
index 0000000000..d957f2014c
--- /dev/null
+++ b/plugins/Login/stylesheets/login.less
@@ -0,0 +1,197 @@
+/* LOGO
+***********************/
+#loginPage {
+    #logo {
+        float: none;
+        margin: 100px auto 0 auto;
+        width: 240px;
+        position: relative;
+    }
+
+    #logo .description {
+        position: absolute;
+        left: -40px !important;
+        top: -30px !important;
+        -webkit-transform: rotate(-6deg);
+        -moz-transform: rotate(-6deg);
+        -ms-transform: rotate(-6deg);
+        -o-transform: rotate(-6deg);
+    }
+
+    #logo .description a {
+        font: 16px/16px 'Patrick Hand';
+        color: #666666;
+        right: auto;
+        text-decoration: none;
+    }
+
+    #logo .description .arrow {
+        background: url(../../Morpheus/images/affix-arrow.png);
+        width: 50px;
+        height: 68px;
+        position: absolute;
+        left: -35px;
+    }
+
+    #logo img {
+        border: 0;
+        vertical-align: bottom;
+        height: auto;
+        width: 240px;
+        margin-right: 20px;
+    }
+
+    #logo .h1 {
+        font-family: Georgia, "Times New Roman", Times, serif;
+        font-weight: normal;
+        color: #136F8B;
+        font-size: 45pt;
+        text-transform: none;
+    }
+
+    /* LAYOUT
+    ***********************/
+    #loginPage a {
+        text-decoration: none;
+    }
+
+    .loadingPiwik {
+        float: left;
+        margin-left: 16px;
+    }
+
+    .loginSection {
+        background-color: @login-section-background;
+        width: 360px;
+        padding: 30px;
+        margin: 50px auto 0 auto;
+        border-radius: 3px;
+        -webkit-box-shadow: 0 0 2px rgba(0, 0, 0, 0.2), 0 1px 1px rgba(0, 0, 0, .2);
+        -moz-box-shadow: 0 0 2px rgba(0, 0, 0, 0.2), 1px 1px 0 rgba(0, 0, 0, .1);
+        box-shadow: 0 0 2px rgba(0, 0, 0, 0.2), 0 1px 1px rgba(0, 0, 0, .2);
+    }
+
+    .loginSection h1 {
+        text-align: center;
+        color: #666;
+        margin: 0 0 30px 0;
+        font-style: normal;
+        font-weight: normal;
+        font-size: 26px;
+        line-height: 1;
+        position: relative;
+    }
+
+    /* FORM
+    ***********************/
+    .loginSection form {
+        margin: 0 5px;
+        padding: 15px;
+        position: relative;
+    }
+
+    .loginSection form div {
+        margin-bottom: 24px;
+    }
+
+    .loginSection .submit {
+        margin-top: 0;
+    }
+
+    .loginSection fieldset {
+        border: 0;
+    }
+
+    .loginSection fieldset.actions {
+        line-height: 35px;
+        width: 315px;
+        margin-top: 10px;
+    }
+
+    #login_form_rememberme {
+        vertical-align: middle;
+    }
+
+    /* FIELDS
+    ***********************/
+    .loginSection form input[type="text"],
+    .loginSection form input[type="password"] {
+        font-size: 20px;
+        padding: 10px 15px 10px 45px;
+        margin: 0 0 15px 0;
+        width: 100%;
+        border: 1px solid #ccc;
+        border-radius: 5px;
+        color: #555;
+        -moz-box-shadow: 0 1px 1px #ccc inset, 0 1px 0 @theme-color-background-base;
+        -webkit-box-shadow: 0 1px 1px #ccc inset, 0 1px 0 @theme-color-background-base;
+        box-shadow: 0 1px 1px #ccc inset, 0 1px 0 @theme-color-background-base;
+    }
+
+    #login_form_password,
+    #reset_form_password,
+    #reset_form_password_bis,
+    #login_form_login,
+    #reset_form_login {
+        background: @theme-color-background-base url(../../Morpheus/images/login-sprite.png) no-repeat;
+    }
+
+    #login_form_password,
+    #reset_form_password,
+    #reset_form_password_bis {
+        background-position: 10px -51px;
+    }
+
+    #login_form_login,
+    #reset_form_login {
+        background-position: 10px 11px;
+    }
+
+    /* MESSAGE
+    ***********************/
+    .message_error,
+    .message {
+        margin: 0 auto;
+        border: 1px solid;
+        padding: 12px;
+    }
+
+    .message_error {
+        background-color: #ffebe8;
+        border-color: #c00;
+    }
+
+    .message {
+        background-color: #ffffe0;
+        border-color: #e6db55;
+    }
+
+    /* NAVIGATION
+    ***********************/
+    #nav,
+    #piwik {
+        margin: 0 0 0 8px;
+        padding: 16px;
+    }
+
+    #nav {
+        text-align: center;
+    }
+
+    #nav a:hover {
+        text-decoration: underline;
+    }
+
+    #nav a {
+        color: #777;
+    }
+
+    #piwik a {
+        color: #CDCDCD;
+    }
+
+    /* IE < 9 will use this */
+    body.old-ie .ie-hide {
+        display: none;
+    }
+}
diff --git a/plugins/Login/stylesheets/variables.less b/plugins/Login/stylesheets/variables.less
new file mode 100644
index 0000000000..6862eff74b
--- /dev/null
+++ b/plugins/Login/stylesheets/variables.less
@@ -0,0 +1 @@
+@login-section-background: #fafafa;
diff --git a/plugins/Login/templates/login.twig b/plugins/Login/templates/login.twig
index cd18c8f190..d6d461fa66 100644
--- a/plugins/Login/templates/login.twig
+++ b/plugins/Login/templates/login.twig
@@ -1,19 +1,7 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-	<meta http-equiv="x-ua-compatible" content="IE=EDGE,chrome=1" >
-    <title>{% if isCustomLogo == false %}Piwik &rsaquo; {% endif %}{{ 'Login_LogIn'|translate }}</title>
-
-    {% include "@CoreHome/_favicon.twig" %}
-    {% autoescape false %}
-    {{ includeAssets({"type": "css"}) }}
-    {% endautoescape %}
-    <link rel="stylesheet" type="text/css" href="plugins/Login/stylesheets/login.css"/>
-    <meta name="description" content="{{ 'General_OpenSourceWebAnalytics'|translate }}"/>
-    <meta name="apple-itunes-app" content="app-id=737216887" />
-    <meta name="google-play-app" content="app-id=org.piwik.mobile2">
-    {% include "_jsCssIncludes.twig" %}
+{% extends '@Morpheus/layout.twig' %}
+
+{% block head %}
+    {{ parent() }}
     <script type="text/javascript" src="libs/bower_components/jquery-placeholder/jquery.placeholder.js"></script>
     <!--[if lt IE 9]>
     <script src="libs/bower_components/html5shiv/dist/html5shiv.min.js"></script>
@@ -27,12 +15,16 @@
             $('input').placeholder();
             $.smartbanner({title: "Piwik Mobile 2", author: "Piwik team", hideOnInstall: false, layer: true, icon: "plugins/CoreHome/images/googleplay.png"});
         });
-	</script>
-	</head>
-	<!--[if lt IE 9 ]>
-	<body id="loginPage" class="old-ie"> <![endif]-->
-    <!--[if (gte IE 9)|!(IE)]><!-->
-    <body id="loginPage"><!--<![endif]-->
+    </script>
+{% endblock %}
+
+{% block pageTitle %}{% if isCustomLogo == false %}Piwik &rsaquo; {% endif %}{{ 'Login_LogIn'|translate }}{% endblock %}
+{% block pageDescription %}{{ 'General_OpenSourceWebAnalytics'|translate }}{% endblock %}
+
+{% set bodyId = 'loginPage' %}
+
+{% block body %}
+
     {{ postEvent("Template.beforeTopBar", "login") }}
     {{ postEvent("Template.beforeContent", "login") }}
 
@@ -87,7 +79,7 @@
                     <p class="message">{{ infoMessage|raw }}</p>
                 {% endif %}
             </div>
-            <form {{ form_data.attributes|raw }}>
+            <form {{ form_data.attributes|raw }} ng-non-bindable>
                 <h1>{{ 'Login_LogIn'|translate }}</h1>
                 <fieldset class="inputs">
                     <input type="text" name="form_login" id="login_form_login" class="input" value="" size="20"
@@ -107,7 +99,7 @@
                            tabindex="100"/>
                 </fieldset>
             </form>
-            <form id="reset_form" style="display:none;">
+            <form id="reset_form" style="display:none;" ng-non-bindable>
                 <fieldset class="inputs">
                     <input type="text" name="form_login" id="reset_form_login" class="input" value="" size="20"
                            tabindex="10"
@@ -152,5 +144,5 @@
             </div>
         {% endif %}
     </section>
-</body>
-</html>
+
+{% endblock %}
diff --git a/plugins/MobileMessaging/Controller.php b/plugins/MobileMessaging/Controller.php
index e19b7684b1..5a906d3ba1 100644
--- a/plugins/MobileMessaging/Controller.php
+++ b/plugins/MobileMessaging/Controller.php
@@ -10,20 +10,38 @@
 namespace Piwik\Plugins\MobileMessaging;
 
 use Piwik\Common;
+use Piwik\Intl\Data\Provider\RegionDataProvider;
 use Piwik\IP;
 use Piwik\Piwik;
+use Piwik\Plugin\ControllerAdmin;
 use Piwik\Plugins\LanguagesManager\LanguagesManager;
 use Piwik\Plugins\MobileMessaging\SMSProvider;
+use Piwik\Translation\Translator;
 use Piwik\View;
 
 require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/functions.php';
 
-/**
- *
- */
-class Controller extends \Piwik\Plugin\ControllerAdmin
+class Controller extends ControllerAdmin
 {
-    /*
+    /**
+     * @var RegionDataProvider
+     */
+    private $regionDataProvider;
+
+    /**
+     * @var Translator
+     */
+    private $translator;
+
+    public function __construct(RegionDataProvider $regionDataProvider, Translator $translator)
+    {
+        $this->regionDataProvider = $regionDataProvider;
+        $this->translator = $translator;
+
+        parent::__construct();
+    }
+
+    /**
      * Mobile Messaging Settings tab :
      *  - set delegated management
      *  - provide & validate SMS API credential
@@ -32,17 +50,45 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
      */
     public function index()
     {
-        Piwik::checkUserIsNotAnonymous();
+        Piwik::checkUserHasSuperUserAccess();
 
         $view = new View('@MobileMessaging/index');
+        $this->setManageVariables($view);
 
+        return $view->render();
+    }
+
+    /**
+     * Mobile Messaging Settings tab :
+     *  - set delegated management
+     *  - provide & validate SMS API credential
+     *  - add & activate phone numbers
+     *  - check remaining credits
+     */
+    public function userSettings()
+    {
+        Piwik::checkUserIsNotAnonymous();
+
+        $view = new View('@MobileMessaging/userSettings');
+        $this->setManageVariables($view);
+
+        return $view->render();
+    }
+
+    private function setManageVariables(View $view)
+    {
         $view->isSuperUser = Piwik::hasUserSuperUserAccess();
 
         $mobileMessagingAPI = API::getInstance();
         $view->delegatedManagement = $mobileMessagingAPI->getDelegatedManagement();
         $view->credentialSupplied = $mobileMessagingAPI->areSMSAPICredentialProvided();
         $view->accountManagedByCurrentUser = $view->isSuperUser || $view->delegatedManagement;
-        $view->strHelpAddPhone = Piwik::translate('MobileMessaging_Settings_PhoneNumbers_HelpAdd', array(Piwik::translate('General_Settings'), Piwik::translate('MobileMessaging_SettingsMenu')));
+        $view->strHelpAddPhone = $this->translator->translate('MobileMessaging_Settings_PhoneNumbers_HelpAdd', array(
+            $this->translator->translate('General_Settings'),
+            $this->translator->translate('MobileMessaging_SettingsMenu')
+        ));
+        $view->creditLeft = 0;
+        $view->provider = '';
         if ($view->credentialSupplied && $view->accountManagedByCurrentUser) {
             $view->provider = $mobileMessagingAPI->getSMSProvider();
             $view->creditLeft = $mobileMessagingAPI->getCreditLeft();
@@ -52,13 +98,12 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
 
         // construct the list of countries from the lang files
         $countries = array();
-        foreach (Common::getCountriesList() as $countryCode => $continentCode) {
+        foreach ($this->regionDataProvider->getCountryList() as $countryCode => $continentCode) {
             if (isset(CountryCallingCodes::$countryCallingCodes[$countryCode])) {
-                $countries[$countryCode] =
-                    array(
-                        'countryName'        => \Piwik\Plugins\UserCountry\countryTranslate($countryCode),
-                        'countryCallingCode' => CountryCallingCodes::$countryCallingCodes[$countryCode],
-                    );
+                $countries[$countryCode] = array(
+                    'countryName'        => \Piwik\Plugins\UserCountry\countryTranslate($countryCode),
+                    'countryCallingCode' => CountryCallingCodes::$countryCallingCodes[$countryCode],
+                );
             }
         }
         $view->countries = $countries;
@@ -72,7 +117,5 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
         $view->phoneNumbers = $mobileMessagingAPI->getPhoneNumbers();
 
         $this->setBasicVariablesView($view);
-
-        return $view->render();
     }
 }
diff --git a/plugins/MobileMessaging/Menu.php b/plugins/MobileMessaging/Menu.php
index e810e99744..8a17e42517 100644
--- a/plugins/MobileMessaging/Menu.php
+++ b/plugins/MobileMessaging/Menu.php
@@ -9,11 +9,22 @@
 namespace Piwik\Plugins\MobileMessaging;
 
 use Piwik\Menu\MenuAdmin;
+use Piwik\Menu\MenuUser;
+use Piwik\Piwik;
 
 class Menu extends \Piwik\Plugin\Menu
 {
     public function configureAdminMenu(MenuAdmin $menu)
     {
-        $menu->addSettingsItem('MobileMessaging_SettingsMenu', $this->urlForAction('index'), $order = 12);
+        if (Piwik::hasUserSuperUserAccess()) {
+            $menu->addSettingsItem('MobileMessaging_SettingsMenu', $this->urlForAction('index'), $order = 12);
+        }
+    }
+
+    public function configureUserMenu(MenuUser $menu)
+    {
+        if (!Piwik::isUserIsAnonymous()) {
+            $menu->addPersonalItem('MobileMessaging_SettingsMenu', $this->urlForAction('userSettings'), $order = 12);
+        }
     }
 }
diff --git a/plugins/MobileMessaging/lang/en.json b/plugins/MobileMessaging/lang/en.json
index 4c46237286..63df29ceef 100644
--- a/plugins/MobileMessaging/lang/en.json
+++ b/plugins/MobileMessaging/lang/en.json
@@ -14,7 +14,7 @@
         "Settings_CredentialProvided": "Your %s SMS API account is correctly configured!",
         "Settings_DeleteAccountConfirm": "Are you sure you want to delete this SMS account?",
         "Settings_InvalidActivationCode": "Code entered was not valid, please try again.",
-        "Settings_LetUsersManageAPICredential": "Allow users to manage their own SMS API credentials",
+        "Settings_LetUsersManageAPICredential": "Allow users to manage their own SMS provider",
         "Settings_LetUsersManageAPICredential_No_Help": "All users are able to receive SMS Reports and will use your account's credits.",
         "Settings_LetUsersManageAPICredential_Yes_Help": "Each user will be able to setup their own SMS API Account and will not use your credit.",
         "Settings_ManagePhoneNumbers": "Manage Phone Numbers",
diff --git a/plugins/MobileMessaging/lang/nb.json b/plugins/MobileMessaging/lang/nb.json
index 78476a3513..f588c83b6e 100644
--- a/plugins/MobileMessaging/lang/nb.json
+++ b/plugins/MobileMessaging/lang/nb.json
@@ -12,6 +12,7 @@
         "Settings_SuperAdmin": "Superbruker-instillinger",
         "Settings_ValidatePhoneNumber": "Valider",
         "Settings_VerificationCodeJustSent": "Vi har nettopp sendt en SMS til dette nummeret med en kode: Skriv inn denne koden ovenfor og klikk \"Valider\".",
+        "SettingsMenu": "Meldingstjenester",
         "SMS_Content_Too_Long": "[for lang]",
         "TopMenu": "E-post og SMS-rapporter"
     }
diff --git a/plugins/MobileMessaging/templates/index.twig b/plugins/MobileMessaging/templates/index.twig
index 17b5bbb435..c75c00f583 100644
--- a/plugins/MobileMessaging/templates/index.twig
+++ b/plugins/MobileMessaging/templates/index.twig
@@ -1,160 +1,11 @@
 {% extends 'admin.twig' %}
 
-{% block content %}
-    {% if accountManagedByCurrentUser %}
-        <h2 piwik-enriched-headline
-            feature-name="{{ 'MobileMessaging_SettingsMenu'|translate }}"
-                >{{ 'MobileMessaging_Settings_SMSAPIAccount'|translate }}</h2>
-        {% if credentialSupplied %}
-            {{ 'MobileMessaging_Settings_CredentialProvided'|translate(provider) }}
-            {{ creditLeft }}
-            <br/>
-            {{ 'MobileMessaging_Settings_UpdateOrDeleteAccount'|translate("<a id='displayAccountForm'>","</a>","<a id='deleteAccount'>","</a>")|raw }}
-        {% else %}
-            {{ 'MobileMessaging_Settings_PleaseSignUp'|translate }}
-        {% endif %}
-        <div id='accountForm' {% if credentialSupplied %}style='display: none;'{% endif %}>
-            <br/>
-            {{ 'MobileMessaging_Settings_SMSProvider'|translate }}
-            <select id='smsProviders'>
-                {% for smsProvider, description in smsProviders %}
-                    <option value='{{ smsProvider }}'>
-                        {{ smsProvider }}
-                    </option>
-                {% endfor %}
-            </select>
-
-            {{ 'MobileMessaging_Settings_APIKey'|translate }}
-            <input size='25' id='apiKey'/>
-
-            <input type='submit' value='{{ 'General_Save'|translate }}' id='apiAccountSubmit' class='submit'/>
-
-            {% for smsProvider, description in smsProviders %}
-                <div class='providerDescription' id='{{ smsProvider }}'>
-                    {{ description|raw }}
-                </div>
-            {% endfor %}
-
-        </div>
-    {% endif %}
+{% import '@MobileMessaging/macros.twig' as macro %}
 
-    {% import 'ajaxMacros.twig' as ajax %}
-
-    <div style="margin-top:10px">
-        {{ ajax.errorDiv('ajaxErrorMobileMessagingSettings') }}
-    </div>
-
-    <h2>{{ 'MobileMessaging_PhoneNumbers'|translate }}</h2>
-    {% if not credentialSupplied %}
-        {% if accountManagedByCurrentUser %}
-            {{ 'MobileMessaging_Settings_CredentialNotProvided'|translate }}
-        {% else %}
-            {{ 'MobileMessaging_Settings_CredentialNotProvidedByAdmin'|translate }}
-        {% endif %}
-    {% else %}
-        {{ 'MobileMessaging_Settings_PhoneNumbers_Help'|translate }}
-        <br/>
-        <br/>
-        <table style="width:900px;" class="adminTable">
-            <tbody>
-            <tr>
-                <td style="width:480px;">
-                    <strong>{{ 'MobileMessaging_Settings_PhoneNumbers_Add'|translate }}</strong>
-                    <br/><br/>
-
-                <span id="suspiciousPhoneNumber" style="display:none;">
-                    {{ 'MobileMessaging_Settings_SuspiciousPhoneNumber'|translate('54184032') }}
-                    <br/><br/>
-                </span>
-
-                + <input id="countryCallingCode" size="4" maxlength="4"/>&nbsp;
-                <input id="newPhoneNumber"/>
-                <input type="submit" value='{{ 'General_Add'|translate }}'
-                       id="addPhoneNumberSubmit"/>
-                <br/>
-
-		<span style=' font-size: 11px;'><span
-                    class="form-description">{{ 'MobileMessaging_Settings_CountryCode'|translate }}</span>
-			<span class="form-description"
-                  style="margin-left:50px;">{{ 'MobileMessaging_Settings_PhoneNumber'|translate }}</span></span>
-                    <br/><br/>
-
-                    {{ 'MobileMessaging_Settings_PhoneNumbers_CountryCode_Help'|translate }}
-
-                    <select id="countries">
-                        {# this is a trick to avoid selecting the first country when no default could be found #}
-                        <option value="">&nbsp;</option>
-                        {% for countryCode, country in countries %}
-                            <option value='{{ country.countryCallingCode }}'
-                                    {% if defaultCountry==countryCode %} selected="selected" {% endif %}
-                                    >
-                                {{ country.countryName }}
-                            </option>
-                        {% endfor %}
-                    </select>
-
-                </td>
-                <td style="width:220px;">
-                    {% import 'macros.twig' as piwik %}
-                    {{ piwik.inlineHelp(strHelpAddPhone) }}
-                </td>
-            </tr>
-            <tr>
-                <td colspan="2">
-
-                    {% if phoneNumbers|length > 0 %}
-                        <br/>
-                        <br/>
-                        <strong>{{ 'MobileMessaging_Settings_ManagePhoneNumbers'|translate }}</strong>
-                        <br/>
-                        <br/>
-                    {% endif %}
-
-                    {{ ajax.errorDiv('invalidVerificationCodeAjaxError') }}
-
-                    <div id='phoneNumberActivated' style="display:none;">
-                        {{ 'MobileMessaging_Settings_PhoneActivated'|translate }}
-                    </div>
-
-                    <div id='invalidActivationCode' style="display:none;">
-                        {{ 'MobileMessaging_Settings_InvalidActivationCode'|translate }}
-                    </div>
-
-                    <ul>
-                        {% for phoneNumber, validated in phoneNumbers %}
-                            <li>
-                                <span class='phoneNumber'>{{ phoneNumber }}</span>
-                                {% if not validated %}
-                                    <input class='verificationCode'/>
-                                    <input
-                                            type='submit'
-                                            value='{{ 'MobileMessaging_Settings_ValidatePhoneNumber'|translate }}'
-                                            class='validatePhoneNumberSubmit'
-                                            />
-                                {% endif %}
-                                <input
-                                        type='submit'
-                                        value='{{ 'General_Remove'|translate }}'
-                                        class='removePhoneNumberSubmit'
-                                        />
-                                {% if not validated %}
-                                    <br/>
-                                    <span class='form-description'>{{ 'MobileMessaging_Settings_VerificationCodeJustSent'|translate }}</span>
-                                {% endif %}
-                                <br/>
-                                <br/>
-                            </li>
-                        {% endfor %}
-                    </ul>
-
-                </td>
-            </tr>
-            </tbody>
-        </table>
-    {% endif %}
+{% block content %}
 
     {% if isSuperUser %}
-        <h2>{{ 'MobileMessaging_Settings_SuperAdmin'|translate }}</h2>
+        <h2>{{ 'General_Settings'|translate }}</h2>
         <table class='adminTable' style='width:650px;'>
             <tr>
                 <td style="width:400px;">{{ 'MobileMessaging_Settings_LetUsersManageAPICredential'|translate }}</td>
@@ -183,6 +34,29 @@
         </table>
     {% endif %}
 
+    {% if accountManagedByCurrentUser and delegatedManagement %}
+
+        <h2 piwik-enriched-headline
+                >{{ 'MobileMessaging_Settings_SMSProvider'|translate }}</h2>
+        To manage your SMS provider go to your <a href="{{ linkTo({'action':'userSettings'}) }}">personal mobile messaging settings</a>.
+
+    {% elseif accountManagedByCurrentUser %}
+
+        <h2 piwik-enriched-headline
+                >{{ 'MobileMessaging_Settings_SMSProvider'|translate }}</h2>
+
+        {{ macro.manageSmsApi(credentialSupplied, creditLeft, smsProviders, provider) }}
+    {% endif %}
+
+    {% import 'ajaxMacros.twig' as ajax %}
+
+    <div style="margin-top:10px">
+        {{ ajax.errorDiv('ajaxErrorMobileMessagingSettings') }}
+    </div>
+
+    <h2>{{ 'MobileMessaging_PhoneNumbers'|translate }}</h2>
+    To manage your phone numbers go to your <a href="{{ linkTo({'action':'userSettings'}) }}">personal mobile messaging settings</a>.
+
     {{ ajax.loadingDiv('ajaxLoadingMobileMessagingSettings') }}
 
     <div class='ui-confirm' id='confirmDeleteAccount'>
diff --git a/plugins/MobileMessaging/templates/macros.twig b/plugins/MobileMessaging/templates/macros.twig
new file mode 100644
index 0000000000..e0c1d499c6
--- /dev/null
+++ b/plugins/MobileMessaging/templates/macros.twig
@@ -0,0 +1,33 @@
+{% macro manageSmsApi(credentialSupplied, creditLeft, smsProviders, provider) %}
+    {% if credentialSupplied %}
+        {{ 'MobileMessaging_Settings_CredentialProvided'|translate(provider) }}
+        {{ creditLeft }}
+        <br/>
+        {{ 'MobileMessaging_Settings_UpdateOrDeleteAccount'|translate("<a id='displayAccountForm'>","</a>","<a id='deleteAccount'>","</a>")|raw }}
+    {% else %}
+        {{ 'MobileMessaging_Settings_PleaseSignUp'|translate }}
+    {% endif %}
+    <div id='accountForm' {% if credentialSupplied %}style='display: none;'{% endif %}>
+        <br/>
+        {{ 'MobileMessaging_Settings_SMSProvider'|translate }}
+        <select id='smsProviders'>
+            {% for smsProvider, description in smsProviders %}
+                <option value='{{ smsProvider }}'>
+                    {{ smsProvider }}
+                </option>
+            {% endfor %}
+        </select>
+
+        {{ 'MobileMessaging_Settings_APIKey'|translate }}
+        <input size='25' id='apiKey'/>
+
+        <input type='submit' value='{{ 'General_Save'|translate }}' id='apiAccountSubmit' class='submit'/>
+
+        {% for smsProvider, description in smsProviders %}
+            <div class='providerDescription' id='{{ smsProvider }}'>
+                {{ description|raw }}
+            </div>
+        {% endfor %}
+
+    </div>
+{% endmacro %}
\ No newline at end of file
diff --git a/plugins/MobileMessaging/templates/userSettings.twig b/plugins/MobileMessaging/templates/userSettings.twig
new file mode 100644
index 0000000000..987683e739
--- /dev/null
+++ b/plugins/MobileMessaging/templates/userSettings.twig
@@ -0,0 +1,139 @@
+{% extends 'user.twig' %}
+
+{% block content %}
+
+    {% import 'ajaxMacros.twig' as ajax %}
+
+    <div style="margin-top:10px">
+        {{ ajax.errorDiv('ajaxErrorMobileMessagingSettings') }}
+    </div>
+
+    {% import '@MobileMessaging/macros.twig' as macro %}
+
+    {% if accountManagedByCurrentUser and delegatedManagement %}
+        <h2 piwik-enriched-headline
+                >{{ 'MobileMessaging_Settings_SMSProvider'|translate }}</h2>
+
+        {{ macro.manageSmsApi(credentialSupplied, creditLeft, smsProviders, provider) }}
+    {% endif %}
+
+    <h2>{{ 'MobileMessaging_PhoneNumbers'|translate }}</h2>
+    {% if not credentialSupplied %}
+        {% if accountManagedByCurrentUser and delegatedManagement %}
+            {{ 'MobileMessaging_Settings_CredentialNotProvided'|translate }}
+        {% elseif accountManagedByCurrentUser %}
+            Before you can create and manage phone numbers, please setup an SMS provider in <a href="{{ linkTo({'action': 'index'}) }}">admin mobile messaging settings</a>.
+        {% else %}
+            {{ 'MobileMessaging_Settings_CredentialNotProvidedByAdmin'|translate }}
+        {% endif %}
+    {% else %}
+        {{ 'MobileMessaging_Settings_PhoneNumbers_Help'|translate }}
+        <br/>
+        <br/>
+        <table style="width:900px;" class="adminTable">
+            <tbody>
+            <tr>
+                <td style="width:480px;">
+                    <strong>{{ 'MobileMessaging_Settings_PhoneNumbers_Add'|translate }}</strong>
+                    <br/><br/>
+
+                <span id="suspiciousPhoneNumber" style="display:none;">
+                    {{ 'MobileMessaging_Settings_SuspiciousPhoneNumber'|translate('54184032') }}
+                    <br/><br/>
+                </span>
+
+                    + <input id="countryCallingCode" size="4" maxlength="4"/>&nbsp;
+                    <input id="newPhoneNumber"/>
+                    <input type="submit" value='{{ 'General_Add'|translate }}'
+                           id="addPhoneNumberSubmit"/>
+                    <br/>
+
+		<span style=' font-size: 11px;'><span
+                    class="form-description">{{ 'MobileMessaging_Settings_CountryCode'|translate }}</span>
+			<span class="form-description"
+                  style="margin-left:50px;">{{ 'MobileMessaging_Settings_PhoneNumber'|translate }}</span></span>
+                    <br/><br/>
+
+                    {{ 'MobileMessaging_Settings_PhoneNumbers_CountryCode_Help'|translate }}
+
+                    <select id="countries">
+                        {# this is a trick to avoid selecting the first country when no default could be found #}
+                        <option value="">&nbsp;</option>
+                        {% for countryCode, country in countries %}
+                            <option value='{{ country.countryCallingCode }}'
+                                    {% if defaultCountry==countryCode %} selected="selected" {% endif %}
+                                    >
+                                {{ country.countryName }}
+                            </option>
+                        {% endfor %}
+                    </select>
+
+                </td>
+                <td style="width:220px;">
+                    {% import 'macros.twig' as piwik %}
+                    {{ piwik.inlineHelp(strHelpAddPhone) }}
+                </td>
+            </tr>
+            <tr>
+                <td colspan="2">
+
+                    {% if phoneNumbers|length > 0 %}
+                        <br/>
+                        <br/>
+                        <strong>{{ 'MobileMessaging_Settings_ManagePhoneNumbers'|translate }}</strong>
+                        <br/>
+                        <br/>
+                    {% endif %}
+
+                    {{ ajax.errorDiv('invalidVerificationCodeAjaxError') }}
+
+                    <div id='phoneNumberActivated' style="display:none;">
+                        {{ 'MobileMessaging_Settings_PhoneActivated'|translate }}
+                    </div>
+
+                    <div id='invalidActivationCode' style="display:none;">
+                        {{ 'MobileMessaging_Settings_InvalidActivationCode'|translate }}
+                    </div>
+
+                    <ul>
+                        {% for phoneNumber, validated in phoneNumbers %}
+                            <li>
+                                <span class='phoneNumber'>{{ phoneNumber }}</span>
+                                {% if not validated %}
+                                    <input class='verificationCode'/>
+                                    <input
+                                            type='submit'
+                                            value='{{ 'MobileMessaging_Settings_ValidatePhoneNumber'|translate }}'
+                                            class='validatePhoneNumberSubmit'
+                                            />
+                                {% endif %}
+                                <input
+                                        type='submit'
+                                        value='{{ 'General_Remove'|translate }}'
+                                        class='removePhoneNumberSubmit'
+                                        />
+                                {% if not validated %}
+                                    <br/>
+                                    <span class='form-description'>{{ 'MobileMessaging_Settings_VerificationCodeJustSent'|translate }}</span>
+                                {% endif %}
+                                <br/>
+                                <br/>
+                            </li>
+                        {% endfor %}
+                    </ul>
+
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    {% endif %}
+
+    {{ ajax.loadingDiv('ajaxLoadingMobileMessagingSettings') }}
+
+    <div class='ui-confirm' id='confirmDeleteAccount'>
+        <h2>{{ 'MobileMessaging_Settings_DeleteAccountConfirm'|translate }}</h2>
+        <input role='yes' type='button' value='{{ 'General_Yes'|translate }}'/>
+        <input role='no' type='button' value='{{ 'General_No'|translate }}'/>
+    </div>
+
+{% endblock %}
diff --git a/plugins/Monolog/Formatter/LineMessageFormatter.php b/plugins/Monolog/Formatter/LineMessageFormatter.php
new file mode 100644
index 0000000000..6b81f2daec
--- /dev/null
+++ b/plugins/Monolog/Formatter/LineMessageFormatter.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\Monolog\Formatter;
+
+use Monolog\Formatter\FormatterInterface;
+
+/**
+ * Formats a log message into a line of text using our custom Piwik log format.
+ */
+class LineMessageFormatter implements FormatterInterface
+{
+    /**
+     * The log message format string that turns a tag name, date-time and message into
+     * one string to log.
+     *
+     * @var string
+     */
+    private $logMessageFormat;
+
+    /**
+     * @param string $logMessageFormat
+     */
+    public function __construct($logMessageFormat)
+    {
+        $this->logMessageFormat = $logMessageFormat;
+    }
+
+    public function format(array $record)
+    {
+        $class = isset($record['extra']['class']) ? $record['extra']['class'] : '';
+        $date = $record['datetime']->format('Y-m-d H:i:s');
+
+        $message = $this->prefixMessageWithRequestId($record);
+
+        $message = str_replace(
+            array('%tag%', '%message%', '%datetime%', '%level%'),
+            array($class, $message, $date, $record['level_name']),
+            $this->logMessageFormat
+        );
+
+        $message = str_replace("\n", "\n  ", $message);
+
+        $message .= "\n";
+
+        return $message;
+    }
+
+    public function formatBatch(array $records)
+    {
+        foreach ($records as $key => $record) {
+            $records[$key] = $this->format($record);
+        }
+
+        return $records;
+    }
+
+    private function prefixMessageWithRequestId(array $record)
+    {
+        $requestId = isset($record['extra']['request_id']) ? $record['extra']['request_id'] : '';
+
+        $message = trim($record['message']);
+
+        if ($requestId) {
+            $message = '[' . $requestId . '] ' . $message;
+        }
+
+        return $message;
+    }
+}
diff --git a/plugins/Monolog/Handler/DatabaseHandler.php b/plugins/Monolog/Handler/DatabaseHandler.php
new file mode 100644
index 0000000000..99ccd68670
--- /dev/null
+++ b/plugins/Monolog/Handler/DatabaseHandler.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\Monolog\Handler;
+
+use Monolog\Handler\AbstractProcessingHandler;
+use Piwik\Common;
+use Piwik\Db;
+
+/**
+ * Writes log to database.
+ */
+class DatabaseHandler extends AbstractProcessingHandler
+{
+    protected function write(array $record)
+    {
+        $sql = sprintf(
+            'INSERT INTO %s (tag, timestamp, level, message) VALUES (?, ?, ?, ?)',
+            Common::prefixTable('logger_message')
+        );
+
+        $queryLog = Db::isQueryLogEnabled();
+        Db::enableQueryLog(false);
+
+        Db::query($sql, array(
+            $record['extra']['class'],
+            $record['datetime']->format('Y-m-d H:i:s'),
+            $record['level_name'],
+            trim($record['formatted'])
+        ));
+
+        Db::enableQueryLog($queryLog);
+    }
+}
diff --git a/plugins/Monolog/Handler/FileHandler.php b/plugins/Monolog/Handler/FileHandler.php
new file mode 100644
index 0000000000..abfd632365
--- /dev/null
+++ b/plugins/Monolog/Handler/FileHandler.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\Monolog\Handler;
+
+use Monolog\Handler\StreamHandler;
+use Piwik\Filechecks;
+
+/**
+ * Writes log to file.
+ *
+ * Extends StreamHandler to be able to have a custom exception message.
+ */
+class FileHandler extends StreamHandler
+{
+    protected function write(array $record)
+    {
+        try {
+            parent::write($record);
+        } catch (\UnexpectedValueException $e) {
+            throw new \Exception(
+                Filechecks::getErrorMessageMissingPermissions($this->url)
+            );
+        }
+    }
+}
diff --git a/plugins/Monolog/Handler/WebNotificationHandler.php b/plugins/Monolog/Handler/WebNotificationHandler.php
new file mode 100644
index 0000000000..7b3098d315
--- /dev/null
+++ b/plugins/Monolog/Handler/WebNotificationHandler.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\Monolog\Handler;
+
+use Monolog\Handler\AbstractProcessingHandler;
+use Monolog\Logger;
+use Piwik\Common;
+use Piwik\Notification;
+use Piwik\Notification\Manager;
+use Zend_Session_Exception;
+
+/**
+ * Writes log messages into HTML notification box.
+ */
+class WebNotificationHandler extends AbstractProcessingHandler
+{
+    protected function write(array $record)
+    {
+        switch ($record['level']) {
+            case Logger::EMERGENCY:
+            case Logger::ALERT:
+            case Logger::CRITICAL:
+            case Logger::ERROR:
+                $context = Notification::CONTEXT_ERROR;
+                break;
+            case Logger::WARNING:
+                $context = Notification::CONTEXT_WARNING;
+                break;
+            default:
+                $context = Notification::CONTEXT_INFO;
+                break;
+        }
+
+        $message = $record['level_name'] . ': ' . htmlentities($record['message']);
+
+        $notification = new Notification($message);
+        $notification->context = $context;
+        $notification->flags = 0;
+        try {
+            Manager::notify(Common::getRandomString(), $notification);
+        } catch (Zend_Session_Exception $e) {
+            // Can happen if this handler is enabled in CLI
+            // Silently ignore the error.
+        }
+    }
+}
diff --git a/plugins/Monolog/Monolog.php b/plugins/Monolog/Monolog.php
new file mode 100644
index 0000000000..79f42cdd41
--- /dev/null
+++ b/plugins/Monolog/Monolog.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\Monolog;
+
+use Piwik\Plugin;
+
+class Monolog extends Plugin
+{
+}
diff --git a/plugins/Monolog/Processor/ClassNameProcessor.php b/plugins/Monolog/Processor/ClassNameProcessor.php
new file mode 100644
index 0000000000..3365f207db
--- /dev/null
+++ b/plugins/Monolog/Processor/ClassNameProcessor.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\Monolog\Processor;
+
+use Piwik\Plugin;
+
+/**
+ * Records the name of the class that logged.
+ */
+class ClassNameProcessor
+{
+    private $skippedClasses = array(
+        __CLASS__,
+        'Piwik\Log',
+        'Piwik\Piwik',
+        'Piwik\CronArchive',
+        'Monolog\Logger',
+    );
+
+    public function __invoke(array $record)
+    {
+        $record['extra']['class'] = $this->getLoggingClassName();
+
+        return $record;
+    }
+
+    /**
+     * Returns the name of the plugin/class that triggered the log.
+     *
+     * @return string
+     */
+    private function getLoggingClassName()
+    {
+        $backtrace = $this->getBacktrace();
+
+        $name = Plugin::getPluginNameFromBacktrace($backtrace);
+
+        // if we can't determine the plugin, use the name of the calling class
+        if ($name == false) {
+            $name = $this->getClassNameThatIsLogging($backtrace);
+        }
+
+        return $name;
+    }
+
+    private function getClassNameThatIsLogging($backtrace)
+    {
+        foreach ($backtrace as $line) {
+            if (isset($line['class'])) {
+                return $line['class'];
+            }
+        }
+
+        return '';
+    }
+
+    private function getBacktrace()
+    {
+        if (version_compare(phpversion(), '5.3.6', '>=')) {
+            $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS | DEBUG_BACKTRACE_PROVIDE_OBJECT);
+        } else {
+            $backtrace = debug_backtrace();
+        }
+
+        $skippedClasses = $this->skippedClasses;
+        $backtrace = array_filter($backtrace, function ($item) use ($skippedClasses) {
+            if (isset($item['class'])) {
+                return !in_array($item['class'], $skippedClasses);
+            }
+            return true;
+        });
+
+        return $backtrace;
+    }
+}
diff --git a/plugins/Monolog/Processor/ExceptionToTextProcessor.php b/plugins/Monolog/Processor/ExceptionToTextProcessor.php
new file mode 100644
index 0000000000..daaaee479e
--- /dev/null
+++ b/plugins/Monolog/Processor/ExceptionToTextProcessor.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\Monolog\Processor;
+
+use Piwik\ErrorHandler;
+use Piwik\Log;
+
+/**
+ * Process a log record containing an exception to generate a textual message.
+ */
+class ExceptionToTextProcessor
+{
+    public function __invoke(array $record)
+    {
+        if (! $this->contextContainsException($record)) {
+            return $record;
+        }
+
+        /** @var \Exception $exception */
+        $exception = $record['context']['exception'];
+
+        $record['message'] = sprintf(
+            "%s(%d): %s\n%s",
+            $exception->getFile(),
+            $exception->getLine(),
+            $this->getMessage($exception),
+            $this->getStackTrace($exception)
+        );
+
+        return $record;
+    }
+
+    private function contextContainsException($record)
+    {
+        return isset($record['context']['exception'])
+            && $record['context']['exception'] instanceof \Exception;
+    }
+
+    private function getMessage(\Exception $exception)
+    {
+        if ($exception instanceof \ErrorException) {
+            return ErrorHandler::getErrNoString($exception->getSeverity()) . ' - ' . $exception->getMessage();
+        }
+
+        return $exception->getMessage();
+    }
+
+    private function getStackTrace(\Exception $exception)
+    {
+        return Log::$debugBacktraceForTests ?: $exception->getTraceAsString();
+    }
+}
diff --git a/plugins/Monolog/Processor/RequestIdProcessor.php b/plugins/Monolog/Processor/RequestIdProcessor.php
new file mode 100644
index 0000000000..f36568193a
--- /dev/null
+++ b/plugins/Monolog/Processor/RequestIdProcessor.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\Monolog\Processor;
+
+use Piwik\Common;
+
+/**
+ * Adds a unique "request id" to the log message to follow log entries for each HTTP request.
+ */
+class RequestIdProcessor
+{
+    private $currentRequestKey;
+
+    public function __invoke(array $record)
+    {
+        if (Common::isPhpCliMode()) {
+            return $record;
+        }
+
+        if (empty($this->currentRequestKey)) {
+            $this->currentRequestKey = substr(Common::generateUniqId(), 0, 5);
+        }
+
+        $record['extra']['request_id'] = $this->currentRequestKey;
+
+        return $record;
+    }
+}
diff --git a/plugins/Monolog/Processor/SprintfProcessor.php b/plugins/Monolog/Processor/SprintfProcessor.php
new file mode 100644
index 0000000000..dafa46e5ba
--- /dev/null
+++ b/plugins/Monolog/Processor/SprintfProcessor.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\Monolog\Processor;
+
+/**
+ * Processes a log message using `sprintf()`.
+ */
+class SprintfProcessor
+{
+    public function __invoke(array $record)
+    {
+        $message = $record['message'];
+        $parameters = $record['context'];
+
+        if (is_string($message) && !empty($parameters)) {
+            $parameters = $this->ensureParametersAreStrings($parameters);
+
+            $record['message'] = vsprintf($message, $parameters);
+        }
+
+        return $record;
+    }
+
+    private function ensureParametersAreStrings(array $parameters)
+    {
+        foreach ($parameters as &$param) {
+            if (is_array($param)) {
+                $param = json_encode($param);
+            }
+        }
+
+        return $parameters;
+    }
+}
diff --git a/plugins/Monolog/Processor/TokenProcessor.php b/plugins/Monolog/Processor/TokenProcessor.php
new file mode 100644
index 0000000000..0fd54892fc
--- /dev/null
+++ b/plugins/Monolog/Processor/TokenProcessor.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\Monolog\Processor;
+
+/**
+ * Removes any token_auth that might appear in the logs.
+ *
+ * Ideally the token_auth should never be logged, but...
+ */
+class TokenProcessor
+{
+    public function __invoke(array $record)
+    {
+        $record['message'] = preg_replace('/token_auth=[0-9a-h]+/', 'token_auth=removed', $record['message']);
+
+        return $record;
+    }
+}
diff --git a/plugins/Monolog/Test/Integration/Fixture/LoggerWrapper.php b/plugins/Monolog/Test/Integration/Fixture/LoggerWrapper.php
new file mode 100644
index 0000000000..0d5ea11264
--- /dev/null
+++ b/plugins/Monolog/Test/Integration/Fixture/LoggerWrapper.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\Monolog\Test\Integration\Fixture;
+
+use Piwik\Log;
+
+class LoggerWrapper
+{
+    public static function doLog($message)
+    {
+        Log::warning($message);
+    }
+}
diff --git a/plugins/Monolog/Test/Integration/LogTest.php b/plugins/Monolog/Test/Integration/LogTest.php
new file mode 100644
index 0000000000..cf0448a6e8
--- /dev/null
+++ b/plugins/Monolog/Test/Integration/LogTest.php
@@ -0,0 +1,249 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\Monolog\Test\Integration;
+
+use Exception;
+use Piwik\Common;
+use Piwik\Config;
+use Piwik\Container\ContainerFactory;
+use Piwik\Container\StaticContainer;
+use Piwik\Db;
+use Piwik\Log;
+use Piwik\Plugins\Monolog\Test\Integration\Fixture\LoggerWrapper;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+
+/**
+ * @group Core
+ * @group Log
+ */
+class LogTest extends IntegrationTestCase
+{
+    const TESTMESSAGE = 'test%smessage';
+    const STRING_MESSAGE_FORMAT = '[%tag%] %message%';
+    const STRING_MESSAGE_FORMAT_SPRINTF = "[%s] %s";
+
+    public static $expectedExceptionOutput = '[Monolog] LogTest.php(120): dummy error message
+  dummy backtrace';
+
+    public static $expectedErrorOutput = '[Monolog] dummyerrorfile.php(145): Unknown error (102) - dummy error string
+  dummy backtrace';
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        // Create the container in the normal environment (because in tests logging is disabled)
+        $containerFactory = new ContainerFactory();
+        $container = $containerFactory->create();
+        StaticContainer::set($container);
+        Log::unsetInstance();
+
+        Config::getInstance()->log['string_message_format'] = self::STRING_MESSAGE_FORMAT;
+        Config::getInstance()->log['logger_file_path'] = self::getLogFileLocation();
+        Config::getInstance()->log['log_level'] = Log::INFO;
+        @unlink(self::getLogFileLocation());
+        Log::$debugBacktraceForTests = "dummy backtrace";
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
+
+        StaticContainer::clearContainer();
+        Log::unsetInstance();
+
+        @unlink(self::getLogFileLocation());
+        Log::$debugBacktraceForTests = null;
+    }
+
+    /**
+     * Data provider for every test.
+     */
+    public function getBackendsToTest()
+    {
+        return array(
+            'file'     => array('file'),
+            'database' => array('database'),
+        );
+    }
+
+    /**
+     * @dataProvider getBackendsToTest
+     */
+    public function testLoggingWorksWhenMessageIsString($backend)
+    {
+        Config::getInstance()->log['log_writers'] = array($backend);
+
+        Log::warning(self::TESTMESSAGE);
+
+        $this->checkBackend($backend, self::TESTMESSAGE, $formatMessage = true, $tag = 'Monolog');
+    }
+
+    /**
+     * @dataProvider getBackendsToTest
+     */
+    public function testLoggingWorksWhenMessageIsSprintfString($backend)
+    {
+        Config::getInstance()->log['log_writers'] = array($backend);
+
+        Log::warning(self::TESTMESSAGE, " subst ");
+
+        $this->checkBackend($backend, sprintf(self::TESTMESSAGE, " subst "), $formatMessage = true, $tag = 'Monolog');
+    }
+
+    /**
+     * @dataProvider getBackendsToTest
+     */
+    public function testLoggingWorksWhenMessageIsError($backend)
+    {
+        Config::getInstance()->log['log_writers'] = array($backend);
+
+        $error = new \ErrorException("dummy error string", 0, 102, "dummyerrorfile.php", 145);
+        Log::error($error);
+
+        $this->checkBackend($backend, self::$expectedErrorOutput, $formatMessage = false, $tag = 'Monolog');
+    }
+
+    /**
+     * @dataProvider getBackendsToTest
+     */
+    public function testLoggingWorksWhenMessageIsException($backend)
+    {
+        Config::getInstance()->log['log_writers'] = array($backend);
+
+        $exception = new Exception("dummy error message");
+        Log::error($exception);
+
+        $this->checkBackend($backend, self::$expectedExceptionOutput, $formatMessage = false, $tag = 'Monolog');
+    }
+
+    /**
+     * @dataProvider getBackendsToTest
+     */
+    public function testLoggingCorrectlyIdentifiesPlugin($backend)
+    {
+        Config::getInstance()->log['log_writers'] = array($backend);
+
+        LoggerWrapper::doLog(self::TESTMESSAGE);
+
+        $this->checkBackend($backend, self::TESTMESSAGE, $formatMessage = true, 'Monolog');
+    }
+
+    /**
+     * @dataProvider getBackendsToTest
+     */
+    public function testLogMessagesIgnoredWhenNotWithinLevel($backend)
+    {
+        Config::getInstance()->log['log_writers'] = array($backend);
+        Config::getInstance()->log['log_level'] = 'ERROR';
+
+        Log::info(self::TESTMESSAGE);
+
+        $this->checkNoMessagesLogged($backend);
+    }
+
+    /**
+     * @dataProvider getBackendsToTest
+     */
+    public function testLogMessagesAreTrimmed($backend)
+    {
+        Config::getInstance()->log['log_writers'] = array($backend);
+
+        LoggerWrapper::doLog(" \n   ".self::TESTMESSAGE."\n\n\n   \n");
+
+        $this->checkBackend($backend, self::TESTMESSAGE, $formatMessage = true, 'Monolog');
+    }
+
+    /**
+     * @dataProvider getBackendsToTest
+     */
+    public function testTokenAuthIsRemoved($backend)
+    {
+        Config::getInstance()->log['log_writers'] = array($backend);
+
+        Log::error('token_auth=9b1cefc915ff6180071fb7dcd13ec5a4');
+
+        $this->checkBackend($backend, 'token_auth=removed', $formatMessage = true, $tag = 'Monolog');
+    }
+
+    /**
+     * The database logs requests at DEBUG level, so we check that there is no recursive
+     * loop (logger insert in databases, which logs the query, ...)
+     * @link https://github.com/piwik/piwik/issues/7017
+     */
+    public function testNoInfiniteLoopWhenLoggingToDatabase()
+    {
+        Config::getInstance()->log['log_writers'] = array('database');
+        Config::getInstance()->log['log_level'] = 'DEBUG';
+
+        Log::info(self::TESTMESSAGE);
+
+        $this->checkBackend('database', self::TESTMESSAGE, $formatMessage = true, $tag = 'Monolog');
+    }
+
+    private function checkBackend($backend, $expectedMessage, $formatMessage = false, $tag = false)
+    {
+        if ($formatMessage) {
+            $expectedMessage = sprintf(self::STRING_MESSAGE_FORMAT_SPRINTF, $tag, $expectedMessage);
+        }
+
+        if ($backend == 'file') {
+            $this->assertTrue(file_exists(self::getLogFileLocation()));
+
+            $fileContents = file_get_contents(self::getLogFileLocation());
+            $fileContents = $this->removePathsFromBacktrace($fileContents);
+
+            $this->assertEquals($expectedMessage . "\n", $fileContents);
+        } else if ($backend == 'database') {
+            $queryLog = Db::isQueryLogEnabled();
+            Db::enableQueryLog(false);
+
+            $count = Db::fetchOne("SELECT COUNT(*) FROM " . Common::prefixTable('logger_message'));
+            $this->assertEquals(1, $count);
+
+            $message = Db::fetchOne("SELECT message FROM " . Common::prefixTable('logger_message') . " LIMIT 1");
+            $message = $this->removePathsFromBacktrace($message);
+            $this->assertEquals($expectedMessage, $message);
+
+            $tagInDb = Db::fetchOne("SELECT tag FROM " . Common::prefixTable('logger_message') . " LIMIT 1");
+            if ($tag === false) {
+                $this->assertEmpty($tagInDb);
+            } else {
+                $this->assertEquals($tag, $tagInDb);
+            }
+
+            Db::enableQueryLog($queryLog);
+        }
+    }
+
+    private function checkNoMessagesLogged($backend)
+    {
+        if ($backend == 'file') {
+            $this->assertFalse(file_exists(self::getLogFileLocation()));
+        } else if ($backend == 'database') {
+            $this->assertEquals(0, Db::fetchOne("SELECT COUNT(*) FROM " . Common::prefixTable('logger_message')));
+        }
+    }
+
+    private function removePathsFromBacktrace($content)
+    {
+        return preg_replace_callback("/(?:\/[^\s(<>]+)*\//", function ($matches) {
+            if ($matches[0] == '/') {
+                return '/';
+            } else {
+                return '';
+            }
+        }, $content);
+    }
+
+    public static function getLogFileLocation()
+    {
+        return StaticContainer::get('path.tmp') . '/logs/piwik.test.log';
+    }
+}
diff --git a/plugins/Monolog/Test/Unit/Formatter/LineMessageFormatterTest.php b/plugins/Monolog/Test/Unit/Formatter/LineMessageFormatterTest.php
new file mode 100644
index 0000000000..2b53633e6d
--- /dev/null
+++ b/plugins/Monolog/Test/Unit/Formatter/LineMessageFormatterTest.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\Monolog\Test\Unit\Formatter;
+
+use DateTime;
+use Piwik\Plugins\Monolog\Formatter\LineMessageFormatter;
+
+/**
+ * @group Log
+ * @covers \Piwik\Plugins\Monolog\Formatter\LineMessageFormatter
+ */
+class LineMessageFormatterTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @test
+     */
+    public function it_should_format_with_placeholders()
+    {
+        $formatter = new LineMessageFormatter('%level% %tag% %datetime% %message%');
+
+        $record = array(
+            'message'    => 'Hello world',
+            'datetime'   => DateTime::createFromFormat('U', 0),
+            'level_name' => 'ERROR',
+            'extra'      => array(
+                'class' => 'Foo'
+            ),
+        );
+
+        $formatted = "ERROR Foo 1970-01-01 00:00:00 Hello world\n";
+
+        $this->assertEquals($formatted, $formatter->format($record));
+    }
+
+    /**
+     * @test
+     */
+    public function it_should_insert_request_id_if_defined()
+    {
+        $formatter = new LineMessageFormatter('%message%');
+
+        $record = array(
+            'message'    => 'Hello world',
+            'datetime'   => DateTime::createFromFormat('U', 0),
+            'level_name' => 'ERROR',
+            'extra'      => array(
+                'request_id' => 'request id'
+            ),
+        );
+
+        $formatted = "[request id] Hello world\n";
+
+        $this->assertEquals($formatted, $formatter->format($record));
+    }
+
+    /**
+     * @test
+     */
+    public function it_should_indent_multiline_message()
+    {
+        $formatter = new LineMessageFormatter('%message%');
+
+        $record = array(
+            'message'    => "Hello world\ntest\ntest",
+            'datetime'   => DateTime::createFromFormat('U', 0),
+            'level_name' => 'ERROR',
+        );
+
+        $formatted = <<<LOG
+Hello world
+  test
+  test
+
+LOG;
+
+        $this->assertEquals($formatted, $formatter->format($record));
+    }
+}
diff --git a/plugins/Monolog/Test/Unit/Processor/ClassNameProcessorTest.php b/plugins/Monolog/Test/Unit/Processor/ClassNameProcessorTest.php
new file mode 100644
index 0000000000..b1b307a4d7
--- /dev/null
+++ b/plugins/Monolog/Test/Unit/Processor/ClassNameProcessorTest.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\Monolog\Test\Unit\Processor;
+
+use Piwik\Plugins\Monolog\Processor\ClassNameProcessor;
+
+/**
+ * @group Log
+ * @covers \Piwik\Plugins\Monolog\Processor\ClassNameProcessor
+ */
+class ClassNameProcessorTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @test
+     */
+    public function it_should_append_classname_to_extra()
+    {
+        $processor = new ClassNameProcessor();
+
+        $result = $processor(array(
+            'extra' => array(
+                'foo' => 'bar',
+            ),
+        ));
+
+        $expected = array(
+            'extra' => array(
+                'foo' => 'bar',
+                'class' => 'Monolog',
+            ),
+        );
+
+        $this->assertEquals($expected, $result);
+    }
+}
diff --git a/plugins/Monolog/Test/Unit/Processor/ExceptionToTextProcessorTest.php b/plugins/Monolog/Test/Unit/Processor/ExceptionToTextProcessorTest.php
new file mode 100644
index 0000000000..5620325ef5
--- /dev/null
+++ b/plugins/Monolog/Test/Unit/Processor/ExceptionToTextProcessorTest.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\Monolog\Test\Unit\Processor;
+
+use Piwik\Log;
+use Piwik\Plugins\Monolog\Processor\ExceptionToTextProcessor;
+
+/**
+ * @group Log
+ * @covers \Piwik\Plugins\Monolog\Processor\ExceptionToTextProcessor
+ */
+class ExceptionToTextProcessorTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @test
+     */
+    public function it_should_skip_if_no_exception()
+    {
+        $processor = new ExceptionToTextProcessor();
+
+        $record = array('message' => 'Hello world');
+
+        $this->assertEquals($record, $processor($record));
+    }
+
+    /**
+     * @test
+     */
+    public function it_should_replace_message_with_formatted_exception()
+    {
+        $processor = new ExceptionToTextProcessor();
+        Log::$debugBacktraceForTests = '[stack trace]';
+
+        $exception = new \Exception('Hello world');
+        $record = array(
+            'context' => array(
+                'exception' => $exception,
+            ),
+        );
+
+        $result = $processor($record);
+
+        $expected = array(
+            'message' => __FILE__ . "(40): Hello world\n[stack trace]",
+            'context' => array(
+                'exception' => $exception,
+            ),
+        );
+
+        $this->assertEquals($expected, $result);
+    }
+
+    /**
+     * @test
+     */
+    public function it_should_add_severity_for_errors()
+    {
+        $processor = new ExceptionToTextProcessor();
+        Log::$debugBacktraceForTests = '[stack trace]';
+
+        $exception = new \ErrorException('Hello world', 0, 1, 'file.php', 123);
+        $record = array(
+            'context' => array(
+                'exception' => $exception,
+            ),
+        );
+
+        $result = $processor($record);
+
+        $expected = array(
+            'message' => "file.php(123): Error - Hello world\n[stack trace]",
+            'context' => array(
+                'exception' => $exception,
+            ),
+        );
+
+        $this->assertEquals($expected, $result);
+    }
+}
diff --git a/plugins/Monolog/Test/Unit/Processor/RequestIdProcessorTest.php b/plugins/Monolog/Test/Unit/Processor/RequestIdProcessorTest.php
new file mode 100644
index 0000000000..3fc3c6a2f9
--- /dev/null
+++ b/plugins/Monolog/Test/Unit/Processor/RequestIdProcessorTest.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\Monolog\Test\Unit\Processor;
+
+use PHPUnit_Framework_TestCase;
+use Piwik\Common;
+use Piwik\Plugins\Monolog\Processor\RequestIdProcessor;
+
+/**
+ * @group Log
+ * @covers \Piwik\Plugins\Monolog\Processor\RequestIdProcessor
+ */
+class RequestIdProcessorTest extends \PHPUnit_Framework_TestCase
+{
+    public function setUp()
+    {
+        parent::setUp();
+        Common::$isCliMode = false;
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
+        Common::$isCliMode = true;
+    }
+
+    /**
+     * @test
+     */
+    public function it_should_append_request_id_to_extra()
+    {
+        $processor = new RequestIdProcessor();
+
+        $result = $processor(array());
+
+        $this->assertArrayHasKey('request_id', $result['extra']);
+        $this->assertInternalType('string', $result['extra']['request_id']);
+        $this->assertNotEmpty($result['extra']['request_id']);
+    }
+
+    /**
+     * @test
+     */
+    public function request_id_should_stay_the_same()
+    {
+        $processor = new RequestIdProcessor();
+
+        $result = $processor(array());
+        $id1 = $result['extra']['request_id'];
+
+        $result = $processor(array());
+        $id2 = $result['extra']['request_id'];
+
+        $this->assertEquals($id1, $id2);
+    }
+}
diff --git a/plugins/Monolog/Test/Unit/Processor/SprintfProcessorTest.php b/plugins/Monolog/Test/Unit/Processor/SprintfProcessorTest.php
new file mode 100644
index 0000000000..27ac6cbd02
--- /dev/null
+++ b/plugins/Monolog/Test/Unit/Processor/SprintfProcessorTest.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\Monolog\Test\Unit\Processor;
+
+use Piwik\Plugins\Monolog\Processor\SprintfProcessor;
+
+/**
+ * @group Log
+ * @covers \Piwik\Plugins\Monolog\Processor\SprintfProcessor
+ */
+class SprintfProcessorTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @test
+     */
+    public function it_should_replace_placeholders()
+    {
+        $result = $this->process(array(
+            'message' => 'Test %s and %s.',
+            'context' => array('here', 'there'),
+        ));
+
+        $this->assertEquals('Test here and there.', $result['message']);
+    }
+
+    /**
+     * @test
+     */
+    public function it_should_ignore_strings_without_placeholders()
+    {
+        $result = $this->process(array(
+            'message' => 'Hello world!',
+            'context' => array('foo', 'bar'),
+        ));
+
+        $this->assertEquals('Hello world!', $result['message']);
+    }
+
+    /**
+     * @test
+     */
+    public function it_should_serialize_arrays()
+    {
+        $result = $this->process(array(
+            'message' => 'Error in the following modules: %s',
+            'context' => array(array('import', 'export')),
+        ));
+
+        $this->assertEquals('Error in the following modules: ["import","export"]', $result['message']);
+    }
+
+    private function process($record)
+    {
+        $processor = new SprintfProcessor();
+        return $processor($record);
+    }
+}
diff --git a/plugins/Monolog/Test/Unit/Processor/TokenProcessorTest.php b/plugins/Monolog/Test/Unit/Processor/TokenProcessorTest.php
new file mode 100644
index 0000000000..574aaa64cb
--- /dev/null
+++ b/plugins/Monolog/Test/Unit/Processor/TokenProcessorTest.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\Monolog\Test\Unit\Processor;
+
+use Piwik\Plugins\Monolog\Processor\TokenProcessor;
+
+/**
+ * @group Log
+ * @covers \Piwik\Plugins\Monolog\Processor\TokenProcessor
+ */
+class TokenProcessorTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @test
+     */
+    public function it_should_remove_token()
+    {
+        $result = $this->process(array(
+            'message' => '&token_auth=9b1cefc915ff6180071fb7dcd13ec5a4&trigger=archivephp',
+        ));
+
+        $this->assertEquals('&token_auth=removed&trigger=archivephp', $result['message']);
+    }
+
+    /**
+     * @test
+     */
+    public function it_should_remove_multiple_tokens()
+    {
+        $result = $this->process(array(
+            'message' => 'First token_auth=9b1cefc915ff6180071fb7dcd13ec5a4 and second token_auth=abec834efc915ff61801fb7dcd13ec',
+        ));
+
+        $this->assertEquals('First token_auth=removed and second token_auth=removed', $result['message']);
+    }
+
+    /**
+     * @test
+     */
+    public function it_should_not_affect_other_strings()
+    {
+        $result = $this->process(array(
+            'message' => 'Please check your token_auth.',
+        ));
+
+        $this->assertEquals('Please check your token_auth.', $result['message']);
+    }
+
+    private function process($record)
+    {
+        $processor = new TokenProcessor();
+        return $processor($record);
+    }
+}
diff --git a/plugins/Monolog/config/config.php b/plugins/Monolog/config/config.php
new file mode 100644
index 0000000000..b95a143c97
--- /dev/null
+++ b/plugins/Monolog/config/config.php
@@ -0,0 +1,100 @@
+<?php
+
+use Interop\Container\ContainerInterface;
+use Monolog\Logger;
+use Piwik\Log;
+
+return array(
+
+    'Psr\Log\LoggerInterface' => DI\object('Monolog\Logger')
+        ->constructor('piwik', DI\link('log.handlers'), DI\link('log.processors')),
+
+    'log.handlers' => DI\factory(function (ContainerInterface $c) {
+        if ($c->has('ini.log.log_writers')) {
+            $writerNames = $c->get('ini.log.log_writers');
+        } else {
+            return array();
+        }
+        $classes = array(
+            'file'     => 'Piwik\Plugins\Monolog\Handler\FileHandler',
+            'screen'   => 'Piwik\Plugins\Monolog\Handler\WebNotificationHandler',
+            'database' => 'Piwik\Plugins\Monolog\Handler\DatabaseHandler',
+        );
+        $writerNames = array_map('trim', $writerNames);
+        $writers = array();
+        foreach ($writerNames as $writerName) {
+            if (isset($classes[$writerName])) {
+                $writers[$writerName] = $c->get($classes[$writerName]);
+            }
+        }
+        return array_values($writers);
+    }),
+
+    'log.processors' => array(
+        DI\link('Piwik\Plugins\Monolog\Processor\ClassNameProcessor'),
+        DI\link('Piwik\Plugins\Monolog\Processor\RequestIdProcessor'),
+        DI\link('Piwik\Plugins\Monolog\Processor\ExceptionToTextProcessor'),
+        DI\link('Piwik\Plugins\Monolog\Processor\SprintfProcessor'),
+        DI\link('Monolog\Processor\PsrLogMessageProcessor'),
+        DI\link('Piwik\Plugins\Monolog\Processor\TokenProcessor'),
+    ),
+
+    'Piwik\Plugins\Monolog\Handler\FileHandler' => DI\object()
+        ->constructor(DI\link('log.file.filename'), DI\link('log.level'))
+        ->method('setFormatter', DI\link('Piwik\Plugins\Monolog\Formatter\LineMessageFormatter')),
+
+    'Piwik\Plugins\Monolog\Handler\DatabaseHandler' => DI\object()
+        ->constructor(DI\link('log.level'))
+        ->method('setFormatter', DI\link('Piwik\Plugins\Monolog\Formatter\LineMessageFormatter')),
+
+    'Piwik\Plugins\Monolog\Handler\WebNotificationHandler' => DI\object()
+        ->constructor(DI\link('log.level'))
+        ->method('setFormatter', DI\link('Piwik\Plugins\Monolog\Formatter\LineMessageFormatter')),
+
+    'log.level' => DI\factory(function (ContainerInterface $c) {
+        if ($c->has('ini.log.log_level')) {
+            $level = strtoupper($c->get('ini.log.log_level'));
+            if (!empty($level) && defined('Piwik\Log::'.strtoupper($level))) {
+                return Log::getMonologLevel(constant('Piwik\Log::'.strtoupper($level)));
+            }
+        }
+        return Logger::WARNING;
+    }),
+
+    'log.file.filename' => DI\factory(function (ContainerInterface $c) {
+        $logPath = $c->get('ini.log.logger_file_path');
+
+        // Absolute path
+        if (strpos($logPath, '/') === 0) {
+            return $logPath;
+        }
+
+        // Remove 'tmp/' at the beginning
+        if (strpos($logPath, 'tmp/') === 0) {
+            $logPath = substr($logPath, strlen('tmp'));
+        }
+
+        if (empty($logPath)) {
+            // Default log file
+            $logPath = '/logs/piwik.log';
+        }
+
+        $logPath = $c->get('path.tmp') . $logPath;
+        if (is_dir($logPath)) {
+            $logPath .= '/piwik.log';
+        }
+
+        return $logPath;
+    }),
+
+    'Piwik\Plugins\Monolog\Formatter\LineMessageFormatter' => DI\object()
+        ->constructor(DI\link('log.format')),
+
+    'log.format' => DI\factory(function (ContainerInterface $c) {
+        if ($c->has('ini.log.string_message_format')) {
+            return $c->get('ini.log.string_message_format');
+        }
+        return '%level% %tag%[%datetime%] %message%';
+    }),
+
+);
diff --git a/plugins/Monolog/plugin.json b/plugins/Monolog/plugin.json
new file mode 100644
index 0000000000..6b0e612b7b
--- /dev/null
+++ b/plugins/Monolog/plugin.json
@@ -0,0 +1,3 @@
+{
+    "description": "Adds logging capabilities to Piwik."
+}
\ No newline at end of file
diff --git a/plugins/Morpheus/javascripts/layout.js b/plugins/Morpheus/javascripts/layout.js
new file mode 100644
index 0000000000..c155945ea9
--- /dev/null
+++ b/plugins/Morpheus/javascripts/layout.js
@@ -0,0 +1,32 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+$(function () {
+    var contentUser = $('#content.user');
+
+    function adjustSize(content)
+    {
+        var width = $('body').width() - content.offset().left - 10;
+        content.css('width', width + 'px');
+    }
+
+    if (contentUser.length) {
+        adjustSize(contentUser);
+        $(window).resize(function () {
+            adjustSize(contentUser);
+        });
+    }
+
+    var contentAdmin = $('#content.admin');
+
+    if (contentAdmin.length) {
+        adjustSize(contentAdmin);
+        $(window).resize(function () {
+            adjustSize(contentAdmin);
+        });
+    }
+});
\ No newline at end of file
diff --git a/plugins/Morpheus/javascripts/piwikHelper.js b/plugins/Morpheus/javascripts/piwikHelper.js
index 8e89039dd0..4f851092b9 100644
--- a/plugins/Morpheus/javascripts/piwikHelper.js
+++ b/plugins/Morpheus/javascripts/piwikHelper.js
@@ -82,6 +82,13 @@ var piwikHelper = {
         return value;
     },
 
+    escape: function (value)
+    {
+        var escape = angular.element(document).injector().get('$sanitize');
+
+        return escape(value);
+    },
+
 	/**
 	 * Add break points to a string so that it can be displayed more compactly
 	 */
diff --git a/plugins/Morpheus/stylesheets/general/_admin.less b/plugins/Morpheus/stylesheets/general/_admin.less
index 0a3b21cd88..3d6aa21f61 100644
--- a/plugins/Morpheus/stylesheets/general/_admin.less
+++ b/plugins/Morpheus/stylesheets/general/_admin.less
@@ -5,6 +5,9 @@
         background-image: none;
         padding-left: 0;
         border-top: 0;
+        > li:first-child span {
+          border-bottom: 3px solid @theme-color-brand;
+        }
         > li {
             padding-bottom: 0px;
             > span {
@@ -15,10 +18,12 @@
                 padding: 12px 15px;
             }
             ul {
+                background-color: @theme-color-menu-contrast-background;
+
                 li {
                     a {
                         color: @theme-color-text-lighter !important;
-                        padding: 0.6em 1.1em;
+                        padding: 0.8em 1.1em;
                         &:hover {
                             color: @theme-color-text;
                             text-decoration: none;
@@ -90,21 +95,40 @@
     color: @theme-color-link;
 }
 
+.admin .adminTable a {
+  color: @theme-color-text;
+  text-decoration: underline;
+}
+
+.admin .adminTable .ui-inline-help a {
+  color: @theme-color-link;
+  text-decoration: none;
+}
+
 .addRowSite,
 .addrow {
     cursor: pointer;
 }
 
+.addrow:hover {
+  text-decoration: underline;
+}
+
 .addrow {
-    margin-top: 10px;
+    margin-top: 16px;
 }
 
 .addRowSite {
     display: inline-block;
     margin: 5px 0;
+    text-decoration: none !important;
     &:before {
         content: url(plugins/Morpheus/images/add.png) !important;
     }
+
+    &:hover {
+      text-decoration: underline !important;
+    }
 }
 
 code {
diff --git a/plugins/Morpheus/stylesheets/general/_default.less b/plugins/Morpheus/stylesheets/general/_default.less
index 002551ecd1..fb90462808 100644
--- a/plugins/Morpheus/stylesheets/general/_default.less
+++ b/plugins/Morpheus/stylesheets/general/_default.less
@@ -32,7 +32,7 @@ blockquote, q {
 }
 
 code {
-  background-color:#F6F9F9;
+  background-color:@theme-color-background-base;
   border: 1px dashed;
   border-left: 5px solid  #4B4BD5;
   direction:ltr;
@@ -51,7 +51,7 @@ pre.code-pre {
 
 /* remember to define focus styles! */
 :focus {
-    outline: 0;
+    outline: auto;
 }
 
 /* remember to highlight inserts somehow! */
@@ -75,7 +75,7 @@ textarea {
 input, select, textarea {
   border-radius: 4px;
   border: 1px solid #d4d4d4;
-  background: #fff url(plugins/Morpheus/images/inp_bg.png) repeat-x 0 0;
+  background: @theme-color-background-base url(plugins/Morpheus/images/inp_bg.png) repeat-x 0 0;
   padding: 3px 10px;
   color: #255792;
   margin-bottom: 3px;
@@ -112,4 +112,4 @@ a {
 /* Make sure the scroll bar is always displayed so the content does not shift when reloading menu with/without scrollbar */
 html {
   overflow-y: scroll;
-}
\ No newline at end of file
+}
diff --git a/plugins/Morpheus/stylesheets/general/_form.less b/plugins/Morpheus/stylesheets/general/_form.less
index b06018c0eb..f4b2acbdae 100644
--- a/plugins/Morpheus/stylesheets/general/_form.less
+++ b/plugins/Morpheus/stylesheets/general/_form.less
@@ -9,12 +9,14 @@
 
 /* on admin screen, Save button aligned on the left */
 .admin .submit {
-  margin-left: 50px;
+  margin-left: 0px;
+  margin-top: 20px;
   float: none;
 }
 
 .admin .entityContainer .submit {
   margin: 0;
+  margin-top: 20px;
 }
 
 .entityContainer .link_but {
@@ -88,8 +90,6 @@ table.entityTable tr td a {
 
 /* cancel button below Forms */
 .entityCancel {
-  float: right;
-  clear: both;
   padding: 10px 0;
   font-size: 12px;
 }
@@ -102,7 +102,7 @@ table.entityTable tr td a {
 }
 
 .entityList ul li {
-  background: #fff url(plugins/Morpheus/images/li_dbl_gray.gif) no-repeat 6px 10px;
+  background: @theme-color-background-base url(plugins/Morpheus/images/li_dbl_gray.gif) no-repeat 6px 10px;
   padding: 0 0 0 21px;
   line-height: 22px;
 }
@@ -119,4 +119,4 @@ table.entityTable tr td a {
 
 .entityList ul.listCircle li a {
   color: #000;
-}
\ No newline at end of file
+}
diff --git a/plugins/Morpheus/stylesheets/general/_forms.less b/plugins/Morpheus/stylesheets/general/_forms.less
index 475c72d9f7..3a23231bcc 100644
--- a/plugins/Morpheus/stylesheets/general/_forms.less
+++ b/plugins/Morpheus/stylesheets/general/_forms.less
@@ -5,7 +5,7 @@ input:not([type="checkbox"]), select, textarea {
     padding: 8px 10px;
     min-height: 30px;
     .box-sizing(border-box);
-    background: #fff;
+    background: @theme-color-background-base;
 }
 button,
 .add-trusted-host,
@@ -64,7 +64,10 @@ button[type="button"],
         min-height: 30px;
         .box-sizing(border-box);
         a {
-            color: @theme-color-text;
+          color: @theme-color-text;
+          &:hover {
+            text-decoration: none;
+          }
         }
         .custom_select_block {
             .custom_select_container{
@@ -109,7 +112,7 @@ button[type="button"],
     }
     > div {
         .border-radius(2px);
-        background-color: #fff;
+        background-color: @theme-color-background-base;
         .font-default(10px, 12px);
         background: none;
         padding: 2px 14px 2px 1px;
diff --git a/plugins/Morpheus/stylesheets/general/_jqueryUI.less b/plugins/Morpheus/stylesheets/general/_jqueryUI.less
index d0036d6b60..cff51214c5 100644
--- a/plugins/Morpheus/stylesheets/general/_jqueryUI.less
+++ b/plugins/Morpheus/stylesheets/general/_jqueryUI.less
@@ -152,7 +152,7 @@ div.ui-state-highlight {
 .ui-state-default {
   border: 1px solid #f2f6f9 !important;
   border-right: 0 !important;
-  background: #fff !important;
+  background: @theme-color-background-base !important;
   color: #000 !important;
   text-align: center !important;
 }
@@ -190,6 +190,12 @@ td.ui-datepicker-other-month.ui-state-hover.ui-datepicker-current-period {
   background: #978c7c !important;
 }
 
+.ui-datepicker select.ui-datepicker-month {
+  width: 46%;
+}
+.ui-datepicker select.ui-datepicker-year {
+  width: 54%;
+}
 .ui-datepicker-month:disabled {
   border-color: #ccc !important;
   background: #f5f3f0 !important;
@@ -259,4 +265,4 @@ body .ui-tooltip.small {
 
 .ui-dialog ~ .ui-dialog {
   border: 1px solid #aaa;
-}
\ No newline at end of file
+}
diff --git a/plugins/Morpheus/stylesheets/less/_colors.less b/plugins/Morpheus/stylesheets/less/_colors.less
index 2dedd81839..e5afd49c6b 100644
--- a/plugins/Morpheus/stylesheets/less/_colors.less
+++ b/plugins/Morpheus/stylesheets/less/_colors.less
@@ -21,7 +21,7 @@
 // Brand colors
 // Variable pattern: @color-<color>-<modifier>
 @color-black-piwik:               #0d0d0d;
-@color-blue-piwik:                #1e93d1;
+@color-blue-piwik:                #4183C4;
 @color-red-piwik:                 #d4291f;
 @color-green-brandSocial:         #009874;
 @color-blue-brandSocial:          #3b5998;
diff --git a/plugins/Morpheus/stylesheets/simple_structure.css b/plugins/Morpheus/stylesheets/simple_structure.css
index 65e6d276b7..6198916ad6 100644
--- a/plugins/Morpheus/stylesheets/simple_structure.css
+++ b/plugins/Morpheus/stylesheets/simple_structure.css
@@ -97,4 +97,4 @@ a { color: #006; }
 }
 .indented-radio-button {
   margin-left:20px;
-}
\ No newline at end of file
+}
diff --git a/plugins/Morpheus/stylesheets/theme.less b/plugins/Morpheus/stylesheets/theme.less
index 4b0b3d0020..c4cbdec5a6 100644
--- a/plugins/Morpheus/stylesheets/theme.less
+++ b/plugins/Morpheus/stylesheets/theme.less
@@ -229,14 +229,14 @@ table.entityTable tr td a:hover {
     position: relative;
   }
   .dropdown-body {
-    background:#fff;
+    background:@theme-color-background-base;
     padding:0 10px;
     .border-radius(0px);
     border: 1px solid @color-silver-l80;
     border-top-width: 0px;
   }
   &:hover .dropdown-body {
-    background:#fff;
+    background:@theme-color-background-base;
     border-color: @color-silver-l80;
   }
   .segmentationContainer {
@@ -272,7 +272,7 @@ table.entityTable tr td a:hover {
           color: @theme-color-text-light;
           &:hover {
               border-color: @color-silver-l80 !important;
-              background: #fff !important;
+              background:@theme-color-background-base !important;
               .border-radius(0px);
           }
           }
@@ -298,7 +298,7 @@ table.entityTable tr td a:hover {
   #Dashboard {
     ul {
 
-      background: #fff;
+      background: @theme-color-background-base;
       border: 1px solid @color-silver-l80;
       padding: 8px 10px 8px 10px;
       color: @theme-color-text-light;
@@ -347,7 +347,7 @@ table.dataTable {
     thead {
         tr {
             th {
-                background: #fff;
+                background: @theme-color-background-base;
                 text-transform: uppercase;
                 color: @theme-color-text;
                 .font-default(10px, 12px);
@@ -418,6 +418,10 @@ table.dataTable {
                 text-decoration: none !important;
                 color: @theme-color-link;
                 width: inherit;
+
+              &.withIcon {
+                  color: @theme-color-text;
+              }
             }
 
             div.label,
@@ -437,13 +441,13 @@ table.dataTable {
         &.subDataTable:hover > td.labeleven,
         &.subDataTable:hover > td.columneven,
         td.cellSubDataTable {
-          background-color: #fff !important;
+          background-color: @theme-color-background-base !important;
         }
     }
 
     &.entityTable tr {
         td  {
-            background-color: #fff !important;
+            background-color: @theme-color-background-base !important;
         }
         &.inactive-plugin td,
         &:hover td {
@@ -456,7 +460,7 @@ table.dataTable {
     }
 }
 
-div.dataTableVizHtmlTable:not(.dataTableActions) {
+div.dataTableVizHtmlTable:not(.dataTableActions), div.dataTableVizAllColumns {
   tr.subDataTable > td:first-child:before {
     display: inline-block;
     float: left;
@@ -685,10 +689,10 @@ div.sparkline {
             }
 
             ol {
-                background: #fff !important;
+                background: @theme-color-background-base !important;
                 border-top: 0 !important;
                 li {
-                    background: #fff !important;
+                    background: @theme-color-background-base !important;
                     .font-default(11px, 19px);
                     font-weight: normal;
                     color: @theme-color-text-lighter;
diff --git a/plugins/Morpheus/stylesheets/ui/_components.less b/plugins/Morpheus/stylesheets/ui/_components.less
index 76db939f73..7e93cf057b 100644
--- a/plugins/Morpheus/stylesheets/ui/_components.less
+++ b/plugins/Morpheus/stylesheets/ui/_components.less
@@ -1,5 +1,5 @@
 //colors calendar
-@calendarHeaderBackground: #fff;
+@calendarHeaderBackground: @theme-color-background-base;
 @calendarHeaderColor: #999;
 @calendarCurrentStateHover: #f5f5f5;
 @calendarBorder: #ccc;
@@ -222,7 +222,7 @@
     border: 1px solid @color-silver-l80;
     padding: 8px 10px 8px 10px;
     height: auto;
-    background: #fff;
+    background: @theme-color-background-base;
     .border-radius(0px);
     .header_short {
         .font-default(10px, 12px);
@@ -287,7 +287,7 @@
         margin: 27px 0 0 319px;
         width: 258px;
         height: 390px;
-        background: #fff;
+        background: @theme-color-background-base;
         h2 {
             color: #1e93d1;
             border-bottom: 1px solid @color-gray;
@@ -348,7 +348,7 @@ table.dataTable tr td .dataTableRowActions {
 
 table.dataTable tr td.labeleven .dataTableRowActions {
   a.rightmost, a {
-    background-color: #fff !important;
+    background-color: @theme-color-background-base !important;
   }
 }
 
diff --git a/plugins/Morpheus/stylesheets/ui/_popups.less b/plugins/Morpheus/stylesheets/ui/_popups.less
index dc2b2140de..78515cfab4 100644
--- a/plugins/Morpheus/stylesheets/ui/_popups.less
+++ b/plugins/Morpheus/stylesheets/ui/_popups.less
@@ -9,8 +9,7 @@
     font-weight: bold;
 }
 
-#feedback-sent,
-#feedback-faq {
+#feedback-sent {
     a {
         color: @theme-color-link;
     }
diff --git a/plugins/Morpheus/stylesheets/uibase/_headerMessage.less b/plugins/Morpheus/stylesheets/uibase/_headerMessage.less
index e2f9a13997..41cdc726b9 100644
--- a/plugins/Morpheus/stylesheets/uibase/_headerMessage.less
+++ b/plugins/Morpheus/stylesheets/uibase/_headerMessage.less
@@ -3,7 +3,7 @@
   z-index: 0;
   cursor: default;
   position: absolute;
-  right: 1px;
+  right: 0px;
   overflow: hidden;
   display: block;
   height: 20px;
diff --git a/plugins/Morpheus/templates/admin.twig b/plugins/Morpheus/templates/admin.twig
index cf93077218..00c7b4b963 100644
--- a/plugins/Morpheus/templates/admin.twig
+++ b/plugins/Morpheus/templates/admin.twig
@@ -1,62 +1,48 @@
-<!DOCTYPE html>
-<html id="ng-app" ng-app="piwikApp">
-    <head>
-{% block head %}
-            <meta charset="utf-8">
-			<meta http-equiv="x-ua-compatible" content="IE=EDGE,chrome=1" >
-            <title>{% if not isCustomLogo %}Piwik &rsaquo; {% endif %}{{ 'CoreAdminHome_Administration'|translate }}</title>
-            <meta name="generator" content="Piwik - free/libre analytics platform"/>
-            <link rel="shortcut icon" href="{{ customFavicon|default('plugins/CoreHome/images/favicon.ico') }}"/>
-
-{% include "@CoreHome/_favicon.twig" %}
-{% include "_jsGlobalVariables.twig" %}
-{% include "_piwikTag.twig" %}
-{% include "_jsCssIncludes.twig" %}
-
-            <!--[if IE]>
-            <link rel="stylesheet" type="text/css" href="plugins/Morpheus/stylesheets/ieonly.css"/>
-            <![endif]-->
-        {% endblock %}
-    </head>
-    <!--[if lt IE 9 ]>
-    <body ng-app="app" class="old-ie {{ postEvent('Template.bodyClass', 'admin') }}">
-    <![endif]-->
-    <!--[if (gte IE 9)|!(IE)]><!-->
-    <body ng-app="app" class="{{ postEvent('Template.bodyClass', 'admin') }}"><!--<![endif]-->
-    {% set isAdminLayout = true %}
-    {% include "_iframeBuster.twig" %}
-    {% include "@CoreHome/_javaScriptDisabled.twig" %}
-
-        <div id="root">
-            {% include "@CoreHome/_topScreen.twig" %}
-
-            {% import 'ajaxMacros.twig' as ajax %}
-            {{ ajax.requestErrorDiv(emailSuperUser|default('')) }}
-            {{ postEvent("Template.beforeContent", "admin", currentModule) }}
-
-            <div id="container">
-
-                {% if showMenu is not defined or showMenu %}
-                    {% include "@CoreAdminHome/_menu.twig" %}
-                {% endif %}
-
-                <div id="content" class="admin">
-
-                    {% include "@CoreHome/_headerMessage.twig" %}
-                    {% include "@CoreHome/_notifications.twig" %}
-
-                    <div class="ui-confirm" id="alert">
-                        <h2></h2>
-                        <input role="no" type="button" value="{{ 'General_Ok'|translate }}"/>
-                    </div>
-
-                    {% include "@CoreHome/_warningInvalidHost.twig" %}
-
-                    {% block content %}
-                    {% endblock %}
-
-                </div>
+{% extends 'layout.twig' %}
+
+{% block pageTitle %}{% if not isCustomLogo %}Piwik &rsaquo;{% endif %} {{ 'CoreAdminHome_Administration'|translate }}{% endblock %}
+
+{% set bodyClass = postEvent('Template.bodyClass', 'admin') %}
+
+{% block body %}
+    {% if isSuperUser %}
+        {% set topMenuModule = 'CoreAdminHome' %}
+        {% set topMenuAction = 'generalSettings' %}
+    {% else %}
+        {% set topMenuModule = 'SitesManager' %}
+        {% set topMenuAction = 'index' %}
+    {% endif %}
+    {{ parent() }}
+{% endblock %}
+
+{% block root %}
+    {% include "@CoreHome/_topScreen.twig" %}
+
+    {% import 'ajaxMacros.twig' as ajax %}
+    {{ ajax.requestErrorDiv(emailSuperUser|default('')) }}
+    {{ postEvent("Template.beforeContent", "admin", currentModule) }}
+
+    <div id="container">
+
+        {% if showMenu is not defined or showMenu %}
+            {% include "@CoreAdminHome/_menu.twig" %}
+        {% endif %}
+
+        <div id="content" class="admin">
+
+            {% include "@CoreHome/_headerMessage.twig" %}
+            {% include "@CoreHome/_notifications.twig" %}
+
+            <div class="ui-confirm" id="alert">
+                <h2></h2>
+                <input role="no" type="button" value="{{ 'General_Ok'|translate }}"/>
             </div>
+
+            {% include "@CoreHome/_warningInvalidHost.twig" %}
+
+            {% block content %}
+            {% endblock %}
+
         </div>
-    </body>
-</html>
+    </div>
+{% endblock %}
diff --git a/plugins/Morpheus/templates/dashboard.twig b/plugins/Morpheus/templates/dashboard.twig
index 64e11b9c12..7f63382d1e 100644
--- a/plugins/Morpheus/templates/dashboard.twig
+++ b/plugins/Morpheus/templates/dashboard.twig
@@ -1,50 +1,38 @@
-<!DOCTYPE html>
-<html id="ng-app" ng-app="piwikApp">
-    <head>
-        {% block head %}
-            <meta charset="utf-8">
-            <title>{{ siteName|raw }} - {% if isCustomLogo == false %}Piwik &rsaquo; {% endif %} {{ 'CoreHome_WebAnalyticsReports'|translate }}</title>
-            <meta http-equiv="X-UA-Compatible" content="IE=EDGE,chrome=1"/>
-            <meta name="viewport" content="initial-scale=1.0" />
-            <meta name="generator" content="Piwik - free/libre analytics platform"/>
-            <meta name="description" content="Web Analytics report for '{{ siteName|escape("html_attr") }}' - Piwik"/>
-            <meta name="apple-itunes-app" content="app-id=737216887" />
-{% include "@CoreHome/_favicon.twig" %}
-{% include "_jsGlobalVariables.twig" %}
-{% include "_piwikTag.twig" %}
-            <!--[if lt IE 9]>
-            <script language="javascript" type="text/javascript" src="libs/jqplot/excanvas.min.js"></script>
-            <![endif]-->
-{% include "_jsCssIncludes.twig" %}
-            <!--[if IE]>
-            <link rel="stylesheet" type="text/css" href="plugins/Morpheus/stylesheets/ieonly.css"/>
-            <![endif]-->
-        {% endblock %}
-    </head>
-    <!--[if lt IE 9 ]>
-    <body ng-app="app" class="old-ie {{ postEvent('Template.bodyClass', 'dashboard') }}"> <![endif]-->
-    <!--[if (gte IE 9)|!(IE)]><!-->
-    <body ng-app="app" class="{{ postEvent('Template.bodyClass', 'dashboard') }}"><!--<![endif]-->
-    {% include "_iframeBuster.twig" %}
-    {% include "@CoreHome/_javaScriptDisabled.twig" %}
-
-    <div id="root">
-        {% include "@CoreHome/_warningInvalidHost.twig" %}
-        {% include "@CoreHome/_topScreen.twig" %}
-
-        {% block notification %}
-            {% include "@CoreHome/_notifications.twig" %}
-        {% endblock %}
-
-        <div class="ui-confirm" id="alert">
-            <h2></h2>
-            <input role="yes" type="button" value="{{ 'General_Ok'|translate }}"/>
-        </div>
+{% extends 'layout.twig' %}
 
-    {{ postEvent("Template.beforeContent", "dashboard", currentModule) }}
-        {% block content %}
-        {% endblock %}
-    </div>
+{% block head %}
+    {{ parent() }}
+
+    <!--[if lt IE 9]>
+    <script language="javascript" type="text/javascript" src="libs/jqplot/excanvas.min.js"></script>
+    <![endif]-->
+{% endblock %}
+
+{% block pageTitle %}{{ siteName|raw }} - {% if not isCustomLogo %}Piwik &rsaquo;{% endif %} {{ 'CoreHome_WebAnalyticsReports'|translate }}{% endblock %}
+{% block pageDescription %}Web Analytics report for {{ siteName|escape("html_attr") }} - Piwik{% endblock %}
+
+{% set bodyClass = postEvent('Template.bodyClass', 'dashboard') %}
+
+{% block body %}
+    {{ parent() }}
     {{ postEvent("Template.footer") }}
-    </body>
-</html>
+{% endblock %}
+
+{% block root %}
+    {% include "@CoreHome/_warningInvalidHost.twig" %}
+    {% include "@CoreHome/_topScreen.twig" %}
+
+    {% block notification %}
+        {% include "@CoreHome/_notifications.twig" %}
+    {% endblock %}
+
+    <div class="ui-confirm" id="alert">
+        <h2></h2>
+        <input role="yes" type="button" value="{{ 'General_Ok'|translate }}"/>
+    </div>
+
+    {{ postEvent("Template.beforeContent", "dashboard", currentModule) }}
+
+    {% block content %}
+    {% endblock %}
+{% endblock %}
diff --git a/plugins/Morpheus/templates/layout.twig b/plugins/Morpheus/templates/layout.twig
new file mode 100644
index 0000000000..004524a93f
--- /dev/null
+++ b/plugins/Morpheus/templates/layout.twig
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html id="ng-app" {% if language is defined %}lang="{{ language }}"{% endif %} ng-app="piwikApp">
+    <head>
+        {% block head %}
+            <meta charset="utf-8">
+            <title>{% block pageTitle %}Piwik{% endblock %}</title>
+            <meta http-equiv="X-UA-Compatible" content="IE=EDGE,chrome=1"/>
+            <meta name="viewport" content="initial-scale=1.0"/>
+            <meta name="generator" content="Piwik - free/libre analytics platform"/>
+            <meta name="description" content="{% block pageDescription %}{% endblock %}"/>
+            <meta name="apple-itunes-app" content="app-id=737216887" />
+            <meta name="google-play-app" content="app-id=org.piwik.mobile2">
+            <link rel="shortcut icon" href="{{ customFavicon|default('plugins/CoreHome/images/favicon.ico') }}"/>
+
+            {% include "@CoreHome/_favicon.twig" %}
+            {% include "_jsGlobalVariables.twig" %}
+            {% include "_piwikTag.twig" %}
+            {% include "_jsCssIncludes.twig" %}
+
+            <!--[if IE]>
+            <link rel="stylesheet" type="text/css" href="plugins/Morpheus/stylesheets/ieonly.css"/>
+            <![endif]-->
+        {% endblock %}
+    </head>
+    <!--[if lt IE 9 ]>
+    <body id="{{ bodyId|default('') }}" ng-app="app" class="old-ie {{ bodyClass|default('') }}">
+    <![endif]-->
+    <!--[if (gte IE 9)|!(IE)]><!-->
+    <body id="{{ bodyId|default('') }}" ng-app="app" class="{{ bodyClass|default('') }}">
+    <!--<![endif]-->
+
+    {% block body %}
+
+        {% include "_iframeBuster.twig" %}
+        {% include "@CoreHome/_javaScriptDisabled.twig" %}
+
+        <div id="root">
+            {% block root %}
+            {% endblock %}
+        </div>
+
+    {% endblock %}
+
+    </body>
+</html>
diff --git a/plugins/Morpheus/templates/user.twig b/plugins/Morpheus/templates/user.twig
new file mode 100644
index 0000000000..4234f07296
--- /dev/null
+++ b/plugins/Morpheus/templates/user.twig
@@ -0,0 +1,45 @@
+{% extends 'layout.twig' %}
+
+{% block pageTitle %}{% if not isCustomLogo %}Piwik &rsaquo; {% endif %}{{ 'CoreAdminHome_Administration'|translate }}{% endblock %}
+
+{% set bodyClass = postEvent('Template.bodyClass', 'admin') %}
+
+{% block body %}
+    {% if userIsAnonymous %}
+        {% set topMenuModule = 'Feedback' %}
+        {% set topMenuAction = 'index' %}
+    {% else %}
+        {% set topMenuModule = 'UsersManager' %}
+        {% set topMenuAction = 'userSettings' %}
+    {% endif %}
+    {{ parent() }}
+{% endblock %}
+
+{% block root %}
+    {% include "@CoreHome/_topScreen.twig" %}
+
+    {% import 'ajaxMacros.twig' as ajax %}
+    {{ ajax.requestErrorDiv(emailSuperUser|default('')) }}
+    {{ postEvent("Template.beforeContent", "user", currentModule) }}
+
+    <div id="container">
+
+        {% if showMenu is not defined or showMenu %}
+            {% include "@CoreHome/_userMenu.twig" %}
+        {% endif %}
+
+        <div id="content" class="admin user">
+
+            {% include "@CoreHome/_notifications.twig" %}
+
+            <div class="ui-confirm" id="alert">
+                <h2></h2>
+                <input role="no" type="button" value="{{ 'General_Ok'|translate }}"/>
+            </div>
+
+            {% block content %}
+            {% endblock %}
+
+        </div>
+    </div>
+{% endblock %}
diff --git a/plugins/MultiSites/API.php b/plugins/MultiSites/API.php
index b5de1060a5..c85dc94024 100755
--- a/plugins/MultiSites/API.php
+++ b/plugins/MultiSites/API.php
@@ -12,14 +12,15 @@ use Exception;
 use Piwik\API\Request;
 use Piwik\Archive;
 use Piwik\Common;
+use Piwik\Container\StaticContainer;
 use Piwik\DataTable;
 use Piwik\Period\Range;
 use Piwik\Piwik;
 use Piwik\Plugins\Goals\Archiver;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
 use Piwik\Plugins\SitesManager\Model as ModelSitesManager;
+use Piwik\Scheduler\Scheduler;
 use Piwik\Site;
-use Piwik\TaskScheduler;
 
 /**
  * The MultiSites API lets you request the key metrics (visits, page views, revenue) for all Websites in Piwik.
@@ -86,13 +87,14 @@ class API extends \Piwik\Plugin\API
     {
         Piwik::checkUserHasSomeViewAccess();
 
-        $idSites = $this->getSitesIdFromPattern($pattern);
+        $sites = $this->getSitesIdFromPattern($pattern, $_restrictSitesToLogin);
 
-        if (empty($idSites)) {
+        if (empty($sites)) {
             return new DataTable();
         }
+
         return $this->buildDataTable(
-            $idSites,
+            $sites,
             $period,
             $date,
             $segment,
@@ -105,27 +107,56 @@ class API extends \Piwik\Plugin\API
     /**
      * Fetches the list of sites which names match the string pattern
      *
-     * @param $pattern
+     * @param string $pattern
+     * @param bool   $_restrictSitesToLogin
      * @return array|string
      */
-    private function getSitesIdFromPattern($pattern)
+    private function getSitesIdFromPattern($pattern, $_restrictSitesToLogin)
     {
-        $idSites = 'all';
+        // First clear cache
+        Site::clearCache();
+
         if (empty($pattern)) {
-            return $idSites;
-        }
-        $idSites = array();
-        $sites = Request::processRequest('SitesManager.getPatternMatchSites',
-            array('pattern'   => $pattern,
-                  // added because caller could overwrite these
-                  'serialize' => 0,
-                  'format'    => 'original'));
-        if (!empty($sites)) {
-            foreach ($sites as $site) {
-                $idSites[] = $site['idsite'];
+
+            /** @var Scheduler $scheduler */
+            $scheduler = StaticContainer::getContainer()->get('Piwik\Scheduler\Scheduler');
+            // Then, warm the cache with only the data we should have access to
+            if (Piwik::hasUserSuperUserAccess()
+                // Hack: when this API function is called as a Scheduled Task, Super User status is enforced.
+                // This means this function would return ALL websites in all cases.
+                // Instead, we make sure that only the right set of data is returned
+                && !$scheduler->isRunningTask()
+            ) {
+                APISitesManager::getInstance()->getAllSites();
+            } else {
+                APISitesManager::getInstance()->getSitesWithAtLeastViewAccess($limit = false, $_restrictSitesToLogin);
+            }
+
+        } else {
+            $sites = Request::processRequest('SitesManager.getPatternMatchSites',
+                array('pattern'   => $pattern,
+                      // added because caller could overwrite these
+                      'showColumns' => '',
+                      'hideColumns' => '',
+                      'serialize'   => 0,
+                      'format'      => 'original'));
+
+            if (!empty($sites)) {
+                $idSites = array();
+                foreach ($sites as $site) {
+                    $idSites[] = $site['idsite'];
+                }
+
+                $model = new ModelSitesManager();
+                $sites = $model->getSitesFromIds($idSites); // getPatternMatchSites does not return all sites information...
+                Site::setSitesFromArray($sites);
             }
         }
-        return $idSites;
+
+        // Both calls above have called Site::setSitesFromArray. We now get these sites:
+        $sitesToProblablyAdd = Site::getSites();
+
+        return $sitesToProblablyAdd;
     }
 
     /**
@@ -144,8 +175,11 @@ class API extends \Piwik\Plugin\API
     public function getOne($idSite, $period, $date, $segment = false, $_restrictSitesToLogin = false, $enhanced = false)
     {
         Piwik::checkUserHasViewAccess($idSite);
+
+        $sites = $this->getSiteFromId($idSite);
+
         return $this->buildDataTable(
-            $idSite,
+            $sites,
             $period,
             $date,
             $segment,
@@ -155,35 +189,26 @@ class API extends \Piwik\Plugin\API
         );
     }
 
-    private function buildDataTable($idSitesOrIdSite, $period, $date, $segment, $_restrictSitesToLogin, $enhanced, $multipleWebsitesRequested)
+    private function getSiteFromId($idSite)
     {
-        $allWebsitesRequested = ($idSitesOrIdSite == 'all');
-        if ($allWebsitesRequested) {
-            // First clear cache
-            Site::clearCache();
-            // Then, warm the cache with only the data we should have access to
-            if (Piwik::hasUserSuperUserAccess()
-                // Hack: when this API function is called as a Scheduled Task, Super User status is enforced.
-                // This means this function would return ALL websites in all cases.
-                // Instead, we make sure that only the right set of data is returned
-                && !TaskScheduler::isTaskBeingExecuted()
-            ) {
-                APISitesManager::getInstance()->getAllSites();
-            } else {
-                APISitesManager::getInstance()->getSitesWithAtLeastViewAccess($limit = false, $_restrictSitesToLogin);
+        $idSite = (int) $idSite;
+        $sites = array(APISitesManager::getInstance()->getSiteFromId($idSite));
+
+        return $sites;
+    }
+
+    private function buildDataTable($sitesToProblablyAdd, $period, $date, $segment, $_restrictSitesToLogin, $enhanced, $multipleWebsitesRequested)
+    {
+        $idSites = array();
+        if (!empty($sitesToProblablyAdd)) {
+            foreach ($sitesToProblablyAdd as $site) {
+                $idSites[] = $site['idsite'];
             }
-            // Both calls above have called Site::setSitesFromArray. We now get these sites:
-            $sitesToProblablyAdd = Site::getSites();
-        } else if (is_array($idSitesOrIdSite)) {
-            $model = new ModelSitesManager();
-            $sitesToProblablyAdd = $model->getSitesFromIds($idSitesOrIdSite);
-        } else {
-            $sitesToProblablyAdd = array(APISitesManager::getInstance()->getSiteFromId($idSitesOrIdSite));
         }
 
         // build the archive type used to query archive data
         $archive = Archive::build(
-            $idSitesOrIdSite,
+            $idSites,
             $period,
             $date,
             $segment,
@@ -208,7 +233,10 @@ class API extends \Piwik\Plugin\API
         // $dataTable instanceOf Set
         $dataTable = $archive->getDataTableFromNumeric($fieldsToGet);
 
-        $dataTable = $this->mergeDataTableMapAndPopulateLabel($idSitesOrIdSite, $multipleWebsitesRequested, $dataTable);
+        if ($multipleWebsitesRequested && count($idSites) === 1 && Range::isMultiplePeriod($date, $period)) {
+        } else {
+            $dataTable = $this->mergeDataTableMapAndPopulateLabel($idSites, $multipleWebsitesRequested, $dataTable);
+        }
 
         if ($dataTable instanceof DataTable\Map) {
             foreach ($dataTable->getDataTables() as $table) {
@@ -234,11 +262,15 @@ class API extends \Piwik\Plugin\API
                 $dataTable->setMetadata(self::getLastPeriodMetadataName('date'), $lastPeriod);
             }
 
-            $pastArchive = Archive::build($idSitesOrIdSite, $period, $strLastDate, $segment, $_restrictSitesToLogin);
+            $pastArchive = Archive::build($idSites, $period, $strLastDate, $segment, $_restrictSitesToLogin);
 
             $pastData = $pastArchive->getDataTableFromNumeric($fieldsToGet);
 
-            $pastData = $this->mergeDataTableMapAndPopulateLabel($idSitesOrIdSite, $multipleWebsitesRequested, $pastData);
+            if ($multipleWebsitesRequested && count($idSites) === 1 && Range::isMultiplePeriod($date, $period)) {
+
+            } else {
+                $pastData = $this->mergeDataTableMapAndPopulateLabel($idSites, $multipleWebsitesRequested, $pastData);
+            }
 
             // use past data to calculate evolution percentages
             $this->calculateEvolutionPercentages($dataTable, $pastData, $apiMetrics);
@@ -256,14 +288,9 @@ class API extends \Piwik\Plugin\API
             $dataTable->queueFilter('ColumnDelete', array('label'));
         }
 
-        Site::clearCache();
-
         // replace record names with user friendly metric names
         $dataTable->queueFilter('ReplaceColumnNames', array($columnNameRewrites));
 
-        // Ensures data set sorted, for Metadata output
-        $dataTable->filter('Sort', array(self::NB_VISITS_METRIC, 'desc', $naturalSort = false));
-
         // filter rows without visits
         // note: if only one website is queried and there are no visits, we can not remove the row otherwise
         // ResponseBuilder throws 'Call to a member function getColumns() on a non-object'
diff --git a/plugins/MultiSites/Controller.php b/plugins/MultiSites/Controller.php
index ece11b742e..647ae147dc 100644
--- a/plugins/MultiSites/Controller.php
+++ b/plugins/MultiSites/Controller.php
@@ -13,16 +13,21 @@ use Piwik\Config;
 use Piwik\Date;
 use Piwik\Period;
 use Piwik\Piwik;
+use Piwik\Translation\Translator;
 use Piwik\View;
 
-/**
- *
- */
 class Controller extends \Piwik\Plugin\Controller
 {
-    public function __construct()
+    /**
+     * @var Translator
+     */
+    private $translator;
+
+    public function __construct(Translator $translator)
     {
         parent::__construct();
+
+        $this->translator = $translator;
     }
 
     public function index()
@@ -64,6 +69,8 @@ class Controller extends \Piwik\Plugin\Controller
 
         $this->setGeneralVariablesView($view);
 
+        $view->siteName = $this->translator->translate('General_AllWebsitesDashboard');
+
         return $view->render();
     }
 
diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.controller.js b/plugins/MultiSites/angularjs/dashboard/dashboard.controller.js
index 2f28a6e887..d4dd4eba3f 100644
--- a/plugins/MultiSites/angularjs/dashboard/dashboard.controller.js
+++ b/plugins/MultiSites/angularjs/dashboard/dashboard.controller.js
@@ -18,6 +18,7 @@
         $scope.evolutionSelector = 'visits_evolution';
         $scope.hasSuperUserAccess = piwik.hasSuperUserAccess;
         $scope.date = piwik.broadcast.getValueFromUrl('date');
+        $scope.idSite = piwik.broadcast.getValueFromUrl('idSite');
         $scope.url  = piwik.piwik_url;
         $scope.period = piwik.period;
 
diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html
index 8035499139..7066fd5d1f 100644
--- a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html
+++ b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html
@@ -79,7 +79,7 @@
 
         <tr ng-if="hasSuperUserAccess">
             <td colspan="8" class="add_new_site">
-                <a href="{{ url }}?module=SitesManager&action=index&showaddsite=1&period={{ period }}&date={{ date }}">
+                <a href="{{ url }}?module=SitesManager&action=index&showaddsite=1&period={{ period }}&date={{ date }}&idSite={{ idSite }}">
                     <img src='plugins/Morpheus/images/add.png' alt=""/> {{ 'SitesManager_AddSite'|translate }}
                 </a>
             </td>
diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.less b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.less
index 24cd976b4c..6502f4244c 100644
--- a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.less
+++ b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.less
@@ -99,7 +99,7 @@
   }
 
   tr:hover td {
-    background: #FFF !important;
+    background: @theme-color-background-base !important;
   }
 
   tr.group {
@@ -232,4 +232,4 @@
 
 #mt thead *:last-child {
   border-top-right-radius: 7px;
-}
\ No newline at end of file
+}
diff --git a/plugins/MultiSites/angularjs/site/site.controller.js b/plugins/MultiSites/angularjs/site/site.controller.js
index 7488b83302..2815ed4a77 100644
--- a/plugins/MultiSites/angularjs/site/site.controller.js
+++ b/plugins/MultiSites/angularjs/site/site.controller.js
@@ -26,7 +26,21 @@
                 append = '&token_auth=' + token_auth;
             }
 
-            return piwik.piwik_url + '?module=MultiSites&action=getEvolutionGraph&period=' + $scope.period + '&date=' + $scope.dateSparkline + '&evolutionBy=' +$scope.metric + '&columns=' + $scope.metric + '&idSite=' + website.idsite + '&idsite=' + website.idsite + '&viewDataTable=sparkline' + append + '&colors=' + encodeURIComponent(JSON.stringify(piwik.getSparklineColors()));
+            var metric = $scope.metric;
+
+            switch ($scope.evolutionMetric) {
+                case 'visits_evolution':
+                    metric = 'nb_visits';
+                    break;
+                case 'pageviews_evolution':
+                    metric = 'nb_pageviews';
+                    break;
+                case 'revenue_evolution':
+                    metric = 'revenue';
+                    break;
+            }
+
+            return piwik.piwik_url + '?module=MultiSites&action=getEvolutionGraph&period=' + $scope.period + '&date=' + $scope.dateSparkline + '&evolutionBy=' + metric + '&columns=' + metric + '&idSite=' + website.idsite + '&idsite=' + website.idsite + '&viewDataTable=sparkline' + append + '&colors=' + encodeURIComponent(JSON.stringify(piwik.getSparklineColors()));
         }
     }
 })();
diff --git a/plugins/MultiSites/lang/ar.json b/plugins/MultiSites/lang/ar.json
index 3f37f6bf9c..0a20fb9003 100644
--- a/plugins/MultiSites/lang/ar.json
+++ b/plugins/MultiSites/lang/ar.json
@@ -1,6 +1,5 @@
 {
     "MultiSites": {
-        "Evolution": "التطور",
-        "PluginDescription": "يعرض إحصائيات مواقع متعددة، يتم تطويره حالياً كإضافة رئيسية في Piwik."
+        "Evolution": "التطور"
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/be.json b/plugins/MultiSites/lang/be.json
index 9ca42148a5..06f82a96d6 100644
--- a/plugins/MultiSites/lang/be.json
+++ b/plugins/MultiSites/lang/be.json
@@ -1,6 +1,5 @@
 {
     "MultiSites": {
-        "Evolution": "Змены",
-        "PluginDescription": "Адлюстравае мульті-сайтавую выканаўчую рэзюмэ\/статыстыку. У цяперашні час падтрымліваецца як плагін ядра Piwik."
+        "Evolution": "Змены"
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/bg.json b/plugins/MultiSites/lang/bg.json
index 51072d705a..45470163ca 100644
--- a/plugins/MultiSites/lang/bg.json
+++ b/plugins/MultiSites/lang/bg.json
@@ -3,7 +3,6 @@
         "Evolution": "Развитие",
         "LoadingWebsites": "Зарежда сайтовете",
         "Pagination": "%s - %s като %s",
-        "PluginDescription": "Показва обобщена статистика\/резюме. В момента се поддържа като основна добавка в Piwik.",
         "TopLinkTooltip": "Сравнете статистиката за всички ваши уебсайтове."
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/ca.json b/plugins/MultiSites/lang/ca.json
index aca6b9d444..822f181e5d 100644
--- a/plugins/MultiSites/lang/ca.json
+++ b/plugins/MultiSites/lang/ca.json
@@ -1,7 +1,6 @@
 {
     "MultiSites": {
         "Evolution": "Evolució",
-        "PluginDescription": "Mostra resum\/estadístiques de multiples llocs web. Actualment mangingut com una extensió del nucli de Piwik.",
         "TopLinkTooltip": "Compareu les estadístiques anàlitiques de tots els vostres llocs web."
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/cs.json b/plugins/MultiSites/lang/cs.json
index b7b03b891d..1578bf4799 100644
--- a/plugins/MultiSites/lang/cs.json
+++ b/plugins/MultiSites/lang/cs.json
@@ -3,7 +3,7 @@
         "Evolution": "Vývoj",
         "LoadingWebsites": "Načítání webových stránek",
         "Pagination": "%s - %s z %s",
-        "PluginDescription": "Zobrazí souhrn\/statistiky pro více sídel. Současně je spravován jako základní zásuvný modul Piwiku",
+        "PluginDescription": "Zobrazte a porovnejte všechny vaše stránky a aplikace na této užitečné nástěnce všech stránek.",
         "TopLinkTooltip": "Porovnejte webové analytické statistiky pro všechny vaše webové stránky."
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/da.json b/plugins/MultiSites/lang/da.json
index fa37dd0c72..bd34e9dc71 100644
--- a/plugins/MultiSites/lang/da.json
+++ b/plugins/MultiSites/lang/da.json
@@ -3,7 +3,6 @@
         "Evolution": "Udvikling",
         "LoadingWebsites": "Loading websites",
         "Pagination": "%s - %s af %s",
-        "PluginDescription": "Viser multi-websted resumé\/statistik. Vedligeholdes som et Piwik-kerne udvidelsesmodul.",
         "TopLinkTooltip": "Sammenlign analyse statistik for alle hjemmesider."
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/de.json b/plugins/MultiSites/lang/de.json
index 273ebf7de8..00db9bed07 100644
--- a/plugins/MultiSites/lang/de.json
+++ b/plugins/MultiSites/lang/de.json
@@ -3,7 +3,7 @@
         "Evolution": "Entwicklung",
         "LoadingWebsites": "Lade Webseiten",
         "Pagination": "%s - %s von %s",
-        "PluginDescription": "Zeigt eine Zusammenfassung über die Statistiken aller Webseiten. Wird derzeit als ein Piwik Core Plugin verwaltet",
+        "PluginDescription": "Zeige und vergleiche alle Webseiten und Apps im hilfreichen 'Alle Websiten' Dashboard.",
         "TopLinkTooltip": "Vergleichen Sie Webanalytikstatistiken für alle Ihre Webseiten."
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/el.json b/plugins/MultiSites/lang/el.json
index d855c95ade..e1af221436 100644
--- a/plugins/MultiSites/lang/el.json
+++ b/plugins/MultiSites/lang/el.json
@@ -3,7 +3,7 @@
         "Evolution": "Πρόοδος",
         "LoadingWebsites": "Γίνεται φόρτωση των ιστοτόπων",
         "Pagination": "%s - %s από %s",
-        "PluginDescription": "Προβάλει ενεργή περίληψη\/στατιστικά πολλών ιστοσελίδων. Προς το παρόν διατηρείτε ως πρόσθετο του πυρήνα του Piwik.",
+        "PluginDescription": "Δείτε και συγκρίνετε όλους τους ιστοτόπους σας και τις εφαρμογές σας σε αυτό τον χρήσιμο πίνακα 'Όλοι οι Ιστοτόποι'.",
         "TopLinkTooltip": "Σύγκριση στατιστικών Ιστού για όλες τις ιστοσελίδες σας."
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/en.json b/plugins/MultiSites/lang/en.json
index 1c481879ee..d2a89bbbbd 100644
--- a/plugins/MultiSites/lang/en.json
+++ b/plugins/MultiSites/lang/en.json
@@ -2,7 +2,7 @@
     "MultiSites": {
         "Evolution": "Evolution",
         "LoadingWebsites": "Loading websites",
-        "PluginDescription": "Displays multi-site executive summary\/statistics. Currently maintained as a core Piwik plugin.",
+        "PluginDescription": "View and compare all your websites and apps in this useful 'All Websites' dashboard. ",
         "TopLinkTooltip": "Compare Web Analytics stats for all of your Websites.",
         "Pagination": "%s - %s of %s"
     }
diff --git a/plugins/MultiSites/lang/es.json b/plugins/MultiSites/lang/es.json
index 833b68c507..92e04772be 100644
--- a/plugins/MultiSites/lang/es.json
+++ b/plugins/MultiSites/lang/es.json
@@ -2,7 +2,6 @@
     "MultiSites": {
         "Evolution": "Evolución",
         "LoadingWebsites": "Cargando sitios web",
-        "PluginDescription": "Muestra resumen y\/o estadísticas ejecutivas multisitio. Actualmente mantenido como un plugin del núcleo de Piwik",
         "TopLinkTooltip": "Comparar la estadísticas de Análisis Web para todos tus Sitios Web."
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/fa.json b/plugins/MultiSites/lang/fa.json
index c0d6120e7f..7338f87427 100644
--- a/plugins/MultiSites/lang/fa.json
+++ b/plugins/MultiSites/lang/fa.json
@@ -2,7 +2,6 @@
     "MultiSites": {
         "Evolution": "تکامل",
         "LoadingWebsites": "درحال بارگزاری وب سایت ها",
-        "PluginDescription": "نمایش خلاصه چند سایت \/ آمار. در حال حاضر به عنوان یک پلاگین Piwik هسته نگهداری می شود.",
         "TopLinkTooltip": "اطلاعات آماری همه وب سایت هایتان را مقایسه کنید."
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/fi.json b/plugins/MultiSites/lang/fi.json
index 3f7251cc81..deac1ad26a 100644
--- a/plugins/MultiSites/lang/fi.json
+++ b/plugins/MultiSites/lang/fi.json
@@ -2,7 +2,6 @@
     "MultiSites": {
         "Evolution": "Kehitys",
         "LoadingWebsites": "Lataa verkkosivuja",
-        "PluginDescription": "Näytä monen sivun yleiskatsaus\/tilastot. Tällä hetkellä ylläpidetään Piwikin ydinmoduulina.",
         "TopLinkTooltip": "Vertaile eri sivujen tilastoja."
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/fr.json b/plugins/MultiSites/lang/fr.json
index 45f81aaafb..47219e9321 100644
--- a/plugins/MultiSites/lang/fr.json
+++ b/plugins/MultiSites/lang/fr.json
@@ -3,7 +3,6 @@
         "Evolution": "Évolution",
         "LoadingWebsites": "Chargement des sites",
         "Pagination": "%s - %s de %s",
-        "PluginDescription": "Affiche le sommaire\/les statistiques multi-site. Actuellement maintenu comme un plugin Piwik cœur.",
         "TopLinkTooltip": "Comparez les statistiques pour tous vos sites web."
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/hi.json b/plugins/MultiSites/lang/hi.json
index 031c6a254e..a8a463dffe 100644
--- a/plugins/MultiSites/lang/hi.json
+++ b/plugins/MultiSites/lang/hi.json
@@ -1,7 +1,6 @@
 {
     "MultiSites": {
         "Evolution": "विकास",
-        "PluginDescription": "एकाधिक साइट कार्यकारी सारांश \/ आँकड़े प्रदर्शित करता है. वर्तमान में एक कोर Piwik प्लगइन के रूप में रखा.",
         "TopLinkTooltip": "आपकी वेबसाइट सभी के लिए वेब विश्लेषिकी आँकड़ों की तुलना करें."
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/hu.json b/plugins/MultiSites/lang/hu.json
index 1168f75d29..1317a41728 100644
--- a/plugins/MultiSites/lang/hu.json
+++ b/plugins/MultiSites/lang/hu.json
@@ -1,6 +1,5 @@
 {
     "MultiSites": {
-        "Evolution": "Trendek",
-        "PluginDescription": "Összefoglaló statisztikákat jelenít meg több weboldal látogatottságáról. A kiegészítő jelenleg a Piwik magjához tartozik."
+        "Evolution": "Trendek"
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/id.json b/plugins/MultiSites/lang/id.json
index ca0f5da2cf..2d27151e22 100644
--- a/plugins/MultiSites/lang/id.json
+++ b/plugins/MultiSites/lang/id.json
@@ -1,7 +1,6 @@
 {
     "MultiSites": {
         "Evolution": "Perkembangan",
-        "PluginDescription": "Menampilkan ringkasan eksekutif\/statistik banyak-situs. Saat ini dikelola sebagai pengaya inti Piwik.",
         "TopLinkTooltip": "Bandingkan statistik Analisis Ramatraya untuk seluruh Situs Anda."
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/it.json b/plugins/MultiSites/lang/it.json
index bfc685e1fc..5a58359a04 100644
--- a/plugins/MultiSites/lang/it.json
+++ b/plugins/MultiSites/lang/it.json
@@ -3,7 +3,7 @@
         "Evolution": "Evoluzione",
         "LoadingWebsites": "Caricamento siti web",
         "Pagination": "%s - %s di %s",
-        "PluginDescription": "Mostra un sommario delle statistiche per il multi-sito. Attualmente mantenuto come un plugin Piwik del core.",
+        "PluginDescription": "Guarda e confronta tutti i siti e le app in questa utile dashboard 'Tutti i Siti'.",
         "TopLinkTooltip": "Compara le statistiche web di tutti i tuoi siti web."
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/ja.json b/plugins/MultiSites/lang/ja.json
index e69b7e74c4..7cf82633d7 100644
--- a/plugins/MultiSites/lang/ja.json
+++ b/plugins/MultiSites/lang/ja.json
@@ -3,7 +3,6 @@
         "Evolution": "推移",
         "LoadingWebsites": "ウェブサイトをロード中",
         "Pagination": "%s の %s - %s",
-        "PluginDescription": "マルチサイト運営の概要や統計を表示します。 現在は、コア Piwik プラグインとしてメンテナンスされています。",
         "TopLinkTooltip": "あなたの全ウェブサイトに対するウェブ解析統計情報を比較してください。"
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/ka.json b/plugins/MultiSites/lang/ka.json
index 9b54f3ec6f..abdc734bd0 100644
--- a/plugins/MultiSites/lang/ka.json
+++ b/plugins/MultiSites/lang/ka.json
@@ -1,6 +1,5 @@
 {
     "MultiSites": {
-        "Evolution": "ევოლუცია",
-        "PluginDescription": "აჩევენებს მრავალი საიტის შემაჯამებელი ანგარიშს\/სტატისტიკას. ამჟამად არსებობს როგორც Piwik–ის ძირითადი პლაგინი"
+        "Evolution": "ევოლუცია"
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/ko.json b/plugins/MultiSites/lang/ko.json
index a1904e8c64..c7bdb7ee7b 100644
--- a/plugins/MultiSites/lang/ko.json
+++ b/plugins/MultiSites/lang/ko.json
@@ -1,7 +1,6 @@
 {
     "MultiSites": {
         "Evolution": "변화 추이",
-        "PluginDescription": "멀티 사이트 운영의 개요 및 통계를 표시합니다. 현재는 코어 Piwik 플러그인으로 관리되고 있습니다.",
         "TopLinkTooltip": "웹사이트의 모든 웹분석 통계를 비교합니다."
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/nl.json b/plugins/MultiSites/lang/nl.json
index 6bae1a7795..90661c56d4 100644
--- a/plugins/MultiSites/lang/nl.json
+++ b/plugins/MultiSites/lang/nl.json
@@ -3,7 +3,6 @@
         "Evolution": "Evolutie",
         "LoadingWebsites": "Websites laden",
         "Pagination": "%s - %s van %s",
-        "PluginDescription": "Toont de multi-site uitvoering van de samenvatting\/statistieken. Momenteel onderhouden als een core plugin van Piwik.",
         "TopLinkTooltip": "Vergelijk Website statistieken van al je websites."
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/pl.json b/plugins/MultiSites/lang/pl.json
index a3557cd8a8..db8a26af67 100644
--- a/plugins/MultiSites/lang/pl.json
+++ b/plugins/MultiSites/lang/pl.json
@@ -2,7 +2,6 @@
     "MultiSites": {
         "Evolution": "Postęp",
         "LoadingWebsites": "Ładowanie stron",
-        "Pagination": "%s - %s z %s",
-        "PluginDescription": "Wyświetla wielostronicowe podsumowania\/statystyki. Obecnie zastosowane jako wtyczka jądra Piwik."
+        "Pagination": "%s - %s z %s"
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/pt-br.json b/plugins/MultiSites/lang/pt-br.json
index 7e04eea0ca..ba4b1c6bf6 100644
--- a/plugins/MultiSites/lang/pt-br.json
+++ b/plugins/MultiSites/lang/pt-br.json
@@ -2,7 +2,6 @@
     "MultiSites": {
         "Evolution": "Evolução",
         "LoadingWebsites": "Carregando sites",
-        "PluginDescription": "Mostra sumários\/estatísticas executivas multi-site. No momento, mantida como plugin núcleo do Piwik.",
         "TopLinkTooltip": "Comparar estatísticas de todos os websites."
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/pt.json b/plugins/MultiSites/lang/pt.json
index e346c8c559..9cd9ebd871 100644
--- a/plugins/MultiSites/lang/pt.json
+++ b/plugins/MultiSites/lang/pt.json
@@ -1,6 +1,5 @@
 {
     "MultiSites": {
-        "Evolution": "Evolução",
-        "PluginDescription": "Mostra um sumário\/estatísticas executivas de multíplos sites. Actualmente mantido como um plugin núcleo Piwik."
+        "Evolution": "Evolução"
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/ro.json b/plugins/MultiSites/lang/ro.json
index 90927ceca6..6d8d68ca30 100644
--- a/plugins/MultiSites/lang/ro.json
+++ b/plugins/MultiSites/lang/ro.json
@@ -3,7 +3,6 @@
         "Evolution": "Evoluţie",
         "LoadingWebsites": "încărcare site-uri web",
         "Pagination": "%s - %s of %s",
-        "PluginDescription": "Afișează multi-site-ul rezumat executiv \/ statistici. În prezent, se menține o bază Piwik plugin.",
         "TopLinkTooltip": "Compara statisticiLE Web Analytics pentru toate site-urile dvs.."
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/ru.json b/plugins/MultiSites/lang/ru.json
index c266ea3b2f..66aebfc010 100644
--- a/plugins/MultiSites/lang/ru.json
+++ b/plugins/MultiSites/lang/ru.json
@@ -2,7 +2,6 @@
     "MultiSites": {
         "Evolution": "Эволюция",
         "LoadingWebsites": "Загрузка сайтов",
-        "PluginDescription": "Отображает сравнительную статистику по многим сайтам. В данный момент является ключевым плагином Piwik.",
         "TopLinkTooltip": "Сравните веб-аналитику для всех ваших сайтов."
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/sk.json b/plugins/MultiSites/lang/sk.json
index 1c677120c1..d17c44309e 100644
--- a/plugins/MultiSites/lang/sk.json
+++ b/plugins/MultiSites/lang/sk.json
@@ -1,6 +1,5 @@
 {
     "MultiSites": {
-        "Evolution": "Vývoj",
-        "PluginDescription": "Zobrazuje Multi-Site zhrnutie \/ štatistiky. V súčasnej dobe je ako hlavný plugin."
+        "Evolution": "Vývoj"
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/sq.json b/plugins/MultiSites/lang/sq.json
index 2242fef0d2..1a526c6c35 100644
--- a/plugins/MultiSites/lang/sq.json
+++ b/plugins/MultiSites/lang/sq.json
@@ -1,6 +1,5 @@
 {
     "MultiSites": {
-        "Evolution": "Evolution",
-        "PluginDescription": "Shfaq përmbledhje\/statistika ekzekutive multi-site-i. Hëpërhë trajtohet si shtojcë bazë e Piwik-ut."
+        "Evolution": "Evolution"
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/sr.json b/plugins/MultiSites/lang/sr.json
index be5b95bec7..28951995c4 100644
--- a/plugins/MultiSites/lang/sr.json
+++ b/plugins/MultiSites/lang/sr.json
@@ -3,7 +3,6 @@
         "Evolution": "Razvoj",
         "LoadingWebsites": "Učitavanje sajtova",
         "Pagination": "%s - %s od %s",
-        "PluginDescription": "Prikazuje statistiku za više sajtova. Ovaj dodatak je trenutno u samoj srži Piwik-a.",
         "TopLinkTooltip": "Uporedi statistiku za sve vaše sajtove"
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/sv.json b/plugins/MultiSites/lang/sv.json
index 1443493ed4..db05655513 100644
--- a/plugins/MultiSites/lang/sv.json
+++ b/plugins/MultiSites/lang/sv.json
@@ -3,7 +3,6 @@
         "Evolution": "Utveckling",
         "LoadingWebsites": "Laddar webbplatser",
         "Pagination": "%s - %s av %s",
-        "PluginDescription": "Visar fler-webbplatser sammanfattning\/statistik. För närvarande underhållen som en central Piwik plugin.",
         "TopLinkTooltip": "Jämför statistik för alla dina webbplatser."
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/th.json b/plugins/MultiSites/lang/th.json
index 64a370643a..736b7f04fd 100644
--- a/plugins/MultiSites/lang/th.json
+++ b/plugins/MultiSites/lang/th.json
@@ -1,6 +1,5 @@
 {
     "MultiSites": {
-        "Evolution": "ความเปลี่ยนแปลง",
-        "PluginDescription": "แสดงมัลติไซต์ สรุป\/สถิติในปัจจุบัน ที่ยังคงเป็นปลั๊กอินของ Piwik"
+        "Evolution": "ความเปลี่ยนแปลง"
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/tl.json b/plugins/MultiSites/lang/tl.json
index d3a4875b8e..1e0fac6429 100644
--- a/plugins/MultiSites/lang/tl.json
+++ b/plugins/MultiSites/lang/tl.json
@@ -3,7 +3,6 @@
         "Evolution": "Ebolusyon",
         "LoadingWebsites": "Naglo-load ang mga website",
         "Pagination": "%s - %s ng %s",
-        "PluginDescription": "Ipakita ang multi-site na buod ng executive \/ statistics. Na kasalukuyan pinapanatili bilang pangunahing Piwik plugin.",
         "TopLinkTooltip": "Ikumpara ang stats ng Web Analytics para sa lahat ng iyong Website."
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/uk.json b/plugins/MultiSites/lang/uk.json
index c8591fa8ca..b6f687fd7c 100644
--- a/plugins/MultiSites/lang/uk.json
+++ b/plugins/MultiSites/lang/uk.json
@@ -1,6 +1,5 @@
 {
     "MultiSites": {
-        "Evolution": "Зміна",
-        "PluginDescription": "Показує багато-сайтову всеохоплюючу статистику. На даний час підтримується як плагін ядра Piwik."
+        "Evolution": "Зміна"
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/vi.json b/plugins/MultiSites/lang/vi.json
index 0850293b38..d4ddc5087f 100644
--- a/plugins/MultiSites/lang/vi.json
+++ b/plugins/MultiSites/lang/vi.json
@@ -1,7 +1,6 @@
 {
     "MultiSites": {
         "Evolution": "Sự tiến triển",
-        "PluginDescription": "Hiển thị tóm tắt\/thống kê multi-site thực thi. Hiện đang duy trì như là một plugin Piwik lõi.",
         "TopLinkTooltip": "So sánh các số liệu thống kê Web Analytics cho tất cả các trang web của bạn."
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/zh-cn.json b/plugins/MultiSites/lang/zh-cn.json
index 7d2ba8b3ec..5205453aaf 100644
--- a/plugins/MultiSites/lang/zh-cn.json
+++ b/plugins/MultiSites/lang/zh-cn.json
@@ -1,7 +1,6 @@
 {
     "MultiSites": {
         "Evolution": "趋势",
-        "PluginDescription": "显示多个网站的摘要 \/ 统计。目前为 Piwik 的核心插件。",
         "TopLinkTooltip": "比较所有网站的分析数据"
     }
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/zh-tw.json b/plugins/MultiSites/lang/zh-tw.json
index 3af3f56ba8..1d7fa7b687 100644
--- a/plugins/MultiSites/lang/zh-tw.json
+++ b/plugins/MultiSites/lang/zh-tw.json
@@ -1,6 +1,5 @@
 {
     "MultiSites": {
-        "Evolution": "發展趨勢",
-        "PluginDescription": "顯示多個網站的摘要 \/ 統計。目前為 Piwik 的核心外掛。"
+        "Evolution": "發展趨勢"
     }
 }
\ No newline at end of file
diff --git a/plugins/Overlay/API.php b/plugins/Overlay/API.php
index 39e16985b1..750697a17f 100644
--- a/plugins/Overlay/API.php
+++ b/plugins/Overlay/API.php
@@ -11,6 +11,7 @@ namespace Piwik\Plugins\Overlay;
 use Exception;
 use Piwik\Access;
 use Piwik\Config;
+use Piwik\Container\StaticContainer;
 use Piwik\DataTable;
 use Piwik\Piwik;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
@@ -107,16 +108,16 @@ class API extends \Piwik\Plugin\API
          * Triggered immediately before the user is authenticated.
          *
          * This event can be used by plugins that provide their own authentication mechanism
-         * to make that mechanism available. Subscribers should set the `'auth'` object in
-         * the {@link Piwik\Registry} to an object that implements the {@link Piwik\Auth} interface.
+         * to make that mechanism available. Subscribers should set the `'Piwik\Auth'` object in
+         * the container to an object that implements the {@link Piwik\Auth} interface.
          *
          * **Example**
          *
-         *     use Piwik\Registry;
+         *     use Piwik\Container\StaticContainer;
          *
          *     public function initAuthenticationObject($activateCookieAuth)
          *     {
-         *         Registry::set('auth', new LDAPAuth($activateCookieAuth));
+         *         StaticContainer::getContainer()->set('Piwik\Auth', new LDAPAuth($activateCookieAuth));
          *     }
          *
          * @param bool $activateCookieAuth Whether authentication based on `$_COOKIE` values should
@@ -124,7 +125,7 @@ class API extends \Piwik\Plugin\API
          */
         Piwik::postEvent('Request.initAuthenticationObject', array($activateCookieAuth = true));
 
-        $auth = \Piwik\Registry::get('auth');
+        $auth = StaticContainer::get('Piwik\Auth');
         $success = Access::getInstance()->reloadAccess($auth);
 
         if (!$success) {
diff --git a/plugins/Overlay/lang/ca.json b/plugins/Overlay/lang/ca.json
index d786a1f663..daebb34b52 100644
--- a/plugins/Overlay/lang/ca.json
+++ b/plugins/Overlay/lang/ca.json
@@ -13,7 +13,6 @@
         "OneClick": "1 click",
         "OpenFullScreen": "Mostra a pantalla complerta (sense barra lateral)",
         "Overlay": "Overlay de pàgina",
-        "PluginDescription": "Observeu les anàlitiques a sobre del lloc web actual.",
         "RedirectUrlError": "Esteu intentant obrir un pàgina Overlay per la URL \"%s\". %s Cap dels dominis configurats al Piwik concòrda amb l'enllaç.",
         "RedirectUrlErrorAdmin": "Podeu afegir una URL addicional per un domini a %s les preferències%s.",
         "RedirectUrlErrorUser": "Contacteu amb el vostre administrador per afegir el domini com una URL adicional."
diff --git a/plugins/Overlay/lang/cs.json b/plugins/Overlay/lang/cs.json
index 2036bded52..bc43cb7276 100644
--- a/plugins/Overlay/lang/cs.json
+++ b/plugins/Overlay/lang/cs.json
@@ -13,7 +13,7 @@
         "OneClick": "1 kliknutí",
         "OpenFullScreen": "Přejít na celou obrazovku (bez postranní lišty)",
         "Overlay": "Překryv stránky",
-        "PluginDescription": "Podívejte se na analytická data přímo na vašich stránkách.",
+        "PluginDescription": "Prohlížejte si vaše analytická data jako překryv na stránkách. Zjistěte, kolik uživatelů kliklo na každý z odkazů.",
         "RedirectUrlError": "Pokoušíte se spustit překryv pro stránku s url \"%s\". %s Žádná doména z nastavení Piwiku ale neodpovídá odkazu.",
         "RedirectUrlErrorAdmin": "Doménu můžete jako další URL přidat v %snastavení%s.",
         "RedirectUrlErrorUser": "Požádejte svého administrátora o přidání stránky jako další URL:."
diff --git a/plugins/Overlay/lang/da.json b/plugins/Overlay/lang/da.json
index c6b09ce750..89423a11e2 100644
--- a/plugins/Overlay/lang/da.json
+++ b/plugins/Overlay/lang/da.json
@@ -13,7 +13,6 @@
         "OneClick": "1 klik",
         "OpenFullScreen": "Vis fuldskærm (ingen sidebjælke)",
         "Overlay": "Side overlejring",
-        "PluginDescription": "Se analysedata som en overlejring på din faktiske hjemmeside.",
         "RedirectUrlError": "Du forsøger at åbne sideoverlejring for URL \"%s\". %s Ingen af ​​domæner fra Piwiks indstillinger matcher linket.",
         "RedirectUrlErrorAdmin": "Du kan tilføje domænet som en yderligere URL %si indstillingerne%s.",
         "RedirectUrlErrorUser": "Spørg administratoren om at tilføje domænet som en yderligere URL."
diff --git a/plugins/Overlay/lang/de.json b/plugins/Overlay/lang/de.json
index 0ea761382e..55808f023e 100644
--- a/plugins/Overlay/lang/de.json
+++ b/plugins/Overlay/lang/de.json
@@ -13,7 +13,7 @@
         "OneClick": "1-click",
         "OpenFullScreen": "Vollbildmodus starten (keine Sidebar)",
         "Overlay": "Seiten Overlay",
-        "PluginDescription": "Sehen Sie analytische Daten als Überlagung auf Ihrer eigentlichen Webseite.",
+        "PluginDescription": "Sehen Sie Ihre Analysedaten als ein Overlay auf Ihrer aktuellen Webseite ein. Lassen Sie sich anzeigen wie oft Ihre Benutzer auf welchen Link geklickt haben.",
         "RedirectUrlError": "Sie versuchen, eine Seiten Overlay Sitzung für die URL \"%s\" zu starten. %s Keine der in den Piwik Einstellungen hinterlegten Domains passt zu diesem Link.",
         "RedirectUrlErrorAdmin": "Sie können diese Domain %sin den Einstellungen%s als zusätzliche URL hinzufügen.",
         "RedirectUrlErrorUser": "Bitten Sie Ihren Administrator diese Domain als zusätzliche URL hinzuzufügen."
diff --git a/plugins/Overlay/lang/el.json b/plugins/Overlay/lang/el.json
index 35061b62d4..3cb097c722 100644
--- a/plugins/Overlay/lang/el.json
+++ b/plugins/Overlay/lang/el.json
@@ -13,7 +13,7 @@
         "OneClick": "1 πάτημα",
         "OpenFullScreen": "Μετάβαση σε πλήρη οθόνη (χωρίς πλευρική γραμμή)",
         "Overlay": "Υπερκάλυψη Σελίδας",
-        "PluginDescription": "Δείτε στατιστικά δεδομένα ως υπερκάλυψη στην ιστοσελίδα σας.",
+        "PluginDescription": "Δείτε τα δεδομένα αναλυτικών σας ως Επικάλυψη στον ιστοτόπο σας. Δείτε πόσες φορές οι χρήστες σας έκαναν κλικ σε κάθε σύνδεσμο.",
         "RedirectUrlError": "Προσπαθείτε να ανοίξετε την Επικάλυψη Σελίδων για τη διεύθυνση URL \"%s\". %s Κανένα από τα ονόματα χώρου που βρίσκονται στις ρυθμίσεις του Piwik δεν ταιριάζει με το σύνδεσμο.",
         "RedirectUrlErrorAdmin": "Μπορείτε να προσθέσετε το όνομα χώρου ως μια πρόσθετη διεύθυνση URL %sστις ρυθμίσεις%s.",
         "RedirectUrlErrorUser": "Ζητήστε από το διαχειριστή σας για να προσθέσετε το όνομα χώρου ως μια επιπλέον διεύθυνση URL."
diff --git a/plugins/Overlay/lang/en.json b/plugins/Overlay/lang/en.json
index f36c077461..6e036b99c7 100644
--- a/plugins/Overlay/lang/en.json
+++ b/plugins/Overlay/lang/en.json
@@ -13,7 +13,7 @@
         "OneClick": "1 click",
         "OpenFullScreen": "Go full screen (no sidebar)",
         "Overlay": "Page Overlay",
-        "PluginDescription": "See analytics data as an overlay on your actual website.",
+        "PluginDescription": "See your analytics data as an Overlay on your actual website. View how many times your users have clicked on each link. ",
         "RedirectUrlError": "You are attempting to open Page Overlay for the URL \"%s\". %s None of the domains from the Piwik settings matches the link.",
         "RedirectUrlErrorAdmin": "You can add the domain as an additional URL %sin the settings%s.",
         "RedirectUrlErrorUser": "Ask your administrator to add the domain as an additional URL."
diff --git a/plugins/Overlay/lang/es.json b/plugins/Overlay/lang/es.json
index 0e7a44adfe..da1ea6e04c 100644
--- a/plugins/Overlay/lang/es.json
+++ b/plugins/Overlay/lang/es.json
@@ -13,7 +13,6 @@
         "OneClick": "1 clic",
         "OpenFullScreen": "Ir a pantalla completa",
         "Overlay": "Vísta general de página",
-        "PluginDescription": "Ver información analítica como una solapa en su actual sitio de internet.",
         "RedirectUrlError": "Está intentando abrir una página de la dirección de internet \"%s\"- %s Ninguno de sus dominios de su configuración Piwik coincide con el enlace.",
         "RedirectUrlErrorAdmin": "Puede agregar el dominio como una dirección de internet %sen la configuración%s.",
         "RedirectUrlErrorUser": "Pregunte a su administrador para agregar el dominio como una dirección de internet adicional."
diff --git a/plugins/Overlay/lang/fa.json b/plugins/Overlay/lang/fa.json
index 9d65044fe3..815b6ebd99 100644
--- a/plugins/Overlay/lang/fa.json
+++ b/plugins/Overlay/lang/fa.json
@@ -11,7 +11,6 @@
         "OneClick": "1 کلیک",
         "OpenFullScreen": "به حالت تمام صفحه برو (بدون ستون کناری)",
         "Overlay": "صفحه از دسترس خارج شد",
-        "PluginDescription": "داده های آماری را بر روی وب سایت واقعی تان مشاهده کنید.",
         "RedirectUrlErrorAdmin": "شما توانید آدرس های جدیدی را اضافه نمایید URL %sin the settings%s.",
         "RedirectUrlErrorUser": "از مدیریت بخواهید که این دامنه را به عنوان دامنه اضافی بیافزاید."
     }
diff --git a/plugins/Overlay/lang/fi.json b/plugins/Overlay/lang/fi.json
index a4edd093ab..2a3719e356 100644
--- a/plugins/Overlay/lang/fi.json
+++ b/plugins/Overlay/lang/fi.json
@@ -13,7 +13,6 @@
         "OneClick": "1 klikkaus",
         "OpenFullScreen": "Siirry koko näytön tilaan (ei sivupalkkia)",
         "Overlay": "Sivun leijuke",
-        "PluginDescription": "Näe analyysidata leijukekerroksena tämänhetkisellä verkkosivullasi.",
         "RedirectUrlError": "Yrität avata sivun leijuketta URL:lle \"%s\". %s mikän Piwikin asetuksien domain ei vastaa linkkiä.",
         "RedirectUrlErrorAdmin": "Voit lisätä domainin ylimääräisenä URL:nä %sasetuksissa%s.",
         "RedirectUrlErrorUser": "Pyydä ylläpitää lisäämään domain ylimääräisenä verkkosivuna."
diff --git a/plugins/Overlay/lang/fr.json b/plugins/Overlay/lang/fr.json
index 89b4321b77..d339f67f56 100644
--- a/plugins/Overlay/lang/fr.json
+++ b/plugins/Overlay/lang/fr.json
@@ -13,7 +13,6 @@
         "OneClick": "1 clic",
         "OpenFullScreen": "Ouvrir en plein écran",
         "Overlay": "Analyse des pages web",
-        "PluginDescription": "Visualisez les données d'analyse superposées sur votre site web.",
         "RedirectUrlError": "Vous tentez d'ouvrir l'analyse des pages web pour l'URL \"%s\". %s Aucun des domaines configurés dans Piwik ne correspond à cette URL.",
         "RedirectUrlErrorAdmin": "Vous pouvez ajouter le domaine en tant qu'URL additionnelle %sdans les paramètres%s.",
         "RedirectUrlErrorUser": "Demandez à votre administrateur d'ajouter le domaine en tant qu'URL additionnelle."
diff --git a/plugins/Overlay/lang/hi.json b/plugins/Overlay/lang/hi.json
index 94445f6b0b..9765dec7db 100644
--- a/plugins/Overlay/lang/hi.json
+++ b/plugins/Overlay/lang/hi.json
@@ -13,7 +13,6 @@
         "OneClick": "1 क्लिक करें",
         "OpenFullScreen": "पूर्ण स्क्रीन (कोई साइडबार नहीं ) के लिए जाओ",
         "Overlay": "पृष्ठ आवरण",
-        "PluginDescription": "आपकी वास्तविक वेबसाइट पर आच्छादन के रूप में एनालिटिक्स डेटा देखें.",
         "RedirectUrlError": "आप यूआरएल \"%s\" के लिए पृष्ठ आवरण खोलने के लिए प्रयास कर रहे हैं. Piwik सेटिंग से डोमेन में से कोई%s भी लिंक से मेल नहीं खाता है.",
         "RedirectUrlErrorAdmin": "आप सेटिंग्स%s से एक अतिरिक्त URL%s के रूप में डोमेन जोड़ सकते हैं",
         "RedirectUrlErrorUser": "एक अतिरिक्त URL के रूप में डोमेन को जोड़ने के लिए अपने व्यवस्थापक से पूछें."
diff --git a/plugins/Overlay/lang/id.json b/plugins/Overlay/lang/id.json
index b543397979..2b751ebcbe 100644
--- a/plugins/Overlay/lang/id.json
+++ b/plugins/Overlay/lang/id.json
@@ -13,7 +13,6 @@
         "OneClick": "1 kilik",
         "OpenFullScreen": "Menuju halaman penuh (tanpa batang sisi)",
         "Overlay": "Penghampar Halaman",
-        "PluginDescription": "Lihat data analitis sebagai penghampar dalam situs Anda sebenarnya.",
         "RedirectUrlError": "Anda mencoba membuka Penghampar Halaman dari URL \"%s\". %s Tidak ada ranah dari pengaturan Piwik sesuai dengan tautan.",
         "RedirectUrlErrorAdmin": "Anda dapat menambah ranah sebagai URL tambahan di %spengaturan%s.",
         "RedirectUrlErrorUser": "Silakan bertanya kepada pengelola Anda untuk menambah ranah sebagai URL tambahan."
diff --git a/plugins/Overlay/lang/it.json b/plugins/Overlay/lang/it.json
index cda414c9e1..1354a0ceab 100644
--- a/plugins/Overlay/lang/it.json
+++ b/plugins/Overlay/lang/it.json
@@ -13,7 +13,7 @@
         "OneClick": "1 click",
         "OpenFullScreen": "vai a schermo intero (niente barra laterale)",
         "Overlay": "Overlay di Pagina",
-        "PluginDescription": "Guarda i dati di analisi come sovrapposizione sul tuo sito web vero e proprio.",
+        "PluginDescription": "Guarda i tuoi dati statistici come sovrimpressione sul tuo sito web. Guarda quante volte i tuoi utenti hanno cliccato su ciascun link.",
         "RedirectUrlError": "Si sta tentando di aprire la Pagina Overlay per l'URL \"%s\". %s Nessuno dei domini dalle impostazioni di Piwik corrisponde al link.",
         "RedirectUrlErrorAdmin": "È possibile aggiungere il dominio come un ulteriore URL %s nelle impostazioni%s.",
         "RedirectUrlErrorUser": "Chiedi all'amministratore di aggiungere il dominio come un URL aggiuntivo."
diff --git a/plugins/Overlay/lang/ja.json b/plugins/Overlay/lang/ja.json
index 7554601958..da0276180c 100644
--- a/plugins/Overlay/lang/ja.json
+++ b/plugins/Overlay/lang/ja.json
@@ -13,7 +13,6 @@
         "OneClick": "1 クリック",
         "OpenFullScreen": "フルスクリーンへ (サイドバーなし)",
         "Overlay": "ページオーバーレイ",
-        "PluginDescription": "実際のウェブサイトで、オーバーレイとして分析データを参照してください。",
         "RedirectUrlError": "URL \"%s\" に対するページオーバーレイを開こうとしています。%s Piwik 設定のドメインが、すべてリンクに一致しません。",
         "RedirectUrlErrorUser": "管理者に、任意のドメインを追加 URL として追加するよう管理者に依頼してください。"
     }
diff --git a/plugins/Overlay/lang/ko.json b/plugins/Overlay/lang/ko.json
index 48d39387c1..4b761eaf5e 100644
--- a/plugins/Overlay/lang/ko.json
+++ b/plugins/Overlay/lang/ko.json
@@ -13,7 +13,6 @@
         "OneClick": "1회 클릭",
         "OpenFullScreen": "전체 화면 (사이드바 아님)으로 이동",
         "Overlay": "페이지 오버레이",
-        "PluginDescription": "실제 웹사이트에 분석 데이터를 겹쳐서 볼 수 있습니다.",
         "RedirectUrlError": "URL \"%s\"에 대한 페이지 오버레이를 열려고 시도합니다. %s은 Piwik 설정한 도메인과 어떤 링크도 일치하지 않습니다.",
         "RedirectUrlErrorAdmin": "당신은 %s설정%s에서 추가적인 URL로 도메인을 추가할 수 있습니다.",
         "RedirectUrlErrorUser": "도메인에 추가적인 URL을 추가하려면 관리자에게 문의하세요."
diff --git a/plugins/Overlay/lang/nl.json b/plugins/Overlay/lang/nl.json
index 2475f4889d..fecf7671ec 100644
--- a/plugins/Overlay/lang/nl.json
+++ b/plugins/Overlay/lang/nl.json
@@ -11,7 +11,6 @@
         "OneClick": "1 klik",
         "OpenFullScreen": "Toon volledig scherm (geen zijbalk)",
         "Overlay": "Pagina Overlay",
-        "PluginDescription": "Zie analyse data als een overlay op je website.",
         "RedirectUrlError": "Je probeert Pagina overlay te openen voor de URL \"%s\". %s Geen enkel domain van de Piwik instellingen komt overeen met de link.",
         "RedirectUrlErrorAdmin": "Je kunt het domein toevoegen als extra URL %sin de instellingen%s.",
         "RedirectUrlErrorUser": "Vraag je beheerder om het domein toe te voegen als additionele URL."
diff --git a/plugins/Overlay/lang/pt-br.json b/plugins/Overlay/lang/pt-br.json
index 02e21e2e9c..2701a2de1d 100644
--- a/plugins/Overlay/lang/pt-br.json
+++ b/plugins/Overlay/lang/pt-br.json
@@ -13,7 +13,6 @@
         "OneClick": "1 clique",
         "OpenFullScreen": "Ir para tela cheia (sem barra lateral)",
         "Overlay": "Sobreposição de Página",
-        "PluginDescription": "Veja os dados do Google Analytics como uma sobreposição no site real.",
         "RedirectUrlError": "Você está tentando abrir sobreposição de página para a URL \"%s\". %s Nenhum dos domínios configurados no Piwik corresponde ao link.",
         "RedirectUrlErrorAdmin": "Você pode adicionar um domínio como uma URL adicional %sem definições%s.",
         "RedirectUrlErrorUser": "Solicite ao seu administrador para adicionar o domínio como uma URL adicional."
diff --git a/plugins/Overlay/lang/ro.json b/plugins/Overlay/lang/ro.json
index 361dfb8e99..88dc592478 100644
--- a/plugins/Overlay/lang/ro.json
+++ b/plugins/Overlay/lang/ro.json
@@ -13,7 +13,6 @@
         "OneClick": "1 click",
         "OpenFullScreen": "Tot ecranul (fără bara laterală)",
         "Overlay": "Acoperire Pagina",
-        "PluginDescription": "A se vedea,o analiză a datelor ca o suprapunere pe site-ul real.",
         "RedirectUrlError": "Încercați să deschideți Acoperire Pagina pentru URL-ul \"%s\". %s Niciunul dintre domeniile de setările Piwik nu se potrivește lcu acest link.",
         "RedirectUrlErrorAdmin": "Puteți adăuga domeniul ca o suplimentare de URL-ul %s in setarile%s.",
         "RedirectUrlErrorUser": "Adresați-vă administratorului pentru a adăuga un domeniu ca un URL suplimentar."
diff --git a/plugins/Overlay/lang/ru.json b/plugins/Overlay/lang/ru.json
index 3cecc3be17..e60dd225f0 100644
--- a/plugins/Overlay/lang/ru.json
+++ b/plugins/Overlay/lang/ru.json
@@ -2,6 +2,7 @@
     "Overlay": {
         "Clicks": "%s кликов",
         "Domain": "Домен",
+        "ErrorNotLoadingLink": "Получить дополнительные советы по устранению неполадок",
         "Link": "Ссылка",
         "Location": "Местоположение",
         "NoData": "Нет данных по этой странице за выбранный период.",
diff --git a/plugins/Overlay/lang/sr.json b/plugins/Overlay/lang/sr.json
index 806a74d8d5..a6f1fb771c 100644
--- a/plugins/Overlay/lang/sr.json
+++ b/plugins/Overlay/lang/sr.json
@@ -13,7 +13,6 @@
         "OneClick": "1 klik",
         "OpenFullScreen": "Prikaži preko celog ekrana",
         "Overlay": "Prikaz preko (overlay)",
-        "PluginDescription": "Prikaži analitičke podatke preko stranice sajta (overlay).",
         "RedirectUrlError": "Pokušali ste da otvorite stranicu za URL \"%s\". %s Nijedan od domena iz Piwik podešavanja ne odgovara ovom linku.",
         "RedirectUrlErrorAdmin": "Možete dodati domen kao dodatni URL %su podešavanjima%s.",
         "RedirectUrlErrorUser": "Zamolite administratora da doda domen kao dodatni URL."
diff --git a/plugins/Overlay/lang/sv.json b/plugins/Overlay/lang/sv.json
index bacb904b6e..9974f217d7 100644
--- a/plugins/Overlay/lang/sv.json
+++ b/plugins/Overlay/lang/sv.json
@@ -13,7 +13,6 @@
         "OneClick": "1 klick",
         "OpenFullScreen": "Gå till helskärmsläge (ingen sidolist)",
         "Overlay": "Sidöverlägg",
-        "PluginDescription": "Se analysdata som ett överliggande lager på din faktiska webbplats.",
         "RedirectUrlError": "Du försöker öppna ett överliggande lager för URL \"%s\". %s Ingen av domänerna från Piwik's inställningar matchar länken.",
         "RedirectUrlErrorAdmin": "Du kan lägga till domänen som en extra URL %si inställningarna%s.",
         "RedirectUrlErrorUser": "Be administratören att lägga till domänen som en extra webbadress"
diff --git a/plugins/Overlay/lang/tl.json b/plugins/Overlay/lang/tl.json
index 231c42ba93..ad94f4a07d 100644
--- a/plugins/Overlay/lang/tl.json
+++ b/plugins/Overlay/lang/tl.json
@@ -12,7 +12,6 @@
         "NoData": "Walang datos para sa pahinang ito sa napiling panahon.",
         "OpenFullScreen": "Mag full screen (walang sidebar)",
         "Overlay": "Page Overlay",
-        "PluginDescription": "Tingnan ang analitiko na datos bilang overlay ng iyong tunay na website.",
         "RedirectUrlError": "Sinusubukan mo upang buksan ang Overlay ng Pahina para sa URL na \"%s\". %s Wala sa mga domains ng Piwik settings ang tugma sa link",
         "RedirectUrlErrorAdmin": "Maaari mong idagdag ang domain na karagdagang URL %s sa mga setting ng %s.",
         "RedirectUrlErrorUser": "Tanungin ang iyong administrator upang idagdag ang domain bilang isang karagdagang URL."
diff --git a/plugins/Overlay/lang/vi.json b/plugins/Overlay/lang/vi.json
index e85e4f8b72..a84ed3122b 100644
--- a/plugins/Overlay/lang/vi.json
+++ b/plugins/Overlay/lang/vi.json
@@ -13,7 +13,6 @@
         "OneClick": "1 click",
         "OpenFullScreen": "Toàn màn hình (không có sidebar)",
         "Overlay": "Trang Overlay",
-        "PluginDescription": "Xem dữ liệu phân tích như một overlay trên trang web thực của bạn.",
         "RedirectUrlError": "Bạn đang cố mở trang Overlay cho URL \"%s\". Không có %s của các tên miền từ các thiết lập Piwik phù hợp với liên kết này.",
         "RedirectUrlErrorAdmin": "Bạn có thể thêm các tên miền như một URL bổ sung %s trong cài đặt %s.",
         "RedirectUrlErrorUser": "Yêu cầu quản trị của bạn thêm các tên miền như một URL bổ sung"
diff --git a/plugins/Overlay/lang/zh-cn.json b/plugins/Overlay/lang/zh-cn.json
index 2f36bba831..6d3eea0bd4 100644
--- a/plugins/Overlay/lang/zh-cn.json
+++ b/plugins/Overlay/lang/zh-cn.json
@@ -13,7 +13,6 @@
         "OneClick": "1 次点击",
         "OpenFullScreen": "全屏(无边框)",
         "Overlay": "页面叠加",
-        "PluginDescription": "在实际网站上叠加显示分析数据。",
         "RedirectUrlError": "您正在打开网址 \"%s\" 的页面叠加。%s 没有 Piwik 设置的域名匹配这个链接。",
         "RedirectUrlErrorAdmin": "您可以在 %s管理设置%s 中以附加网址添加域名。",
         "RedirectUrlErrorUser": "请管理员以附加网址来添加域名。"
diff --git a/plugins/PleineLune b/plugins/PleineLune
deleted file mode 160000
-Subproject d2d78dd7973811cfb3d0744655a2f0d763b0129
diff --git a/plugins/PrivacyManager/Config.php b/plugins/PrivacyManager/Config.php
index ac6e143b11..3767cdc5f4 100644
--- a/plugins/PrivacyManager/Config.php
+++ b/plugins/PrivacyManager/Config.php
@@ -27,7 +27,7 @@ use Piwik\Tracker\Cache;
 class Config
 {
     private $properties = array(
-        'useAnonymizedIpForVisitEnrichment' => array('type' => 'boolean', 'default' => true),
+        'useAnonymizedIpForVisitEnrichment' => array('type' => 'boolean', 'default' => false),
         'ipAddressMaskLength'               => array('type' => 'integer', 'default' => 2),
         'doNotTrackEnabled'                 => array('type' => 'boolean', 'default' => true),
         'ipAnonymizerEnabled'               => array('type' => 'boolean', 'default' => true),
diff --git a/plugins/PrivacyManager/Controller.php b/plugins/PrivacyManager/Controller.php
index d8965147a3..a6720fccbf 100644
--- a/plugins/PrivacyManager/Controller.php
+++ b/plugins/PrivacyManager/Controller.php
@@ -10,6 +10,7 @@ namespace Piwik\Plugins\PrivacyManager;
 
 use Piwik\Common;
 use Piwik\Config as PiwikConfig;
+use Piwik\Container\StaticContainer;
 use Piwik\Date;
 use Piwik\Db;
 use Piwik\Metrics\Formatter;
@@ -19,7 +20,7 @@ use Piwik\Option;
 use Piwik\Piwik;
 use Piwik\Plugins\DBStats\MySQLMetadataProvider;
 use Piwik\Plugins\LanguagesManager\LanguagesManager;
-use Piwik\TaskScheduler;
+use Piwik\Scheduler\Scheduler;
 use Piwik\View;
 
 /**
@@ -250,12 +251,14 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
     {
         Piwik::checkUserHasSuperUserAccess();
         $deleteDataInfos = array();
-        $taskScheduler = new TaskScheduler();
         $deleteDataInfos["config"] = PrivacyManager::getPurgeDataSettings();
         $deleteDataInfos["deleteTables"] =
             "<br/>" . implode(", ", LogDataPurger::getDeleteTableLogTables());
 
-        $scheduleTimetable = $taskScheduler->getScheduledTimeForMethod("PrivacyManager", "deleteLogTables");
+        /** @var Scheduler $scheduler */
+        $scheduler = StaticContainer::getContainer()->get('Piwik\Scheduler\Scheduler');
+
+        $scheduleTimetable = $scheduler->getScheduledTimeForMethod("PrivacyManager", "deleteLogTables");
 
         $optionTable = Option::get(self::OPTION_LAST_DELETE_PIWIK_LOGS);
 
diff --git a/plugins/PrivacyManager/Menu.php b/plugins/PrivacyManager/Menu.php
index 33c7aa55a2..7fbba50e6c 100644
--- a/plugins/PrivacyManager/Menu.php
+++ b/plugins/PrivacyManager/Menu.php
@@ -18,7 +18,7 @@ class Menu extends \Piwik\Plugin\Menu
         if (Piwik::isUserHasSomeAdminAccess()) {
             $menu->addSettingsItem('PrivacyManager_MenuPrivacySettings',
                                    $this->urlForAction('privacySettings'),
-                                   $order = 7);
+                                   $order = 9);
         }
     }
 }
diff --git a/plugins/PrivacyManager/lang/be.json b/plugins/PrivacyManager/lang/be.json
index 25c7a57a31..dbad381752 100644
--- a/plugins/PrivacyManager/lang/be.json
+++ b/plugins/PrivacyManager/lang/be.json
@@ -13,7 +13,6 @@
         "LeastDaysInput": "Калі ласка, пазначце колькасць дзён больш, чым %s.",
         "MenuPrivacySettings": "Прыватнасць",
         "NextDelete": "Наступнае запланавана выдаленне",
-        "PluginDescription": "Наладзіць Piwik, каб зрабіць яго наладкі прыватнасці сумяшчальнымі з існуючым заканадаўствам.",
         "TeaserHeadline": "Наладкі прыватнасці",
         "UseAnonymizeIp": "Ананімазаваць IP-адрасы наведвальнікаў",
         "UseDeleteLog": "Рэгулярна выдаляць старыя запісы наведвальнікаў з базы дадзеных"
diff --git a/plugins/PrivacyManager/lang/bg.json b/plugins/PrivacyManager/lang/bg.json
index 225e49f131..8847241689 100644
--- a/plugins/PrivacyManager/lang/bg.json
+++ b/plugins/PrivacyManager/lang/bg.json
@@ -44,7 +44,6 @@
         "LeastMonthsInput": "Моля укажете номер на месеци по-голям от %s.",
         "MenuPrivacySettings": "Поверителност",
         "NextDelete": "Следващото планирано изтриване е на",
-        "PluginDescription": "Персонализирайте Piwik, за да го съгласувате със съществуващото законодателство.",
         "PurgeNow": "Изтриване на базата данни СЕГА",
         "PurgeNowConfirm": "Вие сте на път перманентно да изтриете информацията от вашата база данни. Сигурни ли сте, че искате да продължите?",
         "PurgingData": "Изтриване на базата данни...",
diff --git a/plugins/PrivacyManager/lang/ca.json b/plugins/PrivacyManager/lang/ca.json
index cfe78bb4f3..5d405c7539 100644
--- a/plugins/PrivacyManager/lang/ca.json
+++ b/plugins/PrivacyManager/lang/ca.json
@@ -46,7 +46,6 @@
         "LeastMonthsInput": "Siusplau, especifiqueu un nombre de dies més gran que %s.",
         "MenuPrivacySettings": "Privacitat",
         "NextDelete": "La pròxima eliminació programada el",
-        "PluginDescription": "Personalitzeu el Piwik per que compleixi amb les legislacions actuals sobre privacitat.",
         "PurgeNow": "Purga la BD ara",
         "PurgeNowConfirm": "Esteu a punt d'esborrar tota la informació de la vostra base de ades. Esteu segur que voleu continuar?",
         "PurgingData": "Prugant la informació...",
diff --git a/plugins/PrivacyManager/lang/cs.json b/plugins/PrivacyManager/lang/cs.json
index d452157e14..d2051e3163 100644
--- a/plugins/PrivacyManager/lang/cs.json
+++ b/plugins/PrivacyManager/lang/cs.json
@@ -1,6 +1,7 @@
 {
     "PrivacyManager": {
         "AnonymizeIpDescription": "Zvolte \"ano\", pokud nemá Piwik sledovat plně kvalifikované IP adresy.",
+        "AnonymizeIpExtendedHelp": "Když uživatelé navštíví vaše stránky, Piwik neuloží jejich plnou IP adresu(jako %s), ale nejprve bude anonymizována (na %s). Anonymizace IP adres je jeden z požadavků práva na ochranu soukromí v některých zemí, jako je třeba Německo.",
         "AnonymizeIpInlineHelp": "Skryje poslední byte IP adresy návštěvníka, aby souhlasila se zákony vaší země.",
         "AnonymizeIpMaskLengtDescription": "Zvolte, kolik bitů z návštěvníkovy IP adresy má být maskováno.",
         "AnonymizeIpMaskLength": "%s bitů - např. %s",
@@ -46,7 +47,7 @@
         "LeastMonthsInput": "Prosím, uveďte počet měsíců větší než %s.",
         "MenuPrivacySettings": "Ochrana soukromí",
         "NextDelete": "Následující plánované mazání za",
-        "PluginDescription": "Přizpůsobí Piwik tak, aby splňoval zákony o soukromí dat.",
+        "PluginDescription": "Zlepšete soukromí pro vaše uživatele a zajistěte soulad vaší instance Piwiku s místní legislativou týkající se soukromí.",
         "PurgeNow": "Vyprázdnit databázi nyní",
         "PurgeNowConfirm": "Chystáte se natrvalo odstranit data z vaší databáze. Opravdu chcete pokračovat?",
         "PurgingData": "Promazávání dat...",
diff --git a/plugins/PrivacyManager/lang/da.json b/plugins/PrivacyManager/lang/da.json
index a103f53f55..f98b24df4d 100644
--- a/plugins/PrivacyManager/lang/da.json
+++ b/plugins/PrivacyManager/lang/da.json
@@ -47,7 +47,6 @@
         "LeastMonthsInput": "Angiv et antal måneder større end %s.",
         "MenuPrivacySettings": "Privatliv",
         "NextDelete": "Næste planlagt sletning på",
-        "PluginDescription": "Tilpas Piwik til beskyttelse af personlige oplysninger i overensstemmelse med gældende lovgivning.",
         "PurgeNow": "Ryd op i databasen nu",
         "PurgeNowConfirm": "Permanent sletning af data fra databasen. Bekræft for at fortsætte?",
         "PurgingData": "Rydder op i data...",
diff --git a/plugins/PrivacyManager/lang/de.json b/plugins/PrivacyManager/lang/de.json
index 5545b1be91..7079382114 100644
--- a/plugins/PrivacyManager/lang/de.json
+++ b/plugins/PrivacyManager/lang/de.json
@@ -47,7 +47,7 @@
         "LeastMonthsInput": "Bitte spezifizieren Sie eine Anzahl Monate größer als %s.",
         "MenuPrivacySettings": "Privatsphäre",
         "NextDelete": "Nächste Löschung geplant in",
-        "PluginDescription": "Erlaubt die Anpassung von Piwik, um es den jeweiligen Datenschutz-Bestimmungen des Landes anzupassen.",
+        "PluginDescription": "Berücksichtigen Sie den Datenschutz für Ihre Benutzer und machen Sie Ihre Piwik Installation datenschutzkonform gemäss Ihren lokalen Datenschutzbestimmungen.",
         "PurgeNow": "Datenbank jetzt leeren",
         "PurgeNowConfirm": "Sie sind dabei, Daten dauerhaft aus der Datenbank zu entfernen. Sind Sie sicher?",
         "PurgingData": "Lösche Daten...",
diff --git a/plugins/PrivacyManager/lang/el.json b/plugins/PrivacyManager/lang/el.json
index cf5c00c670..68f701daf5 100644
--- a/plugins/PrivacyManager/lang/el.json
+++ b/plugins/PrivacyManager/lang/el.json
@@ -47,7 +47,7 @@
         "LeastMonthsInput": "Ορίστε έναν αριθμό μηνών μεγαλύτερο από %s.",
         "MenuPrivacySettings": "Ιδιωτικό απόρρητο",
         "NextDelete": "Η επόμενη προγραμματισμένη διαγραφή σε",
-        "PluginDescription": "Προσαρμόστε το Piwik ώστε να είναι συμβατό με την ισχύουσα νομοθεσία περί προσωπικών δεδομένων.",
+        "PluginDescription": "Αυξάνει την Ιδιωτικότητα των χρηστών σας και κάνει συμβατή την εγκατάσταση του Piwik σας με την τοπική νομοθεσία.",
         "PurgeNow": "Εκκαθάριση Βάσης Δεδομένων Τώρα",
         "PurgeNowConfirm": "Πρόκειται να διαγράψετε μόνιμα δεδομένα από τη βάση δεδομένων σας. Θέλετε, σίγουρα, να συνεχίσετε;",
         "PurgingData": "Εκκαθάριση δεδομενων...",
@@ -58,7 +58,7 @@
         "Teaser": "Σε αυτή τη σελίδα, μπορείτε να προσαρμόσετε το Piwik ώστε να είναι συμβατό με την ισχύουσα νομοθεσία όσο αφορά τα προσωπικά δεδομένα, %sκάνοντας ανώνυμες τις διευθύνσεις IP των επισκεπτών%s, %sαπομακρύνοντας αυτόματα τις παλαιές καταγραφές επισκεπτών από τη βάση δεδομένων%s και %sπαρέχοντας ένα μηχανισμό απενεργοποίησης για την ιστοσελίδα σας%s.",
         "TeaserHeadline": "Ρυθμίσεις ιδιωτικού απορρήτου",
         "UseAnonymizedIpForVisitEnrichment": "Χρησιμοποιήστε παράλληλα και τις Ανώνυμες Διευθύνσεις IP κατά τον εμπλουτισμό των επισκέψεων.",
-        "UseAnonymizedIpForVisitEnrichmentNote": "Πρόσθετα όπως αυτό της Γεωτοποθεσίας και του Παρόχου βελτιώνουν τα μεταδεδομένα για τους επισκέπτες. Εξ' ορισμού τα πρόσθετα αυτά χρησιμοποιούν ανώνυμες διευθύνσεις IP. Αν επιλέξετε 'Όχι', τότε θα χρησιμοποιηθούν οι πλήρης διευθύνσεις IP, έχοντας ως αποτέλεσμα λιγότερη ιδιωτικότητα, αλλά καλύτερη ακρίβεια δεδομένων.",
+        "UseAnonymizedIpForVisitEnrichmentNote": "Πρόσθετα όπως αυτό της Γεωτοποθεσίας και του Παρόχου βελτιώνουν τα μεταδεδομένα για τους επισκέπτες. Εξ' ορισμού τα πρόσθετα αυτά χρησιμοποιούν ανώνυμες διευθύνσεις IP. Αν επιλέξετε 'Όχι', τότε θα χρησιμοποιηθούν οι πλήρεις διευθύνσεις IP, έχοντας ως αποτέλεσμα λιγότερη ιδιωτικότητα, αλλά καλύτερη ακρίβεια δεδομένων.",
         "UseAnonymizeIp": "Κάντε ανώνυμες τις διευθύνσεις IP Επισκεπτών",
         "UseDeleteLog": "Τακτική διαγραφή παλαιών καταγραφών επισκεπτών από τη βάση δεδομένων",
         "UseDeleteReports": "Τακτική διαγραφή παλαιών αναφορών από τη βάση δεδομένων"
diff --git a/plugins/PrivacyManager/lang/en.json b/plugins/PrivacyManager/lang/en.json
index aa84139e89..31c7072993 100644
--- a/plugins/PrivacyManager/lang/en.json
+++ b/plugins/PrivacyManager/lang/en.json
@@ -47,7 +47,7 @@
         "LeastMonthsInput": "Please specify a number of months greater than %s.",
         "MenuPrivacySettings": "Privacy",
         "NextDelete": "Next scheduled deletion in",
-        "PluginDescription": "Customize Piwik to make it privacy compliant with existing legislations.",
+        "PluginDescription": "Increase Privacy for your users and make your Piwik instance privacy compliant with your local legislation.  ",
         "PurgeNow": "Purge DB Now",
         "PurgeNowConfirm": "You are about to permanently delete data from your database. Are you sure you want to continue?",
         "PurgingData": "Purging data...",
diff --git a/plugins/PrivacyManager/lang/es.json b/plugins/PrivacyManager/lang/es.json
index 1fecbf7693..34e296a694 100644
--- a/plugins/PrivacyManager/lang/es.json
+++ b/plugins/PrivacyManager/lang/es.json
@@ -46,7 +46,6 @@
         "LeastMonthsInput": "Por favor, especifique un número de meses mayor que %s.",
         "MenuPrivacySettings": "Privacidad",
         "NextDelete": "La próxima eliminación programada es en",
-        "PluginDescription": "Personalizar Piwik para hacer que cumpla con las legislaciones existentes.",
         "PurgeNow": "Purgar DB ahora",
         "PurgeNowConfirm": "Está a punto de borrar información permanentemente de su base de datos. Está seguro que quiere continuar?",
         "PurgingData": "Purgando información...",
diff --git a/plugins/PrivacyManager/lang/fa.json b/plugins/PrivacyManager/lang/fa.json
index 15f9d7e7a7..3ad486480d 100644
--- a/plugins/PrivacyManager/lang/fa.json
+++ b/plugins/PrivacyManager/lang/fa.json
@@ -37,7 +37,6 @@
         "LeastMonthsInput": "لطفا تعداد ماه هایی بیشتر از %s را مشخص کنید.",
         "MenuPrivacySettings": "حریم خصوصی",
         "NextDelete": "حذف زمان بندی شده ی بعدی در",
-        "PluginDescription": "پیویک را سفارشی کنید تا آن را با قوانین موجود حفظ حریم خصوصی سازگار کنید.",
         "PurgeNow": "پایگاه داده را هم اکنون پالایش کن",
         "PurgeNowConfirm": "شما به طور دائم حذف داده ها از پایگاه داده خود هستند. آیا مطمئن هستید که میخواهید ادامه دهید؟",
         "PurgingData": "در حال پاکسازی داده ها ...",
diff --git a/plugins/PrivacyManager/lang/fi.json b/plugins/PrivacyManager/lang/fi.json
index 945d43dcba..db34d37575 100644
--- a/plugins/PrivacyManager/lang/fi.json
+++ b/plugins/PrivacyManager/lang/fi.json
@@ -46,7 +46,6 @@
         "LeastMonthsInput": "Kuukausien lukumäärän täytyy olla suurempi kuin %s.",
         "MenuPrivacySettings": "Yksityisyys",
         "NextDelete": "Seuraava poistaminen on",
-        "PluginDescription": "Kustomoi Piwikiä, jotta seurantasi noudattaa voimassaolevia lakeja ja säännöksiä.",
         "PurgeNow": "Siivoa tietokanta nyt",
         "PurgeNowConfirm": "Olet poistamassa tietoja lopullisesti. Haluatko varmasti jatkaa?",
         "PurgingData": "Siivotaan tietoja...",
diff --git a/plugins/PrivacyManager/lang/fr.json b/plugins/PrivacyManager/lang/fr.json
index 4a9665d04f..50b1969a4d 100644
--- a/plugins/PrivacyManager/lang/fr.json
+++ b/plugins/PrivacyManager/lang/fr.json
@@ -47,7 +47,6 @@
         "LeastMonthsInput": "Veuillez spécifier un nombre de mois supérieur à %s",
         "MenuPrivacySettings": "Vie privée",
         "NextDelete": "Prochaine suppression programmée dans",
-        "PluginDescription": "Personnalisez Piwik pour que son rapport à la vie privée soit respectueux des législations existantes.",
         "PurgeNow": "Purger la base de données maintenant",
         "PurgeNowConfirm": "Vous êtes sur le point de supprimer définitivement les données de votre base de données. Êtes vous sûr(e) de vouloir continuer?",
         "PurgingData": "Purge des données...",
diff --git a/plugins/PrivacyManager/lang/hi.json b/plugins/PrivacyManager/lang/hi.json
index 183a97881d..eb30e1113a 100644
--- a/plugins/PrivacyManager/lang/hi.json
+++ b/plugins/PrivacyManager/lang/hi.json
@@ -46,7 +46,6 @@
         "LeastMonthsInput": "%s की तुलना में अधिक से अधिक महीनों की संख्या का उल्लेख करें.",
         "MenuPrivacySettings": "गोपनीयता",
         "NextDelete": "में अगले अनुसूचित को हटाएँ",
-        "PluginDescription": "विद्यमान विधान के साथ इसे गोपनीयता के अनुरूप बनाने के लिए Piwik अनुकूलित करें.",
         "PurgeNow": "शुद्ध DB अब है",
         "PurgeNowConfirm": "आप स्थायी रूप से अपने डेटाबेस से डेटा को नष्ट करने के बारे में हैं. क्या आप जारी रखना चाहते हैं?",
         "PurgingData": "डेटा शुद्धीकरण ...",
diff --git a/plugins/PrivacyManager/lang/id.json b/plugins/PrivacyManager/lang/id.json
index 78c1fd6cf0..12aeba3320 100644
--- a/plugins/PrivacyManager/lang/id.json
+++ b/plugins/PrivacyManager/lang/id.json
@@ -46,7 +46,6 @@
         "LeastMonthsInput": "Harap memasukkan jumlah bulan lebih besar dari %s.",
         "MenuPrivacySettings": "Privasi",
         "NextDelete": "Jadwal penghapusan selanjutnya di",
-        "PluginDescription": "Sesuaikan Piwik untuk membuatnya sesuai dengan peraturan perundang-undangan privasi yang ada.",
         "PurgeNow": "Membersihkan Basisdata Sekarang",
         "PurgeNowConfirm": "Anda berkeinginan menghapus permanen data dari basisdata Anda. Apakah Anda yakin melanjutkannya?",
         "PurgingData": "Membersihkan data...",
diff --git a/plugins/PrivacyManager/lang/it.json b/plugins/PrivacyManager/lang/it.json
index af4ebd0d4a..37ce2f53f6 100644
--- a/plugins/PrivacyManager/lang/it.json
+++ b/plugins/PrivacyManager/lang/it.json
@@ -14,7 +14,7 @@
         "DeleteDataDescription2": "Se lo si desidera, i report pre-elaborati non saranno cancellati, solo le visite, le pagine visualizzate e i log delle conversioni verranno cancellati. Oppure, i report pre-elaborati possono essere cancellati e i dati dei log possono essere mantenuti.",
         "DeleteDataInterval": "Cancella i vecchi dati ogni",
         "DeleteDataSettings": "Cancella i vecchi log dei visitatori e i report",
-        "DeleteLogDescription2": "Quando l'eliminazione automatica è abilitata, è necessario assicurarsi che tutti i report giornalieri precedenti sono stati processati, in modo che nessun dato viene perso.",
+        "DeleteLogDescription2": "Quando l'eliminazione automatica è abilitata, è necessario assicurarsi che tutti i report giornalieri precedenti siano stati processati, in modo che nessun dato venga perso. Ottieni più informazioni.",
         "DeleteLogInfo": "I log delle seguenti tabelle saranno cancellati: %s",
         "DeleteLogsConfirm": "Stai per consentire la cancellazione dei dati di log. Se i vecchi dati di registro vengono rimossi e le relazioni non sono già state create, non sarai in grado di vedere i dati storici di analisi. Sei sicuro di volerlo fare?",
         "DeleteLogsOlderThan": "Cancella log più vecchi di",
@@ -47,7 +47,7 @@
         "LeastMonthsInput": "Specifica un numero di mesi superiore a %s",
         "MenuPrivacySettings": "Privacy",
         "NextDelete": "Prossima cancellazione programmata per il",
-        "PluginDescription": "Personalizza Piwik per renderlo conforme alle norme della privacy del tuo paese.",
+        "PluginDescription": "Aumenta la privacy per i tuoi utenti e rende la privacy della tua istanza di Piwik conforme con le leggi locali.",
         "PurgeNow": "Pulisci il DB Ora",
         "PurgeNowConfirm": "Stai per cancellare definitivamente dei dati dal tuo database. Sei sicuro di voler continuare?",
         "PurgingData": "Eliminazione dei dati...",
diff --git a/plugins/PrivacyManager/lang/ja.json b/plugins/PrivacyManager/lang/ja.json
index 28dd668a28..6d82ee31f0 100644
--- a/plugins/PrivacyManager/lang/ja.json
+++ b/plugins/PrivacyManager/lang/ja.json
@@ -46,7 +46,6 @@
         "LeastMonthsInput": "月数は %s より大きい数を指定してください。",
         "MenuPrivacySettings": "プライバシー",
         "NextDelete": "次回の削除まで",
-        "PluginDescription": "既存の法律にのっとり、Piwikがプライバシーに準拠するようカスタマイズする。",
         "PurgeNow": "今DBを削除する",
         "PurgeNowConfirm": "データベースから永久にデータを削除しようとしています。続けますか？",
         "PurgingData": "データを削除しています...",
diff --git a/plugins/PrivacyManager/lang/ko.json b/plugins/PrivacyManager/lang/ko.json
index 65f5221557..2a6794f5f0 100644
--- a/plugins/PrivacyManager/lang/ko.json
+++ b/plugins/PrivacyManager/lang/ko.json
@@ -46,7 +46,6 @@
         "LeastMonthsInput": "달은 %s보다 커야합니다.",
         "MenuPrivacySettings": "개인 정보 보호",
         "NextDelete": "다음 제거까지",
-        "PluginDescription": "기존의 법률에 따라, Piwik이 개인 정보 보호를 준수하도록 지정합니다.",
         "PurgeNow": "지금 DB 삭제",
         "PurgeNowConfirm": "영구적으로 데이터베이스의 데이터를 삭제하려고합니다. 계속 하시겠습니까?",
         "PurgingData": "데이터를 삭제합니다...",
diff --git a/plugins/PrivacyManager/lang/nb.json b/plugins/PrivacyManager/lang/nb.json
index 932285813a..00c6e486d8 100644
--- a/plugins/PrivacyManager/lang/nb.json
+++ b/plugins/PrivacyManager/lang/nb.json
@@ -8,6 +8,7 @@
         "GeolocationAnonymizeIpNote": "Merk: Geoposisjonering vil ha omtrent de samme resultatene med en byte anonymisert. Med to byte eller mer, vil geoposisjonering være unøyaktig.",
         "LastDelete": "Siste sletting var på",
         "MenuPrivacySettings": "Personvern",
+        "RecommendedForPrivacy": "(anbefales for personvern)",
         "ReportsDataSavedEstimate": "Databasestørrelse",
         "TeaserHeadline": "Personverninnstillinger"
     }
diff --git a/plugins/PrivacyManager/lang/nl.json b/plugins/PrivacyManager/lang/nl.json
index 1a4fe14efb..58c0a41cd5 100644
--- a/plugins/PrivacyManager/lang/nl.json
+++ b/plugins/PrivacyManager/lang/nl.json
@@ -42,7 +42,6 @@
         "LeastMonthsInput": "Geef het aantal maanden op, groter dan %s.",
         "MenuPrivacySettings": "Privacy",
         "NextDelete": "Volgende geprogrammeerde verwijdering in",
-        "PluginDescription": "Stel Piwik in zodat het voldoet aan de lokale wetgeving.",
         "PurgeNow": "Purge Database nu",
         "PurgeNowConfirm": "Je staat op het punt om data permanent van je database te verwijderen. Weet je zeker dat je wilt doorgaan?",
         "PurgingData": "Data opschonen",
diff --git a/plugins/PrivacyManager/lang/pl.json b/plugins/PrivacyManager/lang/pl.json
index 205f9abdb0..14a97b8c9e 100644
--- a/plugins/PrivacyManager/lang/pl.json
+++ b/plugins/PrivacyManager/lang/pl.json
@@ -1,6 +1,7 @@
 {
     "PrivacyManager": {
         "AnonymizeIpDescription": "Wybierz \"Tak\" jeśli chcesz aby nie śledzić w pełni wykwalifikowanych adresów IP.",
+        "AnonymizeIpExtendedHelp": "Kiedy użytkownik odwiedzi twoją stronę. Piwik nie użyje całego adresu IP danej osoby (np %s), a zamiast tego wykona anonimizację adresu (do %s). Anonimizacja adresu IP jest wymogiem prawnym w niektórych krajach - na przykład w Niemczech.",
         "AnonymizeIpInlineHelp": "Anonimizacja ostatniego bajtu w adresie IP odwiedzających, by dostosować się do być może lokalnego prawa do prywatności\/wytycznych o prywatności.",
         "AnonymizeIpMaskLengtDescription": "Wybierz ile bajtów z odwiedzających' adresów IP powinny być zamaskowane.",
         "AnonymizeIpMaskLength": "%s bajt(ów) - np. %s",
@@ -21,6 +22,7 @@
         "DoNotTrack_DisabledMoreInfo": "Dla uszanowania prywatności odwiedzających zalecamy włączenie wsparcia DoNotTrack.",
         "DoNotTrack_Enable": "Włącz wspracie Do Not Track",
         "DoNotTrack_Enabled": "Obecnie szanujesz prywatności swojch użytkowników, Brawo!",
+        "DoNotTrack_EnabledMoreInfo": "Jeżeli użytkownik przeglądarki ustawi sobie ,,I do not want to be tracked \/ Nie chcę być śledzony'' (DoNotTrack jest aktywny) wtedy Piwik nie będzie analizował takich odwiedzin.",
         "KeepDataFor": "Zachowaj wszystkie dane dla:",
         "LastDelete": "Ostatnio był usunięte",
         "LeastDaysInput": "Proszę podać liczbę dni większą niż %s.",
diff --git a/plugins/PrivacyManager/lang/pt-br.json b/plugins/PrivacyManager/lang/pt-br.json
index 9ffc8d5d65..f70996a470 100644
--- a/plugins/PrivacyManager/lang/pt-br.json
+++ b/plugins/PrivacyManager/lang/pt-br.json
@@ -46,7 +46,6 @@
         "LeastMonthsInput": "Por favor, especifique um número de meses maior que %s.",
         "MenuPrivacySettings": "Privacidade",
         "NextDelete": "Próxima exclusão agendada em",
-        "PluginDescription": "Personalize Piwik para torná-lo compatível com a privacidade legislações já existentes.",
         "PurgeNow": "Purge DB Agora",
         "PurgeNowConfirm": "Você está prestes a excluir permanentemente os dados de seu banco de dados. Tem certeza de que quer continuar?",
         "PurgingData": "Purgando dados...",
diff --git a/plugins/PrivacyManager/lang/pt.json b/plugins/PrivacyManager/lang/pt.json
index 6eedd17fea..d0801c7487 100644
--- a/plugins/PrivacyManager/lang/pt.json
+++ b/plugins/PrivacyManager/lang/pt.json
@@ -13,7 +13,6 @@
         "LeastDaysInput": "Por favor, especifique um número de dias maior que %s.",
         "MenuPrivacySettings": "Privacidade",
         "NextDelete": "Próxima eliminação agendada em",
-        "PluginDescription": "Customize Piwik para torná-lo compatível com as legislações de privacidade existentes.",
         "TeaserHeadline": "Definições de Privacidade",
         "UseAnonymizeIp": "Tornar anónimos os endereços IP dos visitantes",
         "UseDeleteLog": "Apagar logs de antigos visitantes da base de dados regularmente."
diff --git a/plugins/PrivacyManager/lang/ro.json b/plugins/PrivacyManager/lang/ro.json
index 9a40a046a3..cf600c7de0 100644
--- a/plugins/PrivacyManager/lang/ro.json
+++ b/plugins/PrivacyManager/lang/ro.json
@@ -46,7 +46,6 @@
         "LeastMonthsInput": "Vă rugăm să specificați un număr de luni mai mare decât %s.",
         "MenuPrivacySettings": "Confidenţialitate",
         "NextDelete": "Următoarea programare de ștergere",
-        "PluginDescription": "Personaliza-ti Piwik pentru a face viața privată în conformitate cu legislațiile existente.",
         "PurgeNow": "Curăța DB acum",
         "PurgeNowConfirm": "Ești pe cale de a șterge definitiv baza de date. Sigur doriți să continuați?",
         "PurgingData": "Purjare de date ...",
diff --git a/plugins/PrivacyManager/lang/ru.json b/plugins/PrivacyManager/lang/ru.json
index 2bddad503b..bc9d42a1c5 100644
--- a/plugins/PrivacyManager/lang/ru.json
+++ b/plugins/PrivacyManager/lang/ru.json
@@ -26,13 +26,13 @@
         "DeleteReportsInfo3": "Если вы включили '%s', данные будут навсегда потеряны.",
         "DeleteReportsOlderThan": "Удалить отчеты, старше чем",
         "DeleteSchedulingSettings": "Настройки расписания",
-        "DoNotTrack_Description": "Отказ от Отслеживания - технология и предложение политики безопасности, которая позволяет пользователям отказываться от того, чтобы их посещения отслеживали. Используется в аналитических сервисах, рекламных сетях и социальных платформах.",
+        "DoNotTrack_Description": "Отказ от Отслеживания – технология и предложение политики безопасности, которая позволяет пользователям отказываться от того, чтобы их посещения отслеживали. Используется в аналитических сервисах, рекламных сетях и социальных платформах.",
         "DoNotTrack_Disable": "Отключить возможность отказа от отслеживания",
-        "DoNotTrack_Disabled": "Piwik сейчас отслеживает всех посетителей, даже если они установили настройку \"Я не хочу, чтобы меня отслеживали\" в своих браузерах.",
+        "DoNotTrack_Disabled": "Piwik сейчас отслеживает всех посетителей, даже если они установили настройку «Я не хочу, чтобы меня отслеживали» в своих браузерах.",
         "DoNotTrack_DisabledMoreInfo": "Мы рекомендуем уважать конфиденциальность ваших посетителей и включить возможность отказа от отслеживания.",
         "DoNotTrack_Enable": "Включить возможность отказа от отслеживания",
         "DoNotTrack_Enabled": "На данный момент вы уважается конфиденциальность ваших посетителей. Браво!",
-        "DoNotTrack_EnabledMoreInfo": "Когда пользователь настраивает свой браузер на \"Я не хочу, чтобы меня отслеживали\" (Возможность отказа от отслеживания включена), Piwik не будет отслеживать такие посещения.",
+        "DoNotTrack_EnabledMoreInfo": "Когда пользователь настраивает свой браузер на «Я не хочу, чтобы меня отслеживали» (Возможность отказа от отслеживания включена), Piwik не будет отслеживать такие посещения.",
         "DoNotTrack_SupportDNTPreference": "Настройки Отказа от Отслеживания",
         "EstimatedDBSizeAfterPurge": "Ожидаемый размер базы данных после чистки",
         "EstimatedSpaceSaved": "Ожидаемый сохраненный размер space saved",
@@ -46,7 +46,6 @@
         "LeastMonthsInput": "Пожалуйста, определите количество месяцев, большее чем %s.",
         "MenuPrivacySettings": "Конфиденциальность",
         "NextDelete": "Следующее удаление по расписанию через",
-        "PluginDescription": "Настройте Piwik для соответствия вашей политики конфиденциальности законодательству вашей страны.",
         "PurgeNow": "Очистить базу данных сейчас",
         "PurgeNowConfirm": "Вы собираетесь навсегда удалить данные из вашей базы данных. Вы уверены, что хотите продолжить?",
         "PurgingData": "Чистка данных...",
diff --git a/plugins/PrivacyManager/lang/sq.json b/plugins/PrivacyManager/lang/sq.json
index 79477f73c4..f69cdd55cf 100644
--- a/plugins/PrivacyManager/lang/sq.json
+++ b/plugins/PrivacyManager/lang/sq.json
@@ -14,7 +14,6 @@
         "LeastDaysInput": "Ju lutem, jepni një numër ditësh më të madh se %s.",
         "MenuPrivacySettings": "Privatësi",
         "NextDelete": "Fshirja pasuese është planifikuar më",
-        "PluginDescription": "Përshtateni Piwik-un për ta bërë privatësinë të përputhshme me legjislacionin ekzistues.",
         "Teaser": "Në këtë faqe, mund ta përshtatni Piwik-un që privatësi në të të jetë në pajtim me legjislacionin në fuqi, duke: %s anonimizuar IP-të e vizitorëve%s, %s hequr automatikisht nga baza e të dhënave regjistrime të vjetër vizitorësh%s, dhe %s duke ofruar një mekanizëm Opt-out për site-in tuaj web%s.",
         "TeaserHeadline": "Rregullime Privatësie",
         "UseAnonymizeIp": "Anonimizoni adresat IP të Vizitorëve",
diff --git a/plugins/PrivacyManager/lang/sr.json b/plugins/PrivacyManager/lang/sr.json
index d432ad851d..e95653241e 100644
--- a/plugins/PrivacyManager/lang/sr.json
+++ b/plugins/PrivacyManager/lang/sr.json
@@ -46,7 +46,6 @@
         "LeastMonthsInput": "Molimo vas da navedete broj meseci veći od %s.",
         "MenuPrivacySettings": "Privatnost",
         "NextDelete": "Sledeće zakazano brisanje za",
-        "PluginDescription": "Piwik podešavanja u pogledu privatnosti",
         "PurgeNow": "Očisti bazu",
         "PurgeNowConfirm": "Na putu ste da trajno obrišete podatke iz baze. Da li želite da nastavite?",
         "PurgingData": "Čišćenje baze",
diff --git a/plugins/PrivacyManager/lang/sv.json b/plugins/PrivacyManager/lang/sv.json
index 80bca5aa6f..f42b59fffc 100644
--- a/plugins/PrivacyManager/lang/sv.json
+++ b/plugins/PrivacyManager/lang/sv.json
@@ -46,7 +46,6 @@
         "LeastMonthsInput": "Ange ett antal månader mer än %s.",
         "MenuPrivacySettings": "Integritet",
         "NextDelete": "Nästa schemalagda borttagning",
-        "PluginDescription": "Anpassa Piwik så att den personliga integriteten uppfyller existerande lagstiftning.",
         "PurgeNow": "Rensa databasen nu",
         "PurgeNowConfirm": "Du är på väg att permanent radera data från din databas. Är du säker på att du vill fortsätta?",
         "PurgingData": "Rensar data...",
diff --git a/plugins/PrivacyManager/lang/th.json b/plugins/PrivacyManager/lang/th.json
index 50aad9f7de..1f69e2e81c 100644
--- a/plugins/PrivacyManager/lang/th.json
+++ b/plugins/PrivacyManager/lang/th.json
@@ -12,7 +12,6 @@
         "KeepDataFor": "เก็บข้อมูลทั้งหมดไว้:",
         "LastDelete": "ลบครั้งสุดท้ายเมื่อ",
         "MenuPrivacySettings": "ความเป็นส่วนตัว",
-        "PluginDescription": "กำหนด Piwik เพื่อให้สอดคล้องกับความเป็นส่วนตัวของกฎหมายที่มีอยู่",
         "PurgeNow": "ล้างข้อมูลในฐานข้อมูลตอนนี้เลย",
         "PurgingData": "กำลังล้างข้อมูล...",
         "ReportsDataSavedEstimate": "ขนาดฐานข้อมูล",
diff --git a/plugins/PrivacyManager/lang/tl.json b/plugins/PrivacyManager/lang/tl.json
index 03c8cb1428..cf33061913 100644
--- a/plugins/PrivacyManager/lang/tl.json
+++ b/plugins/PrivacyManager/lang/tl.json
@@ -45,7 +45,6 @@
         "LeastMonthsInput": "Mangyaring tukuyin ang bilang ng buwan na na mas mataas kaysa %s.",
         "MenuPrivacySettings": "Privacy",
         "NextDelete": "Susunod na iskedyul sa pagtaggal sa",
-        "PluginDescription": "I-customize ang Piwik upang gawin itong privacy compliant sa umiiral na legislations.",
         "PurgeNow": "I-purge ang DB Ngayon",
         "PurgeNowConfirm": "Iyo ng permanenteng tanggalin ang data mula sa iyong database. Sigurado ka bang gusto mo itong ituloy?",
         "PurgingData": "Purging data...",
diff --git a/plugins/PrivacyManager/lang/vi.json b/plugins/PrivacyManager/lang/vi.json
index f72bcd89f0..5231390aec 100644
--- a/plugins/PrivacyManager/lang/vi.json
+++ b/plugins/PrivacyManager/lang/vi.json
@@ -46,7 +46,6 @@
         "LeastMonthsInput": "Hãy xác định số tháng lớn hơn %s.",
         "MenuPrivacySettings": "Riêng tư",
         "NextDelete": "Xóa lịch trình tiếp theo trong",
-        "PluginDescription": "Tùy chỉnh Piwik để làm nó riêng tư phù hợp với luật hiện hành.",
         "PurgeNow": "Loại bỏ DB ngay",
         "PurgeNowConfirm": "Bạn muốn xóa vĩnh viễn dữ liệu từ cơ sở dữ liệu của bạn. Bạn có chắc muốn tiếp tục?",
         "PurgingData": "Đang loại bỏ dữ liệu...",
diff --git a/plugins/PrivacyManager/lang/zh-cn.json b/plugins/PrivacyManager/lang/zh-cn.json
index 14fd980c8c..5b48882f72 100644
--- a/plugins/PrivacyManager/lang/zh-cn.json
+++ b/plugins/PrivacyManager/lang/zh-cn.json
@@ -46,7 +46,6 @@
         "LeastMonthsInput": "请设置月份大于 %s。",
         "MenuPrivacySettings": "隐私设置",
         "NextDelete": "下次删除的时间是",
-        "PluginDescription": "设置 Piwik 遵循保护隐私条例的法规。",
         "PurgeNow": "立刻清理数据库",
         "PurgeNowConfirm": "准备从数据库里永久删除数据，您确定要继续吗?",
         "PurgingData": "清理数据...",
diff --git a/plugins/PrivacyManager/templates/privacySettings.twig b/plugins/PrivacyManager/templates/privacySettings.twig
index dc989fbf04..5fa61c683b 100644
--- a/plugins/PrivacyManager/templates/privacySettings.twig
+++ b/plugins/PrivacyManager/templates/privacySettings.twig
@@ -6,7 +6,7 @@
     <h2 piwik-enriched-headline
         help-url="http://piwik.org/docs/privacy/">{{ 'PrivacyManager_TeaserHeadline'|translate }}</h2>
     <p>{{ 'PrivacyManager_Teaser'|translate('<a href="#anonymizeIPAnchor">',"</a>",'<a href="#deleteLogsAnchor">',"</a>",'<a href="#optOutAnchor">',"</a>")|raw }}
-        {{'PrivacyManager_SeeAlsoOurOfficialGuidePrivacy'|translate('<strong><a href="http://piwik.org/privacy/" rel="noreferrer"  target="_blank">','</a></strong>')|raw }}</p>
+        {{'PrivacyManager_SeeAlsoOurOfficialGuidePrivacy'|translate('<a href="http://piwik.org/privacy/" rel="noreferrer"  target="_blank">','</a>')|raw }}</p>
     <h2 id="anonymizeIPAnchor">{{ 'PrivacyManager_UseAnonymizeIp'|translate }}</h2>
     <form method="post" action="{{ {'action':'saveSettings', 'form':'formMaskLength', 'token_auth':token_auth} | urlRewriteWithParameters }}" id="formMaskLength">
         <div id='anonymizeIpSettings'>
diff --git a/plugins/PrivacyManager/tests/Integration/PrivacyManagerConfigTest.php b/plugins/PrivacyManager/tests/Integration/PrivacyManagerConfigTest.php
index 1e17f7253f..9c6b56a208 100644
--- a/plugins/PrivacyManager/tests/Integration/PrivacyManagerConfigTest.php
+++ b/plugins/PrivacyManager/tests/Integration/PrivacyManagerConfigTest.php
@@ -31,15 +31,15 @@ class PrivacyManagerConfigTest extends IntegrationTestCase
 
     public function test_useAnonymizedIpForVisitEnrichment()
     {
-        $this->assertTrue($this->config->useAnonymizedIpForVisitEnrichment);
-
-        $this->config->useAnonymizedIpForVisitEnrichment = false;
-
         $this->assertFalse($this->config->useAnonymizedIpForVisitEnrichment);
 
         $this->config->useAnonymizedIpForVisitEnrichment = true;
 
         $this->assertTrue($this->config->useAnonymizedIpForVisitEnrichment);
+
+        $this->config->useAnonymizedIpForVisitEnrichment = false;
+
+        $this->assertFalse($this->config->useAnonymizedIpForVisitEnrichment);
     }
 
     public function test_doNotTrackEnabled()
@@ -82,7 +82,7 @@ class PrivacyManagerConfigTest extends IntegrationTestCase
             'PrivacyManager.ipAddressMaskLength' => 2,
             'PrivacyManager.ipAnonymizerEnabled' => true,
             'PrivacyManager.doNotTrackEnabled'   => true,
-            'PrivacyManager.useAnonymizedIpForVisitEnrichment' => true,
+            'PrivacyManager.useAnonymizedIpForVisitEnrichment' => false,
         );
 
         $this->assertEquals($expected, $content);
diff --git a/plugins/Provider/Columns/Provider.php b/plugins/Provider/Columns/Provider.php
index cba1b8b9f5..24ab6cecd2 100644
--- a/plugins/Provider/Columns/Provider.php
+++ b/plugins/Provider/Columns/Provider.php
@@ -42,6 +42,13 @@ class Provider extends VisitDimension
      */
     public function onNewVisit(Request $request, Visitor $visitor, $action)
     {
+        // Adding &dp=1 will disable the provider plugin, this is an "unofficial" parameter used to speed up log importer
+        $disableProvider = $request->getParam('dp');
+
+        if (!empty($disableProvider)) {
+            return false;
+        }
+
         // if provider info has already been set, abort
         $locationValue = $visitor->getVisitorColumn('location_provider');
         if (!empty($locationValue)) {
diff --git a/plugins/Provider/Menu.php b/plugins/Provider/Menu.php
deleted file mode 100644
index 2d34f5b229..0000000000
--- a/plugins/Provider/Menu.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\Provider;
-
-use Piwik\Menu\MenuReporting;
-
-class Menu extends \Piwik\Plugin\Menu
-{
-    public function configureReportingMenu(MenuReporting $menu)
-    {
-        $menu->rename('General_Visitors', 'UserCountry_SubmenuLocations',
-                      'General_Visitors', 'Provider_SubmenuLocationsProvider');
-    }
-}
diff --git a/plugins/Provider/Provider.php b/plugins/Provider/Provider.php
index 719029dc8b..1f2a5fc70d 100644
--- a/plugins/Provider/Provider.php
+++ b/plugins/Provider/Provider.php
@@ -65,8 +65,7 @@ class Provider extends \Piwik\Plugin
 
     public static function footerUserCountry(&$out)
     {
-        $out = '<div>
-			<h2>' . Piwik::translate('Provider_WidgetProviders') . '</h2>';
+        $out .= '<div><h2>' . Piwik::translate('Provider_WidgetProviders') . '</h2>';
         $out .= FrontController::getInstance()->fetchDispatch('Provider', 'getProvider');
         $out .= '</div>';
     }
diff --git a/plugins/Provider/lang/am.json b/plugins/Provider/lang/am.json
index fb7cbc4bc1..1c6787d220 100644
--- a/plugins/Provider/lang/am.json
+++ b/plugins/Provider/lang/am.json
@@ -1,7 +1,6 @@
 {
     "Provider": {
         "ColumnProvider": "አቅራቢ",
-        "SubmenuLocationsProvider": "መገኛ እና አቅራቢ",
         "WidgetProviders": "አቅራቢዎች"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/ar.json b/plugins/Provider/lang/ar.json
index 05c6b61ae3..76b24decae 100644
--- a/plugins/Provider/lang/ar.json
+++ b/plugins/Provider/lang/ar.json
@@ -1,8 +1,6 @@
 {
     "Provider": {
         "ColumnProvider": "مزود الخدمة",
-        "PluginDescription": "يعرض تقارير عن مزود الخدمة للزوار.",
-        "SubmenuLocationsProvider": "المكان ومزود الخدمة",
         "WidgetProviders": "مزودو الخدمة"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/be.json b/plugins/Provider/lang/be.json
index f673a9159b..bac4d9dcf6 100644
--- a/plugins/Provider/lang/be.json
+++ b/plugins/Provider/lang/be.json
@@ -1,9 +1,7 @@
 {
     "Provider": {
         "ColumnProvider": "Правайдар",
-        "PluginDescription": "Справаздача правайдараў наведвальнікаў.",
         "ProviderReportDocumentation": "Гэтая справаздача паказвае, якія інтэрнэт-правайдэры наведвальнікаў выкарыстоўваюцца для доступу да вэб-сайту. Вы можаце націснуць на імя правайдэра для больш падрабязнай інфармацыі. %s Калі Piwik не можа вызначыць, правайдэра наведвальніка, ён паказваецца ў якасці IP-адраса.",
-        "SubmenuLocationsProvider": "Лакацыі і правайдары",
         "WidgetProviders": "Правайдары"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/bg.json b/plugins/Provider/lang/bg.json
index 3d6cefdf5d..71678f0898 100644
--- a/plugins/Provider/lang/bg.json
+++ b/plugins/Provider/lang/bg.json
@@ -1,9 +1,7 @@
 {
     "Provider": {
         "ColumnProvider": "Интернет доставчик",
-        "PluginDescription": "Доклад за доставчиците на посетителите.",
         "ProviderReportDocumentation": "Отчетът показва кои доставчици на интернет услуги използват вашите потребители за достъп до уеб сайта. Можете да щракнете върху името на доставчика за повече детайли. %s Ако Piwik не може да определи доставчика на потребителя, той е показан само като IP.",
-        "SubmenuLocationsProvider": "Места & Доставчици",
         "WidgetProviders": "Доставчици"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/ca.json b/plugins/Provider/lang/ca.json
index a5daa7f4ba..958501326a 100644
--- a/plugins/Provider/lang/ca.json
+++ b/plugins/Provider/lang/ca.json
@@ -1,9 +1,7 @@
 {
     "Provider": {
         "ColumnProvider": "Proveïdor",
-        "PluginDescription": "Informació del Proveïdor dels visitants.",
         "ProviderReportDocumentation": "Aquest informe mostra quin Proveïdor d'Internet han utiltizat els vostres visitants per accedir al lloc. Podeu click al nom del proveïdor per més detalls. %s Si el Piwik no pot determinar el proveïdor del visitant, es mostra la seva adreça IP.",
-        "SubmenuLocationsProvider": "Localitzacions i proveïdors",
         "WidgetProviders": "Proveïdors"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/cs.json b/plugins/Provider/lang/cs.json
index 5010e9aa2e..1f3cab1153 100644
--- a/plugins/Provider/lang/cs.json
+++ b/plugins/Provider/lang/cs.json
@@ -1,9 +1,9 @@
 {
     "Provider": {
         "ColumnProvider": "Poskytovatel",
-        "PluginDescription": "Zobrazí poskytovatele připojení návštěvníků",
+        "PluginDescription": "Hlásí poskytovatele internetového připojení návštěvníků.",
         "ProviderReportDocumentation": "Toto hlášení poskytuje informace o tom, jakého poskytovatele internetového připojení vaši návštěvníci při přístupu na stránky použili. Pokud kliknete na jméno poskytovatele, zobrazí se podrobnosti. %s Pokud Piwik nebyl schopen poskytovatele zjistit, je zobrazen jako IP.",
-        "SubmenuLocationsProvider": "Umístění a poskytovatel",
+        "ProviderReportFooter": "Neznámý poskytovatel znamená, že IP adresu nebylo možné vyhledat.",
         "WidgetProviders": "Poskytovatelé"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/da.json b/plugins/Provider/lang/da.json
index 3f5f8dd911..96808b3409 100644
--- a/plugins/Provider/lang/da.json
+++ b/plugins/Provider/lang/da.json
@@ -1,10 +1,8 @@
 {
     "Provider": {
         "ColumnProvider": "Udbyder",
-        "PluginDescription": "Rapporter de besøgendes udbyder.",
         "ProviderReportDocumentation": "Rapporten viser hvilken Internet udbyder de besøgende bruger. Klik på en udbyders navn for flere oplysninger. %s Hvis Piwik ikke kan bestemme besøgendes udbyder, er den opført som IP.",
         "ProviderReportFooter": "Ukendt udbyder betyder at IP-adressen kunne ikke slås op.",
-        "SubmenuLocationsProvider": "Sted og udbyder",
         "WidgetProviders": "Udbydere"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/de.json b/plugins/Provider/lang/de.json
index 1e2be2784c..0f11629152 100644
--- a/plugins/Provider/lang/de.json
+++ b/plugins/Provider/lang/de.json
@@ -1,10 +1,9 @@
 {
     "Provider": {
         "ColumnProvider": "Provider",
-        "PluginDescription": "Stellt Informationen über den Provider des Besuchers dar.",
+        "PluginDescription": "Liefert den Internet Service Provider der Besucher.",
         "ProviderReportDocumentation": "Dieser Bericht zeigt Ihnen, welche Internetanbieter die Besucher Ihrer Webseite nutzen. Sie können auf den Namen eines Anbieters klicken, um mehr Informationen dazu zu erhalten. %s Wenn Piwik den Internetanbieter eines Besuchers nicht feststellen kann, wird er unter IP gelistet.",
         "ProviderReportFooter": "Unbekannter Provider bedeutet die IP-Adresse konnte nicht aufgelöst werden.",
-        "SubmenuLocationsProvider": "Standorte und Provider",
         "WidgetProviders": "Provider"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/el.json b/plugins/Provider/lang/el.json
index 07eedc062d..11d91065f4 100644
--- a/plugins/Provider/lang/el.json
+++ b/plugins/Provider/lang/el.json
@@ -1,10 +1,9 @@
 {
     "Provider": {
         "ColumnProvider": "Πάροχος",
-        "PluginDescription": "Αναφέρει τον Παροχέα των επισκεπτών.",
+        "PluginDescription": "Αναφέρει τον πάροχο διαδικτύου των επισκεπτών σας.",
         "ProviderReportDocumentation": "Αυτή η αναφορά εμφανίζει ποιος Παροχέας Υπηρεσιών Διαδικτύου (ISP) χρησιμοποιείτε από τους επισκέπτες σας για να επισκεφθούν τις ιστοσελίδες σας. Μπορείτε να πατήσετε σε ένα όνομα Παροχέα για περισσότερες λεπτομέρειες. %s Αν το Piwik δεν μπορεί να ανιχνεύσει το παροχέα του επισκέπτη, χαρακτηρίζεται ως IP.",
         "ProviderReportFooter": "Άγνωστος πάροχος σημαίνει ότι δεν ήταν δυνατή η εύρεση της διεύθυνσης IP.",
-        "SubmenuLocationsProvider": "Τοποθεσίες & πάροχοι",
         "WidgetProviders": "Πάροχοι"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/en.json b/plugins/Provider/lang/en.json
index f634e2eda7..dce08d10e4 100644
--- a/plugins/Provider/lang/en.json
+++ b/plugins/Provider/lang/en.json
@@ -1,9 +1,8 @@
 {
     "Provider": {
         "ColumnProvider": "Provider",
-        "PluginDescription": "Reports the Provider of the visitors.",
+        "PluginDescription": "Reports the Internet Service Provider of the visitors.",
         "ProviderReportDocumentation": "This report shows which Internet Service Providers your visitors used to access the website. You can click on a provider name for more details. %s If Piwik can't determine a visitor's provider, it is listed as IP.",
-        "SubmenuLocationsProvider": "Locations & Provider",
         "WidgetProviders": "Providers",
         "ProviderReportFooter": "Unknown provider means the IP address could not be looked up."
     }
diff --git a/plugins/Provider/lang/es.json b/plugins/Provider/lang/es.json
index 7ff037c1cb..fadf8bb435 100644
--- a/plugins/Provider/lang/es.json
+++ b/plugins/Provider/lang/es.json
@@ -1,9 +1,7 @@
 {
     "Provider": {
         "ColumnProvider": "Proveedor",
-        "PluginDescription": "Reporta el Proveedor de los Visitantes.",
         "ProviderReportDocumentation": "Este reporte muestra que Proveedores de Servicios de Internet (ISPs) usan sus visitantes para acceder al sitio web. Usted puede hacer clic en el nombre de un proveedor para más detalles. %s Si Piwik no puede determinar el proveedor de un visitante, será puesto como la IP.",
-        "SubmenuLocationsProvider": "Localizaciones y proveedores",
         "WidgetProviders": "Proveedores"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/et.json b/plugins/Provider/lang/et.json
index 62d493341f..6200fe1913 100644
--- a/plugins/Provider/lang/et.json
+++ b/plugins/Provider/lang/et.json
@@ -1,7 +1,6 @@
 {
     "Provider": {
         "ColumnProvider": "Teenusepakkuja",
-        "SubmenuLocationsProvider": "Asukoht & pakkuja",
         "WidgetProviders": "Teenusepakkujad"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/eu.json b/plugins/Provider/lang/eu.json
index 0c069cffeb..776906791b 100644
--- a/plugins/Provider/lang/eu.json
+++ b/plugins/Provider/lang/eu.json
@@ -1,7 +1,6 @@
 {
     "Provider": {
         "ColumnProvider": "Hornitzailea",
-        "SubmenuLocationsProvider": "Kokalekuak eta hornitzailea",
         "WidgetProviders": "Hornitzaileak"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/fa.json b/plugins/Provider/lang/fa.json
index ff4c40f973..4992ba4d37 100644
--- a/plugins/Provider/lang/fa.json
+++ b/plugins/Provider/lang/fa.json
@@ -1,8 +1,6 @@
 {
     "Provider": {
         "ColumnProvider": "ارائه دهنده خدمات",
-        "PluginDescription": "ارائه دهنده خدمات بازدیدکنندگان را گزارش کن.",
-        "SubmenuLocationsProvider": "محل و ارائه دهنده خدمات",
         "WidgetProviders": "ارائه دهندگان"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/fi.json b/plugins/Provider/lang/fi.json
index fd31c3300e..bf079428c4 100644
--- a/plugins/Provider/lang/fi.json
+++ b/plugins/Provider/lang/fi.json
@@ -1,9 +1,7 @@
 {
     "Provider": {
         "ColumnProvider": "Palveluntarjoajat",
-        "PluginDescription": "Raportit käyttäjien palveluntarjoajista.",
         "ProviderReportDocumentation": "Tämä raportti näyttää, mitä internetin toimittajia kävijäsi käyttivät sivuillasi. Saat lisätietoja klikkaamalla toimittajan nimeä. %s Jos Piwik ei tunnista toimittajan nimeä, kävijästä näytetään IP.",
-        "SubmenuLocationsProvider": "Sijainnit & palveluntarjoajat",
         "WidgetProviders": "Palveluntarjoajat"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/fr.json b/plugins/Provider/lang/fr.json
index c22839beb3..91a7643ef4 100644
--- a/plugins/Provider/lang/fr.json
+++ b/plugins/Provider/lang/fr.json
@@ -1,10 +1,8 @@
 {
     "Provider": {
         "ColumnProvider": "FAI",
-        "PluginDescription": "Effectue des rapports sur les FAI des visiteurs.",
         "ProviderReportDocumentation": "Ce rapport affiche quel Fournisseur d'Accès à Internet vos visiteurs ont utilisé pour accéder à votre site web. Vous pouvez cliquer sur le nom d'un FAI pour plus de détails. %s Si Piwik ne peut déterminer le FAI d'un visiteur, il est listé en tant qu'IP.",
         "ProviderReportFooter": "Fournisseur d'accès inconnu signifie que l'adresse IP ne peut pas être déterminée",
-        "SubmenuLocationsProvider": "Situation géographique et FAI",
         "WidgetProviders": "Fournisseurs d'accès à Internet"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/gl.json b/plugins/Provider/lang/gl.json
index 4d6188a76a..e983b9143d 100644
--- a/plugins/Provider/lang/gl.json
+++ b/plugins/Provider/lang/gl.json
@@ -1,6 +1,5 @@
 {
     "Provider": {
-        "SubmenuLocationsProvider": "Localizacións e provedor",
         "WidgetProviders": "Provedores"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/hi.json b/plugins/Provider/lang/hi.json
index 1d0929f54d..119a91cc57 100644
--- a/plugins/Provider/lang/hi.json
+++ b/plugins/Provider/lang/hi.json
@@ -1,9 +1,7 @@
 {
     "Provider": {
         "ColumnProvider": "प्रदाता",
-        "PluginDescription": "आगंतुकों के प्रदाता के रिपोर्ट.",
         "ProviderReportDocumentation": "इस रिपोर्ट से पता चलता है आपके आगंतुकों को वेबसाइट का उपयोग करने के लिए जो इंटरनेट सेवा प्रदाता इस्तेमाल किया है. आप अधिक जानकारी के लिए एक प्रदाता के नाम पर क्लिक कर सकते हैं. %sPiwik एक आगंतुक प्रदाता निर्धारित नहीं कर सकते हैं, यह आईपी के रूप में सूचीबद्ध किया जाता है.",
-        "SubmenuLocationsProvider": "स्थान और प्रदाता",
         "WidgetProviders": "प्रदाता"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/hr.json b/plugins/Provider/lang/hr.json
deleted file mode 100644
index d155544c3a..0000000000
--- a/plugins/Provider/lang/hr.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "Provider": {
-        "SubmenuLocationsProvider": "Lokacija i pružatelj usluga"
-    }
-}
\ No newline at end of file
diff --git a/plugins/Provider/lang/hu.json b/plugins/Provider/lang/hu.json
index 443f485c8e..49bb8c5ebc 100644
--- a/plugins/Provider/lang/hu.json
+++ b/plugins/Provider/lang/hu.json
@@ -1,8 +1,6 @@
 {
     "Provider": {
         "ColumnProvider": "Internetszolgáltató",
-        "PluginDescription": "Jelentések a látogatók internetszolgáltatóról",
-        "SubmenuLocationsProvider": "Hely és internetszolgáltató",
         "WidgetProviders": "Internetszolgáltatók"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/id.json b/plugins/Provider/lang/id.json
index 95094809f4..70a1b87573 100644
--- a/plugins/Provider/lang/id.json
+++ b/plugins/Provider/lang/id.json
@@ -1,9 +1,7 @@
 {
     "Provider": {
         "ColumnProvider": "Penyedia",
-        "PluginDescription": "Membuat laporan Penyedia pengunjung.",
         "ProviderReportDocumentation": "Laporan ini menampilkan Penyedia Layanan Internet yang digunakan oleh pengunjung Anda untuk mengunjungi situs. Anda dapat mengeklik nama penyedia untuk melihat rinciannya. %s Bila Piwik tak dapat menentukan penyedia pengunjung, ini akan ditampikan sebagai IP.",
-        "SubmenuLocationsProvider": "Lokasi & Penyedia",
         "WidgetProviders": "Penyedia"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/is.json b/plugins/Provider/lang/is.json
index 22c436a004..75add91b2d 100644
--- a/plugins/Provider/lang/is.json
+++ b/plugins/Provider/lang/is.json
@@ -1,8 +1,6 @@
 {
     "Provider": {
         "ColumnProvider": "Veitandi",
-        "PluginDescription": "Skilar gögnum um þá sem veita gestum á vefinn.",
-        "SubmenuLocationsProvider": "Staðsetningar & Veitandi",
         "WidgetProviders": "Veitendur"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/it.json b/plugins/Provider/lang/it.json
index 411f3565da..9f35f15344 100644
--- a/plugins/Provider/lang/it.json
+++ b/plugins/Provider/lang/it.json
@@ -1,10 +1,9 @@
 {
     "Provider": {
         "ColumnProvider": "Provider",
-        "PluginDescription": "Riporta i Provider dei visitatori.",
+        "PluginDescription": "Restituisce gli Internet Service Provider dei visitatori.",
         "ProviderReportDocumentation": "Questo reports mostra quali prvider Internet Service (ISP)i tuoi visitatori hanno utilizzato per accedere al sito web. È possibile fare clic su un nome per maggiori dettagli. %s Se Piwik non può determinare il provider di un visitatore, questo viene elencato come IP.",
         "ProviderReportFooter": "Provider sconosciuto significa che l'indirizzo IP non può essere ricercato",
-        "SubmenuLocationsProvider": "Località & Provider",
         "WidgetProviders": "Providers"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/ja.json b/plugins/Provider/lang/ja.json
index 59bc3ff874..e8a33d9b84 100644
--- a/plugins/Provider/lang/ja.json
+++ b/plugins/Provider/lang/ja.json
@@ -1,10 +1,8 @@
 {
     "Provider": {
         "ColumnProvider": "プロバイダ",
-        "PluginDescription": "ビジターのプロバイダをリポートします。",
         "ProviderReportDocumentation": "このリポートは、ウェブサイトにアクセスする訪問者が使っているインターネットサービスプロバイダを示しています。詳細については、プロバイダ名をクリックしてください。 %s Piwikが訪問者のプロバイダを判別できない場合は、IPとして表示されます。",
         "ProviderReportFooter": "未知のプロバイダーとは IP アドレスが検索できなかったことを意味します。",
-        "SubmenuLocationsProvider": "所在地とプロバイダ",
         "WidgetProviders": "プロバイダ"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/ka.json b/plugins/Provider/lang/ka.json
index 1b7884e94f..0fe0d090b1 100644
--- a/plugins/Provider/lang/ka.json
+++ b/plugins/Provider/lang/ka.json
@@ -1,8 +1,6 @@
 {
     "Provider": {
         "ColumnProvider": "პროვაიდერი",
-        "PluginDescription": "აკეტებს ანგარიშს ვიზიტორების პროვაიდერების შესახებ.",
-        "SubmenuLocationsProvider": "მდებარეობა და პროვაიდერი",
         "WidgetProviders": "პროვაიდერები"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/ko.json b/plugins/Provider/lang/ko.json
index e5810e76f5..bd18d2d99c 100644
--- a/plugins/Provider/lang/ko.json
+++ b/plugins/Provider/lang/ko.json
@@ -1,9 +1,7 @@
 {
     "Provider": {
         "ColumnProvider": "공급자",
-        "PluginDescription": "방문자의 공급자를 보고합니다.",
         "ProviderReportDocumentation": "이 보고서는 웹사이트를 방문하는 방문자가 사용하고있는 인터넷 서비스 공급자를 보여줍니다. 자세한 내용은 공급자 이름을 클릭하세요. %s Piwik가 방문자의 공급자를 확인할 수없는 경우는 IP로 표시됩니다.",
-        "SubmenuLocationsProvider": "위치 및 공급자",
         "WidgetProviders": "공급자"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/lt.json b/plugins/Provider/lang/lt.json
index eb5beb4bca..c316d068a1 100644
--- a/plugins/Provider/lang/lt.json
+++ b/plugins/Provider/lang/lt.json
@@ -1,8 +1,6 @@
 {
     "Provider": {
         "ColumnProvider": "IP tiekėjas",
-        "PluginDescription": "Nurodo lankytojų interneto paslaugų tiekėją.",
-        "SubmenuLocationsProvider": "Vietovės ir IP tiekėjas",
         "WidgetProviders": "IP tiekėjai"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/lv.json b/plugins/Provider/lang/lv.json
index 3e3bbeb285..f1f456274b 100644
--- a/plugins/Provider/lang/lv.json
+++ b/plugins/Provider/lang/lv.json
@@ -1,7 +1,6 @@
 {
     "Provider": {
         "ColumnProvider": "Pakalpojumu sniedzējs",
-        "SubmenuLocationsProvider": "Lokācijas un pakalpojumu sniedzējs",
         "WidgetProviders": "Pakalpojumu sniedzēji"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/nb.json b/plugins/Provider/lang/nb.json
index df2ddd6398..38e9434df0 100644
--- a/plugins/Provider/lang/nb.json
+++ b/plugins/Provider/lang/nb.json
@@ -1,8 +1,6 @@
 {
     "Provider": {
         "ColumnProvider": "Tilbyder",
-        "PluginDescription": "Rapporterer tilbyderen for de besøkende.",
-        "SubmenuLocationsProvider": "Lokasjoner og tilbyder",
         "WidgetProviders": "Tilbydere"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/nl.json b/plugins/Provider/lang/nl.json
index fdbc832388..ae7b7e740a 100644
--- a/plugins/Provider/lang/nl.json
+++ b/plugins/Provider/lang/nl.json
@@ -1,9 +1,7 @@
 {
     "Provider": {
         "ColumnProvider": "Provider",
-        "PluginDescription": "Rapporteert de provider van de bezoekers",
         "ProviderReportDocumentation": "Dit rapport toont de Internet Service Providers die uw bezoekers gebruiken om de website te bezoeken. Klik op een provider naam voor meer informatie. %s Als Piwik de naam van de provider niet kan achterhalen, dan wordt deze vermeld als IP.",
-        "SubmenuLocationsProvider": "Lokatie & provider",
         "WidgetProviders": "Providers"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/pl.json b/plugins/Provider/lang/pl.json
index 392dc9fbf3..b4ce6ba650 100644
--- a/plugins/Provider/lang/pl.json
+++ b/plugins/Provider/lang/pl.json
@@ -1,8 +1,6 @@
 {
     "Provider": {
         "ColumnProvider": "Dostawca",
-        "PluginDescription": "Raporty dostawców o odwiedzających.",
-        "SubmenuLocationsProvider": "Lokalizacje & dostawcy",
         "WidgetProviders": "Dostawcy"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/pt-br.json b/plugins/Provider/lang/pt-br.json
index 43cc0ecc0c..d7e1b13deb 100644
--- a/plugins/Provider/lang/pt-br.json
+++ b/plugins/Provider/lang/pt-br.json
@@ -1,9 +1,7 @@
 {
     "Provider": {
         "ColumnProvider": "Provedor",
-        "PluginDescription": "Relata o provedor dos visitantes.",
         "ProviderReportDocumentation": "Este relatório mostra como o Internet Service Providers de seus visitantes -e usado para acessar o site. Você pode clicar no nome de um provedor para obter mais detalhes. %s Se o Piwik não puder determinar o fornecedor de um visitante, ele será listado como IP.",
-        "SubmenuLocationsProvider": "Lugares e Provedores",
         "WidgetProviders": "Provedores"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/pt.json b/plugins/Provider/lang/pt.json
index 7e295d8279..bc72d77415 100644
--- a/plugins/Provider/lang/pt.json
+++ b/plugins/Provider/lang/pt.json
@@ -1,9 +1,7 @@
 {
     "Provider": {
         "ColumnProvider": "Fornecedor",
-        "PluginDescription": "Relata os Fornecedores dos visitantes.",
         "ProviderReportDocumentation": "Este relatório mostra quais os ISPs que os seus visitantes usaram para aceder ao website. Você pode clicar num nome do ISP para obter mais detalhes. %s Se o Piwik não pode determinar o ISP do visitante, é listado como IP.",
-        "SubmenuLocationsProvider": "Localizações & Fornecedores",
         "WidgetProviders": "Fornecedores"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/ro.json b/plugins/Provider/lang/ro.json
index b8d7812650..7158d97138 100644
--- a/plugins/Provider/lang/ro.json
+++ b/plugins/Provider/lang/ro.json
@@ -1,9 +1,7 @@
 {
     "Provider": {
         "ColumnProvider": "Operator",
-        "PluginDescription": "Rapoarte ale Furnizorului de vizitatori.",
         "ProviderReportDocumentation": "Acest raport arată care furnizorii de servicii de Internet vizitatorii dvs. au folosit pentru a accesa site-ul. Puteți face clic pe un nume de furnizor pentru mai multe detalii. %s Daca Piwik nu poate determina furnizor un vizitator, acesta este listat ca IP.",
-        "SubmenuLocationsProvider": "Locație și operatori",
         "WidgetProviders": "Provideri"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/ru.json b/plugins/Provider/lang/ru.json
index 02ed392a23..ddd5099702 100644
--- a/plugins/Provider/lang/ru.json
+++ b/plugins/Provider/lang/ru.json
@@ -1,9 +1,7 @@
 {
     "Provider": {
         "ColumnProvider": "Провайдер",
-        "PluginDescription": "Отображает провайдеры посетителей.",
         "ProviderReportDocumentation": "Этот отчет показывает, какие интернет-провайдеры у посетителей вашего сайта. Вы можете кликнуть на имя провайдера, чтобы посмотреть детали. %s Если Piwik не может определить провайдера, отображается просто IP.",
-        "SubmenuLocationsProvider": "Локации и провайдеры",
         "WidgetProviders": "Провайдеры"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/sk.json b/plugins/Provider/lang/sk.json
index a5d817600b..63f13daa69 100644
--- a/plugins/Provider/lang/sk.json
+++ b/plugins/Provider/lang/sk.json
@@ -1,8 +1,6 @@
 {
     "Provider": {
         "ColumnProvider": "Poskytovateľ",
-        "PluginDescription": "Report cez ktorého poskytovateľa pripojenia prišli návštevníci na web stránku.",
-        "SubmenuLocationsProvider": "Umiestnenie & poskytovateľ",
         "WidgetProviders": "Poskytovatelia"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/sl.json b/plugins/Provider/lang/sl.json
index f20ef91f3a..aecafe7656 100644
--- a/plugins/Provider/lang/sl.json
+++ b/plugins/Provider/lang/sl.json
@@ -2,7 +2,6 @@
     "Provider": {
         "ColumnProvider": "Ponudnik",
         "ProviderReportFooter": "Neznan ponudnik pomeni, da IP številke ni bilo mogoče povezati s ponudnikom.",
-        "SubmenuLocationsProvider": "Lokacije & Ponudnik",
         "WidgetProviders": "Ponudniki"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/sq.json b/plugins/Provider/lang/sq.json
index b710b409ef..f533c0ef17 100644
--- a/plugins/Provider/lang/sq.json
+++ b/plugins/Provider/lang/sq.json
@@ -1,9 +1,7 @@
 {
     "Provider": {
         "ColumnProvider": "Mundësues",
-        "PluginDescription": "Raporton Mundësuesin e vizitorëve.",
         "ProviderReportDocumentation": "Ky raport ju tregon cilët Mundësuesa Shërbimi Internet kanë përdorur vizitorët tuaj për të hyrë te site-i web. Për më tepër hollësi mund të klikoni mbi emrin e një mundësuesi. %s Nëse Piwik nuk arrin ta përcaktojë mundësuesin për një vizitor, e tregon thjesht si IP.",
-        "SubmenuLocationsProvider": "Vende & Mundësuesa",
         "WidgetProviders": "Mundësuesa"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/sr.json b/plugins/Provider/lang/sr.json
index 4769ee4f59..e712782724 100644
--- a/plugins/Provider/lang/sr.json
+++ b/plugins/Provider/lang/sr.json
@@ -1,9 +1,7 @@
 {
     "Provider": {
         "ColumnProvider": "Provajder",
-        "PluginDescription": "Izveštaj o provajderima",
         "ProviderReportDocumentation": "Ovaj izveštaj prikazuje koje Internet provajdere koriste vaši posetioci kako bi pristupili sajtu. Možete kliknuti na naziv provajdera kako biste videli više detalja. %s Ako Piwik ne može da odredi koji provajder je u pitanju, onda prikazuje IP.",
-        "SubmenuLocationsProvider": "Lokacije i provajderi",
         "WidgetProviders": "Provajderi"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/sv.json b/plugins/Provider/lang/sv.json
index b07e603efb..007c9bbf07 100644
--- a/plugins/Provider/lang/sv.json
+++ b/plugins/Provider/lang/sv.json
@@ -1,9 +1,7 @@
 {
     "Provider": {
         "ColumnProvider": "Internetleverantör",
-        "PluginDescription": "Rapporterar Internetleverantören som besökaren använder.",
         "ProviderReportDocumentation": "Denna rapport visar vilka Internetleverantörer dina besökare använde för att få åtkomst till webbplatsen. Du kan klicka på en leverantörs namn för mer information. %s Om Piwik inte kan avgöra en besökares leverantör, så listas den som IP.",
-        "SubmenuLocationsProvider": "Ursprung och operatör",
         "WidgetProviders": "Internetleverantör"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/th.json b/plugins/Provider/lang/th.json
index cd71ded0ba..612f7edc3e 100644
--- a/plugins/Provider/lang/th.json
+++ b/plugins/Provider/lang/th.json
@@ -1,8 +1,6 @@
 {
     "Provider": {
         "ColumnProvider": "ผู้ให้บริการ",
-        "PluginDescription": "รายงานผู้ให้บริการของผู้เข้าชม",
-        "SubmenuLocationsProvider": "ตำแหน่งที่อยู่และผู้ให้บริการ",
         "WidgetProviders": "ผู้ให้บริการ"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/tl.json b/plugins/Provider/lang/tl.json
index 561e248f46..ad86f5a743 100644
--- a/plugins/Provider/lang/tl.json
+++ b/plugins/Provider/lang/tl.json
@@ -1,10 +1,8 @@
 {
     "Provider": {
         "ColumnProvider": "Tagapagtustos",
-        "PluginDescription": "Mga Ulat ng provider ng mga bisita.",
         "ProviderReportDocumentation": "Ang ulat na itoy ang nagpapakita kung anong Internet Server Providers ang gamit ng iyung bisita upang ma-access ang website. Maari mong e-click ang pangalan ng provider para sa karagdagang detalye. %s kung ang Piwik ay hindi matukoy ang provider ng bisita. ito ay nakalista bilang IP.",
         "ProviderReportFooter": "Ang hindi kilalang provider ay hindi makikita ang IP address.",
-        "SubmenuLocationsProvider": "Mga Lokasyon at Provider",
         "WidgetProviders": "Mga Tagapagtustos"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/tr.json b/plugins/Provider/lang/tr.json
index 7526ee9471..4d9ea04e7d 100644
--- a/plugins/Provider/lang/tr.json
+++ b/plugins/Provider/lang/tr.json
@@ -1,8 +1,6 @@
 {
     "Provider": {
         "ColumnProvider": "Sağlayıcı",
-        "PluginDescription": "Ziyaretciden Sağlayıcının Rapoarları",
-        "SubmenuLocationsProvider": "Konumlar & Sağlayıcı",
         "WidgetProviders": "Sağlayıcılar"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/uk.json b/plugins/Provider/lang/uk.json
index 00717ecf37..6537f7daca 100644
--- a/plugins/Provider/lang/uk.json
+++ b/plugins/Provider/lang/uk.json
@@ -1,8 +1,6 @@
 {
     "Provider": {
         "ColumnProvider": "Провайдер",
-        "PluginDescription": "Звітує про провейдера відвідувачів",
-        "SubmenuLocationsProvider": "Місцезнаходження та провайдер",
         "WidgetProviders": "Провайдери"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/vi.json b/plugins/Provider/lang/vi.json
index a123aed9ae..2231abcec5 100644
--- a/plugins/Provider/lang/vi.json
+++ b/plugins/Provider/lang/vi.json
@@ -1,9 +1,7 @@
 {
     "Provider": {
         "ColumnProvider": "Nhà cung cấp",
-        "PluginDescription": "Báo cáo nhà cung cấp của khách truy cập",
         "ProviderReportDocumentation": "Báo cáo này cho thấy Nhà cung cấp dịch vụ Internet mà khách truy cập sử dụng để truy cập website. Bạn có thể ckick trên tên nhà cung cấp để biết thêm chi tiết. %s Nếu Piwik không thể xác định được nhà cung cấp của khách truy cập, nó liệt kê danh sách IP.",
-        "SubmenuLocationsProvider": "Vị trí và nhà cung cấp",
         "WidgetProviders": "Các nhà cung cấp"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/zh-cn.json b/plugins/Provider/lang/zh-cn.json
index 71cd2924f9..3875ad2245 100644
--- a/plugins/Provider/lang/zh-cn.json
+++ b/plugins/Provider/lang/zh-cn.json
@@ -1,9 +1,7 @@
 {
     "Provider": {
         "ColumnProvider": "网络服务商",
-        "PluginDescription": "访客的网络服务商的报表。",
         "ProviderReportDocumentation": "本报表显示访客的网络服务商。点击服务商名字查看详细资料。%s 如果 Piwik 无法判断访客的网络服务商，就列出IP地址。",
-        "SubmenuLocationsProvider": "地区和网络服务商",
         "WidgetProviders": "网络服务商"
     }
 }
\ No newline at end of file
diff --git a/plugins/Provider/lang/zh-tw.json b/plugins/Provider/lang/zh-tw.json
index 977a425aca..a4952b49c1 100644
--- a/plugins/Provider/lang/zh-tw.json
+++ b/plugins/Provider/lang/zh-tw.json
@@ -1,8 +1,6 @@
 {
     "Provider": {
         "ColumnProvider": "供應商",
-        "PluginDescription": "訪客的網際網路服務供應商報表。",
-        "SubmenuLocationsProvider": "訪客分佈 & 網際網路服務供應商",
         "WidgetProviders": "網際網路服務供應商"
     }
 }
\ No newline at end of file
diff --git a/plugins/QueuedTracking b/plugins/QueuedTracking
new file mode 160000
+Subproject ff1228265cc695fbec8b2997f442ed0bb90f289
diff --git a/plugins/Referrers/API.php b/plugins/Referrers/API.php
index 5172729e86..4ac28978e3 100644
--- a/plugins/Referrers/API.php
+++ b/plugins/Referrers/API.php
@@ -68,8 +68,8 @@ class API extends \Piwik\Plugin\API
      * @param bool $expanded Whether to get report w/ subtables loaded or not.
      * @return DataTable
      */
-    public function  getReferrerType($idSite, $period, $date, $segment = false, $typeReferrer = false,
-                                     $idSubtable = false, $expanded = false)
+    public function getReferrerType($idSite, $period, $date, $segment = false, $typeReferrer = false,
+                                    $idSubtable = false, $expanded = false)
     {
         // if idSubtable is supplied, interpret idSubtable as referrer type and return correct report
         if ($idSubtable !== false) {
@@ -89,6 +89,9 @@ class API extends \Piwik\Plugin\API
             }
 
             if ($result) {
+                $result->filter('ColumnCallbackDeleteMetadata', array('segment'));
+                $result->filter('ColumnCallbackDeleteMetadata', array('segmentValue'));
+
                 return $this->removeSubtableIds($result); // this report won't return subtables of individual reports
             }
         }
@@ -107,6 +110,8 @@ class API extends \Piwik\Plugin\API
             $this->setGetReferrerTypeSubtables($dataTable, $idSite, $period, $date, $segment, $expanded);
         }
 
+        $manager = DataTable\Manager::getInstance();
+
         // set referrer type column to readable value
         $dataTable->queueFilter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getReferrerTypeLabel'));
 
@@ -125,7 +130,6 @@ class API extends \Piwik\Plugin\API
         }
 
         $dataTable = $dataTable->mergeSubtables($labelColumn = 'referer_type', $useMetadataColumn = true);
-
         $dataTable->filter('Sort', array(Metrics::INDEX_NB_VISITS, 'desc'));
         $dataTable->queueFilter('ReplaceColumnNames');
         $dataTable->queueFilter('ReplaceSummaryRowLabel');
@@ -136,6 +140,9 @@ class API extends \Piwik\Plugin\API
     public function getKeywords($idSite, $period, $date, $segment = false, $expanded = false)
     {
         $dataTable = $this->getDataTable(Archiver::KEYWORDS_RECORD_NAME, $idSite, $period, $date, $segment, $expanded);
+        $dataTable->filter('AddSegmentValue');
+        $dataTable->queueFilter('PrependSegment', array('referrerType==search;'));
+
         $dataTable = $this->handleKeywordNotDefined($dataTable);
         return $dataTable;
     }
@@ -234,6 +241,9 @@ class API extends \Piwik\Plugin\API
     public function getSearchEngines($idSite, $period, $date, $segment = false, $expanded = false)
     {
         $dataTable = $this->getDataTable(Archiver::SEARCH_ENGINES_RECORD_NAME, $idSite, $period, $date, $segment, $expanded);
+
+        $dataTable->filter('AddSegmentByLabel', array('referrerName'));
+        $dataTable->queueFilter('PrependSegment', array('referrerType==search;'));
         $dataTable->queueFilter('ColumnCallbackAddMetadata', array('label', 'url', __NAMESPACE__ . '\getSearchEngineUrlFromName'));
         $dataTable->queueFilter('MetadataCallbackAddMetadata', array('url', 'logo', __NAMESPACE__ . '\getSearchEngineLogoFromUrl'));
         return $dataTable;
@@ -273,6 +283,10 @@ class API extends \Piwik\Plugin\API
     public function getCampaigns($idSite, $period, $date, $segment = false, $expanded = false)
     {
         $dataTable = $this->getDataTable(Archiver::CAMPAIGNS_RECORD_NAME, $idSite, $period, $date, $segment, $expanded);
+
+        $dataTable->filter('AddSegmentByLabel', array('referrerName'));
+        $dataTable->queueFilter('PrependSegment', array('referrerType==campaign;'));
+
         return $dataTable;
     }
 
@@ -285,6 +299,7 @@ class API extends \Piwik\Plugin\API
     public function getWebsites($idSite, $period, $date, $segment = false, $expanded = false)
     {
         $dataTable = $this->getDataTable(Archiver::WEBSITES_RECORD_NAME, $idSite, $period, $date, $segment, $expanded);
+        $dataTable->filter('AddSegmentByLabel', array('referrerName'));
         return $dataTable;
     }
 
@@ -314,9 +329,7 @@ class API extends \Piwik\Plugin\API
     public function getSocials($idSite, $period, $date, $segment = false, $expanded = false)
     {
         $dataTable = $this->getDataTable(Archiver::WEBSITES_RECORD_NAME, $idSite, $period, $date, $segment, $expanded);
-
         $dataTable->filter('ColumnCallbackDeleteRow', array('label', function ($url) { return !isSocialUrl($url); }));
-
         $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'url', __NAMESPACE__ . '\getSocialMainUrl'));
         $dataTable->filter('GroupBy', array('label', __NAMESPACE__ . '\getSocialNetworkFromDomain'));
 
diff --git a/plugins/Referrers/Archiver.php b/plugins/Referrers/Archiver.php
index c5dcaef73d..3093449a6c 100644
--- a/plugins/Referrers/Archiver.php
+++ b/plugins/Referrers/Archiver.php
@@ -204,10 +204,10 @@ class Archiver extends \Piwik\Plugin\Archiver
     protected function insertDayNumericMetrics()
     {
         $numericRecords = array(
-            self::METRIC_DISTINCT_SEARCH_ENGINE_RECORD_NAME => count($this->getDataArray(self::SEARCH_ENGINES_RECORD_NAME)),
-            self::METRIC_DISTINCT_KEYWORD_RECORD_NAME       => count($this->getDataArray(self::KEYWORDS_RECORD_NAME)),
-            self::METRIC_DISTINCT_CAMPAIGN_RECORD_NAME      => count($this->getDataArray(self::CAMPAIGNS_RECORD_NAME)),
-            self::METRIC_DISTINCT_WEBSITE_RECORD_NAME       => count($this->getDataArray(self::WEBSITES_RECORD_NAME)),
+            self::METRIC_DISTINCT_SEARCH_ENGINE_RECORD_NAME => count($this->getDataArray(self::SEARCH_ENGINES_RECORD_NAME)->getDataArray()),
+            self::METRIC_DISTINCT_KEYWORD_RECORD_NAME       => count($this->getDataArray(self::KEYWORDS_RECORD_NAME)->getDataArray()),
+            self::METRIC_DISTINCT_CAMPAIGN_RECORD_NAME      => count($this->getDataArray(self::CAMPAIGNS_RECORD_NAME)->getDataArray()),
+            self::METRIC_DISTINCT_WEBSITE_RECORD_NAME       => count($this->getDataArray(self::WEBSITES_RECORD_NAME)->getDataArray()),
             self::METRIC_DISTINCT_URLS_RECORD_NAME          => count($this->distinctUrls),
         );
 
diff --git a/plugins/Referrers/Columns/Base.php b/plugins/Referrers/Columns/Base.php
index a69fcc54bf..feacc90e55 100644
--- a/plugins/Referrers/Columns/Base.php
+++ b/plugins/Referrers/Columns/Base.php
@@ -127,6 +127,14 @@ abstract class Base extends VisitDimension
         return $referrerInformation;
     }
 
+    protected function getReferrerInformationFromRequest(Request $request)
+    {
+        $referrerUrl = $request->getParam('urlref');
+        $currentUrl  = $request->getParam('url');
+
+        return $this->getReferrerInformation($referrerUrl, $currentUrl, $request->getIdSite());
+    }
+
     /**
      * Search engine detection
      * @return bool
@@ -228,8 +236,8 @@ abstract class Base extends VisitDimension
         if (!empty($this->referrerHost)) {
             // is the referrer host the current host?
             if (isset($this->currentUrlParse['host'])) {
-                $currentHost = mb_strtolower($this->currentUrlParse['host'], 'UTF-8');
-                if ($currentHost == mb_strtolower($this->referrerHost, 'UTF-8')) {
+                $currentHost = Common::mb_strtolower($this->currentUrlParse['host'], 'UTF-8');
+                if ($currentHost == Common::mb_strtolower($this->referrerHost, 'UTF-8')) {
                     $this->typeReferrerAnalyzed = Common::REFERRER_TYPE_DIRECT_ENTRY;
                     return true;
                 }
@@ -399,4 +407,23 @@ abstract class Base extends VisitDimension
         }
     }
 
+    protected function isReferrerInformationNew(Visitor $visitor, $information)
+    {
+        foreach (array('referer_keyword', 'referer_name', 'referer_type') as $infoName) {
+            if ($this->hasReferrerColumnChanged($visitor, $information, $infoName)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    protected function hasReferrerColumnChanged(Visitor $visitor, $information, $infoName)
+    {
+        return Common::mb_strtolower($visitor->getVisitorColumn($infoName)) != $information[$infoName];
+    }
+
+    protected function doesLastActionHaveSameReferrer(Visitor $visitor, $referrerType)
+    {
+        return $visitor->getVisitorColumn('referer_type') == $referrerType;
+    }
 }
diff --git a/plugins/Referrers/Columns/Campaign.php b/plugins/Referrers/Columns/Campaign.php
index 4413cd702f..ff2d5c2401 100644
--- a/plugins/Referrers/Columns/Campaign.php
+++ b/plugins/Referrers/Columns/Campaign.php
@@ -8,13 +8,58 @@
  */
 namespace Piwik\Plugins\Referrers\Columns;
 
-use Piwik\Columns\Dimension;
+use Piwik\Common;
 use Piwik\Piwik;
+use Piwik\Tracker\Action;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\TrackerConfig;
+use Piwik\Tracker\Visitor;
 
-class Campaign extends Dimension
+class Campaign extends Base
 {
+    /**
+     * Obtained from the `[Tracker] create_new_visit_when_campaign_changes` INI config option.
+     * If true, will create new visits when campaign name changes.
+     *
+     * @var bool
+     */
+    protected $createNewVisitWhenCampaignChanges;
+
+    public function __construct()
+    {
+        $this->createNewVisitWhenCampaignChanges = TrackerConfig::getConfigValue('create_new_visit_when_campaign_changes') == 1;
+    }
+
     public function getName()
     {
         return Piwik::translate('Referrers_ColumnCampaign');
     }
-}
+
+    /**
+     * If we should create a new visit when the campaign changes, check if the campaign info changed and if so
+     * force the tracker to create a new visit.
+     *
+     * @param Request $request
+     * @param Visitor $visitor
+     * @param Action|null $action
+     * @return bool
+     */
+    public function shouldForceNewVisit(Request $request, Visitor $visitor, Action $action = null)
+    {
+        if (!$this->createNewVisitWhenCampaignChanges) {
+            return false;
+        }
+
+        $information = $this->getReferrerInformationFromRequest($request);
+
+        if ($information['referer_type'] == Common::REFERRER_TYPE_CAMPAIGN
+            && $this->isReferrerInformationNew($visitor, $information)
+        ) {
+            Common::printDebug("Existing visit detected, but creating new visit because campaign information is different than last action.");
+
+            return true;
+        }
+
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/plugins/Referrers/Columns/Keyword.php b/plugins/Referrers/Columns/Keyword.php
index a5025b63c2..78605c9d94 100644
--- a/plugins/Referrers/Columns/Keyword.php
+++ b/plugins/Referrers/Columns/Keyword.php
@@ -41,10 +41,7 @@ class Keyword extends Base
      */
     public function onNewVisit(Request $request, Visitor $visitor, $action)
     {
-        $referrerUrl = $request->getParam('urlref');
-        $currentUrl  = $request->getParam('url');
-
-        $information = $this->getReferrerInformation($referrerUrl, $currentUrl, $request->getIdSite());
+        $information = $this->getReferrerInformationFromRequest($request);
 
         if (!empty($information['referer_keyword'])) {
             return substr($information['referer_keyword'], 0, 255);
diff --git a/plugins/Referrers/Columns/ReferrerName.php b/plugins/Referrers/Columns/ReferrerName.php
index fbd55219dc..7bdb0732a6 100644
--- a/plugins/Referrers/Columns/ReferrerName.php
+++ b/plugins/Referrers/Columns/ReferrerName.php
@@ -35,10 +35,7 @@ class ReferrerName extends Base
      */
     public function onNewVisit(Request $request, Visitor $visitor, $action)
     {
-        $referrerUrl = $request->getParam('urlref');
-        $currentUrl  = $request->getParam('url');
-
-        $information = $this->getReferrerInformation($referrerUrl, $currentUrl, $request->getIdSite());
+        $information = $this->getReferrerInformationFromRequest($request);
 
         if (!empty($information['referer_name'])) {
 
diff --git a/plugins/Referrers/Columns/ReferrerType.php b/plugins/Referrers/Columns/ReferrerType.php
index f4e688f60e..5303a1c360 100644
--- a/plugins/Referrers/Columns/ReferrerType.php
+++ b/plugins/Referrers/Columns/ReferrerType.php
@@ -42,10 +42,7 @@ class ReferrerType extends Base
      */
     public function onNewVisit(Request $request, Visitor $visitor, $action)
     {
-        $referrerUrl = $request->getParam('urlref');
-        $currentUrl  = $request->getParam('url');
-
-        $information = $this->getReferrerInformation($referrerUrl, $currentUrl, $request->getIdSite());
+        $information = $this->getReferrerInformationFromRequest($request);
 
         return $information['referer_type'];
     }
diff --git a/plugins/Referrers/Columns/ReferrerUrl.php b/plugins/Referrers/Columns/ReferrerUrl.php
index 0404a13247..21c5cd5bdc 100644
--- a/plugins/Referrers/Columns/ReferrerUrl.php
+++ b/plugins/Referrers/Columns/ReferrerUrl.php
@@ -35,10 +35,7 @@ class ReferrerUrl extends Base
      */
     public function onNewVisit(Request $request, Visitor $visitor, $action)
     {
-        $referrerUrl = $request->getParam('urlref');
-        $currentUrl  = $request->getParam('url');
-
-        $information = $this->getReferrerInformation($referrerUrl, $currentUrl, $request->getIdSite());
+        $information = $this->getReferrerInformationFromRequest($request);
 
         return $information['referer_url'];
     }
diff --git a/plugins/Referrers/Columns/Website.php b/plugins/Referrers/Columns/Website.php
index 53b143d693..42d05068d6 100644
--- a/plugins/Referrers/Columns/Website.php
+++ b/plugins/Referrers/Columns/Website.php
@@ -8,13 +8,50 @@
  */
 namespace Piwik\Plugins\Referrers\Columns;
 
-use Piwik\Columns\Dimension;
+use Piwik\Common;
 use Piwik\Piwik;
+use Piwik\Tracker\Action;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\TrackerConfig;
+use Piwik\Tracker\Visitor;
 
-class Website extends Dimension
+class Website extends Base
 {
+    /**
+     * Set using the `[Tracker] create_new_visit_when_website_referrer_changes` INI config option.
+     * If true, will force new visits if the referrer website changes.
+     *
+     * @var bool
+     */
+    protected $createNewVisitWhenWebsiteReferrerChanges;
+
+    public function __construct()
+    {
+        $this->createNewVisitWhenWebsiteReferrerChanges = TrackerConfig::getConfigValue('create_new_visit_when_website_referrer_changes') == 1;
+    }
+
     public function getName()
     {
         return Piwik::translate('General_Website');
     }
+
+    public function shouldForceNewVisit(Request $request, Visitor $visitor, Action $action = null)
+    {
+        if (!$this->createNewVisitWhenWebsiteReferrerChanges) {
+            return false;
+        }
+
+        $information = $this->getReferrerInformationFromRequest($request);
+
+        if ($information['referer_type'] == Common::REFERRER_TYPE_WEBSITE
+            && $this->isReferrerInformationNew($visitor, $information)
+        ) {
+            Common::printDebug("Existing visit detected, but creating new visit because website referrer information is different than last action.");
+
+            return true;
+        }
+
+        return false;
+
+    }
 }
\ No newline at end of file
diff --git a/plugins/Referrers/Controller.php b/plugins/Referrers/Controller.php
index 669ee14fc9..2a962755ee 100644
--- a/plugins/Referrers/Controller.php
+++ b/plugins/Referrers/Controller.php
@@ -14,12 +14,14 @@ use Piwik\DataTable\Map;
 use Piwik\Metrics;
 use Piwik\Period\Range;
 use Piwik\Piwik;
+use Piwik\Plugins\Referrers\Reports\GetAll;
 use Piwik\Plugins\Referrers\Reports\GetKeywords;
 use Piwik\Plugins\Referrers\Reports\GetReferrerType;
 use Piwik\Plugins\Referrers\Reports\GetSearchEngines;
 use Piwik\Plugins\Referrers\Reports\GetSocials;
 use Piwik\Plugins\Referrers\Reports\GetWebsites;
 use Piwik\SettingsPiwik;
+use Piwik\Translation\Translator;
 use Piwik\View;
 
 /**
@@ -27,6 +29,18 @@ use Piwik\View;
  */
 class Controller extends \Piwik\Plugin\Controller
 {
+    /**
+     * @var Translator
+     */
+    private $translator;
+
+    public function __construct(Translator $translator)
+    {
+        $this->translator = $translator;
+
+        parent::__construct();
+    }
+
     public function index()
     {
         $view = new View('@Referrers/index');
@@ -34,9 +48,6 @@ class Controller extends \Piwik\Plugin\Controller
         $view->graphEvolutionReferrers = $this->getEvolutionGraph(Common::REFERRER_TYPE_DIRECT_ENTRY, array(), array('nb_visits'));
         $view->nameGraphEvolutionReferrers = 'Referrers.getEvolutionGraph';
 
-        // building the referrers summary report
-        $view->dataTableReferrerType = $this->renderReport(new GetReferrerType());
-
         $nameValues = $this->getReferrersVisitorsByType();
 
         $totalVisits = array_sum($nameValues);
@@ -88,46 +99,35 @@ class Controller extends \Piwik\Plugin\Controller
         $view->urlSparklineDistinctWebsites = $this->getUrlSparkline('getLastDistinctWebsitesGraph');
         $view->urlSparklineDistinctCampaigns = $this->getUrlSparkline('getLastDistinctCampaignsGraph');
 
-        $view->totalVisits = $totalVisits;
-        $view->referrersReportsByDimension = $this->getReferrersReportsByDimensionView($totalVisits);
-
         return $view->render();
     }
 
-    /**
-     * Returns HTML for the Referrers Overview page that categorizes Referrer reports
-     * & allows the user to switch between them.
-     *
-     * @param int $visits The number of visits for this period & site. If <= 0, the
-     *                    reports are not shown, since they will have no data.getReferrersReportsByDimensionView
-     * @return string The report viewer HTML.
-     */
-    private function getReferrersReportsByDimensionView($visits)
+    public function allReferrers()
     {
-        $result = '';
+        $view = new View('@Referrers/allReferrers');
 
-        // only display the reports by dimension view if there are visits
-        if ($visits > 0) {
-            $referrersReportsByDimension = new View\ReportsByDimension('Referrers');
-
-            $referrersReportsByDimension->addReport(
-                'Referrers_ViewAllReferrers', 'Referrers_WidgetGetAll', 'Referrers.getAll');
+        // building the referrers summary report
+        $view->dataTableReferrerType = $this->renderReport(new GetReferrerType());
 
-            $byTypeCategory = Piwik::translate('Referrers_ViewReferrersBy', Piwik::translate('Live_GoalType'));
-            $referrersReportsByDimension->addReport(
-                $byTypeCategory, 'Referrers_Keywords', 'Referrers.getKeywords');
-            $referrersReportsByDimension->addReport($byTypeCategory, 'SitesManager_Sites', 'Referrers.getWebsites');
-            $referrersReportsByDimension->addReport($byTypeCategory, 'Referrers_Campaigns', 'Referrers.getCampaigns');
+        $nameValues = $this->getReferrersVisitorsByType();
 
-            $bySourceCategory = Piwik::translate('Referrers_ViewReferrersBy', Piwik::translate('General_Source'));
-            $referrersReportsByDimension->addReport($bySourceCategory, 'Referrers_Socials', 'Referrers.getSocials');
-            $referrersReportsByDimension->addReport(
-                $bySourceCategory, 'Referrers_SearchEngines', 'Referrers.getSearchEngines');
+        $totalVisits = array_sum($nameValues);
+        foreach ($nameValues as $name => $value) {
+            $view->$name = $value;
 
-            $result = $referrersReportsByDimension->render();
+            // calculate percent of total, if there were any visits
+            if ($value != 0
+                && $totalVisits != 0
+            ) {
+                $percentName = $name . 'Percent';
+                $view->$percentName = round(($value / $totalVisits) * 100, 0);
+            }
         }
 
-        return $result;
+        $view->totalVisits = $totalVisits;
+        $view->referrersReportsByDimension = $this->renderReport(new GetAll());
+
+        return $view->render();
     }
 
     public function getSearchEnginesAndKeywords()
@@ -230,7 +230,7 @@ class Controller extends \Piwik\Plugin\Controller
                 $typeReferrer = Common::getRequestVar('typeReferrer', false);
             }
             $label = self::getTranslatedReferrerTypeLabel($typeReferrer);
-            $total = Piwik::translate('General_Total');
+            $total = $this->translator->translate('General_Total');
 
             if (!empty($view->config->rows_to_display)) {
                 $visibleRows = $view->config->rows_to_display;
@@ -243,10 +243,10 @@ class Controller extends \Piwik\Plugin\Controller
         $view->config->row_picker_match_rows_by = 'label';
         $view->config->rows_to_display = $visibleRows;
 
-        $view->config->documentation = Piwik::translate('Referrers_EvolutionDocumentation') . '<br />'
-            . Piwik::translate('General_BrokenDownReportDocumentation') . '<br />'
-            . Piwik::translate('Referrers_EvolutionDocumentationMoreInfo', '&quot;'
-                . Piwik::translate('Referrers_DetailsByReferrerType') . '&quot;');
+        $view->config->documentation = $this->translator->translate('Referrers_EvolutionDocumentation') . '<br />'
+            . $this->translator->translate('General_BrokenDownReportDocumentation') . '<br />'
+            . $this->translator->translate('Referrers_EvolutionDocumentationMoreInfo', '&quot;'
+                . $this->translator->translate('Referrers_ReferrerTypes') . '&quot;');
 
         return $this->renderView($view);
     }
@@ -254,7 +254,7 @@ class Controller extends \Piwik\Plugin\Controller
     public function getLastDistinctSearchEnginesGraph()
     {
         $view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, "Referrers.getNumberOfDistinctSearchEngines");
-        $view->config->translations['Referrers_distinctSearchEngines'] = ucfirst(Piwik::translate('Referrers_DistinctSearchEngines'));
+        $view->config->translations['Referrers_distinctSearchEngines'] = ucfirst($this->translator->translate('Referrers_DistinctSearchEngines'));
         $view->config->columns_to_display = array('Referrers_distinctSearchEngines');
         return $this->renderView($view);
     }
@@ -262,7 +262,7 @@ class Controller extends \Piwik\Plugin\Controller
     public function getLastDistinctKeywordsGraph()
     {
         $view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, "Referrers.getNumberOfDistinctKeywords");
-        $view->config->translations['Referrers_distinctKeywords'] = ucfirst(Piwik::translate('Referrers_DistinctKeywords'));
+        $view->config->translations['Referrers_distinctKeywords'] = ucfirst($this->translator->translate('Referrers_DistinctKeywords'));
         $view->config->columns_to_display = array('Referrers_distinctKeywords');
         return $this->renderView($view);
     }
@@ -270,7 +270,7 @@ class Controller extends \Piwik\Plugin\Controller
     public function getLastDistinctWebsitesGraph()
     {
         $view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, "Referrers.getNumberOfDistinctWebsites");
-        $view->config->translations['Referrers_distinctWebsites'] = ucfirst(Piwik::translate('Referrers_DistinctWebsites'));
+        $view->config->translations['Referrers_distinctWebsites'] = ucfirst($this->translator->translate('Referrers_DistinctWebsites'));
         $view->config->columns_to_display = array('Referrers_distinctWebsites');
         return $this->renderView($view);
     }
@@ -278,7 +278,7 @@ class Controller extends \Piwik\Plugin\Controller
     public function getLastDistinctCampaignsGraph()
     {
         $view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, "Referrers.getNumberOfDistinctCampaigns");
-        $view->config->translations['Referrers_distinctCampaigns'] = ucfirst(Piwik::translate('Referrers_DistinctCampaigns'));
+        $view->config->translations['Referrers_distinctCampaigns'] = ucfirst($this->translator->translate('Referrers_DistinctCampaigns'));
         $view->config->columns_to_display = array('Referrers_distinctCampaigns');
         return $this->renderView($view);
     }
@@ -422,7 +422,7 @@ function DisplayTopKeywords($url = "")
      */
     private function getReferrerUrlSparkline($referrerType)
     {
-        $totalRow = Piwik::translate('General_Total');
+        $totalRow = $this->translator->translate('General_Total');
         return $this->getUrlSparkline(
             'getEvolutionGraph',
             array('columns'      => array('nb_visits'),
diff --git a/plugins/Referrers/Menu.php b/plugins/Referrers/Menu.php
index 835ae15f78..cb92a43db3 100644
--- a/plugins/Referrers/Menu.php
+++ b/plugins/Referrers/Menu.php
@@ -16,7 +16,8 @@ class Menu extends \Piwik\Plugin\Menu
     {
         $menu->addReferrersItem('', $this->urlForAction('index'), 20);
         $menu->addReferrersItem('General_Overview', $this->urlForAction('index'), 1);
-        $menu->addReferrersItem('Referrers_SubmenuSearchEngines', $this->urlForAction('getSearchEnginesAndKeywords'), 2);
-        $menu->addReferrersItem('Referrers_SubmenuWebsites', $this->urlForAction('indexWebsites'), 3);
+        $menu->addReferrersItem('Referrers_WidgetGetAll', $this->urlForAction('allReferrers'), 2);
+        $menu->addReferrersItem('Referrers_SubmenuSearchEngines', $this->urlForAction('getSearchEnginesAndKeywords'), 3);
+        $menu->addReferrersItem('Referrers_SubmenuWebsites', $this->urlForAction('indexWebsites'), 4);
     }
 }
diff --git a/plugins/Referrers/Referrers.php b/plugins/Referrers/Referrers.php
index 95c7e00446..cefa27bef8 100644
--- a/plugins/Referrers/Referrers.php
+++ b/plugins/Referrers/Referrers.php
@@ -28,11 +28,19 @@ class Referrers extends \Piwik\Plugin
     public function getListHooksRegistered()
     {
         return array(
-            'Insights.addReportToOverview' => 'addReportToInsightsOverview',
-            'Live.getAllVisitorDetails'    => 'extendVisitorDetails'
+            'Insights.addReportToOverview'      => 'addReportToInsightsOverview',
+            'Live.getAllVisitorDetails'         => 'extendVisitorDetails',
+            'Request.getRenamedModuleAndAction' => 'renameDeprecatedModuleAndAction',
         );
     }
 
+    public function renameDeprecatedModuleAndAction(&$module, &$action)
+    {
+        if($module == 'Referers') {
+            $module = 'Referrers';
+        }
+    }
+
     public function extendVisitorDetails(&$visitor, $details)
     {
         $instance = new Visitor($details);
diff --git a/plugins/Referrers/Reports/GetAll.php b/plugins/Referrers/Reports/GetAll.php
index 50ac00dc9c..2079dd414d 100644
--- a/plugins/Referrers/Reports/GetAll.php
+++ b/plugins/Referrers/Reports/GetAll.php
@@ -26,6 +26,11 @@ class GetAll extends Base
         $this->widgetTitle  = 'Referrers_WidgetGetAll';
     }
 
+    public function getDefaultTypeViewDataTable()
+    {
+        return HtmlTable\AllColumns::ID;
+    }
+
     public function configureView(ViewDataTable $view)
     {
         $referrers = new Referrers();
diff --git a/plugins/Referrers/images/searchEngines/extern.peoplecheck.de.png b/plugins/Referrers/images/searchEngines/extern.peoplecheck.de.png
new file mode 100644
index 0000000000..6b4b314e3b
--- /dev/null
+++ b/plugins/Referrers/images/searchEngines/extern.peoplecheck.de.png
diff --git a/plugins/Referrers/images/searchEngines/m.sm.cn.png b/plugins/Referrers/images/searchEngines/m.sm.cn.png
new file mode 100644
index 0000000000..3f812440c5
--- /dev/null
+++ b/plugins/Referrers/images/searchEngines/m.sm.cn.png
diff --git a/plugins/Referrers/images/searchEngines/www.haosou.com.png b/plugins/Referrers/images/searchEngines/www.haosou.com.png
new file mode 100644
index 0000000000..367b89d120
--- /dev/null
+++ b/plugins/Referrers/images/searchEngines/www.haosou.com.png
diff --git a/plugins/Referrers/images/searchEngines/www.qwant.com.png b/plugins/Referrers/images/searchEngines/www.qwant.com.png
new file mode 100644
index 0000000000..00946b0bcc
--- /dev/null
+++ b/plugins/Referrers/images/searchEngines/www.qwant.com.png
diff --git a/plugins/Referrers/images/searchEngines/www.sm.de.png b/plugins/Referrers/images/searchEngines/www.sm.de.png
new file mode 100644
index 0000000000..45a01277b1
--- /dev/null
+++ b/plugins/Referrers/images/searchEngines/www.sm.de.png
diff --git a/plugins/Referrers/images/searchEngines/www.toppreise.ch.png b/plugins/Referrers/images/searchEngines/www.toppreise.ch.png
new file mode 100644
index 0000000000..5c7dffd666
--- /dev/null
+++ b/plugins/Referrers/images/searchEngines/www.toppreise.ch.png
diff --git a/plugins/Referrers/images/searchEngines/www.zxuso.com.png b/plugins/Referrers/images/searchEngines/www.zxuso.com.png
new file mode 100644
index 0000000000..adad7eb500
--- /dev/null
+++ b/plugins/Referrers/images/searchEngines/www.zxuso.com.png
diff --git a/plugins/Referrers/lang/am.json b/plugins/Referrers/lang/am.json
index 934b499a2d..bb457d140b 100644
--- a/plugins/Referrers/lang/am.json
+++ b/plugins/Referrers/lang/am.json
@@ -3,7 +3,6 @@
         "ColumnSearchEngine": "የመፈለጊያ ሞተሮች",
         "ColumnWebsite": "ድር ጣቢያዎች",
         "ColumnWebsitePage": "የድር ጣቢያዎች ገፅ",
-        "DetailsByReferrerType": "ዝርዝር በአመላካች ዓይነት",
         "DirectEntry": "ቀጥተኛ ምዝግብ",
         "Distinct": "የተለዩ ምልከታዎች በአመላካች ዓይነት",
         "DistinctCampaigns": "የተለዩ campaigns",
diff --git a/plugins/Referrers/lang/ar.json b/plugins/Referrers/lang/ar.json
index 2bd92088f3..57e00e072c 100644
--- a/plugins/Referrers/lang/ar.json
+++ b/plugins/Referrers/lang/ar.json
@@ -5,7 +5,6 @@
         "ColumnSearchEngine": "محرك بحث",
         "ColumnWebsite": "موقع ويب",
         "ColumnWebsitePage": "صفحة موقع",
-        "DetailsByReferrerType": "التفاصيل حسب نوع المرسل",
         "DirectEntry": "الوصول المباشر",
         "Distinct": "أبرز المرسلون حسب النوع",
         "DistinctCampaigns": "أبرز الحملات",
@@ -13,7 +12,6 @@
         "DistinctSearchEngines": "أبرز محركات البحث",
         "DistinctWebsites": "أبرز مواقع ويب",
         "Keywords": "الكلمات الدلالية",
-        "PluginDescription": "تقارير عن مرسلي الزوار: محركات البحث، الكلمات الدلالية، المواقع، تتبع الحملات، والوصول المباشر.",
         "ReferrerName": "اسم المرسل",
         "Referrers": "مرسلو الزوار",
         "SearchEngines": "محركات البحث",
diff --git a/plugins/Referrers/lang/be.json b/plugins/Referrers/lang/be.json
index 74633a87a9..8e16e706e6 100644
--- a/plugins/Referrers/lang/be.json
+++ b/plugins/Referrers/lang/be.json
@@ -7,7 +7,6 @@
         "ColumnSearchEngine": "Пошукавая сістэма",
         "ColumnWebsite": "Вэб-сайт",
         "ColumnWebsitePage": "Старонка вэб-сайта",
-        "DetailsByReferrerType": "Дэталі па тыпе спасыльніка",
         "DirectEntry": "Прамы ўваход",
         "DirectEntryDocumentation": "Наведвальнік адчыніў URL у сваім браўзэры і пачаў праглядаць ваш вэб-сайт - ён зайшоў на сайт напрамую.",
         "Distinct": "Розныя спасыльнікі па тыпе",
@@ -19,7 +18,6 @@
         "EvolutionDocumentationMoreInfo": "Для атрымання дадатковай інфармацыі аб розных тыпах спасыльнікаў, звярніцеся да дакументацыі %s табліцы.",
         "Keywords": "Ключавыя словы",
         "KeywordsReportDocumentation": "Гэтая справаздача паказвае, якія ключавыя словы шукалі карыстальнікі, каб трапіць на ваш вэб-сайт. %s Пры націску на радок табліцы, можна ўбачыць размеркаванне пошукавых сістэм, якія былі запытаны па ключавым слове.",
-        "PluginDescription": "Справаздачы дадзеных аб спасыльніках: пошукавыя сістэмы, ключавыя словы, вэб-сайты, назіранне за кампаніямі, прамыя ўваходы.",
         "ReferrerName": "Імя спасыльніка",
         "Referrers": "Спасыльнікі",
         "SearchEngines": "Пошукавыя сістэмы",
diff --git a/plugins/Referrers/lang/bg.json b/plugins/Referrers/lang/bg.json
index e55732af9c..937703c8e3 100644
--- a/plugins/Referrers/lang/bg.json
+++ b/plugins/Referrers/lang/bg.json
@@ -8,7 +8,6 @@
         "ColumnSocial": "Социална мрежа",
         "ColumnWebsite": "Сайт",
         "ColumnWebsitePage": "Интернет страница",
-        "DetailsByReferrerType": "Детайли за типовете референции",
         "DirectEntry": "Директни посещения",
         "DirectEntryDocumentation": "Посетителят е въвел URL в браузъра си и е започнал да браузва вашия сайт - влязъл в уеб сайта директно.",
         "Distinct": "Отделни референции от Тип на референциите",
@@ -20,7 +19,6 @@
         "EvolutionDocumentationMoreInfo": "За повече информация отностно различните типове препращащи сайтове, вижте документите в %s таблицата.",
         "Keywords": "Ключови думи",
         "KeywordsReportDocumentation": "Този отчет показва кои ключови думи потребителите са използвали преди да бъдат препратени към вашият уеб сайт. %s Ако кликнете върху реда в таблицата, можете да видите разпределението на търсачките, в които са били търсени тези ключови думи.",
-        "PluginDescription": "Докладът на референтите данни: търсачки, ключови думи, уеб сайтове, кампания за проследяване, директен запис.",
         "Referrer": "Препоръчител",
         "ReferrerName": "Име на референт",
         "Referrers": "Референции",
diff --git a/plugins/Referrers/lang/ca.json b/plugins/Referrers/lang/ca.json
index ebf032716e..bc0fbab911 100644
--- a/plugins/Referrers/lang/ca.json
+++ b/plugins/Referrers/lang/ca.json
@@ -8,7 +8,6 @@
         "ColumnSocial": "Xarxa social",
         "ColumnWebsite": "Lloc web",
         "ColumnWebsitePage": "Pàgina web",
-        "DetailsByReferrerType": "Detalls segons el tipus de referent",
         "DirectEntry": "Registre directe",
         "DirectEntryDocumentation": "Un visitant ha entrar la URL al seu navegador i ha començat a navegar pel vostre lloc web. Ell ha entrar directament al lloc web.",
         "Distinct": "Referents diferents segons el tipus",
@@ -20,7 +19,6 @@
         "EvolutionDocumentationMoreInfo": "Per mes informació dels tipus de referents, mireu la informació de la taula %s.",
         "Keywords": "Paraules clau",
         "KeywordsReportDocumentation": "Aquest informe mostra quines paraules clau han utilitzat els vostres visitants abans de ser dirigits al vostre lloc web. %s Clicant en una fila de la taula podeu veure la distribució de cercadors en que s'ha cercat la paraula clau.",
-        "PluginDescription": "Informes sobre referents: Cercadors, Paraules Clau, Llocs web, Referent per Campanyes i Entrades Directes",
         "ReferrerName": "Nom del referent",
         "Referrers": "Referents",
         "SearchEngines": "Cercadors",
diff --git a/plugins/Referrers/lang/cs.json b/plugins/Referrers/lang/cs.json
index 0c3e90f17d..fdfbf25364 100644
--- a/plugins/Referrers/lang/cs.json
+++ b/plugins/Referrers/lang/cs.json
@@ -9,7 +9,6 @@
         "ColumnSocial": "Sociální síť",
         "ColumnWebsite": "Web",
         "ColumnWebsitePage": "Web stránka",
-        "DetailsByReferrerType": "Podrobnosti podle typu refereru",
         "DirectEntry": "Přímý vstup",
         "DirectEntryDocumentation": "Návštěvník zadal URL vašich stránek do webového prohlížeče a začal s procházením zde - adresu zadal přímo.",
         "Distinct": "Jedineční refereři podle typu",
@@ -21,11 +20,12 @@
         "EvolutionDocumentationMoreInfo": "Pro více informací o rozdílných typech referrerů nahlédněte do dokumentace tabulky %s.",
         "Keywords": "Klíčových slov",
         "KeywordsReportDocumentation": "Toto hlášení zobrazuje klíčová slova, která uživatelé hledali, než byli odkázáni na vaše stránky. %s Kliknutím na řádek tabulky zobrazíte distribuci vyhledávačů, které byly použity k hledání tohoto klíčového slova.",
-        "PluginDescription": "Zobrazí data refererů: vyhledávací stroje, klíčová slova, weby, správu kampaní, přímé vstupy",
+        "PluginDescription": "Hlásí data referreru: vyhledávače, klíčová slova, stránky, kampaně, sociální média, přímý vstup.",
         "Referrer": "Referrer",
         "ReferrerName": "Jméno referreru",
         "Referrers": "Odkazující stránky",
         "ReferrersOverview": "Přehled referrerů",
+        "ReferrerTypes": "Typy referrerů",
         "SearchEngines": "Vyhledávacích strojů",
         "SearchEnginesDocumentation": "Návštěvník byl na vaše stránky odkázán vyhledávačem. %s Pro více informací si prohlédněte hlášení %s.",
         "SearchEnginesReportDocumentation": "Toto hlášení zobrazuje, které vyhledávače odkázali návštěvníky na vaše stránky. %s Kliknutím na řádek v tabulce zobrazíte, co uživatelé na daném vyhledávači hledali.",
diff --git a/plugins/Referrers/lang/da.json b/plugins/Referrers/lang/da.json
index 0bed296716..ca03b065fe 100644
--- a/plugins/Referrers/lang/da.json
+++ b/plugins/Referrers/lang/da.json
@@ -9,7 +9,6 @@
         "ColumnSocial": "Socialt netværk",
         "ColumnWebsite": "Hjemmeside",
         "ColumnWebsitePage": "Websted side",
-        "DetailsByReferrerType": "Detaljer efter kildetype",
         "DirectEntry": "Direkte træf",
         "DirectEntryDocumentation": "En besøgende har indtastet URL-adressen i browseren og gik direkte til hjemmesiden. Den besøgende kom direkte ind på hjemmesiden.",
         "Distinct": "Forskellige kilder efter kildetype",
@@ -21,11 +20,11 @@
         "EvolutionDocumentationMoreInfo": "Flere oplysninger om de forskellige henvisnings typer findes i dokumentationen af tabellen %s.",
         "Keywords": "Søgeord",
         "KeywordsReportDocumentation": "Rapport viser hvilke søgeord brugere søgte efter, før de blev henvist til hjemmesiden. %s Klik på en række i tabellen for at se fordelingen af søgemaskiner, der blev forespurgt om søgeordet.",
-        "PluginDescription": "Rapporterer henvisningsdata: Søgemaskiner, søgeord, hjemmesider, kampagnesporing, direkte træf.",
         "Referrer": "Henviser",
         "ReferrerName": "Henvisningsnavn",
         "Referrers": "Henvisninger",
         "ReferrersOverview": "Henvisningsoversigt",
+        "ReferrerTypes": "Henvisende typer",
         "SearchEngines": "Søgemaskiner",
         "SearchEnginesDocumentation": "Besøgende blev henvist til hjemmesiden fra en søgemaskine. %s Se rapporten %s for yderligere oplysninger.",
         "SearchEnginesReportDocumentation": "Rapporten viser hvilke søgemaskiner, der henviser brugere til hjemmesiden. %s Klik på en række i tabellen for at se, hvad brugerne søgte efter ved brug af en bestemt søgemaskine.",
diff --git a/plugins/Referrers/lang/de.json b/plugins/Referrers/lang/de.json
index 8cc4e62b7e..f78e48aa22 100644
--- a/plugins/Referrers/lang/de.json
+++ b/plugins/Referrers/lang/de.json
@@ -9,7 +9,6 @@
         "ColumnSocial": "Soziales Netzwerk",
         "ColumnWebsite": "Webseite",
         "ColumnWebsitePage": "Webseiten-Seite",
-        "DetailsByReferrerType": "Details nach Verweisart",
         "DirectEntry": "Direkte Zugriffe",
         "DirectEntryDocumentation": "Ein Besucher kam auf die Webseite, indem er die URL direkt in den Browser eingegeben hat.",
         "Distinct": "Unterschiedliche Verweise nach Verweisart",
@@ -21,11 +20,12 @@
         "EvolutionDocumentationMoreInfo": "Für mehr Informationen über die verschiedenen Verweisarten, lesen Sie die Dokumentation der %s Tabelle.",
         "Keywords": "Suchbegriffe",
         "KeywordsReportDocumentation": "In diesem Bericht sehen Sie, welche Suchbegriffe Besucher in Suchmaschinen eingegeben haben, bevor Sie auf Ihre Seite geführt wurden. %s Wenn Sie auf eine Zeile der Tabelle klicken, wird die Verteilung der Suchmaschinen angezeigt, in denen nach dem Begriff gesucht wurde.",
-        "PluginDescription": "Zeigt Informationen über die Herkunft: Suchmaschinen, Suchbegriffe, Webseiten, Kampagnen, direkte Seitenaufrufe.",
+        "PluginDescription": "Liefert die Herkunft der Daten: Suchmaschinen, Suchwörter, Webseiten, Kampagnen, Social Media, Direkteintritte.",
         "Referrer": "Verweis",
         "ReferrerName": "Name des Verweises",
         "Referrers": "Verweise",
         "ReferrersOverview": "Übersicht Verweise",
+        "ReferrerTypes": "Verweistypen",
         "SearchEngines": "Suchmaschinen",
         "SearchEnginesDocumentation": "Ein Besucher kam durch eine Suchmaschine auf die Webseite. %s Der %s Bericht enthält weitere Details.",
         "SearchEnginesReportDocumentation": "Dieser Bericht zeigt Ihnen, welche Suchmaschinen Besucher auf die Webseite geführt haben. %s Wenn Sie auf eine Zeile der Tabelle klicken, werden die Suchbegriffe angezeigt, nach denen die Besucher gesucht haben.",
diff --git a/plugins/Referrers/lang/el.json b/plugins/Referrers/lang/el.json
index 889066faac..22b6d20382 100644
--- a/plugins/Referrers/lang/el.json
+++ b/plugins/Referrers/lang/el.json
@@ -9,7 +9,6 @@
         "ColumnSocial": "Κοινωνικό δίκτυο",
         "ColumnWebsite": "Ιστοσελίδα",
         "ColumnWebsitePage": "Σελίδα Ιστοσελίδας",
-        "DetailsByReferrerType": "Λεπτομέρειες για τον Τύπο Αναφορέα",
         "DirectEntry": "Απευθείας είσοδος",
         "DirectEntryDocumentation": "Ένας επισκέπτης εισήγαγε τη διεύθυνση στο φυλλομετρητή του και ξεκίνησε να περιηγείται στην ιστοσελίδα - εισήλθε στην ιστοσελίδα απευθείας.",
         "Distinct": "Διαχωρισμός Αναφορέων ανά Τύπο Αναφορέα",
@@ -21,11 +20,12 @@
         "EvolutionDocumentationMoreInfo": "Για περισσότερες πληροφορίες για τους διάφορους τύπους αναφορέων, δείτε την τεκμηρίωση του πίνακα %s.",
         "Keywords": "Λέξεις-κλειδιά",
         "KeywordsReportDocumentation": "Αυτή η αναφορά δείχνει ποιες λέξεις-κλειδιά αναζήτησαν οι χρήστες πριν έρθουν στην ιστοσελίδα. %s Πατώντας σε σε μια γραμμή στον πίνακα, μπορείτε να δείτε την κατανομή των μηχανών αναζήτησης που ερωτήθηκαν για τη λέξη-κλειδί.",
-        "PluginDescription": "Αναφέρει τα δεδομένα των Αναφορέων: Μηχανές Αναζήτησης, Λέξεις-κλειδιά, Ιστοσελίδες, Ανίχνευση Εκστρατειών, Άμεση είσοδος.",
+        "PluginDescription": "Αναφέρει δεδομένα σχετικά με τους αναφορείς: Μηχανές Αναζήτησης, Λέξεις Κλειδιά, Ιστοτόποι, Καμπάνιες, Κοινωνικά Δίκτυα, Απευθείας Είσοδοι.",
         "Referrer": "Παραπομπός",
         "ReferrerName": "Ονομασία Παραπομπού",
         "Referrers": "Αναφορείς",
         "ReferrersOverview": "Επισκόπηση Παραπομπών",
+        "ReferrerTypes": "Τύποι Αναφορών",
         "SearchEngines": "Μηχανές αναζήτησης",
         "SearchEnginesDocumentation": "Ένας επισκέπτης επισκέφτηκε την ιστοσελίδα μέσω μηχανής αναζήτησης. %s Δείτε την αναφορά %s για περισσότερες πληροφορίες.",
         "SearchEnginesReportDocumentation": "αυτή η αναφορά δείχνει ποιες μηχανές αναζήτησης ανάφεραν χρήστες στην ιστοσελίδα. %s Πατώντας σε μια γραμμή στον πίνακα, μπορείτε να δείτε τι αναζητούσαν οι χρήστες χρησιμοποιώντας μια συγκεκριμένη μηχανή αναζήτησης.",
diff --git a/plugins/Referrers/lang/en.json b/plugins/Referrers/lang/en.json
index 7002af6aae..804d02ef5a 100644
--- a/plugins/Referrers/lang/en.json
+++ b/plugins/Referrers/lang/en.json
@@ -9,7 +9,6 @@
         "ColumnSocial": "Social network",
         "ColumnWebsite": "Website",
         "ColumnWebsitePage": "Website Page",
-        "DetailsByReferrerType": "Details by Referrer Type",
         "DirectEntry": "Direct Entry",
         "DirectEntryDocumentation": "A visitor has entered the URL in his browser and started browsing on your website - he entered the website directly.",
         "Distinct": "Distinct Referrers by Referrer Type",
@@ -21,11 +20,12 @@
         "EvolutionDocumentationMoreInfo": "For more information about the different referrer types, see the documentation of the %s table.",
         "Keywords": "Keywords",
         "KeywordsReportDocumentation": "This report shows which keywords users were searching for before they were referred to your website. %s By clicking on a row in the table, you can see the distribution of search engines that were queried for the keyword.",
-        "PluginDescription": "Reports the Referrers data: Search Engines, Keywords, Websites, Campaign Tracking, Direct Entry.",
+        "PluginDescription": "Reports the Referrers data: Search Engines, Keywords, Websites, Campaigns, Social media, Direct entry.",
         "Referrer": "Referrer",
         "ReferrerName": "Referrer Name",
         "Referrers": "Referrers",
         "ReferrersOverview": "Referrers Overview",
+        "ReferrerTypes": "Referrer Types",
         "SearchEngines": "Search Engines",
         "SearchEnginesDocumentation": "A visitor was referred to your website by a search engine. %s See the %s report for more details.",
         "SearchEnginesReportDocumentation": "This report shows which search engines referred users to your website. %s By clicking on a row in the table, you can see what users were searching for using a specific search engine.",
diff --git a/plugins/Referrers/lang/es.json b/plugins/Referrers/lang/es.json
index 4195578d6a..62eeb60962 100644
--- a/plugins/Referrers/lang/es.json
+++ b/plugins/Referrers/lang/es.json
@@ -9,7 +9,6 @@
         "ColumnSocial": "Red social",
         "ColumnWebsite": "Sitio web",
         "ColumnWebsitePage": "Página web",
-        "DetailsByReferrerType": "Detalles por tipo de referencia",
         "DirectEntry": "Entrada directa",
         "DirectEntryDocumentation": "Un visitante ha ingresado la dirección de internet en su navegador y comenzó a navegar en su sitio de internet - él ingresó en su sitio de internet directamente.",
         "Distinct": "Distintas referencias por tipo de referencia",
@@ -21,7 +20,6 @@
         "EvolutionDocumentationMoreInfo": "Para más información sobre los diferentes tipos de páginas web externas, vea la documentación de la tabla %s.",
         "Keywords": "Palabras clave",
         "KeywordsReportDocumentation": "Este informe revela que palabras claves estuvieron buscando antes de ingresar en su sitio de internet. %s Cliqueando en la tabla, puede observar la distribución de los motores de búsqueda en la búsqueda de dichas palabras claves.",
-        "PluginDescription": "Reporte los datos de las Referencias: Motores de búsqueda, Palabras Clave, Sitios, Campañas, Entrada Directa.",
         "Referrer": "Referencias",
         "ReferrerName": "Nombre de la referencia",
         "Referrers": "Referencias",
diff --git a/plugins/Referrers/lang/et.json b/plugins/Referrers/lang/et.json
index 5092379dc8..f2d0d0dc8a 100644
--- a/plugins/Referrers/lang/et.json
+++ b/plugins/Referrers/lang/et.json
@@ -6,7 +6,6 @@
         "ColumnSocial": "Sotsiaalvõrgustik",
         "ColumnWebsite": "Veebileht",
         "ColumnWebsitePage": "Veebi lehekülg",
-        "DetailsByReferrerType": "Detailid viitaja tüübi alusel",
         "DirectEntry": "Otse sisenetud",
         "Keywords": "Võtmesõnad",
         "Referrer": "Viitaja",
diff --git a/plugins/Referrers/lang/eu.json b/plugins/Referrers/lang/eu.json
index 470f62c35e..bbf285324a 100644
--- a/plugins/Referrers/lang/eu.json
+++ b/plugins/Referrers/lang/eu.json
@@ -5,7 +5,6 @@
         "ColumnSearchEngine": "Bilaketa-motorra",
         "ColumnWebsite": "Webgunea",
         "ColumnWebsitePage": "Webguneko orria",
-        "DetailsByReferrerType": "Xehetasunak erreferente motako",
         "DirectEntry": "Sarrera zuzena",
         "Distinct": "Erreferente desberdinak erreferente motagatik",
         "DistinctCampaigns": "kanpaina desberdin",
diff --git a/plugins/Referrers/lang/fa.json b/plugins/Referrers/lang/fa.json
index 151d508d46..59017db103 100644
--- a/plugins/Referrers/lang/fa.json
+++ b/plugins/Referrers/lang/fa.json
@@ -6,7 +6,6 @@
         "ColumnSocial": "شبکه اجتماعی",
         "ColumnWebsite": "وب سایت",
         "ColumnWebsitePage": "صفحه وب سایت",
-        "DetailsByReferrerType": "جزئیات براساس نوع ارجاع دهنده",
         "DirectEntry": "ورود مستقیم",
         "DirectEntryDocumentation": "تا به بازدید کننده، URL در مرورگر خود وارد و شروع به در حال دیدن سایت بر روی وب سایت خود را - که وارد وب سایت به طور مستقیم.",
         "Distinct": "معرف های متمایز براساس نوع ارجاع دهنده",
@@ -17,7 +16,6 @@
         "EvolutionDocumentation": "این یک مرور کلی از مراجعه کنندگان که منجر بازدید کنندگان وب سایت شما می باشد.",
         "EvolutionDocumentationMoreInfo": "برای اطلاعات بیشتر درباره ی انواع ارجاه دهنده های مختلف , مستندات جدول %s را ببینید.",
         "Keywords": "کلمات کلیدی",
-        "PluginDescription": "گزارش داده ها معرف: موتورهای جستجو، کلمات کلیدی، وب سایت ها، ردیابی کمپین بین المللی حقوق بشر، ورود مستقیم.",
         "Referrer": "معرف",
         "ReferrerName": "نام و نام خانوادگی ارجاع دهنده",
         "Referrers": "ارجاع دهنده ها",
diff --git a/plugins/Referrers/lang/fi.json b/plugins/Referrers/lang/fi.json
index 4a48e596d2..db69f331d8 100644
--- a/plugins/Referrers/lang/fi.json
+++ b/plugins/Referrers/lang/fi.json
@@ -9,7 +9,6 @@
         "ColumnSocial": "Sosiaalinen verkosto",
         "ColumnWebsite": "Verkkosivu",
         "ColumnWebsitePage": "Verkkosivu",
-        "DetailsByReferrerType": "Tiedot viittajan tyypin mukaan",
         "DirectEntry": "Suoraan",
         "DirectEntryDocumentation": "Kävijä kirjoitti sivusi osoitteen selaimeensa - hän tuli sivuille suoraan.",
         "Distinct": "Yksilöllisiä viittaajia viittaustyypin mukaan",
@@ -21,7 +20,6 @@
         "EvolutionDocumentationMoreInfo": "Löydät lisätietoja erilaisista viittaustyypeistä taulun %s dokumentaatiosta.",
         "Keywords": "Hakusanat",
         "KeywordsReportDocumentation": "Tämä rapotti näyttää, millä hakusanoilla kävijät tulivat sivuillesi. %s Näet hakukoneiden määrän klikkaamalla hakusanaa.",
-        "PluginDescription": "Raportit viittaajista: hakukone, hakusana, verkkosivu, kampanjat, suoraan saapuneet",
         "Referrer": "Viittaukset",
         "ReferrerName": "Viittauksen nimi",
         "Referrers": "Viittaajat",
diff --git a/plugins/Referrers/lang/fr.json b/plugins/Referrers/lang/fr.json
index 9b96707037..aeeac4703f 100644
--- a/plugins/Referrers/lang/fr.json
+++ b/plugins/Referrers/lang/fr.json
@@ -9,7 +9,6 @@
         "ColumnSocial": "Réseaux sociaux",
         "ColumnWebsite": "Site Web",
         "ColumnWebsitePage": "Page du site",
-        "DetailsByReferrerType": "Détails de types d'acquisitions",
         "DirectEntry": "Entrées directes",
         "DirectEntryDocumentation": "Un visiteur a entré directement l'URL du site web dans son navigateur et a commencé à parcourir votre site web - il est entré directement sur le site web.",
         "Distinct": "Provenances distinctes par type de Provenance",
@@ -21,7 +20,6 @@
         "EvolutionDocumentationMoreInfo": "Pour plus d'informations sur les différents types de référents, consultez la documentation du tableau %s.",
         "Keywords": "Mots-clés",
         "KeywordsReportDocumentation": "Ce rapport affiche quels mots-clés les utilisateurs recherchaient avant d'être conduit sur votre site web. %s En cliquant sur une ligne vous pouvez visualiser la distribution des moteurs de recherche qui ont été utilisés pour le mot-clé.",
-        "PluginDescription": "Effectue des rapports sur les données des référents : moteurs de recherche, mots-clés, sites web, suivi de campagne, entrée directe.",
         "Referrer": "Réfèrent",
         "ReferrerName": "Nom du référent",
         "Referrers": "Référents",
diff --git a/plugins/Referrers/lang/hi.json b/plugins/Referrers/lang/hi.json
index 66b054d7b7..131e5bcd05 100644
--- a/plugins/Referrers/lang/hi.json
+++ b/plugins/Referrers/lang/hi.json
@@ -9,7 +9,6 @@
         "ColumnSocial": "सामाजिक संजाल",
         "ColumnWebsite": "वेबसाइट",
         "ColumnWebsitePage": "वेबसाइट के पेज",
-        "DetailsByReferrerType": "संदर्भ प्रकार से विवरण",
         "DirectEntry": "प्रत्यक्ष प्रवेश",
         "DirectEntryDocumentation": "एक आगंतुक अपने ब्राउज़र में URL दर्ज किया है और आपकी वेबसाइट पर ब्राउज़िंग शुरू कर दी है - उन्होंने सीधे वेबसाइट में प्रवेश किया.",
         "Distinct": "संदर्भ प्रकार से अलग सन्दर्भदाता",
@@ -21,7 +20,6 @@
         "EvolutionDocumentationMoreInfo": "अलग संदर्भ प्रकार के बारे में अधिक जानकारी के लिए, %sतालिका के दस्तावेज़ देखें.",
         "Keywords": "खोजशब्द",
         "KeywordsReportDocumentation": "यह रिपोर्ट कि वे आपकी वेबसाइट पर निर्दिष्ट किये जाने से पहले उपयोगकर्ताओं द्वारा खोजे जा रहे कीवर्ड दिखाता है तालिका में एक पंक्ति पर %s क्लिक करते हुए आप कीवर्ड की पूछा था कि खोज इंजन का वितरण देख सकते हैं.",
-        "PluginDescription": "खोज इंजन, कीवर्ड, वेबसाइट, अभियान ट्रैकिंग, डायरेक्ट एंट्री: सन्दर्भदाता डेटा की रिपोर्ट.",
         "Referrer": "संदर्भ",
         "ReferrerName": "संदर्भ का नाम",
         "Referrers": "सन्दर्भदाता",
diff --git a/plugins/Referrers/lang/hu.json b/plugins/Referrers/lang/hu.json
index f50737643e..db1c7868a9 100644
--- a/plugins/Referrers/lang/hu.json
+++ b/plugins/Referrers/lang/hu.json
@@ -5,7 +5,6 @@
         "ColumnSearchEngine": "Keresőoldal",
         "ColumnWebsite": "Weboldal",
         "ColumnWebsitePage": "Weboldal weblapja",
-        "DetailsByReferrerType": "Forgalmi források szerinti részletes adatok",
         "DirectEntry": "Közvetlen látogatás",
         "Distinct": "Különböző források a forgalmi forrás típus szerint",
         "DistinctCampaigns": "különböző kampány",
@@ -13,7 +12,6 @@
         "DistinctSearchEngines": "különböző keresőoldal",
         "DistinctWebsites": "különböző weboldal",
         "Keywords": "Kulcsszavak",
-        "PluginDescription": "Jelentések a látogatások forrásáról és a hivatkozó weboldalakról (a böngészők által továbbított Referrer adatok segítségével): keresőoldalakról, kulcsszavakról, weboldalakról, kampányokról, direkt látogatásokról.",
         "Referrers": "Források",
         "SearchEngines": "Keresőoldalak",
         "SubmenuSearchEngines": "Keresőoldalak és kulcsszavak",
diff --git a/plugins/Referrers/lang/id.json b/plugins/Referrers/lang/id.json
index 1b16e4ef98..71e6d93f81 100644
--- a/plugins/Referrers/lang/id.json
+++ b/plugins/Referrers/lang/id.json
@@ -9,7 +9,6 @@
         "ColumnSocial": "Jejaring Sosial",
         "ColumnWebsite": "Situs",
         "ColumnWebsitePage": "Halaman Situs",
-        "DetailsByReferrerType": "Selengkapnya berdasarkan Jenis Pengarah",
         "DirectEntry": "Masukan Langsung",
         "DirectEntryDocumentation": "Pengunjung telah memasukkan URL di peramban dan mulai menjelajah ke situs Anda - pengunjung tersebut mengunjungi situs secara langsung.",
         "Distinct": "Pengarah Berbeda berdasarkan Jenis Pengarah",
@@ -21,7 +20,6 @@
         "EvolutionDocumentationMoreInfo": "Informasi selengkapnya tentang jenis lainnya, lihat dokumentasi tentang tabel %s.",
         "Keywords": "Kata Kunci",
         "KeywordsReportDocumentation": "Laporan ini menampilkan kata kunci yang pengguna gunakan saat pencarian sebelum diarahkan ke situs Anda. %s Dengan mengeklik baris dalam tabel, Anda dapat mengetahui penyebaran permintaan mesin pencari atas kata kunci tersebut.",
-        "PluginDescription": "Laporan data Pengarah: Mesin Pencari, Kata kunci, Situs, Kampanye Pelacakan, Masukan Langsung.",
         "Referrer": "Pengarah",
         "ReferrerName": "Nama Pengarah",
         "Referrers": "Pengarah",
diff --git a/plugins/Referrers/lang/is.json b/plugins/Referrers/lang/is.json
index 6e22352a63..2176e68f6c 100644
--- a/plugins/Referrers/lang/is.json
+++ b/plugins/Referrers/lang/is.json
@@ -5,7 +5,6 @@
         "ColumnSearchEngine": "Leitarvél",
         "ColumnWebsite": "Vefur",
         "ColumnWebsitePage": "Vefsíða",
-        "DetailsByReferrerType": "Smáatriði eftir Tegund Sendanda",
         "DirectEntry": "Beinar Innfærslur",
         "Distinct": "Mismundandi Sendendur eftir Tegund Sendanda",
         "DistinctCampaigns": "mismunandi herferðir",
@@ -13,7 +12,6 @@
         "DistinctSearchEngines": "mismunandi leitarvélar",
         "DistinctWebsites": "mismunandi vefir",
         "Keywords": "Leitarorð",
-        "PluginDescription": "Gefur skýrslu um sendendur: Leitarvélar, Leitarorð, Vefi, rekja herferð, bein innfærsla.",
         "Referrers": "Sendendur",
         "SearchEngines": "Leitarvélar",
         "SubmenuSearchEngines": "Leitarvélar & Leitarorð",
diff --git a/plugins/Referrers/lang/it.json b/plugins/Referrers/lang/it.json
index ab54451f3f..4bcf0bcf31 100644
--- a/plugins/Referrers/lang/it.json
+++ b/plugins/Referrers/lang/it.json
@@ -9,7 +9,6 @@
         "ColumnSocial": "Social network",
         "ColumnWebsite": "Sito web",
         "ColumnWebsitePage": "Pagina",
-        "DetailsByReferrerType": "Dettagli per tipo di referente",
         "DirectEntry": "Ingressi Diretti",
         "DirectEntryDocumentation": "Un visitatore ha inserito l'URL nel proprio browser e ha iniziato la navigazione sul tuo sito web - è entrato direttamente al sito.",
         "Distinct": "Referenti distinti per tipo",
@@ -21,11 +20,12 @@
         "EvolutionDocumentationMoreInfo": "Per ulteriori informazioni sui diversi tipi referenti, consulta la documentazione della%s tabella.",
         "Keywords": "Parole chiave",
         "KeywordsReportDocumentation": "Questo report mostra le parole chiave che gli utenti hanno ricercato prima prima di venire indirizzati sul tuo sito web. %s Cliccando su una riga della tabella, è possibile vedere la distribuzione dei motori di ricerca che sono stati interrogati per la parola chiave.",
-        "PluginDescription": "Riporta i dati dei referer: Motori di ricerca, Parole chiave, siti web, tracciamento campagne, entrate dirette.",
+        "PluginDescription": "Restituisce i dati dei Referrer: Motori di Ricerca, Keywords, Siti, Campagne, Social media, Ingressi diretti.",
         "Referrer": "Referente",
         "ReferrerName": "Nome Referente",
         "Referrers": "Referenti",
         "ReferrersOverview": "Panoramica Referenti",
+        "ReferrerTypes": "Tipi di Referer",
         "SearchEngines": "Motori di ricerca",
         "SearchEnginesDocumentation": "Un visitatore è stato portato sul tuo sito da un motore di ricerca. %s Vedi il %s report per maggiori dettagli.",
         "SearchEnginesReportDocumentation": "Questo report mostra quali motori di ricerca dhanno portato gli utenti sull tuo sito web. %s Cliccando su una riga della tabella è possibile vedere ciò che gli utenti stavano cercando utilizzando un determinato motore di ricerca.",
diff --git a/plugins/Referrers/lang/ja.json b/plugins/Referrers/lang/ja.json
index 68f22764dd..29b7374b8e 100644
--- a/plugins/Referrers/lang/ja.json
+++ b/plugins/Referrers/lang/ja.json
@@ -9,7 +9,6 @@
         "ColumnSocial": "ソーシャルネットワーク",
         "ColumnWebsite": "ウェブサイト",
         "ColumnWebsitePage": "ウェブサイトページ",
-        "DetailsByReferrerType": "参照元タイプごとの詳細",
         "DirectEntry": "直接アクセス",
         "DirectEntryDocumentation": "ブラウザにURLを入力して、ウェブサイトの閲覧を開始したビジター - 直接ウェブサイトを見に来た。",
         "Distinct": "参照元タイプごとの個別参照元",
@@ -21,7 +20,6 @@
         "EvolutionDocumentationMoreInfo": "異なる参照元の種類についての詳細は、 %s 表のドキュメントを参照してください。",
         "Keywords": "キーワード",
         "KeywordsReportDocumentation": "このリポートは、ユーザーがウェブサイトをビジットするのに使用した検索したキーワードを示します。 %s テーブル内の行をクリックすると、キーワードに対して照会された検索エンジンの分布を見ることができます。",
-        "PluginDescription": "検索エンジン、キーワード、ウェブサイト、キャンペーントラッキング、直接アクセスの参照元データをリポートします。",
         "Referrer": "参照元",
         "ReferrerName": "参照元の名称",
         "Referrers": "参照元",
diff --git a/plugins/Referrers/lang/ka.json b/plugins/Referrers/lang/ka.json
index ef088d5607..76f77dd90d 100644
--- a/plugins/Referrers/lang/ka.json
+++ b/plugins/Referrers/lang/ka.json
@@ -5,7 +5,6 @@
         "ColumnSearchEngine": "საძიებო სისტემა",
         "ColumnWebsite": "ვებ საიტი",
         "ColumnWebsitePage": "ვებ საიტის გვერდი",
-        "DetailsByReferrerType": "დეტალები რეფერერის ტიპის მიხედვით",
         "DirectEntry": "პირდაპირი შესვლა",
         "Distinct": "განსხვავებული რეფერერები რეფერერების ტიპის მიხედვით",
         "DistinctCampaigns": "განსხვავებული კამპანიები",
@@ -13,7 +12,6 @@
         "DistinctSearchEngines": "განსხვავებული საძიებო სისტემები",
         "DistinctWebsites": "განსხვავებული ვებ საიტები",
         "Keywords": "საკვანძო სიტყვები",
-        "PluginDescription": "აკეთებს ანგარიშს რეფერერების მონაცემებზე: საძიებო სისტემები, საკვანძო სიტყვები, ვებ საიტები, ტრეკირების კამპანია, პირდაპირი შესვლა.",
         "Referrers": "რეფერერები",
         "SearchEngines": "საძიებო სისტემები",
         "SubmenuSearchEngines": "საძიებო სისტემები და საკვანძო სიტყვები",
diff --git a/plugins/Referrers/lang/ko.json b/plugins/Referrers/lang/ko.json
index cb2140f0be..f5f309c895 100644
--- a/plugins/Referrers/lang/ko.json
+++ b/plugins/Referrers/lang/ko.json
@@ -9,7 +9,6 @@
         "ColumnSocial": "소셜 네트워크",
         "ColumnWebsite": "웹사이트",
         "ColumnWebsitePage": "웹사이트 페이지",
-        "DetailsByReferrerType": "리퍼러 타입에 의한 세부사항",
         "DirectEntry": "직접 입력",
         "DirectEntryDocumentation": "브라우저에 URL을 입력하여 웹사이트 검색을 시작한 방문자 - 직접 입력하여 웹사이트를 방문했습다.",
         "Distinct": "리퍼러 타입에 의한 고유 리퍼러",
@@ -21,7 +20,6 @@
         "EvolutionDocumentationMoreInfo": "다른 참조 유형에 대한 자세한 내용은 %s 테이블의 문서를 참조하세요.",
         "Keywords": "검색어",
         "KeywordsReportDocumentation": "이 보고서는 사용자가 웹사이트를 방문하는 데 사용하는 검색어를 나타냅니다. %s 테이블의 행을 클릭하면 검색어에 조회된 검색 엔진의 분포를 볼 수 있습니다.",
-        "PluginDescription": "검색 엔진, 검색어, 웹사이트, 캠페인 추적, 직접 액세스 소스 데이터를 보고합니다.",
         "Referrer": "리퍼러",
         "ReferrerName": "리퍼러 이름",
         "Referrers": "참조",
diff --git a/plugins/Referrers/lang/lt.json b/plugins/Referrers/lang/lt.json
index c1b5d69702..fba457a0f1 100644
--- a/plugins/Referrers/lang/lt.json
+++ b/plugins/Referrers/lang/lt.json
@@ -5,7 +5,6 @@
         "ColumnSearchEngine": "Paieškos sistema",
         "ColumnWebsite": "Svetainė",
         "ColumnWebsitePage": "Svetainės puslapis",
-        "DetailsByReferrerType": "Duomenys pagal šaltinio tipą",
         "DirectEntry": "Tiesioginis apsilankymas",
         "Distinct": "Atskirti šaltinius pagal tipą",
         "DistinctCampaigns": "atskirti kampanijas",
@@ -13,7 +12,6 @@
         "DistinctSearchEngines": "atskirti paieškos sistemas",
         "DistinctWebsites": "atskirti svetaines",
         "Keywords": "Raktiniai žodžiai",
-        "PluginDescription": "Nurodo šaltinio duomenis: paieškos variklius, raktinius žodžius, svetaines, tiesioginius apsilankymus ir t.t.",
         "ReferrerName": "Šaltinio pavadinimas",
         "Referrers": "Šaltiniai",
         "SearchEngines": "Paieškos sistemos",
diff --git a/plugins/Referrers/lang/lv.json b/plugins/Referrers/lang/lv.json
index 19367c0bbe..912441a8b2 100644
--- a/plugins/Referrers/lang/lv.json
+++ b/plugins/Referrers/lang/lv.json
@@ -5,7 +5,6 @@
         "ColumnSearchEngine": "Meklēšanas dzinējs",
         "ColumnWebsite": "Vietne",
         "ColumnWebsitePage": "Vietnes lapa",
-        "DetailsByReferrerType": "Detaļas pēc referera tipa",
         "DirectEntry": "Tiešā ieeja",
         "Keywords": "Atslēgvārdi",
         "ReferrerName": "Referera nosaukums",
diff --git a/plugins/Referrers/lang/nb.json b/plugins/Referrers/lang/nb.json
index 55ff4d3907..d4751641d6 100644
--- a/plugins/Referrers/lang/nb.json
+++ b/plugins/Referrers/lang/nb.json
@@ -6,7 +6,6 @@
         "ColumnSocial": "Sosiale nettverk",
         "ColumnWebsite": "Nettsted",
         "ColumnWebsitePage": "Nettside",
-        "DetailsByReferrerType": "Detaljer etter henvisningstype",
         "DirectEntry": "Direkte treff",
         "Distinct": "Ulike henvisere etter henvisningstype",
         "DistinctCampaigns": "ulike kampanjer",
@@ -14,7 +13,6 @@
         "DistinctSearchEngines": "ulike søkemotorer",
         "DistinctWebsites": "ulike nettsteder",
         "Keywords": "Nøkkelord",
-        "PluginDescription": "Rapporterer henviserdata: Søkemotorer, nøkkelord, nettsteder, kampanjesporing, direkte inngang.",
         "Referrers": "Henvisere",
         "SearchEngines": "Søkemotorer",
         "Socials": "Sosiale nettverk",
@@ -28,6 +26,7 @@
         "UsingNDistinctUrls": "(bruker %s forskjellige URL-er)",
         "Websites": "Nettsteder",
         "WidgetExternalWebsites": "Liste over eksterne nettsteder",
-        "WidgetSocials": "Liste over sosiale nettverk"
+        "WidgetSocials": "Liste over sosiale nettverk",
+        "XPercentOfVisits": "%s%% av besøk"
     }
 }
\ No newline at end of file
diff --git a/plugins/Referrers/lang/nl.json b/plugins/Referrers/lang/nl.json
index 0ccceff47a..47f630f3df 100644
--- a/plugins/Referrers/lang/nl.json
+++ b/plugins/Referrers/lang/nl.json
@@ -8,7 +8,6 @@
         "ColumnSocial": "Sociaal netwerk",
         "ColumnWebsite": "Website",
         "ColumnWebsitePage": "Website pagina",
-        "DetailsByReferrerType": "Details volgens bezoekers afkomst",
         "DirectEntry": "Direct bezoek",
         "DirectEntryDocumentation": "Een bezoeker heeft de URL in zijn browser ingevoerd en is direct op uw website uitgekomen.",
         "Distinct": "Verschillende bezoekers volgens bezoekers herkomst",
@@ -20,7 +19,6 @@
         "EvolutionDocumentationMoreInfo": "Voor meer informatie over de verschillende soorten verwijzingen, zie de documentatie van de %s tabel.",
         "Keywords": "Zoektermen",
         "KeywordsReportDocumentation": "Dit rapport toont de sleutelwoorden waarop men zocht en waarbij men werd doorverwezen naar uw website. %s Door op een rij in de tabel te klikken kunt u de verdeling van de zoekmachines zien die op deze sleutelwoorden naar uw website hebben doorverwezen.",
-        "PluginDescription": "Rapporteert de referers data: zoekmachines, sleutelwoorden, websites, Campagne Tracking, directe toegang.",
         "Referrer": "Referer",
         "ReferrerName": "Verwijzer Naam",
         "Referrers": "Herkomst",
diff --git a/plugins/Referrers/lang/nn.json b/plugins/Referrers/lang/nn.json
index d7e53e43d6..922082eb09 100644
--- a/plugins/Referrers/lang/nn.json
+++ b/plugins/Referrers/lang/nn.json
@@ -5,7 +5,6 @@
         "ColumnSearchEngine": "Søkjemotor",
         "ColumnWebsite": "Nettstad",
         "ColumnWebsitePage": "Nettstadside",
-        "DetailsByReferrerType": "Detaljar sortert etter referansetype",
         "DirectEntry": "Direkte vitjing",
         "Distinct": "Distinkte referansar etter referansetype",
         "DistinctCampaigns": "distinkte kampanjar",
diff --git a/plugins/Referrers/lang/pl.json b/plugins/Referrers/lang/pl.json
index 7abb29063a..a8f3ac70e6 100644
--- a/plugins/Referrers/lang/pl.json
+++ b/plugins/Referrers/lang/pl.json
@@ -5,7 +5,6 @@
         "ColumnSearchEngine": "Wyszukiwarka",
         "ColumnWebsite": "Strona",
         "ColumnWebsitePage": "Pojedyncza strona",
-        "DetailsByReferrerType": "Szczegóły według typu odsyłaczy",
         "DirectEntry": "wejścia bezpośrednie",
         "Distinct": "Wyróżnione odsyłacze według ich typu",
         "DistinctCampaigns": "wyróżnione kampanie",
@@ -13,7 +12,6 @@
         "DistinctSearchEngines": "Wyróżnione wyszukiwarki",
         "DistinctWebsites": "wyróżnione serwisy internetowe",
         "Keywords": "Słowa kluczowe",
-        "PluginDescription": "Raporty danych z odsyłaczy: wyszukiwarek, słów kluczowych, stron, śledzenia kampanii reklamowych, wejść bezpośrednich.",
         "ReferrerName": "Nazwa odsyłacza",
         "Referrers": "Odsyłacze",
         "SearchEngines": "Wyszukiwarki",
diff --git a/plugins/Referrers/lang/pt-br.json b/plugins/Referrers/lang/pt-br.json
index b34a1dcf49..e4e323ffd4 100644
--- a/plugins/Referrers/lang/pt-br.json
+++ b/plugins/Referrers/lang/pt-br.json
@@ -9,7 +9,6 @@
         "ColumnSocial": "Rede social",
         "ColumnWebsite": "Website",
         "ColumnWebsitePage": "Página da Web",
-        "DetailsByReferrerType": "Detalhes por tipo de encaminhador",
         "DirectEntry": "Entrada Direta",
         "DirectEntryDocumentation": "Um visitante entrou a URL no seu navegador e começou a navegar em seu site - ele entrou no site diretamente.",
         "Distinct": "Encaminhadores distintos por tipo de encaminhador",
@@ -21,7 +20,6 @@
         "EvolutionDocumentationMoreInfo": "Para mais informações sobre os tipos encaminhadores diferentes, consulte a documentação da tabela %s.",
         "Keywords": "Palavras Chaves",
         "KeywordsReportDocumentation": "Este relatório mostra quais palavras-chave os usuários estavam procurando antes de eles serem encaminhados para o seu site. %s Ao clicar em uma linha na tabela, você pode ver a distribuição dos motores de busca, que foram consultados para a palavra-chave.",
-        "PluginDescription": "Relata os dados referentes: mecanismos de pesquisa, palavras-chave, websites, campanha de rastreamento, entrada direta.",
         "Referrer": "Encaminhador",
         "ReferrerName": "Nome do encaminhador",
         "Referrers": "Encaminhadores",
diff --git a/plugins/Referrers/lang/pt.json b/plugins/Referrers/lang/pt.json
index 82705f6a56..78080e4748 100644
--- a/plugins/Referrers/lang/pt.json
+++ b/plugins/Referrers/lang/pt.json
@@ -7,7 +7,6 @@
         "ColumnSearchEngine": "Motor de Busca",
         "ColumnWebsite": "Website",
         "ColumnWebsitePage": "Página do Website",
-        "DetailsByReferrerType": "Detalhes por Tipo de Referente",
         "DirectEntry": "Entrada Direta",
         "DirectEntryDocumentation": "O visitante entrou directamente no seu website ao introduzir o endereço do website directamente no browser.",
         "Distinct": "Referentes Distintos por Tipo de Referente",
@@ -19,7 +18,6 @@
         "EvolutionDocumentationMoreInfo": "Para mais informações sobre diferentes tipos de referentes, veja a documentação da %s tabela.",
         "Keywords": "Palavras Chave",
         "KeywordsReportDocumentation": "Este relatório mostra quais as palavras-chave que o visitantes pesquisaram antes de ser referenciados para o seu website. %s Ao clicar numa linha da tabela pode ver a distribuição de motores de pesquisa que foram utilizados na pesquisa pela palavra-chave.",
-        "PluginDescription": "Relata os dados dos Referentes: Motores de Busca, Palavras-Chave, Websites, Campanhas, Entrada Directa.",
         "ReferrerName": "Nome do referente",
         "Referrers": "Referentes",
         "SearchEngines": "Motores de Busca",
diff --git a/plugins/Referrers/lang/ro.json b/plugins/Referrers/lang/ro.json
index 190abba976..e3e0b4e60d 100644
--- a/plugins/Referrers/lang/ro.json
+++ b/plugins/Referrers/lang/ro.json
@@ -9,7 +9,6 @@
         "ColumnSocial": "Reţea socială",
         "ColumnWebsite": "Site web",
         "ColumnWebsitePage": "Pagina Site Web",
-        "DetailsByReferrerType": "Detalii de tipul referal",
         "DirectEntry": "Intrare directă",
         "DirectEntryDocumentation": "Un vizitator a intrat pe URL-ul din browser-ul său și a început sa navigheze pe site-ul tau - a introdus websitul direct .",
         "Distinct": "Districte de referali de tipul referal",
@@ -21,7 +20,6 @@
         "EvolutionDocumentationMoreInfo": "Pentru mai multe informații despre diferitele tipuri de referali, consultați documentația de masa %s.",
         "Keywords": "Cuvinte-cheie",
         "KeywordsReportDocumentation": "Acest raport arată cuvintele cheie cu care utilizatorii au fost căutați pentru înainte de sa fie menționati la site-ul dumneavoastră. %s Făcând clic pe un rând din tabel, puteți vedea distribuția de motoare de căutare care au fost interogate pentru cuvântul cheie.",
-        "PluginDescription": "Rapoarte Referenți date: motoarele de căutare, cuvinte cheie, site-uri, campanie de urmărire, de intrare directă.",
         "Referrer": "referal",
         "ReferrerName": "Nume referal",
         "Referrers": "Referinte",
diff --git a/plugins/Referrers/lang/ru.json b/plugins/Referrers/lang/ru.json
index 11f7f5d041..8866a19deb 100644
--- a/plugins/Referrers/lang/ru.json
+++ b/plugins/Referrers/lang/ru.json
@@ -8,7 +8,6 @@
         "ColumnSocial": "Страница социальной сети",
         "ColumnWebsite": "Сайт",
         "ColumnWebsitePage": "Страница сайта",
-        "DetailsByReferrerType": "Детали по типу источника",
         "DirectEntry": "Прямой вход",
         "DirectEntryDocumentation": "Посетитель перешел на ваш сайт по ссылке, вбив ее в адресую строку браузера или по закладке, что называется прямым переходом.",
         "Distinct": "Различные источники по типу",
@@ -20,11 +19,11 @@
         "EvolutionDocumentationMoreInfo": "Больше информации о различных типах источников см. в документации по таблице %s.",
         "Keywords": "Ключевые слова",
         "KeywordsReportDocumentation": "Этот отчет показывает ключевые слова, которые посетители ващего сайта вводили в поисковике, прежде чем попасть на ваш сайт. %s Кликнув на конкретный ряд таблицы, вы увидите распределение ключевого слова по поисковым системам.",
-        "PluginDescription": "Отображает данные о источниках трафика: поисковые движки, ключевые слова, сайты, входы с кампаний и прямые входы.",
         "Referrer": "Источник",
         "ReferrerName": "Имя источника",
         "Referrers": "Источники трафика",
         "ReferrersOverview": "Обзор источников",
+        "ReferrerTypes": "Типы источника",
         "SearchEngines": "Поисковые движки",
         "SearchEnginesDocumentation": "Посетитель перешел на ваш сайт с поисковой системы. %s Детальная информация в отчете %s.",
         "SearchEnginesReportDocumentation": "Этот отчет показывает, с каких поисковых систем пришли посетители. %s Кликнув на конкретный ряд таблицы, вы увидите, что посетитель искал в поисковой систем и что привело его на ваш сайт.",
@@ -47,6 +46,7 @@
         "WidgetExternalWebsites": "Внешние сайты",
         "WidgetGetAll": "Все источники трафика",
         "WidgetSocials": "Список социальных сетей",
-        "WidgetTopKeywordsForPages": "Топ ключевых слов для страницы URL"
+        "WidgetTopKeywordsForPages": "Топ ключевых слов для страницы URL",
+        "XPercentOfVisits": "%s%% посещений"
     }
 }
\ No newline at end of file
diff --git a/plugins/Referrers/lang/sk.json b/plugins/Referrers/lang/sk.json
index 37722392d0..787ca27887 100644
--- a/plugins/Referrers/lang/sk.json
+++ b/plugins/Referrers/lang/sk.json
@@ -5,7 +5,6 @@
         "ColumnSearchEngine": "Vyhľadávač",
         "ColumnWebsite": "Portál",
         "ColumnWebsitePage": "Stránka portálu",
-        "DetailsByReferrerType": "Detaily za typ odkazu",
         "DirectEntry": "Priamy vstup",
         "Distinct": "Rozlíšiť odkazy podľa typu odkazu",
         "DistinctCampaigns": "rôzne kampane",
@@ -13,7 +12,6 @@
         "DistinctSearchEngines": "rôzne vyhľadávače",
         "DistinctWebsites": "rôzne portály",
         "Keywords": "Kľúčové slová",
-        "PluginDescription": "Report o odkazoch: Vyhľadávače, Kľúčové slová, webové stránky, monitorovanie kampaní, priamy vstup.",
         "Referrers": "Odkazy",
         "SearchEngines": "Vyhľadávače",
         "SubmenuSearchEngines": "Vyhľadávače a kľúčové slová",
diff --git a/plugins/Referrers/lang/sl.json b/plugins/Referrers/lang/sl.json
index 2dd46f6be1..a7236c81b6 100644
--- a/plugins/Referrers/lang/sl.json
+++ b/plugins/Referrers/lang/sl.json
@@ -6,7 +6,6 @@
         "ColumnSocial": "Družbeno omrežje",
         "ColumnWebsite": "Spletna stran",
         "ColumnWebsitePage": "Spletna stran",
-        "DetailsByReferrerType": "Podrobnosti o tipu napotitelja",
         "DirectEntry": "Neposreden obisk",
         "Distinct": "Različnih napotiteljev po tipu",
         "DistinctCampaigns": "različne kampanje",
diff --git a/plugins/Referrers/lang/sq.json b/plugins/Referrers/lang/sq.json
index b987a40da8..c794b02232 100644
--- a/plugins/Referrers/lang/sq.json
+++ b/plugins/Referrers/lang/sq.json
@@ -7,7 +7,6 @@
         "ColumnSearchEngine": "Motorë Kërkimesh",
         "ColumnWebsite": "\"Site\" Web",
         "ColumnWebsitePage": "Faqe \"site\"-i Web",
-        "DetailsByReferrerType": "Hollësi sipas Llojit të Referuesit",
         "DirectEntry": "Zë i Drejtpërdrejtë",
         "DirectEntryDocumentation": "Një vizitor dha URL-në te shfletuesi i vet dhe filloi shfletimin e site-it tuaj - site-in e dha drejtpërdrejt.",
         "Distinct": "Referuesa të Dallueshëm sipas Llojit të Referuesit",
@@ -19,7 +18,6 @@
         "EvolutionDocumentationMoreInfo": "Për më tepër të dhëna rreth llojeve të ndryshëm të sjellësve, shihni dokumentimin mbi tabelën %s.",
         "Keywords": "Fjalëkyça",
         "KeywordsReportDocumentation": "Ky raport tregon cilët fjalëkyça janë përdorur nga përdoruesit përpara se të silleshin te site-i juaj web. %s Duke klikuar mbi një rresht të tabelës, mund të shihni shpërndarjen sipas motorëve të kërkimit te të cilët u kërkua rreth fjalëkyçit.",
-        "PluginDescription": "Raporton të dhëna Referuesish: Motorë Kërkimesh, Fjalëkyça, site-e web, Gjurmim Fushatash, Zëra të Drejtpërdrejtë.",
         "ReferrerName": "Emër Referuesi",
         "Referrers": "Referuesa",
         "SearchEngines": "Motorë Kërkimesh",
diff --git a/plugins/Referrers/lang/sr.json b/plugins/Referrers/lang/sr.json
index 970e3ae7d4..e26bb477ad 100644
--- a/plugins/Referrers/lang/sr.json
+++ b/plugins/Referrers/lang/sr.json
@@ -9,7 +9,6 @@
         "ColumnSocial": "Društvena mreža",
         "ColumnWebsite": "Sajt",
         "ColumnWebsitePage": "Stranica sajta",
-        "DetailsByReferrerType": "Detalji u vezi sa referencom",
         "DirectEntry": "Direktni ulasci",
         "DirectEntryDocumentation": "Korisnik je ukucao adresu u svoj brauzer i došao na vaš sajt - ušao je direktno na vaš sajt.",
         "Distinct": "Različite reference po tipu",
@@ -21,7 +20,6 @@
         "EvolutionDocumentationMoreInfo": "Za više informacija o različitim tipovima referenci, pogledajte dokumentaciju tabele %s.",
         "Keywords": "Ključne reči",
         "KeywordsReportDocumentation": "Ovaj izveštaj prikazuje koje ključne reči su korisnici tražili pre nego što su upućeni na vaš sajt. %s Klikom na red tabele možete videti distribuciju pretraživača po ključnim rečima.",
-        "PluginDescription": "Izveštaji o referencama (dolaznim linkovima): pretraživači, ključne reči, praćenje kampanja, direktni ulasci.",
         "Referrer": "Referenca",
         "ReferrerName": "Naziv reference",
         "Referrers": "Reference",
diff --git a/plugins/Referrers/lang/sv.json b/plugins/Referrers/lang/sv.json
index b65334903f..14ecd29b35 100644
--- a/plugins/Referrers/lang/sv.json
+++ b/plugins/Referrers/lang/sv.json
@@ -9,7 +9,6 @@
         "ColumnSocial": "Sociala nätverk",
         "ColumnWebsite": "Webbplats",
         "ColumnWebsitePage": "Webbplatsens sida",
-        "DetailsByReferrerType": "Detaljer för den refererande typen",
         "DirectEntry": "Direkttrafik",
         "DirectEntryDocumentation": "En besökare har skrivit in webbadressen i sin webbläsare och började surfa på din webbplats - han gick in på hemsidan direkt.",
         "Distinct": "Distinkta hänvisningar av den refererande typen",
@@ -21,7 +20,6 @@
         "EvolutionDocumentationMoreInfo": "Mer information om de olika hänvisningsadressernas typer finns i dokumentationen för %s tabell.",
         "Keywords": "Sökord",
         "KeywordsReportDocumentation": "Rapporten visar vilka sökord som användarna sökte efter innan de hänvisades till din webbplats. %s Genom att klicka på en rad i tabellen kan du se fördelningen av sökmotorer som användes för sökordet.",
-        "PluginDescription": "Rapporterar hänvisningsdata: Sökmotorer, sökord, webbplatser, kampanjspårning och direkttrafik.",
         "Referrer": "Hänvisningar",
         "ReferrerName": "Hänvisningsadress Namn",
         "Referrers": "Trafikkällor",
diff --git a/plugins/Referrers/lang/th.json b/plugins/Referrers/lang/th.json
index fd7925d709..7a8da0a6b7 100644
--- a/plugins/Referrers/lang/th.json
+++ b/plugins/Referrers/lang/th.json
@@ -5,7 +5,6 @@
         "ColumnSearchEngine": "เครื่องมือค้นหา",
         "ColumnWebsite": "เว็บไซต์",
         "ColumnWebsitePage": "หน้าเว็บไซต์",
-        "DetailsByReferrerType": "รายละเอียดตามชนิดแหล่งที่มา",
         "DirectEntry": "เข้าชมโดยตรง",
         "Distinct": "แหล่งที่มาแตกต่างกันตามชนิดของทำการอ้างอิง",
         "DistinctCampaigns": "แคมเปญการขายที่แตกต่างกัน",
@@ -13,7 +12,6 @@
         "DistinctSearchEngines": "เครื่องมือค้นหาที่แตกต่างกัน",
         "DistinctWebsites": "เว็บไซต์ที่แตกต่างกัน",
         "Keywords": "คีย์เวิร์ด",
-        "PluginDescription": "รายงานข้อมูลแหล่งที่มา: Search Engines, Keywords เว็บไซต์ แคมเปญติดตาม รายการเข้าชมโดยตรง",
         "Referrers": "แหล่งที่มา",
         "SearchEngines": "เครื่องมือค้นหา",
         "SubmenuSearchEngines": "เครื่องมือค้นหาและคีย์เวิร์ด",
diff --git a/plugins/Referrers/lang/tl.json b/plugins/Referrers/lang/tl.json
index bb10e0f89a..bd973da30a 100644
--- a/plugins/Referrers/lang/tl.json
+++ b/plugins/Referrers/lang/tl.json
@@ -9,7 +9,6 @@
         "ColumnSocial": "Social network",
         "ColumnWebsite": "Website",
         "ColumnWebsitePage": "Pahina ng Website",
-        "DetailsByReferrerType": "Mga Detalye ng Referrer Type",
         "DirectEntry": "Direktang Entry",
         "DirectEntryDocumentation": "Ang bisita ay nilagay ang URL sa kanyang browser ang nagsimulang maghanap sa loob ng iyong website - ito ay kanyang nilagay diretso sa url.",
         "Distinct": "Naka bukod na Referrers ayon sa uri ng Referrer.",
@@ -21,7 +20,6 @@
         "EvolutionDocumentationMoreInfo": "Para sa karagdagang impormasyon tungkol sa iba't ibang mga uri ng referrer tingnan ang dokumentasyon ng table %s.",
         "Keywords": "Mga Keyword",
         "KeywordsReportDocumentation": "Ang report na ito ay nagpapakita kung anong ano ang mga keywords na ginagamit ng mga users sa pag sesearch bago sila ma-refer sa iyong website. %s Sa pamamagitan ng pag-click sa isang helira sa table maari mong makita ang distribution ng bawat search engines na may query para sa mga keyword.",
-        "PluginDescription": "Mga Ulat ng mga Referrer data: Search Engine mga keyword websites Campaign Tracking Direktan Entry.",
         "Referrer": "Referrer",
         "ReferrerName": "Pangalan ng Referrer",
         "Referrers": "Mga Referrer",
diff --git a/plugins/Referrers/lang/uk.json b/plugins/Referrers/lang/uk.json
index a1098fb973..505d15b7c7 100644
--- a/plugins/Referrers/lang/uk.json
+++ b/plugins/Referrers/lang/uk.json
@@ -5,7 +5,6 @@
         "ColumnSearchEngine": "Пошукова машина",
         "ColumnWebsite": "Веб-сайт",
         "ColumnWebsitePage": "Сторінка Веб-сайту",
-        "DetailsByReferrerType": "Деталі по типу реферера",
         "DirectEntry": "Прямі заходи",
         "Distinct": "Унікальні реферери по типу реферера",
         "DistinctCampaigns": "унікальні компанії",
@@ -13,7 +12,6 @@
         "DistinctSearchEngines": "унікальні пошукові машини",
         "DistinctWebsites": "унікальні веб-сайти",
         "Keywords": "Ключові слова",
-        "PluginDescription": "Звіти та дані реферерів: пошукові машини, ключові слова, веб-сайти, відслідковування кампаній, прямі заходи.",
         "Referrers": "Реферер",
         "SearchEngines": "Пошукові системи",
         "SubmenuSearchEngines": "Пошукові системи і ключові слова",
diff --git a/plugins/Referrers/lang/vi.json b/plugins/Referrers/lang/vi.json
index 96ed257a43..32abfac68a 100644
--- a/plugins/Referrers/lang/vi.json
+++ b/plugins/Referrers/lang/vi.json
@@ -9,7 +9,6 @@
         "ColumnSocial": "Mạng xã hội",
         "ColumnWebsite": "Địa chỉ trang web",
         "ColumnWebsitePage": "Trang web",
-        "DetailsByReferrerType": "Chi tiết bởi kiểu Referrer",
         "DirectEntry": "Nhập trực tiếp",
         "DirectEntryDocumentation": "Một du khách đã nhập vào URL trong trình duyệt của mình và bắt đầu trình duyệt trên trang web của bạn - người đó đã vào trang web một cách trực tiếp.",
         "Distinct": "Các Referrer riêng biệt bởi kiểu Referrer",
@@ -21,7 +20,6 @@
         "EvolutionDocumentationMoreInfo": "Để biết thêm thông tin về các kiểu giới thiệu khác nhau, xem tài liệu của bảng %s.",
         "Keywords": "Từ khóa",
         "KeywordsReportDocumentation": "Báo cáo này cho thấy những từ khóa các người dùng đã tìm kiếm trước khi họ được giới thiệu đến website của bạn. %s bằng cách click trên một hàng trong bảng, bạn có thể thấy sự phân bố của công cụ tìm kiếm đã được truy vấn cho từ khoá.",
-        "PluginDescription": "Báo cáo dữ liệu các giới thiệu(referrer): Công cụ tìm kiếm, từ khoá, trang web, theo dõi Chiến dịch, nhập trực tiếp.",
         "Referrer": "Người được giới thiệu",
         "ReferrerName": "Tên người được giới thiệu",
         "Referrers": "Các người được giới thiệu",
diff --git a/plugins/Referrers/lang/zh-cn.json b/plugins/Referrers/lang/zh-cn.json
index 1e700d747c..cc53e77b17 100644
--- a/plugins/Referrers/lang/zh-cn.json
+++ b/plugins/Referrers/lang/zh-cn.json
@@ -9,7 +9,6 @@
         "ColumnSocial": "社交网络",
         "ColumnWebsite": "网站",
         "ColumnWebsitePage": "网站页面",
-        "DetailsByReferrerType": "来源类型详情",
         "DirectEntry": "直接链接",
         "DirectEntryDocumentation": "访客在浏览器中输入网址来访问您的网站 - 直接访问网站。",
         "Distinct": "不同的来源类型",
@@ -21,7 +20,6 @@
         "EvolutionDocumentationMoreInfo": "不同的来源分类详情请看 %s 表的文档.",
         "Keywords": "关键词",
         "KeywordsReportDocumentation": "本报表显示访客搜索哪些关键字后来到了您的网站。%s 点击表中的一行，可查看用于搜索该关键字的搜索引擎列表。",
-        "PluginDescription": "来源数据报表: 搜索引擎、关键词、网站、广告活动跟踪及直接访问。",
         "Referrer": "来源分析",
         "ReferrerName": "来源名称",
         "Referrers": "来源分析",
diff --git a/plugins/Referrers/lang/zh-tw.json b/plugins/Referrers/lang/zh-tw.json
index 8931e41bf5..fdd9137b78 100644
--- a/plugins/Referrers/lang/zh-tw.json
+++ b/plugins/Referrers/lang/zh-tw.json
@@ -5,7 +5,6 @@
         "ColumnSearchEngine": "搜尋引擎",
         "ColumnWebsite": "網站",
         "ColumnWebsitePage": "網站頁面",
-        "DetailsByReferrerType": "推薦連結網站類型詳細資料",
         "DirectEntry": "直接流量",
         "Distinct": "推薦連結網站類型的不同參照項目",
         "DistinctCampaigns": "不同的廣告活動",
@@ -13,7 +12,6 @@
         "DistinctSearchEngines": "不同的搜尋引擎",
         "DistinctWebsites": "不同的網站",
         "Keywords": "關鍵字",
-        "PluginDescription": "推薦連結網站資料報表：搜尋引擎、關鍵字、網站、廣告活動追蹤及直接流量。",
         "Referrers": "推薦連結網站",
         "SearchEngines": "搜尋引擎",
         "SubmenuSearchEngines": "搜尋引擎 & 關鍵字",
diff --git a/plugins/Referrers/templates/allReferrers.twig b/plugins/Referrers/templates/allReferrers.twig
new file mode 100644
index 0000000000..bf8c7c431c
--- /dev/null
+++ b/plugins/Referrers/templates/allReferrers.twig
@@ -0,0 +1,11 @@
+<h2 piwik-enriched-headline>{{ 'Referrers_ReferrerTypes'|translate }}</h2>
+{{ dataTableReferrerType|raw }}
+
+<div style="clear:both;"></div>
+
+{% if totalVisits > 0 %}
+    <h2 piwik-enriched-headline>{{ 'Referrers_Referrers'|translate }}</h2>
+    {{ referrersReportsByDimension|raw }}
+{% endif %}
+
+{% include "_sparklineFooter.twig" %}
diff --git a/plugins/Referrers/templates/index.twig b/plugins/Referrers/templates/index.twig
index 925f5d3bd6..3b07a4063f 100644
--- a/plugins/Referrers/templates/index.twig
+++ b/plugins/Referrers/templates/index.twig
@@ -2,7 +2,6 @@
     data-graph-id="{{ nameGraphEvolutionReferrers }}">{{ 'General_EvolutionOverPeriod'|translate }}</h2>
 {{ graphEvolutionReferrers|raw }}
 
-<br/>
 <h2 piwik-enriched-headline>{{ 'Referrers_Type'|translate }}</h2>
 
 <div id='leftcolumn'>
@@ -48,15 +47,7 @@
 
 <div style="clear:both;"/>
 
-<div style="padding-left:12px;">
-    <br/>
-
-    <strong>{{ 'General_MoreDetails'|translate }}&nbsp;
-        <a href="#" class="section-toggler-link" data-section-id="distinctReferrersByType">({{ 'General_Show'|translate }})</a>
-    </strong>
-</div>
-
-<div id="distinctReferrersByType" style="display:none;">
+<div id="distinctReferrersByType">
     <div id='leftcolumn'>
         <div class="sparkline" style="padding-left: 12px;">{{ sparkline(urlSparklineDistinctSearchEngines) }}
             <strong>{{ numberDistinctSearchEngines }}</strong> {{ 'Referrers_DistinctSearchEngines'|translate }}
@@ -97,14 +88,4 @@
     <a href="javascript:broadcast.propagateAjax('module=Referrers&action=indexCampaigns')">{{ 'Referrers_Campaigns'|translate }}</a>.
 </div>
 
-<h2 piwik-enriched-headline>{{ 'Referrers_DetailsByReferrerType'|translate }}</h2>
-{{ dataTableReferrerType|raw }}
-
-<div style="clear:both;"></div>
-
-{% if totalVisits > 0 %}
-    <h2 piwik-enriched-headline>{{ 'Referrers_ReferrersOverview'|translate }}</h2>
-    {{ referrersReportsByDimension|raw }}
-{% endif %}
-
 {% include "_sparklineFooter.twig" %}
diff --git a/plugins/Resolution/API.php b/plugins/Resolution/API.php
new file mode 100644
index 0000000000..8a39d78e0b
--- /dev/null
+++ b/plugins/Resolution/API.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Resolution;
+
+use Piwik\Archive;
+use Piwik\DataTable;
+use Piwik\Metrics;
+use Piwik\Piwik;
+
+/**
+ * @see plugins/Resolution/functions.php
+ */
+require_once PIWIK_INCLUDE_PATH . '/plugins/Resolution/functions.php';
+
+/**
+ * @method static \Piwik\Plugins\Resolution\API getInstance()
+ */
+class API extends \Piwik\Plugin\API
+{
+    protected function getDataTable($name, $idSite, $period, $date, $segment)
+    {
+        Piwik::checkUserHasViewAccess($idSite);
+        $archive = Archive::build($idSite, $period, $date, $segment);
+        $dataTable = $archive->getDataTable($name);
+        $dataTable->filter('Sort', array(Metrics::INDEX_NB_VISITS));
+        $dataTable->queueFilter('ReplaceColumnNames');
+        $dataTable->queueFilter('ReplaceSummaryRowLabel');
+        return $dataTable;
+    }
+
+    public function getResolution($idSite, $period, $date, $segment = false)
+    {
+        $dataTable = $this->getDataTable(Archiver::RESOLUTION_RECORD_NAME, $idSite, $period, $date, $segment);
+        $dataTable->filter('AddSegmentValue');
+        return $dataTable;
+    }
+
+    public function getConfiguration($idSite, $period, $date, $segment = false)
+    {
+        $dataTable = $this->getDataTable(Archiver::CONFIGURATION_RECORD_NAME, $idSite, $period, $date, $segment);
+        // use GroupBy filter to avoid duplicate rows if old reports are displayed
+        $dataTable->queueFilter('GroupBy', array('label', __NAMESPACE__ . '\getConfigurationLabel'));
+        return $dataTable;
+    }
+}
diff --git a/plugins/Resolution/Archiver.php b/plugins/Resolution/Archiver.php
new file mode 100644
index 0000000000..f44d744c53
--- /dev/null
+++ b/plugins/Resolution/Archiver.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\Resolution;
+
+use Piwik\DataTable;
+use Piwik\Metrics;
+
+/**
+ * Archiver for Resolution Plugin
+ *
+ * @see PluginsArchiver
+ */
+class Archiver extends \Piwik\Plugin\Archiver
+{
+    const RESOLUTION_RECORD_NAME = 'Resolution_resolution';
+    const CONFIGURATION_RECORD_NAME = 'Resolution_configuration';
+    const RESOLUTION_DIMENSION = "log_visit.config_resolution";
+    const CONFIGURATION_DIMENSION = "CONCAT(log_visit.config_os, ';', log_visit.config_browser_name, ';', log_visit.config_resolution)";
+
+    public function aggregateDayReport()
+    {
+        $this->aggregateByResolution();
+        $this->aggregateByConfiguration();
+    }
+
+    /**
+     * Period archiving: simply sums up daily archives
+     */
+    public function aggregateMultipleReports()
+    {
+        $dataTableRecords = array(
+            self::RESOLUTION_RECORD_NAME,
+            self::CONFIGURATION_RECORD_NAME,
+        );
+        $this->getProcessor()->aggregateDataTableRecords($dataTableRecords, $this->maximumRows);
+    }
+
+    protected function aggregateByConfiguration()
+    {
+        $metrics = $this->getLogAggregator()->getMetricsFromVisitByDimension(self::CONFIGURATION_DIMENSION)->asDataTable();
+        $this->insertTable(self::CONFIGURATION_RECORD_NAME, $metrics);
+    }
+
+    protected function aggregateByResolution()
+    {
+        $table = $this->getLogAggregator()->getMetricsFromVisitByDimension(self::RESOLUTION_DIMENSION)->asDataTable();
+        $table->filter('ColumnCallbackDeleteRow', array('label', function ($value) {
+            return strlen($value) <= 5;
+        }));
+        $this->insertTable(self::RESOLUTION_RECORD_NAME, $table);
+        return $table;
+    }
+
+    protected function insertTable($recordName, DataTable $table)
+    {
+        $report = $table->getSerialized($this->maximumRows, null, Metrics::INDEX_NB_VISITS);
+        return $this->getProcessor()->insertBlobRecord($recordName, $report);
+    }
+
+}
+
diff --git a/plugins/Resolution/Columns/Configuration.php b/plugins/Resolution/Columns/Configuration.php
new file mode 100644
index 0000000000..6929457495
--- /dev/null
+++ b/plugins/Resolution/Columns/Configuration.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Resolution\Columns;
+
+use Piwik\Columns\Dimension;
+use Piwik\Piwik;
+
+class Configuration extends Dimension
+{
+    public function getName()
+    {
+        return Piwik::translate('Resolution_ColumnConfiguration');
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/Columns/Resolution.php b/plugins/Resolution/Columns/Resolution.php
new file mode 100644
index 0000000000..3f1e357279
--- /dev/null
+++ b/plugins/Resolution/Columns/Resolution.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Resolution\Columns;
+
+use Piwik\Piwik;
+use Piwik\Plugin\Dimension\VisitDimension;
+use Piwik\Plugins\Resolution\Segment;
+use Piwik\Tracker\Action;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\Visitor;
+
+class Resolution extends VisitDimension
+{
+    protected $columnName = 'config_resolution';
+    protected $columnType = 'VARCHAR(9) NOT NULL';
+
+    protected function configureSegments()
+    {
+        $segment = new Segment();
+        $segment->setSegment('resolution');
+        $segment->setName('Resolution_ColumnResolution');
+        $segment->setAcceptedValues('1280x1024, 800x600, etc.');
+        $this->addSegment($segment);
+    }
+
+    /**
+     * @param Request $request
+     * @param Visitor $visitor
+     * @param Action|null $action
+     * @return mixed
+     */
+    public function onNewVisit(Request $request, Visitor $visitor, $action)
+    {
+        $resolution = $request->getParam('res');
+
+        if (!empty($resolution)) {
+            return substr($resolution, 0, 9);
+        }
+
+        return $resolution;
+    }
+
+    public function getName()
+    {
+        return Piwik::translate('Resolution_ColumnResolution');
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/Reports/Base.php b/plugins/Resolution/Reports/Base.php
new file mode 100644
index 0000000000..259a164113
--- /dev/null
+++ b/plugins/Resolution/Reports/Base.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Resolution\Reports;
+
+use Piwik\Plugin\ViewDataTable;
+use Piwik\Plugins\CoreVisualizations\Visualizations\Graph;
+
+abstract class Base extends \Piwik\Plugin\Report
+{
+    protected function init()
+    {
+        $this->category = 'General_VisitorSettings';
+    }
+
+    protected function getBasicResolutionDisplayProperties(ViewDataTable $view)
+    {
+        $view->config->show_search = false;
+        $view->config->show_exclude_low_population = false;
+
+        $view->requestConfig->filter_limit = 5;
+
+        if ($view->isViewDataTableId(Graph::ID)) {
+            $view->config->max_graph_elements = 5;
+        }
+    }
+}
diff --git a/plugins/Resolution/Reports/GetConfiguration.php b/plugins/Resolution/Reports/GetConfiguration.php
new file mode 100644
index 0000000000..024efa844e
--- /dev/null
+++ b/plugins/Resolution/Reports/GetConfiguration.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Resolution\Reports;
+
+use Piwik\Piwik;
+use Piwik\Plugin\ViewDataTable;
+use Piwik\Plugins\Resolution\Columns\Configuration;
+
+class GetConfiguration extends Base
+{
+    protected function init()
+    {
+        parent::init();
+        $this->dimension     = new Configuration();
+        $this->name          = Piwik::translate('Resolution_WidgetGlobalVisitors');
+        $this->documentation = Piwik::translate('Resolution_WidgetGlobalVisitorsDocumentation', '<br />');
+        $this->order = 7;
+        $this->widgetTitle  = 'Resolution_WidgetGlobalVisitors';
+    }
+
+    public function configureView(ViewDataTable $view)
+    {
+        $this->getBasicResolutionDisplayProperties($view);
+
+        $view->config->addTranslation('label', $this->dimension->getName());
+
+        $view->requestConfig->filter_limit = 3;
+    }
+
+}
diff --git a/plugins/Resolution/Reports/GetResolution.php b/plugins/Resolution/Reports/GetResolution.php
new file mode 100644
index 0000000000..fbb78eb878
--- /dev/null
+++ b/plugins/Resolution/Reports/GetResolution.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Resolution\Reports;
+
+use Piwik\Piwik;
+use Piwik\Plugin\ViewDataTable;
+use Piwik\Plugins\Resolution\Columns\Resolution;
+
+class GetResolution extends Base
+{
+    protected function init()
+    {
+        parent::init();
+        $this->dimension     = new Resolution();
+        $this->name          = Piwik::translate('Resolution_WidgetResolutions');
+        $this->documentation = ''; // TODO
+        $this->order = 0;
+        $this->widgetTitle  = 'Resolution_WidgetResolutions';
+    }
+
+    public function configureView(ViewDataTable $view)
+    {
+        $this->getBasicResolutionDisplayProperties($view);
+
+        $view->config->addTranslation('label', $this->dimension->getName());
+    }
+
+}
diff --git a/plugins/Resolution/Resolution.php b/plugins/Resolution/Resolution.php
new file mode 100644
index 0000000000..49b2d3a9a6
--- /dev/null
+++ b/plugins/Resolution/Resolution.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Resolution;
+
+use Piwik\Plugins\CoreVisualizations\Visualizations\Graph;
+use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable;
+
+/**
+ *
+ */
+class Resolution extends \Piwik\Plugin
+{
+    /**
+     * @see Piwik\Plugin::getListHooksRegistered
+     */
+    public function getListHooksRegistered()
+    {
+        return array(
+            'Live.getAllVisitorDetails'            => 'extendVisitorDetails',
+        );
+    }
+
+    public function extendVisitorDetails(&$visitor, $details)
+    {
+        $instance = new Visitor($details);
+
+        $visitor['resolution']               = $instance->getResolution();
+    }
+}
diff --git a/plugins/Resolution/Segment.php b/plugins/Resolution/Segment.php
new file mode 100644
index 0000000000..e21a2973d7
--- /dev/null
+++ b/plugins/Resolution/Segment.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Resolution;
+
+/**
+ * Resolution segment base class.
+ *
+ */
+class Segment extends \Piwik\Plugin\Segment
+{
+    protected  function init()
+    {
+        $this->setCategory('General_Visit');
+    }
+}
diff --git a/plugins/Resolution/Visitor.php b/plugins/Resolution/Visitor.php
new file mode 100644
index 0000000000..47fd330868
--- /dev/null
+++ b/plugins/Resolution/Visitor.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Resolution;
+
+class Visitor
+{
+    private $details = array();
+
+    public function __construct($details)
+    {
+        $this->details = $details;
+    }
+
+    function getResolution()
+    {
+        if (!array_key_exists('config_resolution', $this->details)) {
+            return null;
+        }
+
+        return $this->details['config_resolution'];
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/functions.php b/plugins/Resolution/functions.php
new file mode 100644
index 0000000000..e71aaa907a
--- /dev/null
+++ b/plugins/Resolution/functions.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\Resolution;
+
+use Piwik\Piwik;
+
+function getConfigurationLabel($str)
+{
+    if (strpos($str, ';') === false) {
+        return $str;
+    }
+    $values = explode(";", $str);
+
+    $os = \Piwik\Plugins\DevicesDetection\getOsFullName($values[0]);
+    $name = $values[1];
+    $browser = \Piwik\Plugins\DevicesDetection\getBrowserName($name);
+    if ($browser === false) {
+        $browser = Piwik::translate('General_Unknown');
+    }
+    $resolution = $values[2];
+    return $os . " / " . $browser . " / " . $resolution;
+}
diff --git a/plugins/Resolution/lang/am.json b/plugins/Resolution/lang/am.json
new file mode 100644
index 0000000000..db863d489e
--- /dev/null
+++ b/plugins/Resolution/lang/am.json
@@ -0,0 +1,10 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "ውቅረት",
+        "ColumnResolution": "ጥራት",
+        "Configurations": "ውቅረቶች",
+        "Resolutions": "ጥራቶች",
+        "WidgetGlobalVisitors": "የሁሉም ጎብኚዎች ውቅረት",
+        "WidgetResolutions": "የማያ ጥራቶች"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/ar.json b/plugins/Resolution/lang/ar.json
new file mode 100644
index 0000000000..7d9bfebc01
--- /dev/null
+++ b/plugins/Resolution/lang/ar.json
@@ -0,0 +1,10 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "الإعداد",
+        "ColumnResolution": "الكثافة النقطية",
+        "Configurations": "الإعدادات",
+        "Resolutions": "الكثافات النقطية",
+        "WidgetGlobalVisitors": "الإعدادات العامة للزوار",
+        "WidgetResolutions": "كثافات الشاشة النقطية"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/be.json b/plugins/Resolution/lang/be.json
new file mode 100644
index 0000000000..d62451282c
--- /dev/null
+++ b/plugins/Resolution/lang/be.json
@@ -0,0 +1,11 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Канфігурацыя",
+        "ColumnResolution": "Дазвол",
+        "Configurations": "Па канфігурацыі",
+        "Resolutions": "Па дазволе манітораў",
+        "WidgetGlobalVisitors": "Глабальная канфігурацыя",
+        "WidgetGlobalVisitorsDocumentation": "Гэтая справаздача паказвае найбольш распаўсюджаныя агульныя канфігурацыі, якія мелі вашы наведвальнікі. Канфігурацыя - гэта спалучэнне аперацыйнай сістэмы, тыпу браўзэра і дазволу экрана.",
+        "WidgetResolutions": "Дазвол манітораў"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/bg.json b/plugins/Resolution/lang/bg.json
new file mode 100644
index 0000000000..03e0d97f0b
--- /dev/null
+++ b/plugins/Resolution/lang/bg.json
@@ -0,0 +1,11 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Обобщена конфигурация",
+        "ColumnResolution": "Разделителна способност на екрана",
+        "Configurations": "Конфигурации",
+        "Resolutions": "Разделителна способност",
+        "WidgetGlobalVisitors": "Конфигурация на гло",
+        "WidgetGlobalVisitorsDocumentation": "Този отчет показва повечето общопознати цялостни конфигурации, които вашите посетители са имали. Конфигурация е комбинацията от операционна система, тип на браузера и резолюция на екрана.",
+        "WidgetResolutions": "Разделителна способност"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/ca.json b/plugins/Resolution/lang/ca.json
new file mode 100644
index 0000000000..bda670af65
--- /dev/null
+++ b/plugins/Resolution/lang/ca.json
@@ -0,0 +1,11 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Configuració",
+        "ColumnResolution": "Resolució",
+        "Configurations": "Configuracions",
+        "Resolutions": "Resolucions",
+        "WidgetGlobalVisitors": "Configuracions globals dels visitants",
+        "WidgetGlobalVisitorsDocumentation": "Aquest informe mostra les configuracions més comuns que tenen els vostres visitants. Una configuració es la combinació de Sistema Operatiu, tipus de navegador i resolució de pantalla.",
+        "WidgetResolutions": "Resolucions"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/cs.json b/plugins/Resolution/lang/cs.json
new file mode 100644
index 0000000000..fa4fa3f0f8
--- /dev/null
+++ b/plugins/Resolution/lang/cs.json
@@ -0,0 +1,12 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Konfigurace",
+        "ColumnResolution": "Rozlišení",
+        "Configurations": "Nastavení",
+        "PluginDescription": "Hlásí rozšlišení obrazovky návštěvníků.",
+        "Resolutions": "Rozlišení",
+        "WidgetGlobalVisitors": "Hlavní nastavení návštěvníků",
+        "WidgetGlobalVisitorsDocumentation": "Toto hlášení zobrazuje nejčastější konfigurace, které vaši návštěvníci měli. Konfigurace je kombinace operačního systému, prohlížeče a rozlišení.",
+        "WidgetResolutions": "Rozlišení obrazovky"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/da.json b/plugins/Resolution/lang/da.json
new file mode 100644
index 0000000000..cab3e10731
--- /dev/null
+++ b/plugins/Resolution/lang/da.json
@@ -0,0 +1,11 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Konfiguration",
+        "ColumnResolution": "Opløsning",
+        "Configurations": "Indstillinger",
+        "Resolutions": "Opløsninger",
+        "WidgetGlobalVisitors": "Besøgendes konfiguration",
+        "WidgetGlobalVisitorsDocumentation": "Rapporten viser de mest almindelige samlede konfigurationer, som de besøgende havde. En konfiguration er en kombination af et styresystem, en browsertype og en skærmopløsning.",
+        "WidgetResolutions": "Skærmopløsninger"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/de.json b/plugins/Resolution/lang/de.json
new file mode 100644
index 0000000000..a3243fbaf9
--- /dev/null
+++ b/plugins/Resolution/lang/de.json
@@ -0,0 +1,12 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Konfiguration",
+        "ColumnResolution": "Auflösung",
+        "Configurations": "Konfigurationen",
+        "PluginDescription": "Berichte über Bildschirmauflösungen Ihrer Besucher.",
+        "Resolutions": "Auflösungen",
+        "WidgetGlobalVisitors": "Globale Besucherkonfiguration",
+        "WidgetGlobalVisitorsDocumentation": "Dieser Bericht zeigt Ihnen die häufigsten Gesamtkonfigurationen der Besucher. Eine Konfiguration ist die Kombination aus Betriebssystem, Browsertyp und Bildschirmauflösung.",
+        "WidgetResolutions": "Bildschirmauflösungen"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/el.json b/plugins/Resolution/lang/el.json
new file mode 100644
index 0000000000..868683b1cb
--- /dev/null
+++ b/plugins/Resolution/lang/el.json
@@ -0,0 +1,12 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Ρύθμιση",
+        "ColumnResolution": "Ανάλυση",
+        "Configurations": "Ρυθμίσεις",
+        "PluginDescription": "Αναφέρει τις αναλύσεις οθόνης των επισκεπτών σας.",
+        "Resolutions": "Αναλύσεις οθόνης",
+        "WidgetGlobalVisitors": "Γενικές ρυθμίσεις χρηστών",
+        "WidgetGlobalVisitorsDocumentation": "Αυτή η αναφορά δείχνει τις πιο συχνές καθολικές ρυθμίσεις που έχουν οι επισκέπτες σας. Μια ρύθμιση είναι ο συνδυασμός του λειτουργικού συστήματος, του τύπου φυλλομετρητή και της ανάλυσης οθόνης.",
+        "WidgetResolutions": "Αναλύσεις οθόνης"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/en.json b/plugins/Resolution/lang/en.json
new file mode 100644
index 0000000000..f79da0653f
--- /dev/null
+++ b/plugins/Resolution/lang/en.json
@@ -0,0 +1,12 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Configuration",
+        "ColumnResolution": "Resolution",
+        "Configurations": "Configurations",
+        "PluginDescription": "Reports the screen resolutions of your visitors.",
+        "Resolutions": "Resolutions",
+        "WidgetGlobalVisitors": "Visitor Configuration",
+        "WidgetGlobalVisitorsDocumentation": "This report shows the most common overall configurations that your visitors had. A configuration is the combination of an operating system, a browser type and a screen resolution.",
+        "WidgetResolutions": "Screen Resolution"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/es.json b/plugins/Resolution/lang/es.json
new file mode 100644
index 0000000000..dd606039e1
--- /dev/null
+++ b/plugins/Resolution/lang/es.json
@@ -0,0 +1,11 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Configuración",
+        "ColumnResolution": "Resoluciones",
+        "Configurations": "Configuración",
+        "Resolutions": "Resoluciones",
+        "WidgetGlobalVisitors": "Configuración global de visitantes",
+        "WidgetGlobalVisitorsDocumentation": "Este informe muestra las más usuales configuraciones que poseen sus visitantes. Una configuración es una combinación de un sistema operativo, un tipo de navegador de internet y una resolución de pantalla.",
+        "WidgetResolutions": "Resoluciones de pantalla"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/et.json b/plugins/Resolution/lang/et.json
new file mode 100644
index 0000000000..30eccef1b5
--- /dev/null
+++ b/plugins/Resolution/lang/et.json
@@ -0,0 +1,10 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Konfiguratsioon",
+        "ColumnResolution": "Resolutsioon",
+        "Configurations": "Konfiguratsioonid",
+        "Resolutions": "Ekraani resolutsioonid",
+        "WidgetGlobalVisitors": "Kohalike külastajate seaded",
+        "WidgetResolutions": "Ekraani resolutsioonid"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/eu.json b/plugins/Resolution/lang/eu.json
new file mode 100644
index 0000000000..b1b820a1c2
--- /dev/null
+++ b/plugins/Resolution/lang/eu.json
@@ -0,0 +1,10 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Konfigurazioa",
+        "ColumnResolution": "Bereizmena",
+        "Configurations": "Konfigurazioak",
+        "Resolutions": "Bereizmenak",
+        "WidgetGlobalVisitors": "Bisitarien konfigurazioa",
+        "WidgetResolutions": "Pantailaren bereizmenak"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/fa.json b/plugins/Resolution/lang/fa.json
new file mode 100644
index 0000000000..cafca9deb7
--- /dev/null
+++ b/plugins/Resolution/lang/fa.json
@@ -0,0 +1,11 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "پیکربندی",
+        "ColumnResolution": "رزلوشن",
+        "Configurations": "پیکربندی",
+        "Resolutions": "رزلوشن",
+        "WidgetGlobalVisitors": "پیکربندی بازدیدکنندگان جهانی",
+        "WidgetGlobalVisitorsDocumentation": "این گزارش نشان می دهد پیکربندی کلی شایع ترین است که بازدید کنندگان شما است. پیکربندی ترکیبی از سیستم عامل، نوع مرورگر و صفحه نمایش با وضوح است.",
+        "WidgetResolutions": "رزلوشن نمایشگر"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/fi.json b/plugins/Resolution/lang/fi.json
new file mode 100644
index 0000000000..70b35a17f6
--- /dev/null
+++ b/plugins/Resolution/lang/fi.json
@@ -0,0 +1,11 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Asetukset",
+        "ColumnResolution": "Resoluutio",
+        "Configurations": "Asetukset",
+        "Resolutions": "Resoluutio",
+        "WidgetGlobalVisitors": "Kaikkien kävijöiden asetukset",
+        "WidgetGlobalVisitorsDocumentation": "Tämä raportti näyttää yleiskuvan eri käyttäjien asetuksista. Asetukset on yhdistelmä käyttöjärjestelmästä, selaimen tyypistä ja näytön resoluutiosta.",
+        "WidgetResolutions": "Näytön resoluutio"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/fr.json b/plugins/Resolution/lang/fr.json
new file mode 100644
index 0000000000..fc933f2519
--- /dev/null
+++ b/plugins/Resolution/lang/fr.json
@@ -0,0 +1,11 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Configuration",
+        "ColumnResolution": "Résolution",
+        "Configurations": "Configurations",
+        "Resolutions": "Résolutions",
+        "WidgetGlobalVisitors": "Configuration globale des visiteurs",
+        "WidgetGlobalVisitorsDocumentation": "Ce rapport montre les configurations globales les plus communes de vos visiteurs. Une configuration est la combinaison d'un système d'exploitation, d'un type de navigateur et d'une résolution d'écran.",
+        "WidgetResolutions": "Résolutions d'écran"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/gl.json b/plugins/Resolution/lang/gl.json
new file mode 100644
index 0000000000..aaa796e7ca
--- /dev/null
+++ b/plugins/Resolution/lang/gl.json
@@ -0,0 +1,8 @@
+{
+    "Resolution": {
+        "Configurations": "Configuracións",
+        "Resolutions": "Resolucións",
+        "WidgetGlobalVisitors": "Configuración global de visitantes",
+        "WidgetResolutions": "Resolucións de pantalla"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/he.json b/plugins/Resolution/lang/he.json
new file mode 100644
index 0000000000..bd83655787
--- /dev/null
+++ b/plugins/Resolution/lang/he.json
@@ -0,0 +1,5 @@
+{
+    "Resolution": {
+        "WidgetResolutions": "רזולוציית מסך"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/hi.json b/plugins/Resolution/lang/hi.json
new file mode 100644
index 0000000000..5918da9c01
--- /dev/null
+++ b/plugins/Resolution/lang/hi.json
@@ -0,0 +1,9 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "विन्यास",
+        "ColumnResolution": "संकल्प",
+        "Configurations": "विन्यास",
+        "Resolutions": "संकल्प",
+        "WidgetGlobalVisitors": "आगंतुक विन्यास"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/hr.json b/plugins/Resolution/lang/hr.json
new file mode 100644
index 0000000000..a1b2c845ef
--- /dev/null
+++ b/plugins/Resolution/lang/hr.json
@@ -0,0 +1,7 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "KOnfiguracija",
+        "ColumnResolution": "Rezolucija",
+        "Configurations": "Konfiguracija"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/hu.json b/plugins/Resolution/lang/hu.json
new file mode 100644
index 0000000000..1be3f7ca3e
--- /dev/null
+++ b/plugins/Resolution/lang/hu.json
@@ -0,0 +1,10 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Konfiguráció",
+        "ColumnResolution": "Felbontás",
+        "Configurations": "Konfigurációk",
+        "Resolutions": "Képernyőfelbontások",
+        "WidgetGlobalVisitors": "Globális látogatói beállítások",
+        "WidgetResolutions": "Képernyőfelbontások"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/id.json b/plugins/Resolution/lang/id.json
new file mode 100644
index 0000000000..e224567379
--- /dev/null
+++ b/plugins/Resolution/lang/id.json
@@ -0,0 +1,11 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Pengaturan",
+        "ColumnResolution": "Resolusi",
+        "Configurations": "Pengaturan",
+        "Resolutions": "Resolusi",
+        "WidgetGlobalVisitors": "Pengaturan pengunjung umum",
+        "WidgetGlobalVisitorsDocumentation": "Laporan ini menunjukkan pengaturan paling umum yang pengunjung miliki. Subuah pengaturan terdiri atas sistem operasi, jenis peramban, dan resolusi layar.",
+        "WidgetResolutions": "Resolusi layar"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/is.json b/plugins/Resolution/lang/is.json
new file mode 100644
index 0000000000..d3b2411f15
--- /dev/null
+++ b/plugins/Resolution/lang/is.json
@@ -0,0 +1,10 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Uppsetning",
+        "ColumnResolution": "Skjáupplausn",
+        "Configurations": "Uppsetningar",
+        "Resolutions": "Skjáupplausnir",
+        "WidgetGlobalVisitors": "Altæk gestastilling",
+        "WidgetResolutions": "Skjáupplausnir"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/it.json b/plugins/Resolution/lang/it.json
new file mode 100644
index 0000000000..41dc660c4f
--- /dev/null
+++ b/plugins/Resolution/lang/it.json
@@ -0,0 +1,12 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Configurazione",
+        "ColumnResolution": "Risoluzione",
+        "Configurations": "Configurazioni",
+        "PluginDescription": "Restituisce la risoluzione di schermo dei tuoi visitatori.",
+        "Resolutions": "Risoluzioni",
+        "WidgetGlobalVisitors": "Riepilogo configurazione visitatori",
+        "WidgetGlobalVisitorsDocumentation": "Questo report mostra le configurazioni globali più comuni che i visitatori avevano. Una configurazione è la combinazione di un sistema operativo, un tipo browser e una risoluzione di schermo.",
+        "WidgetResolutions": "Risoluzione schermo"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/ja.json b/plugins/Resolution/lang/ja.json
new file mode 100644
index 0000000000..08594ca73d
--- /dev/null
+++ b/plugins/Resolution/lang/ja.json
@@ -0,0 +1,11 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "環境設定",
+        "ColumnResolution": "解像度",
+        "Configurations": "環境設定",
+        "Resolutions": "解像度",
+        "WidgetGlobalVisitors": "ビジターの全般的な環境設定",
+        "WidgetGlobalVisitorsDocumentation": "ビジターの最も一般的な利用環境についてのリポートです。オペレーティングシステム、ブラウザの種類と画面の解像度の組合せで表示します。",
+        "WidgetResolutions": "画面解像度"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/ka.json b/plugins/Resolution/lang/ka.json
new file mode 100644
index 0000000000..4ef05cca97
--- /dev/null
+++ b/plugins/Resolution/lang/ka.json
@@ -0,0 +1,10 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "კონფიგურაცია",
+        "ColumnResolution": "რეზოლუცია",
+        "Configurations": "გონფიგურაციები",
+        "Resolutions": "რეზოლუციები",
+        "WidgetGlobalVisitors": "ვიზიტორების გლობალური კონფიგურაცია",
+        "WidgetResolutions": "ეკრანის რეზოლუვიები"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/ko.json b/plugins/Resolution/lang/ko.json
new file mode 100644
index 0000000000..d76113b7af
--- /dev/null
+++ b/plugins/Resolution/lang/ko.json
@@ -0,0 +1,11 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "구성",
+        "ColumnResolution": "해상도",
+        "Configurations": "구성",
+        "Resolutions": "해상도",
+        "WidgetGlobalVisitors": "글로벌 방문자 구성",
+        "WidgetGlobalVisitorsDocumentation": "방문자의 가장 일반적인 사용 환경에 대한 보고서입니다. 운영 체제, 브라우저 종류와 화면 해상도의 조합으로 표시합니다.",
+        "WidgetResolutions": "스크린 해상도"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/lt.json b/plugins/Resolution/lang/lt.json
new file mode 100644
index 0000000000..34d0e7299f
--- /dev/null
+++ b/plugins/Resolution/lang/lt.json
@@ -0,0 +1,10 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Konfigūracija",
+        "ColumnResolution": "Ekrano raiška",
+        "Configurations": "Konfigūracijos",
+        "Resolutions": "Ekranų raiškos",
+        "WidgetGlobalVisitors": "Bendri lankytojų nustatymai",
+        "WidgetResolutions": "Ekrano raiška"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/lv.json b/plugins/Resolution/lang/lv.json
new file mode 100644
index 0000000000..4183c8b7ce
--- /dev/null
+++ b/plugins/Resolution/lang/lv.json
@@ -0,0 +1,11 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Konfigurācija",
+        "ColumnResolution": "Ekrāna izšķirtspēja",
+        "Configurations": "Konfigurācijas",
+        "Resolutions": "Ekrāna izšķirtspējas",
+        "WidgetGlobalVisitors": "Globālā apmeklētāju konfigurācija",
+        "WidgetGlobalVisitorsDocumentation": "Šajā atskaitē redzamas visbiežāk izmantotās apmeklētāju konfigurācijas. Konfigurācija ir operētājsistēmas, pārlūka tipa un ekrāna izšķirtspējas kombinācija.",
+        "WidgetResolutions": "Ekrāna izšķirtspējas"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/nb.json b/plugins/Resolution/lang/nb.json
new file mode 100644
index 0000000000..add66843bb
--- /dev/null
+++ b/plugins/Resolution/lang/nb.json
@@ -0,0 +1,10 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Konfigurasjon",
+        "ColumnResolution": "Oppløsning",
+        "Configurations": "Konfigurasjon",
+        "Resolutions": "Oppløsninger",
+        "WidgetGlobalVisitors": "Besøkendes konfigurasjon",
+        "WidgetResolutions": "Skjermoppløsninger"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/nl.json b/plugins/Resolution/lang/nl.json
new file mode 100644
index 0000000000..d9724ada1a
--- /dev/null
+++ b/plugins/Resolution/lang/nl.json
@@ -0,0 +1,11 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Configuratie",
+        "ColumnResolution": "Resolutie",
+        "Configurations": "Configuraties",
+        "Resolutions": "Schermresoluties",
+        "WidgetGlobalVisitors": "Algemene configuratie",
+        "WidgetGlobalVisitorsDocumentation": "Dit rapport toont de meest voorkomende configuraties die uw bezoekers hadden. Een configuratie is de combinatie van een besturingssysteem, een browser type en een schermresolutie.",
+        "WidgetResolutions": "Schermresoluties"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/nn.json b/plugins/Resolution/lang/nn.json
new file mode 100644
index 0000000000..0524f04c04
--- /dev/null
+++ b/plugins/Resolution/lang/nn.json
@@ -0,0 +1,10 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Konfigurasjon",
+        "ColumnResolution": "Oppløysing",
+        "Configurations": "Konfigurasjonar",
+        "Resolutions": "Oppløysingar",
+        "WidgetGlobalVisitors": "Global vitjarkonfigurasjon",
+        "WidgetResolutions": "Skjermoppløysing"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/pl.json b/plugins/Resolution/lang/pl.json
new file mode 100644
index 0000000000..00459e717b
--- /dev/null
+++ b/plugins/Resolution/lang/pl.json
@@ -0,0 +1,10 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Konfiguracja",
+        "ColumnResolution": "Rozdzielczość",
+        "Configurations": "Konfiguracje",
+        "Resolutions": "Rozdzielczość",
+        "WidgetGlobalVisitors": "Ogólna konfiguracja odwiedzających",
+        "WidgetResolutions": "Rozdzielczość ekranu"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/pt-br.json b/plugins/Resolution/lang/pt-br.json
new file mode 100644
index 0000000000..aed2a71000
--- /dev/null
+++ b/plugins/Resolution/lang/pt-br.json
@@ -0,0 +1,11 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Configuração",
+        "ColumnResolution": "Resolução",
+        "Configurations": "Configurações",
+        "Resolutions": "Resoluções",
+        "WidgetGlobalVisitors": "Configuração Global de Visitante",
+        "WidgetGlobalVisitorsDocumentation": "Este relatório mostra as configurações mais comuns gerais que os visitantes tiveram. A configuração é a combinação de um sistema operacional, um tipo de navegador e uma resolução de tela.",
+        "WidgetResolutions": "Resoluções de Tela"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/pt.json b/plugins/Resolution/lang/pt.json
new file mode 100644
index 0000000000..1dd610e679
--- /dev/null
+++ b/plugins/Resolution/lang/pt.json
@@ -0,0 +1,11 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Configuração",
+        "ColumnResolution": "Resolução",
+        "Configurations": "Configurações",
+        "Resolutions": "Resoluções",
+        "WidgetGlobalVisitors": "Configuração global dos visitantes",
+        "WidgetGlobalVisitorsDocumentation": "Este relatório mostra as configurações gerais mais comuns que os visitantes tiveram. Uma configuração é a combinação de um sistema operativo, um tipo de navegador e uma resolução de visualização.",
+        "WidgetResolutions": "Resoluções de Ecrã"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/ro.json b/plugins/Resolution/lang/ro.json
new file mode 100644
index 0000000000..0ffc306ee5
--- /dev/null
+++ b/plugins/Resolution/lang/ro.json
@@ -0,0 +1,11 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Configuraţia",
+        "ColumnResolution": "Rezoluţie ecran",
+        "Configurations": "Configurare",
+        "Resolutions": "Rezolutii",
+        "WidgetGlobalVisitors": "Configurare vizitatori globala",
+        "WidgetGlobalVisitorsDocumentation": "Acest raport arată cele mai comune configurații generale,pe care vizitatorii le au avut. O configurație este combinația dintre un sistem de operare, un tip de browser și o rezoluție a ecranului.",
+        "WidgetResolutions": "Rezolutii ecran"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/ru.json b/plugins/Resolution/lang/ru.json
new file mode 100644
index 0000000000..8581b68f31
--- /dev/null
+++ b/plugins/Resolution/lang/ru.json
@@ -0,0 +1,11 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Конфигурация",
+        "ColumnResolution": "Разрешение",
+        "Configurations": "По конфигурации",
+        "Resolutions": "По разрешению мониторов",
+        "WidgetGlobalVisitors": "Глобальная конфигурация",
+        "WidgetGlobalVisitorsDocumentation": "Этот отчет показывает общую информацию по наиболее популяоным конфигурациям системы ваших посетителей. Конфигурация - это комбинация операционной системы, браузера и разрешения экрана.",
+        "WidgetResolutions": "По разрешению мониторов"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/sk.json b/plugins/Resolution/lang/sk.json
new file mode 100644
index 0000000000..e956c53439
--- /dev/null
+++ b/plugins/Resolution/lang/sk.json
@@ -0,0 +1,10 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Konfigurácia",
+        "ColumnResolution": "Rozlíšenie",
+        "Configurations": "Konfigurácia",
+        "Resolutions": "Rozlíšenie",
+        "WidgetGlobalVisitors": "Globálne konfigurácie návštevníkov",
+        "WidgetResolutions": "Rozlíšenie obrazovky"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/sl.json b/plugins/Resolution/lang/sl.json
new file mode 100644
index 0000000000..b2b1440a31
--- /dev/null
+++ b/plugins/Resolution/lang/sl.json
@@ -0,0 +1,9 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Nastavitev",
+        "ColumnResolution": "Resolucija",
+        "Configurations": "Nastavitve",
+        "Resolutions": "Resolucije",
+        "WidgetResolutions": "Resolucija zaslona"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/sq.json b/plugins/Resolution/lang/sq.json
new file mode 100644
index 0000000000..15b9a9c3ab
--- /dev/null
+++ b/plugins/Resolution/lang/sq.json
@@ -0,0 +1,11 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Formësim",
+        "ColumnResolution": "Qartësi",
+        "Configurations": "Formësime",
+        "Resolutions": "Qartësi",
+        "WidgetGlobalVisitors": "Formësime globale vizitorësh",
+        "WidgetGlobalVisitorsDocumentation": "Ky raport shfaq formësimet e përgjithshme më të rëndomta të përdorura nga vizitorët tuaj. Formësimi përmban të dhënat për sistemin operativ, llojin e shfletuesit dhe qartësinë e ekranit.",
+        "WidgetResolutions": "Qartësi ekrani"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/sr.json b/plugins/Resolution/lang/sr.json
new file mode 100644
index 0000000000..56c82ccd4b
--- /dev/null
+++ b/plugins/Resolution/lang/sr.json
@@ -0,0 +1,11 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Podešavanja",
+        "ColumnResolution": "Rezolucija",
+        "Configurations": "Podešavanja",
+        "Resolutions": "Rezolucije",
+        "WidgetGlobalVisitors": "Globalna podešavanja posetilaca",
+        "WidgetGlobalVisitorsDocumentation": "Ovaj izveštaj prikazuje najčešća podešavanja vaših posetilaca. Pod podešavanjem podrazumevamo kombinaciju operativnog sistema, tipa brauzera i ekranske rezolucije.",
+        "WidgetResolutions": "Rezolucije ekrana"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/sv.json b/plugins/Resolution/lang/sv.json
new file mode 100644
index 0000000000..232f7de8d3
--- /dev/null
+++ b/plugins/Resolution/lang/sv.json
@@ -0,0 +1,11 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Konfiguration",
+        "ColumnResolution": "Skärmupplösning",
+        "Configurations": "Konfiguration",
+        "Resolutions": "Skärmupplösning",
+        "WidgetGlobalVisitors": "Global besökarkonfiguration",
+        "WidgetGlobalVisitorsDocumentation": "Denna rapport visar de vanligaste övergripande konfigurationer som besökarna hade. En konfiguration är en kombination av ett operativsystem, en webbläsare och en skärmupplösning.",
+        "WidgetResolutions": "Skärmupplösning"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/te.json b/plugins/Resolution/lang/te.json
new file mode 100644
index 0000000000..ee4af78da4
--- /dev/null
+++ b/plugins/Resolution/lang/te.json
@@ -0,0 +1,6 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "స్వరూపణం",
+        "Configurations": "స్వరూపణలు"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/th.json b/plugins/Resolution/lang/th.json
new file mode 100644
index 0000000000..dcdc1ca7d1
--- /dev/null
+++ b/plugins/Resolution/lang/th.json
@@ -0,0 +1,10 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "การตั้งค่า",
+        "ColumnResolution": "ความละเอียด",
+        "Configurations": "การกำหนดค่า",
+        "Resolutions": "ความละเอียด",
+        "WidgetGlobalVisitors": "การตั้งค่าผู้เข้าชมโดยรวม",
+        "WidgetResolutions": "ความละเอียดจอภาพ"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/tl.json b/plugins/Resolution/lang/tl.json
new file mode 100644
index 0000000000..5d126ac0f6
--- /dev/null
+++ b/plugins/Resolution/lang/tl.json
@@ -0,0 +1,11 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Configuration",
+        "ColumnResolution": "Resolusyon",
+        "Configurations": "Configurations",
+        "Resolutions": "Mga Resolution",
+        "WidgetGlobalVisitors": "Configuration ng bisita",
+        "WidgetGlobalVisitorsDocumentation": "Ang ulat na ito ay nagpapakita ng karaniwang pangkalahatang configuration na meron ang iyong bisita. Ang configuration ay binubuo ng operating system uri ng mga browser at screen resolution.",
+        "WidgetResolutions": "Screen Resolution"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/tr.json b/plugins/Resolution/lang/tr.json
new file mode 100644
index 0000000000..91a8e73aa4
--- /dev/null
+++ b/plugins/Resolution/lang/tr.json
@@ -0,0 +1,10 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Konfigürasyon",
+        "ColumnResolution": "Çözünürlük",
+        "Configurations": "Konfigürasyonları",
+        "Resolutions": "Çözünürlükler",
+        "WidgetGlobalVisitors": "Global ziyaretçi konfikasyonu",
+        "WidgetResolutions": "Ekran çözünürlükleri"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/uk.json b/plugins/Resolution/lang/uk.json
new file mode 100644
index 0000000000..546bbaec47
--- /dev/null
+++ b/plugins/Resolution/lang/uk.json
@@ -0,0 +1,10 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Конфігурація",
+        "ColumnResolution": "Роздільна здатність",
+        "Configurations": "Конфігурації",
+        "Resolutions": "Роздільні здатності",
+        "WidgetGlobalVisitors": "Загальна конфігурація відвідувачів",
+        "WidgetResolutions": "Роздільні здатності"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/vi.json b/plugins/Resolution/lang/vi.json
new file mode 100644
index 0000000000..600e5fe0ad
--- /dev/null
+++ b/plugins/Resolution/lang/vi.json
@@ -0,0 +1,11 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "Cấu hình",
+        "ColumnResolution": "Độ phân giải",
+        "Configurations": "cấu hình",
+        "Resolutions": "Độ phân giải",
+        "WidgetGlobalVisitors": "Cấu hình khách truy cập",
+        "WidgetGlobalVisitorsDocumentation": "Báo cáo này cho thấy các cấu hình tổng thể phổ biến nhất mà khách truy cập của bạn đã có. Một cấu hình là sự kết hợp của một hệ điều hành, một loại trình duyệt và độ phân giải màn hình.",
+        "WidgetResolutions": "Độ phân giải màn hình"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/zh-cn.json b/plugins/Resolution/lang/zh-cn.json
new file mode 100644
index 0000000000..ad8ae4895e
--- /dev/null
+++ b/plugins/Resolution/lang/zh-cn.json
@@ -0,0 +1,11 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "客户端配置",
+        "ColumnResolution": "分辨率",
+        "Configurations": "客户端配置",
+        "Resolutions": "分辨率",
+        "WidgetGlobalVisitors": "访客设置",
+        "WidgetGlobalVisitorsDocumentation": "本报表显示您的访客最常用的系统配置。系统配置是操作系统、浏览器类型及显示器分辨率的组合。",
+        "WidgetResolutions": "画面分辨率"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Resolution/lang/zh-tw.json b/plugins/Resolution/lang/zh-tw.json
new file mode 100644
index 0000000000..6247b35720
--- /dev/null
+++ b/plugins/Resolution/lang/zh-tw.json
@@ -0,0 +1,11 @@
+{
+    "Resolution": {
+        "ColumnConfiguration": "客戶端配置",
+        "ColumnResolution": "解析度",
+        "Configurations": "客戶端配置",
+        "Resolutions": "解析度",
+        "WidgetGlobalVisitors": "全域訪客配置",
+        "WidgetGlobalVisitorsDocumentation": "此報表列出貴站訪客最常見的設定配置。設定配置包含作業系統、瀏覽器、螢幕解析度等資訊。",
+        "WidgetResolutions": "畫面解析度"
+    }
+}
\ No newline at end of file
diff --git a/plugins/SEO/API.php b/plugins/SEO/API.php
index 167f37e6ba..fdadbf518f 100644
--- a/plugins/SEO/API.php
+++ b/plugins/SEO/API.php
@@ -4,24 +4,28 @@
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
  */
+
 namespace Piwik\Plugins\SEO;
 
 use Piwik\DataTable;
 use Piwik\Piwik;
+use Piwik\Plugins\SEO\Metric\Aggregator;
+use Piwik\Plugins\SEO\Metric\Metric;
+use Piwik\Plugins\SEO\Metric\ProviderCache;
+use Piwik\Url;
 
 /**
  * @see plugins/Referrers/functions.php
- * @method static \Piwik\Plugins\SEO\API getInstance()
+ * @method static API getInstance()
  */
 require_once PIWIK_INCLUDE_PATH . '/plugins/Referrers/functions.php';
 
 /**
- * The SEO API lets you access a list of SEO metrics for the specified URL: Google Pagerank, Goolge/Bing indexed pages
+ * The SEO API lets you access a list of SEO metrics for the specified URL: Google PageRank, Google/Bing indexed pages
  * Alexa Rank, age of the Domain name and count of DMOZ entries.
  *
- * @method static \Piwik\Plugins\SEO\API getInstance()
+ * @method static API getInstance()
  */
 class API extends \Piwik\Plugin\API
 {
@@ -34,62 +38,38 @@ class API extends \Piwik\Plugin\API
     public function getRank($url)
     {
         Piwik::checkUserHasSomeViewAccess();
-        $rank = new RankChecker($url);
 
-        $linkToMajestic = MajesticClient::getLinkForUrl($url);
+        $metricProvider = new ProviderCache(new Aggregator());
+        $domain = Url::getHostFromUrl($url);
+        $metrics = $metricProvider->getMetrics($domain);
+
+        return $this->toDataTable($metrics);
+    }
+
+    /**
+     * @param Metric[] $metrics
+     * @return DataTable
+     */
+    private function toDataTable(array $metrics)
+    {
+        $translated = array();
 
-        $data = array(
-            'Google PageRank'                          => array(
-                'rank' => $rank->getPageRank(),
-                'logo' => \Piwik\Plugins\Referrers\getSearchEngineLogoFromUrl('http://google.com'),
-                'id'   => 'pagerank'
-            ),
-            Piwik::translate('SEO_Google_IndexedPages') => array(
-                'rank' => $rank->getIndexedPagesGoogle(),
-                'logo' => \Piwik\Plugins\Referrers\getSearchEngineLogoFromUrl('http://google.com'),
-                'id'   => 'google-index',
-            ),
-            Piwik::translate('SEO_Bing_IndexedPages')   => array(
-                'rank' => $rank->getIndexedPagesBing(),
-                'logo' => \Piwik\Plugins\Referrers\getSearchEngineLogoFromUrl('http://bing.com'),
-                'id'   => 'bing-index',
-            ),
-            Piwik::translate('SEO_AlexaRank')           => array(
-                'rank' => $rank->getAlexaRank(),
-                'logo' => \Piwik\Plugins\Referrers\getSearchEngineLogoFromUrl('http://alexa.com'),
-                'id'   => 'alexa',
-            ),
-            Piwik::translate('SEO_DomainAge')           => array(
-                'rank' => $rank->getAge(),
-                'logo' => 'plugins/SEO/images/whois.png',
-                'id'   => 'domain-age',
-            ),
-            Piwik::translate('SEO_ExternalBacklinks')   => array(
-                'rank'         => $rank->getExternalBacklinkCount(),
-                'logo'         => 'plugins/SEO/images/majesticseo.png',
-                'logo_link'    => $linkToMajestic,
-                'logo_tooltip' => Piwik::translate('SEO_ViewBacklinksOnMajesticSEO'),
-                'id'           => 'external-backlinks',
-            ),
-            Piwik::translate('SEO_ReferrerDomains')     => array(
-                'rank'         => $rank->getReferrerDomainCount(),
-                'logo'         => 'plugins/SEO/images/majesticseo.png',
-                'logo_link'    => $linkToMajestic,
-                'logo_tooltip' => Piwik::translate('SEO_ViewBacklinksOnMajesticSEO'),
-                'id'           => 'referrer-domains',
-            ),
-        );
+        foreach ($metrics as $metric) {
+            if (!$metric instanceof Metric) {
+                continue;
+            }
 
-        // Add DMOZ only if > 0 entries found
-        $dmozRank = array(
-            'rank' => $rank->getDmoz(),
-            'logo' => \Piwik\Plugins\Referrers\getSearchEngineLogoFromUrl('http://dmoz.org'),
-            'id'   => 'dmoz',
-        );
-        if ($dmozRank['rank'] > 0) {
-            $data[Piwik::translate('SEO_Dmoz')] = $dmozRank;
+            $label = Piwik::translate($metric->getName());
+            $translated[$label] = array(
+                'id'           => $metric->getId(),
+                'rank'         => $metric->getValue(),
+                'logo'         => $metric->getLogo(),
+                'logo_link'    => $metric->getLogoLink(),
+                'logo_tooltip' => Piwik::translate($metric->getLogoTooltip()),
+                'rank_suffix'  => Piwik::translate($metric->getValueSuffix()),
+            );
         }
 
-        return DataTable::makeFromIndexedArray($data);
+        return DataTable::makeFromIndexedArray($translated);
     }
 }
diff --git a/plugins/SEO/MajesticClient.php b/plugins/SEO/MajesticClient.php
deleted file mode 100644
index b7a7eeddc8..0000000000
--- a/plugins/SEO/MajesticClient.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\SEO;
-
-use Piwik\Common;
-use Piwik\Http;
-
-/**
- * Client for Majestic SEO's HTTP API.
- *
- * Hides the HTTP request sending logic.
- */
-class MajesticClient
-{
-    const API_BASE = 'http://simpleapi.majesticseo.com/sapi/';
-    const API_KEY = 'ETHPYY'; // please only use this key within Piwik
-
-    /**
-     * Returns a URL that can be used to view all SEO data for a particular website.
-     *
-     * @param string $targetSiteUrl The URL of the website for whom SEO stats should be
-     *                              accessible for.
-     * @return string
-     */
-    public static function getLinkForUrl($targetSiteUrl)
-    {
-        $domain = @parse_url($targetSiteUrl, PHP_URL_HOST);
-        return "http://www.majesticseo.com/reports/site-explorer/summary/$domain?IndexDataSource=F";
-    }
-
-    /**
-     * Returns backlink statistics including the count of backlinks and count of
-     * referrer domains (domains with backlinks).
-     *
-     * This method issues an HTTP request and waits for it to return.
-     *
-     * @param string $siteDomain The domain of the website to get stats for.
-     * @param int $timeout The number of seconds to wait before aborting
-     *                     the HTTP request.
-     * @return array An array containing the backlink count and referrer
-     *               domain count:
-     *               array(
-     *                   'backlink_count' => X,
-     *                   'referrer_domains_count' => Y
-     *               )
-     *               If either stat is false, either the API returned an
-     *               error, or the IP was blocked for this request.
-     */
-    public function getBacklinkStats($siteDomain, $timeout = 300)
-    {
-        $apiUrl = $this->getApiUrl($method = 'GetBacklinkStats', $args = array(
-            'items' => '1',
-            'item0' => $siteDomain
-        ));
-        $apiResponse = Http::sendHttpRequest($apiUrl, $timeout);
-
-        $result = array(
-            'backlink_count'         => false,
-            'referrer_domains_count' => false
-        );
-
-        $apiResponse = json_decode($apiResponse, $assoc = true);
-        if (!empty($apiResponse)
-            && !empty($apiResponse['Data'])
-        ) {
-            $siteSeoStats = reset($apiResponse['Data']);
-
-            if (isset($siteSeoStats['ExtBackLinks'])
-                && $siteSeoStats['ExtBackLinks'] !== -1
-            ) {
-                $result['backlink_count'] = $siteSeoStats['ExtBackLinks'];
-            }
-
-            if (isset($siteSeoStats['RefDomains'])
-                && $siteSeoStats['RefDomains'] !== -1
-            ) {
-                $result['referrer_domains_count'] = $siteSeoStats['RefDomains'];
-            }
-        }
-
-        return $result;
-    }
-
-    private function getApiUrl($method, $args = array())
-    {
-        $args['sak'] = self::API_KEY;
-
-        $queryString = http_build_query($args);
-        return self::API_BASE . $method . '?' . $queryString;
-    }
-}
diff --git a/plugins/SEO/Metric/Aggregator.php b/plugins/SEO/Metric/Aggregator.php
new file mode 100644
index 0000000000..bdaf430000
--- /dev/null
+++ b/plugins/SEO/Metric/Aggregator.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\SEO\Metric;
+
+use Piwik\Container\StaticContainer;
+use Piwik\Metrics\Formatter;
+use Piwik\Piwik;
+
+/**
+ * Aggregates metrics from several providers.
+ */
+class Aggregator implements MetricsProvider
+{
+    /**
+     * @var MetricsProvider[]
+     */
+    private $providers;
+
+    public function __construct()
+    {
+        $this->providers = $this->getProviders();
+    }
+
+    public function getMetrics($domain)
+    {
+        $metrics = array();
+
+        foreach ($this->providers as $provider) {
+            $metrics = array_merge($metrics, $provider->getMetrics($domain));
+        }
+
+        return $metrics;
+    }
+
+    /**
+     * @return MetricsProvider[]
+     */
+    private function getProviders()
+    {
+        $container = StaticContainer::getContainer();
+
+        $providers = array(
+            $container->get('Piwik\Plugins\SEO\Metric\Google'),
+            $container->get('Piwik\Plugins\SEO\Metric\Bing'),
+            $container->get('Piwik\Plugins\SEO\Metric\Alexa'),
+            $container->get('Piwik\Plugins\SEO\Metric\DomainAge'),
+            $container->get('Piwik\Plugins\SEO\Metric\Majestic'),
+            $container->get('Piwik\Plugins\SEO\Metric\Dmoz'),
+        );
+
+        /**
+         * Use this event to register new SEO metrics providers.
+         *
+         * @param array $providers Contains an array of Piwik\Plugins\SEO\Metric\MetricsProvider instances.
+         */
+        Piwik::postEvent('SEO.getMetricsProviders', array(&$providers));
+
+        return $providers;
+    }
+}
diff --git a/plugins/SEO/Metric/Alexa.php b/plugins/SEO/Metric/Alexa.php
new file mode 100644
index 0000000000..d9ec020954
--- /dev/null
+++ b/plugins/SEO/Metric/Alexa.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\SEO\Metric;
+
+use Piwik\Http;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Retrieves the Alexa rank.
+ */
+class Alexa implements MetricsProvider
+{
+    const URL = 'http://data.alexa.com/data?cli=10&url=';
+    const LINK = 'http://www.alexa.com/siteinfo/';
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    public function __construct(LoggerInterface $logger)
+    {
+        $this->logger = $logger;
+    }
+
+    public function getMetrics($domain)
+    {
+        try {
+            $response = Http::sendHttpRequest(self::URL . urlencode($domain), $timeout = 10, @$_SERVER['HTTP_USER_AGENT']);
+
+            $xml = @simplexml_load_string($response);
+            $value = $xml ? (string)$xml->SD->POPULARITY['TEXT'] : null;
+        } catch (\Exception $e) {
+            $this->logger->warning('Error while getting Alexa SEO stats: {message}', array('message' => $e->getMessage()));
+            $value = null;
+        }
+
+        $logo = \Piwik\Plugins\Referrers\getSearchEngineLogoFromUrl('http://alexa.com');
+        $link = self::LINK . urlencode($domain);
+
+        return array(
+            new Metric('alexa', 'SEO_AlexaRank', $value, $logo, $link)
+        );
+    }
+}
diff --git a/plugins/SEO/Metric/Bing.php b/plugins/SEO/Metric/Bing.php
new file mode 100644
index 0000000000..c01b23d576
--- /dev/null
+++ b/plugins/SEO/Metric/Bing.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\SEO\Metric;
+
+use Piwik\Http;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Fetches the number of pages indexed in Bing.
+ */
+class Bing implements MetricsProvider
+{
+    const URL = 'http://www.bing.com/search?mkt=en-US&q=site%3A';
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    public function __construct(LoggerInterface $logger)
+    {
+        $this->logger = $logger;
+    }
+
+    public function getMetrics($domain)
+    {
+        $url = self::URL . urlencode($domain);
+
+        try {
+            $response = str_replace('&nbsp;', ' ', Http::sendHttpRequest($url, $timeout = 10, @$_SERVER['HTTP_USER_AGENT']));
+
+            if (preg_match('#([0-9\,]+) results#i', $response, $p)) {
+                $pageCount = (int)str_replace(',', '', $p[1]);
+            } else {
+                $pageCount = 0;
+            }
+        } catch (\Exception $e) {
+            $this->logger->warning('Error while getting Bing SEO stats: {message}', array('message' => $e->getMessage()));
+            $pageCount = null;
+        }
+
+        $logo = \Piwik\Plugins\Referrers\getSearchEngineLogoFromUrl('http://bing.com');
+
+        return array(
+            new Metric('bing-index', 'SEO_Bing_IndexedPages', $pageCount, $logo, null, null, 'General_Pages')
+        );
+    }
+}
diff --git a/plugins/SEO/Metric/Dmoz.php b/plugins/SEO/Metric/Dmoz.php
new file mode 100644
index 0000000000..82ffd248ba
--- /dev/null
+++ b/plugins/SEO/Metric/Dmoz.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\SEO\Metric;
+
+use Piwik\Http;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Retrieves the number of Dmoz.org entries.
+ */
+class Dmoz implements MetricsProvider
+{
+    const URL = 'http://www.dmoz.org/search?q=';
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param LoggerInterface $logger
+     */
+    public function __construct(LoggerInterface $logger)
+    {
+        $this->logger = $logger;
+    }
+
+    public function getMetrics($domain)
+    {
+        try {
+            $response = Http::sendHttpRequest(self::URL . urlencode($domain), $timeout = 10, @$_SERVER['HTTP_USER_AGENT']);
+
+            preg_match('#Open Directory Sites[^\(]+\([0-9]-[0-9]+ of ([0-9]+)\)#', $response, $p);
+            if (!empty($p[1])) {
+                $value = (int)$p[1];
+            } else {
+                $value = 0;
+            }
+
+            // Add DMOZ only if > 0 entries found
+            if ($value == 0) {
+                return array();
+            }
+        } catch (\Exception $e) {
+            $this->logger->warning('Error while getting Dmoz SEO stats: {message}', array('message' => $e->getMessage()));
+            $value = null;
+        }
+
+        $logo = \Piwik\Plugins\Referrers\getSearchEngineLogoFromUrl('http://dmoz.org');
+
+        return array(
+            new Metric('dmoz', 'SEO_Dmoz', $value, $logo)
+        );
+    }
+}
diff --git a/plugins/SEO/Metric/DomainAge.php b/plugins/SEO/Metric/DomainAge.php
new file mode 100644
index 0000000000..a059b49572
--- /dev/null
+++ b/plugins/SEO/Metric/DomainAge.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\SEO\Metric;
+
+use Piwik\Http;
+use Piwik\Metrics\Formatter;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Fetches the domain age using archive.org, who.is and whois.com.
+ */
+class DomainAge implements MetricsProvider
+{
+    /**
+     * @var Formatter
+     */
+    private $formatter;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    public function __construct(Formatter $formatter, LoggerInterface $logger)
+    {
+        $this->formatter = $formatter;
+        $this->logger = $logger;
+    }
+
+    public function getMetrics($domain)
+    {
+        $ages = array();
+
+        $age = $this->getAgeArchiveOrg($domain);
+        if ($age > 0) {
+            $ages[] = $age;
+        }
+
+        $age = $this->getAgeWhoIs($domain);
+        if ($age > 0) {
+            $ages[] = $age;
+        }
+
+        $age = $this->getAgeWhoisCom($domain);
+        if ($age > 0) {
+            $ages[] = $age;
+        }
+
+        if (count($ages) > 0) {
+            $value = min($ages);
+            $value = $this->formatter->getPrettyTimeFromSeconds(time() - $value, true);
+        } else {
+            $value = null;
+        }
+
+        return array(
+            new Metric('domain-age', 'SEO_DomainAge', $value, 'plugins/SEO/images/whois.png')
+        );
+    }
+
+    /**
+     * Returns the domain age archive.org lists for the current url
+     *
+     * @param string $domain
+     * @return int
+     */
+    private function getAgeArchiveOrg($domain)
+    {
+        $url = str_replace('www.', '', $domain);
+        $data = $this->getUrl('http://wayback.archive.org/web/*/' . urlencode($url));
+        preg_match('#<a href=\"([^>]*)' . preg_quote($url) . '/\">([^<]*)<\/a>#', $data, $p);
+        if (!empty($p[2])) {
+            $value = strtotime($p[2]);
+            if ($value === false) {
+                return 0;
+            }
+            return $value;
+        }
+        return 0;
+    }
+
+    /**
+     * Returns the domain age who.is lists for the current url
+     *
+     * @param string $domain
+     * @return int
+     */
+    private function getAgeWhoIs($domain)
+    {
+        $url = preg_replace('/^www\./', '', $domain);
+        $url = 'http://www.who.is/whois/' . urlencode($url);
+        $data = $this->getUrl($url);
+        preg_match('#(?:Creation Date|Created On|created|Registered on)\.*:\s*([ \ta-z0-9\/\-:\.]+)#si', $data, $p);
+        if (!empty($p[1])) {
+            $value = strtotime(trim($p[1]));
+            if ($value === false) {
+                return 0;
+            }
+            return $value;
+        }
+        return 0;
+    }
+
+    /**
+     * Returns the domain age whois.com lists for the current url
+     *
+     * @param string $domain
+     * @return int
+     */
+    private function getAgeWhoisCom($domain)
+    {
+        $url = preg_replace('/^www\./', '', $domain);
+        $url = 'http://www.whois.com/whois/' . urlencode($url);
+        $data = $this->getUrl($url);
+        preg_match('#(?:Creation Date|Created On|created):\s*([ \ta-z0-9\/\-:\.]+)#si', $data, $p);
+        if (!empty($p[1])) {
+            $value = strtotime(trim($p[1]));
+            if ($value === false) {
+                return 0;
+            }
+            return $value;
+        }
+        return 0;
+    }
+
+    private function getUrl($url)
+    {
+        try {
+            return str_replace('&nbsp;', ' ', Http::sendHttpRequest($url, $timeout = 10, @$_SERVER['HTTP_USER_AGENT']));
+        } catch (\Exception $e) {
+            $this->logger->warning('Error while getting SEO stats (domain age): {message}', array('message' => $e->getMessage()));
+            return '';
+        }
+    }
+}
diff --git a/plugins/SEO/Metric/Google.php b/plugins/SEO/Metric/Google.php
new file mode 100644
index 0000000000..84e021c2ea
--- /dev/null
+++ b/plugins/SEO/Metric/Google.php
@@ -0,0 +1,170 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\SEO\Metric;
+
+use Piwik\Http;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Retrieves Google PageRank.
+ */
+class Google implements MetricsProvider
+{
+    const SEARCH_URL = 'http://www.google.com/search?hl=en&q=site%3A';
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param LoggerInterface $logger
+     */
+    public function __construct(LoggerInterface $logger)
+    {
+        $this->logger = $logger;
+    }
+
+    public function getMetrics($domain)
+    {
+        $pageCount = $this->fetchIndexedPagesCount($domain);
+        $pageRank = $this->fetchPageRank($domain);
+
+        $logo = \Piwik\Plugins\Referrers\getSearchEngineLogoFromUrl('http://google.com');
+
+        return array(
+            new Metric('google-index', 'SEO_Google_IndexedPages', $pageCount, $logo, null, null, 'General_Pages'),
+            new Metric('pagerank', 'Google PageRank', $pageRank, $logo, null, null, '/10'),
+        );
+    }
+
+    public function fetchIndexedPagesCount($domain)
+    {
+        $url = self::SEARCH_URL . urlencode($domain);
+
+        try {
+            $response = str_replace('&nbsp;', ' ', Http::sendHttpRequest($url, $timeout = 10, @$_SERVER['HTTP_USER_AGENT']));
+
+            if (preg_match('#([0-9\,]+) results#i', $response, $p)) {
+                return (int)str_replace(',', '', $p[1]);
+            } else {
+                return 0;
+            }
+        } catch (\Exception $e) {
+            $this->logger->warning('Error while getting Google search SEO stats: {message}', array('message' => $e->getMessage()));
+            return null;
+        }
+    }
+
+    public function fetchPageRank($domain)
+    {
+        $chwrite = $this->checkHash($this->hashURL($domain));
+
+        $url = "http://toolbarqueries.google.com/tbr?client=navclient-auto&ch=" . $chwrite . "&features=Rank&q=info:" . $domain . "&num=100&filter=0";
+
+        try {
+            $response = Http::sendHttpRequest($url, $timeout = 10, @$_SERVER['HTTP_USER_AGENT']);
+
+            preg_match('#Rank_[0-9]:[0-9]:([0-9]+){1,}#si', $response, $p);
+
+            return isset($p[1]) ? $p[1] : null;
+        } catch (\Exception $e) {
+            $this->logger->warning('Error while getting Google PageRank for SEO stats: {message}', array('message' => $e->getMessage()));
+            return null;
+        }
+    }
+
+    /**
+     * Generate a hash for a url
+     *
+     * @param string $string
+     * @return int
+     */
+    private function hashURL($string)
+    {
+        $Check1 = $this->strToNum($string, 0x1505, 0x21);
+        $Check2 = $this->strToNum($string, 0, 0x1003F);
+
+        $Check1 >>= 2;
+        $Check1 = (($Check1 >> 4) & 0x3FFFFC0) | ($Check1 & 0x3F);
+        $Check1 = (($Check1 >> 4) & 0x3FFC00) | ($Check1 & 0x3FF);
+        $Check1 = (($Check1 >> 4) & 0x3C000) | ($Check1 & 0x3FFF);
+
+        $T1 = (((($Check1 & 0x3C0) << 4) | ($Check1 & 0x3C)) << 2) | ($Check2 & 0xF0F);
+        $T2 = (((($Check1 & 0xFFFFC000) << 4) | ($Check1 & 0x3C00)) << 0xA) | ($Check2 & 0xF0F0000);
+
+        return ($T1 | $T2);
+    }
+
+    /**
+     * Generate a checksum for the hash string
+     *
+     * @param int $hashnum
+     * @return string
+     */
+    private function checkHash($hashnum)
+    {
+        $CheckByte = 0;
+        $Flag = 0;
+
+        $HashStr = sprintf('%u', $hashnum);
+        $length = strlen($HashStr);
+
+        for ($i = $length - 1; $i >= 0; $i--) {
+            $Re = $HashStr{$i};
+            if (1 === ($Flag % 2)) {
+                $Re += $Re;
+                $Re = (int)($Re / 10) + ($Re % 10);
+            }
+            $CheckByte += $Re;
+            $Flag++;
+        }
+
+        $CheckByte %= 10;
+        if (0 !== $CheckByte) {
+            $CheckByte = 10 - $CheckByte;
+            if (1 === ($Flag % 2)) {
+                if (1 === ($CheckByte % 2)) {
+                    $CheckByte += 9;
+                }
+                $CheckByte >>= 1;
+            }
+        }
+
+        return '7' . $CheckByte . $HashStr;
+    }
+
+    /**
+     * Convert numeric string to int
+     *
+     * @param string $Str
+     * @param int $Check
+     * @param int $Magic
+     * @return int
+     */
+    private function strToNum($Str, $Check, $Magic)
+    {
+        $Int32Unit = 4294967296; // 2^32
+
+        $length = strlen($Str);
+        for ($i = 0; $i < $length; $i++) {
+            $Check *= $Magic;
+            // If the float is beyond the boundaries of integer (usually +/- 2.15e+9 = 2^31),
+            // the result of converting to integer is undefined
+            // refer to http://www.php.net/manual/en/language.types.integer.php
+            if ($Check >= $Int32Unit) {
+                $Check = ($Check - $Int32Unit * (int)($Check / $Int32Unit));
+                //if the check less than -2^31
+                $Check = ($Check < -2147483648) ? ($Check + $Int32Unit) : $Check;
+            }
+            $Check += ord($Str{$i});
+        }
+        return $Check;
+    }
+}
diff --git a/plugins/SEO/Metric/Majestic.php b/plugins/SEO/Metric/Majestic.php
new file mode 100644
index 0000000000..f276232945
--- /dev/null
+++ b/plugins/SEO/Metric/Majestic.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\SEO\Metric;
+
+use Piwik\Http;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Client for Majestic SEO's HTTP API.
+ */
+class Majestic implements MetricsProvider
+{
+    const API_BASE = 'http://simpleapi.majesticseo.com/sapi/';
+    const API_KEY = 'ETHPYY'; // please only use this key within Piwik
+    const LOGO = 'plugins/SEO/images/majesticseo.png';
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param LoggerInterface $logger
+     */
+    public function __construct(LoggerInterface $logger)
+    {
+        $this->logger = $logger;
+    }
+
+    public function getMetrics($domain)
+    {
+        try {
+            $stats = $this->getBacklinkStats($domain);
+            $backlinks = $stats['backlink_count'];
+            $referrers = $stats['referrer_domains_count'];
+        } catch (\Exception $e) {
+            $this->logger->warning('Error while getting Majestic SEO stats: {message}', array('message' => $e->getMessage()));
+            $backlinks = null;
+            $referrers = null;
+        }
+
+        $link = $this->getLinkForUrl($domain);
+
+        return array(
+            new Metric('external-backlinks', 'SEO_ExternalBacklinks', $backlinks, self::LOGO, $link, 'SEO_ViewBacklinksOnMajesticSEO'),
+            new Metric('referrer-domains', 'SEO_ReferrerDomains', $referrers, self::LOGO, $link, 'SEO_ViewBacklinksOnMajesticSEO'),
+        );
+    }
+
+    /**
+     * Returns a URL that can be used to view all SEO data for a particular website.
+     *
+     * @param string $targetSiteUrl The URL of the website for whom SEO stats should be
+     *                              accessible for.
+     * @return string
+     */
+    private function getLinkForUrl($targetSiteUrl)
+    {
+        $domain = @parse_url($targetSiteUrl, PHP_URL_HOST);
+        return "http://www.majesticseo.com/reports/site-explorer/summary/$domain?IndexDataSource=F";
+    }
+
+    /**
+     * Returns backlink statistics including the count of backlinks and count of
+     * referrer domains (domains with backlinks).
+     *
+     * This method issues an HTTP request and waits for it to return.
+     *
+     * @param string $siteDomain The domain of the website to get stats for.
+     * @param int $timeout The number of seconds to wait before aborting
+     *                     the HTTP request.
+     * @return array An array containing the backlink count and referrer
+     *               domain count:
+     *               array(
+     *                   'backlink_count' => X,
+     *                   'referrer_domains_count' => Y
+     *               )
+     *               If either stat is false, either the API returned an
+     *               error, or the IP was blocked for this request.
+     */
+    private function getBacklinkStats($siteDomain, $timeout = 300)
+    {
+        $apiUrl = $this->getApiUrl($method = 'GetBacklinkStats', $args = array(
+            'items' => '1',
+            'item0' => $siteDomain
+        ));
+        $apiResponse = Http::sendHttpRequest($apiUrl, $timeout);
+
+        $result = array(
+            'backlink_count'         => false,
+            'referrer_domains_count' => false
+        );
+
+        $apiResponse = json_decode($apiResponse, $assoc = true);
+        if (!empty($apiResponse)
+            && !empty($apiResponse['Data'])
+        ) {
+            $siteSeoStats = reset($apiResponse['Data']);
+
+            if (isset($siteSeoStats['ExtBackLinks'])
+                && $siteSeoStats['ExtBackLinks'] !== -1
+            ) {
+                $result['backlink_count'] = $siteSeoStats['ExtBackLinks'];
+            }
+
+            if (isset($siteSeoStats['RefDomains'])
+                && $siteSeoStats['RefDomains'] !== -1
+            ) {
+                $result['referrer_domains_count'] = $siteSeoStats['RefDomains'];
+            }
+        }
+
+        return $result;
+    }
+
+    private function getApiUrl($method, $args = array())
+    {
+        $args['sak'] = self::API_KEY;
+
+        $queryString = http_build_query($args);
+        return self::API_BASE . $method . '?' . $queryString;
+    }
+}
diff --git a/plugins/SEO/Metric/Metric.php b/plugins/SEO/Metric/Metric.php
new file mode 100644
index 0000000000..ec28b55138
--- /dev/null
+++ b/plugins/SEO/Metric/Metric.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\SEO\Metric;
+
+/**
+ * Describes a SEO metric.
+ */
+class Metric
+{
+    /**
+     * @var string
+     */
+    private $id;
+
+    /**
+     * @var string
+     */
+    private $name;
+
+    /**
+     * @var string
+     */
+    private $value;
+
+    /**
+     * @var string
+     */
+    private $logo;
+
+    /**
+     * @var string|null
+     */
+    private $logoLink;
+
+    /**
+     * @var string|null
+     */
+    private $logoTooltip;
+
+    /**
+     * @var string|null
+     */
+    private $valueSuffix;
+
+    /**
+     * @param string $id
+     * @param string $name Can be a string or a translation ID.
+     * @param string $value Rank value.
+     * @param string $logo URL to a logo.
+     * @param string|null $logoLink
+     * @param string|null $logoTooltip
+     * @param string|null $valueSuffix
+     */
+    public function __construct($id, $name, $value, $logo, $logoLink = null, $logoTooltip = null, $valueSuffix = null)
+    {
+        $this->id = $id;
+        $this->name = $name;
+        $this->value = $value;
+        $this->logo = $logo;
+        $this->logoLink = $logoLink;
+        $this->logoTooltip = $logoTooltip;
+        $this->valueSuffix = $valueSuffix;
+    }
+
+    /**
+     * @return string
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return string
+     */
+    public function getValue()
+    {
+        return $this->value;
+    }
+
+    /**
+     * @return string
+     */
+    public function getLogo()
+    {
+        return $this->logo;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getLogoLink()
+    {
+        return $this->logoLink;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getLogoTooltip()
+    {
+        return $this->logoTooltip;
+    }
+
+    /**
+     * @return null|string
+     */
+    public function getValueSuffix()
+    {
+        return $this->valueSuffix;
+    }
+
+    /**
+     * Allows the class to be serialized with var_export (in the cache).
+     *
+     * @param array $array
+     * @return Metric
+     */
+    public static function __set_state($array)
+    {
+        return new self(
+            $array['id'],
+            $array['name'],
+            $array['value'],
+            $array['logo'],
+            $array['logoLink'],
+            $array['logoTooltip'],
+            $array['valueSuffix']
+        );
+    }
+}
diff --git a/plugins/SEO/Metric/MetricsProvider.php b/plugins/SEO/Metric/MetricsProvider.php
new file mode 100644
index 0000000000..c737efb928
--- /dev/null
+++ b/plugins/SEO/Metric/MetricsProvider.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\SEO\Metric;
+
+/**
+ * Provides SEO metrics for a domain.
+ */
+interface MetricsProvider
+{
+    /**
+     * @param string $domain
+     * @return Metric[]
+     */
+    public function getMetrics($domain);
+}
diff --git a/plugins/SEO/Metric/ProviderCache.php b/plugins/SEO/Metric/ProviderCache.php
new file mode 100644
index 0000000000..cb03063281
--- /dev/null
+++ b/plugins/SEO/Metric/ProviderCache.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\SEO\Metric;
+
+use Piwik\Cache;
+
+/**
+ * Caches another provider.
+ */
+class ProviderCache implements MetricsProvider
+{
+    /**
+     * @var MetricsProvider
+     */
+    private $provider;
+
+    /**
+     * @var Cache\Lazy
+     */
+    private $cache;
+
+    public function __construct(MetricsProvider $provider)
+    {
+        $this->provider = $provider;
+        $this->cache = Cache::getLazyCache();
+    }
+
+    public function getMetrics($domain)
+    {
+        $cacheId = 'SEO_getRank_' . md5($domain);
+
+        $metrics = $this->cache->fetch($cacheId);
+
+        if (! is_array($metrics)) {
+            $metrics = $this->provider->getMetrics($domain);
+
+            $this->cache->save($cacheId, $metrics, 60 * 60 * 6);
+        }
+
+        return $metrics;
+    }
+}
diff --git a/plugins/SEO/RankChecker.php b/plugins/SEO/RankChecker.php
deleted file mode 100644
index fa254070df..0000000000
--- a/plugins/SEO/RankChecker.php
+++ /dev/null
@@ -1,378 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\SEO;
-
-use Exception;
-use Piwik\Http;
-use Piwik\Log;
-use Piwik\Metrics\Formatter;
-
-/**
- * The functions below are derived/adapted from GetRank.org's
- * Free PageRank Script v2.0, released under GPL.
- *
- * @copyright Copyright (C) 2007 - 2010 GetRank.Org  All rights reserved.
- * @link http://www.getrank.org/free-pagerank-script/
- * @license GPL
- */
-class RankChecker
-{
-    private $url;
-    private $majesticInfo = null;
-    private $formatter = null;
-
-    public function __construct($url)
-    {
-        $this->url = self::extractDomainFromUrl($url);
-        $this->formatter = new Formatter();
-    }
-
-    /**
-     * Extract domain from URL as the web services generally
-     * expect only a domain name (i.e., no protocol, port, path, query, etc).
-     *
-     * @param string $url
-     * @return string
-     */
-    public static function extractDomainFromUrl($url)
-    {
-        return preg_replace(
-            array(
-                 '~^https?\://~si', // strip protocol
-                 '~[/:#?;%&].*~', // strip port, path, query, anchor, etc
-                 '~\.$~', // trailing period
-            ),
-            '', $url);
-    }
-
-    /**
-     * Web service proxy that retrieves the content at the specified URL
-     *
-     * @param string $url
-     * @return string
-     */
-    private function getPage($url)
-    {
-        try {
-            return str_replace('&nbsp;', ' ', Http::sendHttpRequest($url, $timeout = 10, @$_SERVER['HTTP_USER_AGENT']));
-        } catch (Exception $e) {
-            return '';
-        }
-    }
-
-    /**
-     * Returns the google page rank for the current url
-     *
-     * @return int
-     */
-    public function getPageRank()
-    {
-        $chwrite = $this->CheckHash($this->HashURL($this->url));
-
-        $url = "http://toolbarqueries.google.com/tbr?client=navclient-auto&ch=" . $chwrite . "&features=Rank&q=info:" . $this->url . "&num=100&filter=0";
-        $data = $this->getPage($url);
-        preg_match('#Rank_[0-9]:[0-9]:([0-9]+){1,}#si', $data, $p);
-        $value = isset($p[1]) ? $p[1] : 0;
-
-        return $value;
-    }
-
-    /**
-     * Returns the alexa traffic rank for the current url
-     *
-     * @return int
-     */
-    public function getAlexaRank()
-    {
-        $xml = @simplexml_load_string($this->getPage('http://data.alexa.com/data?cli=10&url=' . urlencode($this->url)));
-        return $xml ? $xml->SD->POPULARITY['TEXT'] : '';
-    }
-
-    /**
-     * Returns the number of Dmoz.org entries for the current url
-     *
-     * @return int
-     */
-    public function getDmoz()
-    {
-        $url = 'http://www.dmoz.org/search?q=' . urlencode($this->url);
-        $data = $this->getPage($url);
-        preg_match('#Open Directory Sites[^\(]+\([0-9]-[0-9]+ of ([0-9]+)\)#', $data, $p);
-        if (!empty($p[1])) {
-            return (int)$p[1];
-        }
-        return 0;
-    }
-
-    /**
-     * Returns the number of pages google holds in it's index for the current url
-     *
-     * @return int
-     */
-    public function getIndexedPagesGoogle()
-    {
-        $url = 'http://www.google.com/search?hl=en&q=site%3A' . urlencode($this->url);
-        $data = $this->getPage($url);
-        if (preg_match('#([0-9\,]+) results#i', $data, $p)) {
-            $indexedPages = (int)str_replace(',', '', $p[1]);
-            return $indexedPages;
-        }
-        return 0;
-    }
-
-    /**
-     * Returns the number of pages bing holds in it's index for the current url
-     *
-     * @return int
-     */
-    public function getIndexedPagesBing()
-    {
-        $url = 'http://www.bing.com/search?mkt=en-US&q=site%3A' . urlencode($this->url);
-        $data = $this->getPage($url);
-        if (preg_match('#([0-9\,]+) results#i', $data, $p)) {
-            return (int)str_replace(',', '', $p[1]);
-        }
-        return 0;
-    }
-
-    /**
-     * Returns the domain age for the current url
-     *
-     * @return int
-     */
-    public function getAge()
-    {
-        $ageArchiveOrg = $this->_getAgeArchiveOrg();
-        $ageWhoIs = $this->_getAgeWhoIs();
-        $ageWhoisCom = $this->_getAgeWhoisCom();
-
-        $ages = array();
-
-        if ($ageArchiveOrg > 0) {
-            $ages[] = $ageArchiveOrg;
-        }
-
-        if ($ageWhoIs > 0) {
-            $ages[] = $ageWhoIs;
-        }
-
-        if ($ageWhoisCom > 0) {
-            $ages[] = $ageWhoisCom;
-        }
-
-        if (count($ages) > 1) {
-            $maxAge = min($ages);
-        } else {
-            $maxAge = array_shift($ages);
-        }
-
-        if ($maxAge) {
-            return $this->formatter->getPrettyTimeFromSeconds(time() - $maxAge);
-        }
-        return false;
-    }
-
-    /**
-     * Returns the number backlinks that link to the current site.
-     *
-     * @return int
-     */
-    public function getExternalBacklinkCount()
-    {
-        try {
-            $majesticInfo = $this->getMajesticInfo();
-            return $majesticInfo['backlink_count'];
-        } catch (Exception $e) {
-            Log::info($e);
-            return 0;
-        }
-    }
-
-    /**
-     * Returns the number of referrer domains that link to the current site.
-     *
-     * @return int
-     */
-    public function getReferrerDomainCount()
-    {
-        try {
-            $majesticInfo = $this->getMajesticInfo();
-            return $majesticInfo['referrer_domains_count'];
-        } catch (Exception $e) {
-            Log::info($e);
-            return 0;
-        }
-    }
-
-    /**
-     * Returns the domain age archive.org lists for the current url
-     *
-     * @return int
-     */
-    protected function _getAgeArchiveOrg()
-    {
-        $url = str_replace('www.', '', $this->url);
-        $data = @$this->getPage('http://wayback.archive.org/web/*/' . urlencode($url));
-        preg_match('#<a href=\"([^>]*)' . preg_quote($url) . '/\">([^<]*)<\/a>#', $data, $p);
-        if (!empty($p[2])) {
-            $value = strtotime($p[2]);
-            if ($value === false) {
-                return 0;
-            }
-            return $value;
-        }
-        return 0;
-    }
-
-    /**
-     * Returns the domain age who.is lists for the current url
-     *
-     * @return int
-     */
-    protected function _getAgeWhoIs()
-    {
-        $url = preg_replace('/^www\./', '', $this->url);
-        $url = 'http://www.who.is/whois/' . urlencode($url);
-        $data = $this->getPage($url);
-        preg_match('#(?:Creation Date|Created On|created|Registered on)\.*:\s*([ \ta-z0-9\/\-:\.]+)#si', $data, $p);
-        if (!empty($p[1])) {
-            $value = strtotime(trim($p[1]));
-            if ($value === false) {
-                return 0;
-            }
-            return $value;
-        }
-        return 0;
-    }
-
-    /**
-     * Returns the domain age whois.com lists for the current url
-     *
-     * @return int
-     */
-    protected function _getAgeWhoisCom()
-    {
-        $url = preg_replace('/^www\./', '', $this->url);
-        $url = 'http://www.whois.com/whois/' . urlencode($url);
-        $data = $this->getPage($url);
-        preg_match('#(?:Creation Date|Created On|created):\s*([ \ta-z0-9\/\-:\.]+)#si', $data, $p);
-        if (!empty($p[1])) {
-            $value = strtotime(trim($p[1]));
-            if ($value === false) {
-                return 0;
-            }
-            return $value;
-        }
-        return 0;
-    }
-
-    /**
-     * Convert numeric string to int
-     *
-     * @see getPageRank()
-     *
-     * @param string $Str
-     * @param int $Check
-     * @param int $Magic
-     * @return int
-     */
-    private function StrToNum($Str, $Check, $Magic)
-    {
-        $Int32Unit = 4294967296; // 2^32
-
-        $length = strlen($Str);
-        for ($i = 0; $i < $length; $i++) {
-            $Check *= $Magic;
-            // If the float is beyond the boundaries of integer (usually +/- 2.15e+9 = 2^31),
-            // the result of converting to integer is undefined
-            // refer to http://www.php.net/manual/en/language.types.integer.php
-            if ($Check >= $Int32Unit) {
-                $Check = ($Check - $Int32Unit * (int)($Check / $Int32Unit));
-                //if the check less than -2^31
-                $Check = ($Check < -2147483648) ? ($Check + $Int32Unit) : $Check;
-            }
-            $Check += ord($Str{$i});
-        }
-        return $Check;
-    }
-
-    /**
-     * Generate a hash for a url
-     *
-     * @see getPageRank()
-     *
-     * @param string $String
-     * @return int
-     */
-    private function HashURL($String)
-    {
-        $Check1 = $this->StrToNum($String, 0x1505, 0x21);
-        $Check2 = $this->StrToNum($String, 0, 0x1003F);
-
-        $Check1 >>= 2;
-        $Check1 = (($Check1 >> 4) & 0x3FFFFC0) | ($Check1 & 0x3F);
-        $Check1 = (($Check1 >> 4) & 0x3FFC00) | ($Check1 & 0x3FF);
-        $Check1 = (($Check1 >> 4) & 0x3C000) | ($Check1 & 0x3FFF);
-
-        $T1 = (((($Check1 & 0x3C0) << 4) | ($Check1 & 0x3C)) << 2) | ($Check2 & 0xF0F);
-        $T2 = (((($Check1 & 0xFFFFC000) << 4) | ($Check1 & 0x3C00)) << 0xA) | ($Check2 & 0xF0F0000);
-
-        return ($T1 | $T2);
-    }
-
-    /**
-     * Generate a checksum for the hash string
-     *
-     * @see getPageRank()
-     *
-     * @param int $Hashnum
-     * @return string
-     */
-    private function CheckHash($Hashnum)
-    {
-        $CheckByte = 0;
-        $Flag = 0;
-
-        $HashStr = sprintf('%u', $Hashnum);
-        $length = strlen($HashStr);
-
-        for ($i = $length - 1; $i >= 0; $i--) {
-            $Re = $HashStr{$i};
-            if (1 === ($Flag % 2)) {
-                $Re += $Re;
-                $Re = (int)($Re / 10) + ($Re % 10);
-            }
-            $CheckByte += $Re;
-            $Flag++;
-        }
-
-        $CheckByte %= 10;
-        if (0 !== $CheckByte) {
-            $CheckByte = 10 - $CheckByte;
-            if (1 === ($Flag % 2)) {
-                if (1 === ($CheckByte % 2)) {
-                    $CheckByte += 9;
-                }
-                $CheckByte >>= 1;
-            }
-        }
-
-        return '7' . $CheckByte . $HashStr;
-    }
-
-    private function getMajesticInfo()
-    {
-        if ($this->majesticInfo === null) {
-            $client = new MajesticClient();
-            $this->majesticInfo = $client->getBacklinkStats($this->url);
-        }
-
-        return $this->majesticInfo;
-    }
-}
diff --git a/plugins/SEO/Widgets.php b/plugins/SEO/Widgets.php
index bf2e95e0a7..1f06c2ec8b 100644
--- a/plugins/SEO/Widgets.php
+++ b/plugins/SEO/Widgets.php
@@ -11,6 +11,7 @@ namespace Piwik\Plugins\SEO;
 use Piwik\Common;
 use Piwik\DataTable\Renderer;
 use Piwik\Site;
+use Piwik\Url;
 use Piwik\UrlHelper;
 use Piwik\View;
 
@@ -41,7 +42,7 @@ class Widgets extends \Piwik\Plugin\Widgets
         $dataTable = API::getInstance()->getRank($url);
 
         $view = new View('@SEO/getRank');
-        $view->urlToRank = RankChecker::extractDomainFromUrl($url);
+        $view->urlToRank = Url::getHostFromUrl($url);
 
         /** @var \Piwik\DataTable\Renderer\Php $renderer */
         $renderer = Renderer::factory('php');
diff --git a/plugins/SEO/templates/getRank.twig b/plugins/SEO/templates/getRank.twig
index 5233fc82ea..80bf40ef7b 100644
--- a/plugins/SEO/templates/getRank.twig
+++ b/plugins/SEO/templates/getRank.twig
@@ -22,25 +22,24 @@
                 {% endset %}
                 {{ 'SEO_SEORankingsFor'|translate(cleanUrl)|raw }}
                 <table cellspacing="2" style="margin:auto;line-height:1.5em;padding-top:10px;">
+
                     {% for rank in ranks %}
                         <tr>
-{% set seoLink %}{% if rank.logo_link is defined %}<a class="linkContent" href="?module=Proxy&action=redirect&url={{ rank.logo_link|url_encode }}"
+{% set seoLink %}{% if rank.logo_link is not empty %}<a class="linkContent" href="?module=Proxy&action=redirect&url={{ rank.logo_link|url_encode }}"
                                                     target="_blank"
                          {% if rank.logo_tooltip is not empty %}title="{{ rank.logo_tooltip }}"{% endif %}>{% endif %}{% endset %}
                             {% set majesticLink %}{{ seoLink }}Majestic</a>{% endset %}
-                            <td>{% if rank.logo_link is defined %}{{ seoLink|raw }}{% endif %}<img
+                            <td>{% if rank.logo_link is not empty %}{{ seoLink|raw }}{% endif %}<img
                                             style='vertical-align:middle;margin-right:6px;' src='{{ rank.logo }}' border='0'
-                                            alt="{{ rank.label }}">{% if rank.logo_link is defined %}</a>{% endif %} {{ rank.label|replace({"Majestic":
+                                            alt="{{ rank.label }}">{% if rank.logo_link is not empty %}</a>{% endif %} {{ rank.label|replace({"Majestic":
                                 majesticLink})|raw }}
                             </td>
                             <td>
                                 <div style="margin-left:15px;">
-                                {% if rank.logo_link is defined %}{{ seoLink|raw }}{% endif %}
+                                {% if rank.logo_link is not empty %}{{ seoLink|raw }}{% endif %}
                                     {% if rank.rank %}{{ rank.rank|raw }}{% else %}-{% endif %}
-                                    {% if rank.id=='pagerank' %} /10
-                                    {% elseif rank.id=='google-index' or rank.id=='bing-index' %} {{ 'General_Pages'|translate }}
-                                    {% endif %}
-                                {% if rank.logo_link is defined %}</a>{% endif %}
+                                    {{ rank.rank_suffix }}
+                                {% if rank.logo_link is not empty %}</a>{% endif %}
                                 </div>
                             </td>
                         </tr>
diff --git a/plugins/ScheduledReports/API.php b/plugins/ScheduledReports/API.php
index 54cbf41125..0c02e7957c 100644
--- a/plugins/ScheduledReports/API.php
+++ b/plugins/ScheduledReports/API.php
@@ -9,8 +9,10 @@
 namespace Piwik\Plugins\ScheduledReports;
 
 use Exception;
+use Piwik\API\Request;
 use Piwik\Common;
 use Piwik\Config;
+use Piwik\Container\StaticContainer;
 use Piwik\Date;
 use Piwik\Db;
 use Piwik\Log;
@@ -21,7 +23,9 @@ use Piwik\Plugins\SegmentEditor\API as APISegmentEditor;
 use Piwik\Plugins\SitesManager\API as SitesManagerApi;
 use Piwik\ReportRenderer;
 use Piwik\Site;
+use Piwik\Tracker;
 use Piwik\Translate;
+use Piwik\Translation\Translator;
 
 /**
  * The ScheduledReports API lets you manage Scheduled Email reports, as well as generate, download or email any existing report.
@@ -240,6 +244,10 @@ class API extends \Piwik\Plugin\API
 
             // decode report list
             $report['reports'] = json_decode($report['reports'], true);
+
+            if (!empty($report['parameters']['additionalEmails']) && is_array($report['parameters']['additionalEmails'])) {
+                $report['parameters']['additionalEmails'] = array_values($report['parameters']['additionalEmails']);
+            }
         }
 
         // static cache
@@ -269,7 +277,9 @@ class API extends \Piwik\Plugin\API
             $language = Translate::getLanguageDefault();
         }
 
-        Translate::reloadLanguage($language);
+        /** @var Translator $translator */
+        $translator = StaticContainer::get('Piwik\Translation\Translator');
+        $translator->setCurrentLanguage($language);
 
         $reports = $this->getReports($idSite = false, $_period = false, $idReport);
         $report = reset($reports);
@@ -348,12 +358,26 @@ class API extends \Piwik\Plugin\API
                 }
             }
 
-            $processedReport = \Piwik\Plugins\API\API::getInstance()->getProcessedReport(
-                $idSite, $period, $date, $apiModule, $apiAction,
-                $segment != null ? urlencode($segment['definition']) : false,
-                $apiParameters, $idGoal = false, $language
+            $params = array(
+                'idSite' => $idSite,
+                'period' => $period,
+                'date'   => $date,
+                'apiModule' => $apiModule,
+                'apiAction' => $apiAction,
+                'apiParameters' => $apiParameters,
+                'idGoal' => false,
+                'language' => $language,
+                'serialize' => 0,
+                'format' => 'original'
             );
 
+            if ($segment != null) {
+                $params['segment'] = urlencode($segment['definition']);
+            } else {
+                $params['segment'] = false;
+            }
+
+            $processedReport = Request::processRequest('API.getProcessedReport', $params);
             $processedReport['segment'] = $segment;
 
             // TODO add static method getPrettyDate($period, $date) in Period
@@ -428,6 +452,11 @@ class API extends \Piwik\Plugin\API
         list($reportSubject, $reportTitle) = self::getReportSubjectAndReportTitle(Site::getNameFor($idSite), $report['reports']);
         $filename = "$reportTitle - $prettyDate - $description";
 
+	// if reporting for a segment, use the segment's name in the title
+	if(is_array($segment) && strlen($segment['name'])) {
+		$reportTitle .= " - ".$segment['name'];
+	}
+	
         $reportRenderer->renderFrontPage($reportTitle, $prettyDate, $description, $reportMetadata, $segment);
         array_walk($processedReports, array($reportRenderer, 'renderReport'));
 
@@ -554,7 +583,8 @@ class API extends \Piwik\Plugin\API
         $this->getModel()->updateReport($report['idreport'], array('ts_last_sent' => $now));
 
         // If running from piwik.php with debug, do not delete the PDF after sending the email
-        if (!isset($GLOBALS['PIWIK_TRACKER_DEBUG']) || !$GLOBALS['PIWIK_TRACKER_DEBUG']) {
+        $tracker = new Tracker();
+        if (!$tracker->isDebugModeEnabled()) {
             @chmod($outputFilename, 0600);
         }
     }
diff --git a/plugins/ScheduledReports/Menu.php b/plugins/ScheduledReports/Menu.php
index 6c0111ff23..ea02b98b60 100644
--- a/plugins/ScheduledReports/Menu.php
+++ b/plugins/ScheduledReports/Menu.php
@@ -24,11 +24,10 @@ class Menu extends \Piwik\Plugin\Menu
             \Piwik\Plugin\Manager::getInstance()->isPluginActivated('MobileMessaging')
                 ? 'MobileMessaging_TopLinkTooltip' : 'ScheduledReports_TopLinkTooltip');
 
-        $menu->addManageItem(null, $this->urlForDefaultAction(array('segment' => false)), 10);
-        $menu->addManageItem(
+        $menu->addPersonalItem(
             $this->getTopMenuTranslationKey(),
             $this->urlForAction('index', array('segment' => false)),
-            13,
+            7,
             $tooltip
         );
     }
diff --git a/plugins/ScheduledReports/ScheduledReports.php b/plugins/ScheduledReports/ScheduledReports.php
index 4b8190fead..a77d21ccf3 100644
--- a/plugins/ScheduledReports/ScheduledReports.php
+++ b/plugins/ScheduledReports/ScheduledReports.php
@@ -19,7 +19,8 @@ use Piwik\Plugins\MobileMessaging\MobileMessaging;
 use Piwik\Plugins\UsersManager\API as APIUsersManager;
 use Piwik\Plugins\UsersManager\Model as UserModel;
 use Piwik\ReportRenderer;
-use Piwik\ScheduledTime;
+use Piwik\Scheduler\Schedule\Schedule;
+use Piwik\Tracker;
 use Piwik\View;
 use Zend_Mime;
 use Piwik\Config;
@@ -62,7 +63,7 @@ class ScheduledReports extends \Piwik\Plugin
 
     private static $managedReportFormats = array(
         ReportRenderer::HTML_FORMAT => 'plugins/Morpheus/images/html_icon.png',
-        ReportRenderer::PDF_FORMAT  => 'plugins/UserSettings/images/plugins/pdf.gif',
+        ReportRenderer::PDF_FORMAT  => 'plugins/DevicePlugins/images/plugins/pdf.gif',
         ReportRenderer::CSV_FORMAT  => 'plugins/Morpheus/images/export.png',
     );
 
@@ -93,9 +94,17 @@ class ScheduledReports extends \Piwik\Plugin
             'SegmentEditor.deactivate'                  => 'segmentDeactivation',
             'SegmentEditor.update'                      => 'segmentUpdated',
             'Translate.getClientSideTranslationKeys'    => 'getClientSideTranslationKeys',
+            'Request.getRenamedModuleAndAction'         => 'renameDeprecatedModuleAndAction',
         );
     }
 
+    public function renameDeprecatedModuleAndAction(&$module, &$action)
+    {
+        if($module == 'PDFReports') {
+            $module = 'ScheduledReports';
+        }
+    }
+
     public function getClientSideTranslationKeys(&$translationKeys)
     {
         $translationKeys[] = "ScheduledReports_ReportSent";
@@ -406,7 +415,8 @@ class ScheduledReports extends \Piwik\Plugin
             } catch (Exception $e) {
 
                 // If running from piwik.php with debug, we ignore the 'email not sent' error
-                if (!isset($GLOBALS['PIWIK_TRACKER_DEBUG']) || !$GLOBALS['PIWIK_TRACKER_DEBUG']) {
+                $tracker = new Tracker();
+                if (!$tracker->isDebugModeEnabled()) {
                     throw new Exception("An error occured while sending '$filename' " .
                         " to " . implode(', ', $mail->getRecipients()) .
                         ". Error was '" . $e->getMessage() . "'");
@@ -475,7 +485,7 @@ class ScheduledReports extends \Piwik\Plugin
             $additionalEMails = $parameters[self::ADDITIONAL_EMAILS_PARAMETER];
             $recipients = array_merge($recipients, $additionalEMails);
         }
-        $recipients = array_filter($recipients);
+        $recipients = array_values(array_filter($recipients));
     }
 
     public static function template_reportParametersScheduledReports(&$out)
@@ -592,7 +602,7 @@ class ScheduledReports extends \Piwik\Plugin
                 throw new Exception(Piwik::translate('UsersManager_ExceptionInvalidEmail') . ' (' . $email . ')');
             }
         }
-        $additionalEmails = array_filter($additionalEmails);
+        $additionalEmails = array_values(array_filter($additionalEmails));
         return $additionalEmails;
     }
 
@@ -617,10 +627,10 @@ class ScheduledReports extends \Piwik\Plugin
     public static function getPeriodToFrequency()
     {
         return array(
-            ScheduledTime::PERIOD_NEVER => Piwik::translate('General_Never'),
-            ScheduledTime::PERIOD_DAY   => Piwik::translate('General_Daily'),
-            ScheduledTime::PERIOD_WEEK  => Piwik::translate('General_Weekly'),
-            ScheduledTime::PERIOD_MONTH => Piwik::translate('General_Monthly'),
+            Schedule::PERIOD_NEVER => Piwik::translate('General_Never'),
+            Schedule::PERIOD_DAY   => Piwik::translate('General_Daily'),
+            Schedule::PERIOD_WEEK  => Piwik::translate('General_Weekly'),
+            Schedule::PERIOD_MONTH => Piwik::translate('General_Monthly'),
         );
     }
 
@@ -631,11 +641,11 @@ class ScheduledReports extends \Piwik\Plugin
     public static function getPeriodToFrequencyAsAdjective()
     {
         return array(
-            ScheduledTime::PERIOD_DAY   => Piwik::translate('General_DailyReport'),
-            ScheduledTime::PERIOD_WEEK  => Piwik::translate('General_WeeklyReport'),
-            ScheduledTime::PERIOD_MONTH => Piwik::translate('General_MonthlyReport'),
-            ScheduledTime::PERIOD_YEAR  => Piwik::translate('General_YearlyReport'),
-            ScheduledTime::PERIOD_RANGE => Piwik::translate('General_RangeReports'),
+            Schedule::PERIOD_DAY   => Piwik::translate('General_DailyReport'),
+            Schedule::PERIOD_WEEK  => Piwik::translate('General_WeeklyReport'),
+            Schedule::PERIOD_MONTH => Piwik::translate('General_MonthlyReport'),
+            Schedule::PERIOD_YEAR  => Piwik::translate('General_YearlyReport'),
+            Schedule::PERIOD_RANGE => Piwik::translate('General_RangeReports'),
         );
     }
 
diff --git a/plugins/ScheduledReports/Tasks.php b/plugins/ScheduledReports/Tasks.php
index 1cbca73236..be61e0d793 100644
--- a/plugins/ScheduledReports/Tasks.php
+++ b/plugins/ScheduledReports/Tasks.php
@@ -8,7 +8,7 @@
  */
 namespace Piwik\Plugins\ScheduledReports;
 
-use Piwik\ScheduledTime;
+use Piwik\Scheduler\Schedule\Schedule;
 use Piwik\Site;
 
 class Tasks extends \Piwik\Plugin\Tasks
@@ -16,11 +16,11 @@ class Tasks extends \Piwik\Plugin\Tasks
     public function schedule()
     {
         foreach (API::getInstance()->getReports() as $report) {
-            if (!$report['deleted'] && $report['period'] != ScheduledTime::PERIOD_NEVER) {
+            if (!$report['deleted'] && $report['period'] != Schedule::PERIOD_NEVER) {
 
                 $timezone = Site::getTimezoneFor($report['idsite']);
 
-                $schedule = ScheduledTime::getScheduledTimeForPeriod($report['period']);
+                $schedule = Schedule::getScheduledTimeForPeriod($report['period']);
                 $schedule->setHour($report['hour']);
                 $schedule->setTimezone($timezone);
 
diff --git a/plugins/ScheduledReports/config/tcpdf_config.php b/plugins/ScheduledReports/config/tcpdf_config.php
index f7a92b0006..cf7dad0fce 100644
--- a/plugins/ScheduledReports/config/tcpdf_config.php
+++ b/plugins/ScheduledReports/config/tcpdf_config.php
@@ -15,7 +15,7 @@ use Piwik\Container\StaticContainer;
 
 define('K_PATH_MAIN', PIWIK_INCLUDE_PATH . '/libs/tcpdf/');
 
-$pathTmpTCPDF = StaticContainer::getContainer()->get('path.tmp') . '/tcpdf/';
+$pathTmpTCPDF = StaticContainer::get('path.tmp') . '/tcpdf/';
 
 define('K_PATH_CACHE', $pathTmpTCPDF);
 define('K_PATH_IMAGES', $pathTmpTCPDF);
diff --git a/plugins/ScheduledReports/javascripts/pdf.js b/plugins/ScheduledReports/javascripts/pdf.js
index da23deb4fd..126f956adf 100644
--- a/plugins/ScheduledReports/javascripts/pdf.js
+++ b/plugins/ScheduledReports/javascripts/pdf.js
@@ -36,16 +36,17 @@ function formSetEditReport(idReport) {
     $('#report_hour').val(report.hour);
     $('[name=report_format].' + report.type + ' option[value=' + report.format + ']').prop('selected', 'selected');
 
-    var selectorReportFormat = 'select[name=report_format].' + $('#report_type').val();
-    $(selectorReportFormat).change( toggleDisplayOptionsByFormat );
+    $('select[name=report_type]').change( toggleDisplayOptionsByFormat );
+    $('select[name=report_format]').change( toggleDisplayOptionsByFormat );
 
     // When CSV is selected, hide "Display options"
     toggleDisplayOptionsByFormat();
 
     function toggleDisplayOptionsByFormat() {
+        var selectorReportFormat = 'select[name=report_format].' + $('#report_type').val();
         var format = $(selectorReportFormat).val();
         var displayOptionsSelector = $('#row_report_display_options');
-        if (format == 'csv') {
+        if (format == 'csv' || format == 'sms') {
             displayOptionsSelector.hide();
         } else {
             displayOptionsSelector.show();
@@ -66,7 +67,7 @@ function formSetEditReport(idReport) {
 
 function getReportAjaxRequest(idReport, defaultApiMethod) {
     var parameters = {};
-    piwikHelper.lazyScrollTo(".centerLargeDiv>h2", 400);
+    piwikHelper.lazyScrollTo(".emailReports>h2", 400);
     parameters.module = 'API';
     parameters.method = defaultApiMethod;
     if (idReport == 0) {
diff --git a/plugins/ScheduledReports/lang/ar.json b/plugins/ScheduledReports/lang/ar.json
index dd612352e5..8929db69bc 100644
--- a/plugins/ScheduledReports/lang/ar.json
+++ b/plugins/ScheduledReports/lang/ar.json
@@ -10,13 +10,11 @@
         "EmailReports": "التقارير البريدية",
         "EmailSchedule": "جدولة البريد",
         "FrontPage": "صفحة المقدمة",
-        "ManageEmailReports": "إدارة تقارير البريد",
         "MonthlyScheduleHelp": "الجدولة الشهرية: سيتم إرسال التقرير في الأول من كل شهر.",
         "MustBeLoggedIn": "يجب أن تسجل الدخول لإنشاء وجدولة التقارير.",
         "PiwikReports": "تقارير Piwik",
         "PleaseFindAttachedFile": "انظر المرفقات رجاء لتحميل %1$s التقارير حول %2$s.",
         "PleaseFindBelow": "ستجد %1$s تقريرك حول %2$s أدناه.",
-        "PluginDescription": "أنشأ وحمل تقاريرك المخصصة، واجعلها تُرسل إليك يومياً، أسبوعياً أو شهرياً.",
         "ReportFormat": "تهيئة التقرير",
         "ReportsIncluded": "الإحصائيات المُضمنة",
         "SendReportNow": "أرسل التقرير الآن",
diff --git a/plugins/ScheduledReports/lang/be.json b/plugins/ScheduledReports/lang/be.json
index 4f920ab3f5..d3a488895c 100644
--- a/plugins/ScheduledReports/lang/be.json
+++ b/plugins/ScheduledReports/lang/be.json
@@ -10,14 +10,12 @@
         "EmailReports": "Справаздачы па Email",
         "EmailSchedule": "Расклад электроннай пошты",
         "FrontPage": "Галоўная старонка",
-        "ManageEmailReports": "Упраўленне справаздачамі па электроннай пошце",
         "MonthlyScheduleHelp": "Штомесячны расклад: справаздача будзе адпраўлена першым днём кожнага месяца.",
         "MustBeLoggedIn": "Вы павінны ўвайсці ў сістэму для стварэння і планавання карыстацкіх справаздач.",
         "Pagination": "Старонка %s з %s",
         "PiwikReports": "Piwik справаздачы",
         "PleaseFindAttachedFile": "Вы можаце знайсці ў прыкладаемым файле вашу %1$s справаздачу для %2$s.",
         "PleaseFindBelow": "Ніжэй вы знойдзеце вашу %1$s справаздачу для %2$s.",
-        "PluginDescription": "Стварэнне і запампоука карыстацкіх справаздач, і адпраўка іх па электроннай пошце штодзень, штотыдзень або штомесяц.",
         "ReportFormat": "Фармат справаздачы",
         "ReportsIncluded": "Уключаная статыстыка",
         "SendReportNow": "Адправіць справаздачу зараз",
diff --git a/plugins/ScheduledReports/lang/bg.json b/plugins/ScheduledReports/lang/bg.json
index 85a63f3990..9b3c40c271 100644
--- a/plugins/ScheduledReports/lang/bg.json
+++ b/plugins/ScheduledReports/lang/bg.json
@@ -17,7 +17,6 @@
         "EmailSchedule": "Списък с е-пощи",
         "EvolutionGraph": "Показване на графиките с история за най-високите %s стойности",
         "FrontPage": "Заглавна страница",
-        "ManageEmailReports": "Управление на Email докладите",
         "MonthlyScheduleHelp": "Месечен график: докладът ще бъде изпратен на първия ден от всеки месец.",
         "MustBeLoggedIn": "Трябва да сте влязъл, за да създавате и планирате персонализирани отчети.",
         "NoRecipients": "Този доклад все още няма получатели",
@@ -26,7 +25,6 @@
         "PiwikReports": "Piwik доклади",
         "PleaseFindAttachedFile": "Моля, вижте в прикачения си файл %1$s доклад за %2$s.",
         "PleaseFindBelow": "Моля намерете по-долу вашият %1$s отчет за %2$s.",
-        "PluginDescription": "Създайте и изтеглете Вашите персонализирани отчети,и ги изпращайте по имейл ежедневно, ежеседмично или ежемесечно.",
         "ReportFormat": "Формат на доклад",
         "ReportHour": "Изпрати доклад в",
         "ReportIncludeNWebsites": "Този отчет ще включва главните метрични данни за всички уеб сайтове, които са били посещавани поне веднъж (от %s сайта, които са налични).",
diff --git a/plugins/ScheduledReports/lang/ca.json b/plugins/ScheduledReports/lang/ca.json
index 65472b7bcf..9f88b079d1 100644
--- a/plugins/ScheduledReports/lang/ca.json
+++ b/plugins/ScheduledReports/lang/ca.json
@@ -16,7 +16,6 @@
         "EmailSchedule": "Programació per correu electrònic",
         "EvolutionGraph": "Mostrar els valors històrics pels %s valors més representatius.",
         "FrontPage": "Portada",
-        "ManageEmailReports": "Administra els informes per correu electrònic.",
         "MonthlyScheduleHelp": "Programació mensual: L'informe s'enviarà el primer día de cada més.",
         "MustBeLoggedIn": "Heu d'estar identificat per crear i programar informes personalitzats",
         "NoRecipients": "Aquest informe no té destinataris",
@@ -24,7 +23,6 @@
         "PiwikReports": "Informes Piwik",
         "PleaseFindAttachedFile": "Podeu trobar al fitxer adjunt el vostre informe %1$s per a %2$s.",
         "PleaseFindBelow": "A continuació podeu trobar el vostre informe %1$s per a %2$s.",
-        "PluginDescription": "Creeu i descarregeu els vostres informes personalitats. Envieu-vos els per correu electronic diariament, semanalment o mensualment.",
         "ReportFormat": "Format de l'informe",
         "ReportIncludeNWebsites": "L'informe incloura les mètriques més importants de tots els llocs webs que tinguin almenys una visita (dels %s llocs web actualment disponibles)",
         "ReportsIncluded": "Estadístiques incloses",
diff --git a/plugins/ScheduledReports/lang/cs.json b/plugins/ScheduledReports/lang/cs.json
index a05e8577a1..1e5a78f490 100644
--- a/plugins/ScheduledReports/lang/cs.json
+++ b/plugins/ScheduledReports/lang/cs.json
@@ -17,16 +17,16 @@
         "EmailSchedule": "Plánování zasílání hlášení",
         "EvolutionGraph": "Zobrazit historické grafy pro %s nejvyšších hodnot",
         "FrontPage": "Hlavní strana",
-        "ManageEmailReports": "Spravovat emailové hlášení",
         "MonthlyScheduleHelp": "Měsíční plán: hlášení bude odesláno první den měsíce",
         "MustBeLoggedIn": "Musíte být přihlášen, abyste mohl vytvářet vlastní hlášení.",
         "NoRecipients": "Toto hlášení nemá příjemce",
         "OClock": "hodin",
         "Pagination": "Stránka %s z %s",
+        "PersonalEmailReports": "Osobní emailová hlášení",
         "PiwikReports": "Hlášení Piwiku",
         "PleaseFindAttachedFile": "Prosím najděte v přiloženém souboru %1$s hlášení pro %2$s",
         "PleaseFindBelow": "Najděte níže vaše %1$s hlášení pro %2$s.",
-        "PluginDescription": "Vytvořit a uložit vlastní hlášení a dostávat denní, týdenní nebo měsíční emailové hlášení.",
+        "PluginDescription": "Vytvořte vlastní emailová hlášení a naplánujte jejich zaslání denně, týdně nebo měsíčně jednomu nebo více lidem. Je podporováno mnoho formátů (HTML, PDF, CSV, obrázky).",
         "ReportFormat": "Formát hlášení",
         "ReportHour": "Zasílat hlášení v",
         "ReportIncludeNWebsites": "Hlášení bude obsahovat hlavní měření pro webové stránky, které mají aspoň jednnu návštěvu z %s aktuálně dostupných stránek.",
diff --git a/plugins/ScheduledReports/lang/da.json b/plugins/ScheduledReports/lang/da.json
index 2c9443f8c6..70a05a3385 100644
--- a/plugins/ScheduledReports/lang/da.json
+++ b/plugins/ScheduledReports/lang/da.json
@@ -17,7 +17,6 @@
         "EmailSchedule": "E-mail tidsplan",
         "EvolutionGraph": "Vis historiske grafer for top %s værdier",
         "FrontPage": "Forside",
-        "ManageEmailReports": "Administrer e-mail rapporter",
         "MonthlyScheduleHelp": "Månedlig tidsplan: Rapporten vil blive sendt den første dag i hver måned.",
         "MustBeLoggedIn": "Du skal være logget på for at oprette og planlægge brugerdefinerede rapporter.",
         "NoRecipients": "Denne rapport har ingen modtagere",
@@ -26,7 +25,6 @@
         "PiwikReports": "Piwik rapporter",
         "PleaseFindAttachedFile": "Vedlagt i vedhæftede fil din %1$s rapport for %2$s.",
         "PleaseFindBelow": "Find rapporten nedenfor %1$s for %2$s.",
-        "PluginDescription": "Opret og hent brugerdefinerede rapporter, og få dem sendt dagligt, ugentligt eller månedligt.",
         "ReportFormat": "Rapport format",
         "ReportHour": "Send rapport",
         "ReportIncludeNWebsites": "Rapporten indeholder de vigtigste nøgletal for alle hjemmesider, der har mindst ét ​​besøg (fra %s hjemmesider der pt er tilgængelige).",
diff --git a/plugins/ScheduledReports/lang/de.json b/plugins/ScheduledReports/lang/de.json
index b9a942d1ba..d83e20b22c 100644
--- a/plugins/ScheduledReports/lang/de.json
+++ b/plugins/ScheduledReports/lang/de.json
@@ -17,16 +17,16 @@
         "EmailSchedule": "E-Mail-Zeitplan",
         "EvolutionGraph": "Zeige historischen Graph für die Top %s Werte",
         "FrontPage": "Titelseite",
-        "ManageEmailReports": "E-Mail-Berichte verwalten",
         "MonthlyScheduleHelp": "Monatlich: Bericht wird immer am ersten Tag des Monats verschickt.",
         "MustBeLoggedIn": "Sie müssen angemeldet sein, um Berichte anlegen und versenden zu können.",
         "NoRecipients": "Dieser Bericht hat keine Empfänger.",
         "OClock": "Uhr",
         "Pagination": "Seite %s von %s",
+        "PersonalEmailReports": "Persönliche Email-Berichte",
         "PiwikReports": "Piwik-Berichte",
         "PleaseFindAttachedFile": "Sie finden in der angehängten Datei Ihren Bericht (Intervall: %1$s) für %2$s.",
         "PleaseFindBelow": "Unterhalb befindet sich der Bericht (Intervall: %1$s) für %2$s.",
-        "PluginDescription": "Berichte erstellen, herunterladen und täglich, wöchentlich oder monatlich per E-Mail versenden.",
+        "PluginDescription": "Erstellen Sie eigene Berichte und planen Sie deren täglichen, wöchentlichen oder monatlichen Versand an einen oder mehrere Empfänger. Diverse Berichtsformate werden unterstützt (HTML, PDF, CSV, Bilder).",
         "ReportFormat": "Berichtsformat",
         "ReportHour": "Bericht senden um",
         "ReportIncludeNWebsites": "Dieser Bericht wird die Hauptmetriken für alle Webseiten enthalten, die mindestens einen Besuch haben (von den %s derzeit verfügbaren Webseiten).",
diff --git a/plugins/ScheduledReports/lang/el.json b/plugins/ScheduledReports/lang/el.json
index 64fc8fd25b..b5cfb81247 100644
--- a/plugins/ScheduledReports/lang/el.json
+++ b/plugins/ScheduledReports/lang/el.json
@@ -17,16 +17,16 @@
         "EmailSchedule": "Προγραμματισμός Ηλεκτρονικής Αλληλογραφίας",
         "EvolutionGraph": "Προβολή Ιστορικών Διαγραμμάτων για τις κορυφαίες %s τιμές",
         "FrontPage": "Εξώφυλλο",
-        "ManageEmailReports": "Διαχείριση Αναφορών Αλληλογραφίας",
         "MonthlyScheduleHelp": "Μηνιαίος προγραμματισμός: η αναφορά θα αποσταλεί την πρώτη μέρα κάθε μήνα.",
         "MustBeLoggedIn": "Πρέπει να έχετε συνδεθεί για να δημιουργήσετε και να προγραμματίσετε προσαρμοσμένες αναφορές.",
         "NoRecipients": "Αυτή η αναφορά δεν έχει παραλήπτες",
         "OClock": "η ώρα",
         "Pagination": "Σελίδα %s από %s",
+        "PersonalEmailReports": "Προσωπικές Αναφορές με E-mail",
         "PiwikReports": "Αναφορές Piwik",
         "PleaseFindAttachedFile": "Βρείτε στο συνημμένο αρχείο την αναφορά %1$s για %2$s.",
         "PleaseFindBelow": "Βρείτε παρακάτω την αναφορά %1$s για τη %2$s.",
-        "PluginDescription": "Δημιουργήστε και λάβετε τις προσαρμοσμένες αναφορές σας και ρυθμίστε τες ώστε να τις λαμβάνετε ημερησίως, εβδομαδιαίως ή μηνιαίως.",
+        "PluginDescription": "Δημιουργεί προσαρμοσμένες αναφορές και τις προγραμματίζει για καθημερινή, εβδομαδιαία ή μηνιαία αναφορά σε ένα ή περισσότερα άτομα. Υποστηρίζονται αρκετοί τύποι αναφορών (html, pdf, csv, εικόνες).",
         "ReportFormat": "Μορφή Αναφοράς",
         "ReportHour": "Αποστολή αναφοράς στις",
         "ReportIncludeNWebsites": "Η αναφορά θα περιλαμβάνει βασικές μετρήσεις για όλες τις ιστοσελίδες που έχουν τουλάχιστον μια επισκεψη (από τις συνολικά %s διαθέσιμες ιστοσελίδες).",
diff --git a/plugins/ScheduledReports/lang/en.json b/plugins/ScheduledReports/lang/en.json
index 7b5b14d495..5cf0e083ac 100644
--- a/plugins/ScheduledReports/lang/en.json
+++ b/plugins/ScheduledReports/lang/en.json
@@ -17,7 +17,7 @@
         "EmailSchedule": "Email Schedule",
         "EvolutionGraph": "Show Historical Graphs for the top %s values",
         "FrontPage": "Front Page",
-        "ManageEmailReports": "Manage Email Reports",
+        "PersonalEmailReports": "Personal Email Reports",
         "MonthlyScheduleHelp": "Monthly schedule: report will be sent the first day of each month.",
         "MustBeLoggedIn": "You must be logged in to create and schedule custom reports.",
         "NoRecipients": "This report has no recipients",
@@ -26,7 +26,7 @@
         "PiwikReports": "Piwik Reports",
         "PleaseFindAttachedFile": "Please find in attached file your %1$s report for %2$s.",
         "PleaseFindBelow": "Please find below your %1$s report for %2$s.",
-        "PluginDescription": "Create and download your custom reports, and have them emailed daily, weekly or monthly.",
+        "PluginDescription": "Create custom reports and schedule them to be emailed daily, weekly or monthly to one or several people. Several report formats are supported (html, pdf, csv, images).",
         "ReportFormat": "Report Format",
         "ReportHour": "Send report at",
         "ReportIncludeNWebsites": "The report will include main metrics for all websites that have at least one visit (from the %s websites currently available).",
diff --git a/plugins/ScheduledReports/lang/es.json b/plugins/ScheduledReports/lang/es.json
index 0f7dbbbfa3..6738f7fc08 100644
--- a/plugins/ScheduledReports/lang/es.json
+++ b/plugins/ScheduledReports/lang/es.json
@@ -17,7 +17,6 @@
         "EmailSchedule": "Programe el envío del Email",
         "EvolutionGraph": "Mostrar Gráficas Históricas para los %s valores más altos",
         "FrontPage": "Página Incial",
-        "ManageEmailReports": "Administrar los Reportes por Email",
         "MonthlyScheduleHelp": "Envío mensual: los reportes serán enviados el primer día de cada mes.",
         "MustBeLoggedIn": "Usted debe haber iniciado sesión para crear y programar reportes personalizados.",
         "NoRecipients": "Este reporte no tiene destinatarios",
@@ -26,7 +25,6 @@
         "PiwikReports": "Reportes Piwik",
         "PleaseFindAttachedFile": "Encontrará el reporte de %1$s %2$s como un archivo PDF adjunto.",
         "PleaseFindBelow": "Por favor encuentre debajo su reporte %1$s para %2$s.",
-        "PluginDescription": "Cree y descargue sus reportes personalizados, y envíelos por email diariamente, semanalmente o mensualmente.",
         "ReportFormat": "Formato del Reporte",
         "ReportHour": "Enviar informe en",
         "ReportIncludeNWebsites": "El reporte incluirá las principales métricas para todos los sitios de internet con al menos una visita (de todo %s los sitios de internet disponibles).",
diff --git a/plugins/ScheduledReports/lang/et.json b/plugins/ScheduledReports/lang/et.json
index 71355349bb..cfbd4c26aa 100644
--- a/plugins/ScheduledReports/lang/et.json
+++ b/plugins/ScheduledReports/lang/et.json
@@ -13,7 +13,6 @@
         "EmailReports": "E-posti raportid",
         "EmailSchedule": "E-posti ajastamine",
         "FrontPage": "Esileht",
-        "ManageEmailReports": "Halda e-posti raporteid",
         "OClock": "kell",
         "Pagination": "Lehekülg %s \/ %s",
         "PiwikReports": "Piwiku raportid",
diff --git a/plugins/ScheduledReports/lang/fa.json b/plugins/ScheduledReports/lang/fa.json
index 15ab6652be..094a219ac2 100644
--- a/plugins/ScheduledReports/lang/fa.json
+++ b/plugins/ScheduledReports/lang/fa.json
@@ -17,7 +17,6 @@
         "EmailSchedule": "زمانبندی ایمیل",
         "EvolutionGraph": "نمایش نمودارهای گرافیکی برای مقدار %s بالا",
         "FrontPage": "صفحه اول",
-        "ManageEmailReports": "مدیریت گزارش از راه ایمیل",
         "MonthlyScheduleHelp": "زمانبندی ماهانه: گزارش در اولین روز هر ماه فرستاده خواهد شد.",
         "MustBeLoggedIn": "برای ساخت و زمانبندی گزارشات دلخواه باید ابتدا وارد شوید",
         "NoRecipients": "این گزارش هیچ دریافت کننده ای ندارد.",
@@ -25,7 +24,6 @@
         "Pagination": "صفحه %s از %s",
         "PiwikReports": "گزارش های Piwik",
         "PleaseFindBelow": "لطفا در زیر پیدا نمایید %1$s گزارش برای %2$s.",
-        "PluginDescription": "ایجاد و گزارش های سفارشی خود را، و آنها را ایمیل های روزانه، هفتگی و یا ماهانه.",
         "ReportFormat": "فرمت گزارش",
         "ReportHour": "گزارش را بفرست هر",
         "ReportIncludeNWebsites": "گزارش شامل معیار های اصلی برای تمام وبسایت هایی که حداقل یک بازدید دارند می شود (از میان %s وبسایتی که در دسترس هستند).",
diff --git a/plugins/ScheduledReports/lang/fi.json b/plugins/ScheduledReports/lang/fi.json
index f0cc16e6c7..0a9cf22359 100644
--- a/plugins/ScheduledReports/lang/fi.json
+++ b/plugins/ScheduledReports/lang/fi.json
@@ -17,7 +17,6 @@
         "EmailSchedule": "Sähköpostiaikataulu",
         "EvolutionGraph": "Näytä historiakuvaajat top-%s arvolle",
         "FrontPage": "Etusivu",
-        "ManageEmailReports": "Hallitse sähköpostiraportteja",
         "MonthlyScheduleHelp": "Kuukausittainen aikataulu: raportti lähetetään kuun ensimmäisenä päivänä.",
         "MustBeLoggedIn": "Sinun täytyy olla kirjautuneena sisään ennen kustomoitujen raporttien luomista ja ajastamista.",
         "NoRecipients": "Tällä raportilla ei ole vastaanottajia",
@@ -26,7 +25,6 @@
         "PiwikReports": "Piwikin raportit",
         "PleaseFindAttachedFile": "Liitteenä on raporttisi %1$s sivulle %2$s.",
         "PleaseFindBelow": "Alla on raporttisi %1$s sivulle %2$s.",
-        "PluginDescription": "Luo ja lataa kustomoituja raportejasi. Lisäksi voit ajastaa sähköpostituksen päivittäin, viikottain tai kuukausittain.",
         "ReportFormat": "Raportin muoto",
         "ReportHour": "Lähetä raportti",
         "ReportIncludeNWebsites": "Tämä raportti sisältää tärkeimmät metriikat kaikilta sivuilta, joilla oli vähintään yksi käynti (%s sivusta)",
diff --git a/plugins/ScheduledReports/lang/fr.json b/plugins/ScheduledReports/lang/fr.json
index 4f02025ed8..fdcfa5608d 100644
--- a/plugins/ScheduledReports/lang/fr.json
+++ b/plugins/ScheduledReports/lang/fr.json
@@ -17,7 +17,6 @@
         "EmailSchedule": "Planification courriel",
         "EvolutionGraph": "Afficher les graphiques historiques pour les plus hautes %s valeurs",
         "FrontPage": "Première page",
-        "ManageEmailReports": "Gérer les rapports par e-mail",
         "MonthlyScheduleHelp": "Planification mensuelle : le rapport sera envoyé le premier jour de chaque mois.",
         "MustBeLoggedIn": "Vous devez être connecté pour créer et planifier des rapports personnalisés.",
         "NoRecipients": "Ce rapport n'a aucun destinataire",
@@ -26,7 +25,6 @@
         "PiwikReports": "Rapports Piwik",
         "PleaseFindAttachedFile": "Veuillez trouver en pièce jointe votre rapport %1$s pour %2$s.",
         "PleaseFindBelow": "Veuillez trouver ci-dessous votre %1$s rapport pour %2$s.",
-        "PluginDescription": "Créez et téléchargez vos rapports personnalisés, et recevez les par e-mail quotidiennement, chaque semaine ou mensuellement.",
         "ReportFormat": "Format du rapport",
         "ReportHour": "Envoyer le rapport à",
         "ReportIncludeNWebsites": "Le rapport incluera les métriques principales pour tous les sites web qui ont au moins une visite (depuis les %s sites web actuellement disponibles)",
diff --git a/plugins/ScheduledReports/lang/hi.json b/plugins/ScheduledReports/lang/hi.json
index 7eaff3b79d..d64476b850 100644
--- a/plugins/ScheduledReports/lang/hi.json
+++ b/plugins/ScheduledReports/lang/hi.json
@@ -17,7 +17,6 @@
         "EmailSchedule": "ईमेल कार्यक्रम तय करे",
         "EvolutionGraph": "शीर्ष %sमूल्यों के लिए ऐतिहासिक रेखाचित्र दिखाएँ",
         "FrontPage": "मुखपृष्ठ",
-        "ManageEmailReports": "ईमेल प्रतिवेदन प्रबंधन",
         "MonthlyScheduleHelp": "मासिक अनुसूची: रिपोर्ट प्रत्येक माह के पहले दिन भेजी जाएगी.",
         "MustBeLoggedIn": "तुम्हें विशिष्ट प्रतिवेदन बनाने और अनुसूची करने के लिए लॉग इन होना चाहिए.",
         "NoRecipients": "इस रिपोर्ट में कोई प्राप्तकर्ता नहीं हैं",
@@ -26,7 +25,6 @@
         "PiwikReports": "Piwik प्रतिवेदन",
         "PleaseFindAttachedFile": "संलग्न फाइल में %2$s के लिए अपने %1$s रिपोर्ट मिल दें",
         "PleaseFindBelow": "%2$s के लिए अपने %1$s रिपोर्ट के नीचे खोजे .",
-        "PluginDescription": "बनाएँ और डाउनलोड करें अपने विशिष्ट प्रतिवेदन, और उन्हें दैनिक, साप्ताहिक या मासिक ईमेल किया.",
         "ReportFormat": "प्रतिवेदन प्रारूप",
         "ReportHour": "पर रिपोर्ट भेजें",
         "ReportIncludeNWebsites": "रिपोर्ट में कम से कम एक यात्रा (वेबसाइटों से %sवर्तमान में उपलब्ध) है कि सभी वेबसाइटों के मुख्य मैट्रिक्स शामिल होंगे.",
diff --git a/plugins/ScheduledReports/lang/id.json b/plugins/ScheduledReports/lang/id.json
index 4849633914..ad620d8add 100644
--- a/plugins/ScheduledReports/lang/id.json
+++ b/plugins/ScheduledReports/lang/id.json
@@ -17,7 +17,6 @@
         "EmailSchedule": "Jadwal Surel",
         "EvolutionGraph": "Tampilkan Grapik Riwayat untuk nilai %s teratas",
         "FrontPage": "Halaman Depan",
-        "ManageEmailReports": "Pengatur Laporan Surel",
         "MonthlyScheduleHelp": "Laporan bulanan: laporan akan dikirim satiap hari pertama tiap bulan.",
         "MustBeLoggedIn": "Anda harus masuk-log untuk membuat dan mengatur jadwal laporan.",
         "NoRecipients": "Laporan ini tidak memiliki penerima",
@@ -26,7 +25,6 @@
         "PiwikReports": "Laporan Piwik",
         "PleaseFindAttachedFile": "Silakan temukan berkas lampiran laporan %1$s Anda untuk %2$s.",
         "PleaseFindBelow": "Silakan temukan di bawah laporan %1$s Anda untuk %2$s.",
-        "PluginDescription": "Buat dan unduh laporan tersesuai, dan mengatur surel laporan harian, mingguan atau bulanan.",
         "ReportFormat": "Bentuk Laporan",
         "ReportHour": "Kirim laporan pada pukul",
         "ReportIncludeNWebsites": "Laporan akan dimasukkan dalam matriks utama untuk setiap situs dengan sekurangnya satu kunjungan (dari situs %s saat ini yang tersedia).",
diff --git a/plugins/ScheduledReports/lang/it.json b/plugins/ScheduledReports/lang/it.json
index f26669d8ca..0414d3ab31 100644
--- a/plugins/ScheduledReports/lang/it.json
+++ b/plugins/ScheduledReports/lang/it.json
@@ -17,16 +17,16 @@
         "EmailSchedule": "Pianifica Email",
         "EvolutionGraph": "Mostra Grafici Storici per i %s valori top",
         "FrontPage": "Prima pagina",
-        "ManageEmailReports": "Gestisci Report Email",
         "MonthlyScheduleHelp": "Pianificazione mensile: il report verrà inviato il primo giorno di ogni mese.",
         "MustBeLoggedIn": "Devi avere effettuato l'accesso per creare e pianificare i report personalizzati.",
         "NoRecipients": "Questo report non ha destinatari",
         "OClock": ".",
         "Pagination": "Pagina %s di %s",
+        "PersonalEmailReports": "Reports Personali per Email",
         "PiwikReports": "Report di Piwik",
         "PleaseFindAttachedFile": "Potete trovare nel file allegato %1$s il report per %2$s.",
         "PleaseFindBelow": "Di seguito trovi il tuo report %1$s per il %2$s.",
-        "PluginDescription": "Crea e scarica i tuoi report personalizzati e ricevili tramite email giornalmente, settimanalmente o mensilmente.",
+        "PluginDescription": "Crea dei report personalizzati e li programma per l'invio tramite email ogni giorno, settimana o mese a uno o più persone. Sono supportati svariati formati (html, pdf, csv, immagini).",
         "ReportFormat": "Formato report",
         "ReportHour": "Invia report alle",
         "ReportIncludeNWebsites": "Il report comprenderà le principali metriche per tutti i siti web che hanno almeno una visita (dai%s siti web attualmente disponibili).",
diff --git a/plugins/ScheduledReports/lang/ja.json b/plugins/ScheduledReports/lang/ja.json
index 6ff59005fd..6612ef8f70 100644
--- a/plugins/ScheduledReports/lang/ja.json
+++ b/plugins/ScheduledReports/lang/ja.json
@@ -17,7 +17,6 @@
         "EmailSchedule": "メールのスケジュール",
         "EvolutionGraph": "トップの %s 値の履歴グラフを表示",
         "FrontPage": "表紙",
-        "ManageEmailReports": "メールリポートの管理",
         "MonthlyScheduleHelp": "月間スケジュール： リポートは毎月1日に送信されます。",
         "MustBeLoggedIn": "カスタムリポートの作成とスケジュールにはログインする必要があります。",
         "NoRecipients": "このレポートは、受取人がいません",
@@ -26,7 +25,6 @@
         "PiwikReports": "Piwik リポート",
         "PleaseFindAttachedFile": "%2$s の %1$s のリポートを添付しています。",
         "PleaseFindBelow": "%2$s の %1$s のリポートをお届けします。",
-        "PluginDescription": "カスタムリポートを作成してダウンロードします。それらを、毎日、毎週または毎月メールで送信します。",
         "ReportFormat": "リポートのフォーマット",
         "ReportHour": "でレポートを送信",
         "ReportIncludeNWebsites": "このレポートは、現在利用可能な %s ウェブサイトから、少なくとも 1 訪問以上ある全ウェブサイトの主なメトリクスを含みます。",
diff --git a/plugins/ScheduledReports/lang/ko.json b/plugins/ScheduledReports/lang/ko.json
index b59c39c1b6..4c4b158965 100644
--- a/plugins/ScheduledReports/lang/ko.json
+++ b/plugins/ScheduledReports/lang/ko.json
@@ -16,7 +16,6 @@
         "EmailSchedule": "이메일 예약",
         "EvolutionGraph": "%s의 값에 대한 이력 그래프 표시",
         "FrontPage": "시작 페이지",
-        "ManageEmailReports": "이메일 보고서 관리",
         "MonthlyScheduleHelp": "월간 스케줄: 보고서는 매월 1일에 발송됩니다.",
         "MustBeLoggedIn": "보고서 작성 및 일정을 사용자정의하려면 로그인해야합니다.",
         "NoRecipients": "이 보고서의 수신자가 없음",
@@ -25,7 +24,6 @@
         "PiwikReports": "Piwik 보고서",
         "PleaseFindAttachedFile": "%2$s의 %1$s의 보고서를 첨부합니다.",
         "PleaseFindBelow": "%2$s의 %1$s 보고서를 제공합니다.",
-        "PluginDescription": "사용자정의 보고서를 작성하고 다운로드합니다. 매일, 매주 또는 매월 이메일로 전송합니다.",
         "ReportFormat": "보고서 형식",
         "ReportHour": "다음으로 보고서 보내기",
         "ReportIncludeNWebsites": "이 보고서는 하나 이상의 방문있는 모든 웹사이트에 대한 주요 통계를 포함합니다(현재 %s 웹사이트에서 가능).",
diff --git a/plugins/ScheduledReports/lang/lt.json b/plugins/ScheduledReports/lang/lt.json
index d3a56495e8..34906945ba 100644
--- a/plugins/ScheduledReports/lang/lt.json
+++ b/plugins/ScheduledReports/lang/lt.json
@@ -7,12 +7,10 @@
         "EmailReports": "Ataskaitos el. paštu",
         "EmailSchedule": "Siuntimo tvarkaraštis",
         "FrontPage": "Pirminis puslapis",
-        "ManageEmailReports": "Administruoti ataskaitas",
         "MonthlyScheduleHelp": "Kas mėnesį: ataskaita bus išsiųsta kiekvieno mėnesio pirmąją dieną.",
         "Pagination": "Puslapis %s iš %s",
         "PiwikReports": "Piwik ataskaitos",
         "PleaseFindAttachedFile": "Prašome peržiūrėti %1$s ataskaitų failą skirtą %2$s.",
-        "PluginDescription": "Sukurkite ir atsisiųskite savo ataskaitas arba nustatytike jų kadieninį, kas savaitinį ar mėnesinį atsisiuntimą.",
         "ReportFormat": "Ataskaitos formatas",
         "ReportsIncluded": "Įtraukta statistika",
         "SendReportNow": "Siųsti ataskaitą dabar",
diff --git a/plugins/ScheduledReports/lang/nb.json b/plugins/ScheduledReports/lang/nb.json
index 01bbfa3e5d..4a524c5031 100644
--- a/plugins/ScheduledReports/lang/nb.json
+++ b/plugins/ScheduledReports/lang/nb.json
@@ -1,17 +1,20 @@
 {
     "ScheduledReports": {
+        "AggregateReportsFormat_GraphsOnly": "Vis kun grafer (ingen rapport-tabeller)",
         "AlsoSendReportToTheseEmails": "Send også rapporten til disse e-postadressene (en adresse per linje):",
         "CreateReport": "Lag rapport",
         "EmailHello": "Hei,",
         "EmailReports": "E-postrapporter",
         "EmailSchedule": "E-postplan",
         "FrontPage": "Forside",
-        "ManageEmailReports": "Administrer e-postrapporter",
         "MonthlyScheduleHelp": "Månedsplan: Rapportene blir sendt første dag i hver måned.",
+        "NoRecipients": "Denne rapporten har ingen mottakere",
         "Pagination": "Side %s av %s",
         "PiwikReports": "Piwik-rapporter",
         "PleaseFindAttachedFile": "I den vedlagte filen finner du din %1$s rapport for %2$s.",
+        "PleaseFindBelow": "Nedenfor finner du din %1$s rapport for %2$s.",
         "ReportFormat": "Rapportformat",
+        "ReportHour": "Send rapport",
         "ReportSent": "Rapport sendt",
         "ReportType": "Send rapport via",
         "ReportUpdated": "Rapport oppdatert",
diff --git a/plugins/ScheduledReports/lang/nl.json b/plugins/ScheduledReports/lang/nl.json
index 110898e58b..679f47a8dd 100644
--- a/plugins/ScheduledReports/lang/nl.json
+++ b/plugins/ScheduledReports/lang/nl.json
@@ -17,16 +17,15 @@
         "EmailSchedule": "E-mail tijdsschema",
         "EvolutionGraph": "Toon historische grafieken voor de top %s waarden",
         "FrontPage": "Voorpagina",
-        "ManageEmailReports": "Beheer de e-mail rapporten",
         "MonthlyScheduleHelp": "Maandelijks versturen: Rapport zal worden verzonden elke eerste dag van de maand.",
         "MustBeLoggedIn": "U moet ingelogd zijn om aangepaste rapporten te maken en in te plannen.",
         "NoRecipients": "Dit rapport heeft geen ontvangers",
         "OClock": "uur",
         "Pagination": "Pagina %s van %s",
+        "PersonalEmailReports": "Persoonlijke E-mail Rapporten",
         "PiwikReports": "Piwik rapporten",
         "PleaseFindAttachedFile": "In de bijlage treft u uw %1$s rapport voor %2$s.",
         "PleaseFindBelow": "Hieronder treft u uw %1$s rapport voor %2$s.",
-        "PluginDescription": "Maak en download uw aangepaste rapporten en laat deze dagelijks, wekelijks of maandelijks per e-mail versturen.",
         "ReportFormat": "Rapportformaat",
         "ReportHour": "Verstuur rapport om",
         "ReportIncludeNWebsites": "Het rapport zal gegevens bevatten van alle websites die tenminste één bezoek hebben gehad (van de %s websites die momenteel beschikbaar zijn).",
diff --git a/plugins/ScheduledReports/lang/pl.json b/plugins/ScheduledReports/lang/pl.json
index 4639f0b616..85d6b37322 100644
--- a/plugins/ScheduledReports/lang/pl.json
+++ b/plugins/ScheduledReports/lang/pl.json
@@ -13,7 +13,6 @@
         "EmailReports": "Raporty pocztowe",
         "EmailSchedule": "Kalendarium poczty e-mail",
         "FrontPage": "Strona główna",
-        "ManageEmailReports": "Administracja raportami pocztowymi",
         "MonthlyScheduleHelp": "Planowanie miesięczne: raport będzie wysyłany pierwszego dnia każdego miesiąca.",
         "PiwikReports": "Raporty Piwik",
         "PleaseFindAttachedFile": "Prosimy odszukać w pliku załącznika twój %1$s raport dla %2$s.",
diff --git a/plugins/ScheduledReports/lang/pt-br.json b/plugins/ScheduledReports/lang/pt-br.json
index 9010596b78..2d49f2f0ee 100644
--- a/plugins/ScheduledReports/lang/pt-br.json
+++ b/plugins/ScheduledReports/lang/pt-br.json
@@ -17,7 +17,6 @@
         "EmailSchedule": "Agendamento de e-mail",
         "EvolutionGraph": "Mostrar gráficos históricos para os principais %s valores",
         "FrontPage": "Primeira página",
-        "ManageEmailReports": "Gerenciar relatórios de e-mail",
         "MonthlyScheduleHelp": "Programação mensal: relatório será enviado no primeiro dia de cada mês.",
         "MustBeLoggedIn": "Você precisa estar logado para criar e agendar relatórios personalizados.",
         "NoRecipients": "Este relatório não tem destinatários",
@@ -26,7 +25,6 @@
         "PiwikReports": "Relatórios Piwik",
         "PleaseFindAttachedFile": "Por favor, encontrar no arquivo anexo o relatório %1$s para %2$s.",
         "PleaseFindBelow": "Veja abaixo o seu relatório %1$s para %2$s.",
-        "PluginDescription": "Criar e baixar seus relatórios personalizados, e tê-los enviado por email diária, semanal ou mensalmente.",
         "ReportFormat": "Formato do relatório",
         "ReportHour": "Envia relatório em",
         "ReportIncludeNWebsites": "O relatório incluirá as principais métricas para todos os sites que têm pelo menos uma visita (a partir de sites %s atualmente disponível).",
diff --git a/plugins/ScheduledReports/lang/pt.json b/plugins/ScheduledReports/lang/pt.json
index b91b390ec4..3c2e889c4d 100644
--- a/plugins/ScheduledReports/lang/pt.json
+++ b/plugins/ScheduledReports/lang/pt.json
@@ -14,14 +14,12 @@
         "EmailReports": "Relatórios Email",
         "EmailSchedule": "Agenda de Email",
         "FrontPage": "Primeira Página",
-        "ManageEmailReports": "Gerir relatórios de email",
         "MonthlyScheduleHelp": "Agenda mensal: o relatório será enviado no primeiro dia de cada mês.",
         "MustBeLoggedIn": "Deve estar autenticado para criar e agendar relatórios personalizados.",
         "Pagination": "Página %s de %s",
         "PiwikReports": "Relatórios Piwik",
         "PleaseFindAttachedFile": "Por favor encontre anexado o seu %1$s relatório para %2$s.",
         "PleaseFindBelow": "Veja abaixo o relatório %1$s para %2$s.",
-        "PluginDescription": "Criar e fazer download dos seus relatórios personalizados, e enviar por e-mail diariamente, semanalmente ou mensalmente.",
         "ReportFormat": "Formato do relatório",
         "ReportsIncluded": "Incluir Estatísticas",
         "SendReportNow": "Enviar Relatório agora",
diff --git a/plugins/ScheduledReports/lang/ro.json b/plugins/ScheduledReports/lang/ro.json
index d574374163..be97cbe48a 100644
--- a/plugins/ScheduledReports/lang/ro.json
+++ b/plugins/ScheduledReports/lang/ro.json
@@ -17,7 +17,6 @@
         "EmailSchedule": "E-mail Program",
         "EvolutionGraph": "Arata Graficele Istorice pentru valorile top %s",
         "FrontPage": "Pagina titlu",
-        "ManageEmailReports": "Gestionare e-mail Rapoarte",
         "MonthlyScheduleHelp": "Program lunar: Raportul va fi trimis în prima zi a fiecărei luni.",
         "MustBeLoggedIn": "Trebuie să fii logat pentru a crea și programa rapoarte personalizate.",
         "NoRecipients": "Acest raport nu are destinatari",
@@ -26,7 +25,6 @@
         "PiwikReports": "Rapoarte Piwik",
         "PleaseFindAttachedFile": "Vă rugăm să găsiți în fișierul tau atașat %1$s raportul pentru %2$s.",
         "PleaseFindBelow": "Va rugam sa gasiti mai jos raport ul tau de %1$s pentru %2$s.",
-        "PluginDescription": "Creaza si descărca rapoartele tale personalizate, și le poti trimite prin e-mail zilnic, săptămânal sau lunar.",
         "ReportFormat": "Formatul raportului",
         "ReportHour": "Expediază raportul la",
         "ReportIncludeNWebsites": "Raportul va include principalii indicatori pentru toate site-urile care au cel puțin o vizită (de la %s site-uri disponibile în prezent ).",
diff --git a/plugins/ScheduledReports/lang/ru.json b/plugins/ScheduledReports/lang/ru.json
index 82dde7dcd3..3a89125ea3 100644
--- a/plugins/ScheduledReports/lang/ru.json
+++ b/plugins/ScheduledReports/lang/ru.json
@@ -12,20 +12,19 @@
         "DescriptionOnFirstPage": "Описание отчета будет отображено на первой страние отчета.",
         "DisplayFormat_TablesOnly": "Отображать только таблицы (без графиков)",
         "EmailHello": "Здравствуйте,",
-        "EmailReports": "Отправка по e-mail",
+        "EmailReports": "Email-отчёты",
         "EmailSchedule": "Расписание e-mail рассылки",
         "EvolutionGraph": "Показать историю изменения графика для первых %s значений.",
         "FrontPage": "Первая страница",
-        "ManageEmailReports": "Управление Email-отчетами",
         "MonthlyScheduleHelp": "Ежемесячное расписание: отчеты будут рассылаться каждый первый день месяца.",
         "MustBeLoggedIn": "Вы должны быть авторизованы для создания и редактирования расписания отчетов.",
         "NoRecipients": "У этого отчета нет получателей",
         "OClock": "часов",
         "Pagination": "Страница %s из %s",
+        "PersonalEmailReports": "Персональные Email-отчёты",
         "PiwikReports": "Отчеты Веб-аналитики",
         "PleaseFindAttachedFile": "К этому письму прикреплен файл %1$s, являющийся отчетом для %2$s.",
         "PleaseFindBelow": "Пожалуйста, ниже вашего %1$s отчет за %2$s.",
-        "PluginDescription": "Создавайте и скачивайте ваши пользовательские отчеты и получайте их по почте каждый день, неделю, месяц.",
         "ReportFormat": "Формат отчета",
         "ReportHour": "Отправлять отчёт в",
         "ReportIncludeNWebsites": "Отчет будет содержать основные показатели для всех сайтов, у которых было хотя бы одно посещение (всего сейчас доступно %s сайтов).",
@@ -38,7 +37,7 @@
         "SentToMe": "Отправить мне",
         "TableOfContent": "Лист отчета",
         "ThereIsNoReportToManage": "У вас пока нет отчетности для сайта %s",
-        "TopLinkTooltip": "Создайте Email отчеты в Piwik, чтобы получать их прямо на ваш email или email ваших клиентов автоматически!",
+        "TopLinkTooltip": "Создайте Email-отчёты в Piwik, чтобы получать их прямо на ваш email или email ваших клиентов автоматически!",
         "TopOfReport": "Вернуться наверх",
         "UpdateReport": "Обновить отчетность",
         "WeeklyScheduleHelp": "Еженедельное расписание: отчеты будут рассылаться каждый понедельник."
diff --git a/plugins/ScheduledReports/lang/sl.json b/plugins/ScheduledReports/lang/sl.json
index 1f68dfb058..6867ebf308 100644
--- a/plugins/ScheduledReports/lang/sl.json
+++ b/plugins/ScheduledReports/lang/sl.json
@@ -8,7 +8,6 @@
         "EmailReports": "Email Poročila",
         "EmailSchedule": "Urnik Emailov",
         "FrontPage": "Prva Stran",
-        "ManageEmailReports": "Urejaj Email Poročila",
         "MonthlyScheduleHelp": "Mesečno poročilo: poročilo bo poslano vsak prvi dan v mesecu.",
         "Pagination": "Stran %s od %s",
         "PiwikReports": "Piwik Poročila",
diff --git a/plugins/ScheduledReports/lang/sq.json b/plugins/ScheduledReports/lang/sq.json
index af1d5e09f0..c6e658cd13 100644
--- a/plugins/ScheduledReports/lang/sq.json
+++ b/plugins/ScheduledReports/lang/sq.json
@@ -14,14 +14,12 @@
         "EmailReports": "Dërgo Raportet Me Email",
         "EmailSchedule": "Plan Dërgimi me Email",
         "FrontPage": "Faqja Ballore",
-        "ManageEmailReports": "Administroni Raporte Email",
         "MonthlyScheduleHelp": "Planifikim mujor: raporti do të dërgohet ditën e parë të çdo muaji.",
         "MustBeLoggedIn": "Duhet të jeni i futur që të krijoni dhe të planifikoni raporte të personalizuar.",
         "Pagination": "Faqja %s nga %s",
         "PiwikReports": "Raporte Piwik",
         "PleaseFindAttachedFile": "Ju lutem, shihni te kartela bashkangjitur %1$s raportin tuaj për %2$s.",
         "PleaseFindBelow": "Ju lutem, shihni më poshtë raportin tuaj %1$s për %2$s.",
-        "PluginDescription": "Krijoni dhe shkarkoni raporte të personalizuar, dhe merrini ata përditë, përjavë ose përmuaj, me email.",
         "ReportFormat": "Format Raporti",
         "ReportsIncluded": "Përfshi statistikat",
         "SendReportNow": "Dërgoje Raportin tani",
diff --git a/plugins/ScheduledReports/lang/sr.json b/plugins/ScheduledReports/lang/sr.json
index e24b0f6640..157eceaf8e 100644
--- a/plugins/ScheduledReports/lang/sr.json
+++ b/plugins/ScheduledReports/lang/sr.json
@@ -17,7 +17,6 @@
         "EmailSchedule": "Zakaži slanje",
         "EvolutionGraph": "Prikaži istorijske grafikone za prvih %s vrednosti",
         "FrontPage": "Naslovna strana",
-        "ManageEmailReports": "Upravljanje izveštajima",
         "MonthlyScheduleHelp": "Mesečno zakazivanje: izveštaj će biti poslat svakog prvog u mesecu.",
         "MustBeLoggedIn": "Morate biti prijavljeni na sistem kako biste kreirali i zakazivali izveštaje.",
         "NoRecipients": "Nije definisan primaoc",
@@ -26,7 +25,6 @@
         "PiwikReports": "Piwik izveštaji",
         "PleaseFindAttachedFile": "u prilogu se nalazi vaš %1$s izveštaj za %2$s.",
         "PleaseFindBelow": "u nastavku je vaš %1$s izveštaj za %2$s.",
-        "PluginDescription": "Napravite i preuzmite izveštaje putem elektronske pošte dnevno, nedeljno ili mesečno.",
         "ReportFormat": "Format izveštaja",
         "ReportHour": "Pošalji izveštaj u",
         "ReportIncludeNWebsites": "Izveštaj će obuhvatiti glavne metrike za sve sajtove koji imaju barem jednu posetu (od ukupno %s sajtova koliko je trenutno dostupno).",
diff --git a/plugins/ScheduledReports/lang/sv.json b/plugins/ScheduledReports/lang/sv.json
index 7101c7f4c0..c078ffd55b 100644
--- a/plugins/ScheduledReports/lang/sv.json
+++ b/plugins/ScheduledReports/lang/sv.json
@@ -17,7 +17,6 @@
         "EmailSchedule": "Schemalagd e-post",
         "EvolutionGraph": "Visa historiska grafer för dom topp %s värdena",
         "FrontPage": "Startsida",
-        "ManageEmailReports": "Hantera e-postrapporter",
         "MonthlyScheduleHelp": "Månatligt schema: Rapporten kommer att skickas ut den första dagen i varje månad.",
         "MustBeLoggedIn": "Du måste vara inloggad för att skapa och schemalägga anpassade rapporter.",
         "NoRecipients": "Rapporten har ingen mottagare",
@@ -26,7 +25,6 @@
         "PiwikReports": "Piwik Rapporter",
         "PleaseFindAttachedFile": "Du finner din rapport %1$s i den bifogade filen för %2$s.",
         "PleaseFindBelow": "Nedan hittar du din %1$s rapport för %2$s.",
-        "PluginDescription": "Skapa och ladda ner dina anpassade rapporter, och få dem e-postade dagligen, veckovis eller månadsvis.",
         "ReportFormat": "Rapportformat",
         "ReportHour": "Skicka rapporten vid",
         "ReportIncludeNWebsites": "Rapporten kommer att innehålla viktiga mättal för alla webbplatser som har minst ett besök (från %s webbsidorna som för tillfället är tillgängliga).",
diff --git a/plugins/ScheduledReports/lang/ta.json b/plugins/ScheduledReports/lang/ta.json
index 956f74dad9..025dbfcad4 100644
--- a/plugins/ScheduledReports/lang/ta.json
+++ b/plugins/ScheduledReports/lang/ta.json
@@ -3,7 +3,6 @@
         "CreateReport": "அறிக்கையை உருவாக்கு",
         "EmailReports": "மின்னஞ்சல் அறிக்கைகள்",
         "EmailSchedule": "மின்னஞ்சல் பட்டி",
-        "FrontPage": "முன் பக்கம்",
-        "ManageEmailReports": "மின்னஞ்சல் அறிக்கைகளை மேலாண் செய்"
+        "FrontPage": "முன் பக்கம்"
     }
 }
\ No newline at end of file
diff --git a/plugins/ScheduledReports/lang/tl.json b/plugins/ScheduledReports/lang/tl.json
index ffd25ed8c8..f3f217b429 100644
--- a/plugins/ScheduledReports/lang/tl.json
+++ b/plugins/ScheduledReports/lang/tl.json
@@ -17,7 +17,6 @@
         "EmailSchedule": "Iskedyul ng email",
         "EvolutionGraph": "Ipakita ang mga Makasaysayang Graph para sa nangungunang %s halaga",
         "FrontPage": "Pangunahing Pahina",
-        "ManageEmailReports": "Pamahalaan ang mga Ulat sa Email",
         "MonthlyScheduleHelp": "Buwanang iskedyul: ang ulat ay ipapadala sa unang araw ng bawat buwan.",
         "MustBeLoggedIn": "Kailangang naka-log in upang gumawa at mag-iskedyul ng mga pasadyang ulat",
         "NoRecipients": "Wala pang makakatanggap sa ulat na ito",
@@ -26,7 +25,6 @@
         "PiwikReports": "Mga ulat ng Piwik",
         "PleaseFindAttachedFile": "Pakihanap sa naka-attach na file ang iyong %1$s ulat para sa %2$s.",
         "PleaseFindBelow": "Mangyaring hanapin sa ibaba ang iyong %1$s ulat para sa %2$s.",
-        "PluginDescription": "Gumawa at i-download ang iyong mga custom na ulat at i-email ang mga ito araw-araw linguhan o buwanan.",
         "ReportFormat": "Report Format",
         "ReportHour": "Ipadala ang ulat sa",
         "ReportIncludeNWebsites": "Ang ulat ay may kasamang pangunahing sukatan para sa lahat ng website na hindi bababa sa isang pagbisite (mula sa %s website hanggang sa kasalukuyan)",
diff --git a/plugins/ScheduledReports/lang/vi.json b/plugins/ScheduledReports/lang/vi.json
index 7c516be7f3..d1096b457e 100644
--- a/plugins/ScheduledReports/lang/vi.json
+++ b/plugins/ScheduledReports/lang/vi.json
@@ -17,7 +17,6 @@
         "EmailSchedule": "Lịch email",
         "EvolutionGraph": "Hiển thị đồ thị lịch sử cho các giá trị %s đứng đầu",
         "FrontPage": "Trang đầu",
-        "ManageEmailReports": "Quản lý các báo cáo email",
         "MonthlyScheduleHelp": "Lịch trình hàng tháng: báo cáo sẽ được gửi vào ngày đầu tiên của mỗi tháng.",
         "MustBeLoggedIn": "Bạn phải đăng nhập để tạo và lập lịch các báo cáo tùy chỉnh.",
         "NoRecipients": "Báo cáo này không có người nhận",
@@ -26,7 +25,6 @@
         "PiwikReports": "Các báo cáo Piwik",
         "PleaseFindAttachedFile": "Hãy tìm trong tập tin đính kèm %1$s báo cáo của bạn cho %2$s.",
         "PleaseFindBelow": "Hãy tìm dưới đây %1$s báo cáo của bạn cho %2$s.",
-        "PluginDescription": "Tạo và tải về các báo cáo tuỳ chỉnh của bạn, và họ đã gửi qua email hàng ngày, hàng tuần hoặc hàng tháng.",
         "ReportFormat": "Định dạng báo cáo",
         "ReportHour": "Gửi báo cáo tại",
         "ReportIncludeNWebsites": "Báo cáo này sẽ bao gồm các số liệu chính cho tất cả các trang web có ít nhất một lần truy cập( từ trang web %s hiện đang có sẵn).",
diff --git a/plugins/ScheduledReports/lang/zh-cn.json b/plugins/ScheduledReports/lang/zh-cn.json
index 15fcd666d3..45d9e72aa6 100644
--- a/plugins/ScheduledReports/lang/zh-cn.json
+++ b/plugins/ScheduledReports/lang/zh-cn.json
@@ -17,7 +17,6 @@
         "EmailSchedule": "邮件计划",
         "EvolutionGraph": "显示前 %s 个的历史图形",
         "FrontPage": "首页",
-        "ManageEmailReports": "管理报表邮件",
         "MonthlyScheduleHelp": "每月计划: 报表将会在每月的第一天寄出。",
         "MustBeLoggedIn": "登录后才能创建和自定义报表。",
         "NoRecipients": "这个报表没有收件人",
@@ -26,7 +25,6 @@
         "PiwikReports": "Piwik 报表",
         "PleaseFindAttachedFile": "您的 %2$s 的 %1$s 报表在附件中。",
         "PleaseFindBelow": "下面是您的 %2$s 的 %1$s 报表。",
-        "PluginDescription": "生成和下载您的自定义报表，可以选择日发送，周发送或者月发送。",
         "ReportFormat": "报表格式",
         "ReportHour": "发送报表时间",
         "ReportIncludeNWebsites": "本报表包括至少有一次访问(来自当前的 %s 个网站)的所有网站的主要指标。",
diff --git a/plugins/ScheduledReports/templates/_addReport.twig b/plugins/ScheduledReports/templates/_addReport.twig
index 3fbc21b98b..24ddf473a3 100644
--- a/plugins/ScheduledReports/templates/_addReport.twig
+++ b/plugins/ScheduledReports/templates/_addReport.twig
@@ -1,7 +1,4 @@
 <div class="entityAddContainer" style="display:none;">
-    <div class='entityCancel'>
-        {{ 'ScheduledReports_CancelAndReturnToReports'|translate("<a class='entityCancelLink'>","</a>")|raw }}
-    </div>
     <div class='clear'></div>
     <form id='addEditReport'>
         <table class="dataTable entityTable">
diff --git a/plugins/ScheduledReports/templates/_listReports.twig b/plugins/ScheduledReports/templates/_listReports.twig
index b9359f21a0..72b6698fcb 100644
--- a/plugins/ScheduledReports/templates/_listReports.twig
+++ b/plugins/ScheduledReports/templates/_listReports.twig
@@ -12,7 +12,7 @@
         </tr>
         </thead>
 
-        {% if userLogin == 'anonymous' %}
+    {% if userLogin == 'anonymous' %}
         <tr>
             <td colspan='7'>
                 <br/>
@@ -21,18 +21,14 @@
                 <br/><br/>
             </td>
         </tr>
-    </table>
     {% elseif reports is empty %}
-    <tr>
-        <td colspan='7'>
-            <br/>
-            {{ 'ScheduledReports_ThereIsNoReportToManage'|translate(siteName)|raw }}.
-            <br/><br/>
-            <a onclick='' id='linkAddReport'>&rsaquo; {{ 'ScheduledReports_CreateAndScheduleReport'|translate }}</a>
-            <br/><br/>
-        </td>
-    </tr>
-    </table>
+        <tr>
+            <td colspan='7'>
+                <br/>
+                {{ 'ScheduledReports_ThereIsNoReportToManage'|translate(siteName)|raw }}.
+                <br/><br/>
+            </td>
+        </tr>
     {% else %}
     {% for report in reports %}
         <tr>
@@ -62,7 +58,7 @@
                         <br/>
                     {% endfor %}
                     {# send now link #}
-                    <a href="#" idreport="{{ report.idreport }}" name="linkSendNow" class="link_but" style="margin-top:3px;">
+                    <a href="#" idreport="{{ report.idreport }}" name="linkSendNow" class="link_but withIcon" style="margin-top:3px;">
                         <img border=0 src='{{ reportTypes[report.type] }}'/>
                         {{ 'ScheduledReports_SendReportNow'|translate }}
                     </a>
@@ -75,33 +71,35 @@
                             'outputType':downloadOutputType, 'language':language,
                             'format': (report.format in ['html', 'csv']) ? report.format : false
                        }) }}"
-                   rel="noreferrer"  target="_blank" name="linkDownloadReport" id="{{ report.idreport }}" class="link_but">
+                   rel="noreferrer"  target="_blank" name="linkDownloadReport" id="{{ report.idreport }}" class="link_but withIcon">
                     <img src='{{ reportFormatsByReportType[report.type][report.format] }}' border="0"/>
                     {{ 'General_Download'|translate }}
                 </a>
             </td>
             <td>
                 {# edit link #}
-                <a href='#' name="linkEditReport" id="{{ report.idreport }}" class="link_but">
+                <a href='#' name="linkEditReport" id="{{ report.idreport }}" class="link_but withIcon">
                     <img src='plugins/Morpheus/images/ico_edit.png' border="0"/>
                     {{ 'General_Edit'|translate }}
                 </a>
             </td>
             <td>
                 {# delete link #}
-                <a href='#' name="linkDeleteReport" id="{{ report.idreport }}" class="link_but">
+                <a href='#' name="linkDeleteReport" id="{{ report.idreport }}" class="link_but withIcon">
                     <img src='plugins/Morpheus/images/ico_delete.png' border="0"/>
                     {{ 'General_Delete'|translate }}
                 </a>
             </td>
         </tr>
     {% endfor %}
+    {% endif %}
+
     </table>
     {% if userLogin != 'anonymous' %}
         <br/>
-        <a onclick='' id='linkAddReport'>&rsaquo; {{ 'ScheduledReports_CreateAndScheduleReport'|translate }}</a>
+        <div id='linkAddReport' class="addrow"><img src='plugins/Morpheus/images/add.png'/> {{ 'ScheduledReports_CreateAndScheduleReport'|translate }}</div>
         <br/>
         <br/>
     {% endif %}
-    {% endif %}
+
 </div>
diff --git a/plugins/ScheduledReports/templates/index.twig b/plugins/ScheduledReports/templates/index.twig
index b8ccecf53a..89065c5d90 100644
--- a/plugins/ScheduledReports/templates/index.twig
+++ b/plugins/ScheduledReports/templates/index.twig
@@ -1,16 +1,17 @@
-{% extends 'dashboard.twig' %}
+{% extends 'user.twig' %}
 
 {% block content %}
 
-{% include "@CoreHome/_siteSelectHeader.twig" %}
+<div class="emailReports">
+    <h2 piwik-enriched-headline
+        help-url="http://piwik.org/docs/email-reports/">{{ 'ScheduledReports_PersonalEmailReports'|translate }}</h2>
 
-<div class="top_controls">
-    {% include "@CoreHome/_periodSelect.twig" %}
-</div>
+    {% include "@CoreHome/_siteSelectHeader.twig" %}
+
+    <div class="top_controls">
+        {% include "@CoreHome/_periodSelect.twig" %}
+    </div>
 
-<div class="centerLargeDiv">
-    <h2 piwik-enriched-headline
-        help-url="http://piwik.org/docs/email-reports/">{{ 'ScheduledReports_ManageEmailReports'|translate }}</h2>
     <span id="reportSentSuccess"></span>
     <span id="reportUpdatedSuccess"></span>
 
@@ -53,10 +54,17 @@
         position:relative;
     }
 
-    .entityAddContainer > .entityCancel:first-child {
-        position: absolute;
-        right:0;
-        bottom:100%;
+    #linkAddReport {
+        margin-top: 0px;
     }
+
+    #linkAddReport:hover {
+        text-decoration: underline;
+    }
+
+    .emailReports .top_controls {
+        padding-bottom: 18px;
+    }
+
 </style>
 {% endblock %}
diff --git a/plugins/ScheduledReports/tests/Integration/ApiTest.php b/plugins/ScheduledReports/tests/Integration/ApiTest.php
index 50610684d6..080e3b3be1 100644
--- a/plugins/ScheduledReports/tests/Integration/ApiTest.php
+++ b/plugins/ScheduledReports/tests/Integration/ApiTest.php
@@ -15,9 +15,9 @@ use Piwik\Plugins\ScheduledReports\API as APIScheduledReports;
 use Piwik\Plugins\ScheduledReports\Menu;
 use Piwik\Plugins\ScheduledReports\Tasks;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
-use Piwik\ScheduledTask;
-use Piwik\ScheduledTime\Monthly;
-use Piwik\ScheduledTime;
+use Piwik\Scheduler\Schedule\Monthly;
+use Piwik\Scheduler\Schedule\Schedule;
+use Piwik\Scheduler\Task;
 use Piwik\Site;
 use Piwik\Tests\Framework\Mock\FakeAccess;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
@@ -61,7 +61,7 @@ class ApiTest extends IntegrationTestCase
             'idsite'      => $this->idSite,
             'description' => 'test description"',
             'type'        => 'email',
-            'period'      => ScheduledTime::PERIOD_DAY,
+            'period'      => Schedule::PERIOD_DAY,
             'hour'        => '4',
             'format'      => 'pdf',
             'reports'     => array('UserCountry_getCountry'),
@@ -75,7 +75,7 @@ class ApiTest extends IntegrationTestCase
 
         $dataWebsiteTwo = $data;
         $dataWebsiteTwo['idsite'] = 2;
-        $dataWebsiteTwo['period'] = ScheduledTime::PERIOD_MONTH;
+        $dataWebsiteTwo['period'] = Schedule::PERIOD_MONTH;
 
         self::addReport($dataWebsiteTwo);
 
@@ -278,7 +278,7 @@ class ApiTest extends IntegrationTestCase
         APIScheduledReports::getInstance()->addReport(
             1,
             '',
-            ScheduledTime::PERIOD_DAY,
+            Schedule::PERIOD_DAY,
             0,
             MobileMessaging::MOBILE_TYPE,
             MobileMessaging::SMS_FORMAT,
@@ -352,7 +352,7 @@ class ApiTest extends IntegrationTestCase
         // test no exception is raised when a scheduled report is set to never send
         $report6 = self::getMonthlyEmailReportData($this->idSite);
         $report6['idreport'] = 6;
-        $report6['period'] = ScheduledTime::PERIOD_NEVER;
+        $report6['period'] = Schedule::PERIOD_NEVER;
         $report6['deleted'] = 0;
 
         $stubbedAPIScheduledReports = $this->getMock('\\Piwik\\Plugins\\ScheduledReports\\API', array('getReports', 'getInstance'), $arguments = array(), $mockClassName = '', $callOriginalConstructor = false);
@@ -368,7 +368,7 @@ class ApiTest extends IntegrationTestCase
         ));
 
         // expected tasks
-        $scheduleTask1 = ScheduledTime::factory('daily');
+        $scheduleTask1 = Schedule::factory('daily');
         $scheduleTask1->setHour(0); // paris is UTC-1, period ends at 23h UTC
         $scheduleTask1->setTimezone('Europe/Paris');
 
@@ -385,10 +385,10 @@ class ApiTest extends IntegrationTestCase
         $scheduleTask4->setTimezone('UTC-6.5');
 
         $expectedTasks = array(
-            new ScheduledTask (APIScheduledReports::getInstance(), 'sendReport', 1, $scheduleTask1),
-            new ScheduledTask (APIScheduledReports::getInstance(), 'sendReport', 2, $scheduleTask2),
-            new ScheduledTask (APIScheduledReports::getInstance(), 'sendReport', 4, $scheduleTask3),
-            new ScheduledTask (APIScheduledReports::getInstance(), 'sendReport', 5, $scheduleTask4),
+            new Task(APIScheduledReports::getInstance(), 'sendReport', 1, $scheduleTask1),
+            new Task(APIScheduledReports::getInstance(), 'sendReport', 2, $scheduleTask2),
+            new Task(APIScheduledReports::getInstance(), 'sendReport', 4, $scheduleTask3),
+            new Task(APIScheduledReports::getInstance(), 'sendReport', 5, $scheduleTask4),
         );
 
         $pdfReportPlugin = new Tasks();
@@ -406,8 +406,8 @@ class ApiTest extends IntegrationTestCase
     public function getGetReportSubjectAndReportTitleTestCases()
     {
         return array(
-            array('<Piwik.org>', '<Piwik.org>', '<Piwik.org>', array('UserSettings_getBrowserType')),
-            array('Piwik.org', 'Piwik.org', 'Piwik.org', array('MultiSites_getAll', 'UserSettings_getBrowserType')),
+            array('<Piwik.org>', '<Piwik.org>', '<Piwik.org>', array('DevicesDetection_getBrowserEngines')),
+            array('Piwik.org', 'Piwik.org', 'Piwik.org', array('MultiSites_getAll', 'DevicesDetection_getBrowserEngines')),
             array('General_MultiSitesSummary', 'General_MultiSitesSummary', 'Piwik.org', array('MultiSites_getAll')),
         );
     }
@@ -457,7 +457,7 @@ class ApiTest extends IntegrationTestCase
         return array(
             'idsite'      => $idSite,
             'description' => 'test description"',
-            'period'      => ScheduledTime::PERIOD_DAY,
+            'period'      => Schedule::PERIOD_DAY,
             'hour'        => '7',
             'type'        => 'email',
             'format'      => 'pdf',
@@ -476,7 +476,7 @@ class ApiTest extends IntegrationTestCase
         return array(
             'idsite'      => $idSite,
             'description' => 'very very long and possibly truncated description. very very long and possibly truncated description. very very long and possibly truncated description. very very long and possibly truncated description. very very long and possibly truncated description. ',
-            'period'      => ScheduledTime::PERIOD_MONTH,
+            'period'      => Schedule::PERIOD_MONTH,
             'hour'        => '0',
             'type'        => 'email',
             'format'      => 'pdf',
diff --git a/plugins/ScheduledReports/tests/Integration/ScheduledReportsTest.php b/plugins/ScheduledReports/tests/Integration/ScheduledReportsTest.php
index dfe17b9dfd..7b2a2ae655 100644
--- a/plugins/ScheduledReports/tests/Integration/ScheduledReportsTest.php
+++ b/plugins/ScheduledReports/tests/Integration/ScheduledReportsTest.php
@@ -7,12 +7,14 @@
  */
 
 namespace Piwik\Plugins\ScheduledReports\tests;
+
 use Piwik\Access;
 use Piwik\Db;
 use Piwik\Piwik;
 use Piwik\Plugins\ScheduledReports\API;
 use Piwik\Plugins\ScheduledReports\ScheduledReports;
 use Piwik\Tests\Framework\Fixture;
+use Piwik\Tests\Framework\Mock\FakeAccess;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 
 /**
@@ -155,7 +157,7 @@ class ScheduledReportsTest extends IntegrationTestCase
 
     private function setIdentity($login)
     {
-        $pseudoMockAccess = new \FakeAccess();
+        $pseudoMockAccess = new FakeAccess();
         $pseudoMockAccess::$identity  = $login;
         $pseudoMockAccess::$superUser = true;
         Access::setSingletonInstance($pseudoMockAccess);
diff --git a/plugins/SecurityInfo b/plugins/SecurityInfo
-Subproject 36fa09c37715435b96731dceae7ebab05a7d6a0
+Subproject a7e2d59ac96e39e1141808fd944e863dc9588e8
diff --git a/plugins/SegmentEditor/javascripts/Segmentation.js b/plugins/SegmentEditor/javascripts/Segmentation.js
index 13126b2ccd..176283eded 100644
--- a/plugins/SegmentEditor/javascripts/Segmentation.js
+++ b/plugins/SegmentEditor/javascripts/Segmentation.js
@@ -69,18 +69,6 @@ Segmentation = (function($) {
             this.currentSegmentStr = segmentStr;
         };
 
-        segmentation.prototype.shortenSegmentName = function(name, length){
-
-            if(typeof length === "undefined") length = 18;
-            if(typeof name === "undefined") name = "";
-            var i;
-
-            if(name.length > length) {
-                return name.slice(0, length).trim() + "...";
-            }
-            return name;
-        };
-
         segmentation.prototype.markCurrentSegment = function(){
             var current = this.getSegment();
 
@@ -208,7 +196,6 @@ Segmentation = (function($) {
         var getListHtml = function() {
             var html = self.editorTemplate.find("> .listHtml").clone();
             var segment, injClass;
-
             var listHtml = '<li data-idsegment="" ' +
                             (self.currentSegmentStr == "" ? " class='segmentSelected' " : "")
                             + ' data-definition=""><span class="segname">' + self.translations['SegmentEditor_DefaultAllVisits']
@@ -219,12 +206,16 @@ Segmentation = (function($) {
                 {
                     segment = self.availableSegments[i];
                     injClass = "";
-                    if( segment.definition == self.currentSegmentStr){
+                    var checkSelected = segment.definition;
+                    if(!$.browser.mozilla) {
+                        checkSelected = encodeURIComponent(checkSelected);
+                    }
+                    
+                    if( checkSelected == self.currentSegmentStr){
                         injClass = 'class="segmentSelected"';
                     }
                     listHtml += '<li data-idsegment="'+segment.idsegment+'" data-definition="'+ (segment.definition).replace(/"/g, '&quot;') +'" '
-                                + injClass +' title="'+segment.name+'"><span class="segname">'
-                                + self.shortenSegmentName(segment.name)+'</span>';
+                                +injClass+' title="'+segment.name+'"><span class="segname">'+segment.name+'</span>';
                     if(self.segmentAccess == "write") {
                         listHtml += '<span class="editSegment" title="'+ self.translations['General_Edit'].toLocaleLowerCase() +'"></span>';
                     }
@@ -258,7 +249,7 @@ Segmentation = (function($) {
             for(var i = 0; i < self.availableSegments.length; i++)
             {
                 segment = self.availableSegments[i];
-                newOption = '<option data-idsegment="'+segment.idsegment+'" data-definition="'+(segment.definition).replace(/"/g, '&quot;')+'" title="'+segment.name+'">'+self.shortenSegmentName(segment.name)+'</option>';
+                newOption = '<option data-idsegment="'+segment.idsegment+'" data-definition="'+(segment.definition).replace(/"/g, '&quot;')+'" title="'+segment.name+'">'+segment.name+'</option>';
                 segmentsDropdown.append(newOption);
             }
             $(html).find(".segment-content > h3").after(getInitialStateRowsHtml()).show();
@@ -334,7 +325,7 @@ Segmentation = (function($) {
             $(self.form).find(".segment-content > h3 > span").text(segment.name);
             $(self.form).find('.available_segments_select > option[data-idsegment="'+segment.idsegment+'"]').prop("selected",true);
 
-            $(self.form).find('.available_segments a.dropList').text(self.shortenSegmentName(segment.name));
+            $(self.form).find('.available_segments a.dropList').text(segment.name);
 
             if(segment.definition != ""){
                 revokeInitialStateRows();
diff --git a/plugins/SegmentEditor/lang/nb.json b/plugins/SegmentEditor/lang/nb.json
index ebc33e267b..b6f48d138e 100644
--- a/plugins/SegmentEditor/lang/nb.json
+++ b/plugins/SegmentEditor/lang/nb.json
@@ -2,8 +2,11 @@
     "SegmentEditor": {
         "AddNewSegment": "Legg til nytt segment",
         "ChooseASegment": "Velg et segment",
+        "DefaultAllVisits": "Alle besøk",
         "OperatorAND": "OG",
         "OperatorOR": "ELLER",
+        "SegmentDisplayedAllWebsites": "alle nettsteder",
+        "SegmentDisplayedThisWebsiteOnly": "kun denne nettsiden",
         "SegmentIsDisplayedForWebsite": "og vises for",
         "ThisSegmentIsVisibleTo": "Dette segmentet er synlig for:",
         "VisibleToAllUsers": "alle brukere",
diff --git a/plugins/SegmentEditor/lang/ru.json b/plugins/SegmentEditor/lang/ru.json
index 55ae3f319a..3bc8394ee4 100644
--- a/plugins/SegmentEditor/lang/ru.json
+++ b/plugins/SegmentEditor/lang/ru.json
@@ -10,6 +10,7 @@
         "SegmentDisplayedAllWebsites": "все сайты",
         "SegmentDisplayedThisWebsiteOnly": "только этот сайт",
         "SegmentIsDisplayedForWebsite": "и отображается для",
+        "SegmentNotAppliedMessage": "Вы запрашиваете данные для пользовательского сегмента '%s', эта конфигурация Piwik в данный момент препятствует обработке отчетов в реальном времени по соображениям производительности.",
         "SelectSegmentOfVisitors": "Выберите сегмент посетителей:",
         "ThisSegmentIsVisibleTo": "Этот сегмент видим для:",
         "VisibleToAllUsers": "все пользователи",
diff --git a/plugins/SegmentEditor/stylesheets/segmentation.less b/plugins/SegmentEditor/stylesheets/segmentation.less
index f7f27d94e0..fdf4a1d579 100644
--- a/plugins/SegmentEditor/stylesheets/segmentation.less
+++ b/plugins/SegmentEditor/stylesheets/segmentation.less
@@ -204,7 +204,7 @@ div.scrollable {
 .segment-element .segment-content .segment-rows {
   padding: 4px;
   margin: 0 3px 0 0;
-  background: #fff;
+  background: @theme-color-background-base;
   border: 1px solid #a9a399;
   border-radius: 3px 3px 3px 3px;
   position: relative;
@@ -214,7 +214,7 @@ div.scrollable {
 .segment-element .segment-content .segment-add-row,
 .segment-element .segment-content .segment-add-or {
   font: bold 14px Arial;
-  background: #fff;
+  background: @theme-color-background-base;
   color: #b9b9b9;
   text-align: center;
   position: relative;
@@ -303,7 +303,7 @@ div.scrollable {
 .segment-element .segment-content .segment-or:after {
   content: '';
   position: absolute;
-  background: #fff;
+  background: @theme-color-background-base;
   border: 1px solid #efefeb;
   width: 10px;
   top: -1px;
@@ -327,7 +327,7 @@ div.scrollable {
   margin: -1px 0 -1px 6%;
   z-index: 1;
   position: relative;
-  background: #fff;
+  background: @theme-color-background-base;
   padding: 5px 35px;
   color: #4f4f4f;
   font: bold 14px Arial;
@@ -653,11 +653,6 @@ a.metric_category {
   content: ".";
 }
 
-.available_segments a.dropdown {
-  background: url("plugins/Morpheus/images/sort_subtable_desc.png") no-repeat scroll 100% -2px transparent !important;
-  padding: 0 17px 0 0 !important;
-}
-
 .notification {
   float: left;
 }
@@ -679,7 +674,7 @@ a.metric_category {
   margin: 8px;
 }
 
-.segmentSelected, .segmentSelected:hover {
+.segmentSelected, .segmentSelected:hover, .segmentEditorPanel .segmentationContainer .submenu li .segmentSelected {
   font-weight: bold;
 }
 
@@ -739,13 +734,44 @@ a.metric_category {
   width: 160px;
 }
 
-.available_segments a.dropdown,
+.segmentationTitle,
+.segment-element .segment-nav a.dropdown,
+.segname {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.segmentationTitle,
+.segment-element .segment-nav a.dropdown {
+  max-width: 160px;
+}
+
+.segname {
+  max-width: 145px;
+}
+
+.segmentEditorPanel.visible .segmentationTitle {
+  max-width: 180px;
+  overflow: visible; /* restore default */
+  white-space: normal; /* restore default */
+}
+
+.segment-element .segment-nav a.dropdown,
+.segname {
+	display: inline-block;
+}
+
+.segment-element .segment-nav a.dropdown,
 .segment-element .segment-top a.dropdown {
   padding: 0 17px 0 0;
   background: none !important;
 }
 
-.available_segments a.dropdown:after,
+.segment-element .segment-nav a.dropdown {
+  background: url("plugins/Morpheus/images/sort_subtable_desc.png") no-repeat scroll 100% -2px transparent !important;
+}
+
 .segment-element .segment-top a.dropdown:after {
   content: " \25BC";
   font-size: 0px;
diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php
index 1e7ffb2867..8457778ab5 100644
--- a/plugins/SitesManager/API.php
+++ b/plugins/SitesManager/API.php
@@ -11,6 +11,7 @@ namespace Piwik\Plugins\SitesManager;
 use Exception;
 use Piwik\Access;
 use Piwik\Common;
+use Piwik\Container\StaticContainer;
 use Piwik\Date;
 use Piwik\Db;
 use Piwik\Metrics\Formatter;
@@ -18,10 +19,10 @@ use Piwik\Network\IPUtils;
 use Piwik\Option;
 use Piwik\Piwik;
 use Piwik\ProxyHttp;
+use Piwik\Scheduler\Scheduler;
 use Piwik\SettingsPiwik;
 use Piwik\SettingsServer;
 use Piwik\Site;
-use Piwik\TaskScheduler;
 use Piwik\Tracker;
 use Piwik\Tracker\Cache;
 use Piwik\Url;
@@ -182,6 +183,7 @@ class API extends \Piwik\Plugin\API
         $site = $this->getModel()->getSiteFromId($idSite);
 
         Site::setSitesFromArray(array($site));
+
         return $site;
     }
 
@@ -350,7 +352,10 @@ class API extends \Piwik\Plugin\API
      */
     public function getSitesIdWithAtLeastViewAccess($_restrictSitesToLogin = false)
     {
-        if (Piwik::hasUserSuperUserAccess() && !TaskScheduler::isTaskBeingExecuted()) {
+        /** @var Scheduler $scheduler */
+        $scheduler = StaticContainer::getContainer()->get('Piwik\Scheduler\Scheduler');
+
+        if (Piwik::hasUserSuperUserAccess() && !$scheduler->isRunningTask()) {
             return Access::getInstance()->getSitesIdWithAtLeastViewAccess();
         }
 
@@ -359,7 +364,7 @@ class API extends \Piwik\Plugin\API
             // but during scheduled task execution, we sometimes want to restrict sites to
             // a different login than the superuser.
             && (Piwik::hasUserSuperUserAccessOrIsTheUser($_restrictSitesToLogin)
-                || TaskScheduler::isTaskBeingExecuted())
+                || $scheduler->isRunningTask())
         ) {
 
             if (Piwik::hasTheUserSuperUserAccess($_restrictSitesToLogin)) {
@@ -599,9 +604,6 @@ class API extends \Piwik\Plugin\API
 
         $this->getModel()->deleteSite($idSite);
 
-        // we do not delete logs here on purpose (you can run these queries on the log_ tables to delete all data)
-        Cache::deleteCacheWebsiteAttributes($idSite);
-
         /**
          * Triggered after a site has been deleted.
          *
diff --git a/plugins/SitesManager/SiteUrls.php b/plugins/SitesManager/SiteUrls.php
index b859085d92..a1fac67a89 100644
--- a/plugins/SitesManager/SiteUrls.php
+++ b/plugins/SitesManager/SiteUrls.php
@@ -8,26 +8,25 @@
  */
 namespace Piwik\Plugins\SitesManager;
 
-use Piwik\CacheFile;
-use Piwik\Development;
+use Piwik\Cache;
 
 class SiteUrls
 {
-    private static $allUrlsCacheKey = 'allSiteUrlsPerSite';
+    private static $cacheId = 'allSiteUrlsPerSite';
 
     public static function clearSitesCache()
     {
-        self::getCache()->delete(self::$allUrlsCacheKey);
+        self::getCache()->delete(self::$cacheId);
     }
 
     public function getAllCachedSiteUrls()
     {
         $cache    = $this->getCache();
-        $siteUrls = $cache->get(self::$allUrlsCacheKey);
+        $siteUrls = $cache->fetch(self::$cacheId);
 
-        if (empty($siteUrls) || Development::isEnabled()) {
+        if (empty($siteUrls)) {
             $siteUrls = $this->getAllSiteUrls();
-            $cache->set(self::$allUrlsCacheKey, $siteUrls);
+            $cache->save(self::$cacheId, $siteUrls, 1800);
         }
 
         return $siteUrls;
@@ -53,6 +52,6 @@ class SiteUrls
 
     private static function getCache()
     {
-        return new CacheFile('tracker', 1800);
+        return Cache::getLazyCache();
     }
 }
diff --git a/plugins/SitesManager/SitesManager.php b/plugins/SitesManager/SitesManager.php
index b16b5add39..f06ff69948 100644
--- a/plugins/SitesManager/SitesManager.php
+++ b/plugins/SitesManager/SitesManager.php
@@ -7,6 +7,8 @@
  *
  */
 namespace Piwik\Plugins\SitesManager;
+use Piwik\DataAccess\ArchiveInvalidator;
+use Piwik\Tracker\Cache;
 
 /**
  *
@@ -27,9 +29,19 @@ class SitesManager extends \Piwik\Plugin
             'AssetManager.getStylesheetFiles'        => 'getStylesheetFiles',
             'Tracker.Cache.getSiteAttributes'        => 'recordWebsiteDataInCache',
             'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys',
+            'SitesManager.deleteSite.end'            => 'onSiteDeleted'
         );
     }
 
+    public function onSiteDeleted($idSite)
+    {
+        // we do not delete logs here on purpose (you can run these queries on the log_ tables to delete all data)
+        Cache::deleteCacheWebsiteAttributes($idSite);
+
+        $archiveInvalidator = new ArchiveInvalidator();
+        $archiveInvalidator->forgetRememberedArchivedReportsToInvalidateForSite($idSite);
+    }
+
     /**
      * Get CSS files
      */
@@ -47,7 +59,6 @@ class SitesManager extends \Piwik\Plugin
         $jsFiles[] = "plugins/SitesManager/angularjs/sites-manager/api-helper.service.js";
         $jsFiles[] = "plugins/SitesManager/angularjs/sites-manager/api-site.service.js";
         $jsFiles[] = "plugins/SitesManager/angularjs/sites-manager/api-core.service.js";
-        $jsFiles[] = "plugins/SitesManager/angularjs/sites-manager/api-coreadmin.service.js";
         $jsFiles[] = "plugins/SitesManager/angularjs/sites-manager/multiline-field.directive.js";
         $jsFiles[] = "plugins/SitesManager/angularjs/sites-manager/edit-trigger.directive.js";
         $jsFiles[] = "plugins/SitesManager/angularjs/sites-manager/scroll.directive.js";
@@ -65,7 +76,7 @@ class SitesManager extends \Piwik\Plugin
      */
     public function recordWebsiteDataInCache(&$array, $idSite)
     {
-        $idSite = (int)$idSite;
+        $idSite = (int) $idSite;
 
         // add the 'hosts' entry in the website array
         $array['hosts'] = $this->getTrackerHosts($idSite);
@@ -78,6 +89,20 @@ class SitesManager extends \Piwik\Plugin
         $array['sitesearch'] = $website['sitesearch'];
         $array['sitesearch_keyword_parameters'] = $this->getTrackerSearchKeywordParameters($website);
         $array['sitesearch_category_parameters'] = $this->getTrackerSearchCategoryParameters($website);
+        $array['timezone'] = $this->getTimezoneFromWebsite($website);
+    }
+
+    /**
+     * Returns whether we should keep URL fragments for a specific site.
+     *
+     * @param array $site DB data for the site.
+     * @return bool
+     */
+    private static function getTimezoneFromWebsite($site)
+    {
+        if (!empty($site['timezone'])) {
+            return $site['timezone'];
+        }
     }
 
     /**
diff --git a/plugins/SitesManager/angularjs/sites-manager/api-core.service.js b/plugins/SitesManager/angularjs/sites-manager/api-core.service.js
index 493f976d37..fb19897073 100644
--- a/plugins/SitesManager/angularjs/sites-manager/api-core.service.js
+++ b/plugins/SitesManager/angularjs/sites-manager/api-core.service.js
@@ -13,12 +13,17 @@
     function CoreAPIFactory(api) {
 
         return {
-            getIpFromHeader: getIpFromHeader()
+            getIpFromHeader: getIpFromHeader(),
+            isPluginActivated: isPluginActivated()
         };
 
         function getIpFromHeader() {
             return api.fetchApi('API.getIpFromHeader', api.valueAdaptor);
         }
+
+        function isPluginActivated() {
+            return api.fetchApi('API.isPluginActivated', api.valueAdaptor);
+        }
     }
 
 })();
diff --git a/plugins/SitesManager/angularjs/sites-manager/api-coreadmin.service.js b/plugins/SitesManager/angularjs/sites-manager/api-coreadmin.service.js
deleted file mode 100644
index ae02989fde..0000000000
--- a/plugins/SitesManager/angularjs/sites-manager/api-coreadmin.service.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/*!
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-(function () {
-    // can probably be shared
-    angular.module('piwikApp').factory('coreAdminAPI', CoreAdminAPIFactory);
-
-    CoreAdminAPIFactory.$inject = ['sitesManagerApiHelper'];
-
-    function CoreAdminAPIFactory(api) {
-
-        return {
-            isPluginActivated: isPluginActivated()
-        };
-
-        function isPluginActivated() {
-            return api.fetchApi('CoreAdminHome.isPluginActivated', api.valueAdaptor);
-        }
-    }
-})();
diff --git a/plugins/SitesManager/angularjs/sites-manager/sites-manager.controller.js b/plugins/SitesManager/angularjs/sites-manager/sites-manager.controller.js
index 899ee34fe9..2aea880d24 100644
--- a/plugins/SitesManager/angularjs/sites-manager/sites-manager.controller.js
+++ b/plugins/SitesManager/angularjs/sites-manager/sites-manager.controller.js
@@ -7,9 +7,9 @@
 (function () {
     angular.module('piwikApp').controller('SitesManagerController', SitesManagerController);
 
-    SitesManagerController.$inject = ['$scope', '$filter', 'coreAPI', 'coreAdminAPI', 'sitesManagerAPI', 'piwik', 'sitesManagerApiHelper'];
+    SitesManagerController.$inject = ['$scope', '$filter', 'coreAPI', 'sitesManagerAPI', 'piwik', 'sitesManagerApiHelper'];
 
-    function SitesManagerController($scope, $filter, coreAPI, coreAdminAPI, sitesManagerAPI, piwik, sitesManagerApiHelper) {
+    function SitesManagerController($scope, $filter, coreAPI, sitesManagerAPI, piwik, sitesManagerApiHelper) {
 
         var translate = $filter('translate');
 
@@ -21,6 +21,8 @@
 
         var initModel = function() {
 
+            $scope.period = piwik.broadcast.getValueFromUrl('period');
+            $scope.date = piwik.broadcast.getValueFromUrl('date');
             $scope.sites = [];
             $scope.hasSuperUserAccess = piwik.hasSuperUserAccess;
             $scope.redirectParams = {showaddsite: false};
@@ -139,7 +141,7 @@
 
         var initCustomVariablesActivated = function() {
 
-            coreAdminAPI.isPluginActivated(
+            coreAPI.isPluginActivated(
 
                 function (customVariablesActivated) {
                     $scope.customVariablesActivated = customVariablesActivated;
diff --git a/plugins/SitesManager/lang/ar.json b/plugins/SitesManager/lang/ar.json
index e06c4319d5..7715ea10fa 100644
--- a/plugins/SitesManager/lang/ar.json
+++ b/plugins/SitesManager/lang/ar.json
@@ -32,7 +32,6 @@
         "NoWebsites": "أنت لا تملك أي مواقع لتديرها.",
         "OnlyOneSiteAtTime": "لا يمكنك تحرير أكثر من موقع في الوقت ذاته. يرجى حفظ أو إلغاء التغييرات الحالية على الموقع %s.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "سيقوم Piwik آلياً باستثناء كافة باراميترات الجلسات الشائعة (%s).",
-        "PluginDescription": "إدارة المواقع في Piwik: أضف موقعاً جديداً، أو قم بتحرير واحداً موجوداً، اعرض كود برمجيات جافا ليتم تضمينه في صفحاتك. كافة السلوكيات متوفرة أيضاً من خلال واجهة برمجة التطبيقات.",
         "SelectACity": "اختر مدينة",
         "SelectDefaultCurrency": "يمكنك اختيار العملة الافتراضية للمواقع الجديدة.",
         "SelectDefaultTimezone": "يمكنك تحديد منطقة زمنية افتراضية للمواقع الجديدة",
diff --git a/plugins/SitesManager/lang/be.json b/plugins/SitesManager/lang/be.json
index 6e8ac11362..0ce685219b 100644
--- a/plugins/SitesManager/lang/be.json
+++ b/plugins/SitesManager/lang/be.json
@@ -36,7 +36,6 @@
         "OnlyOneSiteAtTime": "Вы можаце рэдагаваць толькі адзін вэб-сайт за адзін раз. Калі ласка, захаваце ці адмяніце змены ў бягучым сайце %s.",
         "PiwikOffersEcommerceAnalytics": "Piwik прапаноўвае пашыранае адсочванне і рэпартаванне для камерцыйных вэб-сайтаў. Даведайцеся больш пра %s Аналітыку Электронна-камерцыйных сайтаў%s.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik аўтаматычна выключае агульныя параметры сесіі (%s).",
-        "PluginDescription": "Кіраванне Сайтамі ў Piwik: Дадаць новы сайт, Рэдагаваць існуючы, паказаць код JavaScript, каб дадаць яго на старонкі свайго сайта. Усе дзеянні, таксама даступныя праз API.",
         "SelectACity": "Абярыце горад",
         "SelectDefaultCurrency": "Вы можаце выбраць валюту для ўстаноўкі па змаўчанні для новых вэб-сайтаў.",
         "SelectDefaultTimezone": "Вы можаце абраць гадзінны пояс па змаўчанні для новых вэб-сайтаў.",
diff --git a/plugins/SitesManager/lang/bg.json b/plugins/SitesManager/lang/bg.json
index 06b0372cbc..7c7c3e3810 100644
--- a/plugins/SitesManager/lang/bg.json
+++ b/plugins/SitesManager/lang/bg.json
@@ -39,7 +39,6 @@
         "OnlyOneSiteAtTime": "Не можете да променяте едновременно два сайта. Моля Запазете или Откажете вашата текуща модификация на този уеб сайт %s.",
         "PiwikOffersEcommerceAnalytics": "Piwik позволява задълбочено проследяване и анализ на Електронна търговия. Научете повече относно %s Електронна търговия анализ %s.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik автоматично ще изключи общите параметри на сесията (%s).",
-        "PluginDescription": "Уеб сайтове за управление в Piwik: Добавяне на нов сайт, редактиране на вече съществуващ такъв, показване на JavaScript код за добавяне на страниците си. Всички действия са достъпни чрез API.",
         "SearchKeywordLabel": "Параметър за заявката",
         "SearchKeywordParametersDesc": "Въведете списък, разделен със запетаи, за имената на всички заявки съдържащи търсени ключови думи в сайта.",
         "SelectACity": "Изберете град",
diff --git a/plugins/SitesManager/lang/ca.json b/plugins/SitesManager/lang/ca.json
index e0bbfe89a3..29b228a40d 100644
--- a/plugins/SitesManager/lang/ca.json
+++ b/plugins/SitesManager/lang/ca.json
@@ -45,7 +45,6 @@
         "OnlyOneSiteAtTime": "Només podeu editar un lloc web a la vegada. Sisplau, Guardeu o Canceleu les modificacions al lloc web %s.",
         "PiwikOffersEcommerceAnalytics": "EL Piwik permet analítiques avançades per a Eccomerce. Sabeu més de les %s Analítiques per a Ecommerce %s.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik exclourà automàticament els paràmetres de sessió comuns (%s).",
-        "PluginDescription": "Gestió de Llocs Web al Piwik: Afegiu un nou lloc Web, Editeu un d'existent, mostreu el codi Javascript per incloure a les vostres pàgines. Totes les accions están disponibles a través de la API.",
         "SearchCategoryDesc": "El Piwik també pot gestionar la categoria de Cerca per cada una de les paraules clau de la carca interna.",
         "SearchCategoryLabel": "Paràmetre de la categoria",
         "SearchCategoryParametersDesc": "Podeu introduir una llista separada per comes de paràmetres que especifíquen la categoria de cerca.",
diff --git a/plugins/SitesManager/lang/cs.json b/plugins/SitesManager/lang/cs.json
index beb921887b..cf937b35d0 100644
--- a/plugins/SitesManager/lang/cs.json
+++ b/plugins/SitesManager/lang/cs.json
@@ -49,7 +49,7 @@
         "OnlyOneSiteAtTime": "Můžete upravit zároveň pouze jednu stránku. Uložte nebo zrušte současné úpravy stránky %s.",
         "PiwikOffersEcommerceAnalytics": "Piwik povolen pro rozšířenou analytiku a měření stránek typu Obchod. Číst o %s analytice %s více.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik automaticky vynechá běžné parametry sezení (%s)",
-        "PluginDescription": "Správa sídel v Piwiku: Přidat nový web, Upravit existující, Zobrazit JavaScriptový kód při umístění na stránky. Všechny akce jsou k dispozici také přes API.",
+        "PluginDescription": "Správa webových stránek vám umožňuje přidat novou webovou stránku a upravit již existující.",
         "SearchCategoryDesc": "Piwik může také sledovat kategorii vyhledávánípro každé klíčové slovo interního vyhledávání.",
         "SearchCategoryLabel": "Parametr kategorie",
         "SearchCategoryParametersDesc": "Můžete zadat seznam parametrů dotazu oddělených čárkou, které určují kategorii.",
diff --git a/plugins/SitesManager/lang/da.json b/plugins/SitesManager/lang/da.json
index 2820eba9f8..f10d778526 100644
--- a/plugins/SitesManager/lang/da.json
+++ b/plugins/SitesManager/lang/da.json
@@ -49,7 +49,6 @@
         "OnlyOneSiteAtTime": "Du kan kun redigere en hjemmesider ad gangen. Gem eller Annullér de aktuelle ændringer på hjemmesiden %s.",
         "PiwikOffersEcommerceAnalytics": "Piwik giver mulighed for avancerede e-handel analysesporing og rapportering. Lær mere om %s E-handel analyse%s.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": " Piwik vil automatisk udelukke den fælles session parametre (%s).",
-        "PluginDescription": "Hjemmeside styring i Piwik: Tilføj en ny hjemmeside, rediger et eksisterende, vis JavaScript-koden til at inkludere på dine sider. Alle handlinger er også tilgængelige via API.",
         "SearchCategoryDesc": "Piwik kan også spore søgekategori for hver interne hjemmeside søgeord.",
         "SearchCategoryLabel": "Kategoriparameter",
         "SearchCategoryParametersDesc": "Du kan indtaste en kommasepareret liste af søgeparametre, der angiver søgekategorien.",
diff --git a/plugins/SitesManager/lang/de.json b/plugins/SitesManager/lang/de.json
index a3a8ebb81d..922a0afec3 100644
--- a/plugins/SitesManager/lang/de.json
+++ b/plugins/SitesManager/lang/de.json
@@ -49,7 +49,7 @@
         "OnlyOneSiteAtTime": "Sie können immer nur eine Webseite zur gleichen Zeit bearbeiten. Zunächst müssen Sie die aktuellen Änderungen an der Webseite %s speichern oder verwerfen.",
         "PiwikOffersEcommerceAnalytics": "Mit Piwik können Sie Ihre Ecommerce Webseite tracken und erhalten spezielle Ecommerce Berichte. Weitere Informationen %sfinden Sie hier%s.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik wird automatisch typische Session-Parameter ignorieren (%s).",
-        "PluginDescription": "Webseitenverwaltung in Piwik: Eine neue Webseite hinzufügen, eine existierende Webseite editieren, den JavaScript-Code zum Einfügen in die Webseite anzeigen. Alle Aktionen sind auch über die API steuerbar.",
+        "PluginDescription": "Websites management lässt Sie eine neue Webseite hinzufügen und bestehende Webseiten ändern.",
         "SearchCategoryDesc": "Piwik kann auch die Kategorie auswerten, die in der internen Suche gewählt wird.",
         "SearchCategoryLabel": "Kategorie Parameter",
         "SearchCategoryParametersDesc": "Sie können eine durch Komma getrennte Liste der URL-Parameter eingeben, welche die Suchkategorie enthalten.",
diff --git a/plugins/SitesManager/lang/el.json b/plugins/SitesManager/lang/el.json
index 18ed6b2f29..bd7825aa64 100644
--- a/plugins/SitesManager/lang/el.json
+++ b/plugins/SitesManager/lang/el.json
@@ -49,7 +49,7 @@
         "OnlyOneSiteAtTime": "Μπορείτε να επεξεργαστείτε μόνο μια ιστοσελίδα τη φορά. Αποθηκεύστε ή Ακυρώστε τις τρέχουσες αλλαγές για την ιστοσελίδα %s.",
         "PiwikOffersEcommerceAnalytics": "Το Piwik επιτρέπει την καταγραφή και αναφορά προηγμένων Στατιστικών Ηλεκτρονικού Εμπορίου. Μάθετε περισσότερα για τα %sΣτατιστικά Ηλεκτρονικού Εμπορίου%s.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Το Piwik θα αποκλείσει αυτόματα τις παραμέτρους κοινής συνεδρίας (%s).",
-        "PluginDescription": "Διαχείριση Ιστοσελίδων στο Piwik: Προσθήκη μιας νέας ιστοσελίδας, Επεξεργαστείτε μια υπάρχουσα, Προβάλετε τον κώδικα Javascript που πρέπει να περιληφθεί στις σελίδες σας. Όλες οι δραστηριότητες είναι επίσης διαθέσιμες μέσω του API.",
+        "PluginDescription": "Η διαχείριση ιστοτόπων επιτρέπει την προσθήκη νέου ιστοτόπου και την επεξεργασία υπαρχόντων.",
         "SearchCategoryDesc": "Το Piwik μπορεί να παρακολουθεί επίσης την κατηγορία αναζήτησης για κάθε λέξη-κλειδί εσωτερικής αναζήτησης στην ιστοσελίδα.",
         "SearchCategoryLabel": "Παράμετρος κατηγορίας",
         "SearchCategoryParametersDesc": "Μπορείτε να εισάγετε μια λίστα (csv, διαχωρισμένη με κόμματα) των παραμέτρων του ερωτήματος που προσδιορίζουν την κατηγορία αναζήτησης.",
diff --git a/plugins/SitesManager/lang/en.json b/plugins/SitesManager/lang/en.json
index bd7019acdd..072921ef48 100644
--- a/plugins/SitesManager/lang/en.json
+++ b/plugins/SitesManager/lang/en.json
@@ -49,7 +49,7 @@
         "OnlyOneSiteAtTime": "You can only edit one website at a time. Please Save or Cancel your current modifications to the website %s.",
         "PiwikOffersEcommerceAnalytics": "Piwik allows for advanced Ecommerce Analytics tracking & reporting. Learn more about %s Ecommerce Analytics%s.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik will automatically exclude the common session parameters (%s).",
-        "PluginDescription": "Websites Management in Piwik: Add a new Website, Edit an existing one, Show the JavaScript code to include on your pages. All the actions are also available through the API.",
+        "PluginDescription": "Websites management lets you add a new website and edit existing websites. ",
         "SearchCategoryDesc": "Piwik can also track the Search category for each internal site search keyword.",
         "SearchCategoryLabel": "Category parameter",
         "SearchCategoryParametersDesc": "You may enter a comma-separated list of query parameters specifying the search category.",
@@ -74,4 +74,4 @@
         "YouCurrentlyHaveAccessToNWebsites": "You currently have access to %s websites.",
         "YourCurrentIpAddressIs": "Your current IP address is %s"
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/SitesManager/lang/es.json b/plugins/SitesManager/lang/es.json
index bf13e10069..43fec32d47 100644
--- a/plugins/SitesManager/lang/es.json
+++ b/plugins/SitesManager/lang/es.json
@@ -49,7 +49,6 @@
         "OnlyOneSiteAtTime": "Puede editar un sitio de internet a la vez. Por favor guarde o cancele sus modificaciones actuales para el sitio de internet %s.",
         "PiwikOffersEcommerceAnalytics": "Piwik permite el rastreo avanzado de analítica Ecommerce y su posterior generación de informes. Aprenda más acerca de %s Analítica Ecommerce%s.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik automáticamente excluirá los parámetros de sesión (%s).",
-        "PluginDescription": "Administrador de Sitios en Piwik: Agregar un Nuevo Sitio, Mostrar el código Javascript que se incluirá en las páginas. Todas las acciones también están disponibles en la API.",
         "SearchCategoryDesc": "Piwik puede seguir la categoría Buscar para cada palabra clave del buscador del sitio interno.",
         "SearchCategoryLabel": "Parámetro de categoría",
         "SearchCategoryParametersDesc": "Puede ingresar una lista de tipo separado por comas de parámetros de pregunta especificando la categoría de búsqueda.",
diff --git a/plugins/SitesManager/lang/fa.json b/plugins/SitesManager/lang/fa.json
index e97b9eea41..b2951a59e7 100644
--- a/plugins/SitesManager/lang/fa.json
+++ b/plugins/SitesManager/lang/fa.json
@@ -39,7 +39,6 @@
         "NotFound": "وبسایتی یافت نشد برای",
         "NoWebsites": "شما هیچ سایتی برای مدیریت ندارید.",
         "OnlyOneSiteAtTime": "شما در یک لحظه فقط می توانید یک وبسایت را تنظیم کنید. لطفا تغییراتی را که همین الان به وبسایت %s داده اید ذخیره یا لغو کنید.",
-        "PluginDescription": "مدیریت سایت در Piwik: اضافه کردن یک وب سایت جدید، یک موجود را ویرایش، نمایش کد های جاوا اسکریپت در صفحات خود شامل. همه اقدامات نیز در دسترس هستند از طریق API.",
         "SearchCategoryLabel": "پارامتر مجموعه",
         "SearchKeywordLabel": "پارامتر پرس و جو",
         "SearchParametersNote": "توجه: پارامترهای پرس و جو و پارامترهای مجموعه فقط برای وبسایت هایی استفاده خواهند شد که جستجوی سایت را فعال کرده اند ولی این پارامترها را خالی باقی گذاشته اند.",
diff --git a/plugins/SitesManager/lang/fi.json b/plugins/SitesManager/lang/fi.json
index 04b4c8be3f..681251bcd0 100644
--- a/plugins/SitesManager/lang/fi.json
+++ b/plugins/SitesManager/lang/fi.json
@@ -49,7 +49,6 @@
         "OnlyOneSiteAtTime": "Voit muokata vain yhtä verkkosivua kerrallaan. Tallenna tai peru muutoksesi sivuun %s.",
         "PiwikOffersEcommerceAnalytics": "Piwikillä voi seurata verkkokauppaa tarkasti. Lue lisää %s verkkokauppa-analytiikasta%s.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik jättää automaattisesti huomiotta yleiset istuntoparametrit (%s).",
-        "PluginDescription": "Verkkosivujen hallinta Piwikissä: lisää uusi sivu, muokkaa sivua, näytä sivuille lisättävä Javascript. Kaikkia toimintoja voi käyttää myös API:lla.",
         "SearchCategoryDesc": "Piwik voi myös seurata haun kategoriaa jokaiselle sivun sisäiselle hakusanalle.",
         "SearchCategoryLabel": "Kategoriaparametri",
         "SearchCategoryParametersDesc": "Voit ilmoittaa pilkuilla erotellun listan parametreistä, jotka määrittelevät haun kategorian.",
diff --git a/plugins/SitesManager/lang/fr.json b/plugins/SitesManager/lang/fr.json
index c7b0f04d6f..f0c3c4a604 100644
--- a/plugins/SitesManager/lang/fr.json
+++ b/plugins/SitesManager/lang/fr.json
@@ -49,7 +49,6 @@
         "OnlyOneSiteAtTime": "Vous pouvez éditer un site web à la fois. Veuillez Enregistrer ou Annuler vos modifications courantes sur le site web %s.",
         "PiwikOffersEcommerceAnalytics": "Piwik permet un suivi et un rapport avancé des statistiques E-commerce. Apprenez-en plus à propos %s des statistiques E-commerce%s.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik exclura automatiquement les paramètres de session communs (%s).",
-        "PluginDescription": "Gestion des sites web dans Piwik: Ajoute un nouveau site web, modifie un existant, affiche le code JavaScript à inclure dans vos pages. Toutes les actions sont disponibles au travers de l'API.",
         "SearchCategoryDesc": "Piwik peut aussi effectuer le suivi de la catégorie de recherche pour chaque mot-clé de recherche interne.",
         "SearchCategoryLabel": "Paramètres de catégories",
         "SearchCategoryParametersDesc": "Vous pouvez entrer une liste de paramètres de requête servant à spécifier la catégorie de recherche séparés par des virgules.",
diff --git a/plugins/SitesManager/lang/hi.json b/plugins/SitesManager/lang/hi.json
index f36dd5ae1f..23b453178d 100644
--- a/plugins/SitesManager/lang/hi.json
+++ b/plugins/SitesManager/lang/hi.json
@@ -49,7 +49,6 @@
         "OnlyOneSiteAtTime": "आप केवल एक समय में एक वेबसाइट को संपादित कर सकते हैं. वेबसाइट %sके लिए अपने मौजूदा संशोधनों सहेजें या रद्द करें.",
         "PiwikOffersEcommerceAnalytics": "Piwik ट्रैकिंग और रिपोर्टिंग उन्नत ईकॉमर्स एनालिटिक्स के लिए अनुमति देता है. %sईकॉमर्स एनालिटिक्स%s के बारे में अधिक जानें.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik स्वतः सामान्य सत्र के मापदंडों(%s) से अलग रहेगा",
-        "PluginDescription": "Piwik में वेबसाइटों प्रबंधन: एक नई वेबसाइट में जोड़ें, एक मौजूदा एक संपादित करें, अपने पृष्ठों पर शामिल करने के लिए जावास्क्रिप्ट कोड दिखाएं. सभी कार्यों एपीआई के माध्यम से भी उपलब्ध हैं.",
         "SearchCategoryDesc": "Piwik भी एक आंतरिक साइट खोज कीवर्ड के लिए खोज श्रेणी ट्रैक कर सकता हैं.",
         "SearchCategoryLabel": "श्रेणी पैरामीटर",
         "SearchCategoryParametersDesc": "आप खोज श्रेणी को निर्दिष्ट करने क्वेरी पैरामीटर को एक अल्पविराम से अलग सूची दर्ज कर सकते हैं.",
diff --git a/plugins/SitesManager/lang/hu.json b/plugins/SitesManager/lang/hu.json
index b9b81baa5f..585d1fad32 100644
--- a/plugins/SitesManager/lang/hu.json
+++ b/plugins/SitesManager/lang/hu.json
@@ -31,7 +31,6 @@
         "NotFound": "Ilyen weboldal nincs",
         "NoWebsites": "Nem került még létrehozásra egyetlen weboldal sem.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "A Piwik automatikusan kiszűri az általánosan használt session paramétereket (%s).",
-        "PluginDescription": "Weboldalak kezelése a Piwik rendszerében: Új weboldal hozzáadása, meglévő weboldal szerkesztése, a weblapokba beillesztendő JavaScript követőkódok megjelenítése. Az összes funkció elérhető az API-n keresztül is.",
         "SelectACity": "Válassz egy várost",
         "SelectDefaultCurrency": "Kiválaszthatod, melyik legyen az alapértelmezett pénznem új weboldalak létrehozása esetén.",
         "SelectDefaultTimezone": "Kiválaszthatod, melyik legyen az alapértelmezett időzóna új weboldalak létrehozása esetén.",
diff --git a/plugins/SitesManager/lang/id.json b/plugins/SitesManager/lang/id.json
index 59e82c69b6..af4ce5c6ef 100644
--- a/plugins/SitesManager/lang/id.json
+++ b/plugins/SitesManager/lang/id.json
@@ -49,7 +49,6 @@
         "OnlyOneSiteAtTime": "Anda hanya dapat menyunting satu situs dalam sekali waktu. Silakan Simpam atau Batalkan perubahan terhadap situs %s.",
         "PiwikOffersEcommerceAnalytics": "Piwik mungkinkan pelaporan dan pelacakan Analisis Niaga-E. Pelajari tentang %s Analisis Niaga-E%s.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik akan otomatis kecualikan parameter sesi umum (%s).",
-        "PluginDescription": "Pengatur Situs di Piwik: Menambah Situs baru, Menyunting yang telah ada, Menampilakn kodeJavaScript untuk dimasukkan ke halaman Anda. Seluruh tindakan tersebut juga tersedia melalui API.",
         "SearchCategoryDesc": "Piwik juga dapat melacak kategori Pencarian untuk setiap kata kunci pencarian situs dalam.",
         "SearchCategoryLabel": "Parameter kategori",
         "SearchCategoryParametersDesc": "Anda diizinkan memasukkan daftar dipisah koma parameter kueri kategori pencarian tertentu.",
diff --git a/plugins/SitesManager/lang/is.json b/plugins/SitesManager/lang/is.json
index 080d71d411..f5e7f1b285 100644
--- a/plugins/SitesManager/lang/is.json
+++ b/plugins/SitesManager/lang/is.json
@@ -3,7 +3,6 @@
         "Currency": "Gjaldmiðill",
         "ExcludedIps": "Útilokuð vistföng (IP)",
         "GlobalListExcludedIps": "Algildur listi af útilokuðum vistföngum (IP)",
-        "PluginDescription": "Stjórnun vefja í Piwik: Bættu við nýjum vef, Breyttu núverandi vef, Sýndu JavaScript kóðann sem á að vera á síðunum þínum. Allar aðgerðir eru einnig aðgengilegar gegnum API.",
         "ShowTrackingTag": "Sýna merkimiða til að elta",
         "Sites": "Vefir",
         "Timezone": "Tímabelti",
diff --git a/plugins/SitesManager/lang/it.json b/plugins/SitesManager/lang/it.json
index db2af7d9c0..93076f149b 100644
--- a/plugins/SitesManager/lang/it.json
+++ b/plugins/SitesManager/lang/it.json
@@ -49,7 +49,7 @@
         "OnlyOneSiteAtTime": "Puoi modificare solo un sito per volta. Per favore Salva o Annulla le modifiche attuali al sito %s.",
         "PiwikOffersEcommerceAnalytics": "Piwik permette statistiche Ecommerce avanzate di monitoraggio e reporting. Per saperne di più su%s Statistiche Ecommerce%s.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik escluderà automaticamente i parametri di sessioni comuni (%s).",
-        "PluginDescription": "Gestione dei siti in Piwik: Aggiungi nuovi siti, modificane uno esistente, mostra il codice da includere nelle tue pagine. Tutte le azioni sono disponibili anche dalle API.",
+        "PluginDescription": "La Gestione dei Siti ti permette di aggiungere e modificare i siti web esistenti.",
         "SearchCategoryDesc": "Piwik può anche monitorare la categoria Ricerca per ogni parola chiave di ricerca interna al sito.",
         "SearchCategoryLabel": "Parametro categoria",
         "SearchCategoryParametersDesc": "Puoi immettere una lista di parametri di ricerca separati da virgola specificando la categoria di ricerca.",
diff --git a/plugins/SitesManager/lang/ja.json b/plugins/SitesManager/lang/ja.json
index e9dbea7ecd..65e0143611 100644
--- a/plugins/SitesManager/lang/ja.json
+++ b/plugins/SitesManager/lang/ja.json
@@ -49,7 +49,6 @@
         "OnlyOneSiteAtTime": "一度にウェブサイトは一つだけ編集できます。ウェブサイト %s への変更を保存するか、キャンセルしてください。",
         "PiwikOffersEcommerceAnalytics": "Piwikは、高度なeコマース分析、トラッキング＆リポーティング、が可能になります。%s eコマース分析 %s について詳しく知る。",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "一般的なセッションパラメータ(%s)は、Piwik が自動的に除外します。",
-        "PluginDescription": "Piwik でのウェブサイト管理は、新規ウェブサイトの追加、既存ウェブサイトの編集、ページに挿入する JavaScript コードの表示を行うことができます。 また、すべての動作は API を通じて利用することができます。",
         "SearchCategoryDesc": "Piwik は、各内部サイト内検索キーワードに対する検索カテゴリを追跡することもできます。",
         "SearchCategoryLabel": "カテゴリーパラメーター",
         "SearchCategoryParametersDesc": "検索カテゴリを指定するクエリパラメーターリストを、コンマ区切りで入力できます。",
diff --git a/plugins/SitesManager/lang/ka.json b/plugins/SitesManager/lang/ka.json
index 28eac2fe4d..5c0c750864 100644
--- a/plugins/SitesManager/lang/ka.json
+++ b/plugins/SitesManager/lang/ka.json
@@ -31,7 +31,6 @@
         "NotFound": "ვებ საიტი არ მოიძებნა",
         "NoWebsites": "თქვენ არ გაქვთ ვებ საიტი, რომ ადმინისტრირება გაუწიოთ.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik ავტომატურად გამორიცხავს საერთო სესიის პარამეტრებს (%s).",
-        "PluginDescription": "ვებ საიტების მენეჯმენტი Piwik პროგრამაში: ახალი ვებ საიტის დამატება, არსებულის რედაქტირება, JavaScript კოდის ჩვენება, რომელიც უნდა ჩასვათ თქვენს გვერდებზე. ყველა ამ ქმედების განხორციელება ასევე შესაძლებელია API ფუნქციების გამოყენებით.",
         "SelectACity": "შეარჩიეთ ქალაქი",
         "SelectDefaultCurrency": "შეგიძლიათ შეარჩიოთ ვალუტა, რომელიც იქნება ახალი ვებ საიტების ნაგულისხმევი მნიშვნელობა.",
         "SelectDefaultTimezone": "შეგიძლიათ შეარჩიოთ საათობრივი სარტყელი, რომელიც იქნება ახალი ვებსაიტებისთვის ნაგულისხმევი საათობრივი სარტყელი.",
diff --git a/plugins/SitesManager/lang/ko.json b/plugins/SitesManager/lang/ko.json
index 32a112d3bb..33d1d5ab76 100644
--- a/plugins/SitesManager/lang/ko.json
+++ b/plugins/SitesManager/lang/ko.json
@@ -49,7 +49,6 @@
         "OnlyOneSiteAtTime": "일단 웹사이트는 하나만 편집할 수 있습니다. 웹사이트 %s의 변경 사항을 저장하거나 취소하세요.",
         "PiwikOffersEcommerceAnalytics": "Piwik은 고급 전자상거래 분석 및 추적 그리고 리포팅할 수 있습니다. %s전자상 상거래 분석%s에 대하여 더 알아보세요.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "일반적인 세션 매개 변수 (%s)는 Piwik가 자동으로 제외합니다.",
-        "PluginDescription": "Piwik에서 웹사이트 관리는 새로운 웹사이트의 추가, 기존 웹사이트의 편집 페이지에 삽입하는 JavaScript 코드를 표시할 수 있습니다. 또한 모든 동작은 API를 통해 사용할 수 있습니다.",
         "SearchCategoryDesc": "Piwik는 내부 사이트 검색어에 대한 검색 카테고리를 추적할 수 있습니다.",
         "SearchCategoryLabel": "카테고리 매개변수",
         "SearchCategoryParametersDesc": "사이트 검색 카테고리를 지정하는 모든 쿼리 매개변수 이름를 쉼표로 구분하여 모두 입력합니다.",
diff --git a/plugins/SitesManager/lang/lt.json b/plugins/SitesManager/lang/lt.json
index 888860a16e..e6060fdd14 100644
--- a/plugins/SitesManager/lang/lt.json
+++ b/plugins/SitesManager/lang/lt.json
@@ -33,7 +33,6 @@
         "NotFound": "Nerasta svetainių",
         "NoWebsites": "Neturite jokių svetainių administravimui.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik automatiškai neįtrauks paplitusių sesijos parametrų (%s).",
-        "PluginDescription": "Svetainių administravimas: Pridėkite naujas svetaines, redaguokite esamas, gaukite Javascript kodą įkėlimui į savo svetainę. Visi šie veiksmai taip pat pasiekiami per API sąsają.",
         "SelectACity": "Pasirinkite miestą",
         "SelectDefaultCurrency": "Galite pasirinkti numatytąją valiutą naujoms svetainėms.",
         "SelectDefaultTimezone": "Galite pasirinkti numatytąją laiko juostą naujoms svetainėms.",
diff --git a/plugins/SitesManager/lang/lv.json b/plugins/SitesManager/lang/lv.json
index 3e906e3e6c..494eb54b8b 100644
--- a/plugins/SitesManager/lang/lv.json
+++ b/plugins/SitesManager/lang/lv.json
@@ -27,7 +27,6 @@
         "NotFound": "Nav atrastas vietnes priekš",
         "NoWebsites": "Jums nav nevienas vietnes ko administrēt.",
         "OnlyOneSiteAtTime": "Jūs varat vienlaicīgi labot tikai vienas vietnes iestatījumus. Lūdzu saglabājiet vai atceļiet savas pašlaik veiktās izmaiņas vietnei %s.",
-        "PluginDescription": "Piwik vietņu pārvaldība: pievienojiet jaunu vietni, labojiet esošās, apskatiet ievietošanai lapās paredzēto kodu. Visas darbības ir pieejamas arī izmantojot API.",
         "SelectACity": "Izvēlieties pilsētu",
         "ShowTrackingTag": "Apskatīt izsekošanas kodu",
         "Sites": "Vietnes",
diff --git a/plugins/SitesManager/lang/nb.json b/plugins/SitesManager/lang/nb.json
index 52b105bf0e..19113f8c9f 100644
--- a/plugins/SitesManager/lang/nb.json
+++ b/plugins/SitesManager/lang/nb.json
@@ -24,6 +24,7 @@
         "ListOfIpsToBeExcludedOnAllWebsites": "IP-adressene nedenfor blir ekskludert fra sporing på alle nettsteder.",
         "ListOfQueryParametersToBeExcludedOnAllWebsites": "URL-spørreparametrene nedenfor blir ekskludert fra alle side URL-rapporter.",
         "MainDescription": "Dine analyser trenger nettsteder! Legg til, oppdater, slett websider, og vis koden som du skal legge inn på dine websider.",
+        "NotFound": "Ingen nettsteder funnet for",
         "NoWebsites": "Du har ingen nettsteder å administrere",
         "SelectACity": "Velg en by",
         "SelectDefaultCurrency": "Du kan velge standard valuta for nye nettsteder.",
diff --git a/plugins/SitesManager/lang/nl.json b/plugins/SitesManager/lang/nl.json
index 3fb3f58082..af56dce031 100644
--- a/plugins/SitesManager/lang/nl.json
+++ b/plugins/SitesManager/lang/nl.json
@@ -42,7 +42,6 @@
         "OnlyOneSiteAtTime": "U kunt slechts één website tegelijkertijd bewerken. Sla uw wijzigingen voor website %s op of annuleer de wijzigingen.",
         "PiwikOffersEcommerceAnalytics": "In Piwik is een geavanceerde Ecommerce Analytics tracking & rapportage mogelijk. Leer meer over %s Ecommerce Analytics%s.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik sluit automatisch veelvoorkomende sessie parameters uit (%s).",
-        "PluginDescription": "Websitebeheer in Piwik: Voeg een nieuwe website toe, pas een bestaande aan, toon de javascript code om te integreren in uw pagina's. Alle acties zijn ook beschikbaar via de API.",
         "SearchKeywordParametersDesc": "Voer een komma gescheiden lijst in van alle query parameter namen die het site zoek sleutelwoord bevatten.",
         "SelectACity": "Selecteer een stad",
         "SelectDefaultCurrency": "U kunt de standaard munteenheid voor nieuwe websites ingeven.",
diff --git a/plugins/SitesManager/lang/pl.json b/plugins/SitesManager/lang/pl.json
index f8e5477a31..24e8b1f376 100644
--- a/plugins/SitesManager/lang/pl.json
+++ b/plugins/SitesManager/lang/pl.json
@@ -28,12 +28,14 @@
         "ListOfQueryParametersToBeExcludedOnAllWebsites": "Parametry dotyczące listy zapytań z adresami URL przedstawione poniżej zostaną wykluczone ze statystyk na wszystkich stronach.",
         "ListOfQueryParametersToExclude": "Wprowadź listę z parametrami zapytań URL, po jednym w linii, by móc wykluczyć je z raportów o adresach URL stron.",
         "MainDescription": "Twoje raporty z analityką statystyczną stron wymagają posiadania serwisu internetowego! Dodaj, zaktualizuj, zmień serwis internetowy, i wyświetl kod JavaScript do umieszczenia na stronach.",
+        "NotAnEcommerceSite": "Strona nie jest typu Ecommerce",
         "NotFound": "Nie znaleziono stron dla",
         "NoWebsites": "Nie posiadasz żadnej strony którą możesz zarządzać.",
         "OnlyOneSiteAtTime": "W danym momencie możesz edytować tylko jedną ze stron. Zapisz lub zrezygnuj z wprowadzonych teraz modyfikacji dla strony %s.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik automatycznie wyklucza wspólne parametry sesji (%s).",
-        "PluginDescription": "Zarządzanie stronami w Piwik: dodanie nowej strony, edycja istniejącej, wyświetlanie kodu JavaScript który należy dodać do stron. Wszystkie te działania są dostępne przez interfejs API.",
+        "SearchCategoryLabel": "Parametr kategorii",
         "SearchKeywordLabel": "Parametr zapytania",
+        "SearchParametersNote2": "W celu zablokowania opcji Szukania na Stronie dla nowych stron, te dwa pola nalezy pozostawić puste.",
         "SelectACity": "Wybierz miasto",
         "SelectDefaultCurrency": "Możesz wybrać walutę jako domyślną dla nowych stron.",
         "SelectDefaultTimezone": "Możesz wybrać strefę czasową jako domyślną dla nowych stron.",
diff --git a/plugins/SitesManager/lang/pt-br.json b/plugins/SitesManager/lang/pt-br.json
index ba69818ec4..b3650e6116 100644
--- a/plugins/SitesManager/lang/pt-br.json
+++ b/plugins/SitesManager/lang/pt-br.json
@@ -49,7 +49,6 @@
         "OnlyOneSiteAtTime": "Você pode editar um website por vez. Por favor salve ou cancele as modificações do website atual %s.",
         "PiwikOffersEcommerceAnalytics": "Piwik permite análises avançadas de rastreamento e relatórios de comércio eletrônico. Saiba mais sobre %s Análise de E-comerce%s.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik excluirá automaticamente a sessão comum de parâmetros (%s).",
-        "PluginDescription": "Gerenciamento de websites no Piwik: adiciona um novo website, edita um existente, mostra código JavaScript para incluir em suas páginas. Todas as ações também estão disponíveis através da API.",
         "SearchCategoryDesc": "Piwik também pode acompanhar a categoria de busca para cada palavra-chave de busca interna no site.",
         "SearchCategoryLabel": "Parâmetro categoria",
         "SearchCategoryParametersDesc": "Você pode inserir uma lista separada por vírgulas de parâmetros de consulta especificando a categoria de pesquisa.",
diff --git a/plugins/SitesManager/lang/pt.json b/plugins/SitesManager/lang/pt.json
index a4ba6dcb72..02634e1c22 100644
--- a/plugins/SitesManager/lang/pt.json
+++ b/plugins/SitesManager/lang/pt.json
@@ -36,7 +36,6 @@
         "OnlyOneSiteAtTime": "Você só pode editar um site de cada vez. Por favor, Salvar ou Cancelar as modificações atuais para o website %s.",
         "PiwikOffersEcommerceAnalytics": "O Piwik permite a análise e relatórios avançados de rastreamento de Comércio Electrónico . Saiba mais sobre %s Rastreamento de Comércio Electrónico %s.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik exclui automaticamente parâmetros comuns de sessões (%s).",
-        "PluginDescription": "Gerir Websites no Piwik: Adicionar um novo Website, Editar um existente, Mostrar o código JavaScript para incluir nas suas páginas. Todas estas acções também estão disponíveis pelo API.",
         "SelectACity": "Seleccione uma cidade",
         "SelectDefaultCurrency": "Pode seleccionar a moeda para ser pré-definida em websites novos.",
         "SelectDefaultTimezone": "Pode seleccionar o fuso horário para ser pré-definido em websites novos.",
diff --git a/plugins/SitesManager/lang/ro.json b/plugins/SitesManager/lang/ro.json
index 07c130eb8f..a6be40f03b 100644
--- a/plugins/SitesManager/lang/ro.json
+++ b/plugins/SitesManager/lang/ro.json
@@ -49,7 +49,6 @@
         "OnlyOneSiteAtTime": "Puteți edita un singur site-ul la un moment dat. Vă rugăm să salvați sau anulati modificările dvs. curente de pe site-ul %s.",
         "PiwikOffersEcommerceAnalytics": "Piwik permite pentru comerț electronic analiza de urmărire și de raportare. Aflați mai multe despre %s comerț electronic %s.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik va exclude în mod automat parametrii comuni de sesiune (%s).",
-        "PluginDescription": "Managementul site-uri web în Piwik: Adauga un nou site web, editaza unul deja existent, Arata codul JavaScript pentru il include pe paginile dvs.. Toate acțiunile sunt, de asemenea, disponibile prin intermediul API.",
         "SearchCategoryDesc": "Piwik poate urmări, de asemenea, categoria de căutare pentru fiecare website cuvânt cheie din cautarea interna.",
         "SearchCategoryLabel": "Parametru categorie",
         "SearchCategoryParametersDesc": "Puteți introduce o lista separata prin virgula de parametri de interogare care specifică categoria de căutare.",
diff --git a/plugins/SitesManager/lang/ru.json b/plugins/SitesManager/lang/ru.json
index 2d3af2a4f3..34ae13a68e 100644
--- a/plugins/SitesManager/lang/ru.json
+++ b/plugins/SitesManager/lang/ru.json
@@ -31,11 +31,11 @@
         "GlobalListExcludedIps": "Общий список исключенных IP",
         "GlobalListExcludedQueryParameters": "Общий список запросов URL-параметров для исключения",
         "GlobalListExcludedUserAgents": "Общий список пользовательских агентов для исключения",
-        "GlobalListExcludedUserAgents_Desc": "Если строка user-agent'а посетителя содержит строки которые вы указали - Piwik не будет учитывать посещение.",
+        "GlobalListExcludedUserAgents_Desc": "Если строка user-agent'а посетителя содержит строки, которые вы указали – Piwik не будет учитывать посещение.",
         "GlobalWebsitesSettings": "Общие настройки сайтов",
         "HelpExcludedIps": "Введите список IP адресов, по одному на каждую строку, которые вы хотите исключить и не учитывать в Веб-аналитике. Можно вводить группой, напр. %1$s или %2$s",
         "JsTrackingTagHelp": "Это код JavaScript, который необходимо вставить во все ваши страницы",
-        "KeepURLFragments": "Отслеживание фрагментов url страницы",
+        "KeepURLFragments": "Отслеживать фрагменты url страницы",
         "KeepURLFragmentsHelp": "Если флажок не установлен, фрагменты URL (всё после %1$s) будут удалены при отслеживании: %2$s будут отслеживаться как %3$s",
         "KeepURLFragmentsHelp2": "Вы также можете переопределить этот параметр для отдельных веб-сайтов выше.",
         "KeepURLFragmentsLong": "Сохранять дополнительные фрагменты url при отслеживании страниц",
@@ -47,9 +47,8 @@
         "NotFound": "Не найдено сайтов для",
         "NoWebsites": "Вы не имеете ни одного сайта на учете.",
         "OnlyOneSiteAtTime": "Вы можете только редактировать один сайт в одно и то же время. Пожалуйста, сохраните или отмените ваши текущие изменения к сайту %s.",
-        "PiwikOffersEcommerceAnalytics": "Эта опция может быть использована для аналитики интернет-магазинов и электронных заказов. Больше информации - здесь: %s Аналитика эл. коммерции%s.",
+        "PiwikOffersEcommerceAnalytics": "Эта опция может быть использована для аналитики интернет-магазинов и электронных заказов. Больше информации – здесь: %s Аналитика эл. коммерции%s.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Веб-аналитика будет автоматически изымать необходимые параметры сессии (%s).",
-        "PluginDescription": "Управление сайтами в Веб-аналитике: Добавьте новый сайт, редактируйте уже существующий, просмотрите Javascript код, который необходимо вставить для индексации страниц. Конечно, все это доступно и через API.",
         "SearchCategoryDesc": "Piwik также может отслеживать категорию поиска для каждого слова, которое ищут на вашем сайте в поиске.",
         "SearchCategoryLabel": "Параметр категорий",
         "SearchCategoryParametersDesc": "Вы можете ввести разделенные запятыми список параметров, которые бы определяли категорию поиска.",
@@ -64,8 +63,9 @@
         "ShowTrackingTag": "Показать код",
         "Sites": "Сайты",
         "SiteSearchUse": "Вы можете использовать Piwik для отслеживания и отображения аналитики по тому, что ищут посетители на вашем сайте используя функционал для внутреннего поиска по сайту.",
+        "SuperUserAccessCan": "Пользователь с правами суперпользователя может также %sуказать общие настройки%s для новых веб-сайтов.",
         "Timezone": "Часовой пояс",
-        "TrackingSiteSearch": "Отслеживание внутреннего поиска по сайту",
+        "TrackingSiteSearch": "Отслеживать внутренний поиск по сайту",
         "TrackingTags": "Код отслеживания для %s",
         "Urls": "URL-ы",
         "UTCTimeIs": "Время UTC: %s.",
diff --git a/plugins/SitesManager/lang/sq.json b/plugins/SitesManager/lang/sq.json
index 0e7ffe4900..3730a80f52 100644
--- a/plugins/SitesManager/lang/sq.json
+++ b/plugins/SitesManager/lang/sq.json
@@ -36,7 +36,6 @@
         "OnlyOneSiteAtTime": "Mund të përpunoni vetëm një site web në një herë. Ju lutem, Ruani ose Anuloni ndryshimet tuaja të tanishme te site-i web %s.",
         "PiwikOffersEcommerceAnalytics": "Piwik-u ju mundëson ndjekje & raportim të thelluar Analizash E-tregtie. Mësoni më tepër rreth %s Analizash E-tregtie%s.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik-u do t'i përjashtojë vetvetiu parametrat e zakonshëm të sesioneve (%s).",
-        "PluginDescription": "Administrim site-esh web në Piwik: Shtoni një site web të ri, Përpunoni një ekzistues, Shfaqni kod JavaScript për t'u përfshirë te faqet tuaja. Krejt veprimet mund të kryhen edhe përmes API-t.",
         "SelectACity": "Përzgjidhni një qytet",
         "SelectDefaultCurrency": "Mund të përzgjidhni monedhën parazgjedhje për site-et e rinj web.",
         "SelectDefaultTimezone": "Mund të përzgjidhni zonën kohore parazgjedhje për site-et e rinj web.",
diff --git a/plugins/SitesManager/lang/sr.json b/plugins/SitesManager/lang/sr.json
index c5389d1a25..8e22110945 100644
--- a/plugins/SitesManager/lang/sr.json
+++ b/plugins/SitesManager/lang/sr.json
@@ -49,7 +49,6 @@
         "OnlyOneSiteAtTime": "U jednom trenutku možete raditi samo sa jednim sajtom. Molimo vas da snimite ili poništite izmene vezane za sajt %s.",
         "PiwikOffersEcommerceAnalytics": "Piwik omogućuje napredno praćenje i izveštavanje u pogledu elektronskih porudžbina. Saznajte više na %s Ecommerce Analytics%s.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik će automatski izuzeti uobičajene parametre sesije (%s)",
-        "PluginDescription": "Upravljanje sajtovima: dodajte novi sajt, izmenite postojeći, pogledajte JavaScript kod koji treba ubaciti na stranice sajta. Sve akcije su dostupne i preko API-ja.",
         "SearchCategoryDesc": "Piwik takođe može i da prati kategorije pretrage za svaku ključnu reč.",
         "SearchCategoryLabel": "Parametar kategorije",
         "SearchCategoryParametersDesc": "Možete upisati spisak parametara razdvojen zarezima kako biste naveli kategoriju pretrage.",
diff --git a/plugins/SitesManager/lang/sv.json b/plugins/SitesManager/lang/sv.json
index 391e534d28..1a6d4703fa 100644
--- a/plugins/SitesManager/lang/sv.json
+++ b/plugins/SitesManager/lang/sv.json
@@ -49,7 +49,6 @@
         "OnlyOneSiteAtTime": "Du kan endast redigera en webbplats åt gången. Vänligen spara eller avbryt dina ändringar för denna webbplats (%s).",
         "PiwikOffersEcommerceAnalytics": "Piwik möjliggör för avancerad e-handelsspårning och rapportering. Läs mer om %s E-handelsspårning%s.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik kommer automatiskt att exkludera de vanligaste sessions parametrarna (%s).",
-        "PluginDescription": "Hantering av Webbplatser i Piwik: Lägg till en ny hemsida, ändra en befintlig, visa JavaScript-koden att inkludera på dina sidor. Alla åtgärder finns också tillgängliga via API.",
         "SearchCategoryDesc": "Piwik kan även spåra kategorierna för varje sökord i webbplatssökningar.",
         "SearchCategoryLabel": "Kategoriparameter",
         "SearchCategoryParametersDesc": "Du kan ange en kommaseparerad lista med frågeparametrar som specificerar sökningens kategori.",
diff --git a/plugins/SitesManager/lang/th.json b/plugins/SitesManager/lang/th.json
index ea84c8100c..1dd6f91257 100644
--- a/plugins/SitesManager/lang/th.json
+++ b/plugins/SitesManager/lang/th.json
@@ -31,7 +31,6 @@
         "NotFound": "ไม่มีเว็บไซต์ที่ค้นพบสำหรับ",
         "NoWebsites": "คุณไม่มีเว็บไซต์ที่จะจัดการ",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik จะไม่รวมพารามิเตอร์โดยอัตโนมัติในเซสชันทั่วไป (%s)",
-        "PluginDescription": "การจัดการเว็บไซต์ใน Piwik: เพิ่มเว็บไซต์ใหม่ แก้ไขแบบหนึ่งที่มีอยู่ แสดงโค๊ด JavaScript เพื่อรวมไว้บนหน้าเว็บของคุณ ยังสามารถใช้งานผ่าน API ดำเนินการทั้งหมดได้",
         "SearchCategoryLabel": "ค่าพารามิเตอร์สำหรับหมวดหมู่",
         "SelectACity": "เลือกเมือง",
         "SelectDefaultCurrency": "คุณสามารถเลือกสกุลเงินที่กำหนด โดยค่าเริ่มต้นสำหรับเว็บไซต์ใหม่",
diff --git a/plugins/SitesManager/lang/tl.json b/plugins/SitesManager/lang/tl.json
index a1dc3e17bc..77d782e4b5 100644
--- a/plugins/SitesManager/lang/tl.json
+++ b/plugins/SitesManager/lang/tl.json
@@ -48,7 +48,6 @@
         "OnlyOneSiteAtTime": "Maaari mo lamang i-edit ang isang website ng isang beses. Mangyaring I-save o Kanselahin iyong kasalukuyang mga pagbabago sa website %s.",
         "PiwikOffersEcommerceAnalytics": "Ang Piwik ay mayroon rin para sa advanced na Ecommerce Analytics tracking & pag-uulat. Matuto nang higit pa tungkol sa %s Ecommerce Analytics%s.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Awtomatikong ibubukod ng Piwik ang mga karaniwang mga session parameter (%s).",
-        "PluginDescription": "Websites Management ng Piwik: Mag-dagdag ng isang bagong website I-edit ang isang umiiral Ipakita ang JavaScript code upang isama sa iyong mga pahina. Ang lahat ng actions ay makukuha sa pamamagaitan ng API.",
         "SearchCategoryDesc": "Ang Piwik ay maaari ring masubaybayan ang mga kategorya ng Paghahanap para sa bawat keyword sa loob na paghahanap sa site.",
         "SearchCategoryLabel": "Kategorya ng parameter",
         "SearchCategoryParametersDesc": "Maari kang maglagay ng query na pinaghiwa-hiwalay ng kuwit upang matukoy ang hinahanap na kategorya.",
diff --git a/plugins/SitesManager/lang/uk.json b/plugins/SitesManager/lang/uk.json
index bc8fd4a218..9eac2a6812 100644
--- a/plugins/SitesManager/lang/uk.json
+++ b/plugins/SitesManager/lang/uk.json
@@ -31,7 +31,6 @@
         "NotFound": "не знайдено жодного веб-сайту",
         "NoWebsites": "Немає жодного сайту щоб адмініструвати",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik автоматично виключатиме типові параметри сесій (%s).",
-        "PluginDescription": "Керування Веб-сайтами в Piwik: Додати новий веб-сайт, редагувати існуючі, пеерглянути JavaScript код щоб включити на ваші сторінки. Всі операції також доступні через API.",
         "SelectACity": "Виберіть місто",
         "SelectDefaultCurrency": "Можна вибрати типову валюту для нових сайтів",
         "SelectDefaultTimezone": "Можна вибрати часовий пояс, який буде типовим для нових веб-сайтів.",
diff --git a/plugins/SitesManager/lang/vi.json b/plugins/SitesManager/lang/vi.json
index 25aad906ef..2d20de9db9 100644
--- a/plugins/SitesManager/lang/vi.json
+++ b/plugins/SitesManager/lang/vi.json
@@ -49,7 +49,6 @@
         "OnlyOneSiteAtTime": "Bạn chỉ có thể sửa một website tại một thời điểm. Hãy lưu hoặc hủy thay đổi hiện tại của bạn đến trang web %s.",
         "PiwikOffersEcommerceAnalytics": "Piwik cho phép theo dõi và báo cáo chi tiết với phân tích thương mại điện tử. Tìm hiểu thêm về phân tích thương mại điện tử %s%s.",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik sẽ tự động loại bỏ các tham số phiên chung (%s).",
-        "PluginDescription": "Quản lý các trang web trong Piwik: Thêm một Website mới, chỉnh sửa một trang web hiện tại, Hiển thị các mã JavaScript trên các trang của bạn. Tất cả các hành động cũng có hiệu lực qua API này.",
         "SearchCategoryDesc": "Piwik cũng có thể theo dõi các danh mục tìm kiếm cho mỗi từ khóa tìm kiếm trang nội bộ.",
         "SearchCategoryLabel": "Tham số Mục",
         "SearchCategoryParametersDesc": "Bạn có thể nhập một danh sách ngăn bằng dấu phẩy của các tham số truy vấn xác định bởi danh mục tìm kiếm này.",
diff --git a/plugins/SitesManager/lang/zh-cn.json b/plugins/SitesManager/lang/zh-cn.json
index 942917e22e..7f91fe76aa 100644
--- a/plugins/SitesManager/lang/zh-cn.json
+++ b/plugins/SitesManager/lang/zh-cn.json
@@ -49,7 +49,6 @@
         "OnlyOneSiteAtTime": "每次只能修改一个网站，请保持或取消当前对网站 %s 的修改。",
         "PiwikOffersEcommerceAnalytics": "Piwik 可以使用高级电商分析和报表，了解更多的 %s 电商分析%s。",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik 会自动排除常见的会话参数(%s)",
-        "PluginDescription": "Piwik 网站管理: 新增网站、修改网站、显示加入您的网页的 JavaScript 代码。所有操作都可以通过 API 调用。",
         "SearchCategoryDesc": "Piwik 也可以统计每个站内搜索关键字的搜索分类。",
         "SearchCategoryLabel": "分类参数",
         "SearchCategoryParametersDesc": "输入用逗号分开的搜索参数列表来指定搜索分类。",
diff --git a/plugins/SitesManager/lang/zh-tw.json b/plugins/SitesManager/lang/zh-tw.json
index 7f92644d82..6a4cd32d52 100644
--- a/plugins/SitesManager/lang/zh-tw.json
+++ b/plugins/SitesManager/lang/zh-tw.json
@@ -31,7 +31,6 @@
         "NotFound": "找不到網站",
         "NoWebsites": "你沒有任何網站可以管理。",
         "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik 將會自動排除常見的會話參數 (%s)。",
-        "PluginDescription": "Piwik 網站管理：新增一個新網站、編輯一個已存在的網站、顯示插入你網頁的 JavaScript 原始碼。所有動作都可以透過 API 使用。",
         "SelectACity": "選擇一個城市",
         "SelectDefaultCurrency": "你可以為新的網站選擇預設的貨幣。",
         "SelectDefaultTimezone": "你可以為新的網站選擇預設的時區。",
diff --git a/plugins/SitesManager/templates/global-settings.html b/plugins/SitesManager/templates/global-settings.html
index 049d7b5386..e6ae10d949 100644
--- a/plugins/SitesManager/templates/global-settings.html
+++ b/plugins/SitesManager/templates/global-settings.html
@@ -182,7 +182,7 @@
         </tr>
     </table>
 
-    <span style="margin-left:20px;">
+    <span>
         <input type="submit" class="submit" ng-click="saveGlobalSettings()" value="{{ 'General_Save'|translate }}"/>
     </span>
 
diff --git a/plugins/SitesManager/templates/sites-list/add-site-link.html b/plugins/SitesManager/templates/sites-list/add-site-link.html
index fd17255269..58a5effd59 100644
--- a/plugins/SitesManager/templates/sites-list/add-site-link.html
+++ b/plugins/SitesManager/templates/sites-list/add-site-link.html
@@ -1,3 +1,3 @@
-<a ng-show="hasSuperUserAccess && !siteIsBeingEdited" class="addRowSite" ng-click="addSite()">
+<a ng-show="hasSuperUserAccess && !siteIsBeingEdited" class="addRowSite" ng-click="addSite()" tabindex="1">
     {{ 'SitesManager_AddSite'|translate }}
 </a>
diff --git a/plugins/SitesManager/templates/sites-list/site-fields.html b/plugins/SitesManager/templates/sites-list/site-fields.html
index 3b73950cbb..06dff3eb20 100644
--- a/plugins/SitesManager/templates/sites-list/site-fields.html
+++ b/plugins/SitesManager/templates/sites-list/site-fields.html
@@ -175,7 +175,7 @@
 </td>
 
 <td>
-    <a ng-show="site.idsite" href="?module=CoreAdminHome&action=trackingCodeGenerator&idSite={{ site.idsite }}&updated=false">
+    <a ng-show="site.idsite" href="?module=CoreAdminHome&action=trackingCodeGenerator&idSite={{ site.idsite }}&period={{ period }}&date={{ date }}&updated=false">
         {{ 'SitesManager_ShowTrackingTag'|translate }}
     </a>
 </td>
diff --git a/plugins/SitesManager/templates/sites-list/sites-list.html b/plugins/SitesManager/templates/sites-list/sites-list.html
index 8252585d22..bd8ddd1c6e 100644
--- a/plugins/SitesManager/templates/sites-list/sites-list.html
+++ b/plugins/SitesManager/templates/sites-list/sites-list.html
@@ -19,8 +19,8 @@
             <th>{{ 'SitesManager_Timezone'|translate }}</th>
             <th>{{ 'SitesManager_Currency'|translate }}</th>
             <th>{{ 'Goals_Ecommerce'|translate }}</th>
-            <th></th>
-            <th></th>
+            <th>{{ 'General_Edit'|translate }}</th>
+            <th>{{ 'General_Delete'|translate }}</th>
             <th>{{ 'General_JsTrackingTag'|translate }}</th>
         </tr>
         </thead>
diff --git a/plugins/SitesManager/templates/sites-manager-header.html b/plugins/SitesManager/templates/sites-manager-header.html
index 968947182f..a817dd8511 100644
--- a/plugins/SitesManager/templates/sites-manager-header.html
+++ b/plugins/SitesManager/templates/sites-manager-header.html
@@ -2,7 +2,6 @@
         piwik-enriched-headline
         help-url="http://piwik.org/docs/manage-websites/"
         feature-name="{{ 'SitesManager_WebsitesManagement'|translate }}">
-
     {{ 'SitesManager_WebsitesManagement'|translate }}
 </h2>
 
diff --git a/plugins/SitesManager/tests/Integration/ApiTest.php b/plugins/SitesManager/tests/Integration/ApiTest.php
new file mode 100644
index 0000000000..d4a4b6c87b
--- /dev/null
+++ b/plugins/SitesManager/tests/Integration/ApiTest.php
@@ -0,0 +1,1078 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\SitesManager\tests\Integration;
+
+use Piwik\Access;
+use Piwik\Piwik;
+use Piwik\Plugins\SitesManager\API;
+use Piwik\Plugins\SitesManager\Model;
+use Piwik\Plugins\UsersManager\API as APIUsersManager;
+use Piwik\Site;
+use Piwik\Tests\Framework\Mock\FakeAccess;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+use Exception;
+use PHPUnit_Framework_Constraint_IsType;
+
+/**
+ * Class Plugins_SitesManagerTest
+ *
+ * @group Plugins
+ */
+class ApiTest extends IntegrationTestCase
+{
+    public function setUp()
+    {
+        parent::setUp();
+
+        // setup the access layer
+        $pseudoMockAccess = new FakeAccess;
+        FakeAccess::$superUser = true;
+        Access::setSingletonInstance($pseudoMockAccess);
+    }
+
+    /**
+     * empty name -> exception
+     *
+     * @group Plugins
+     */
+    public function testAddSiteEmptyName()
+    {
+        try {
+            API::getInstance()->addSite("", array("http://piwik.net"));
+        } catch (Exception $e) {
+            return;
+        }
+        $this->fail('Expected exception not raised');
+    }
+
+    /**
+     * DataProvider for testAddSiteWrongUrls
+     */
+    public function getInvalidUrlData()
+    {
+        return array(
+            array(array()), // no urls
+            array(array("")),
+            array(""),
+            array("httpww://piwik.net"),
+            array("httpww://piwik.net/gqg~#"),
+        );
+    }
+
+    /**
+     * wrong urls -> exception
+     *
+     * @dataProvider getInvalidUrlData
+     * @group Plugins
+     */
+    public function testAddSiteWrongUrls($url)
+    {
+        try {
+            API::getInstance()->addSite("name", $url);
+        } catch (Exception $e) {
+            return;
+        }
+        $this->fail('Expected exception not raised');
+    }
+
+    /**
+     * Test with valid IPs
+     *
+     * @group Plugins
+     */
+    public function testAddSiteExcludedIpsAndtimezoneAndCurrencyAndExcludedQueryParametersValid()
+    {
+        $ips = '1.2.3.4,1.1.1.*,1.2.*.*,1.*.*.*';
+        $timezone = 'Europe/Paris';
+        $currency = 'EUR';
+        $excludedQueryParameters = 'p1,P2, P33333';
+        $expectedExcludedQueryParameters = 'p1,P2,P33333';
+        $excludedUserAgents = " p1,P2, \nP3333 ";
+        $expectedExcludedUserAgents = "p1,P2,P3333";
+        $expectedWebsiteType = 'mobile-\'app';
+        $keepUrlFragment = 1;
+        $idsite = API::getInstance()->addSite("name", "http://piwik.net/", $ecommerce = 1,
+            $siteSearch = 1, $searchKeywordParameters = 'search,param', $searchCategoryParameters = 'cat,category',
+            $ips, $excludedQueryParameters, $timezone, $currency, $group = null, $startDate = null, $excludedUserAgents,
+            $keepUrlFragment, $expectedWebsiteType);
+        $siteInfo = API::getInstance()->getSiteFromId($idsite);
+        $this->assertEquals($ips, $siteInfo['excluded_ips']);
+        $this->assertEquals($timezone, $siteInfo['timezone']);
+        $this->assertEquals($currency, $siteInfo['currency']);
+        $this->assertEquals($ecommerce, $siteInfo['ecommerce']);
+        $this->assertTrue(Site::isEcommerceEnabledFor($idsite));
+        $this->assertEquals($siteSearch, $siteInfo['sitesearch']);
+        $this->assertTrue(Site::isSiteSearchEnabledFor($idsite));
+        $this->assertEquals($expectedWebsiteType, $siteInfo['type']);
+        $this->assertEquals($expectedWebsiteType, Site::getTypeFor($idsite));
+
+        $this->assertEquals($searchKeywordParameters, $siteInfo['sitesearch_keyword_parameters']);
+        $this->assertEquals($searchCategoryParameters, $siteInfo['sitesearch_category_parameters']);
+        $this->assertEquals($expectedExcludedQueryParameters, $siteInfo['excluded_parameters']);
+        $this->assertEquals($expectedExcludedUserAgents, $siteInfo['excluded_user_agents']);
+    }
+
+    /**
+     * dataProvider for testAddSiteExcludedIpsNotValid
+     */
+    public function getInvalidIPsData()
+    {
+        return array(
+            array('35817587341'),
+            array('ieagieha'),
+            array('1.2.3'),
+            array('*.1.1.1'),
+            array('*.*.1.1'),
+            array('*.*.*.1'),
+            array('1.1.1.1.1'),
+        );
+    }
+
+    /**
+     * Test with invalid IPs
+     *
+     * @dataProvider getInvalidIPsData
+     * @group Plugins
+     */
+    public function testAddSiteExcludedIpsNotValid($ip)
+    {
+        try {
+            API::getInstance()->addSite("name", "http://piwik.net/", $ecommerce = 0,
+                $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, $ip);
+        } catch (Exception $e) {
+            return;
+        }
+        $this->fail('Expected exception not raised');
+    }
+
+    /**
+     * one url -> one main_url and nothing inserted as alias urls
+     *
+     * @group Plugins
+     */
+    public function testAddSiteOneUrl()
+    {
+        $url = "http://piwik.net/";
+        $urlOK = "http://piwik.net";
+        $idsite = API::getInstance()->addSite("name", $url);
+        $this->assertInternalType(PHPUnit_Framework_Constraint_IsType::TYPE_INT, $idsite);
+
+        $siteInfo = API::getInstance()->getSiteFromId($idsite);
+        $this->assertEquals($urlOK, $siteInfo['main_url']);
+        $this->assertEquals(date('Y-m-d'), date('Y-m-d', strtotime($siteInfo['ts_created'])));
+
+        $siteUrls = API::getInstance()->getSiteUrlsFromId($idsite);
+        $this->assertEquals(1, count($siteUrls));
+    }
+
+    /**
+     * several urls -> one main_url and others as alias urls
+     *
+     * @group Plugins
+     */
+    public function testAddSiteSeveralUrls()
+    {
+        $urls = array("http://piwik.net/", "http://piwik.com", "https://piwik.net/test/");
+        $urlsOK = array("http://piwik.net", "http://piwik.com", "https://piwik.net/test");
+        $idsite = API::getInstance()->addSite("super website", $urls);
+        $this->assertInternalType(PHPUnit_Framework_Constraint_IsType::TYPE_INT, $idsite);
+
+        $siteInfo = API::getInstance()->getSiteFromId($idsite);
+        $this->assertEquals($urlsOK[0], $siteInfo['main_url']);
+
+        $siteUrls = API::getInstance()->getSiteUrlsFromId($idsite);
+        $this->assertEquals($urlsOK, $siteUrls);
+    }
+
+    /**
+     * strange name
+     *
+     * @group Plugins
+     */
+    public function testAddSiteStrangeName()
+    {
+        $name = "supertest(); ~@@()''!£\$'%%^'!£ போ";
+        $idsite = API::getInstance()->addSite($name, "http://piwik.net");
+        $this->assertInternalType(PHPUnit_Framework_Constraint_IsType::TYPE_INT, $idsite);
+
+        $siteInfo = API::getInstance()->getSiteFromId($idsite);
+        $this->assertEquals($name, $siteInfo['name']);
+
+    }
+
+    /**
+     * adds a site
+     * use by several other unit tests
+     */
+    protected function _addSite()
+    {
+        $name = "website ";
+        $idsite = API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/"));
+        $this->assertInternalType(PHPUnit_Framework_Constraint_IsType::TYPE_INT, $idsite);
+
+        $siteInfo = API::getInstance()->getSiteFromId($idsite);
+        $this->assertEquals($name, $siteInfo['name']);
+        $this->assertEquals("http://piwik.net", $siteInfo['main_url']);
+
+        $siteUrls = API::getInstance()->getSiteUrlsFromId($idsite);
+        $this->assertEquals(array("http://piwik.net", "http://piwik.com/test"), $siteUrls);
+
+        return $idsite;
+    }
+
+    /**
+     * no duplicate -> all the urls are saved
+     *
+     * @group Plugins
+     */
+    public function testAddSiteUrlsnoDuplicate()
+    {
+        $idsite = $this->_addSite();
+
+        $siteUrlsBefore = API::getInstance()->getSiteUrlsFromId($idsite);
+
+        $toAdd = array("http://piwik1.net",
+                       "http://piwik2.net",
+                       "http://piwik3.net/test/",
+                       "http://localhost/test",
+                       "http://localho5.st/test",
+                       "http://l42578gqege.f4",
+                       "http://super.com/test/test/atqata675675/te"
+        );
+        $toAddValid = array("http://piwik1.net",
+                            "http://piwik2.net",
+                            "http://piwik3.net/test",
+                            "http://localhost/test",
+                            "http://localho5.st/test",
+                            "http://l42578gqege.f4",
+                            "http://super.com/test/test/atqata675675/te");
+
+        $insertedUrls = API::getInstance()->addSiteAliasUrls($idsite, $toAdd);
+        $this->assertEquals(count($toAdd), $insertedUrls);
+
+        $siteUrlsAfter = API::getInstance()->getSiteUrlsFromId($idsite);
+
+        $shouldHave = array_merge($siteUrlsBefore, $toAddValid);
+        sort($shouldHave);
+
+        sort($siteUrlsAfter);
+
+        $this->assertEquals($shouldHave, $siteUrlsAfter);
+    }
+
+    /**
+     * duplicate -> don't save the already existing URLs
+     *
+     * @group Plugins
+     */
+    public function testAddSiteUrlsDuplicate()
+    {
+        $idsite = $this->_addSite();
+
+        $siteUrlsBefore = API::getInstance()->getSiteUrlsFromId($idsite);
+
+        $toAdd = array_merge($siteUrlsBefore, array("http://piwik1.net", "http://piwik2.net"));
+
+        $insertedUrls = API::getInstance()->addSiteAliasUrls($idsite, $toAdd);
+        $this->assertEquals(count($toAdd) - count($siteUrlsBefore), $insertedUrls);
+
+        $siteUrlsAfter = API::getInstance()->getSiteUrlsFromId($idsite);
+
+        $shouldHave = $toAdd;
+        sort($shouldHave);
+
+        sort($siteUrlsAfter);
+
+        $this->assertEquals($shouldHave, $siteUrlsAfter);
+    }
+
+    /**
+     * case empty array => nothing happens
+     *
+     * @group Plugins
+     */
+    public function testAddSiteUrlsNoUrlsToAdd1()
+    {
+        $idsite = $this->_addSite();
+
+        $siteUrlsBefore = API::getInstance()->getSiteUrlsFromId($idsite);
+
+        $toAdd = array();
+
+        $insertedUrls = API::getInstance()->addSiteAliasUrls($idsite, $toAdd);
+        $this->assertEquals(count($toAdd), $insertedUrls);
+
+        $siteUrlsAfter = API::getInstance()->getSiteUrlsFromId($idsite);
+
+        $shouldHave = $siteUrlsBefore;
+        sort($shouldHave);
+
+        sort($siteUrlsAfter);
+
+        $this->assertEquals($shouldHave, $siteUrlsAfter);
+    }
+
+    /**
+     * case array only duplicate => nothing happens
+     *
+     * @group Plugins
+     */
+    public function testAddSiteUrlsNoUrlsToAdd2()
+    {
+        $idsite = $this->_addSite();
+
+        $siteUrlsBefore = API::getInstance()->getSiteUrlsFromId($idsite);
+
+        $toAdd = $siteUrlsBefore;
+
+        $insertedUrls = API::getInstance()->addSiteAliasUrls($idsite, $toAdd);
+        $this->assertEquals(0, $insertedUrls);
+
+        $siteUrlsAfter = API::getInstance()->getSiteUrlsFromId($idsite);
+
+        $shouldHave = $siteUrlsBefore;
+        sort($shouldHave);
+
+        sort($siteUrlsAfter);
+
+        $this->assertEquals($shouldHave, $siteUrlsAfter);
+    }
+
+    /**
+     * wrong format urls => exception
+     *
+     * @group Plugins
+     */
+    public function testAddSiteUrlsWrongUrlsFormat3()
+    {
+        try {
+            $idsite = $this->_addSite();
+            $toAdd = array("http:mpigeq");
+            API::getInstance()->addSiteAliasUrls($idsite, $toAdd);
+        } catch (Exception $e) {
+            return;
+        }
+        $this->fail('Expected exception not raised');
+    }
+
+    /**
+     * wrong idsite => no exception because simply no access to this resource
+     *
+     * @group Plugins
+     */
+    public function testAddSiteUrlsWrongIdSite1()
+    {
+        try {
+            $toAdd = array("http://pigeq.com/test");
+            API::getInstance()->addSiteAliasUrls(-1, $toAdd);
+        } catch (Exception $e) {
+            return;
+        }
+        $this->fail('Expected exception not raised');
+    }
+
+    /**
+     * wrong idsite => exception
+     *
+     * @group Plugins
+     */
+    public function testAddSiteUrlsWrongIdSite2()
+    {
+        try {
+            $toAdd = array("http://pigeq.com/test");
+            API::getInstance()->addSiteAliasUrls(155, $toAdd);
+        } catch (Exception $e) {
+            return;
+        }
+        $this->fail('Expected exception not raised');
+    }
+
+    /**
+     * no Id -> empty array
+     *
+     * @group Plugins
+     */
+    public function testGetAllSitesIdNoId()
+    {
+        $ids = API::getInstance()->getAllSitesId();
+        $this->assertEquals(array(), $ids);
+    }
+
+    /**
+     * several Id -> normal array
+     *
+     * @group Plugins
+     */
+    public function testGetAllSitesIdSeveralId()
+    {
+        $name = "tetq";
+        $idsites = array(
+            API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")),
+            API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")),
+            API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")),
+            API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")),
+            API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")),
+        );
+
+        $ids = API::getInstance()->getAllSitesId();
+        $this->assertEquals($idsites, $ids);
+    }
+
+    /**
+     * wrong id => exception
+     *
+     * @group Plugins
+     */
+    public function testGetSiteFromIdWrongId1()
+    {
+        try {
+            API::getInstance()->getSiteFromId(0);
+        } catch (Exception $e) {
+            return;
+        }
+        $this->fail('Expected exception not raised');
+    }
+
+    /**
+     * wrong id => exception
+     *
+     * @group Plugins
+     */
+    public function testGetSiteFromIdWrongId2()
+    {
+        try {
+            API::getInstance()->getSiteFromId("x1");
+        } catch (Exception $e) {
+            return;
+        }
+        $this->fail('Expected exception not raised');
+    }
+
+    /**
+     * wrong id : no access => exception
+     *
+     * @group Plugins
+     */
+    public function testGetSiteFromIdWrongId3()
+    {
+        $idsite = API::getInstance()->addSite("site", array("http://piwik.net", "http://piwik.com/test/"));
+        $this->assertEquals(1, $idsite);
+
+        // set noaccess to site 1
+        FakeAccess::setIdSitesView(array(2));
+        FakeAccess::setIdSitesAdmin(array());
+
+        try {
+            API::getInstance()->getSiteFromId(1);
+        } catch (Exception $e) {
+            return;
+        }
+        $this->fail('Expected exception not raised');
+    }
+
+    /**
+     * normal case
+     *
+     * @group Plugins
+     */
+    public function testGetSiteFromIdNormalId()
+    {
+        $name = "website ''";
+        $idsite = API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/"));
+        $this->assertInternalType(PHPUnit_Framework_Constraint_IsType::TYPE_INT, $idsite);
+
+        $siteInfo = API::getInstance()->getSiteFromId($idsite);
+        $this->assertEquals($name, $siteInfo['name']);
+        $this->assertEquals("http://piwik.net", $siteInfo['main_url']);
+    }
+
+    /**
+     * there is no admin site available -> array()
+     *
+     * @group Plugins
+     */
+    public function testGetSitesWithAdminAccessNoResult()
+    {
+        FakeAccess::setIdSitesAdmin(array());
+
+        $sites = API::getInstance()->getSitesWithAdminAccess();
+        $this->assertEquals(array(), $sites);
+    }
+
+    /**
+     * normal case, admin and view and noaccess website => return only admin
+     *
+     * @group Plugins
+     */
+    public function testGetSitesWithAdminAccess()
+    {
+        API::getInstance()->addSite("site1", array("http://piwik.net", "http://piwik.com/test/"));
+        API::getInstance()->addSite("site2", array("http://piwik.com/test/"));
+        API::getInstance()->addSite("site3", array("http://piwik.org"));
+
+        $resultWanted = array(
+            0 => array("idsite" => 1, "name" => "site1", "main_url" => "http://piwik.net", "ecommerce" => 0, "excluded_ips" => "", 'sitesearch' => 1, 'sitesearch_keyword_parameters' => '', 'sitesearch_category_parameters' => '', 'excluded_parameters' => '', 'excluded_user_agents' => '', 'timezone' => 'UTC', 'currency' => 'USD', 'group' => '', 'keep_url_fragment' => 0, 'type' => 'website'),
+            1 => array("idsite" => 3, "name" => "site3", "main_url" => "http://piwik.org", "ecommerce" => 0, "excluded_ips" => "", 'sitesearch' => 1, 'sitesearch_keyword_parameters' => '', 'sitesearch_category_parameters' => '', 'excluded_parameters' => '', 'excluded_user_agents' => '', 'timezone' => 'UTC', 'currency' => 'USD', 'group' => '', 'keep_url_fragment' => 0, 'type' => 'website'),
+        );
+
+        FakeAccess::setIdSitesAdmin(array(1, 3));
+
+        $sites = API::getInstance()->getSitesWithAdminAccess();
+
+        // we dont test the ts_created
+        unset($sites[0]['ts_created']);
+        unset($sites[1]['ts_created']);
+        $this->assertEquals($resultWanted, $sites);
+    }
+
+    /**
+     * there is no admin site available -> array()
+     *
+     * @group Plugins
+     */
+    public function testGetSitesWithViewAccessNoResult()
+    {
+        FakeAccess::setIdSitesView(array());
+        FakeAccess::setIdSitesAdmin(array());
+
+        $sites = API::getInstance()->getSitesWithViewAccess();
+        $this->assertEquals(array(), $sites);
+    }
+
+    /**
+     * normal case, admin and view and noaccess website => return only admin
+     *
+     * @group Plugins
+     */
+    public function testGetSitesWithViewAccess()
+    {
+        API::getInstance()->addSite("site1", array("http://piwik.net", "http://piwik.com/test/"));
+        API::getInstance()->addSite("site2", array("http://piwik.com/test/"));
+        API::getInstance()->addSite("site3", array("http://piwik.org"));
+
+        $resultWanted = array(
+            0 => array("idsite" => 1, "name" => "site1", "main_url" => "http://piwik.net", "ecommerce" => 0, 'sitesearch' => 1, 'sitesearch_keyword_parameters' => '', 'sitesearch_category_parameters' => '', "excluded_ips" => "", 'excluded_parameters' => '', 'excluded_user_agents' => '', 'timezone' => 'UTC', 'currency' => 'USD', 'group' => '', 'keep_url_fragment' => 0, 'type' => 'website'),
+            1 => array("idsite" => 3, "name" => "site3", "main_url" => "http://piwik.org", "ecommerce" => 0, 'sitesearch' => 1, 'sitesearch_keyword_parameters' => '', 'sitesearch_category_parameters' => '', "excluded_ips" => "", 'excluded_parameters' => '', 'excluded_user_agents' => '', 'timezone' => 'UTC', 'currency' => 'USD', 'group' => '', 'keep_url_fragment' => 0, 'type' => 'website'),
+        );
+
+        FakeAccess::setIdSitesView(array(1, 3));
+        FakeAccess::setIdSitesAdmin(array());
+
+        $sites = API::getInstance()->getSitesWithViewAccess();
+        // we dont test the ts_created
+        unset($sites[0]['ts_created']);
+        unset($sites[1]['ts_created']);
+        $this->assertEquals($resultWanted, $sites);
+    }
+
+    /**
+     * there is no admin site available -> array()
+     *
+     * @group Plugins
+     */
+    public function testGetSitesWithAtLeastViewAccessNoResult()
+    {
+        FakeAccess::setIdSitesView(array());
+        FakeAccess::setIdSitesAdmin(array());
+
+        $sites = API::getInstance()->getSitesWithAtLeastViewAccess();
+        $this->assertEquals(array(), $sites);
+    }
+
+    /**
+     * normal case, admin and view and noaccess website => return only admin
+     *
+     * @group Plugins
+     */
+    public function testGetSitesWithAtLeastViewAccess()
+    {
+        API::getInstance()->addSite("site1", array("http://piwik.net", "http://piwik.com/test/"), $ecommerce = 1);
+        API::getInstance()->addSite("site2", array("http://piwik.com/test/"));
+        API::getInstance()->addSite("site3", array("http://piwik.org"));
+
+        $resultWanted = array(
+            0 => array("idsite" => 1, "name" => "site1", "main_url" => "http://piwik.net", "ecommerce" => 1, "excluded_ips" => "", 'sitesearch' => 1, 'sitesearch_keyword_parameters' => '', 'sitesearch_category_parameters' => '', 'excluded_parameters' => '', 'excluded_user_agents' => '', 'timezone' => 'UTC', 'currency' => 'USD', 'group' => '', 'keep_url_fragment' => 0, 'type' => 'website'),
+            1 => array("idsite" => 3, "name" => "site3", "main_url" => "http://piwik.org", "ecommerce" => 0, "excluded_ips" => "", 'sitesearch' => 1, 'sitesearch_keyword_parameters' => '', 'sitesearch_category_parameters' => '', 'excluded_parameters' => '', 'excluded_user_agents' => '', 'timezone' => 'UTC', 'currency' => 'USD', 'group' => '', 'keep_url_fragment' => 0, 'type' => 'website'),
+        );
+
+        FakeAccess::setIdSitesView(array(1, 3));
+        FakeAccess::setIdSitesAdmin(array());
+
+        $sites = API::getInstance()->getSitesWithAtLeastViewAccess();
+        // we dont test the ts_created
+        unset($sites[0]['ts_created']);
+        unset($sites[1]['ts_created']);
+        $this->assertEquals($resultWanted, $sites);
+    }
+
+    /**
+     * no urls for this site => array()
+     *
+     * @group Plugins
+     */
+    public function testGetSiteUrlsFromIdNoUrls()
+    {
+        $idsite = API::getInstance()->addSite("site1", array("http://piwik.net"));
+
+        $urls = API::getInstance()->getSiteUrlsFromId($idsite);
+        $this->assertEquals(array("http://piwik.net"), $urls);
+    }
+
+    /**
+     * normal case
+     *
+     * @group Plugins
+     */
+    public function testGetSiteUrlsFromIdManyUrls()
+    {
+        $site = array("http://piwik.net",
+                      "http://piwik.org",
+                      "http://piwik.org",
+                      "http://piwik.com");
+        sort($site);
+
+        $idsite = API::getInstance()->addSite("site1", $site);
+
+        $siteWanted = array("http://piwik.net",
+                            "http://piwik.org",
+                            "http://piwik.com");
+        sort($siteWanted);
+        $urls = API::getInstance()->getSiteUrlsFromId($idsite);
+
+        $this->assertEquals($siteWanted, $urls);
+    }
+
+    /**
+     * wrongId => exception
+     *
+     * @group Plugins
+     */
+    public function testGetSiteUrlsFromIdWrongId()
+    {
+        try {
+            FakeAccess::setIdSitesView(array(3));
+            FakeAccess::setIdSitesAdmin(array());
+            API::getInstance()->getSiteUrlsFromId(1);
+        } catch (Exception $e) {
+            return;
+        }
+        $this->fail('Expected exception not raised');
+    }
+
+    /**
+     * one url => no change to alias urls
+     *
+     * @group Plugins
+     */
+    public function testUpdateSiteOneUrl()
+    {
+        $urls = array("http://piwiknew.com",
+                      "http://piwiknew.net",
+                      "http://piwiknew.org",
+                      "http://piwiknew.fr");
+        $idsite = API::getInstance()->addSite("site1", $urls);
+
+        $newMainUrl = "http://main.url";
+
+        // Also test that the group was set to empty, and is searchable
+        $websites = API::getInstance()->getSitesFromGroup('');
+        $this->assertEquals(1, count($websites));
+
+        // the Update doesn't change the group field
+        API::getInstance()->updateSite($idsite, "test toto@{}", $newMainUrl);
+        $websites = API::getInstance()->getSitesFromGroup('');
+        $this->assertEquals(1, count($websites));
+
+        // Updating the group to something
+        $group = 'something';
+        API::getInstance()->updateSite($idsite, "test toto@{}", $newMainUrl, $ecommerce = 0, $ss = true, $ss_kwd = null, $ss_cat = '', $ips = null, $parametersExclude = null, $timezone = null, $currency = null, $group);
+        $websites = API::getInstance()->getSitesFromGroup($group);
+        $this->assertEquals(1, count($websites));
+        $this->assertEquals(date('Y-m-d'), date('Y-m-d', strtotime($websites[0]['ts_created'])));
+
+        // Updating the group to nothing
+        $group = '';
+        $type = 'mobileAppTest';
+        API::getInstance()->updateSite($idsite, "test toto@{}", $newMainUrl, $ecommerce = 0, $ss = false, $ss_kwd = '', $ss_cat = null, $ips = null, $parametersExclude = null, $timezone = null, $currency = null, $group, $startDate = '2010-01-01', $excludedUserAgent = null, $keepUrlFragment = 1, $type);
+        $websites = API::getInstance()->getSitesFromGroup($group);
+        $this->assertEquals(1, count($websites));
+        $this->assertEquals('2010-01-01', date('Y-m-d', strtotime($websites[0]['ts_created'])));
+
+        // Test setting the website type
+        $this->assertEquals($type, Site::getTypeFor($idsite));
+
+        // Check Alias URLs contain only main url
+        $allUrls = API::getInstance()->getSiteUrlsFromId($idsite);
+        $this->assertEquals($newMainUrl, $allUrls[0]);
+        $aliasUrls = array_slice($allUrls, 1);
+        $this->assertEquals(array(), $aliasUrls);
+
+    }
+
+    /**
+     * strange name and NO URL => name ok, main_url not updated
+     *
+     * @group Plugins
+     */
+    public function testUpdateSiteStrangeNameNoUrl()
+    {
+        $idsite = API::getInstance()->addSite("site1", "http://main.url");
+        $newName = "test toto@{'786'}";
+
+        API::getInstance()->updateSite($idsite, $newName);
+
+        $site = API::getInstance()->getSiteFromId($idsite);
+
+        $this->assertEquals($newName, $site['name']);
+        // url didn't change because parameter url NULL in updateSite
+        $this->assertEquals("http://main.url", $site['main_url']);
+    }
+
+    /**
+     * several urls => both main and alias are updated
+     * also test the update of group field
+     *
+     * @group Plugins
+     */
+    public function testUpdateSiteSeveralUrlsAndGroup()
+    {
+        $urls = array("http://piwiknew.com",
+                      "http://piwiknew.net",
+                      "http://piwiknew.org",
+                      "http://piwiknew.fr");
+
+        $group = 'GROUP Before';
+        $idsite = API::getInstance()->addSite("site1", $urls, $ecommerce = 1,
+            $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null,
+            $excludedIps = null, $excludedQueryParameters = null, $timezone = null, $currency = null, $group, $startDate = '2011-01-01');
+
+        $websites = API::getInstance()->getSitesFromGroup($group);
+        $this->assertEquals(1, count($websites));
+
+        $newurls = array("http://piwiknew2.com",
+                         "http://piwiknew2.net",
+                         "http://piwiknew2.org",
+                         "http://piwiknew2.fr");
+
+        $groupAfter = '   GROUP After';
+        API::getInstance()->updateSite($idsite, "test toto@{}", $newurls, $ecommerce = 0,
+            $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null,
+            $excludedIps = null, $excludedQueryParameters = null, $timezone = null, $currency = null, $groupAfter);
+
+        // no result for the group before update
+        $websites = API::getInstance()->getSitesFromGroup($group);
+        $this->assertEquals(0, count($websites));
+
+        // Testing that the group was updated properly (and testing that the group value is trimmed before inserted/searched)
+        $websites = API::getInstance()->getSitesFromGroup($groupAfter . ' ');
+        $this->assertEquals(1, count($websites));
+        $this->assertEquals('2011-01-01', date('Y-m-d', strtotime($websites[0]['ts_created'])));
+
+        // Test fetch website groups
+        $expectedGroups = array(trim($groupAfter));
+        $fetched = API::getInstance()->getSitesGroups();
+        $this->assertEquals($expectedGroups, $fetched);
+
+        $allUrls = API::getInstance()->getSiteUrlsFromId($idsite);
+        sort($allUrls);
+        sort($newurls);
+        $this->assertEquals($newurls, $allUrls);
+    }
+
+    /**
+     * @expectedException Exception
+     * @expectedExceptionMessage SitesManager_ExceptionDeleteSite
+     */
+    public function test_delete_ShouldNotDeleteASiteInCaseThereIsOnlyOneSite()
+    {
+        $siteId1 = $this->_addSite();
+
+        $this->assertHasSite($siteId1);
+
+        try {
+            API::getInstance()->deleteSite($siteId1);
+            $this->fail('an expected exception was not raised');
+        } catch (Exception $e) {
+            $this->assertHasSite($siteId1);
+            throw $e;
+        }
+    }
+
+    /**
+     * @expectedException Exception
+     * @expectedExceptionMessage website id = 99999498 not found
+     */
+    public function test_delete_ShouldTriggerException_IfGivenSiteDoesNotExist()
+    {
+        API::getInstance()->deleteSite(99999498);
+    }
+
+    public function test_delete_ShouldActuallyRemoveAnExistingSiteButOnlyTheGivenSite()
+    {
+        $this->_addSite();
+        $siteId1 = $this->_addSite();
+        $siteId2 = $this->_addSite();
+
+        $this->assertHasSite($siteId1);
+        $this->assertHasSite($siteId2);
+
+        API::getInstance()->deleteSite($siteId1);
+
+        $this->assertHasNotSite($siteId1);
+        $this->assertHasSite($siteId2);
+    }
+
+    public function test_delete_ShouldTriggerAnEventOnceSiteWasActuallyDeleted()
+    {
+        $called = 0;
+        $deletedSiteId = null;
+
+        Piwik::addAction('SitesManager.deleteSite.end', function ($param) use (&$called, &$deletedSiteId) {
+            $called++;
+            $deletedSiteId = $param;
+        });
+
+        $this->_addSite();
+        $siteId1 = $this->_addSite();
+
+        API::getInstance()->deleteSite($siteId1);
+
+        $this->assertSame(1, $called);
+        $this->assertSame($siteId1, $deletedSiteId);
+    }
+
+    private function assertHasSite($idSite)
+    {
+        $model = new Model();
+        $siteInfo = $model->getSiteFromId($idSite);
+        $this->assertNotEmpty($siteInfo);
+    }
+
+    private function assertHasNotSite($idSite)
+    {
+        $model = new Model();
+        $siteInfo = $model->getSiteFromId($idSite);
+        $this->assertEmpty($siteInfo);
+    }
+
+    /**
+     * @group Plugins
+     */
+    public function testGetSitesGroups()
+    {
+        $groups = array('group1', ' group1 ', '', 'group2');
+        $expectedGroups = array('group1', '', 'group2');
+        foreach ($groups as $group) {
+            API::getInstance()->addSite("test toto@{}", 'http://example.org', $ecommerce = 1, $siteSearch = null, $searchKeywordParameters = null, $searchCategoryParameters = null, $excludedIps = null, $excludedQueryParameters = null, $timezone = null, $currency = null, $group);
+        }
+
+        $this->assertEquals($expectedGroups, API::getInstance()->getSitesGroups());
+    }
+
+    public function getInvalidTimezoneData()
+    {
+        return array(
+            array('UTC+15'),
+            array('Paris'),
+        );
+    }
+
+    /**
+     *
+     * @dataProvider getInvalidTimezoneData
+     * @group Plugins
+     */
+    public function testAddSitesInvalidTimezone($timezone)
+    {
+        try {
+            API::getInstance()->addSite("site1", array('http://example.org'), $ecommerce = 0,
+                $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, $ip = '', $params = '', $timezone);
+        } catch (Exception $e) {
+            return;
+        }
+        $this->fail('Expected exception not raised');
+    }
+
+    /**
+     * @group Plugins
+     */
+    public function testAddSitesInvalidCurrency()
+    {
+        try {
+            $invalidCurrency = '€';
+            API::getInstance()->addSite("site1", array('http://example.org'), $ecommerce = 0,
+                $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, '', 'UTC', $invalidCurrency);
+        } catch (Exception $e) {
+            return;
+        }
+        $this->fail('Expected exception not raised');
+    }
+
+    /**
+     * @group Plugins
+     */
+    public function testSetDefaultTimezoneAndCurrencyAndExcludedQueryParametersAndExcludedIps()
+    {
+        // test that they return default values
+        $defaultTimezone = API::getInstance()->getDefaultTimezone();
+        $this->assertEquals('UTC', $defaultTimezone);
+        $defaultCurrency = API::getInstance()->getDefaultCurrency();
+        $this->assertEquals('USD', $defaultCurrency);
+        $excludedIps = API::getInstance()->getExcludedIpsGlobal();
+        $this->assertEquals('', $excludedIps);
+        $excludedQueryParameters = API::getInstance()->getExcludedQueryParametersGlobal();
+        $this->assertEquals('', $excludedQueryParameters);
+
+        // test that when not specified, defaults are set as expected
+        $idsite = API::getInstance()->addSite("site1", array('http://example.org'));
+        $site = new Site($idsite);
+        $this->assertEquals('UTC', $site->getTimezone());
+        $this->assertEquals('USD', $site->getCurrency());
+        $this->assertEquals('', $site->getExcludedQueryParameters());
+        $this->assertEquals('', $site->getExcludedIps());
+        $this->assertEquals(false, $site->isEcommerceEnabled());
+
+        // set the global timezone and get it
+        $newDefaultTimezone = 'UTC+5.5';
+        API::getInstance()->setDefaultTimezone($newDefaultTimezone);
+        $defaultTimezone = API::getInstance()->getDefaultTimezone();
+        $this->assertEquals($newDefaultTimezone, $defaultTimezone);
+
+        // set the default currency and get it
+        $newDefaultCurrency = 'EUR';
+        API::getInstance()->setDefaultCurrency($newDefaultCurrency);
+        $defaultCurrency = API::getInstance()->getDefaultCurrency();
+        $this->assertEquals($newDefaultCurrency, $defaultCurrency);
+
+        // set the global IPs to exclude and get it
+        $newGlobalExcludedIps = '1.1.1.*,1.1.*.*,150.1.1.1';
+        API::getInstance()->setGlobalExcludedIps($newGlobalExcludedIps);
+        $globalExcludedIps = API::getInstance()->getExcludedIpsGlobal();
+        $this->assertEquals($newGlobalExcludedIps, $globalExcludedIps);
+
+        // set the global URL query params to exclude and get it
+        $newGlobalExcludedQueryParameters = 'PHPSESSID,blabla, TesT';
+        // removed the space
+        $expectedGlobalExcludedQueryParameters = 'PHPSESSID,blabla,TesT';
+        API::getInstance()->setGlobalExcludedQueryParameters($newGlobalExcludedQueryParameters);
+        $globalExcludedQueryParameters = API::getInstance()->getExcludedQueryParametersGlobal();
+        $this->assertEquals($expectedGlobalExcludedQueryParameters, $globalExcludedQueryParameters);
+
+        // create a website and check that default currency and default timezone are set
+        // however, excluded IPs and excluded query Params are not returned
+        $idsite = API::getInstance()->addSite("site1", array('http://example.org'), $ecommerce = 0,
+            $siteSearch = 0, $searchKeywordParameters = 'test1,test2', $searchCategoryParameters = 'test2,test1',
+            '', '', $newDefaultTimezone);
+        $site = new Site($idsite);
+        $this->assertEquals($newDefaultTimezone, $site->getTimezone());
+        $this->assertEquals(date('Y-m-d'), $site->getCreationDate()->toString());
+        $this->assertEquals($newDefaultCurrency, $site->getCurrency());
+        $this->assertEquals('', $site->getExcludedIps());
+        $this->assertEquals('', $site->getExcludedQueryParameters());
+        $this->assertEquals('test1,test2', $site->getSearchKeywordParameters());
+        $this->assertEquals('test2,test1', $site->getSearchCategoryParameters());
+        $this->assertFalse($site->isSiteSearchEnabled());
+        $this->assertFalse(Site::isSiteSearchEnabledFor($idsite));
+        $this->assertFalse($site->isEcommerceEnabled());
+        $this->assertFalse(Site::isEcommerceEnabledFor($idsite));
+    }
+
+    /**
+     * @group Plugins
+     */
+    public function testGetSitesIdFromSiteUrlSuperUser()
+    {
+        API::getInstance()->addSite("site1", array("http://piwik.net", "http://piwik.com"));
+        API::getInstance()->addSite("site2", array("http://piwik.com", "http://piwik.net"));
+        API::getInstance()->addSite("site3", array("http://piwik.com", "http://piwik.org"));
+
+        $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://piwik.org');
+        $this->assertTrue(count($idsites) == 1);
+
+        $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://www.piwik.org');
+        $this->assertTrue(count($idsites) == 1);
+
+        $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://piwik.net');
+        $this->assertTrue(count($idsites) == 2);
+
+        $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://piwik.com');
+        $this->assertTrue(count($idsites) == 3);
+    }
+
+    /**
+     * @group Plugins
+     */
+    public function testGetSitesIdFromSiteUrlUser()
+    {
+        API::getInstance()->addSite("site1", array("http://www.piwik.net", "http://piwik.com"));
+        API::getInstance()->addSite("site2", array("http://piwik.com", "http://piwik.net"));
+        API::getInstance()->addSite("site3", array("http://piwik.com", "http://piwik.org"));
+
+        $saveAccess = Access::getInstance();
+
+        APIUsersManager::getInstance()->addUser("user1", "geqgegagae", "tegst@tesgt.com", "alias");
+        APIUsersManager::getInstance()->setUserAccess("user1", "view", array(1));
+
+        APIUsersManager::getInstance()->addUser("user2", "geqgegagae", "tegst2@tesgt.com", "alias");
+        APIUsersManager::getInstance()->setUserAccess("user2", "view", array(1));
+        APIUsersManager::getInstance()->setUserAccess("user2", "admin", array(3));
+
+        APIUsersManager::getInstance()->addUser("user3", "geqgegagae", "tegst3@tesgt.com", "alias");
+        APIUsersManager::getInstance()->setUserAccess("user3", "view", array(1, 2));
+        APIUsersManager::getInstance()->setUserAccess("user3", "admin", array(3));
+
+        $pseudoMockAccess = new FakeAccess;
+        FakeAccess::$superUser = false;
+        FakeAccess::$identity = 'user1';
+        FakeAccess::setIdSitesView(array(1));
+        FakeAccess::setIdSitesAdmin(array());
+        Access::setSingletonInstance($pseudoMockAccess);
+        $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://piwik.com');
+        $this->assertEquals(1, count($idsites));
+
+        // testing URL normalization
+        $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://www.piwik.com');
+        $this->assertEquals(1, count($idsites));
+        $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://piwik.net');
+        $this->assertEquals(1, count($idsites));
+
+        $pseudoMockAccess = new FakeAccess;
+        FakeAccess::$superUser = false;
+        FakeAccess::$identity = 'user2';
+        FakeAccess::setIdSitesView(array(1));
+        FakeAccess::setIdSitesAdmin(array(3));
+        Access::setSingletonInstance($pseudoMockAccess);
+        $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://piwik.com');
+        $this->assertEquals(2, count($idsites));
+
+        $pseudoMockAccess = new FakeAccess;
+        FakeAccess::$superUser = false;
+        FakeAccess::$identity = 'user3';
+        FakeAccess::setIdSitesView(array(1, 2));
+        FakeAccess::setIdSitesAdmin(array(3));
+        Access::setSingletonInstance($pseudoMockAccess);
+        $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://piwik.com');
+        $this->assertEquals(3, count($idsites));
+
+        Access::setSingletonInstance($saveAccess);
+    }
+
+    /**
+     * @group Plugins
+     */
+    public function testGetSitesFromTimezones()
+    {
+        API::getInstance()->addSite("site3", array("http://piwik.org"), null, $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, null, null, 'UTC');
+        $idsite2 = API::getInstance()->addSite("site3", array("http://piwik.org"), null, $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, null, null, 'Pacific/Auckland');
+        $idsite3 = API::getInstance()->addSite("site3", array("http://piwik.org"), null, $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, null, null, 'Pacific/Auckland');
+        $idsite4 = API::getInstance()->addSite("site3", array("http://piwik.org"), null, $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, null, null, 'UTC+10');
+        $result = API::getInstance()->getSitesIdFromTimezones(array('UTC+10', 'Pacific/Auckland'));
+        $this->assertEquals(array($idsite2, $idsite3, $idsite4), $result);
+    }
+}
diff --git a/plugins/SitesManager/tests/Integration/SiteUrlsTest.php b/plugins/SitesManager/tests/Integration/SiteUrlsTest.php
index 4614f7cece..f9362ae2f4 100644
--- a/plugins/SitesManager/tests/Integration/SiteUrlsTest.php
+++ b/plugins/SitesManager/tests/Integration/SiteUrlsTest.php
@@ -7,7 +7,7 @@
  */
 
 namespace Piwik\Plugins\SitesManager\tests\Integration;
-use Piwik\CacheFile;
+use Piwik\Cache;
 use Piwik\Plugins\SitesManager\API;
 use Piwik\Plugins\SitesManager\SiteUrls;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
@@ -111,8 +111,8 @@ class SiteUrlsTest extends IntegrationTestCase
     public function testGetAllCachedSiteUrls_ShouldReadFromTheCacheFile()
     {
         $urlsToFake = array(1 => 'Whatever');
-        $cache      = new CacheFile('tracker', 600);
-        $cache->set('allSiteUrlsPerSite', $urlsToFake);
+        $cache      = $this->buildCache();
+        $cache->save('allSiteUrlsPerSite', $urlsToFake, 600);
 
         $actual = $this->siteUrls->getAllCachedSiteUrls();
 
@@ -138,9 +138,14 @@ class SiteUrlsTest extends IntegrationTestCase
 
     private function assertValueInCache($value)
     {
-        $cache    = new CacheFile('tracker', 600);
-        $siteUrls = $cache->get('allSiteUrlsPerSite');
+        $cache    = $this->buildCache();
+        $siteUrls = $cache->fetch('allSiteUrlsPerSite');
 
         $this->assertEquals($value, $siteUrls);
     }
+
+    private function buildCache()
+    {
+        return Cache::getLazyCache();
+    }
 }
diff --git a/plugins/SitesManager/tests/Integration/SitesManagerTest.php b/plugins/SitesManager/tests/Integration/SitesManagerTest.php
index 3f82a95574..135f505f01 100644
--- a/plugins/SitesManager/tests/Integration/SitesManagerTest.php
+++ b/plugins/SitesManager/tests/Integration/SitesManagerTest.php
@@ -9,13 +9,13 @@
 namespace Piwik\Plugins\SitesManager\tests\Integration;
 
 use Piwik\Access;
-use Piwik\Plugins\SitesManager\API;
-use Piwik\Plugins\UsersManager\API as APIUsersManager;
-use Piwik\Site;
+use Piwik\Cache;
+use Piwik\DataAccess\ArchiveInvalidator;
+use Piwik\Date;
+use Piwik\Plugins\SitesManager\SitesManager;
+use Piwik\Tests\Framework\Fixture;
 use Piwik\Tests\Framework\Mock\FakeAccess;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
-use Exception;
-use PHPUnit_Framework_Constraint_IsType;
 
 /**
  * Class Plugins_SitesManagerTest
@@ -24,6 +24,13 @@ use PHPUnit_Framework_Constraint_IsType;
  */
 class SitesManagerTest extends IntegrationTestCase
 {
+    /**
+     * @var SitesManager
+     */
+    private $manager;
+
+    private $siteId;
+
     public function setUp()
     {
         parent::setUp();
@@ -32,969 +39,41 @@ class SitesManagerTest extends IntegrationTestCase
         $pseudoMockAccess = new FakeAccess;
         FakeAccess::$superUser = true;
         Access::setSingletonInstance($pseudoMockAccess);
-    }
-
-    /**
-     * empty name -> exception
-     *
-     * @group Plugins
-     */
-    public function testAddSiteEmptyName()
-    {
-        try {
-            API::getInstance()->addSite("", array("http://piwik.net"));
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * DataProvider for testAddSiteWrongUrls
-     */
-    public function getInvalidUrlData()
-    {
-        return array(
-            array(array()), // no urls
-            array(array("")),
-            array(""),
-            array("httpww://piwik.net"),
-            array("httpww://piwik.net/gqg~#"),
-        );
-    }
-
-    /**
-     * wrong urls -> exception
-     *
-     * @dataProvider getInvalidUrlData
-     * @group Plugins
-     */
-    public function testAddSiteWrongUrls($url)
-    {
-        try {
-            API::getInstance()->addSite("name", $url);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * Test with valid IPs
-     *
-     * @group Plugins
-     */
-    public function testAddSiteExcludedIpsAndtimezoneAndCurrencyAndExcludedQueryParametersValid()
-    {
-        $ips = '1.2.3.4,1.1.1.*,1.2.*.*,1.*.*.*';
-        $timezone = 'Europe/Paris';
-        $currency = 'EUR';
-        $excludedQueryParameters = 'p1,P2, P33333';
-        $expectedExcludedQueryParameters = 'p1,P2,P33333';
-        $excludedUserAgents = " p1,P2, \nP3333 ";
-        $expectedExcludedUserAgents = "p1,P2,P3333";
-        $expectedWebsiteType = 'mobile-\'app';
-        $keepUrlFragment = 1;
-        $idsite = API::getInstance()->addSite("name", "http://piwik.net/", $ecommerce = 1,
-            $siteSearch = 1, $searchKeywordParameters = 'search,param', $searchCategoryParameters = 'cat,category',
-            $ips, $excludedQueryParameters, $timezone, $currency, $group = null, $startDate = null, $excludedUserAgents,
-            $keepUrlFragment, $expectedWebsiteType);
-        $siteInfo = API::getInstance()->getSiteFromId($idsite);
-        $this->assertEquals($ips, $siteInfo['excluded_ips']);
-        $this->assertEquals($timezone, $siteInfo['timezone']);
-        $this->assertEquals($currency, $siteInfo['currency']);
-        $this->assertEquals($ecommerce, $siteInfo['ecommerce']);
-        $this->assertTrue(Site::isEcommerceEnabledFor($idsite));
-        $this->assertEquals($siteSearch, $siteInfo['sitesearch']);
-        $this->assertTrue(Site::isSiteSearchEnabledFor($idsite));
-        $this->assertEquals($expectedWebsiteType, $siteInfo['type']);
-        $this->assertEquals($expectedWebsiteType, Site::getTypeFor($idsite));
-
-        $this->assertEquals($searchKeywordParameters, $siteInfo['sitesearch_keyword_parameters']);
-        $this->assertEquals($searchCategoryParameters, $siteInfo['sitesearch_category_parameters']);
-        $this->assertEquals($expectedExcludedQueryParameters, $siteInfo['excluded_parameters']);
-        $this->assertEquals($expectedExcludedUserAgents, $siteInfo['excluded_user_agents']);
-    }
-
-    /**
-     * dataProvider for testAddSiteExcludedIpsNotValid
-     */
-    public function getInvalidIPsData()
-    {
-        return array(
-            array('35817587341'),
-            array('ieagieha'),
-            array('1.2.3'),
-            array('*.1.1.1'),
-            array('*.*.1.1'),
-            array('*.*.*.1'),
-            array('1.1.1.1.1'),
-        );
-    }
 
-    /**
-     * Test with invalid IPs
-     *
-     * @dataProvider getInvalidIPsData
-     * @group Plugins
-     */
-    public function testAddSiteExcludedIpsNotValid($ip)
-    {
-        try {
-            API::getInstance()->addSite("name", "http://piwik.net/", $ecommerce = 0,
-                $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, $ip);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
+        $this->manager = new SitesManager();
+        $this->siteId  = Fixture::createWebsite('2014-03-03 00:00:00');
     }
 
-    /**
-     * one url -> one main_url and nothing inserted as alias urls
-     *
-     * @group Plugins
-     */
-    public function testAddSiteOneUrl()
+    public function test_onSiteDeleted_shouldClearSiteCache()
     {
-        $url = "http://piwik.net/";
-        $urlOK = "http://piwik.net";
-        $idsite = API::getInstance()->addSite("name", $url);
-        $this->assertInternalType(PHPUnit_Framework_Constraint_IsType::TYPE_INT, $idsite);
+        $cache = Cache::getLazyCache();
+        $cache->save($this->siteId, 'testcontent');
 
-        $siteInfo = API::getInstance()->getSiteFromId($idsite);
-        $this->assertEquals($urlOK, $siteInfo['main_url']);
-        $this->assertEquals(date('Y-m-d'), date('Y-m-d', strtotime($siteInfo['ts_created'])));
+        $this->manager->onSiteDeleted($this->siteId);
 
-        $siteUrls = API::getInstance()->getSiteUrlsFromId($idsite);
-        $this->assertEquals(1, count($siteUrls));
+        $this->assertFalse($cache->contains($this->siteId));
     }
 
-    /**
-     * several urls -> one main_url and others as alias urls
-     *
-     * @group Plugins
-     */
-    public function testAddSiteSeveralUrls()
+    public function test_onSiteDeleted_shouldRemoveRememberedArchiveReports()
     {
-        $urls = array("http://piwik.net/", "http://piwik.com", "https://piwik.net/test/");
-        $urlsOK = array("http://piwik.net", "http://piwik.com", "https://piwik.net/test");
-        $idsite = API::getInstance()->addSite("super website", $urls);
-        $this->assertInternalType(PHPUnit_Framework_Constraint_IsType::TYPE_INT, $idsite);
+        $archive = new ArchiveInvalidator();
+        $archive->rememberToInvalidateArchivedReportsLater($this->siteId, Date::factory('2014-04-05'));
+        $archive->rememberToInvalidateArchivedReportsLater($this->siteId, Date::factory('2014-04-06'));
+        $archive->rememberToInvalidateArchivedReportsLater(4949, Date::factory('2014-04-05'));
 
-        $siteInfo = API::getInstance()->getSiteFromId($idsite);
-        $this->assertEquals($urlsOK[0], $siteInfo['main_url']);
-
-        $siteUrls = API::getInstance()->getSiteUrlsFromId($idsite);
-        $this->assertEquals($urlsOK, $siteUrls);
-    }
-
-    /**
-     * strange name
-     *
-     * @group Plugins
-     */
-    public function testAddSiteStrangeName()
-    {
-        $name = "supertest(); ~@@()''!£\$'%%^'!£ போ";
-        $idsite = API::getInstance()->addSite($name, "http://piwik.net");
-        $this->assertInternalType(PHPUnit_Framework_Constraint_IsType::TYPE_INT, $idsite);
-
-        $siteInfo = API::getInstance()->getSiteFromId($idsite);
-        $this->assertEquals($name, $siteInfo['name']);
-
-    }
-
-    /**
-     * adds a site
-     * use by several other unit tests
-     */
-    protected function _addSite()
-    {
-        $name = "website ";
-        $idsite = API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/"));
-        $this->assertInternalType(PHPUnit_Framework_Constraint_IsType::TYPE_INT, $idsite);
-
-        $siteInfo = API::getInstance()->getSiteFromId($idsite);
-        $this->assertEquals($name, $siteInfo['name']);
-        $this->assertEquals("http://piwik.net", $siteInfo['main_url']);
-
-        $siteUrls = API::getInstance()->getSiteUrlsFromId($idsite);
-        $this->assertEquals(array("http://piwik.net", "http://piwik.com/test"), $siteUrls);
-
-        return $idsite;
-    }
-
-    /**
-     * no duplicate -> all the urls are saved
-     *
-     * @group Plugins
-     */
-    public function testAddSiteUrlsnoDuplicate()
-    {
-        $idsite = $this->_addSite();
-
-        $siteUrlsBefore = API::getInstance()->getSiteUrlsFromId($idsite);
-
-        $toAdd = array("http://piwik1.net",
-                       "http://piwik2.net",
-                       "http://piwik3.net/test/",
-                       "http://localhost/test",
-                       "http://localho5.st/test",
-                       "http://l42578gqege.f4",
-                       "http://super.com/test/test/atqata675675/te"
+        $expected = array(
+            '2014-04-05' => array($this->siteId, 4949),
+            '2014-04-06' => array($this->siteId)
         );
-        $toAddValid = array("http://piwik1.net",
-                            "http://piwik2.net",
-                            "http://piwik3.net/test",
-                            "http://localhost/test",
-                            "http://localho5.st/test",
-                            "http://l42578gqege.f4",
-                            "http://super.com/test/test/atqata675675/te");
-
-        $insertedUrls = API::getInstance()->addSiteAliasUrls($idsite, $toAdd);
-        $this->assertEquals(count($toAdd), $insertedUrls);
-
-        $siteUrlsAfter = API::getInstance()->getSiteUrlsFromId($idsite);
 
-        $shouldHave = array_merge($siteUrlsBefore, $toAddValid);
-        sort($shouldHave);
+        $this->assertEquals($expected, $archive->getRememberedArchivedReportsThatShouldBeInvalidated());
 
-        sort($siteUrlsAfter);
-
-        $this->assertEquals($shouldHave, $siteUrlsAfter);
-    }
-
-    /**
-     * duplicate -> don't save the already existing URLs
-     *
-     * @group Plugins
-     */
-    public function testAddSiteUrlsDuplicate()
-    {
-        $idsite = $this->_addSite();
-
-        $siteUrlsBefore = API::getInstance()->getSiteUrlsFromId($idsite);
-
-        $toAdd = array_merge($siteUrlsBefore, array("http://piwik1.net", "http://piwik2.net"));
-
-        $insertedUrls = API::getInstance()->addSiteAliasUrls($idsite, $toAdd);
-        $this->assertEquals(count($toAdd) - count($siteUrlsBefore), $insertedUrls);
-
-        $siteUrlsAfter = API::getInstance()->getSiteUrlsFromId($idsite);
-
-        $shouldHave = $toAdd;
-        sort($shouldHave);
-
-        sort($siteUrlsAfter);
-
-        $this->assertEquals($shouldHave, $siteUrlsAfter);
-    }
+        $this->manager->onSiteDeleted($this->siteId);
 
-    /**
-     * case empty array => nothing happens
-     *
-     * @group Plugins
-     */
-    public function testAddSiteUrlsNoUrlsToAdd1()
-    {
-        $idsite = $this->_addSite();
-
-        $siteUrlsBefore = API::getInstance()->getSiteUrlsFromId($idsite);
-
-        $toAdd = array();
-
-        $insertedUrls = API::getInstance()->addSiteAliasUrls($idsite, $toAdd);
-        $this->assertEquals(count($toAdd), $insertedUrls);
-
-        $siteUrlsAfter = API::getInstance()->getSiteUrlsFromId($idsite);
-
-        $shouldHave = $siteUrlsBefore;
-        sort($shouldHave);
-
-        sort($siteUrlsAfter);
-
-        $this->assertEquals($shouldHave, $siteUrlsAfter);
-    }
-
-    /**
-     * case array only duplicate => nothing happens
-     *
-     * @group Plugins
-     */
-    public function testAddSiteUrlsNoUrlsToAdd2()
-    {
-        $idsite = $this->_addSite();
-
-        $siteUrlsBefore = API::getInstance()->getSiteUrlsFromId($idsite);
-
-        $toAdd = $siteUrlsBefore;
-
-        $insertedUrls = API::getInstance()->addSiteAliasUrls($idsite, $toAdd);
-        $this->assertEquals(0, $insertedUrls);
-
-        $siteUrlsAfter = API::getInstance()->getSiteUrlsFromId($idsite);
-
-        $shouldHave = $siteUrlsBefore;
-        sort($shouldHave);
-
-        sort($siteUrlsAfter);
-
-        $this->assertEquals($shouldHave, $siteUrlsAfter);
-    }
-
-    /**
-     * wrong format urls => exception
-     *
-     * @group Plugins
-     */
-    public function testAddSiteUrlsWrongUrlsFormat3()
-    {
-        try {
-            $idsite = $this->_addSite();
-            $toAdd = array("http:mpigeq");
-            API::getInstance()->addSiteAliasUrls($idsite, $toAdd);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * wrong idsite => no exception because simply no access to this resource
-     *
-     * @group Plugins
-     */
-    public function testAddSiteUrlsWrongIdSite1()
-    {
-        try {
-            $toAdd = array("http://pigeq.com/test");
-            API::getInstance()->addSiteAliasUrls(-1, $toAdd);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * wrong idsite => exception
-     *
-     * @group Plugins
-     */
-    public function testAddSiteUrlsWrongIdSite2()
-    {
-        try {
-            $toAdd = array("http://pigeq.com/test");
-            API::getInstance()->addSiteAliasUrls(155, $toAdd);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * no Id -> empty array
-     *
-     * @group Plugins
-     */
-    public function testGetAllSitesIdNoId()
-    {
-        $ids = API::getInstance()->getAllSitesId();
-        $this->assertEquals(array(), $ids);
-    }
-
-    /**
-     * several Id -> normal array
-     *
-     * @group Plugins
-     */
-    public function testGetAllSitesIdSeveralId()
-    {
-        $name = "tetq";
-        $idsites = array(
-            API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")),
-            API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")),
-            API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")),
-            API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")),
-            API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")),
+        $expected = array(
+            '2014-04-05' => array(4949)
         );
-
-        $ids = API::getInstance()->getAllSitesId();
-        $this->assertEquals($idsites, $ids);
-    }
-
-    /**
-     * wrong id => exception
-     *
-     * @group Plugins
-     */
-    public function testGetSiteFromIdWrongId1()
-    {
-        try {
-            API::getInstance()->getSiteFromId(0);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * wrong id => exception
-     *
-     * @group Plugins
-     */
-    public function testGetSiteFromIdWrongId2()
-    {
-        try {
-            API::getInstance()->getSiteFromId("x1");
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
+        $this->assertEquals($expected, $archive->getRememberedArchivedReportsThatShouldBeInvalidated());
     }
 
-    /**
-     * wrong id : no access => exception
-     *
-     * @group Plugins
-     */
-    public function testGetSiteFromIdWrongId3()
-    {
-        $idsite = API::getInstance()->addSite("site", array("http://piwik.net", "http://piwik.com/test/"));
-        $this->assertEquals(1, $idsite);
-
-        // set noaccess to site 1
-        FakeAccess::setIdSitesView(array(2));
-        FakeAccess::setIdSitesAdmin(array());
-
-        try {
-            API::getInstance()->getSiteFromId(1);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * normal case
-     *
-     * @group Plugins
-     */
-    public function testGetSiteFromIdNormalId()
-    {
-        $name = "website ''";
-        $idsite = API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/"));
-        $this->assertInternalType(PHPUnit_Framework_Constraint_IsType::TYPE_INT, $idsite);
-
-        $siteInfo = API::getInstance()->getSiteFromId($idsite);
-        $this->assertEquals($name, $siteInfo['name']);
-        $this->assertEquals("http://piwik.net", $siteInfo['main_url']);
-    }
-
-    /**
-     * there is no admin site available -> array()
-     *
-     * @group Plugins
-     */
-    public function testGetSitesWithAdminAccessNoResult()
-    {
-        FakeAccess::setIdSitesAdmin(array());
-
-        $sites = API::getInstance()->getSitesWithAdminAccess();
-        $this->assertEquals(array(), $sites);
-    }
-
-    /**
-     * normal case, admin and view and noaccess website => return only admin
-     *
-     * @group Plugins
-     */
-    public function testGetSitesWithAdminAccess()
-    {
-        API::getInstance()->addSite("site1", array("http://piwik.net", "http://piwik.com/test/"));
-        API::getInstance()->addSite("site2", array("http://piwik.com/test/"));
-        API::getInstance()->addSite("site3", array("http://piwik.org"));
-
-        $resultWanted = array(
-            0 => array("idsite" => 1, "name" => "site1", "main_url" => "http://piwik.net", "ecommerce" => 0, "excluded_ips" => "", 'sitesearch' => 1, 'sitesearch_keyword_parameters' => '', 'sitesearch_category_parameters' => '', 'excluded_parameters' => '', 'excluded_user_agents' => '', 'timezone' => 'UTC', 'currency' => 'USD', 'group' => '', 'keep_url_fragment' => 0, 'type' => 'website'),
-            1 => array("idsite" => 3, "name" => "site3", "main_url" => "http://piwik.org", "ecommerce" => 0, "excluded_ips" => "", 'sitesearch' => 1, 'sitesearch_keyword_parameters' => '', 'sitesearch_category_parameters' => '', 'excluded_parameters' => '', 'excluded_user_agents' => '', 'timezone' => 'UTC', 'currency' => 'USD', 'group' => '', 'keep_url_fragment' => 0, 'type' => 'website'),
-        );
-
-        FakeAccess::setIdSitesAdmin(array(1, 3));
-
-        $sites = API::getInstance()->getSitesWithAdminAccess();
-
-        // we dont test the ts_created
-        unset($sites[0]['ts_created']);
-        unset($sites[1]['ts_created']);
-        $this->assertEquals($resultWanted, $sites);
-    }
-
-    /**
-     * there is no admin site available -> array()
-     *
-     * @group Plugins
-     */
-    public function testGetSitesWithViewAccessNoResult()
-    {
-        FakeAccess::setIdSitesView(array());
-        FakeAccess::setIdSitesAdmin(array());
-
-        $sites = API::getInstance()->getSitesWithViewAccess();
-        $this->assertEquals(array(), $sites);
-    }
-
-    /**
-     * normal case, admin and view and noaccess website => return only admin
-     *
-     * @group Plugins
-     */
-    public function testGetSitesWithViewAccess()
-    {
-        API::getInstance()->addSite("site1", array("http://piwik.net", "http://piwik.com/test/"));
-        API::getInstance()->addSite("site2", array("http://piwik.com/test/"));
-        API::getInstance()->addSite("site3", array("http://piwik.org"));
-
-        $resultWanted = array(
-            0 => array("idsite" => 1, "name" => "site1", "main_url" => "http://piwik.net", "ecommerce" => 0, 'sitesearch' => 1, 'sitesearch_keyword_parameters' => '', 'sitesearch_category_parameters' => '', "excluded_ips" => "", 'excluded_parameters' => '', 'excluded_user_agents' => '', 'timezone' => 'UTC', 'currency' => 'USD', 'group' => '', 'keep_url_fragment' => 0, 'type' => 'website'),
-            1 => array("idsite" => 3, "name" => "site3", "main_url" => "http://piwik.org", "ecommerce" => 0, 'sitesearch' => 1, 'sitesearch_keyword_parameters' => '', 'sitesearch_category_parameters' => '', "excluded_ips" => "", 'excluded_parameters' => '', 'excluded_user_agents' => '', 'timezone' => 'UTC', 'currency' => 'USD', 'group' => '', 'keep_url_fragment' => 0, 'type' => 'website'),
-        );
-
-        FakeAccess::setIdSitesView(array(1, 3));
-        FakeAccess::setIdSitesAdmin(array());
-
-        $sites = API::getInstance()->getSitesWithViewAccess();
-        // we dont test the ts_created
-        unset($sites[0]['ts_created']);
-        unset($sites[1]['ts_created']);
-        $this->assertEquals($resultWanted, $sites);
-    }
-
-    /**
-     * there is no admin site available -> array()
-     *
-     * @group Plugins
-     */
-    public function testGetSitesWithAtLeastViewAccessNoResult()
-    {
-        FakeAccess::setIdSitesView(array());
-        FakeAccess::setIdSitesAdmin(array());
-
-        $sites = API::getInstance()->getSitesWithAtLeastViewAccess();
-        $this->assertEquals(array(), $sites);
-    }
-
-    /**
-     * normal case, admin and view and noaccess website => return only admin
-     *
-     * @group Plugins
-     */
-    public function testGetSitesWithAtLeastViewAccess()
-    {
-        API::getInstance()->addSite("site1", array("http://piwik.net", "http://piwik.com/test/"), $ecommerce = 1);
-        API::getInstance()->addSite("site2", array("http://piwik.com/test/"));
-        API::getInstance()->addSite("site3", array("http://piwik.org"));
-
-        $resultWanted = array(
-            0 => array("idsite" => 1, "name" => "site1", "main_url" => "http://piwik.net", "ecommerce" => 1, "excluded_ips" => "", 'sitesearch' => 1, 'sitesearch_keyword_parameters' => '', 'sitesearch_category_parameters' => '', 'excluded_parameters' => '', 'excluded_user_agents' => '', 'timezone' => 'UTC', 'currency' => 'USD', 'group' => '', 'keep_url_fragment' => 0, 'type' => 'website'),
-            1 => array("idsite" => 3, "name" => "site3", "main_url" => "http://piwik.org", "ecommerce" => 0, "excluded_ips" => "", 'sitesearch' => 1, 'sitesearch_keyword_parameters' => '', 'sitesearch_category_parameters' => '', 'excluded_parameters' => '', 'excluded_user_agents' => '', 'timezone' => 'UTC', 'currency' => 'USD', 'group' => '', 'keep_url_fragment' => 0, 'type' => 'website'),
-        );
-
-        FakeAccess::setIdSitesView(array(1, 3));
-        FakeAccess::setIdSitesAdmin(array());
-
-        $sites = API::getInstance()->getSitesWithAtLeastViewAccess();
-        // we dont test the ts_created
-        unset($sites[0]['ts_created']);
-        unset($sites[1]['ts_created']);
-        $this->assertEquals($resultWanted, $sites);
-    }
-
-    /**
-     * no urls for this site => array()
-     *
-     * @group Plugins
-     */
-    public function testGetSiteUrlsFromIdNoUrls()
-    {
-        $idsite = API::getInstance()->addSite("site1", array("http://piwik.net"));
-
-        $urls = API::getInstance()->getSiteUrlsFromId($idsite);
-        $this->assertEquals(array("http://piwik.net"), $urls);
-    }
-
-    /**
-     * normal case
-     *
-     * @group Plugins
-     */
-    public function testGetSiteUrlsFromIdManyUrls()
-    {
-        $site = array("http://piwik.net",
-                      "http://piwik.org",
-                      "http://piwik.org",
-                      "http://piwik.com");
-        sort($site);
-
-        $idsite = API::getInstance()->addSite("site1", $site);
-
-        $siteWanted = array("http://piwik.net",
-                            "http://piwik.org",
-                            "http://piwik.com");
-        sort($siteWanted);
-        $urls = API::getInstance()->getSiteUrlsFromId($idsite);
-
-        $this->assertEquals($siteWanted, $urls);
-    }
-
-    /**
-     * wrongId => exception
-     *
-     * @group Plugins
-     */
-    public function testGetSiteUrlsFromIdWrongId()
-    {
-        try {
-            FakeAccess::setIdSitesView(array(3));
-            FakeAccess::setIdSitesAdmin(array());
-            API::getInstance()->getSiteUrlsFromId(1);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * one url => no change to alias urls
-     *
-     * @group Plugins
-     */
-    public function testUpdateSiteOneUrl()
-    {
-        $urls = array("http://piwiknew.com",
-                      "http://piwiknew.net",
-                      "http://piwiknew.org",
-                      "http://piwiknew.fr");
-        $idsite = API::getInstance()->addSite("site1", $urls);
-
-        $newMainUrl = "http://main.url";
-
-        // Also test that the group was set to empty, and is searchable
-        $websites = API::getInstance()->getSitesFromGroup('');
-        $this->assertEquals(1, count($websites));
-
-        // the Update doesn't change the group field
-        API::getInstance()->updateSite($idsite, "test toto@{}", $newMainUrl);
-        $websites = API::getInstance()->getSitesFromGroup('');
-        $this->assertEquals(1, count($websites));
-
-        // Updating the group to something
-        $group = 'something';
-        API::getInstance()->updateSite($idsite, "test toto@{}", $newMainUrl, $ecommerce = 0, $ss = true, $ss_kwd = null, $ss_cat = '', $ips = null, $parametersExclude = null, $timezone = null, $currency = null, $group);
-        $websites = API::getInstance()->getSitesFromGroup($group);
-        $this->assertEquals(1, count($websites));
-        $this->assertEquals(date('Y-m-d'), date('Y-m-d', strtotime($websites[0]['ts_created'])));
-
-        // Updating the group to nothing
-        $group = '';
-        $type = 'mobileAppTest';
-        API::getInstance()->updateSite($idsite, "test toto@{}", $newMainUrl, $ecommerce = 0, $ss = false, $ss_kwd = '', $ss_cat = null, $ips = null, $parametersExclude = null, $timezone = null, $currency = null, $group, $startDate = '2010-01-01', $excludedUserAgent = null, $keepUrlFragment = 1, $type);
-        $websites = API::getInstance()->getSitesFromGroup($group);
-        $this->assertEquals(1, count($websites));
-        $this->assertEquals('2010-01-01', date('Y-m-d', strtotime($websites[0]['ts_created'])));
-
-        // Test setting the website type
-        $this->assertEquals($type, Site::getTypeFor($idsite));
-
-        // Check Alias URLs contain only main url
-        $allUrls = API::getInstance()->getSiteUrlsFromId($idsite);
-        $this->assertEquals($newMainUrl, $allUrls[0]);
-        $aliasUrls = array_slice($allUrls, 1);
-        $this->assertEquals(array(), $aliasUrls);
-
-    }
-
-    /**
-     * strange name and NO URL => name ok, main_url not updated
-     *
-     * @group Plugins
-     */
-    public function testUpdateSiteStrangeNameNoUrl()
-    {
-        $idsite = API::getInstance()->addSite("site1", "http://main.url");
-        $newName = "test toto@{'786'}";
-
-        API::getInstance()->updateSite($idsite, $newName);
-
-        $site = API::getInstance()->getSiteFromId($idsite);
-
-        $this->assertEquals($newName, $site['name']);
-        // url didn't change because parameter url NULL in updateSite
-        $this->assertEquals("http://main.url", $site['main_url']);
-    }
-
-    /**
-     * several urls => both main and alias are updated
-     * also test the update of group field
-     *
-     * @group Plugins
-     */
-    public function testUpdateSiteSeveralUrlsAndGroup()
-    {
-        $urls = array("http://piwiknew.com",
-                      "http://piwiknew.net",
-                      "http://piwiknew.org",
-                      "http://piwiknew.fr");
-
-        $group = 'GROUP Before';
-        $idsite = API::getInstance()->addSite("site1", $urls, $ecommerce = 1,
-            $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null,
-            $excludedIps = null, $excludedQueryParameters = null, $timezone = null, $currency = null, $group, $startDate = '2011-01-01');
-
-        $websites = API::getInstance()->getSitesFromGroup($group);
-        $this->assertEquals(1, count($websites));
-
-        $newurls = array("http://piwiknew2.com",
-                         "http://piwiknew2.net",
-                         "http://piwiknew2.org",
-                         "http://piwiknew2.fr");
-
-        $groupAfter = '   GROUP After';
-        API::getInstance()->updateSite($idsite, "test toto@{}", $newurls, $ecommerce = 0,
-            $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null,
-            $excludedIps = null, $excludedQueryParameters = null, $timezone = null, $currency = null, $groupAfter);
-
-        // no result for the group before update
-        $websites = API::getInstance()->getSitesFromGroup($group);
-        $this->assertEquals(0, count($websites));
-
-        // Testing that the group was updated properly (and testing that the group value is trimmed before inserted/searched)
-        $websites = API::getInstance()->getSitesFromGroup($groupAfter . ' ');
-        $this->assertEquals(1, count($websites));
-        $this->assertEquals('2011-01-01', date('Y-m-d', strtotime($websites[0]['ts_created'])));
-
-        // Test fetch website groups
-        $expectedGroups = array(trim($groupAfter));
-        $fetched = API::getInstance()->getSitesGroups();
-        $this->assertEquals($expectedGroups, $fetched);
-
-        $allUrls = API::getInstance()->getSiteUrlsFromId($idsite);
-        sort($allUrls);
-        sort($newurls);
-        $this->assertEquals($newurls, $allUrls);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testGetSitesGroups()
-    {
-        $groups = array('group1', ' group1 ', '', 'group2');
-        $expectedGroups = array('group1', '', 'group2');
-        foreach ($groups as $group) {
-            API::getInstance()->addSite("test toto@{}", 'http://example.org', $ecommerce = 1, $siteSearch = null, $searchKeywordParameters = null, $searchCategoryParameters = null, $excludedIps = null, $excludedQueryParameters = null, $timezone = null, $currency = null, $group);
-        }
-
-        $this->assertEquals($expectedGroups, API::getInstance()->getSitesGroups());
-    }
-
-    public function getInvalidTimezoneData()
-    {
-        return array(
-            array('UTC+15'),
-            array('Paris'),
-        );
-    }
-
-    /**
-     *
-     * @dataProvider getInvalidTimezoneData
-     * @group Plugins
-     */
-    public function testAddSitesInvalidTimezone($timezone)
-    {
-        try {
-            API::getInstance()->addSite("site1", array('http://example.org'), $ecommerce = 0,
-                $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, $ip = '', $params = '', $timezone);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAddSitesInvalidCurrency()
-    {
-        try {
-            $invalidCurrency = '€';
-            API::getInstance()->addSite("site1", array('http://example.org'), $ecommerce = 0,
-                $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, '', 'UTC', $invalidCurrency);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testSetDefaultTimezoneAndCurrencyAndExcludedQueryParametersAndExcludedIps()
-    {
-        // test that they return default values
-        $defaultTimezone = API::getInstance()->getDefaultTimezone();
-        $this->assertEquals('UTC', $defaultTimezone);
-        $defaultCurrency = API::getInstance()->getDefaultCurrency();
-        $this->assertEquals('USD', $defaultCurrency);
-        $excludedIps = API::getInstance()->getExcludedIpsGlobal();
-        $this->assertEquals('', $excludedIps);
-        $excludedQueryParameters = API::getInstance()->getExcludedQueryParametersGlobal();
-        $this->assertEquals('', $excludedQueryParameters);
-
-        // test that when not specified, defaults are set as expected
-        $idsite = API::getInstance()->addSite("site1", array('http://example.org'));
-        $site = new Site($idsite);
-        $this->assertEquals('UTC', $site->getTimezone());
-        $this->assertEquals('USD', $site->getCurrency());
-        $this->assertEquals('', $site->getExcludedQueryParameters());
-        $this->assertEquals('', $site->getExcludedIps());
-        $this->assertEquals(false, $site->isEcommerceEnabled());
-
-        // set the global timezone and get it
-        $newDefaultTimezone = 'UTC+5.5';
-        API::getInstance()->setDefaultTimezone($newDefaultTimezone);
-        $defaultTimezone = API::getInstance()->getDefaultTimezone();
-        $this->assertEquals($newDefaultTimezone, $defaultTimezone);
-
-        // set the default currency and get it
-        $newDefaultCurrency = 'EUR';
-        API::getInstance()->setDefaultCurrency($newDefaultCurrency);
-        $defaultCurrency = API::getInstance()->getDefaultCurrency();
-        $this->assertEquals($newDefaultCurrency, $defaultCurrency);
-
-        // set the global IPs to exclude and get it
-        $newGlobalExcludedIps = '1.1.1.*,1.1.*.*,150.1.1.1';
-        API::getInstance()->setGlobalExcludedIps($newGlobalExcludedIps);
-        $globalExcludedIps = API::getInstance()->getExcludedIpsGlobal();
-        $this->assertEquals($newGlobalExcludedIps, $globalExcludedIps);
-
-        // set the global URL query params to exclude and get it
-        $newGlobalExcludedQueryParameters = 'PHPSESSID,blabla, TesT';
-        // removed the space
-        $expectedGlobalExcludedQueryParameters = 'PHPSESSID,blabla,TesT';
-        API::getInstance()->setGlobalExcludedQueryParameters($newGlobalExcludedQueryParameters);
-        $globalExcludedQueryParameters = API::getInstance()->getExcludedQueryParametersGlobal();
-        $this->assertEquals($expectedGlobalExcludedQueryParameters, $globalExcludedQueryParameters);
-
-        // create a website and check that default currency and default timezone are set
-        // however, excluded IPs and excluded query Params are not returned
-        $idsite = API::getInstance()->addSite("site1", array('http://example.org'), $ecommerce = 0,
-            $siteSearch = 0, $searchKeywordParameters = 'test1,test2', $searchCategoryParameters = 'test2,test1',
-            '', '', $newDefaultTimezone);
-        $site = new Site($idsite);
-        $this->assertEquals($newDefaultTimezone, $site->getTimezone());
-        $this->assertEquals(date('Y-m-d'), $site->getCreationDate()->toString());
-        $this->assertEquals($newDefaultCurrency, $site->getCurrency());
-        $this->assertEquals('', $site->getExcludedIps());
-        $this->assertEquals('', $site->getExcludedQueryParameters());
-        $this->assertEquals('test1,test2', $site->getSearchKeywordParameters());
-        $this->assertEquals('test2,test1', $site->getSearchCategoryParameters());
-        $this->assertFalse($site->isSiteSearchEnabled());
-        $this->assertFalse(Site::isSiteSearchEnabledFor($idsite));
-        $this->assertFalse($site->isEcommerceEnabled());
-        $this->assertFalse(Site::isEcommerceEnabledFor($idsite));
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testGetSitesIdFromSiteUrlSuperUser()
-    {
-        API::getInstance()->addSite("site1", array("http://piwik.net", "http://piwik.com"));
-        API::getInstance()->addSite("site2", array("http://piwik.com", "http://piwik.net"));
-        API::getInstance()->addSite("site3", array("http://piwik.com", "http://piwik.org"));
-
-        $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://piwik.org');
-        $this->assertTrue(count($idsites) == 1);
-
-        $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://www.piwik.org');
-        $this->assertTrue(count($idsites) == 1);
-
-        $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://piwik.net');
-        $this->assertTrue(count($idsites) == 2);
-
-        $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://piwik.com');
-        $this->assertTrue(count($idsites) == 3);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testGetSitesIdFromSiteUrlUser()
-    {
-        API::getInstance()->addSite("site1", array("http://www.piwik.net", "http://piwik.com"));
-        API::getInstance()->addSite("site2", array("http://piwik.com", "http://piwik.net"));
-        API::getInstance()->addSite("site3", array("http://piwik.com", "http://piwik.org"));
-
-        $saveAccess = Access::getInstance();
-
-        APIUsersManager::getInstance()->addUser("user1", "geqgegagae", "tegst@tesgt.com", "alias");
-        APIUsersManager::getInstance()->setUserAccess("user1", "view", array(1));
-
-        APIUsersManager::getInstance()->addUser("user2", "geqgegagae", "tegst2@tesgt.com", "alias");
-        APIUsersManager::getInstance()->setUserAccess("user2", "view", array(1));
-        APIUsersManager::getInstance()->setUserAccess("user2", "admin", array(3));
-
-        APIUsersManager::getInstance()->addUser("user3", "geqgegagae", "tegst3@tesgt.com", "alias");
-        APIUsersManager::getInstance()->setUserAccess("user3", "view", array(1, 2));
-        APIUsersManager::getInstance()->setUserAccess("user3", "admin", array(3));
-
-        $pseudoMockAccess = new FakeAccess;
-        FakeAccess::$superUser = false;
-        FakeAccess::$identity = 'user1';
-        FakeAccess::setIdSitesView(array(1));
-        FakeAccess::setIdSitesAdmin(array());
-        Access::setSingletonInstance($pseudoMockAccess);
-        $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://piwik.com');
-        $this->assertEquals(1, count($idsites));
-
-        // testing URL normalization
-        $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://www.piwik.com');
-        $this->assertEquals(1, count($idsites));
-        $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://piwik.net');
-        $this->assertEquals(1, count($idsites));
-
-        $pseudoMockAccess = new FakeAccess;
-        FakeAccess::$superUser = false;
-        FakeAccess::$identity = 'user2';
-        FakeAccess::setIdSitesView(array(1));
-        FakeAccess::setIdSitesAdmin(array(3));
-        Access::setSingletonInstance($pseudoMockAccess);
-        $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://piwik.com');
-        $this->assertEquals(2, count($idsites));
-
-        $pseudoMockAccess = new FakeAccess;
-        FakeAccess::$superUser = false;
-        FakeAccess::$identity = 'user3';
-        FakeAccess::setIdSitesView(array(1, 2));
-        FakeAccess::setIdSitesAdmin(array(3));
-        Access::setSingletonInstance($pseudoMockAccess);
-        $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://piwik.com');
-        $this->assertEquals(3, count($idsites));
-
-        Access::setSingletonInstance($saveAccess);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testGetSitesFromTimezones()
-    {
-        API::getInstance()->addSite("site3", array("http://piwik.org"), null, $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, null, null, 'UTC');
-        $idsite2 = API::getInstance()->addSite("site3", array("http://piwik.org"), null, $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, null, null, 'Pacific/Auckland');
-        $idsite3 = API::getInstance()->addSite("site3", array("http://piwik.org"), null, $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, null, null, 'Pacific/Auckland');
-        $idsite4 = API::getInstance()->addSite("site3", array("http://piwik.org"), null, $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, null, null, 'UTC+10');
-        $result = API::getInstance()->getSitesIdFromTimezones(array('UTC+10', 'Pacific/Auckland'));
-        $this->assertEquals(array($idsite2, $idsite3, $idsite4), $result);
-    }
 }
diff --git a/plugins/TasksTimetable b/plugins/TasksTimetable
-Subproject 00004da3c3b876fab49fa612f184b181909de41
+Subproject 4af9daf3388f59159cf0ff9eb60b8bc38461149
diff --git a/plugins/TestRunner/Commands/GenerateTravisYmlFile.php b/plugins/TestRunner/Commands/GenerateTravisYmlFile.php
index 43f75ccb76..7d15058403 100644
--- a/plugins/TestRunner/Commands/GenerateTravisYmlFile.php
+++ b/plugins/TestRunner/Commands/GenerateTravisYmlFile.php
@@ -6,15 +6,15 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  */
-
 namespace Piwik\Plugins\TestRunner\Commands;
 
+use Piwik\Plugins\TestRunner\TravisYml\Generator\CoreTravisYmlGenerator;
+use Piwik\Plugins\TestRunner\TravisYml\Generator\PiwikTestsPluginsTravisYmlGenerator;
+use Piwik\Plugins\TestRunner\TravisYml\Generator\PluginTravisYmlGenerator;
 use Piwik\View;
 use Piwik\Plugin\ConsoleCommand;
-use Piwik\Plugins\TestRunner\TravisYmlView;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Output\OutputInterface;
 use Exception;
 
@@ -24,13 +24,17 @@ use Exception;
  */
 class GenerateTravisYmlFile extends ConsoleCommand
 {
+    const COMMAND_NAME = 'generate:travis-yml';
+
     protected function configure()
     {
-        $this->setName('generate:travis-yml')
+        $this->setName(self::COMMAND_NAME)
              ->setDescription('Generates a .travis.yml file for a plugin. The file can be auto-updating based on the parameters supplied.')
              ->addOption('plugin', null, InputOption::VALUE_REQUIRED, 'The plugin for whom a .travis.yml file should be generated.')
              ->addOption('core', null, InputOption::VALUE_NONE, 'Supplied when generating the .travis.yml file for Piwik core.'
                                                           . ' Should only be used by core developers.')
+             ->addOption('piwik-tests-plugins', null, InputOption::VALUE_REQUIRED, 'Supplied when generating the .travis.yml file for the '
+                                                          . 'piwik-tests-plugins repository. Should only be used by core developers.')
              ->addOption('artifacts-pass', null, InputOption::VALUE_REQUIRED,
                 "Password to the Piwik build artifacts server. Will be encrypted in the .travis.yml file.")
              ->addOption('github-token', null, InputOption::VALUE_REQUIRED,
@@ -44,155 +48,33 @@ class GenerateTravisYmlFile extends ConsoleCommand
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $targetPlugin  = $input->getOption('plugin');
-        $outputYmlPath = $this->getTravisYmlOutputPath($input, $targetPlugin);
-
-        $view = $this->createTravisYmlView($input, $output, $targetPlugin, $outputYmlPath);
-        $travisYmlContents = $view->render();
-
-        $this->dumpTravisYmlContents($input, $output, $outputYmlPath, $travisYmlContents);
-    }
-
-    private function createTravisYmlView(InputInterface $input, OutputInterface $output, $targetPlugin, $outputYmlPath)
-    {
-        $view = new TravisYmlView();
-        $view->setPlugin($targetPlugin);
-
-        $thisConsoleCommand = $this->getExecutedConsoleCommandForTravis($input);
-        $view->setGenerateYmlCommand($thisConsoleCommand);
-
-        $phpVersions = $input->getOption('php-versions');
-        if (!empty($phpVersions)) {
-            $view->setPhpVersions(explode(',', $phpVersions));
-        }
-
-        if (file_exists($outputYmlPath)) {
-            $output->writeln("<info>Found existing YAML file at $outputYmlPath.</info>");
-
-            $view->processExistingTravisYml($outputYmlPath);
-        } else {
-            $output->writeln("<info>Could not find existing YAML file at $outputYmlPath, generating a new one.</info>");
-        }
-
-        $this->setExtraEnvironmentVariables($view, $input, $output);
-
-        return $view;
-    }
-
-    private function dumpTravisYmlContents(InputInterface $input, OutputInterface $output, $outputYmlPath, $travisYmlContents)
-    {
-        $writePath = $input->getOption('dump');
-        if (empty($writePath)) {
-            $writePath = $outputYmlPath;
-        }
-
-        file_put_contents($writePath, $travisYmlContents);
+        $generator = $this->createTravisYmlGenerator($input);
+        $travisYmlContents = $generator->generate();
 
+        $writePath = $generator->dumpTravisYmlContents($travisYmlContents);
         $this->writeSuccessMessage($output, array("Generated .travis.yml file at '$writePath'!"));
     }
 
-    private function setExtraEnvironmentVariables(TravisYmlView $view, InputInterface $input, OutputInterface $output)
-    {
-        if (!empty($view->existingEnv)) {
-            $output->writeln("<info>Existing .yml file found, ignoring global variables specified on command line.</info>");
-            return;
-        }
-
-        $extraVars = array();
-
-        $artifactsPass = $input->getOption('artifacts-pass');
-        if (!empty($artifactsPass)) {
-            $extraVars[] = $this->travisEncrypt("ARTIFACTS_PASS=" . $artifactsPass, $view, $output);
-        }
-
-        $githubToken = $input->getOption('github-token');
-        if (!empty($githubToken)) {
-            $extraVars[] = $this->travisEncrypt("GITHUB_USER_TOKEN=" . $githubToken, $view, $output);
-        }
-
-        $view->setExtraGlobalEnvVars($extraVars);
-    }
-
-    private function getTravisYmlOutputPath(InputInterface $input, $targetPlugin)
-    {
-        if ($input->getOption('core')) {
-            return PIWIK_INCLUDE_PATH . '/.travis.yml';
-        } else if ($targetPlugin) {
-            $pluginDirectory = PIWIK_INCLUDE_PATH . '/plugins/' . $targetPlugin;
-            if (!is_writable($pluginDirectory)) {
-                throw new Exception("Cannot write to '$pluginDirectory'!");
-            }
-
-            return $pluginDirectory . '/.travis.yml';
-        } else {
-            throw new Exception("Neither --plugin option or --core option specified; don't know where to generate .travis.yml."
-                              . " Execute './console help generate:travis-yml' for more info");
-        }
-    }
-
-    private function getExecutedConsoleCommandForTravis(InputInterface $input)
-    {
-        $command = "php ./console " . $this->getName();
-
-        $arguments = $input->getOptions();
-        unset($arguments['github-token']);
-        unset($arguments['artifacts-pass']);
-        unset($arguments['dump']);
-
-        foreach ($arguments as $name => $value) {
-            if ($value === false
-                || $value === null
-            ) {
-                continue;
-            }
-
-            if ($value === true) {
-                $command .= " --$name";
-            } else if (is_array($value)) {
-                foreach ($value as $arrayValue) {
-                    $command .= " --$name=\"" . addslashes($arrayValue) . "\"";
-                }
-            } else {
-                $command .= " --$name=\"" . addslashes($value) . "\"";
-            }
-        }
-
-        return $command;
-    }
-
-
-    private function travisEncrypt($data, TravisYmlView $view, OutputInterface $output)
+    private function createTravisYmlGenerator(InputInterface $input)
     {
-        $output->writeln("Encrypting \"$data\"...");
-
-        $command = "travis encrypt \"$data\"";
+        $allOptions = $input->getOptions();
 
-        // change dir to target plugin since plugin will be in its own git repo
-        if (!empty($view->pluginName)) {
-            $command = "cd \"" . $view->getPluginRootFolder() . "\" && " . $command;
+        $isCore = $input->getOption('core');
+        if ($isCore) {
+            return new CoreTravisYmlGenerator($allOptions);
         }
 
-        exec($command, $commandOutput, $returnCode);
-        if ($returnCode !== 0) {
-            throw new Exception("Cannot encrypt \"$data\" for travis! Please make sure you have the travis command line "
-                              . "utility installed (see http://blog.travis-ci.com/2013-01-14-new-client/).\n\n"
-                              . "return code: $returnCode\n\n"
-                              . "travis output:\n\n" . implode("\n", $commandOutput));
+        $targetPlugin = $input->getOption('plugin');
+        if ($targetPlugin) {
+            return new PluginTravisYmlGenerator($targetPlugin, $allOptions);
         }
 
-        if (empty($commandOutput)) {
-            throw new Exception("Cannot parse travis encrypt output:\n\n" . implode("\n", $commandOutput));
-        }
-
-        // when not executed from a command line travis encrypt will return only the encrypted data
-        $encryptedData = $commandOutput[0];
-
-        if (substr($encryptedData, 0, 1) != '"'
-            || substr($encryptedData, -1) != '"'
-        ) {
-            $encryptedData = '"' . addslashes($encryptedData) . '"';
+        $piwikTestsPluginPath = $input->getOption('piwik-tests-plugins');
+        if ($piwikTestsPluginPath) {
+            return new PiwikTestsPluginsTravisYmlGenerator($piwikTestsPluginPath, $allOptions);
         }
 
-        return "secure: " . $encryptedData;
+        throw new Exception("Neither --plugin option, --core option or --piwik-tests-plugins specified; don't know what type"
+            . " of .travis.yml file to generate. Execute './console help generate:travis-yml' for more info");
     }
 }
\ No newline at end of file
diff --git a/plugins/TestRunner/Commands/TestsRun.php b/plugins/TestRunner/Commands/TestsRun.php
index 0aaef90049..21c4c81678 100644
--- a/plugins/TestRunner/Commands/TestsRun.php
+++ b/plugins/TestRunner/Commands/TestsRun.php
@@ -46,8 +46,16 @@ class TestsRun extends ConsoleCommand
 
         $command = '../../vendor/phpunit/phpunit/phpunit';
 
+        if (version_compare(PHP_VERSION, '5.4.0', '<')) {
+            $command = 'php -dzend.enable_gc=0 ' . $command;
+        }
+
         if (!$this->isCoverageEnabled($options) && $this->isXdebugLoaded()) {
-            $output->writeln('<comment>Did you know? You can run tests faster by disabling xdebug</comment>');
+            $message = 'Did you know? You can run tests faster by disabling xdebug';
+            if($this->isXdebugCodeCoverageEnabled()) {
+                $message .= ' (if you need xdebug, speed up tests by setting xdebug.coverage_enable=0)</comment>';
+            }
+            $output->writeln('<comment>' . $message .'</comment>');
         }
 
         // force xdebug usage for coverage options
@@ -255,6 +263,11 @@ class TestsRun extends ConsoleCommand
         return extension_loaded('xdebug');
     }
 
+    private function isXdebugCodeCoverageEnabled()
+    {
+        return (bool)ini_get('xdebug.coverage_enable');
+    }
+
     private function fixPathToTestFileOrDirectory($testFile)
     {
         if ('/' !== substr($testFile, 0, 1)) {
diff --git a/plugins/TestRunner/Commands/TestsRunOnAws.php b/plugins/TestRunner/Commands/TestsRunOnAws.php
index 495ecfa461..8ff81fa0a5 100644
--- a/plugins/TestRunner/Commands/TestsRunOnAws.php
+++ b/plugins/TestRunner/Commands/TestsRunOnAws.php
@@ -155,7 +155,7 @@ This feature is still beta and there might be problems with pictures and/or bina
         if (in_array($testSuite, array('system', 'all'))) {
             $message = "<info>Tests finished. You can browse processed files and download artifacts at </info><comment>http://$host/tests/PHPUnit/System/processed/</comment>";
         } elseif ('ui' === $testSuite) {
-            $message = "<info>Tests finished. You can browse processed screenshots at </info><comment>http://$host/tests/PHPUnit/UI/screenshot-diffs/diffviewer.html</comment>";
+            $message = "<info>Tests finished. You can browse processed screenshots at </info><comment>http://$host/tests/UI/screenshot-diffs/diffviewer.html</comment>";
         } else {
             $message = "<info>Tests finished</info>";
         }
diff --git a/plugins/TestRunner/Commands/TestsRunUI.php b/plugins/TestRunner/Commands/TestsRunUI.php
index e02a452607..c8d31d891c 100644
--- a/plugins/TestRunner/Commands/TestsRunUI.php
+++ b/plugins/TestRunner/Commands/TestsRunUI.php
@@ -27,11 +27,18 @@ class TestsRunUI extends ConsoleCommand
         $this->addOption('drop', null, InputOption::VALUE_NONE, "Drop the existing database and re-setup a persisted fixture.");
         $this->addOption('assume-artifacts', null, InputOption::VALUE_NONE, "Assume the diffviewer and processed screenshots will be stored on the builds artifacts server. For use with travis build.");
         $this->addOption('plugin', null, InputOption::VALUE_REQUIRED, "Execute all tests for a plugin.");
+        $this->addOption('core', null, InputOption::VALUE_NONE, "Execute only tests for Piwik core & core plugins.");
         $this->addOption('skip-delete-assets', null, InputOption::VALUE_NONE, "Skip deleting of merged assets (will speed up a test run, but not by a lot).");
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        if (!file_exists(PIWIK_INCLUDE_PATH . '/tests/UI/expected-ui-screenshots/README.md')) {
+            // REMOVE THIS CHECK AFTER 1st April 2015
+            $output->writeln('<error>"tests/UI/expected-ui-screenshots" does not exist. You might have to run "git submodule update --init"</error>');
+            return;
+        }
+
         $specs = $input->getArgument('specs');
         $persistFixtureData = $input->getOption("persist-fixture-data");
         $keepSymlinks = $input->getOption('keep-symlinks');
@@ -40,6 +47,7 @@ class TestsRunUI extends ConsoleCommand
         $assumeArtifacts = $input->getOption('assume-artifacts');
         $plugin = $input->getOption('plugin');
         $skipDeleteAssets = $input->getOption('skip-delete-assets');
+        $core = $input->getOption('core');
 
         if (!$skipDeleteAssets) {
             AssetManager::getInstance()->removeMergedAssets();
@@ -69,6 +77,11 @@ class TestsRunUI extends ConsoleCommand
         if ($plugin) {
             $options[] = "--plugin=" . $plugin;
         }
+
+        if ($core) {
+            $options[] = "--core";
+        }
+
         $options = implode(" ", $options);
 
         $specs = implode(" ", $specs);
diff --git a/plugins/TestRunner/Commands/TestsSetupFixture.php b/plugins/TestRunner/Commands/TestsSetupFixture.php
index cda1a5c585..f659eae71f 100644
--- a/plugins/TestRunner/Commands/TestsSetupFixture.php
+++ b/plugins/TestRunner/Commands/TestsSetupFixture.php
@@ -93,6 +93,9 @@ class TestsSetupFixture extends ConsoleCommand
             $_SERVER = json_decode($serverGlobal, true);
         }
 
+        if(Config::getInstance()->database_tests['tables_prefix'] !== '') {
+            throw new \Exception("To generate OmniFixture for the UI tests, you must set an empty tables_prefix in [database_tests]");
+        }
         $this->requireFixtureFiles($input);
         $this->setIncludePathAsInTestBootstrap();
 
@@ -111,22 +114,23 @@ class TestsSetupFixture extends ConsoleCommand
             }
         }
 
+        if ($input->getOption('set-phantomjs-symlinks')) {
+            $this->createSymbolicLinksForUITests();
+        }
+
         $fixture = $this->createFixture($input, $allowSave = !empty($configDomainToSave));
 
         $this->setupDatabaseOverrides($input, $fixture);
 
         // perform setup and/or teardown
         if ($input->getOption('teardown')) {
+            exit;
             $fixture->getTestEnvironment()->save();
             $fixture->performTearDown();
         } else {
             $fixture->performSetUp();
         }
 
-        if ($input->getOption('set-phantomjs-symlinks')) {
-            $this->createSymbolicLinksForUITests();
-        }
-
         $this->writeSuccessMessage($output, array("Fixture successfully setup!"));
 
         $sqlDumpPath = $input->getOption('sqldump');
@@ -175,7 +179,8 @@ class TestsSetupFixture extends ConsoleCommand
             'dbname' => $fixture->getDbName(),
             'host' => $input->getOption('db-host'),
             'username' => $input->getOption('db-user'),
-            'password' => $input->getOption('db-pass')
+            'password' => $input->getOption('db-pass'),
+            'tables_prefix' => '',
         );
         foreach ($optionsToOverride as $configOption => $value) {
             if ($value) {
@@ -232,13 +237,11 @@ class TestsSetupFixture extends ConsoleCommand
     private function requireFixtureFiles(InputInterface $input)
     {
         require_once PIWIK_INCLUDE_PATH . '/libs/PiwikTracker/PiwikTracker.php';
-        require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/FakeAccess.php';
         require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/TestingEnvironment.php';
-        require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/IntegrationTestCase.php';
 
         $fixturesToLoad = array(
             '/tests/PHPUnit/Fixtures/*.php',
-            '/tests/PHPUnit/UI/Fixtures/*.php',
+            '/tests/UI/Fixtures/*.php',
             '/plugins/*/tests/Fixtures/*.php',
             '/plugins/*/Test/Fixtures/*.php',
         );
diff --git a/plugins/TestRunner/Controller.php b/plugins/TestRunner/Controller.php
new file mode 100644
index 0000000000..c3f75fbe10
--- /dev/null
+++ b/plugins/TestRunner/Controller.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\TestRunner;
+
+class Controller extends \Piwik\Plugin\Controller
+{
+    public function check()
+    {
+        return 'OK';
+    }
+}
diff --git a/plugins/TestRunner/README.md b/plugins/TestRunner/README.md
index be10873613..d0c9c864d9 100644
--- a/plugins/TestRunner/README.md
+++ b/plugins/TestRunner/README.md
@@ -10,13 +10,17 @@ __I want to run the tests with different parameters on AWS, is it possible?__
 
 Yes, at the time of writing this you have to edit the file `Runner/Remote.php`
 
+__Why am I getting an error "AWS was not able to validate the provided access credentials"?__
+
+It could be caused by an invalid set date. Execute `date` on the command line and make sure it is correct.
+
 __How can I change the base image (AMI) that is used for AWS tests?__
 
 * Log in to AWS
 * Select `EC2 => AMI`
 * Launch a new instance of the current AMI by selecting it and pressing `Launch`
 * Select a `c3.large` instance type
-* Press `Review and Launch` and on next page `Launch` (in theory you have to select your keypair somewhere otherwise you will not be able to log in but I couldn't find where)
+* Press `Review and Launch` and on next page `Launch` (there you have to select your keypair otherwise you can't log in)
 * Log in to the newly created instance. To get login information 
   * Go to `EC2 => Instances`
   * Select the created instance
@@ -33,7 +37,7 @@ __How can I change the base image (AMI) that is used for AWS tests?__
     or if you don't know Puppet at least add it in this shell script https://github.com/piwik/piwik-dev-environment/blob/master/puppet/files/setup.sh
     For instance if you installed a new package you can simply add a new entry here https://github.com/piwik/piwik-dev-environment/blob/master/puppet/modules/piwik/manifests/base.pp
 * In `EC2 => Instances` menu select the instance you are currently using.
-* Select `Actions => Create Image`
+* Select `Actions => Image => Create Image`
 * Define the name `Piwik Testing vX.X` and a description like `Used to run Piwik tests via Piwik console`. Make sure to increase the box version in X.X (have a look in `EC2 => AMI` for current version)
 * Press `Create Image`
 * Go to `EC2 => AMIs` menu and while waiting for the image creation to complete add the following tags
@@ -54,6 +58,7 @@ __How do I create a new EC2 key/pair for a developer?__
 1. Go to: https://console.aws.amazon.com/ec2/v2/home?region=us-east-1
 2. Click `Create Key Pair`
 3. Send PGP email
+
 ```
 Here are info for running tests on Ec2
  * Access Key ID: 
diff --git a/plugins/TestRunner/TravisYml/Generator.php b/plugins/TestRunner/TravisYml/Generator.php
new file mode 100644
index 0000000000..0c4e4b8579
--- /dev/null
+++ b/plugins/TestRunner/TravisYml/Generator.php
@@ -0,0 +1,209 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+namespace Piwik\Plugins\TestRunner\TravisYml;
+
+use Exception;
+use Piwik\Plugins\TestRunner\Commands\GenerateTravisYmlFile;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Base class for .travis.yml file generators.
+ */
+abstract class Generator
+{
+    /**
+     * @var string[]
+     */
+    protected $options;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var TravisYmlView
+     */
+    protected $view;
+
+    /**
+     * Constructor.
+     *
+     * @param string[] $options The string options applied to the generate:travis-yml command.
+     */
+    public function __construct($options)
+    {
+        $this->options = $options;
+        if (class_exists('\Piwik\Container\StaticContainer')) {
+            $this->logger = \Piwik\Container\StaticContainer::getContainer()->get('Psr\Log\LoggerInterface');
+        }
+
+        $this->view = new TravisYmlView();
+    }
+
+    /**
+     * Generates the contents of a .travis.yml file and returns them.
+     *
+     * @return string
+     */
+    public function generate()
+    {
+        $this->configureView();
+
+        return $this->view->render();
+    }
+
+    /**
+     * Writes the contents of a .travis.yml file to the correct destination. If the --dump option
+     * is specified, the file is saved here instead of the .travis.yml file it should be saved to.
+     *
+     * @param string $travisYmlContents
+     * @return string Returns the path of the file that was written to.
+     * @throws Exception if the path being written is not writable.
+     */
+    public function dumpTravisYmlContents($travisYmlContents)
+    {
+        $writePath = @$this->options['dump'];
+        if (empty($writePath)) {
+            $writePath = $this->getTravisYmlOutputPath();
+        }
+
+        if (!is_writable(dirname($writePath))) {
+            throw new Exception("Cannot write to '$writePath'!");
+        }
+
+        file_put_contents($writePath, $travisYmlContents);
+
+        return $writePath;
+    }
+
+    /**
+     * Returns the path of the .travis.yml file we are generating. The --dump option has no effect on
+     * this path.
+     */
+    public abstract function getTravisYmlOutputPath();
+
+    protected function configureView()
+    {
+        $thisConsoleCommand = $this->getExecutedConsoleCommandForTravis();
+        $this->view->setGenerateYmlCommand($thisConsoleCommand);
+
+        $phpVersions = @$this->options['php-versions'];
+        if (!empty($phpVersions)) {
+            $this->view->setPhpVersions(explode(',', $phpVersions));
+        }
+
+        $outputYmlPath = $this->getTravisYmlOutputPath();
+        if (file_exists($outputYmlPath)) {
+            $this->log('info', "Found existing YAML file at {path}.", array('path' => $outputYmlPath));
+
+            $parser = new Parser();
+            $existingSections = $parser->processExistingTravisYml($outputYmlPath);
+            $this->view->setExistingSections($existingSections);
+        } else {
+            $this->log('info', "Could not find existing YAML file at {path}, generating a new one.", array('path' => $outputYmlPath));
+        }
+
+        $this->setExtraEnvironmentVariables();
+    }
+
+    protected function travisEncrypt($data)
+    {
+        $this->log('info', "Encrypting \"{data}\"...", array('data' => $data));
+
+        $command = "travis encrypt \"$data\"";
+
+        exec($command, $commandOutput, $returnCode);
+        if ($returnCode !== 0) {
+            throw new Exception("Cannot encrypt \"$data\" for travis! Please make sure you have the travis command line "
+                . "utility installed (see http://blog.travis-ci.com/2013-01-14-new-client/).\n\n"
+                . "return code: $returnCode\n\n"
+                . "travis output:\n\n" . implode("\n", $commandOutput));
+        }
+
+        if (empty($commandOutput)) {
+            throw new Exception("Cannot parse travis encrypt output:\n\n" . implode("\n", $commandOutput));
+        }
+
+        // when not executed from a command line travis encrypt will return only the encrypted data
+        $encryptedData = $commandOutput[0];
+
+        if (substr($encryptedData, 0, 1) != '"'
+            || substr($encryptedData, -1) != '"'
+        ) {
+            $encryptedData = '"' . addslashes($encryptedData) . '"';
+        }
+
+        return "secure: " . $encryptedData;
+    }
+
+    protected function getExecutedConsoleCommandForTravis()
+    {
+        $command = "php ./console " . GenerateTravisYmlFile::COMMAND_NAME;
+
+        $options = $this->getOptionsForSelfReferentialCommand();
+
+        foreach ($options as $name => $value) {
+            if ($value === false
+                || $value === null
+            ) {
+                continue;
+            }
+
+            if ($value === true) {
+                $command .= " --$name";
+            } else if (is_array($value)) {
+                foreach ($value as $arrayValue) {
+                    $command .= " --$name=\"" . addslashes($arrayValue) . "\"";
+                }
+            } else {
+                $command .= " --$name=\"" . addslashes($value) . "\"";
+            }
+        }
+
+        return $command;
+    }
+
+    private function setExtraEnvironmentVariables()
+    {
+        if (!empty($this->view->existingEnv)) {
+            $this->log('info', "Existing .yml file found, ignoring global variables specified on command line.");
+            return;
+        }
+
+        $extraVars = array();
+
+        $artifactsPass = @$this->options['artifacts-pass'];
+        if (!empty($artifactsPass)) {
+            $extraVars[] = $this->travisEncrypt("ARTIFACTS_PASS=" . $artifactsPass);
+        }
+
+        $githubToken = @$this->options['github-token'];
+        if (!empty($githubToken)) {
+            $extraVars[] = $this->travisEncrypt("GITHUB_USER_TOKEN=" . $githubToken);
+        }
+
+        $this->view->setExtraGlobalEnvVars($extraVars);
+    }
+
+    protected function getOptionsForSelfReferentialCommand()
+    {
+        $options = $this->options;
+        unset($options['github-token']);
+        unset($options['artifacts-pass']);
+        unset($options['dump']);
+        return $options;
+    }
+
+    protected function log($level, $message, $params = array())
+    {
+        if ($this->logger) {
+            $this->logger->$level($message, $params);
+        }
+    }
+}
\ No newline at end of file
diff --git a/plugins/TestRunner/TravisYml/Generator/CoreTravisYmlGenerator.php b/plugins/TestRunner/TravisYml/Generator/CoreTravisYmlGenerator.php
new file mode 100644
index 0000000000..9fb549daac
--- /dev/null
+++ b/plugins/TestRunner/TravisYml/Generator/CoreTravisYmlGenerator.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+namespace Piwik\Plugins\TestRunner\TravisYml\Generator;
+
+use Piwik\Plugins\TestRunner\TravisYml\Generator;
+
+class CoreTravisYmlGenerator extends Generator
+{
+    protected function configureView()
+    {
+        parent::configureView();
+
+        $this->view->setGenerationMode('core');
+    }
+
+    public function getTravisYmlOutputPath()
+    {
+        return PIWIK_INCLUDE_PATH . '/.travis.yml';
+    }
+}
\ No newline at end of file
diff --git a/plugins/TestRunner/TravisYml/Generator/PiwikTestsPluginsTravisYmlGenerator.php b/plugins/TestRunner/TravisYml/Generator/PiwikTestsPluginsTravisYmlGenerator.php
new file mode 100644
index 0000000000..c4799aab83
--- /dev/null
+++ b/plugins/TestRunner/TravisYml/Generator/PiwikTestsPluginsTravisYmlGenerator.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+namespace Piwik\Plugins\TestRunner\TravisYml\Generator;
+
+use Exception;
+use Piwik\Plugins\TestRunner\TravisYml\Generator;
+
+class PiwikTestsPluginsTravisYmlGenerator extends Generator
+{
+    /**
+     * @var string
+     */
+    private $repoPath;
+
+    /**
+     * @param string $repoPath
+     * @param string[] $options
+     */
+    public function __construct($repoPath, $options)
+    {
+        parent::__construct($options);
+
+        $this->repoPath = $repoPath;
+    }
+
+    protected function configureView()
+    {
+        parent::configureView();
+
+        $this->view->setGenerationMode('piwik-tests-plugins');
+        $this->view->setTravisShScriptLocation("./travis.sh");
+        $this->view->setPathToCustomTravisStepsFiles($this->getTestsRepoPath() . "/travis");
+        $this->view->setTravisShCwd("\$TRAVIS_BUILD_DIR");
+    }
+
+    public function getTravisYmlOutputPath()
+    {
+        return $this->repoPath . '/.travis.yml';
+    }
+
+    private function getTestsRepoPath()
+    {
+        return dirname($this->getTravisYmlOutputPath());
+    }
+
+    protected function getOptionsForSelfReferentialCommand()
+    {
+        $options = parent::getOptionsForSelfReferentialCommand();
+        $options['piwik-tests-plugins'] = '..'; // make sure --piwik-tests-plugins is used correctly when executed in travis-ci
+        return $options;
+    }
+}
\ No newline at end of file
diff --git a/plugins/TestRunner/TravisYml/Generator/PluginTravisYmlGenerator.php b/plugins/TestRunner/TravisYml/Generator/PluginTravisYmlGenerator.php
new file mode 100644
index 0000000000..d41cd11d26
--- /dev/null
+++ b/plugins/TestRunner/TravisYml/Generator/PluginTravisYmlGenerator.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+namespace Piwik\Plugins\TestRunner\TravisYml\Generator;
+
+use Exception;
+use Piwik\Filesystem;
+use Piwik\Plugins\TestRunner\TravisYml\Generator;
+
+class PluginTravisYmlGenerator extends Generator
+{
+    /**
+     * @var string
+     */
+    private $targetPlugin;
+
+    public function __construct($targetPlugin, $options)
+    {
+        parent::__construct($options);
+
+        $this->targetPlugin = $targetPlugin;
+    }
+
+    protected function travisEncrypt($data)
+    {
+        $cwd = getcwd();
+
+        // change dir to target plugin since plugin will be in its own git repo
+        chdir($this->getPluginRootFolder());
+
+        try {
+            $result = parent::travisEncrypt($data);
+
+            chdir($cwd);
+
+            return $result;
+        } catch (Exception $ex) {
+            chdir($cwd);
+
+            throw $ex;
+        }
+    }
+
+    public function getTravisYmlOutputPath()
+    {
+        return $this->getPluginRootFolder() . "/.travis.yml";
+    }
+
+    public function getPluginRootFolder()
+    {
+        return PIWIK_INCLUDE_PATH . "/plugins/{$this->targetPlugin}";
+    }
+
+    protected function configureView()
+    {
+        parent::configureView();
+
+        $this->view->setGenerationMode('plugin');
+        $this->view->setPlugin($this->targetPlugin);
+        $this->view->setPathToCustomTravisStepsFiles($this->getPluginRootFolder() . "/tests/travis");
+
+        $testsToRun = array();
+        $testsToExclude = array();
+
+        if ($this->isTargetPluginContainsPluginTests()) {
+            $testsToRun[] = array('name' => 'PluginTests',
+                'vars' => "MYSQL_ADAPTER=PDO_MYSQL");
+            $testsToRun[] = array('name' => 'PluginTests',
+                'vars' => "MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=minimum_required_piwik");
+
+            $testsToExclude[] = array('description' => 'execute latest stable tests only w/ PHP 5.5',
+                'php' => '5.3',
+                'env' => 'TEST_SUITE=PluginTests MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=minimum_required_piwik');
+            $testsToExclude[] = array('php' => '5.4',
+                'env' => 'TEST_SUITE=PluginTests MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=minimum_required_piwik');
+        }
+
+        if ($this->isTargetPluginContainsUITests()) {
+            $testsToRun[] = array('name' => 'UITests',
+                'vars' => "MYSQL_ADAPTER=PDO_MYSQL");
+
+            $testsToExclude[] = array('description' => 'execute UI tests only w/ PHP 5.6',
+                'php' => '5.3',
+                'env' => 'TEST_SUITE=UITests MYSQL_ADAPTER=PDO_MYSQL');
+            $testsToExclude[] = array('php' => '5.4',
+                'env' => 'TEST_SUITE=UITests MYSQL_ADAPTER=PDO_MYSQL');
+            $testsToExclude[] = array('php' => '5.5',
+                'env' => 'TEST_SUITE=UITests MYSQL_ADAPTER=PDO_MYSQL');
+        }
+
+        if (empty($testsToRun)) {
+            throw new Exception("No tests to run for this plugin, aborting .travis.yml generation.");
+        }
+
+        $this->view->setTestsToRun($testsToRun);
+        $this->view->setTestsToExclude($testsToExclude);
+    }
+
+    private function isTargetPluginContainsPluginTests()
+    {
+        $pluginPath = $this->getPluginRootFolder();
+        return $this->doesFolderContainPluginTests($pluginPath . "/tests")
+        || $this->doesFolderContainPluginTests($pluginPath . "/Test");
+    }
+
+    private function doesFolderContainPluginTests($folderPath)
+    {
+        $testFiles = Filesystem::globr($folderPath, "*Test.php");
+        return !empty($testFiles);
+    }
+
+    private function isTargetPluginContainsUITests()
+    {
+        $pluginPath = $this->getPluginRootFolder();
+        return $this->doesFolderContainUITests($pluginPath . "/tests")
+        || $this->doesFolderContainUITests($pluginPath . "/Test");
+    }
+
+    private function doesFolderContainUITests($folderPath)
+    {
+        $testFiles = Filesystem::globr($folderPath, "*_spec.js");
+        return !empty($testFiles);
+    }
+}
\ No newline at end of file
diff --git a/plugins/TestRunner/TravisYml/Parser.php b/plugins/TestRunner/TravisYml/Parser.php
new file mode 100644
index 0000000000..7b0fd0e505
--- /dev/null
+++ b/plugins/TestRunner/TravisYml/Parser.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+namespace Piwik\Plugins\TestRunner\TravisYml;
+
+/**
+ * Utility class that will parse a .travis.yml file and return the contents of the
+ * file's root YAML sections.
+ */
+class Parser
+{
+    /**
+     * Parse existing data in a .travis.yml file that should be preserved in the output .travis.yml.
+     * Includes comments.
+     *
+     * @var string $existingYmlPath The path to the existing .travis.yml file.
+     * @return string[]
+     */
+    public function processExistingTravisYml($existingYmlPath)
+    {
+        $result = array();
+
+        $existingYamlText = file_get_contents($existingYmlPath);
+        foreach ($this->getRootSectionsFromYaml($existingYamlText) as $sectionName => $offset) {
+            $section = $this->getRootSectionText($existingYamlText, $offset);
+            $result[$sectionName] = $section;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Extracts the name and offset of all root elements of a YAML document. This method does this by
+     * checking for text that starts at the beginning of a line and ends with a ':'.
+     *
+     * @param string $yamlText The YAML text to search through.
+     * @return array Array mapping string section names with the starting offset of the text in the YAML.
+     */
+    private function getRootSectionsFromYaml($yamlText)
+    {
+        preg_match_all("/^[a-zA-Z_]+:/m", $yamlText, $allMatches, PREG_OFFSET_CAPTURE);
+
+        $result = array();
+
+        foreach ($allMatches[0] as $match) {
+            $matchLength = strlen($match[0]);
+            $sectionName = substr($match[0], 0, $matchLength - 1);
+
+            $result[$sectionName] = $match[1] + $matchLength;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Gets the text of a root YAML element in a YAML doc using the name of the element and the starting
+     * offset of the element's text. This is accomplished by searching for the first line that doesn't
+     * start with whitespace after the given offset and using the text between the given offset and the
+     * line w/o starting whitespace.
+     *
+     * @param string $yamlText The YAML text to search through.
+     * @param int $offset The offset start of the YAML text (does not include the element name and colon, ie
+     *                    the offset is after `'element:'`).
+     * @return string
+     */
+    private function getRootSectionText($yamlText, $offset)
+    {
+        preg_match("/^[^\s]/m", $yamlText, $endMatches, PREG_OFFSET_CAPTURE, $offset);
+
+        $endPos = isset($endMatches[0][1]) ? $endMatches[0][1] : strlen($yamlText);
+
+        return substr($yamlText, $offset, $endPos - $offset);
+    }
+}
\ No newline at end of file
diff --git a/plugins/TestRunner/TravisYml/TravisYmlView.php b/plugins/TestRunner/TravisYml/TravisYmlView.php
new file mode 100644
index 0000000000..de18c4dc32
--- /dev/null
+++ b/plugins/TestRunner/TravisYml/TravisYmlView.php
@@ -0,0 +1,229 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\TestRunner\TravisYml;
+
+use Piwik\View;
+
+/**
+ * View class for the travis.yml.twig template file. Generates the contents for a .travis.yml file.
+ */
+class TravisYmlView extends View
+{
+    /**
+     * The .travis.yml section names that are overwritten by this command.
+     * 
+     * @var string[]
+     */
+    private static $travisYmlSectionNames = array(
+        'php',
+        'services',
+        'language',
+        'script',
+        'before_install',
+        'install',
+        'before_script',
+        'after_script',
+        'after_success'
+    );
+
+    /**
+     * The names of .travis.yml sections that can be extended w/ custom steps by plugins. Twig templates
+     * in the plugins/PluginName/tests/travis directory can be used to insert travis commands at the
+     * beginning or end of a section. For example, before_install.before.yml will add steps
+     * at the beginning of the before_install: section.
+     *
+     * @var string[]
+     */
+    private static $travisYmlExtendableSectionNames = array(
+        'before_install',
+        'install',
+        'before_script',
+        'after_script',
+        'after_success'
+    );
+
+    /**
+     * Constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct("@TestRunner/travis.yml");
+
+        $this->setTestsToRun(array());
+        $this->setTestsToExclude(array());
+        $this->setTravisShScriptLocation("\$PIWIK_ROOT_DIR/tests/travis/travis.sh");
+        $this->setTravisShCwd("tests/PHPUnit");
+    }
+
+    /**
+     * Sets the generation mode. Can be 'core' for generating the core .travis.yml file,
+     * 'plugin' for generating a plugin's .travis.yml file or 'piwik-tests-plugins'
+     * for generating the .travis.yml file for the piwik-tests-plugins repo.
+     *
+     * @param string $mode
+     */
+    public function setGenerationMode($mode)
+    {
+        $this->generationMode = $mode;
+    }
+
+    /**
+     * Sets the name of plugin the generated .travis.yml file is for.
+     *
+     * @param string $pluginName ie, ExamplePlugin, UserLanguage, etc.
+     */
+    public function setPlugin($pluginName)
+    {
+        $this->pluginName = $pluginName;
+    }
+
+    /**
+     * Sets the path where custom travis.yml files should be searched for. The view will load
+     * files in this directory that look like "XXX.before.yml" or "XXX.after.yml" where XXX
+     * is the name of a .travis.yml section (eg, install.before.yml). The view will insert
+     * the contents of these files in the correct positions in the generated output.
+     *
+     * @param string $path A path to a directory.
+     */
+    public function setPathToCustomTravisStepsFiles($path)
+    {
+        $customTravisBuildSteps = array();
+
+        foreach (self::$travisYmlExtendableSectionNames as $name) {
+            $customTravisBuildSteps[$name] = array();
+
+            $beforeStepsTemplate = $this->getPathToCustomTravisStepsFile($path, $name, 'before');
+            if (file_exists($beforeStepsTemplate)) {
+                $customTravisBuildSteps[$name]['before'] = $this->changeIndent(file_get_contents($beforeStepsTemplate), '  ');
+            }
+
+            $afterStepsTemplate = $this->getPathToCustomTravisStepsFile($path, $name, 'after');
+            if (file_exists($afterStepsTemplate)) {
+                $customTravisBuildSteps[$name]['after'] = $this->changeIndent(file_get_contents($afterStepsTemplate), '  ');
+            }
+        }
+
+        $this->customTravisBuildSteps = $customTravisBuildSteps;
+    }
+
+    /**
+     * Set extra global environment variables that should be set in the generated .travis.yml file. The entries
+     * should be whole statements like `"MY_VAR=myvalue"` or `"secure: mysecurevalue"`.
+     *
+     * @param string[] $extraVars
+     */
+    public function setExtraGlobalEnvVars($extraVars)
+    {
+        $this->extraGlobalEnvVars = $extraVars;
+    }
+
+    /**
+     * Sets the self-referential command that will generate the .travis.yml file on travis.
+     *
+     * @param string $consoleCommand ie, `"./console generate:travis-yml ..."`
+     */
+    public function setGenerateYmlCommand($consoleCommand)
+    {
+        $this->consoleCommand = addslashes($consoleCommand);
+    }
+
+    /**
+     * Sets the PHP versions to run tests against in travis.
+     *
+     * @param string[] $phpVersions ie, `array("5.3", "5.4", "5.5")`.
+     */
+    public function setPhpVersions($phpVersions)
+    {
+        $this->phpVersions = $phpVersions;
+    }
+
+    /**
+     * Sets the YAML sections that were found in an existing .travis.yml file and
+     * should be preserved. See {@link $travisYmlSectionNames} for list of sections
+     * that will NOT be preserved.
+     *
+     * @param $existingSections
+     */
+    public function setExistingSections($existingSections)
+    {
+        foreach ($existingSections as $sectionName => $section) {
+            if ($sectionName == 'env') {
+                $this->existingEnv = $section;
+            } else if ($sectionName == 'matrix') {
+                $this->existingMatrix = $section;
+            } else if (!in_array($sectionName, self::$travisYmlSectionNames)) {
+                $this->extraSections .= "\n\n$sectionName:" . $section;
+            }
+        }
+    }
+
+    /**
+     * Sets the test jobs to run.
+     *
+     * @param array $testsToRun Each element must be an array w/ two elements:
+     *
+     *                          **name**: The test suite name (ie, PluginTests, UITests, etc.)
+     *                          **vars**: The environment variables (ie, TEST_AGAINST_CORE=latest_stable)
+     */
+    public function setTestsToRun($testsToRun)
+    {
+        $this->testsToRun = $testsToRun;
+    }
+
+    /**
+     * Sets the tests to exclude.
+     *
+     * @param array $testsToExclude Each element must be an array w/ the following elements:
+     *
+     *                              **php**: The PHP version of the job to exclude.
+     *                              **env**: The environment variables of the job to exclude.
+     *                              **description**: (optional) If supplied, this will be
+     *                                               output as a comment above the excluding
+     *                                               YAML.
+     */
+    public function setTestsToExclude($testsToExclude)
+    {
+        $this->testsToExclude = $testsToExclude;
+    }
+
+    /**
+     * Sets the location of the travis.sh script to use in the .travis.yml file. This
+     * will be the value of the `script:` section.
+     *
+     * @param string $path
+     */
+    public function setTravisShScriptLocation($path)
+    {
+        $this->travisShScriptLocation = $path;
+    }
+
+    /**
+     * Sets the current working directory that the travis.sh script should be using. This
+     * will generate a .travis.yml file that will cd into this directory right before
+     * travis executes the build script.
+     *
+     * @param string $path
+     */
+    public function setTravisShCwd($path)
+    {
+        $this->travisShCwd = $path;
+    }
+
+    private function changeIndent($text, $newIndent)
+    {
+        $text = trim($text);
+
+        return preg_replace("/^\\s*/", $newIndent, $text);
+    }
+
+    private function getPathToCustomTravisStepsFile($rootPath, $sectionName, $type)
+    {
+        return "$rootPath/$sectionName.$type.yml";
+    }
+}
\ No newline at end of file
diff --git a/plugins/TestRunner/TravisYmlView.php b/plugins/TestRunner/TravisYmlView.php
deleted file mode 100644
index 809de91144..0000000000
--- a/plugins/TestRunner/TravisYmlView.php
+++ /dev/null
@@ -1,278 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-
-namespace Piwik\Plugins\TestRunner;
-
-use Piwik\Filesystem;
-use Piwik\View;
-use Exception;
-
-/**
- * View class for the travis.yml.twig template file. Generates the contents for a .travis.yml file.
- */
-class TravisYmlView extends View
-{
-    /**
-     * The .travis.yml section names that are overwritten by this command.
-     * 
-     * @var string[]
-     */
-    private static $travisYmlSectionNames = array(
-        'php',
-        'language',
-        'script',
-        'before_install',
-        'install',
-        'before_script',
-        'after_script',
-        'after_success'
-    );
-
-    /**
-     * The names of .travis.yml sections that can be extended w/ custom steps by plugins. Twig templates
-     * in the plugins/PluginName/tests/travis directory can be used to insert travis commands at the
-     * beginning or end of a section. For example, before_install.before.yml will add steps
-     * at the beginning of the before_install: section.
-     *
-     * @var string[]
-     */
-    private static $travisYmlExtendableSectionNames = array(
-        'before_install',
-        'install',
-        'before_script',
-        'after_script',
-        'after_success'
-    );
-
-    /**
-     * Constructor.
-     */
-    public function __construct()
-    {
-        parent::__construct("@TestRunner/travis.yml");
-    }
-
-    /**
-     * Parse existing data in a .travis.yml file that should be preserved in the output .travis.yml.
-     * Includes comments.
-     * 
-     * @var string $existingYmlPath The path to the existing .travis.yml file.
-     */
-    public function processExistingTravisYml($existingYmlPath)
-    {
-        $existingYamlText = file_get_contents($existingYmlPath);
-        foreach ($this->getRootSectionsFromYaml($existingYamlText) as $sectionName => $offset) {
-            $section = $this->getRootSectionText($existingYamlText, $offset);
-            if ($sectionName == 'env') {
-                $this->existingEnv = $section;
-            } else if ($sectionName == 'matrix') {
-                $this->existingMatrix = $section;
-            } else if (!in_array($sectionName, self::$travisYmlSectionNames)) {
-                $this->extraSections .= "\n\n$sectionName:" . $section;
-            }
-        }
-    }
-
-    /**
-     * Sets the name of plugin the generated .travis.yml file is for.
-     *
-     * @param string $pluginName ie, ExamplePlugin, UserSettings, etc.
-     */
-    public function setPlugin($pluginName)
-    {
-        $this->pluginName = $pluginName;
-
-        $customTravisBuildSteps = array();
-
-        foreach (self::$travisYmlExtendableSectionNames as $name) {
-            $customTravisBuildSteps[$name] = array();
-
-            $beforeStepsTemplate = $this->getPathToCustomTravisStepsFile($name, 'before');
-            if (file_exists($beforeStepsTemplate)) {
-                $customTravisBuildSteps[$name]['before'] = $this->changeIndent(file_get_contents($beforeStepsTemplate), '  ');
-            }
-
-            $afterStepsTemplate = $this->getPathToCustomTravisStepsFile($name, 'after');
-            if (file_exists($afterStepsTemplate)) {
-                $customTravisBuildSteps[$name]['after'] = $this->changeIndent(file_get_contents($afterStepsTemplate), '  ');
-            }
-        }
-
-        $this->customTravisBuildSteps = $customTravisBuildSteps;
-    }
-
-    /**
-     * Set extra global environment variables that should be set in the generated .travis.yml file. The entries
-     * should be whole statements like `"MY_VAR=myvalue"` or `"secure: mysecurevalue"`.
-     *
-     * @param string[] $extraVars
-     */
-    public function setExtraGlobalEnvVars($extraVars)
-    {
-        $this->extraGlobalEnvVars = $extraVars;
-    }
-
-    /**
-     * Sets the self-referential command that will generate the .travis.yml file on travis.
-     *
-     * @param string $consoleCommand ie, `"./console generate:travis-yml ..."`
-     */
-    public function setGenerateYmlCommand($consoleCommand)
-    {
-        $this->consoleCommand = addslashes($consoleCommand);
-    }
-
-    /**
-     * Sets the PHP versions to run tests against in travis.
-     *
-     * @param string[] $phpVersions ie, `array("5.3.3", "5.4", "5.5")`.
-     */
-    public function setPhpVersions($phpVersions)
-    {
-        $this->phpVersions = $phpVersions;
-    }
-
-    /**
-     * Renders the view. See {@link Piwik\View::render()}.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        list($this->testsToRun, $this->testsToExclude) = $this->getTestsToRun();
-
-        return parent::render();
-    }
-
-    /**
-     * Extracts the name and offset of all root elements of a YAML document. This method does this by
-     * checking for text that starts at the beginning of a line and ends with a ':'.
-     *
-     * @param string $yamlText The YAML text to search through.
-     * @return array Array mapping string section names with the starting offset of the text in the YAML.
-     */
-    private function getRootSectionsFromYaml($yamlText)
-    {
-        preg_match_all("/^[a-zA-Z_]+:/m", $yamlText, $allMatches, PREG_OFFSET_CAPTURE);
-
-        $result = array();
-
-        foreach ($allMatches[0] as $match) {
-            $matchLength = strlen($match[0]);
-            $sectionName = substr($match[0], 0, $matchLength - 1);
-
-            $result[$sectionName] = $match[1] + $matchLength;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Gets the text of a root YAML element in a YAML doc using the name of the element and the starting
-     * offset of the element's text. This is accomplished by searching for the first line that doesn't
-     * start with whitespace after the given offset and using the text between the given offset and the
-     * line w/o starting whitespace.
-     *
-     * @param string $yamlText The YAML text to search through.
-     * @param int $offset The offset start of the YAML text (does not include the element name and colon, ie
-     *                    the offset is after `'element:'`).
-     * @return string
-     */
-    private function getRootSectionText($yamlText, $offset)
-    {
-        preg_match("/^[^\s]/m", $yamlText, $endMatches, PREG_OFFSET_CAPTURE, $offset);
-
-        $endPos = isset($endMatches[0][1]) ? $endMatches[0][1] : strlen($yamlText);
-
-        return substr($yamlText, $offset, $endPos - $offset);
-    }
-
-    private function getTestsToRun()
-    {
-        $testsToRun = array();
-        $testsToExclude = array();
-
-        if ($this->isTargetPluginContainsPluginTests()) {
-            $testsToRun[] = array('name' => 'PluginTests',
-                                  'vars' => "MYSQL_ADAPTER=PDO_MYSQL");
-            $testsToRun[] = array('name' => 'PluginTests',
-                                  'vars' => "MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=latest_stable");
-
-            $testsToExclude[] = array('description' => 'execute latest stable tests only w/ PHP 5.5',
-                                      'php' => '5.3.3',
-                                      'env' => 'TEST_SUITE=PluginTests MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=latest_stable');
-            $testsToExclude[] = array('php' => '5.4',
-                                      'env' => 'TEST_SUITE=PluginTests MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=latest_stable');
-        }
-
-        if ($this->isTargetPluginContainsUITests()) {
-            $testsToRun[] = array('name' => 'UITests',
-                                  'vars' => "MYSQL_ADAPTER=PDO_MYSQL");
-
-            $testsToExclude[] = array('description' => 'execute UI tests only w/ PHP 5.6',
-                                      'php' => '5.3.3',
-                                      'env' => 'TEST_SUITE=UITests MYSQL_ADAPTER=PDO_MYSQL');
-            $testsToExclude[] = array('php' => '5.4',
-                                      'env' => 'TEST_SUITE=UITests MYSQL_ADAPTER=PDO_MYSQL');
-            $testsToExclude[] = array('php' => '5.5',
-                                      'env' => 'TEST_SUITE=UITests MYSQL_ADAPTER=PDO_MYSQL');
-        }
-
-        if (!empty($this->pluginName)
-            && empty($testsToRun)
-        ) {
-            throw new Exception("No tests to run for this plugin, aborting .travis.yml generation.");
-        }
-
-        return array($testsToRun, $testsToExclude);
-    }
-
-    private function isTargetPluginContainsPluginTests()
-    {
-        $pluginPath = $this->getPluginRootFolder();
-        return $this->doesFolderContainPluginTests($pluginPath . "/tests")
-            || $this->doesFolderContainPluginTests($pluginPath . "/Test");
-    }
-
-    private function doesFolderContainPluginTests($folderPath)
-    {
-        $testFiles = Filesystem::globr($folderPath, "*Test.php");
-        return !empty($testFiles);
-    }
-
-    private function isTargetPluginContainsUITests()
-    {
-        $pluginPath = $this->getPluginRootFolder();
-        return $this->doesFolderContainUITests($pluginPath . "/tests")
-            || $this->doesFolderContainUITests($pluginPath . "/Test");
-    }
-
-    private function doesFolderContainUITests($folderPath)
-    {
-        $testFiles = Filesystem::globr($folderPath, "*_spec.js");
-        return !empty($testFiles);
-    }
-
-    private function changeIndent($text, $newIndent)
-    {
-        $text = trim($text);
-
-        return preg_replace("/^\\s*/", $newIndent, $text);
-    }
-
-    public function getPluginRootFolder()
-    {
-        return PIWIK_INCLUDE_PATH . "/plugins/{$this->pluginName}";
-    }
-
-    private function getPathToCustomTravisStepsFile($sectionName, $type)
-    {
-        return $this->getPluginRootFolder() . "/tests/travis/$sectionName.$type.yml";
-    }
-}
\ No newline at end of file
diff --git a/plugins/TestRunner/plugin.json b/plugins/TestRunner/plugin.json
index b0f0d8ae1c..f3e5b86ef6 100644
--- a/plugins/TestRunner/plugin.json
+++ b/plugins/TestRunner/plugin.json
@@ -1,19 +1,22 @@
 {
-  "name": "TestRunner",
-  "version": "0.1.0",
-  "description": "Let's you run Piwik tests. Only needed in development.",
-  "theme": false,
-  "require": {
-     "piwik": ">=2.8.1-rc1"
-  },
-  "authors": [
-      {
-          "name": "Piwik",
-          "email": "hello@piwik.org",
-          "homepage": "http://piwik.org"
-      }
-  ],
-  "license": "GPL v3+",
-  "keywords": ["test", "runner"],
-  "homepage": "http://piwik.org"
+    "name": "TestRunner",
+    "version": "0.1.0",
+    "description": "Developer tool that lets you run Piwik automated tests suite. Only needed in development.",
+    "theme": false,
+    "require": {
+        "piwik": ">=2.9.0"
+    },
+    "authors": [
+        {
+            "name": "Piwik",
+            "email": "hello@piwik.org",
+            "homepage": "http:\/\/piwik.org"
+        }
+    ],
+    "license": "GPL v3+",
+    "keywords": [
+        "test",
+        "runner"
+    ],
+    "homepage": "http:\/\/piwik.org"
 }
\ No newline at end of file
diff --git a/plugins/TestRunner/templates/travis.yml.twig b/plugins/TestRunner/templates/travis.yml.twig
index 8623bd8b92..1971674108 100644
--- a/plugins/TestRunner/templates/travis.yml.twig
+++ b/plugins/TestRunner/templates/travis.yml.twig
@@ -1,5 +1,5 @@
 # do not edit this file manually, instead run the generate:travis-yml console command
-{% if pluginName is empty %}
+{% if generationMode == 'core' %}
 # if you are a Piwik core developer, edit this template file to auto generate the .travis.yml: https://github.com/piwik/piwik/blob/master/plugins/TestRunner/templates/travis.yml.twig
 
 # when modifying this file, please consider whether your changes should apply to plugin .travis.yml files. if not, check whether the pluginName twig var is empty,
@@ -14,7 +14,7 @@ language: php
 {% if phpVersions|default is empty %}
 php:
   - 5.6
-  - 5.3.3
+  - 5.3
 #  - hhvm
 {% else %}
 php:
@@ -22,12 +22,15 @@ php:
 {% endfor %}
 {% endif %}
 
+services:
+  - redis-server
+
 # Separate different test suites
 {% if existingEnv|default is empty -%}
 env:
   global:
-    - PLUGIN_NAME={{ pluginName|raw }}
-{% if pluginName is empty %}
+{% if pluginName|default is not empty %}    - PLUGIN_NAME={{ pluginName|raw }}
+{% endif %}{% if generationMode == 'core' %}
     - PIWIK_ROOT_DIR=$TRAVIS_BUILD_DIR
 {% else %}
     - PIWIK_ROOT_DIR=$TRAVIS_BUILD_DIR/piwik
@@ -58,7 +61,7 @@ matrix:
   {{ existingMatrix|trim|raw }}
 {% endif %}
 
-script: $PIWIK_ROOT_DIR/tests/travis/travis.sh
+script: {{ travisShScriptLocation }}
 
 before_install:
 {% if customTravisBuildSteps.before_install.before|default is not empty %}{{ customTravisBuildSteps.before_install.before|raw }}
@@ -75,30 +78,25 @@ install:
 {% if customTravisBuildSteps.install.before|default is not empty %}{{ customTravisBuildSteps.install.before|raw }}
 
 {% endif %}
-{% if pluginName is not empty %}
+{% if generationMode == 'plugin' %}
   # move all contents of current repo (which contains the plugin) to a new directory
   - mkdir $PLUGIN_NAME
   - cp -R !($PLUGIN_NAME) $PLUGIN_NAME
   - cp -R .git/ $PLUGIN_NAME/
   - cp .travis.yml $PLUGIN_NAME
-
+{% endif %}
+{% if generationMode != 'core' %}
   # checkout piwik in the current directory
-  - git clone https://github.com/piwik/piwik.git piwik
+  - git clone -q https://github.com/piwik/piwik.git piwik
   - cd piwik
-  - git fetch --all
-  - | 
-    if [ "$TEST_AGAINST_PIWIK_BRANCH" == "" ]; then
-        if [ "$TEST_AGAINST_CORE" == "latest_stable" ]; then
-            export TEST_AGAINST_PIWIK_BRANCH=$(git describe --tags `git rev-list --tags --max-count=1`)
-            export TEST_AGAINST_PIWIK_BRANCH=`echo $TEST_AGAINST_PIWIK_BRANCH | tr -d ' ' | tr -d '\n'`
-        else
-            export TEST_AGAINST_PIWIK_BRANCH=master
-        fi
-    fi
-  - echo "Testing against '$TEST_AGAINST_PIWIK_BRANCH'"
-  - git checkout "$TEST_AGAINST_PIWIK_BRANCH"
-  - git submodule init
-  - git submodule update || true
+  - git fetch -q --all
+{% else %}
+  - git fetch -q
+{% endif %}
+{% if generationMode == 'plugin' %}
+  - ./tests/travis/checkout_test_against_branch.sh
+  - git submodule init -q
+  - git submodule update -q || true
 
   # move plugin contents to folder in the plugins subdirectory
   - rm -rf plugins/$PLUGIN_NAME
@@ -106,18 +104,15 @@ install:
 
   # copy .coveralls.yml if none exists
   - if [ ! -f ../coveralls.yml ];
-    then cp .coveralls.yml ../coveralls.yml;
+    then cp .coveralls.yml ../coveralls.yml || true;
     fi
+{% endif %}
 
   # make sure travis test scripts are always latest (so in older releases/branches, the latest scripts will still be used)
-  - git checkout master -- ./tests/travis ./plugins/TestRunner
-
+  - git checkout master -q -- ./tests/travis ./plugins/TestRunner || true
+{% if generationMode == 'plugin' %}
   # clone dependent repos
   - ./tests/travis/checkout_dependent_plugins.sh
-{% else %}
-  # make sure travis test scripts are always latest (so in older releases/branches, the latest scripts will still be used)
-  - git fetch
-  - git checkout master -- ./tests/travis ./plugins/TestRunner || true
 {% endif %}
 {% if customTravisBuildSteps.install.after|default is not empty %}
 
@@ -128,12 +123,17 @@ before_script:
 {% if customTravisBuildSteps.before_script.before|default is not empty %}{{ customTravisBuildSteps.before_script.before|raw }}
 
 {% endif %}
+  - ./tests/travis/install_mysql_5.6.sh
+
   - if ([ -z "$TEST_SUITE" ] || [ -n "$PLUGIN_NAME" ]);
     then composer require satooshi/php-coveralls dev-master;
     else
     phpenv config-rm xdebug.ini;
     fi
 
+  # add always_populate_raw_post_data=-1 to php.ini
+  - echo "always_populate_raw_post_data=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+
   - ./tests/travis/configure_git.sh
 
   # print out mysql information
@@ -142,16 +142,14 @@ before_script:
 
   # configure mysql
   - mysql -e "SET GLOBAL sql_mode = 'NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES'" # Travis default
+  # try to avoid mysql has gone away errors
+  - mysql -e "SET GLOBAL wait_timeout = 36000;"
+  - mysql -e "SET GLOBAL max_allowed_packet = 134209536;"
+  - mysql -e "SHOW VARIABLES LIKE 'max_allowed_packet';"
+  - mysql -e "SHOW VARIABLES LIKE 'wait_timeout';"
 
-  # Uncomment to enable sql_mode STRICT_TRANS_TABLES (new default in Mysql 5.6)
-  - mysql -e "SET GLOBAL sql_mode = 'NO_ENGINE_SUBSTITUTION'"
   - mysql -e "SELECT @@sql_mode;"
-  - mysql -e "SHOW GLOBAL VARIABLES;"
-{% if pluginName is empty %}
-
-  # Start UI tests
-  - ./tests/travis/initiate_ui_tests.sh
-{%- endif %}
+  # - mysql -e "SHOW GLOBAL VARIABLES;"
 
   # travis now complains about this failing 9 times out of 10, so removing it. hopefully the random failures it prevented won't come back
   # - travis_retry composer self-update
@@ -161,13 +159,14 @@ before_script:
   # print out more debugging info
   - uname -a
   - date
+  # - php -i
   - php -r "var_dump(gd_info());"
   - mysql -e 'create database piwik_tests;'
 
   # Make sure we use Python 2.6
   - travis_retry sudo add-apt-repository ppa:fkrull/deadsnakes -y
-  - travis_retry sudo apt-get update
-  - travis_retry sudo apt-get install python2.6 python2.6-dev -y --force-yes
+  - travis_retry sudo apt-get update > /dev/null
+  - travis_retry sudo apt-get install python2.6 python2.6-dev -y --force-yes > /dev/null
 
   # Log Analytics works with Python 2.6 or 2.7 but we want to test on 2.6
   - python2.6 --version
@@ -179,7 +178,7 @@ before_script:
   - export GENERATE_TRAVIS_YML_COMMAND="{{ consoleCommand|raw }}"
   - ./tests/travis/autoupdate_travis_yml.sh
 
-  - cd tests/PHPUnit
+  - cd {{ travisShCwd }}
 {% if customTravisBuildSteps.before_script.after|default is not empty %}
 
 {{ customTravisBuildSteps.before_script.after|raw }}
@@ -214,7 +213,7 @@ after_success:
 
 {% endif %}
   - cd $PIWIK_ROOT_DIR
-{% if pluginName is empty %}  - ./tests/travis/generate_docs.sh
+{% if generationMode == 'core' %}  - ./tests/travis/generate_docs.sh
 {% endif %}
 {% if customTravisBuildSteps.after_success.after|default is not empty %}
 
diff --git a/plugins/TestRunner/tests/Integration/TravisYmlViewTest.php b/plugins/TestRunner/tests/Integration/TravisYmlViewTest.php
index eea866f303..89cfe74097 100644
--- a/plugins/TestRunner/tests/Integration/TravisYmlViewTest.php
+++ b/plugins/TestRunner/tests/Integration/TravisYmlViewTest.php
@@ -8,8 +8,8 @@
  */
 namespace Piwik\Plugins\TestRunner\tests\Integration;
 
-use Symfony\Component\Console\Output\ConsoleOutput;
-use Piwik\Plugins\TestRunner\TravisYmlView;
+use Piwik\Plugins\TestRunner\TravisYml\Parser;
+use Piwik\Plugins\TestRunner\TravisYml\TravisYmlView;
 use Piwik\Plugin\Manager as PluginManager;
 use PHPUnit_Framework_TestCase;
 use Spyc; // DeviceDectector requires Spyc
@@ -29,9 +29,15 @@ class TravisYmlViewTest extends PHPUnit_Framework_TestCase
     public function testViewGeneratesCorrectLookingYAML()
     {
         $view = new TravisYmlView();
+        $view->setGenerationMode('plugin');
         $view->setPlugin('ExamplePlugin');
         $view->setExtraGlobalEnvVars(array('secure: artifactspass', 'secure: githubtoken'));
         $view->setGenerateYmlCommand('./console generate:travis-yml \'arg1\' arg2');
+        $view->setPathToCustomTravisStepsFiles(PIWIK_INCLUDE_PATH . '/plugins/ExamplePlugin/tests/travis');
+        $view->setTestsToRun(array(
+            array('name' => "PluginTests", 'vars' => "MYSQL_ADAPTER=PDO_MYSQL"),
+            array('name' => "PluginTests", 'vars' => "MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=latest_stable")
+        ));
         $output = $view->render();
 
         $yaml = Spyc::YAMLLoadString($output);
@@ -58,10 +64,16 @@ class TravisYmlViewTest extends PHPUnit_Framework_TestCase
     public function testViewPreservesCommentsAndEnvVarsIfExistingYml()
     {
         $view = new TravisYmlView();
+        $view->setGenerationMode('plugin');
         $view->setPlugin('ExamplePlugin');
         $view->setExtraGlobalEnvVars(array('secure: artifactspass', 'secure: githubtoken'));
         $view->setGenerateYmlCommand('./console generate:travis-yml arg1 arg2');
-        $view->processExistingTravisYml(PIWIK_INCLUDE_PATH . '/plugins/TestRunner/tests/resources/test.travis.yml');
+        $view->setPathToCustomTravisStepsFiles(PIWIK_INCLUDE_PATH . '/plugins/ExamplePlugin/tests/travis');
+
+        $parser = new Parser();
+        $existingSections = $parser->processExistingTravisYml(PIWIK_INCLUDE_PATH . '/plugins/TestRunner/tests/resources/test.travis.yml');
+        $view->setExistingSections($existingSections);
+
         $output = $view->render();
 
         $yaml = Spyc::YAMLLoadString($output);
@@ -88,8 +100,13 @@ class TravisYmlViewTest extends PHPUnit_Framework_TestCase
     public function testViewGeneratesCorrectLookingYAMLForCore()
     {
         $view = new TravisYmlView();
+        $view->setGenerationMode('core');
+
         // no setPlugin call here signifies generating for core
-        $view->processExistingTravisYml(PIWIK_INCLUDE_PATH . '/.travis.yml');
+        $parser = new Parser();
+        $existingSections = $parser->processExistingTravisYml(PIWIK_INCLUDE_PATH . '/plugins/TestRunner/tests/resources/test.travis.yml');
+        $view->setExistingSections($existingSections);
+
         $view->setExtraGlobalEnvVars(array('secure: artifactspass', 'secure: githubtoken'));
         $view->setGenerateYmlCommand('./console generate:travis-yml \'arg1\' arg2');
         $output = $view->render();
@@ -107,6 +124,7 @@ class TravisYmlViewTest extends PHPUnit_Framework_TestCase
     public function testViewGeneratesCorrectLookingYAMLWhenCustomPhpVersionsUsed()
     {
         $view = new TravisYmlView();
+        $view->setGenerationMode('plugin');
         $view->setPlugin('ExamplePlugin');
         $view->setPhpVersions(array('5.4', '5.6', 'hhvm'));
         $view->setGenerateYmlCommand('./console generate:travis-yml arg1 arg2');
diff --git a/plugins/Transitions/API.php b/plugins/Transitions/API.php
index 32abffdc06..7092fee8f8 100644
--- a/plugins/Transitions/API.php
+++ b/plugins/Transitions/API.php
@@ -24,7 +24,7 @@ use Piwik\Plugins\Actions\Actions;
 use Piwik\Plugins\Actions\ArchivingHelper;
 use Piwik\RankingQuery;
 use Piwik\Segment;
-use Piwik\SegmentExpression;
+use Piwik\Segment\SegmentExpression;
 use Piwik\Site;
 use Piwik\Tracker\Action;
 use Piwik\Tracker\PageUrl;
@@ -523,8 +523,8 @@ class API extends \Piwik\Plugin\API
             if ($visits) {
                 // load details (i.e. subtables)
                 $details = array();
-                if ($idSubTable = $row->getIdSubDataTable()) {
-                    $subTable = Manager::getInstance()->getTable($idSubTable);
+                $subTable = $row->getSubtable();
+                if ($subTable) {
                     foreach ($subTable->getRows() as $subRow) {
                         $details[] = array(
                             'label'     => $subRow->getColumn('label'),
diff --git a/plugins/Transitions/lang/bg.json b/plugins/Transitions/lang/bg.json
index 6eac78d77e..cac4559b09 100644
--- a/plugins/Transitions/lang/bg.json
+++ b/plugins/Transitions/lang/bg.json
@@ -15,7 +15,6 @@
         "LoopsInline": "%s страница се презарежда",
         "NoDataForAction": "Няма информация за %s",
         "OutgoingTraffic": "Изходящ трафик",
-        "PluginDescription": "Доклади за предишни и следващи действия за всяка страница.",
         "ShareOfAllPageviews": "Тази страница има %s разглеждания (от всички %s разглеждания)",
         "ToFollowingPages": "Към вътрешни страници",
         "ToFollowingPagesInline": "%s за вътрешни страници",
diff --git a/plugins/Transitions/lang/ca.json b/plugins/Transitions/lang/ca.json
index 394f4cd16b..0f70fa5fc7 100644
--- a/plugins/Transitions/lang/ca.json
+++ b/plugins/Transitions/lang/ca.json
@@ -16,7 +16,6 @@
         "NoDataForAction": "No hi ha informació per %s",
         "NoDataForActionDetails": "O l'acció no ha estat vista cap vegada durant el període %s o és invàlida.",
         "OutgoingTraffic": "Tràfic surtint",
-        "PluginDescription": "Mostra informació sobra les accions anteriors i següents a una URL.",
         "ShareOfAllPageviews": "Aquesta pàgina ha tingut %s visites (%s de totes les visites)",
         "ToFollowingPages": "A pàgines internes",
         "ToFollowingPagesInline": "%s a pàgines internes",
diff --git a/plugins/Transitions/lang/cs.json b/plugins/Transitions/lang/cs.json
index bc3fa80375..30790aff23 100644
--- a/plugins/Transitions/lang/cs.json
+++ b/plugins/Transitions/lang/cs.json
@@ -16,7 +16,7 @@
         "NoDataForAction": "Pro %s nejsou žádná data",
         "NoDataForActionDetails": "Buď akce neměla za období %s žádné zobrazení stránky, nebo je neplatná.",
         "OutgoingTraffic": "Odchozí provoz",
-        "PluginDescription": "Hlášení o předchozích a následujících akcích pro každou URL stránky.",
+        "PluginDescription": "V novém hlášení přechodů hlásí předchozí a následující akci pro každou URL, je dostupný přes novou ikonu v hlášení akcí.",
         "ShareOfAllPageviews": "Tato stránka měla %s zobrazení (%s všech zobrazení)",
         "ToFollowingPages": "Na interní stránky",
         "ToFollowingPagesInline": "%s na interní stránky",
diff --git a/plugins/Transitions/lang/da.json b/plugins/Transitions/lang/da.json
index a69362278d..53ceb6c2d8 100644
--- a/plugins/Transitions/lang/da.json
+++ b/plugins/Transitions/lang/da.json
@@ -16,7 +16,6 @@
         "NoDataForAction": "Der er ingen data for %s",
         "NoDataForActionDetails": "Enten havde handlingen ingen sidevisninger i perioden %s eller den er ugyldig.",
         "OutgoingTraffic": "Udgående trafik",
-        "PluginDescription": "Rapporter om tidligere og følgende handlinger for hver side URL.",
         "ShareOfAllPageviews": "Denne side havde %s sidevisninger (%s af alle sidevisninger)",
         "ToFollowingPages": "Til interne sider",
         "ToFollowingPagesInline": "%s til interne sider",
diff --git a/plugins/Transitions/lang/de.json b/plugins/Transitions/lang/de.json
index 6978f6f3c9..1377487d87 100644
--- a/plugins/Transitions/lang/de.json
+++ b/plugins/Transitions/lang/de.json
@@ -16,7 +16,7 @@
         "NoDataForAction": "Es sind keine Daten für %s verfügbar",
         "NoDataForActionDetails": "Entweder hatte diese Aktion während des Zeitraums %s keine Seitenansichten oder sie ist ungültig.",
         "OutgoingTraffic": "Ausgehender Verkehr",
-        "PluginDescription": "Berichte über vorherige und nachfolgende Aktionen einer Seiten URL.",
+        "PluginDescription": "Berichte über vergangene und zukünftige Aktionen für jede Seiten-URL in einem neuen Transitions-Bericht, aufrufbar im Aktionen-Bericht über ein neues Icon.",
         "ShareOfAllPageviews": "Diese Seite wurde %s mal angesehen (%s aller Seitenansichten)",
         "ToFollowingPages": "Zu internen Seiten",
         "ToFollowingPagesInline": "%s zu internen Seiten",
diff --git a/plugins/Transitions/lang/el.json b/plugins/Transitions/lang/el.json
index c5c02a4003..86409350c2 100644
--- a/plugins/Transitions/lang/el.json
+++ b/plugins/Transitions/lang/el.json
@@ -16,7 +16,7 @@
         "NoDataForAction": "Δεν υπάρχουν δεδομένα για %s",
         "NoDataForActionDetails": "Είτε η ενέργεια δεν είχε προβολές σελίδας (pageviews) κατά τη διάρκεια της περιόδου %s ή δεν είναι έγκυρη.",
         "OutgoingTraffic": "Εξερχόμενη κίνηση",
-        "PluginDescription": "Αναφορές σχετικά με τις προηγούμενες και επόμενες ενέργειες για κάθε διεύθυνση URL της σελίδας.",
+        "PluginDescription": "Αναφέρει προηγούμενες και επόμενες ενέργειες για κάθε σελίδα στην αναφορά για νέες Μεταβάσεις, διαθέσιμη στις αναφορές Ενεργειών από ένα νέο εικονίδιο.",
         "ShareOfAllPageviews": "Αυτή η σελίδα είχε %s προβολές σελίδων (%s από όλες τις προβολές σελίδων)",
         "ToFollowingPages": "Προς Εσωτερικές Σελίδες",
         "ToFollowingPagesInline": "%s προς εσωτερικές σελίδες",
diff --git a/plugins/Transitions/lang/en.json b/plugins/Transitions/lang/en.json
index b63a65fb16..4e76d5bc54 100644
--- a/plugins/Transitions/lang/en.json
+++ b/plugins/Transitions/lang/en.json
@@ -16,7 +16,7 @@
         "NoDataForAction": "There's no data for %s",
         "NoDataForActionDetails": "Either the action had no pageviews during the period %s or it is invalid.",
         "OutgoingTraffic": "Outgoing traffic",
-        "PluginDescription": "Reports about previous and following actions for each page URL.",
+        "PluginDescription": "Reports previous and following actions for each page URL in a new Transitions report, available in the Actions reports via a new icon.",
         "ShareOfAllPageviews": "This page had %s pageviews (%s of all pageviews)",
         "ToFollowingPages": "To Internal Pages",
         "ToFollowingPagesInline": "%s to internal pages",
diff --git a/plugins/Transitions/lang/es.json b/plugins/Transitions/lang/es.json
index 239600c944..7965102ee7 100644
--- a/plugins/Transitions/lang/es.json
+++ b/plugins/Transitions/lang/es.json
@@ -16,7 +16,6 @@
         "NoDataForAction": "No hay información para %s",
         "NoDataForActionDetails": "O la acción no tuvo vistas de páginas durante el período %s o es inválida.",
         "OutgoingTraffic": "Tráfico saliente",
-        "PluginDescription": "Reportes acerca de las acciones anteriores y posteriores de cada dirección de página de internet.",
         "ShareOfAllPageviews": "Esta página tuvo %s vistas de página (%s de todas las vistas de páginas)",
         "ToFollowingPages": "A páginas internas",
         "ToFollowingPagesInline": "%s a páginas internas",
diff --git a/plugins/Transitions/lang/fa.json b/plugins/Transitions/lang/fa.json
index 3c292d29a0..df91ccd169 100644
--- a/plugins/Transitions/lang/fa.json
+++ b/plugins/Transitions/lang/fa.json
@@ -15,7 +15,6 @@
         "LoopsInline": "%s بارگذاری مجدد صفحه",
         "NoDataForAction": "هیچ داده ای وجود ندارد برای %s",
         "OutgoingTraffic": "ترافیک خروجی",
-        "PluginDescription": "درباره فعالیت های قبلی و پیش روی هر URL صفحه گزارش می دهد.",
         "ShareOfAllPageviews": "این صفحه %s بازدیدازصفحه دارد(%s از تمام بازدیدازصفحه ها)",
         "ToFollowingPages": "به صفحه های داخلی",
         "ToFollowingPagesInline": "%s به صفحه های داخلی",
diff --git a/plugins/Transitions/lang/fi.json b/plugins/Transitions/lang/fi.json
index fd146572a6..01fa2d4235 100644
--- a/plugins/Transitions/lang/fi.json
+++ b/plugins/Transitions/lang/fi.json
@@ -16,7 +16,6 @@
         "NoDataForAction": "%s:lle ei ole tietoja",
         "NoDataForActionDetails": "Joko toiminnolle ei ole tietoja aikavälille %s tai toiminto on virheellinen.",
         "OutgoingTraffic": "Lähtevä liikenne",
-        "PluginDescription": "Raportoi edellisen ja seuraavan toiminnon jokaiselle osoitteelle.",
         "ShareOfAllPageviews": "Tällä sivulla on %s sivunavausta (%s kaikista)",
         "ToFollowingPages": "Sisäisille sivuille",
         "ToFollowingPagesInline": "%s sisäisille sivuille",
diff --git a/plugins/Transitions/lang/fr.json b/plugins/Transitions/lang/fr.json
index 9016b3e128..5d7120c15d 100644
--- a/plugins/Transitions/lang/fr.json
+++ b/plugins/Transitions/lang/fr.json
@@ -16,7 +16,6 @@
         "NoDataForAction": "Il n'y a aucune données pour %s",
         "NoDataForActionDetails": "L'action n'a eu aucune visite de page durant la période %s ou bien elle est invalide.",
         "OutgoingTraffic": "Trafic sortant",
-        "PluginDescription": "Effectue un rapport à propos des actions précédentes et suivantes pour chaque URL de page.",
         "ShareOfAllPageviews": "Cette page a eu %s affichages (%s de tous les affichages)",
         "ToFollowingPages": "Vers des pages internes",
         "ToFollowingPagesInline": "%s vers des pages internes",
diff --git a/plugins/Transitions/lang/hi.json b/plugins/Transitions/lang/hi.json
index b6d4a0560c..c38be90fc5 100644
--- a/plugins/Transitions/lang/hi.json
+++ b/plugins/Transitions/lang/hi.json
@@ -16,7 +16,6 @@
         "NoDataForAction": "%s के लिए कोई डेटा नहीं है",
         "NoDataForActionDetails": "या तो कार्रवाई की अवधि %s के दौरान कोई पेज देखा गया था या यह अवैध है.",
         "OutgoingTraffic": "निवर्तमान यातायात",
-        "PluginDescription": "प्रत्येक पृष्ठ यूआरएल के लिए पिछले और अगले कार्यों के बारे में रिपोर्ट.",
         "ShareOfAllPageviews": "यह पृष्ठ का %s पृष्ठ दृश्य (सभी पृष्ठ दृश्य का %s)किया था",
         "ToFollowingPages": "आंतरिक पृष्ठ",
         "ToFollowingPagesInline": "%s आंतरिक पृष्ठ",
diff --git a/plugins/Transitions/lang/id.json b/plugins/Transitions/lang/id.json
index b39332d680..8a0c64ea45 100644
--- a/plugins/Transitions/lang/id.json
+++ b/plugins/Transitions/lang/id.json
@@ -16,7 +16,6 @@
         "NoDataForAction": "Tidak tersedia data untuk %s",
         "NoDataForActionDetails": "Tidak ada tindakan memiliki tampilan halaman selama periode %s atau ini tidak sahih.",
         "OutgoingTraffic": "Lalu lintas keluar",
-        "PluginDescription": "Laporan tentang tindakan sebelumnya dan berikutnya untuk setiap URL halaman.",
         "ShareOfAllPageviews": "Halaman ini memiliki %s tampilan halaman (%s dari semua tampilan halaman)",
         "ToFollowingPages": "Menuju Halaman Dalam",
         "ToFollowingPagesInline": "%s menuju halaman dalam",
diff --git a/plugins/Transitions/lang/it.json b/plugins/Transitions/lang/it.json
index f34989eb5d..7de5cf9832 100644
--- a/plugins/Transitions/lang/it.json
+++ b/plugins/Transitions/lang/it.json
@@ -16,7 +16,7 @@
         "NoDataForAction": "Non ci sono dati per %s",
         "NoDataForActionDetails": "O l'azione non ha avuto pagine viste durante il periodo di%s o non è valida.",
         "OutgoingTraffic": "Traffico uscente",
-        "PluginDescription": "Rapporti delle azioni precedenti e seguenti per ogni URL pagina.",
+        "PluginDescription": "Restituisce le azioni precedenti e seguenti per ciascun URL di pagina in un nuovo report Transizioni, disponibile tra i report Azioni con una nuova icona.",
         "ShareOfAllPageviews": "Questa pagina ha %s visualizzazioni (%s di tutte le visualizzazioni)",
         "ToFollowingPages": "A Pagine Interne",
         "ToFollowingPagesInline": "%s a pagine interne",
diff --git a/plugins/Transitions/lang/ja.json b/plugins/Transitions/lang/ja.json
index 51505ea372..5763bc3426 100644
--- a/plugins/Transitions/lang/ja.json
+++ b/plugins/Transitions/lang/ja.json
@@ -16,7 +16,6 @@
         "NoDataForAction": "%s に対するデータはありません。",
         "NoDataForActionDetails": "アクションが %s の期間ページビューが無かったか、無効です。",
         "OutgoingTraffic": "送信トラフィック",
-        "PluginDescription": "各ページ URL の前後のアクションについてレポートします。",
         "ShareOfAllPageviews": "このページは、%s ページビューでした ( 全ページビューの %s )",
         "ToFollowingPages": "内部ページへ",
         "ToFollowingPagesInline": "内部ページへの %s",
diff --git a/plugins/Transitions/lang/ko.json b/plugins/Transitions/lang/ko.json
index 6fdb5887ec..468c039e52 100644
--- a/plugins/Transitions/lang/ko.json
+++ b/plugins/Transitions/lang/ko.json
@@ -16,7 +16,6 @@
         "NoDataForAction": "%s 데이터 없음",
         "NoDataForActionDetails": "특정 동작은 %s을 하는 기간 동안 페이지뷰가 일어나지 않거나 유효하지 않습니다.",
         "OutgoingTraffic": "나가는 트래픽",
-        "PluginDescription": "각 페이지 URL에 대한 이전 및 다음 작업에 대한 보고서입니다.",
         "ShareOfAllPageviews": "이 페이지의 페이지뷰 %s (전체 페이지뷰 수 %s)",
         "ToFollowingPages": "내부 페이지로",
         "ToFollowingPagesInline": "%s 내부 페이지",
diff --git a/plugins/Transitions/lang/nb.json b/plugins/Transitions/lang/nb.json
index 3af7aa217d..e56dcf970c 100644
--- a/plugins/Transitions/lang/nb.json
+++ b/plugins/Transitions/lang/nb.json
@@ -1,6 +1,7 @@
 {
     "Transitions": {
         "FromCampaigns": "Fra kampanjer",
+        "FromPreviousPages": "Fra interne sider",
         "FromPreviousPagesInline": "%s fra interne sider",
         "FromPreviousSiteSearches": "Fra interne søk",
         "FromPreviousSiteSearchesInline": "%s fra interne søk",
@@ -9,6 +10,7 @@
         "IncomingTraffic": "Innkommende trafikk",
         "OutgoingTraffic": "Utgående trafikk",
         "ToFollowingPages": "Til interne sider",
+        "ToFollowingPagesInline": "%s til interne sider",
         "ToFollowingSiteSearches": "Interne søk",
         "ToFollowingSiteSearchesInline": "%s interne søk",
         "XOutOfYVisits": "%s (av %s)"
diff --git a/plugins/Transitions/lang/pl.json b/plugins/Transitions/lang/pl.json
index fa4ebe30d0..07eb95002b 100644
--- a/plugins/Transitions/lang/pl.json
+++ b/plugins/Transitions/lang/pl.json
@@ -1,12 +1,16 @@
 {
     "Transitions": {
+        "DirectEntries": "Wejścia Bezpośrednie",
         "ExitsInline": "%s wyjść",
+        "FromCampaigns": "Z Kampanii",
         "FromPreviousSiteSearches": "Z wyszukiwarki wewnętrznej",
         "FromSearchEngines": "Z wyszukiwarek",
         "FromWebsites": "Ze stron",
         "IncomingTraffic": "Ruch przychodzący",
         "LoopsInline": "%s odświeżeń stron",
         "OutgoingTraffic": "Ruch wychodzący",
-        "ToFollowingSiteSearchesInline": "%s wewnętrzne wyszukiwania"
+        "ToFollowingSiteSearches": "Wyszukania Wewnętrzne",
+        "ToFollowingSiteSearchesInline": "%s wewnętrzne wyszukiwania",
+        "XOutOfYVisits": "%s (z %s)"
     }
 }
\ No newline at end of file
diff --git a/plugins/Transitions/lang/pt-br.json b/plugins/Transitions/lang/pt-br.json
index 7ee1f7c62b..dd78e8347c 100644
--- a/plugins/Transitions/lang/pt-br.json
+++ b/plugins/Transitions/lang/pt-br.json
@@ -16,7 +16,6 @@
         "NoDataForAction": "Não há dados para %s",
         "NoDataForActionDetails": "Ou a ação não tinha visualizações de página durante o período de %s ou é inválido.",
         "OutgoingTraffic": "O tráfego de saída",
-        "PluginDescription": "Relatórios sobre as ações anteriores e seguintes para cada URL da página.",
         "ShareOfAllPageviews": "Esta página teve %s exibições (%s de todos as exibições)",
         "ToFollowingPages": "Para páginas internas",
         "ToFollowingPagesInline": "%s para páginas internas",
diff --git a/plugins/Transitions/lang/ro.json b/plugins/Transitions/lang/ro.json
index 29217f8bba..1a8f4d00cb 100644
--- a/plugins/Transitions/lang/ro.json
+++ b/plugins/Transitions/lang/ro.json
@@ -16,7 +16,6 @@
         "NoDataForAction": "Nu este nici o data pentru %s",
         "NoDataForActionDetails": "Fie acțiunea nu a avut nici o afișări de pagină în timpul perioadei%s sau este invalida.",
         "OutgoingTraffic": "traficul de ieșire",
-        "PluginDescription": "Rapoarte cu privire la acțiunile anterioare și următoarele pentru fiecare adresă URL pagină.",
         "ShareOfAllPageviews": "Această pagină a avut vizualizări de %s pagini (%s din toate vizualizări de pagini)",
         "ToFollowingPages": "Catre paginile interne",
         "ToFollowingPagesInline": "%s la pagini interne",
diff --git a/plugins/Transitions/lang/ru.json b/plugins/Transitions/lang/ru.json
index 9d0aea9e09..75ce05c052 100644
--- a/plugins/Transitions/lang/ru.json
+++ b/plugins/Transitions/lang/ru.json
@@ -16,7 +16,6 @@
         "NoDataForAction": "Нет данныз для %s",
         "NoDataForActionDetails": "Не было совершено таких действий %s или они неправильны.",
         "OutgoingTraffic": "Исходящий трафик",
-        "PluginDescription": "Отчеты о предыдущих и последующих действиях для каждой страницы (URL).",
         "ShareOfAllPageviews": "У этой страницы %s просмотров (%s из просмотров всех страниц)",
         "ToFollowingPages": "на внутренние страницы",
         "ToFollowingPagesInline": "%s на внутренние страницы",
diff --git a/plugins/Transitions/lang/sl.json b/plugins/Transitions/lang/sl.json
index c27d740f33..2fb5767b8a 100644
--- a/plugins/Transitions/lang/sl.json
+++ b/plugins/Transitions/lang/sl.json
@@ -8,7 +8,6 @@
         "FromSearchEngines": "S spletnih iskalnikov",
         "NoDataForAction": "Ni podatkov za %s",
         "OutgoingTraffic": "Izhodni promet",
-        "PluginDescription": "Poročila o predhodnih in naslednjih akcijah za vsak URL",
         "ShareOfAllPageviews": "Ta stran je imela %s ogledov strani (%s od vseh ogledov strani)",
         "ToFollowingPages": "Na notranje strani",
         "ToFollowingPagesInline": "%s na notranje strani",
diff --git a/plugins/Transitions/lang/sr.json b/plugins/Transitions/lang/sr.json
index 397c1c262c..18aa94c6b7 100644
--- a/plugins/Transitions/lang/sr.json
+++ b/plugins/Transitions/lang/sr.json
@@ -16,7 +16,6 @@
         "NoDataForAction": "Nema podataka za %s",
         "NoDataForActionDetails": "Ili akcija nema nijedan pregled stranica za dati period %s ili ona nije validna.",
         "OutgoingTraffic": "Odlazni saobraćaj",
-        "PluginDescription": "Izveštaj o prethodnim i narednim akcijama za svaki URL.",
         "ShareOfAllPageviews": "Ova stranica ima %s pregleda (%s od svih pregleda)",
         "ToFollowingPages": "Ka internim stranicama",
         "ToFollowingPagesInline": "%s ka drugim stranicama",
diff --git a/plugins/Transitions/lang/sv.json b/plugins/Transitions/lang/sv.json
index 46a35d1e97..9cc3c25f13 100644
--- a/plugins/Transitions/lang/sv.json
+++ b/plugins/Transitions/lang/sv.json
@@ -16,7 +16,6 @@
         "NoDataForAction": "Det finns inga data för %s",
         "NoDataForActionDetails": "Antingen har händelsen inte haft några sidvisningar under persioden %s eller så är den ogiltig.",
         "OutgoingTraffic": "Utgående trafik",
-        "PluginDescription": "Rapporterar om tidigare och efterföljande händelser för varje sidas URL.",
         "ShareOfAllPageviews": "Den här sidan hade %s sidvisningar (%s av alla sidvisningar)",
         "ToFollowingPages": "Till interna sidor",
         "ToFollowingPagesInline": "%s till interna sidor",
diff --git a/plugins/Transitions/lang/tl.json b/plugins/Transitions/lang/tl.json
index 0c5f85778d..de57b8ea32 100644
--- a/plugins/Transitions/lang/tl.json
+++ b/plugins/Transitions/lang/tl.json
@@ -16,7 +16,6 @@
         "NoDataForAction": "Walang data para sa %s",
         "NoDataForActionDetails": "Maaaring ang aksyon ay walang pageview sa panahon ng %s o ito ay hindi wasto.",
         "OutgoingTraffic": "Mga outgoing na traffic",
-        "PluginDescription": "Mga ulat tungkol sa nakaraan at sumusunod na aksyon para sa bawat page URL.",
         "ShareOfAllPageviews": "Ang pahinang ito ay may %s na pageview (%s ng lahat ng mga pageview)",
         "ToFollowingPages": "Sa mga panloob na mga pahina",
         "ToFollowingPagesInline": "%s panloob na mga pahina",
diff --git a/plugins/Transitions/lang/vi.json b/plugins/Transitions/lang/vi.json
index 760500be2b..484c864088 100644
--- a/plugins/Transitions/lang/vi.json
+++ b/plugins/Transitions/lang/vi.json
@@ -16,7 +16,6 @@
         "NoDataForAction": "Không có dữ liệu cho %s",
         "NoDataForActionDetails": "Hay là hành động không có lượt xem trang trong thời gian %s hoặc không hợp lệ.",
         "OutgoingTraffic": "Lưu lượng truy cập đi",
-        "PluginDescription": "Báo cáo về các hoạt động trước và sau cho mỗi URL trang.",
         "ShareOfAllPageviews": "Trang này đã có %s lượt xem trang (%s của tất cả các lượt xem trang)",
         "ToFollowingPages": "Tới các trang nội bộ",
         "ToFollowingPagesInline": "%s tới các trang nội bộ",
diff --git a/plugins/Transitions/lang/zh-cn.json b/plugins/Transitions/lang/zh-cn.json
index 1785aa9d93..6c9061118e 100644
--- a/plugins/Transitions/lang/zh-cn.json
+++ b/plugins/Transitions/lang/zh-cn.json
@@ -16,7 +16,6 @@
         "NoDataForAction": "没有 %s 数据",
         "NoDataForActionDetails": "本活动在 %s 期间没有被访问过或者不正确。",
         "OutgoingTraffic": "出口流量",
-        "PluginDescription": "本报表显示每个页面网址之前和之后的活动。",
         "ShareOfAllPageviews": "本页面被访问 %s 次 (总访问量的 %s)",
         "ToFollowingPages": "转向站内页面",
         "ToFollowingPagesInline": "%s 次转向站内页面",
diff --git a/plugins/TreemapVisualization b/plugins/TreemapVisualization
-Subproject 97682657c5e296a7d631d274caa749348595b21
+Subproject 5dbb90f027b6d214aebfa4f222975d32e99d783
diff --git a/plugins/UserCountry/API.php b/plugins/UserCountry/API.php
index 4e17fb6767..38408b39e6 100644
--- a/plugins/UserCountry/API.php
+++ b/plugins/UserCountry/API.php
@@ -32,6 +32,7 @@ class API extends \Piwik\Plugin\API
         $dataTable = $this->getDataTable(Archiver::COUNTRY_RECORD_NAME, $idSite, $period, $date, $segment);
 
         // apply filter on the whole datatable in order the inline search to work (searches are done on "beautiful" label)
+        $dataTable->filter('AddSegmentValue');
         $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'code'));
         $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getFlagFromCode'));
         $dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\countryTranslate'));
@@ -68,6 +69,9 @@ class API extends \Piwik\Plugin\API
     {
         $dataTable = $this->getDataTable(Archiver::REGION_RECORD_NAME, $idSite, $period, $date, $segment);
 
+        $segments = array('regionCode', 'countryCode');
+        $dataTable->filter('AddSegmentByLabel', array($segments, Archiver::LOCATION_SEPARATOR));
+
         $separator = Archiver::LOCATION_SEPARATOR;
         $unk = Visit::UNKNOWN_CODE;
 
@@ -110,6 +114,9 @@ class API extends \Piwik\Plugin\API
     {
         $dataTable = $this->getDataTable(Archiver::CITY_RECORD_NAME, $idSite, $period, $date, $segment);
 
+        $segments = array('city', 'regionCode', 'countryCode');
+        $dataTable->filter('AddSegmentByLabel', array($segments, Archiver::LOCATION_SEPARATOR));
+
         $separator = Archiver::LOCATION_SEPARATOR;
         $unk = Visit::UNKNOWN_CODE;
 
diff --git a/plugins/UserCountry/Columns/Country.php b/plugins/UserCountry/Columns/Country.php
index 31e2839a54..db8026ba6b 100644
--- a/plugins/UserCountry/Columns/Country.php
+++ b/plugins/UserCountry/Columns/Country.php
@@ -10,6 +10,8 @@ namespace Piwik\Plugins\UserCountry\Columns;
 
 use Piwik\Common;
 use Piwik\Config;
+use Piwik\Container\StaticContainer;
+use Piwik\Intl\Data\Provider\RegionDataProvider;
 use Piwik\IP;
 use Piwik\Piwik;
 use Piwik\Plugin\Manager;
@@ -92,7 +94,10 @@ class Country extends Base
             $hostnameDomain = 'gb';
         }
 
-        if (array_key_exists($hostnameDomain, Common::getCountriesList())) {
+        /** @var RegionDataProvider $regionDataProvider */
+        $regionDataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\RegionDataProvider');
+
+        if (array_key_exists($hostnameDomain, $regionDataProvider->getCountryList())) {
             return $hostnameDomain;
         }
 
diff --git a/plugins/UserCountry/GeoIPAutoUpdater.php b/plugins/UserCountry/GeoIPAutoUpdater.php
index b76f347413..aba1d5d263 100755
--- a/plugins/UserCountry/GeoIPAutoUpdater.php
+++ b/plugins/UserCountry/GeoIPAutoUpdater.php
@@ -12,6 +12,7 @@ require_once PIWIK_INCLUDE_PATH . "/core/ScheduledTask.php"; // for the tracker
 
 use Exception;
 use Piwik\Common;
+use Piwik\Container\StaticContainer;
 use Piwik\Date;
 use Piwik\Http;
 use Piwik\Log;
@@ -20,18 +21,18 @@ use Piwik\Piwik;
 use Piwik\Plugins\UserCountry\LocationProvider\GeoIp\Php;
 use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
 use Piwik\Plugins\UserCountry\LocationProvider;
-use Piwik\ScheduledTask;
-use Piwik\ScheduledTaskTimetable;
-use Piwik\ScheduledTime\Monthly;
-use Piwik\ScheduledTime\Weekly;
-use Piwik\TaskScheduler;
+use Piwik\Scheduler\Scheduler;
+use Piwik\Scheduler\Task;
+use Piwik\Scheduler\Timetable;
+use Piwik\Scheduler\Schedule\Monthly;
+use Piwik\Scheduler\Schedule\Weekly;
 use Piwik\Unzip;
 
 /**
  * Used to automatically update installed GeoIP databases, and manages the updater's
  * scheduled task.
  */
-class GeoIPAutoUpdater extends ScheduledTask
+class GeoIPAutoUpdater extends Task
 {
     const SCHEDULE_PERIOD_MONTHLY = 'month';
     const SCHEDULE_PERIOD_WEEKLY = 'week';
@@ -78,7 +79,7 @@ class GeoIPAutoUpdater extends ScheduledTask
                 break;
         }
 
-        parent::__construct($this, 'update', null, $schedulePeriod, ScheduledTask::LOWEST_PRIORITY);
+        parent::__construct($this, 'update', null, $schedulePeriod, Task::LOWEST_PRIORITY);
     }
 
     /**
@@ -346,7 +347,10 @@ class GeoIPAutoUpdater extends ScheduledTask
 
             Option::set(self::SCHEDULE_PERIOD_OPTION_NAME, $period);
 
-            TaskScheduler::rescheduleTask(new GeoIPAutoUpdater());
+            /** @var Scheduler $scheduler */
+            $scheduler = StaticContainer::getContainer()->get('Piwik\Scheduler\Scheduler');
+
+            $scheduler->rescheduleTask(new GeoIPAutoUpdater());
         }
     }
 
@@ -636,12 +640,12 @@ class GeoIPAutoUpdater extends ScheduledTask
     {
         $task = new GeoIPAutoUpdater();
 
-        $timetable = new ScheduledTaskTimetable();
+        $timetable = new Timetable();
         return $timetable->getScheduledTaskTime($task->getName());
     }
 
     /**
-     * See {@link Piwik\ScheduledTime::getRescheduledTime()}.
+     * See {@link Piwik\Scheduler\Schedule\Schedule::getRescheduledTime()}.
      */
     public function getRescheduledTime()
     {
diff --git a/plugins/UserCountry/Menu.php b/plugins/UserCountry/Menu.php
index 9305ab23fa..fa90e258db 100644
--- a/plugins/UserCountry/Menu.php
+++ b/plugins/UserCountry/Menu.php
@@ -19,7 +19,7 @@ class Menu extends \Piwik\Plugin\Menu
         if (UserCountry::isGeoLocationAdminEnabled() && Piwik::hasUserSuperUserAccess()) {
             $menu->addSettingsItem('UserCountry_Geolocation',
                                    $this->urlForAction('adminIndex'),
-                                   $order = 8);
+                                   $order = 9);
         }
     }
 
diff --git a/plugins/UserCountry/UserCountry.php b/plugins/UserCountry/UserCountry.php
index 960e966093..d28e6ce601 100644
--- a/plugins/UserCountry/UserCountry.php
+++ b/plugins/UserCountry/UserCountry.php
@@ -11,6 +11,8 @@ namespace Piwik\Plugins\UserCountry;
 use Piwik\ArchiveProcessor;
 use Piwik\Common;
 use Piwik\Config;
+use Piwik\Container\StaticContainer;
+use Piwik\Intl\Data\Provider\RegionDataProvider;
 use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
 use Piwik\Plugins\UserCountry\LocationProvider;
 use Piwik\Url;
@@ -85,9 +87,12 @@ class UserCountry extends \Piwik\Plugin
      */
     public static function getCountriesForContinent($continent)
     {
+        /** @var RegionDataProvider $regionDataProvider */
+        $regionDataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\RegionDataProvider');
+
         $result = array();
         $continent = strtolower($continent);
-        foreach (Common::getCountriesList() as $countryCode => $continentCode) {
+        foreach ($regionDataProvider->getCountryList() as $countryCode => $continentCode) {
             if ($continent == $continentCode) {
                 $result[] = $countryCode;
             }
diff --git a/plugins/UserCountry/lang/ar.json b/plugins/UserCountry/lang/ar.json
index 935fff9595..b464ce374a 100644
--- a/plugins/UserCountry/lang/ar.json
+++ b/plugins/UserCountry/lang/ar.json
@@ -284,7 +284,6 @@
         "country_zw": "زيمبابوي",
         "DistinctCountries": "%s دولة بارزة",
         "Location": "المكان",
-        "PluginDescription": "تقارير دول الزوار",
         "SubmenuLocations": "الأماكن"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserCountry/lang/be.json b/plugins/UserCountry/lang/be.json
index 5ccd56ca29..321fe3b5bf 100644
--- a/plugins/UserCountry/lang/be.json
+++ b/plugins/UserCountry/lang/be.json
@@ -284,7 +284,6 @@
         "country_zw": "Зімбабвэ",
         "DistinctCountries": "%s унікальных краін",
         "Location": "Лакаця",
-        "PluginDescription": "Справаздачы краін наведвальнікаў.",
         "SubmenuLocations": "Лакацыі"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserCountry/lang/bg.json b/plugins/UserCountry/lang/bg.json
index c58276cd87..fc276f5aee 100644
--- a/plugins/UserCountry/lang/bg.json
+++ b/plugins/UserCountry/lang/bg.json
@@ -346,7 +346,6 @@
         "Organization": "Организация",
         "OrgDatabase": "Организация на базата данни",
         "PiwikNotManagingGeoIPDBs": "Piwik в момента не се управлява от никакви GeoIP база данни.",
-        "PluginDescription": "Доклад за Държавите на Вашите посетители.",
         "Region": "Регион",
         "SetupAutomaticUpdatesOfGeoIP": "Настройка за автоматични актуализации на GeoIP бази данни",
         "SubmenuLocations": "Местонахождение",
diff --git a/plugins/UserCountry/lang/ca.json b/plugins/UserCountry/lang/ca.json
index 9e68ac7ac1..4984f8b847 100644
--- a/plugins/UserCountry/lang/ca.json
+++ b/plugins/UserCountry/lang/ca.json
@@ -351,7 +351,6 @@
         "PeclGeoIPNoDBDir": "El mòdul de PECL està cercant la base de dades a %1$s, però aquest directori no existeix. Sisplau, creu-lo i afegiu bases de dades de Geolocalització allí. Alternativament, podeu modificar el paràmetre %2$s del vostre fitxer php.ini per utilizar el directori correcte.",
         "PeclGeoLiteError": "La vostra base de dades de Geocalització es troba a %1$s amb el nom %2$s. Desafortunadament, el mòdul PECL no la pot reconèixer amb aquest nom. Sisuaplau, renombreu-la a %3$s.",
         "PiwikNotManagingGeoIPDBs": "El Piwik actualment no gestiona cap base de dades de Geolocalització",
-        "PluginDescription": "El informes que contenen informació sobra la localització (pais, regió, ciutat i coordenades geogràfiques (latitud\/longitud)",
         "Region": "Regió",
         "SetupAutomaticUpdatesOfGeoIP": "Configureu les actualitzacions automàtiques de les bases de Dades de Geolocalització.",
         "SubmenuLocations": "Localització",
diff --git a/plugins/UserCountry/lang/cs.json b/plugins/UserCountry/lang/cs.json
index 76906aa1ff..ec8c6fa57e 100644
--- a/plugins/UserCountry/lang/cs.json
+++ b/plugins/UserCountry/lang/cs.json
@@ -356,7 +356,7 @@
         "PeclGeoIPNoDBDir": "PECl modul hledá geoIP databáze v adresáři %1$s, ale ten neexistuje. Vytvořte ho a umístěte do něho databáze, nebo nastavte php.ini možnost %2$s na správný adresář.",
         "PeclGeoLiteError": "Vaše GeoIP databáze v adresáři %1$s je pojmenována %2$s. Bohužel, PECl modul ji pod tímto názvem nenajde. Přejmenujte ji na %3$s.",
         "PiwikNotManagingGeoIPDBs": "Piwik aktuálně nespravuje žádné GeoIP databáze.",
-        "PluginDescription": "Zobrazí státy návštěvníků",
+        "PluginDescription": "Hlásí umístění vašich návštěvníků: zemi, oblast, město a geografické koordináty (šířku\/délku).",
         "Region": "Region",
         "SetupAutomaticUpdatesOfGeoIP": "Nastavit automatické aktualizace GeoIP databází",
         "SubmenuLocations": "Umístění",
diff --git a/plugins/UserCountry/lang/da.json b/plugins/UserCountry/lang/da.json
index 164a957797..8cfa2313a1 100644
--- a/plugins/UserCountry/lang/da.json
+++ b/plugins/UserCountry/lang/da.json
@@ -356,7 +356,6 @@
         "PeclGeoIPNoDBDir": "PECL-modulet søger efter databaser i %1$s, men denne mappe eksisterer ikke. Opret mappen og tilføj GeoIP databasen. Alternativt kan du indstille %2$s til den rigtige mappe i din php.ini fil.",
         "PeclGeoLiteError": "GeoIP database i %1$s hedder %2$s. Desværre kan PECL modulet ikke genkende den med dette navn. Omdøb den til %3$s.",
         "PiwikNotManagingGeoIPDBs": "Piwik styrer pt. ikke nogle GeoIP databaser.",
-        "PluginDescription": "Rapporter besøgendes land.",
         "Region": "Region",
         "SetupAutomaticUpdatesOfGeoIP": "Konfigurer automatiske opdateringer af GeoIP databaser",
         "SubmenuLocations": "Steder",
diff --git a/plugins/UserCountry/lang/de.json b/plugins/UserCountry/lang/de.json
index 3ac89c502c..5ff5b11fb8 100644
--- a/plugins/UserCountry/lang/de.json
+++ b/plugins/UserCountry/lang/de.json
@@ -356,7 +356,7 @@
         "PeclGeoIPNoDBDir": "Das PECL Modul hat im Verzeichnis %1$s keine Datenbank gefunden. Bitte erstellen Sie das Verzeichnis und fügen die GeoIP Datenbanken hinzu. Alternativ ist es möglich %2$s auf das richtige Verzeichnis in der php.ini zu konfigurieren.",
         "PeclGeoLiteError": "Ihre GeoIP Datenbank in %1$s lautet %2$s. Allerdings kann das PECL Modul die Datenbank mit diesem Namen nicht erkennen. Bitte benennen Sie sie um in %3$s.",
         "PiwikNotManagingGeoIPDBs": "Piwik verwaltet derzeit keine GeoIP Datenbanken.",
-        "PluginDescription": "Erfasst das Herkunftsland Ihrer Besucher.",
+        "PluginDescription": "Bericht über den Standort Ihrer Besucher: Land, Region, Stadt und geographische Koordinaten (geographische Breite und geographische Länge).",
         "Region": "Region",
         "SetupAutomaticUpdatesOfGeoIP": "Automatische Aktualisierungen für GeoIP Datenbanken einrichten",
         "SubmenuLocations": "Orte",
diff --git a/plugins/UserCountry/lang/el.json b/plugins/UserCountry/lang/el.json
index a509832f92..2290f03932 100644
--- a/plugins/UserCountry/lang/el.json
+++ b/plugins/UserCountry/lang/el.json
@@ -356,7 +356,7 @@
         "PeclGeoIPNoDBDir": "Η μονάδα PECL ψάχνει για βάσεις δεδομένων στο %1$s, αλλά αυτός ο κατάλογος δεν υπάρχει. Παρακαλούμε δημιουργήστε τον και προσθέστε τις GeoIP βάσεις δεδομένων μέσα. Εναλλακτικά, μπορείτε να ορίσετε το %2$s στο σωστό κατάλογο στο αρχείο σας php.ini.",
         "PeclGeoLiteError": "Η βάση δεδομένων σας με γεωτοποθεσία στο %1$s ονομάζεται %2$s. Δυστυχώς, η μονάδα PECL δε θα την αναγνωρίσει με αυτό το όνομα. Παρακαλούμε μετονομάστε την σε %3$s.",
         "PiwikNotManagingGeoIPDBs": "Το Piwik δεν διαχειρίζεται καμιά βάση δεδομένων GeoIP.",
-        "PluginDescription": "Αναφέρει τη Χώρα των επισκεπτών.",
+        "PluginDescription": "Αναφέρει τον τοποθεσία των επισκεπτών σας: χώρα, περιοχή, πόλη και γεωγραφικές συντεταγμένες (πλάτος\/μήκος).",
         "Region": "Περιοχή",
         "SetupAutomaticUpdatesOfGeoIP": "Εγκατάσταση αυτόματων ενημερώσεων των βάσεων δεδομένων GeoIP",
         "SubmenuLocations": "Τοποθεσίες",
diff --git a/plugins/UserCountry/lang/en.json b/plugins/UserCountry/lang/en.json
index 96c2452456..90b2ca7e7c 100644
--- a/plugins/UserCountry/lang/en.json
+++ b/plugins/UserCountry/lang/en.json
@@ -356,7 +356,7 @@
         "PeclGeoIPNoDBDir": "The PECL module is looking for databases in %1$s, but this directory does not exist. Please create it and add the GeoIP databases to it. Alternatively, you can set %2$s to the correct directory in your php.ini file.",
         "PeclGeoLiteError": "Your GeoIP database in %1$s is named %2$s. Unfortunately, the PECL module will not recognize it with this name. Please rename it to %3$s.",
         "PiwikNotManagingGeoIPDBs": "Piwik is not currently managing any GeoIP databases.",
-        "PluginDescription": "Reports information regarding visitor location, including country, region, city and geographic coordinates (latitude\/longitude).",
+        "PluginDescription": "Reports the location of your visitors: country, region, city and geographic coordinates (latitude\/longitude).",
         "Region": "Region",
         "SetupAutomaticUpdatesOfGeoIP": "Setup automatic updates of GeoIP databases",
         "SubmenuLocations": "Locations",
diff --git a/plugins/UserCountry/lang/es.json b/plugins/UserCountry/lang/es.json
index 0bdee0dec3..7744df35d6 100644
--- a/plugins/UserCountry/lang/es.json
+++ b/plugins/UserCountry/lang/es.json
@@ -356,7 +356,6 @@
         "PeclGeoIPNoDBDir": "El módulo PECL está buscando base de datos en %1$s, pero esta carpeta no existe. Por favor, créela y agreguéle una base de datos GeoIP a la misma. Alternativamente, puede disponer %2$s una determinada carpeta en su archivo php.ini",
         "PeclGeoLiteError": "Su base de datos GeoIP en %1$s está nombrada %2$s. Desafortunadamente, el módulo PECL no la reconocerá con dicho nombre. Por favor, renómbrela a %3$s.",
         "PiwikNotManagingGeoIPDBs": "Piwik no está actualmente administrando ninguna base de datos GeoIP.",
-        "PluginDescription": "Reporta el País de tus visitantes.",
         "Region": "Región",
         "SetupAutomaticUpdatesOfGeoIP": "Configurar actualizaciones automáticas de sus base de datos GeoIP",
         "SubmenuLocations": "Localizaciones",
diff --git a/plugins/UserCountry/lang/fa.json b/plugins/UserCountry/lang/fa.json
index 07a3e46c0c..b1538dac7a 100644
--- a/plugins/UserCountry/lang/fa.json
+++ b/plugins/UserCountry/lang/fa.json
@@ -317,7 +317,6 @@
         "NoDataForGeoIPReport1": "هیچ اطلاعاتی ای برای این گزارش وجود ندارد زیرا اطلاعاتی درباره مکان بازدید کننده ها یا آی پی آن ها نمی توان بدست آورد.",
         "Organization": "سازمان",
         "OrgDatabase": "پایگاه داده ی سازمان",
-        "PluginDescription": "گزارش کشور بازدیدکننده ها",
         "Region": "منطقه",
         "SubmenuLocations": "موقعیت ها",
         "ToGeolocateOldVisits": "برای اینکه اطلاعات مکان بازدیدهای پیشین تان را بدست آورید ، اسکریپتی که %1$s اینجا %2$s توضیح داده شده را به کار ببرید.",
diff --git a/plugins/UserCountry/lang/fi.json b/plugins/UserCountry/lang/fi.json
index 1ed0f24155..4b0e11ab47 100644
--- a/plugins/UserCountry/lang/fi.json
+++ b/plugins/UserCountry/lang/fi.json
@@ -356,7 +356,6 @@
         "PeclGeoIPNoDBDir": "PECL-moduuli etsii tietokantoja %1$s:ssa, mutta tätä hakemistoa ei ole olemassa. Luo se ja lisää GeoIP tietokannat siihen. Vaihtoehtoisesti voit asentaa %2$s:n oikeaan hakemistoon php.ini tiedostossasi.",
         "PeclGeoLiteError": "%1$s:ssa sijaitsevan GeoIP tietokantasi nimi on %2$s. Valitettavasti PECL-moduuli ei tunnista sitä tällä nimellä. Ole hyvä ja anna sille nimi %3$s.",
         "PiwikNotManagingGeoIPDBs": "Piwik ei käytä tällä hetkellä mitään GeoIP tietokantoja.",
-        "PluginDescription": "Raportoi käyttäjien maat.",
         "Region": "Alue",
         "SetupAutomaticUpdatesOfGeoIP": "Asenna automaattiset GeoIP tietokantojen päivitykset",
         "SubmenuLocations": "Sijainnit",
diff --git a/plugins/UserCountry/lang/fr.json b/plugins/UserCountry/lang/fr.json
index 08b7ae2d3a..6ebdd279c1 100644
--- a/plugins/UserCountry/lang/fr.json
+++ b/plugins/UserCountry/lang/fr.json
@@ -356,7 +356,6 @@
         "PeclGeoIPNoDBDir": "Le module PECL s'attend à trouver les bases de données dans %1$s, mais ce répertoire n'existe pas. Veuillez le créer et ajoutez-y les bases de données GéoIP. Autrement vous pouvez paramétrer %2$s pour corriger le répertoire dans votre fichier php.ini.",
         "PeclGeoLiteError": "Votre base de données GeoIP dans %1$s est nommée %2$s. Malheureusement, le module PECL ne la reconnaitra pas avec ce nom. Veuillez la renommer %3$s.",
         "PiwikNotManagingGeoIPDBs": "Piwik ne gère actuellement aucune base de données GeoIP.",
-        "PluginDescription": "Effectue des rapports sur les pays des visiteurs.",
         "Region": "Région",
         "SetupAutomaticUpdatesOfGeoIP": "Configurer les mises à jour automatiques des bases de données GeoIP",
         "SubmenuLocations": "Provenances géographiques",
diff --git a/plugins/UserCountry/lang/hi.json b/plugins/UserCountry/lang/hi.json
index 3d473910f7..501058f4f1 100644
--- a/plugins/UserCountry/lang/hi.json
+++ b/plugins/UserCountry/lang/hi.json
@@ -347,7 +347,6 @@
         "Organization": "संगठन",
         "OrgDatabase": "संगठन डाटाबेस",
         "PiwikNotManagingGeoIPDBs": "Piwik वर्तमान में किसी भी GeoIP डेटाबेस के प्रबंध नहीं है.",
-        "PluginDescription": "देश, क्षेत्र, शहर के और भौगोलिक निर्देशांक (अक्षांश \/ देशांतर) सहित आगंतुक स्थान के बारे में रिपोर्टें जानकारी,.",
         "Region": "क्षेत्र",
         "SetupAutomaticUpdatesOfGeoIP": "GeoIP डेटाबेस के स्वचालित अपडेट सेटअप",
         "SubmenuLocations": "स्थान",
diff --git a/plugins/UserCountry/lang/hu.json b/plugins/UserCountry/lang/hu.json
index 153cdbbc91..d8090f7b9c 100644
--- a/plugins/UserCountry/lang/hu.json
+++ b/plugins/UserCountry/lang/hu.json
@@ -284,7 +284,6 @@
         "country_zw": "Zimbabwe",
         "DistinctCountries": "%s különböző ország",
         "Location": "Hely",
-        "PluginDescription": "A látogatók származási országáról készít jelentéseket.",
         "SubmenuLocations": "Helyek"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserCountry/lang/id.json b/plugins/UserCountry/lang/id.json
index 5991ea3405..acffd6df46 100644
--- a/plugins/UserCountry/lang/id.json
+++ b/plugins/UserCountry/lang/id.json
@@ -351,7 +351,6 @@
         "PeclGeoIPNoDBDir": "Modul PECL sedang mencari basisdata di %1$s, tapi direktori ini tidak tersedia. Harap memperbaiki ini dan menambah basisdata GeoIP di dalamnya. Atau Anda dapat mengatur %2$s ke direktori yang sesuai dalam berkas php.ini Anda.",
         "PeclGeoLiteError": "Basisdata GeoIP Anda di %1$s dengan nama %2$s. Sayangnya, modul PECL tidak akan mengenali ini dengan nama ini. Harap nama diganti menjadi %3$s.",
         "PiwikNotManagingGeoIPDBs": "Piwik saat ini tidak mengelola basisdata GeoIP apapun.",
-        "PluginDescription": "Laporan Negara pengunjung.",
         "Region": "Wilayah",
         "SetupAutomaticUpdatesOfGeoIP": "Pengaturan pembaruan otomatis basisdata GeoIP",
         "SubmenuLocations": "Lokasi",
diff --git a/plugins/UserCountry/lang/is.json b/plugins/UserCountry/lang/is.json
index 17d76e0809..2284ff6293 100644
--- a/plugins/UserCountry/lang/is.json
+++ b/plugins/UserCountry/lang/is.json
@@ -281,7 +281,6 @@
         "country_zw": "Simbabve",
         "DistinctCountries": "%s mismunandi lönd",
         "Location": "Staðsetning",
-        "PluginDescription": "Greinir frá hvaða landi gestirnir koma",
         "SubmenuLocations": "Staðsetningar"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserCountry/lang/it.json b/plugins/UserCountry/lang/it.json
index 44b4078d1a..7a001637c9 100644
--- a/plugins/UserCountry/lang/it.json
+++ b/plugins/UserCountry/lang/it.json
@@ -356,7 +356,7 @@
         "PeclGeoIPNoDBDir": "Il modulo PECL è alla ricerca di databasee in%1$s, ma questa directory non esiste. Si prega di crearla e aggiungervi i database GeoIP. In alternativa, è possibile impostare %2$s per la directory corretta nel file php.ini.",
         "PeclGeoLiteError": "Il tuo databese GeoIP in %1$s è chiamato %2$s. Sfortunatamente il modulo PECL non lo riconosce con questo nome. Si prega di rinominarlo come %3$s.",
         "PiwikNotManagingGeoIPDBs": "Piwik attualmente non sta gestendo alcun database GeoIP.",
-        "PluginDescription": "Mostra gli stati dei tuoi visitatori.",
+        "PluginDescription": "Restituisce la provenienza dei tuoi visitatori: nazione, regione, città e coordinate geografiche (latitudine\/longitudine).",
         "Region": "Regione",
         "SetupAutomaticUpdatesOfGeoIP": "Imposta gli aggiornamenti automatici dei database GeoIP",
         "SubmenuLocations": "Località",
diff --git a/plugins/UserCountry/lang/ja.json b/plugins/UserCountry/lang/ja.json
index c817b908ed..19489834b0 100644
--- a/plugins/UserCountry/lang/ja.json
+++ b/plugins/UserCountry/lang/ja.json
@@ -355,7 +355,6 @@
         "PeclGeoIPNoDBDir": "PECL モジュールは、%1$s でデータベースを探していますが、このディレクトリーは存在しません。ディレクトリーを作成し GeoIP データベースをそれに追加してください。または、お使いの php.ini ファイルの正しいディレクトリーに %2$s を設定できます。",
         "PeclGeoLiteError": "あなたの %1$s GeoIP データベースは、%2$s と名付けられています。残念ながら、PECL モジュールはこの名前のまま認識することができません。名前を %3$s に変更してください。",
         "PiwikNotManagingGeoIPDBs": "GeoIP データベースは、現在 Piwik により管理されていません。",
-        "PluginDescription": "ビジターの国をリポートします。",
         "Region": "地域",
         "SetupAutomaticUpdatesOfGeoIP": "GeoIP データベースの自動アップデートをセットアップしてください。",
         "SubmenuLocations": "場所",
diff --git a/plugins/UserCountry/lang/ka.json b/plugins/UserCountry/lang/ka.json
index e0a6776ecc..3cb01dc964 100644
--- a/plugins/UserCountry/lang/ka.json
+++ b/plugins/UserCountry/lang/ka.json
@@ -283,7 +283,6 @@
         "country_zw": "ზიმბაბვე",
         "DistinctCountries": "%s განსხვავებული ქვეყანა",
         "Location": "მდებარეობა",
-        "PluginDescription": "ვიზიტორების ქვეყნის რეპორტი",
         "SubmenuLocations": "მდებარეობები"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserCountry/lang/ko.json b/plugins/UserCountry/lang/ko.json
index b58954f3fc..1f428aeff7 100644
--- a/plugins/UserCountry/lang/ko.json
+++ b/plugins/UserCountry/lang/ko.json
@@ -351,7 +351,6 @@
         "PeclGeoIPNoDBDir": "PECL 모듈이 %1$s 경로에서 데이터베이스를 찾았지만, 디렉토리가 존재하지 않습니다. 디렉토리를 만들고 여기에 GeoIP 데이터베이스를 추가하세요. 대안으로, php.ini 파일에 올바른 디렉토리를 %2$s 경로를 설정할 수 있습니다.",
         "PeclGeoLiteError": "%1$s에 있는 GeoIP 데이터베이스 이름은 %2$s입니다. 안타깝게도, PECL 모듈은 이 이름으로 인식하지 않습니다. 이름을 %3$s로 변경해 주세요.",
         "PiwikNotManagingGeoIPDBs": "Piwik은 현재 모든 GeoIP 데이터베이스를 관리하지 않습니다.",
-        "PluginDescription": "방문자의 국가를 보고합니다.",
         "Region": "지역",
         "SetupAutomaticUpdatesOfGeoIP": "GeoIP 데이터베이스의 자동 업데이트 설정",
         "SubmenuLocations": "위치",
diff --git a/plugins/UserCountry/lang/lt.json b/plugins/UserCountry/lang/lt.json
index 0b7428b431..08ecb0bfef 100644
--- a/plugins/UserCountry/lang/lt.json
+++ b/plugins/UserCountry/lang/lt.json
@@ -284,7 +284,6 @@
         "country_zw": "Zimbabwe",
         "DistinctCountries": "%s atskirti šalis",
         "Location": "Vietovė",
-        "PluginDescription": "Nurodo lankytojų šalis.",
         "SubmenuLocations": "Vietovės"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserCountry/lang/lv.json b/plugins/UserCountry/lang/lv.json
index 108231df34..29aec3954c 100644
--- a/plugins/UserCountry/lang/lv.json
+++ b/plugins/UserCountry/lang/lv.json
@@ -283,7 +283,6 @@
         "country_zr": "Zaira",
         "country_zw": "Zimbabve",
         "Location": "Lokācijas",
-        "PluginDescription": "Apmeklētāju valstu apskats.",
         "SubmenuLocations": "Lokācijas"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserCountry/lang/nb.json b/plugins/UserCountry/lang/nb.json
index b546ee4421..4e43352b95 100644
--- a/plugins/UserCountry/lang/nb.json
+++ b/plugins/UserCountry/lang/nb.json
@@ -288,6 +288,7 @@
         "CurrentLocationIntro": "Ifølge denne leverandøren, er din nåværende posisjon",
         "DistinctCountries": "%s bestemte land",
         "DownloadingDb": "Laster ned %s",
+        "DownloadNewDatabasesEvery": "Oppdater databasene hver",
         "FoundApacheModules": "Piwik fant følgende Apache-moduler",
         "GeoIPDatabases": "GeoIP-databaser",
         "GeoIPNoServerVars": "Piwik kan ikke finne noen GeoIP %s variabler.",
@@ -295,9 +296,10 @@
         "HowToInstallApacheModule": "Hvordan installerer jeg GeoIP-modulen for Apache?",
         "HowToInstallGeoIPDatabases": "Hvordan får jeg GeoIP databasene?",
         "ISPDatabase": "ISP-database",
+        "Latitude": "Breddegrad",
         "Location": "Lokasjon",
+        "Longitude": "Lengdegrad",
         "Organization": "Organisasjon",
-        "PluginDescription": "Rapporterer landet for de besøkende.",
         "Region": "Region",
         "SubmenuLocations": "Lokasjoner"
     }
diff --git a/plugins/UserCountry/lang/nl.json b/plugins/UserCountry/lang/nl.json
index ed8596d2cf..67d57bf999 100644
--- a/plugins/UserCountry/lang/nl.json
+++ b/plugins/UserCountry/lang/nl.json
@@ -330,7 +330,6 @@
         "Organization": "Organisatie",
         "OrgDatabase": "Organisatie Database",
         "PiwikNotManagingGeoIPDBs": "Piwik beheert momenteel geen GeoIP databases.",
-        "PluginDescription": "Rapporteert het land van de bezoekers.",
         "Region": "Regio",
         "SetupAutomaticUpdatesOfGeoIP": "Stel automatische updates van GeoIP databases in",
         "SubmenuLocations": "Locaties",
diff --git a/plugins/UserCountry/lang/nn.json b/plugins/UserCountry/lang/nn.json
index 64a605aa00..42a3559ab4 100644
--- a/plugins/UserCountry/lang/nn.json
+++ b/plugins/UserCountry/lang/nn.json
@@ -285,7 +285,6 @@
         "country_zw": "Zimbabwe",
         "DistinctCountries": "%s distinkte land",
         "Location": "Plass",
-        "PluginDescription": "Rapporterer landet til vitjarane",
         "SubmenuLocations": "Plassar"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserCountry/lang/pl.json b/plugins/UserCountry/lang/pl.json
index 86c80727e9..e4012cd14b 100644
--- a/plugins/UserCountry/lang/pl.json
+++ b/plugins/UserCountry/lang/pl.json
@@ -1,6 +1,8 @@
 {
     "UserCountry": {
+        "AssumingNonApache": "Nie można znaleźć funkcji apache_get_modules co oznacza serwer nie będący typu Apache.",
         "CannotListContent": "Błąd wyświetlenia zawartości %1$s: %2$s",
+        "CannotLocalizeLocalIP": "Adres IP %s jest adresem lokalnym i nie można go poddać geolokacji.",
         "CannotUnzipDatFile": "Błąd rozpakowania pliki dat w %1$s: %2$s",
         "City": "Miasto",
         "CityAndCountry": "%1$s, %2$s",
@@ -287,13 +289,30 @@
         "country_zm": "Zambia",
         "country_zr": "Zair",
         "country_zw": "Zimbabwe",
+        "CurrentLocationIntro": "Według tego dostawcy, twoją aktualną lokalizacją jest",
+        "DefaultLocationProviderDesc1": "Domyślny dostawca usług geolokacyjnych zgaduje państwo odwiedzającego na podstawie języka używanego w przeglądarce.",
         "DistinctCountries": "%s wyróżniających się krajów",
         "DownloadingDb": "Pobieranie %s",
         "DownloadNewDatabasesEvery": "Zaktualizuj bazę danych co",
         "FoundApacheModules": "Piwik znalazł następujące moduły Apache",
         "FromDifferentCities": "różne miasta",
         "GeoIPDatabases": "Baza danych GeoIP",
+        "GeoIPImplHasAccessTo": "Ta implementacja GeoIP ma dostęp do następujących typów baz danych",
+        "GeoIPIncorrectDatabaseFormat": "Twoja baza GeoIP ma niepoprawny format. Może być uszkodzona. Dopilnuj by używać wersji binarnej oraz spróbuj podmienić bazę na nową kopię\/wersję.",
+        "GeoIpLocationProviderDesc_Pecl2": "Ten dostawca nie podlega żadnym ograniczeniom w działaniu, dlatego polecamy jego używanie.",
+        "GeoIpLocationProviderDesc_Php2": "Jeżeli twoja strona ma bardzo dużo ruchu, ten dostawca usług lokacyjnych może okazać się za wolny. W takim wypadku zaleca się instalację %1$srozszerzenia PECL%2$s lub %3$smoduło serverowego%4$s.",
+        "GeoIpLocationProviderDesc_ServerBased2": "W przypadku importu plików logów lub wykonaniu innej operacji mogącej wymagać ustawienia adres IP, prosimy używać %1$simplementacji GeoIP PECL (rekomendowana)%2$s lub %3$simplementacji GeoIP PHP%4$s.",
+        "GeoIpLocationProviderDesc_ServerBasedAnonWarn": "NOTKA: Anonimizacja IP nie wywiera żadnego efektu gdy jest używana z tym dostawcą. Przed użyciem anonimizacji adresów IP, upewnij się, iż nie narusza ono żadnych praw do prywatności, który może podlegać.",
+        "GeoIpLocationProviderNotRecomnended": "Geolokacja działa, ale nie używasz rekomendowanego dostawcy.",
+        "GeoIPNoServerVars": "Piwik nie może znaleźć żadnych zmiennych %s GeoIP",
+        "GeoIPServerVarsFound": "Piwik wykrył następujące zmienne GeoIP %s",
+        "GeoIPUpdaterInstructions": "Wprowadź poniżej linki do twoich baz danych. Jeżeli bazy zostały zakupione od %3$sMaxMind%4$s, możesz znaleźć takowe linki %1$stutaj%2$s. W przypadku problemów z dostępem do plików, należy kontaktować się z %3$sMaxMind%4$s.",
+        "GeoIPUpdaterIntro": "Piwik zarządza aktualizacjami dla następujących baz GeoIP",
+        "GeoLiteCityLink": "W przypadku używania darmowej bazy GeoLite Miasta, użyj tego linka: %1$s%2$s%3$s",
         "Geolocation": "Geolokalizacja",
+        "GeolocationPageDesc": "Na tej stronie można zmienić sposób wykrywania lokalizacji odwiedzających stosowany przez Piwik'a.",
+        "getCityDocumentation": "Raport ten pokazuje miasta, w których przebywali odwiedzający gdy whcodzili na stronę.",
+        "getContinentDocumentation": "Raport then pokazuje kraje, w których byli odwiedzający gdzy oglądali strony.",
         "getCountryDocumentation": "Ten raport pokazuje, w którym kraju był odwiedzający kiedy wchodził na twoją stronę.",
         "getRegionDocumentation": "Ten raport pokazuje,w którym regionie był odwiedzający kiedy wchodził na twoją stronę.",
         "HowToInstallApacheModule": "W jaki sposób zainstaluję moduł GeoIP dla Apache?",
@@ -301,6 +320,7 @@
         "HowToInstallGeoIpPecl": "W jaki sposób zainstaluję rozszerzenie GeoIP PECL?",
         "HowToInstallNginxModule": "W jaki sposób zainstaluję moduł GeoIP dla Nginx?",
         "HowToSetupGeoIP": "Jak ustawić dokładną geolokalizację z GeoIP?",
+        "HttpServerModule": "Moduł Serwera HTTP",
         "ISPDatabase": "Baza danych dostawców internetowych",
         "IWantToDownloadFreeGeoIP": "Chcę ściągnąć darmową bazę GeoIP...",
         "Latitude": "Szerokość",
@@ -311,11 +331,11 @@
         "Organization": "Organizacja",
         "OrgDatabase": "Baza Danych Organizacji",
         "PiwikNotManagingGeoIPDBs": "Piwik nie zarządza obecnie żadną baza danych GeoIP.",
-        "PluginDescription": "Raporty o krajach pochodzenia odwiedzających.",
         "Region": "Region",
         "SetupAutomaticUpdatesOfGeoIP": "Ustaw automatyczne aktualizacje dla bazy danych GeoIP",
         "SubmenuLocations": "Położenia",
         "UnsupportedArchiveType": "Napotkał nieobsługiwany typ archiwum %1$s.",
+        "UpdaterHasNotBeenRun": "Aktualizacja nie została jeszcze wykonana.",
         "WidgetLocation": "Lokalizacja odwiedzającego"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserCountry/lang/pt-br.json b/plugins/UserCountry/lang/pt-br.json
index bf9ae740aa..78f8a24631 100644
--- a/plugins/UserCountry/lang/pt-br.json
+++ b/plugins/UserCountry/lang/pt-br.json
@@ -355,7 +355,6 @@
         "PeclGeoIPNoDBDir": "O módulo PECL está à procura de bancos de dados em %1$s mas este diretório não existe. Por favor, crie-o e adicione as bases de dados GeoIP a ele. Como alternativa, você pode definir %2$s para o diretório correto em seu arquivo php.ini.",
         "PeclGeoLiteError": "Seu banco de dados GeoIP em %1$s é nomeado %2$s. Infelizmente, o módulo PECL não irá reconhecê-lo com este nome. Por favor, mude o nome para %3$s.",
         "PiwikNotManagingGeoIPDBs": "Piwik atualmente não gerencia nenhuma base de dados GeoIP.",
-        "PluginDescription": "Relata o país dos visitantes",
         "Region": "Região",
         "SetupAutomaticUpdatesOfGeoIP": "Configurar as atualizações automáticas de bancos de dados GeoIP",
         "SubmenuLocations": "Locais",
diff --git a/plugins/UserCountry/lang/pt.json b/plugins/UserCountry/lang/pt.json
index 1621575e4f..a5be6fcd3f 100644
--- a/plugins/UserCountry/lang/pt.json
+++ b/plugins/UserCountry/lang/pt.json
@@ -284,7 +284,6 @@
         "country_zw": "Zimbabué",
         "DistinctCountries": "%s países distintos",
         "Location": "Localização",
-        "PluginDescription": "Relata o País dos visitantes.",
         "SubmenuLocations": "Localizações"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserCountry/lang/ro.json b/plugins/UserCountry/lang/ro.json
index 3d5897fabb..184e413275 100644
--- a/plugins/UserCountry/lang/ro.json
+++ b/plugins/UserCountry/lang/ro.json
@@ -356,7 +356,6 @@
         "PeclGeoIPNoDBDir": "Modulul PECL este în căutarea de baze de date în%1$s, dar acest director nu există. Vă rugăm să-l creeze și să adăugați bazele de date GeoIP . Alternativ, puteți seta %2$s la directorul corect în fișierul dvs. php.ini.",
         "PeclGeoLiteError": "Baza de date GeoIP în %1$s este numita %2$s. Din păcate, modulul de PECL nu-l va recunoaște cu acest nume. Vă rugăm să-l redenumiți la %3$s.",
         "PiwikNotManagingGeoIPDBs": "Piwik nu gestionează în prezent nici o baza de date GeoIP.",
-        "PluginDescription": "Rapoarte de informații cu privire la locația vizitatorilor, inclusiv țară, regiune, oraș și coordonatele geografice (latitudine \/ longitudine).",
         "Region": "Regiune",
         "SetupAutomaticUpdatesOfGeoIP": "Configurare automata aactualizărilor bazelor de date GeoIP",
         "SubmenuLocations": "Locații",
diff --git a/plugins/UserCountry/lang/ru.json b/plugins/UserCountry/lang/ru.json
index 9720738465..470ed8c0fc 100644
--- a/plugins/UserCountry/lang/ru.json
+++ b/plugins/UserCountry/lang/ru.json
@@ -3,6 +3,7 @@
         "AssumingNonApache": "Не удается найти apache_get_modules функцию, видимо, это не веб-сервер Apache.",
         "CannotFindGeoIPServerVar": "Переменная %s не установлена. Ваш сервер не может быть сконфигурирован правильно.",
         "CannotFindPeclGeoIPDb": "Невозможно найти базу базу данных по стране, региону или городу для GeoIP PECL модуля. Убедитесь, что ваша БД GeoIP находится в %1$s и названа %2$s или %3$s, иначе PECL модуль не заметит ее.",
+        "CannotListContent": "Не удалось перечислить содержимое для %1$s: %2$s",
         "CannotLocalizeLocalIP": "IP адрес %s - это локальный адрес и его конкретное местонахождение не может быть определено.",
         "CannotSetupGeoIPAutoUpdating": "Похоже на то, чтобы храните свои GeoIP базы за пределами папки Piwik. Piwik не может автоматически обновлять базы, которые находятся за пределами папки misc.",
         "City": "Город",
@@ -349,7 +350,6 @@
         "PeclGeoIPNoDBDir": "PECL модуль обращается к базам в %1$s, но это директория не существует. Пожалуйста, создайте ее и добавьте в нее базу данных GeoIP. Или вы можете установить %2$s в правильную директорию в вашем php.ini файле.",
         "PeclGeoLiteError": "Ваша БД GeoIP в %1$s названа %2$s. К сожалению, PECL модуь не сможет распознать такое имя. Пожалуйста, переименуйте это в %3$s.",
         "PiwikNotManagingGeoIPDBs": "Piwik в настоящее время не работает с базами GeoIP.",
-        "PluginDescription": "Отображает страну посетителя.",
         "Region": "Регион",
         "SetupAutomaticUpdatesOfGeoIP": "Настроить автоматическое обновление GeoIP баз",
         "SubmenuLocations": "Локации",
@@ -357,6 +357,7 @@
         "ThisUrlIsNotAValidGeoIPDB": "Загруженный файл не является корректной GeoIP базой. Пожалуйста, перепроверьте ссылку или загрузите файл вручную.",
         "ToGeolocateOldVisits": "Для того чтобы получить информацию о местоположении для предыдущих посетителей, воспользуйтесь скриптом, о котором написано %1$sтут%2$s.",
         "UpdaterHasNotBeenRun": "Обновления никогда не производились.",
+        "UpdaterScheduledForNextRun": "Это запланированный запуск команды core:archive при следующем выполнении cron-задачи.",
         "WidgetLocation": "Местонахождение посетителя"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserCountry/lang/sk.json b/plugins/UserCountry/lang/sk.json
index 874b0ccb5c..0a7de811f8 100644
--- a/plugins/UserCountry/lang/sk.json
+++ b/plugins/UserCountry/lang/sk.json
@@ -278,7 +278,6 @@
         "country_zw": "Zimbabwe",
         "DistinctCountries": "Počet rôznych krajín: %s",
         "Location": "Miesto",
-        "PluginDescription": "Report návštevníkov podľa krajiny",
         "SubmenuLocations": "Umiestnenie"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserCountry/lang/sl.json b/plugins/UserCountry/lang/sl.json
index 436825eae1..291eef1a8a 100644
--- a/plugins/UserCountry/lang/sl.json
+++ b/plugins/UserCountry/lang/sl.json
@@ -278,7 +278,6 @@
         "country_zw": "Zimbabve",
         "DistinctCountries": "%s različnih držav",
         "Location": "Lokacija",
-        "PluginDescription": "Sporoči državo, iz katere so obiskovalci.",
         "Region": "Regija",
         "SubmenuLocations": "Lokacije",
         "WidgetLocation": "Lokacija obiskovalca"
diff --git a/plugins/UserCountry/lang/sq.json b/plugins/UserCountry/lang/sq.json
index 9d5683fe90..66c61bbdd7 100644
--- a/plugins/UserCountry/lang/sq.json
+++ b/plugins/UserCountry/lang/sq.json
@@ -285,7 +285,6 @@
         "country_zw": "Zimbabve",
         "DistinctCountries": "%s vende ndaras",
         "Location": "Vend",
-        "PluginDescription": "Raporton Vendin e vizitorëve.",
         "SubmenuLocations": "Vende"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserCountry/lang/sr.json b/plugins/UserCountry/lang/sr.json
index 6d5397e703..beacb866f1 100644
--- a/plugins/UserCountry/lang/sr.json
+++ b/plugins/UserCountry/lang/sr.json
@@ -356,7 +356,6 @@
         "PeclGeoIPNoDBDir": "PECL modul traži bazu u %1$s ali ovaj direktorijum ne postoji. Molimo vas da ga kreirate i da mu dodate GeoIP bazu. Takođe možete postaviti %2$s za pravi direktorijum u php.ini datoteci.",
         "PeclGeoLiteError": "Vaša GeoIp baza se nalazi u %1$s i zove se %2$s. Na žalost, PECL modul je neće prepoznati pod ovim imenom. Molimo vas da je reimenujete u %3$s.",
         "PiwikNotManagingGeoIPDBs": "Piwik trenutno ne upravlja ni jednom GeoIP bazom.",
-        "PluginDescription": "Izveštaj o zemljama posetilaca",
         "Region": "Regija",
         "SetupAutomaticUpdatesOfGeoIP": "Podesite automatska osvežavanja GeoIP baza.",
         "SubmenuLocations": "Lokacije",
diff --git a/plugins/UserCountry/lang/sv.json b/plugins/UserCountry/lang/sv.json
index 639c9dd5fb..c2dd83b5f3 100644
--- a/plugins/UserCountry/lang/sv.json
+++ b/plugins/UserCountry/lang/sv.json
@@ -356,7 +356,6 @@
         "PeclGeoIPNoDBDir": "PECL-modulen letar efter databaser i %1$s, men den här mappen finns inte. Var vänlig skapa den och lägg till GeoIP-databaser i den. Alternativt, ändra inställningen %2$s till den rätta mappen i din php.ini.",
         "PeclGeoLiteError": "Din GeoIP-databas i %1$s har namnet %2$s. Tyvärr kommer inte PECL-modulen att känna igen den med det här namnet. Var vänlig döp om den till %3$s.",
         "PiwikNotManagingGeoIPDBs": "För närvarande hanterar inte Piwik någon GeoIP-databas.",
-        "PluginDescription": "Rapporterar Landet för besökaren.",
         "Region": "Region",
         "SetupAutomaticUpdatesOfGeoIP": "Ställ in automatisk uppdatering av GeoIP-databaser",
         "SubmenuLocations": "Platser",
diff --git a/plugins/UserCountry/lang/th.json b/plugins/UserCountry/lang/th.json
index 255381596c..9f733cfc94 100644
--- a/plugins/UserCountry/lang/th.json
+++ b/plugins/UserCountry/lang/th.json
@@ -284,7 +284,6 @@
         "Latitude": "ละติจูด",
         "Location": "ตำแหน่งที่ตั้ง",
         "Longitude": "ลองจิจูด",
-        "PluginDescription": "ประเทศของผู้เข้าชมในรายงาน",
         "Region": "ภูมิภาค",
         "SetupAutomaticUpdatesOfGeoIP": "ติดตั้งการปรับปรุงอัตโนมัติจากฐานข้อมูล GeoIP",
         "SubmenuLocations": "ตำแหน่งที่อยู่",
diff --git a/plugins/UserCountry/lang/tl.json b/plugins/UserCountry/lang/tl.json
index 8fb991719e..44dc7b3fdb 100644
--- a/plugins/UserCountry/lang/tl.json
+++ b/plugins/UserCountry/lang/tl.json
@@ -351,7 +351,6 @@
         "OrgDatabase": "Organisasyon ng Database",
         "PeclGeoIPNoDBDir": "Ang PECL module ay naghahanap ng databases sa %1$s Pero ang directory na ito ay wala. Mangyaring gawin ito at e-dagdag ang GeopIP databases dito. Bukod dito maari kang magtakda ng %2$s sa tamang directory sa iyong php.ini file",
         "PiwikNotManagingGeoIPDBs": "Ang Piwik ay kasalukuyang di namamahala ng anumang GeoIP database",
-        "PluginDescription": "Mga ulat impormasyon tungkol sa lokasyon ng bisita kabilang ang mga bansa rehiyon lungsod at mga geographic coordinates (latitued \/ longtitude).",
         "Region": "Rehiyon",
         "SetupAutomaticUpdatesOfGeoIP": "I-set-up ang awtomatikong update ng mga database ng GeoIP",
         "SubmenuLocations": "Mga Lokasyon",
diff --git a/plugins/UserCountry/lang/uk.json b/plugins/UserCountry/lang/uk.json
index 0a1207f2cb..91f14b8a19 100644
--- a/plugins/UserCountry/lang/uk.json
+++ b/plugins/UserCountry/lang/uk.json
@@ -283,7 +283,6 @@
         "country_zw": "Зімбабве",
         "DistinctCountries": "%s унікальних країн",
         "Location": "Місцезнаходження",
-        "PluginDescription": "Повідомляє країну відвідувачів.",
         "SubmenuLocations": "Місцезнаходження"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserCountry/lang/vi.json b/plugins/UserCountry/lang/vi.json
index e126b8a918..5f805f814f 100644
--- a/plugins/UserCountry/lang/vi.json
+++ b/plugins/UserCountry/lang/vi.json
@@ -355,7 +355,6 @@
         "PeclGeoIPNoDBDir": "Module PECL đang tìm kiếm cơ sở dữ liệu trong %1$s, nhưng thư mục này không tồn tại. Hãy tạo ra nó và thêm cơ sở dữ liệu Geoip vào đó. Ngoài ra, bạn có thể thiết lập %2$s vào đúng thư mục trong tập tin php.ini của bạn.",
         "PeclGeoLiteError": "Cơ sở dữ liệu geoip của bạn trong %1$s được đặt tên %2$s. Thật không may, module PECL sẽ không nhận ra nó với tên này. Xin đổi tên nó thành %3$s.",
         "PiwikNotManagingGeoIPDBs": "Hiện tại Piwik không quản lý bất kỳ cơ sở dữ liệu Geoip nào.",
-        "PluginDescription": "Thông tin báo cáo liên quan đến vị trí của khách truy cập, bao gồm quốc gia, vùng, thành phố và tọa độ địa lý (vĩ độ\/kinh độ).",
         "Region": "Vùng",
         "SetupAutomaticUpdatesOfGeoIP": "Thiết lập tự động cập nhật cơ sở dữ liệu GeoIP",
         "SubmenuLocations": "Các vị trí",
diff --git a/plugins/UserCountry/lang/zh-cn.json b/plugins/UserCountry/lang/zh-cn.json
index b020353ef6..024fcbcacc 100644
--- a/plugins/UserCountry/lang/zh-cn.json
+++ b/plugins/UserCountry/lang/zh-cn.json
@@ -355,7 +355,6 @@
         "PeclGeoIPNoDBDir": "PECL 模块在 %1$s 中查找数据库，但这个目录不存在，请改正并把 GeoIP 数据库加入。另外，您也可以在 php.ini 文件中设置 %2$s 为正确的目录。",
         "PeclGeoLiteError": "您在 %1$s 中的GeoIP 数据库名称为 %2$s。但是 PECL 模块无法识别这个名称，请改名为 %3$s。",
         "PiwikNotManagingGeoIPDBs": "Piwik 目前没有任何 GeoIP 数据库。",
-        "PluginDescription": "访客的来源\/国家报表。",
         "Region": "地区",
         "SetupAutomaticUpdatesOfGeoIP": "设置自动更新 GeoIP 数据库",
         "SubmenuLocations": "所在地",
diff --git a/plugins/UserCountry/lang/zh-tw.json b/plugins/UserCountry/lang/zh-tw.json
index d823c3d9fa..62b50c6e36 100644
--- a/plugins/UserCountry/lang/zh-tw.json
+++ b/plugins/UserCountry/lang/zh-tw.json
@@ -277,7 +277,6 @@
         "country_zw": "辛巴威",
         "DistinctCountries": "%s 個不同的國家",
         "Location": "位置",
-        "PluginDescription": "訪客的來源\/國家報表。",
         "SubmenuLocations": "所在地",
         "WidgetLocation": "訪客所在地點"
     }
diff --git a/plugins/UserCountry/tests/Unit/UserCountryTest.php b/plugins/UserCountry/tests/Unit/UserCountryTest.php
index 5a6e453e3a..b4ada3e4d1 100644
--- a/plugins/UserCountry/tests/Unit/UserCountryTest.php
+++ b/plugins/UserCountry/tests/Unit/UserCountryTest.php
@@ -8,7 +8,8 @@
 
 namespace Piwik\Plugins\UserCountry\tests\Unit;
 
-use Piwik\Log;
+use Piwik\Container\StaticContainer;
+use Piwik\Intl\Data\Provider\RegionDataProvider;
 use Piwik\Plugins\UserCountry\GeoIPAutoUpdater;
 use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
 use Piwik\Plugins\UserCountry;
@@ -17,7 +18,6 @@ use Exception;
 
 require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/UserCountry.php';
 require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/functions.php';
-require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/Countries.php';
 
 class UserCountryTest extends \PHPUnit_Framework_Testcase
 {
@@ -44,10 +44,11 @@ class UserCountryTest extends \PHPUnit_Framework_Testcase
      */
     public function testFlagsAndContinents()
     {
-        require PIWIK_PATH_TEST_TO_ROOT . '/core/DataFiles/Countries.php';
+        /** @var RegionDataProvider $dataProvider */
+        $dataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\RegionDataProvider');
 
-        $continents = $GLOBALS['Piwik_ContinentList'];
-        $countries = array_merge($GLOBALS['Piwik_CountryList'], $GLOBALS['Piwik_CountryList_Extras']);
+        $continents = $dataProvider->getContinentList();
+        $countries = $dataProvider->getCountryList(true);
 
         // Get list of existing flag icons
         $flags = scandir(PIWIK_PATH_TEST_TO_ROOT . '/plugins/UserCountry/images/flags/');
diff --git a/plugins/UserCountryMap/Controller.php b/plugins/UserCountryMap/Controller.php
index 914835439e..f1cc36eed0 100644
--- a/plugins/UserCountryMap/Controller.php
+++ b/plugins/UserCountryMap/Controller.php
@@ -15,6 +15,7 @@ use Piwik\Config;
 use Piwik\Piwik;
 use Piwik\Plugins\Goals\API as APIGoals;
 use Piwik\Site;
+use Piwik\Translation\Translator;
 use Piwik\View;
 
 /**
@@ -22,9 +23,20 @@ use Piwik\View;
  */
 class Controller extends \Piwik\Plugin\Controller
 {
-
     // By default plot up to the last 30 days of visitors on the map, for low traffic sites
     const REAL_TIME_WINDOW = 'last30';
+    
+    /**
+     * @var Translator
+     */
+    private $translator;
+
+    public function __construct(Translator $translator)
+    {
+        $this->translator = $translator;
+
+        parent::__construct();
+    }
 
     public function visitorMap($fetch = false, $segmentOverride = false)
     {
@@ -64,18 +76,18 @@ class Controller extends \Piwik\Plugin\Controller
 
         // some translations
         $view->localeJSON = json_encode(array(
-                                                     'nb_visits'            => Piwik::translate('General_NVisits'),
-                                                     'one_visit'            => Piwik::translate('General_OneVisit'),
-                                                     'no_visit'             => Piwik::translate('UserCountryMap_NoVisit'),
-                                                     'nb_actions'           => Piwik::translate('VisitsSummary_NbActionsDescription'),
-                                                     'nb_actions_per_visit' => Piwik::translate('VisitsSummary_NbActionsPerVisit'),
-                                                     'bounce_rate'          => Piwik::translate('VisitsSummary_NbVisitsBounced'),
-                                                     'avg_time_on_site'     => Piwik::translate('VisitsSummary_AverageVisitDuration'),
-                                                     'and_n_others'         => Piwik::translate('UserCountryMap_AndNOthers'),
-                                                     'no_data'              => Piwik::translate('CoreHome_ThereIsNoDataForThisReport'),
-                                                     'nb_uniq_visitors'     => Piwik::translate('VisitsSummary_NbUniqueVisitors'),
-                                                     'nb_users'             => Piwik::translate('VisitsSummary_NbUsers'),
-                                                ));
+             'nb_visits'            => $this->translator->translate('General_NVisits'),
+             'one_visit'            => $this->translator->translate('General_OneVisit'),
+             'no_visit'             => $this->translator->translate('UserCountryMap_NoVisit'),
+             'nb_actions'           => $this->translator->translate('VisitsSummary_NbActionsDescription'),
+             'nb_actions_per_visit' => $this->translator->translate('VisitsSummary_NbActionsPerVisit'),
+             'bounce_rate'          => $this->translator->translate('VisitsSummary_NbVisitsBounced'),
+             'avg_time_on_site'     => $this->translator->translate('VisitsSummary_AverageVisitDuration'),
+             'and_n_others'         => $this->translator->translate('UserCountryMap_AndNOthers'),
+             'no_data'              => $this->translator->translate('CoreHome_ThereIsNoDataForThisReport'),
+             'nb_uniq_visitors'     => $this->translator->translate('VisitsSummary_NbUniqueVisitors'),
+             'nb_users'             => $this->translator->translate('VisitsSummary_NbUsers'),
+        ));
 
         $view->reqParamsJSON = $this->getEnrichedRequest($params = array(
             'period'                      => $period,
@@ -136,19 +148,19 @@ class Controller extends \Piwik\Plugin\Controller
 
         // some translations
         $locale = array(
-            'nb_actions'       => Piwik::translate('VisitsSummary_NbActionsDescription'),
-            'local_time'       => Piwik::translate('VisitTime_ColumnLocalTime'),
-            'from'             => Piwik::translate('General_FromReferrer'),
-            'seconds'          => Piwik::translate('UserCountryMap_Seconds'),
-            'seconds_ago'      => Piwik::translate('UserCountryMap_SecondsAgo'),
-            'minutes'          => Piwik::translate('UserCountryMap_Minutes'),
-            'minutes_ago'      => Piwik::translate('UserCountryMap_MinutesAgo'),
-            'hours'            => Piwik::translate('UserCountryMap_Hours'),
-            'hours_ago'        => Piwik::translate('UserCountryMap_HoursAgo'),
-            'days_ago'         => Piwik::translate('UserCountryMap_DaysAgo'),
-            'actions'          => Piwik::translate('VisitsSummary_NbPageviewsDescription'),
-            'searches'         => Piwik::translate('UserCountryMap_Searches'),
-            'goal_conversions' => Piwik::translate('UserCountryMap_GoalConversions'),
+            'nb_actions'       => $this->translator->translate('VisitsSummary_NbActionsDescription'),
+            'local_time'       => $this->translator->translate('VisitTime_ColumnLocalTime'),
+            'from'             => $this->translator->translate('General_FromReferrer'),
+            'seconds'          => $this->translator->translate('UserCountryMap_Seconds'),
+            'seconds_ago'      => $this->translator->translate('UserCountryMap_SecondsAgo'),
+            'minutes'          => $this->translator->translate('UserCountryMap_Minutes'),
+            'minutes_ago'      => $this->translator->translate('UserCountryMap_MinutesAgo'),
+            'hours'            => $this->translator->translate('UserCountryMap_Hours'),
+            'hours_ago'        => $this->translator->translate('UserCountryMap_HoursAgo'),
+            'days_ago'         => $this->translator->translate('UserCountryMap_DaysAgo'),
+            'actions'          => $this->translator->translate('VisitsSummary_NbPageviewsDescription'),
+            'searches'         => $this->translator->translate('UserCountryMap_Searches'),
+            'goal_conversions' => $this->translator->translate('UserCountryMap_GoalConversions'),
         );
 
         $segment = $segmentOverride ? : Request::getRawSegmentFromRequest() ? : '';
@@ -206,7 +218,7 @@ class Controller extends \Piwik\Plugin\Controller
     private function checkUserCountryPluginEnabled()
     {
         if (!\Piwik\Plugin\Manager::getInstance()->isPluginActivated('UserCountry')) {
-            throw new Exception(Piwik::translate('General_Required', 'Plugin UserCountry'));
+            throw new Exception($this->translator->translate('General_Required', 'Plugin UserCountry'));
         }
     }
 
diff --git a/plugins/UserCountryMap/UserCountryMap.php b/plugins/UserCountryMap/UserCountryMap.php
index 9d124ecf97..4d385d7f00 100644
--- a/plugins/UserCountryMap/UserCountryMap.php
+++ b/plugins/UserCountryMap/UserCountryMap.php
@@ -35,11 +35,6 @@ class UserCountryMap extends \Piwik\Plugin
 
     public function postLoad()
     {
-        if (PluginManager::getInstance()->isPluginActivated('UserCountry')) {
-            WidgetsList::add('General_Visitors', Piwik::translate('UserCountryMap_VisitorMap'), 'UserCountryMap', 'visitorMap');
-            WidgetsList::add('Live!', Piwik::translate('UserCountryMap_RealTimeMap'), 'UserCountryMap', 'realtimeMap');
-        }
-
         Piwik::addAction('Template.leftColumnUserCountry', array('Piwik\Plugins\UserCountryMap\UserCountryMap', 'insertMapInLocationReport'));
     }
 
@@ -54,11 +49,23 @@ class UserCountryMap extends \Piwik\Plugin
         $hooks = array(
             'AssetManager.getJavaScriptFiles' => 'getJsFiles',
             'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
-            'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys'
+            'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys',
+            'Platform.initialized' => array(
+                'after'    => true,
+                'function' => 'registerWidgets'
+            )
         );
         return $hooks;
     }
 
+    public function registerWidgets()
+    {
+        if (PluginManager::getInstance()->isPluginActivated('UserCountry')) {
+            WidgetsList::add('General_Visitors', Piwik::translate('UserCountryMap_VisitorMap'), 'UserCountryMap', 'visitorMap');
+            WidgetsList::add('Live!', Piwik::translate('UserCountryMap_RealTimeMap'), 'UserCountryMap', 'realtimeMap');
+        }
+    }
+
     public function getJsFiles(&$jsFiles)
     {
         $jsFiles[] = "libs/bower_components/visibilityjs/lib/visibility.core.js";
diff --git a/plugins/UserCountryMap/lang/nb.json b/plugins/UserCountryMap/lang/nb.json
index b073dc86fa..1548316b21 100644
--- a/plugins/UserCountryMap/lang/nb.json
+++ b/plugins/UserCountryMap/lang/nb.json
@@ -15,6 +15,8 @@
         "Searches": "%s søk",
         "Seconds": "sekunder",
         "SecondsAgo": "%s sekunder siden",
+        "WithUnknownCity": "%s med ukjent by",
+        "WithUnknownRegion": "%s med ukjent region",
         "WorldWide": "Verdensbasis"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserCountryMap/lang/nl.json b/plugins/UserCountryMap/lang/nl.json
index 6c732ead60..ec0a2cbcc2 100644
--- a/plugins/UserCountryMap/lang/nl.json
+++ b/plugins/UserCountryMap/lang/nl.json
@@ -18,6 +18,8 @@
         "Seconds": "seconden",
         "SecondsAgo": "%s seconden geleden",
         "VisitorMap": "Bezoeker Kaart",
+        "WithUnknownCity": "%s met onbekende stad",
+        "WithUnknownRegion": "%s met onbekende regio",
         "WorldWide": "Wereldwijd"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserCountryMap/lang/sl.json b/plugins/UserCountryMap/lang/sl.json
index 435a4a62e9..5bcd724bac 100644
--- a/plugins/UserCountryMap/lang/sl.json
+++ b/plugins/UserCountryMap/lang/sl.json
@@ -3,6 +3,7 @@
         "map": "zemljevid",
         "RealTimeMap": "Zemljevid v realnem času",
         "Regions": "Regije",
-        "VisitorMap": "Zemljevid obiskovalcev"
+        "VisitorMap": "Zemljevid obiskovalcev",
+        "WorldWide": "Cel svet"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserCountryMap/stylesheets/realtime-map.less b/plugins/UserCountryMap/stylesheets/realtime-map.less
index 9f7ee78b0f..c6c98ffda5 100644
--- a/plugins/UserCountryMap/stylesheets/realtime-map.less
+++ b/plugins/UserCountryMap/stylesheets/realtime-map.less
@@ -150,4 +150,4 @@
 
 .realtime-map[data-name=symbol-animate-fill] {
     color: #fdb;
-}
\ No newline at end of file
+}
diff --git a/plugins/UserCountryMap/stylesheets/visitor-map.less b/plugins/UserCountryMap/stylesheets/visitor-map.less
index 37c0fd9ae6..c279fd3733 100644
--- a/plugins/UserCountryMap/stylesheets/visitor-map.less
+++ b/plugins/UserCountryMap/stylesheets/visitor-map.less
@@ -151,7 +151,7 @@
 }
 
 .visitor-map[data-name=unknown-region-fill-color] {
-    color: #fff;
+    color: @theme-color-background-base;
 }
 
 .visitor-map[data-name=unknown-region-stroke-color] {
@@ -171,15 +171,15 @@
 }
 
 .visitor-map[data-name=invisible-region-background] {
-    color: #fff;
+    color: @theme-color-background-base;
 }
 
 .visitor-map[data-name=city-label-color] {
-    color: #fff;
+    color: @theme-color-background-base;
 }
 
 .visitor-map[data-name=city-stroke-color] {
-    color: #fff;
+    color: @theme-color-background-base;
 }
 
 .visitor-map[data-name=city-highlight-stroke-color] {
@@ -195,7 +195,7 @@
 }
 
 .visitor-map[data-name=city-label-fill-color] {
-    color: #fff;
+    color: @theme-color-background-base;
 }
 
 .visitor-map[data-name=city-selected-color] {
@@ -224,4 +224,4 @@
 
 .visitor-map[data-name=special-metrics-color-scale-4] {
     color: #E87500;
-}
\ No newline at end of file
+}
diff --git a/plugins/UserCountryMap/templates/visitorMap.twig b/plugins/UserCountryMap/templates/visitorMap.twig
index da76ee038b..b10f1a4bdc 100644
--- a/plugins/UserCountryMap/templates/visitorMap.twig
+++ b/plugins/UserCountryMap/templates/visitorMap.twig
@@ -1,3 +1,4 @@
+<section>
 <div class="UserCountryMap" style="position:relative; overflow:hidden;">
     <div class="UserCountryMap_container">
         <div class="UserCountryMap_map" style="overflow:hidden;"></div>
@@ -73,6 +74,7 @@
         </div>
     </div>
 </div>
+</section>
 
 {% if not noData %}
 <!-- configure some piwik vars -->
diff --git a/plugins/UserLanguage/.gitignore b/plugins/UserLanguage/.gitignore
new file mode 100644
index 0000000000..c8c9480010
--- /dev/null
+++ b/plugins/UserLanguage/.gitignore
@@ -0,0 +1 @@
+tests/System/processed/*xml
\ No newline at end of file
diff --git a/plugins/UserLanguage/API.php b/plugins/UserLanguage/API.php
new file mode 100644
index 0000000000..30d6ffd8ce
--- /dev/null
+++ b/plugins/UserLanguage/API.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\UserLanguage;
+
+use Piwik\Archive;
+use Piwik\DataTable;
+use Piwik\Metrics;
+use Piwik\Piwik;
+
+/**
+ * @see plugins/UserLanguage/functions.php
+ */
+require_once PIWIK_INCLUDE_PATH . '/plugins/UserLanguage/functions.php';
+
+/**
+ * The UserLanguage API lets you access reports about your Visitors language setting
+ *
+ * @method static \Piwik\Plugins\UserLanguage\API getInstance()
+ */
+class API extends \Piwik\Plugin\API
+{
+    protected function getDataTable($name, $idSite, $period, $date, $segment)
+    {
+        Piwik::checkUserHasViewAccess($idSite);
+        $archive = Archive::build($idSite, $period, $date, $segment);
+        $dataTable = $archive->getDataTable($name);
+        $dataTable->filter('Sort', array(Metrics::INDEX_NB_VISITS));
+        $dataTable->queueFilter('ReplaceColumnNames');
+        $dataTable->queueFilter('ReplaceSummaryRowLabel');
+        return $dataTable;
+    }
+
+    public function getLanguage($idSite, $period, $date, $segment = false)
+    {
+        $dataTable = $this->getDataTable(Archiver::LANGUAGE_RECORD_NAME, $idSite, $period, $date, $segment);
+        $dataTable->filter('GroupBy', array('label', __NAMESPACE__ . '\groupByLangCallback'));
+        $dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\languageTranslate'));
+
+        return $dataTable;
+    }
+
+    public function getLanguageCode($idSite, $period, $date, $segment = false)
+    {
+        $dataTable = $this->getDataTable(Archiver::LANGUAGE_RECORD_NAME, $idSite, $period, $date, $segment);
+        $dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\languageTranslateWithCode'));
+
+        return $dataTable;
+    }
+}
diff --git a/plugins/UserLanguage/Archiver.php b/plugins/UserLanguage/Archiver.php
new file mode 100644
index 0000000000..14fd369eec
--- /dev/null
+++ b/plugins/UserLanguage/Archiver.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\UserLanguage;
+
+use Piwik\Common;
+use Piwik\Container\StaticContainer;
+use Piwik\DataArray;
+use Piwik\DataTable;
+use Piwik\Intl\Data\Provider\RegionDataProvider;
+use Piwik\Metrics;
+
+require_once PIWIK_INCLUDE_PATH . '/plugins/UserLanguage/functions.php';
+
+/**
+ * Archiver for UserLanguage Plugin
+ *
+ * @see PluginsArchiver
+ */
+class Archiver extends \Piwik\Plugin\Archiver
+{
+    const LANGUAGE_RECORD_NAME = 'UserLanguage_language';
+
+    const LANGUAGE_DIMENSION = "log_visit.location_browser_lang";
+
+    /**
+     * Daily archive of User Settings report. Processes reports for Visits by Resolution,
+     * browser plugins, etc. Some reports are built from the logs, some reports are superset of an existing report
+     */
+    public function aggregateDayReport()
+    {
+        $this->aggregateByLanguage();
+    }
+
+    /**
+     * Period archiving: simply sums up daily archives
+     */
+    public function aggregateMultipleReports()
+    {
+        $dataTableRecords = array(
+            self::LANGUAGE_RECORD_NAME,
+        );
+        $this->getProcessor()->aggregateDataTableRecords($dataTableRecords, $this->maximumRows);
+    }
+
+    protected function aggregateByLanguage()
+    {
+        /** @var RegionDataProvider $regionDataProvider */
+        $regionDataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\RegionDataProvider');
+
+        $query = $this->getLogAggregator()->queryVisitsByDimension(array("label" => self::LANGUAGE_DIMENSION));
+        $countryCodes = $regionDataProvider->getCountryList($includeInternalCodes = true);
+        $metricsByLanguage = new DataArray();
+
+        while ($row = $query->fetch()) {
+            $langCode = Common::extractLanguageCodeFromBrowserLanguage($row['label']);
+            $countryCode = Common::extractCountryCodeFromBrowserLanguage($row['label'], $countryCodes, $enableLanguageToCountryGuess = true);
+
+            if ($countryCode == 'xx' || $countryCode == $langCode) {
+                $metricsByLanguage->sumMetricsVisits($langCode, $row);
+            } else {
+                $metricsByLanguage->sumMetricsVisits($langCode . '-' . $countryCode, $row);
+            }
+        }
+
+        $report = $metricsByLanguage->asDataTable();
+        $this->insertTable(self::LANGUAGE_RECORD_NAME, $report);
+    }
+
+
+    protected function insertTable($recordName, DataTable $table)
+    {
+        $report = $table->getSerialized($this->maximumRows, null, Metrics::INDEX_NB_VISITS);
+        return $this->getProcessor()->insertBlobRecord($recordName, $report);
+    }
+
+}
+
diff --git a/plugins/UserLanguage/Columns/Language.php b/plugins/UserLanguage/Columns/Language.php
new file mode 100644
index 0000000000..5812528688
--- /dev/null
+++ b/plugins/UserLanguage/Columns/Language.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\UserLanguage\Columns;
+
+use Piwik\Common;
+use Piwik\Piwik;
+use Piwik\Plugin\Dimension\VisitDimension;
+use Piwik\Tracker\Action;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\Visitor;
+
+class Language extends VisitDimension
+{
+    protected $columnName = 'location_browser_lang';
+    protected $columnType = 'VARCHAR(20) NOT NULL';
+
+    public function getName()
+    {
+        return Piwik::translate('General_Language');
+    }
+
+    /**
+     * @param Request $request
+     * @param Visitor $visitor
+     * @param Action|null $action
+     * @return mixed
+     */
+    public function onNewVisit(Request $request, Visitor $visitor, $action)
+    {
+        return $this->getSingleLanguageFromAcceptedLanguages($request->getBrowserLanguage());
+    }
+
+    /**
+     * For better privacy we store only the main language code, instead of the whole browser language string.
+     * 
+     * @param $acceptLanguagesString
+     * @return string
+     */
+    protected function getSingleLanguageFromAcceptedLanguages($acceptLanguagesString)
+    {
+        if (empty($acceptLanguagesString)) {
+            return '';
+        }
+
+        $languageCode = Common::extractLanguageAndRegionCodeFromBrowserLanguage($acceptLanguagesString);
+        return $languageCode;
+    }
+}
diff --git a/plugins/UserLanguage/Reports/Base.php b/plugins/UserLanguage/Reports/Base.php
new file mode 100644
index 0000000000..5496a64b9e
--- /dev/null
+++ b/plugins/UserLanguage/Reports/Base.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\UserLanguage\Reports;
+
+use Piwik\Plugin\ViewDataTable;
+use Piwik\Plugins\CoreVisualizations\Visualizations\Graph;
+
+abstract class Base extends \Piwik\Plugin\Report
+{
+    protected function init()
+    {
+        $this->category = 'General_VisitorSettings';
+    }
+
+    protected function getBasicUserSettingsDisplayProperties(ViewDataTable $view)
+    {
+        $view->config->show_search = false;
+        $view->config->show_exclude_low_population = false;
+
+        $view->requestConfig->filter_limit = 5;
+
+        if ($view->isViewDataTableId(Graph::ID)) {
+            $view->config->max_graph_elements = 5;
+        }
+    }
+}
diff --git a/plugins/UserLanguage/Reports/GetLanguage.php b/plugins/UserLanguage/Reports/GetLanguage.php
new file mode 100644
index 0000000000..70f4304fa6
--- /dev/null
+++ b/plugins/UserLanguage/Reports/GetLanguage.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\UserLanguage\Reports;
+
+use Piwik\Piwik;
+use Piwik\Plugin\ViewDataTable;
+use Piwik\Plugins\UserLanguage\Columns\Language;
+
+class GetLanguage extends Base
+{
+    protected function init()
+    {
+        parent::init();
+        $this->dimension     = new Language();
+        $this->name          = Piwik::translate('UserLanguage_BrowserLanguage');
+        $this->documentation = ''; // TODO
+        $this->order = 10;
+        $this->widgetTitle  = 'UserLanguage_BrowserLanguage';
+    }
+
+    public function configureView(ViewDataTable $view)
+    {
+        $view->config->show_search = false;
+        $view->config->columns_to_display = array('label', 'nb_visits');
+        $view->config->show_exclude_low_population = false;
+        $view->config->addTranslation('label', $this->dimension->getName());
+
+        $view->requestConfig->filter_sort_column = 'nb_visits';
+        $view->requestConfig->filter_sort_order  = 'desc';
+    }
+
+    public function getRelatedReports() {
+        return array(
+            new GetLanguageCode()
+        );
+    }
+
+}
diff --git a/plugins/UserLanguage/Reports/GetLanguageCode.php b/plugins/UserLanguage/Reports/GetLanguageCode.php
new file mode 100644
index 0000000000..9b2ab021d9
--- /dev/null
+++ b/plugins/UserLanguage/Reports/GetLanguageCode.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\UserLanguage\Reports;
+
+use Piwik\Piwik;
+use Piwik\Plugins\UserLanguage\Columns\Language;
+
+class GetLanguageCode extends GetLanguage
+{
+    protected function init()
+    {
+        parent::init();
+        $this->dimension     = new Language();
+        $this->name          = Piwik::translate('UserLanguage_LanguageCode');
+        $this->documentation = '';
+        $this->order = 11;
+        $this->widgetTitle  = 'UserLanguage_LanguageCode';
+    }
+
+    public function getRelatedReports()
+    {
+        return array(
+            new GetLanguage()
+        );
+    }
+
+}
diff --git a/plugins/UserLanguage/UserLanguage.php b/plugins/UserLanguage/UserLanguage.php
new file mode 100644
index 0000000000..07d4fdb300
--- /dev/null
+++ b/plugins/UserLanguage/UserLanguage.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\UserLanguage;
+use Piwik\Piwik;
+use Piwik\FrontController;
+
+/**
+ *
+ */
+class UserLanguage extends \Piwik\Plugin
+{
+    public function postLoad()
+    {
+        Piwik::addAction('Template.footerUserCountry', array('Piwik\Plugins\UserLanguage\UserLanguage', 'footerUserCountry'));
+    }
+
+    public static function footerUserCountry(&$out)
+    {
+        $out .= '<div><h2>' . Piwik::translate('UserLanguage_BrowserLanguage') . '</h2>';
+        $out .= FrontController::getInstance()->fetchDispatch('UserLanguage', 'getLanguage');
+        $out .= '</div>';
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/functions.php b/plugins/UserLanguage/functions.php
new file mode 100644
index 0000000000..6e28cddf27
--- /dev/null
+++ b/plugins/UserLanguage/functions.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\UserLanguage;
+
+use Piwik\Piwik;
+
+/**
+ * Returns the given language code to translated language name
+ *
+ * @param $label
+ *
+ * @return string
+ */
+function languageTranslate($label)
+{
+    if ($label == '' || $label == 'xx') {
+        return Piwik::translate('General_Unknown');
+    }
+
+    $key = 'UserLanguage_Language_' . $label;
+
+    $translation = Piwik::translate($key);
+
+    // Show language code if unknown code
+    if ($translation == $key) {
+        $translation = Piwik::translate('UserLanguage_LanguageCode') . ' ' . $label;
+    }
+
+    return $translation;
+}
+
+/**
+ * @param $label
+ * @return string
+ */
+function languageTranslateWithCode($label)
+{
+    $ex = explode('-', $label);
+    $lang = languageTranslate($ex[0]);
+
+    if (count($ex) == 2 && $ex[0] != $ex[1]) {
+        $countryKey = 'UserCountry_country_' . $ex[1];
+        $country = Piwik::translate($countryKey);
+
+        if ($country == $countryKey) {
+            return sprintf("%s (%s)", $lang, $ex[0]);
+        }
+
+        return sprintf("%s - %s (%s)", $lang, $country, $label);
+
+    } else {
+        return sprintf("%s (%s)", $lang, $ex[0]);
+    }
+
+}
+
+/**
+ * @param $lang
+ * @return mixed
+ */
+function groupByLangCallback($lang)
+{
+    $ex = explode('-', $lang);
+    return $ex[0];
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/am.json b/plugins/UserLanguage/lang/am.json
new file mode 100644
index 0000000000..52e9db00c0
--- /dev/null
+++ b/plugins/UserLanguage/lang/am.json
@@ -0,0 +1,159 @@
+{
+    "UserLanguage": {
+        "Language_aa": "አፋርኛ",
+        "Language_ab": "አብሐዚኛ",
+        "Language_af": "አፍሪካንስኛ",
+        "Language_ak": "አካንኛ",
+        "Language_am": "አማርኛ",
+        "Language_ar": "ዐርቢኛ",
+        "Language_as": "አሳሜዛዊ",
+        "Language_ay": "አያማርኛ",
+        "Language_az": "አዜርባይጃንኛ",
+        "Language_ba": "ባስኪርኛ",
+        "Language_be": "ቤላራሻኛ",
+        "Language_bg": "ቡልጋሪኛ",
+        "Language_bh": "ቢሃሪ",
+        "Language_bi": "ቢስላምኛ",
+        "Language_bn": "በንጋሊኛ",
+        "Language_bo": "ትበትንኛ",
+        "Language_br": "ብሬቶንኛ",
+        "Language_bs": "ቦስኒያንኛ",
+        "Language_ca": "ካታላንኛ",
+        "Language_co": "ኮርሲካኛ",
+        "Language_cs": "ቼክኛ",
+        "Language_cy": "ወልሽ",
+        "Language_da": "ዴኒሽ",
+        "Language_de": "ጀርመን",
+        "Language_dv": "ዲቬህ",
+        "Language_dz": "ድዞንግኻኛ",
+        "Language_ee": "ኢዊ",
+        "Language_el": "ግሪክኛ",
+        "Language_en": "እንግሊዝኛ",
+        "Language_eo": "ኤስፐራንቶ",
+        "Language_es": "ስፓኒሽ",
+        "Language_et": "ኤስቶኒአን",
+        "Language_eu": "ባስክኛ",
+        "Language_fa": "ፐርሲያኛ",
+        "Language_fi": "ፊኒሽ",
+        "Language_fj": "ፊጂኛ",
+        "Language_fo": "ፋሮኛ",
+        "Language_fr": "ፈረንሳይኛ",
+        "Language_fy": "ፍሪስኛ",
+        "Language_ga": "አይሪሽ",
+        "Language_gd": "እስኮትስ ጌልክኛ",
+        "Language_gl": "ጋለጋኛ",
+        "Language_gn": "ጓራኒኛ",
+        "Language_gu": "ጉጃርቲኛ",
+        "Language_ha": "ሃውሳኛ",
+        "Language_he": "ዕብራስጥ",
+        "Language_hi": "ሐንድኛ",
+        "Language_hr": "ክሮሽያንኛ",
+        "Language_ht": "ሃይትኛ",
+        "Language_hu": "ሀንጋሪኛ",
+        "Language_hy": "አርመናዊ",
+        "Language_ia": "ኢንቴርሊንጓ",
+        "Language_id": "እንዶኒሲኛ",
+        "Language_ie": "እንተርሊንግወ",
+        "Language_ig": "ኢግቦኛ",
+        "Language_ik": "እኑፒያቅኛ",
+        "Language_is": "አይስላንድኛ",
+        "Language_it": "ጣሊያንኛ",
+        "Language_iu": "እኑክቲቱትኛ",
+        "Language_ja": "ጃፓንኛ",
+        "Language_jv": "ጃቫንኛ",
+        "Language_ka": "ጊዮርጊያን",
+        "Language_kg": "ኮንጎኛ",
+        "Language_kk": "ካዛክኛ",
+        "Language_kl": "ካላሊሱትኛ",
+        "Language_km": "ክመርኛ",
+        "Language_kn": "ካናዳኛ",
+        "Language_ko": "ኮሪያኛ",
+        "Language_ks": "ካሽሚርኛ",
+        "Language_ku": "ኩርድሽኛ",
+        "Language_ky": "ኪርጊዝኛ",
+        "Language_la": "ላቲንኛ",
+        "Language_lb": "ሉክዘምበርገርኛ",
+        "Language_lg": "ጋንዳኛ",
+        "Language_ln": "ሊንጋላኛ",
+        "Language_lo": "ላውስኛ",
+        "Language_lt": "ሊቱአኒያን",
+        "Language_lv": "ላትቪያን",
+        "Language_mg": "ማላጋስኛ",
+        "Language_mi": "ማዮሪኛ",
+        "Language_mk": "ማከዶኒኛ",
+        "Language_ml": "ማላያላምኛ",
+        "Language_mn": "ሞንጎላዊኛ",
+        "Language_mr": "ማራዚኛ",
+        "Language_ms": "ማላይኛ",
+        "Language_mt": "ማልቲስኛ",
+        "Language_my": "ቡርማኛ",
+        "Language_na": "ናኡሩ",
+        "Language_nb": "የኖርዌይ ቦክማል",
+        "Language_nd": "ሰሜን ንዴብሌ",
+        "Language_ne": "ኔፓሊኛ",
+        "Language_nl": "ደች",
+        "Language_nn": "የኖርዌ አዲሱ ኖርዌጅያንኛ",
+        "Language_no": "ኖርዌጂያን",
+        "Language_ny": "ንያንጃ",
+        "Language_oc": "ኦኪታንኛ",
+        "Language_om": "ኦሮምኛ",
+        "Language_or": "ኦሪያኛ",
+        "Language_os": "ኦሴቲክ",
+        "Language_pa": "ፓንጃቢኛ",
+        "Language_pl": "ፖሊሽ",
+        "Language_ps": "ፑሽቶኛ",
+        "Language_pt": "ፖርቱጋሊኛ",
+        "Language_qu": "ኵቿኛ",
+        "Language_rm": "ሮማንስ",
+        "Language_rn": "ሩንዲኛ",
+        "Language_ro": "ሮማኒያን",
+        "Language_ru": "ራሽኛ",
+        "Language_rw": "ኪንያርዋንድኛ",
+        "Language_sa": "ሳንስክሪትኛ",
+        "Language_sd": "ሲንድሂኛ",
+        "Language_se": "ሰሜናዊ ሳሚ",
+        "Language_sg": "ሳንጎኛ",
+        "Language_si": "ስንሃልኛ",
+        "Language_sk": "ስሎቫክኛ",
+        "Language_sl": "ስሎቪኛ",
+        "Language_sm": "ሳሞአኛ",
+        "Language_sn": "ሾናኛ",
+        "Language_so": "ሱማልኛ",
+        "Language_sq": "ልቤኒኛ",
+        "Language_sr": "ሰርቢኛ",
+        "Language_ss": "ስዋቲኛ",
+        "Language_st": "ሶዞኛ",
+        "Language_su": "ሱዳንኛ",
+        "Language_sv": "ስዊድንኛ",
+        "Language_sw": "ስዋሂሊኛ",
+        "Language_ta": "ታሚልኛ",
+        "Language_te": "ተሉጉኛ",
+        "Language_tg": "ታጂኪኛ",
+        "Language_th": "ታይኛ",
+        "Language_ti": "ትግርኛ",
+        "Language_tk": "ቱርክመንኛ",
+        "Language_tl": "ታጋሎገኛ",
+        "Language_tn": "ጽዋናዊኛ",
+        "Language_to": "ቶንጋ",
+        "Language_tr": "ቱርክኛ",
+        "Language_ts": "ጾንጋኛ",
+        "Language_tt": "ታታርኛ",
+        "Language_tw": "ትዊኛ",
+        "Language_ty": "ታሂታንኛ",
+        "Language_ug": "ኡዊግሁርኛ",
+        "Language_uk": "ዩክረኒኛ",
+        "Language_ur": "ኡርዱኛ",
+        "Language_uz": "ኡዝበክኛ",
+        "Language_ve": "ቬንዳ",
+        "Language_vi": "ቪትናምኛ",
+        "Language_vo": "ቮላፑክኛ",
+        "Language_wo": "ዎሎፍኛ",
+        "Language_xh": "ዞሳኛ",
+        "Language_yi": "ይዲሻዊኛ",
+        "Language_yo": "ዮሩባዊኛ",
+        "Language_za": "ዡዋንግኛ",
+        "Language_zh": "ቻይንኛ",
+        "Language_zu": "ዙሉኛ",
+        "LanguageCode": "የቋንቋ ኮድ"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/ar.json b/plugins/UserLanguage/lang/ar.json
new file mode 100644
index 0000000000..c02fc61e8c
--- /dev/null
+++ b/plugins/UserLanguage/lang/ar.json
@@ -0,0 +1,188 @@
+{
+    "UserLanguage": {
+        "Language_aa": "الأفارية",
+        "Language_ab": "الأبخازية",
+        "Language_ae": "الأفستية",
+        "Language_af": "الأفريقية",
+        "Language_ak": "الأكانية",
+        "Language_am": "الأمهرية",
+        "Language_an": "الأراجونية",
+        "Language_ar": "العربية",
+        "Language_as": "الأسامية",
+        "Language_av": "الأفاريكية",
+        "Language_ay": "الأيمارا",
+        "Language_az": "الأذرية",
+        "Language_ba": "الباشكيرية",
+        "Language_be": "البيلوروسية",
+        "Language_bg": "البلغارية",
+        "Language_bh": "البيهارية",
+        "Language_bi": "البيسلامية",
+        "Language_bm": "البامبارا",
+        "Language_bn": "البنغالية",
+        "Language_bo": "التبتية",
+        "Language_br": "البريتونية",
+        "Language_bs": "البوسنية",
+        "Language_ca": "الكاتالوينية",
+        "Language_ce": "الشيشانية",
+        "Language_ch": "التشامورو",
+        "Language_co": "الكورسيكية",
+        "Language_cr": "الكرى",
+        "Language_cs": "التشيكية",
+        "Language_cu": "سلافية كنسية",
+        "Language_cv": "التشفاش",
+        "Language_cy": "الولزية",
+        "Language_da": "الدانماركية",
+        "Language_de": "الألمانية",
+        "Language_dv": "المالديفية",
+        "Language_dz": "الزونخاية",
+        "Language_ee": "الايوي",
+        "Language_el": "اليونانية",
+        "Language_en": "الانجليزية",
+        "Language_eo": "اسبرانتو",
+        "Language_es": "الأسبانية",
+        "Language_et": "الأستونية",
+        "Language_eu": "لغة الباسك",
+        "Language_fa": "الفارسية",
+        "Language_ff": "الفلة",
+        "Language_fi": "الفنلندية",
+        "Language_fj": "الفيجية",
+        "Language_fo": "الفارويز",
+        "Language_fr": "الفرنسية",
+        "Language_fy": "الفريزيان",
+        "Language_ga": "الأيرلندية",
+        "Language_gd": "الغيلية الأسكتلندية",
+        "Language_gl": "الجاليكية",
+        "Language_gn": "الجوارانى",
+        "Language_gu": "الغوجاراتية",
+        "Language_gv": "المنكية",
+        "Language_ha": "الهوسا",
+        "Language_he": "العبرية",
+        "Language_hi": "الهندية",
+        "Language_ho": "الهيرى موتو",
+        "Language_hr": "الكرواتية",
+        "Language_ht": "الهايتية",
+        "Language_hu": "الهنغارية",
+        "Language_hy": "الأرمينية",
+        "Language_hz": "الهيريرو",
+        "Language_ia": "اللّغة الوسيطة",
+        "Language_id": "الأندونيسية",
+        "Language_ie": "الانترلينج",
+        "Language_ig": "الايجبو",
+        "Language_ii": "السيتشيون يى",
+        "Language_ik": "الاينبياك",
+        "Language_io": "الايدو",
+        "Language_is": "الأيسلاندية",
+        "Language_it": "الايطالية",
+        "Language_iu": "الاينكتيتت",
+        "Language_ja": "اليابانية",
+        "Language_jv": "الجاوية",
+        "Language_ka": "الجورجية",
+        "Language_kg": "الكونغو",
+        "Language_ki": "الكيكيو",
+        "Language_kj": "الكيونياما",
+        "Language_kk": "الكازاخستانية",
+        "Language_kl": "الكالاليست",
+        "Language_km": "الخميرية",
+        "Language_kn": "الكانادا",
+        "Language_ko": "الكورية",
+        "Language_kr": "الكانيوري",
+        "Language_ks": "الكاشميرية",
+        "Language_ku": "الكردية",
+        "Language_kv": "الكومي",
+        "Language_kw": "الكورنية",
+        "Language_ky": "القيرغستانية",
+        "Language_la": "اللاتينية",
+        "Language_lb": "اللوكسمبرجية",
+        "Language_lg": "الجاندا",
+        "Language_li": "الليمبرجيشية",
+        "Language_ln": "اللينجالا",
+        "Language_lo": "اللاوية",
+        "Language_lt": "اللتوانية",
+        "Language_lu": "اللبا-كاتانجا",
+        "Language_lv": "اللاتفية",
+        "Language_mg": "المالاجاشية",
+        "Language_mh": "المارشالية",
+        "Language_mi": "الماورية",
+        "Language_mk": "المقدونية",
+        "Language_ml": "الماليالام",
+        "Language_mn": "المنغولية",
+        "Language_mr": "الماراثى",
+        "Language_ms": "لغة الملايو",
+        "Language_mt": "المالطية",
+        "Language_my": "البورمية",
+        "Language_na": "النورو",
+        "Language_nb": "البوكمالية النرويجية",
+        "Language_nd": "النديبيل الشمالى",
+        "Language_ne": "النيبالية",
+        "Language_ng": "الندونجا",
+        "Language_nl": "الهولندية",
+        "Language_nn": "النينورسك النرويجي",
+        "Language_no": "النرويجية",
+        "Language_nr": "النديبيل الجنوبى",
+        "Language_nv": "النافاجو",
+        "Language_ny": "النيانجا، التشيتشوا، التشوا",
+        "Language_oc": "الأوكيتانية",
+        "Language_oj": "الأوجيبوا",
+        "Language_om": "الأورومو",
+        "Language_or": "الأورييا",
+        "Language_os": "الأوسيتيك",
+        "Language_pa": "البنجابية",
+        "Language_pi": "البالية",
+        "Language_pl": "البولندية",
+        "Language_ps": "البشتونية",
+        "Language_pt": "البرتغالية",
+        "Language_qu": "الكويتشوا",
+        "Language_rm": "الرهايتو-رومانس",
+        "Language_rn": "الرندى",
+        "Language_ro": "الرومانية",
+        "Language_ru": "الروسية",
+        "Language_rw": "الكينيارواندا",
+        "Language_sa": "السنسكريتية",
+        "Language_sc": "السردينية",
+        "Language_sd": "السيندى",
+        "Language_se": "السامي الشمالى",
+        "Language_sg": "السانجو",
+        "Language_si": "السريلانكية",
+        "Language_sk": "السلوفاكية",
+        "Language_sl": "السلوفانية",
+        "Language_sm": "الساموائية",
+        "Language_sn": "الشونا",
+        "Language_so": "الصومالية",
+        "Language_sq": "الألبانية",
+        "Language_sr": "الصربية",
+        "Language_ss": "السواتى",
+        "Language_st": "السوتو الجنوبية",
+        "Language_su": "السودانية",
+        "Language_sv": "السويدية",
+        "Language_sw": "السواحلية",
+        "Language_ta": "التاميلية",
+        "Language_te": "التيلجو",
+        "Language_tg": "الطاجيكية",
+        "Language_th": "التايلاندية",
+        "Language_ti": "التيجرينيا",
+        "Language_tk": "التركمانية",
+        "Language_tl": "التاغالوغية",
+        "Language_tn": "التسوانية",
+        "Language_to": "تونجا - جزر تونجا",
+        "Language_tr": "التركية",
+        "Language_ts": "السونجا",
+        "Language_tt": "التتارية",
+        "Language_tw": "التوي",
+        "Language_ty": "التاهيتية",
+        "Language_ug": "الأغورية",
+        "Language_uk": "الأوكرانية",
+        "Language_ur": "الأردية",
+        "Language_uz": "الاوزباكية",
+        "Language_ve": "الفيندا",
+        "Language_vi": "الفيتنامية",
+        "Language_wa": "الولونية",
+        "Language_wo": "الولوف",
+        "Language_xh": "الخوسا",
+        "Language_yi": "اليديشية",
+        "Language_yo": "اليوروبية",
+        "Language_za": "الزهيونج",
+        "Language_zh": "الصينية",
+        "Language_zu": "الزولو",
+        "LanguageCode": "كود اللغة"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/be.json b/plugins/UserLanguage/lang/be.json
new file mode 100644
index 0000000000..eca3f52fd8
--- /dev/null
+++ b/plugins/UserLanguage/lang/be.json
@@ -0,0 +1,119 @@
+{
+    "UserLanguage": {
+        "Language_ab": "абхазская",
+        "Language_af": "афрыкаанс",
+        "Language_am": "амхарская",
+        "Language_an": "арагонская",
+        "Language_ar": "арабская",
+        "Language_as": "асамская",
+        "Language_av": "аварская",
+        "Language_ay": "аймара",
+        "Language_az": "азербайджанская",
+        "Language_ba": "башкірская",
+        "Language_be": "беларуская",
+        "Language_bg": "балгарская",
+        "Language_bh": "біхары",
+        "Language_bn": "бенгальская",
+        "Language_br": "брэтонская",
+        "Language_bs": "баснійская",
+        "Language_ca": "каталонская",
+        "Language_ce": "чачэнская",
+        "Language_cs": "чэшская",
+        "Language_cv": "чувашская",
+        "Language_cy": "валійская",
+        "Language_da": "дацкая",
+        "Language_de": "нямецкая",
+        "Language_el": "грэцкая",
+        "Language_en": "англійская",
+        "Language_eo": "эсперанта",
+        "Language_es": "іспанская",
+        "Language_et": "эстонская",
+        "Language_eu": "баскская",
+        "Language_fa": "фарсі",
+        "Language_fi": "фінская",
+        "Language_fo": "фарэрская",
+        "Language_fr": "французская",
+        "Language_fy": "фрызская",
+        "Language_ga": "ірландская",
+        "Language_gd": "шатландская гэльская",
+        "Language_gl": "галісійская",
+        "Language_gn": "гуарані",
+        "Language_gu": "гуяраці",
+        "Language_he": "іўрыт",
+        "Language_hi": "хіндзі",
+        "Language_hr": "харвацкая",
+        "Language_hu": "венгерская",
+        "Language_hy": "армянская",
+        "Language_ia": "інтэрлінгва",
+        "Language_id": "інданезійская",
+        "Language_ie": "інтэрлінгве",
+        "Language_is": "ісландская",
+        "Language_it": "італьянская",
+        "Language_ja": "японская",
+        "Language_jv": "яванская",
+        "Language_ka": "грузінская",
+        "Language_kk": "казахская",
+        "Language_kn": "каннада",
+        "Language_ko": "карэйская",
+        "Language_ku": "курдская",
+        "Language_la": "лацінская",
+        "Language_ln": "лінгала",
+        "Language_lo": "лаоская",
+        "Language_lt": "літоўская",
+        "Language_lv": "латышская",
+        "Language_mg": "мальгашская",
+        "Language_mk": "македонская",
+        "Language_ml": "малаяламская",
+        "Language_mn": "мангольская",
+        "Language_mr": "маратхі",
+        "Language_ms": "малайская",
+        "Language_mt": "мальтыйская",
+        "Language_nb": "нарвэская букмал",
+        "Language_ne": "непальская",
+        "Language_nl": "галандская",
+        "Language_nn": "нарвежская (нюнорск)",
+        "Language_no": "нарвежская",
+        "Language_oc": "правансальская",
+        "Language_oj": "аджыбве",
+        "Language_or": "орыя",
+        "Language_os": "асецінская",
+        "Language_pa": "панджабі",
+        "Language_pl": "польская",
+        "Language_ps": "пушту",
+        "Language_pt": "партугальская",
+        "Language_qu": "кечуа",
+        "Language_rm": "рэта-раманская",
+        "Language_ro": "румынская",
+        "Language_ru": "руская",
+        "Language_sa": "санскрыт",
+        "Language_sd": "сіндхі",
+        "Language_si": "сінгальская",
+        "Language_sk": "славацкая",
+        "Language_sl": "славенская",
+        "Language_so": "самалійская",
+        "Language_sq": "албанская",
+        "Language_sr": "сербская",
+        "Language_su": "суданская",
+        "Language_sv": "шведская",
+        "Language_sw": "суахілі",
+        "Language_ta": "тамільская",
+        "Language_te": "тэлугу",
+        "Language_tg": "таджыкская",
+        "Language_th": "тайская",
+        "Language_ti": "тыгрынья",
+        "Language_tk": "туркменская",
+        "Language_tr": "турэцкая",
+        "Language_tt": "татарская",
+        "Language_ug": "уйгурская",
+        "Language_uk": "украінская",
+        "Language_ur": "урду",
+        "Language_uz": "узбекская",
+        "Language_vi": "в'етнамская",
+        "Language_vo": "валапюк",
+        "Language_xh": "хоса",
+        "Language_yi": "ідыш",
+        "Language_zh": "кітайская",
+        "Language_zu": "зулу",
+        "LanguageCode": "Код мовы"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/bg.json b/plugins/UserLanguage/lang/bg.json
new file mode 100644
index 0000000000..0696d8caaf
--- /dev/null
+++ b/plugins/UserLanguage/lang/bg.json
@@ -0,0 +1,190 @@
+{
+    "UserLanguage": {
+        "BrowserLanguage": "Език на браузъра",
+        "Language_aa": "афарски",
+        "Language_ab": "абхазки",
+        "Language_ae": "авестийски",
+        "Language_af": "бурски език",
+        "Language_ak": "акански",
+        "Language_am": "амхарски",
+        "Language_an": "арагонски",
+        "Language_ar": "арабски",
+        "Language_as": "асамски",
+        "Language_av": "аварски",
+        "Language_ay": "аймара",
+        "Language_az": "азербайджански",
+        "Language_ba": "башкирски",
+        "Language_be": "беларуски",
+        "Language_bg": "български",
+        "Language_bh": "бихари",
+        "Language_bi": "бислама",
+        "Language_bm": "бамбара",
+        "Language_bn": "бенгалски",
+        "Language_bo": "тибетски",
+        "Language_br": "бретонски",
+        "Language_bs": "босненски",
+        "Language_ca": "каталонски",
+        "Language_ce": "чеченски",
+        "Language_ch": "чаморо",
+        "Language_co": "корсикански",
+        "Language_cr": "крии",
+        "Language_cs": "чешки",
+        "Language_cu": "църковно славянски",
+        "Language_cv": "чувашки",
+        "Language_cy": "уелски",
+        "Language_da": "датски",
+        "Language_de": "немски",
+        "Language_dv": "дивехи",
+        "Language_dz": "дзонха",
+        "Language_ee": "еуе",
+        "Language_el": "гръцки",
+        "Language_en": "английски",
+        "Language_eo": "есперанто",
+        "Language_es": "испански",
+        "Language_et": "естонски",
+        "Language_eu": "баски",
+        "Language_fa": "персийски",
+        "Language_ff": "фула",
+        "Language_fi": "фински",
+        "Language_fj": "фиджийски",
+        "Language_fo": "фарьорски",
+        "Language_fr": "френски",
+        "Language_fy": "фризийски",
+        "Language_ga": "ирландски",
+        "Language_gd": "шотландски галски",
+        "Language_gl": "галисийски",
+        "Language_gn": "гуарани",
+        "Language_gu": "гуджарати",
+        "Language_gv": "манкски",
+        "Language_ha": "хауза",
+        "Language_he": "иврит",
+        "Language_hi": "хинди",
+        "Language_ho": "хири моту",
+        "Language_hr": "хърватски",
+        "Language_ht": "хаитянски",
+        "Language_hu": "унгарски",
+        "Language_hy": "арменски",
+        "Language_hz": "хереро",
+        "Language_ia": "интерлингва",
+        "Language_id": "индонезийски",
+        "Language_ie": "оксидентал",
+        "Language_ig": "игбо",
+        "Language_ii": "сечуански",
+        "Language_ik": "инупиак",
+        "Language_io": "идо",
+        "Language_is": "исландски",
+        "Language_it": "италиански",
+        "Language_iu": "инуктитут",
+        "Language_ja": "японски",
+        "Language_jv": "явански",
+        "Language_ka": "грузински",
+        "Language_kg": "конгоански",
+        "Language_ki": "кикуйу",
+        "Language_kj": "кваняма",
+        "Language_kk": "казахски",
+        "Language_kl": "гренландски ескимоски",
+        "Language_km": "кхмерски",
+        "Language_kn": "каннада",
+        "Language_ko": "корейски",
+        "Language_kr": "канури",
+        "Language_ks": "кашмирски",
+        "Language_ku": "кюрдски",
+        "Language_kv": "Коми",
+        "Language_kw": "корнуолски келтски",
+        "Language_ky": "киргизски",
+        "Language_la": "латински",
+        "Language_lb": "люксембургски",
+        "Language_lg": "ганда",
+        "Language_li": "лимбургски",
+        "Language_ln": "лингала",
+        "Language_lo": "лаоски",
+        "Language_lt": "литовски",
+        "Language_lu": "луба катанга",
+        "Language_lv": "латвийски",
+        "Language_mg": "малгашки",
+        "Language_mh": "маршалезе",
+        "Language_mi": "маорски",
+        "Language_mk": "македонски",
+        "Language_ml": "малаялам",
+        "Language_mn": "монголски",
+        "Language_mr": "маратхи",
+        "Language_ms": "малайски",
+        "Language_mt": "малтийски",
+        "Language_my": "бирмански",
+        "Language_na": "науру",
+        "Language_nb": "норвежки бокмал",
+        "Language_nd": "северен ндебеле",
+        "Language_ne": "непалски",
+        "Language_ng": "ндонга",
+        "Language_nl": "холандски",
+        "Language_nn": "съвременен норвежки",
+        "Language_no": "норвежки",
+        "Language_nr": "южен ндебеле",
+        "Language_nv": "навахо",
+        "Language_ny": "чинянджа",
+        "Language_oc": "окситански",
+        "Language_oj": "оджибва",
+        "Language_om": "оромо",
+        "Language_or": "ория",
+        "Language_os": "осетски",
+        "Language_pa": "пенджабски",
+        "Language_pi": "пали",
+        "Language_pl": "полски",
+        "Language_ps": "пущу",
+        "Language_pt": "португалски",
+        "Language_qu": "кечуа",
+        "Language_rm": "реторомански",
+        "Language_rn": "рунди",
+        "Language_ro": "румънски",
+        "Language_ru": "руски",
+        "Language_rw": "киняруанда",
+        "Language_sa": "санкскритски",
+        "Language_sc": "сардински",
+        "Language_sd": "синдхи",
+        "Language_se": "северен сами",
+        "Language_sg": "санго",
+        "Language_si": "синхалски",
+        "Language_sk": "словашки",
+        "Language_sl": "словенски",
+        "Language_sm": "самоански",
+        "Language_sn": "шона",
+        "Language_so": "сомалийски",
+        "Language_sq": "албански",
+        "Language_sr": "сръбски",
+        "Language_ss": "суази",
+        "Language_st": "сесуто",
+        "Language_su": "сундански",
+        "Language_sv": "шведски",
+        "Language_sw": "суахили",
+        "Language_ta": "тамилски",
+        "Language_te": "телугу",
+        "Language_tg": "таджикски",
+        "Language_th": "таи",
+        "Language_ti": "тигриня",
+        "Language_tk": "туркменски",
+        "Language_tl": "тагалог",
+        "Language_tn": "тсвана",
+        "Language_to": "тонга",
+        "Language_tr": "турски",
+        "Language_ts": "тсонга",
+        "Language_tt": "татарски",
+        "Language_tw": "туи",
+        "Language_ty": "таитянски",
+        "Language_ug": "уйгурски",
+        "Language_uk": "украински",
+        "Language_ur": "урду",
+        "Language_uz": "узбекски",
+        "Language_ve": "венда",
+        "Language_vi": "виетнамски",
+        "Language_vo": "волапюк",
+        "Language_wa": "валонски",
+        "Language_wo": "волоф",
+        "Language_xh": "ксоса",
+        "Language_yi": "идиш",
+        "Language_yo": "йоруба",
+        "Language_za": "зуанг",
+        "Language_zh": "китайски",
+        "Language_zu": "зулуски",
+        "LanguageCode": "Код на езика"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/bn.json b/plugins/UserLanguage/lang/bn.json
new file mode 100644
index 0000000000..54b756072d
--- /dev/null
+++ b/plugins/UserLanguage/lang/bn.json
@@ -0,0 +1,188 @@
+{
+    "UserLanguage": {
+        "Language_aa": "আফার",
+        "Language_ab": "আব্খাজিয়",
+        "Language_ae": "আবেস্তীয়",
+        "Language_af": "আফ্রিকান্স",
+        "Language_ak": "আকান",
+        "Language_am": "আমহারিক",
+        "Language_an": "আর্গোনিজ",
+        "Language_ar": "আরবী",
+        "Language_as": "আসামি",
+        "Language_av": "আভেরিক",
+        "Language_ay": "আয়মারা",
+        "Language_az": "আজারবাইজানীয়",
+        "Language_ba": "বাশকির",
+        "Language_be": "বেলারুশিয়",
+        "Language_bg": "বুলগেরিয়",
+        "Language_bh": "বিহারি",
+        "Language_bi": "বিসলামা",
+        "Language_bm": "বামবারা",
+        "Language_bn": "বাংলা",
+        "Language_bo": "তিব্বতি",
+        "Language_br": "ব্রেটোন",
+        "Language_bs": "বসনীয়",
+        "Language_ca": "কাতালান",
+        "Language_ce": "চেচেন",
+        "Language_ch": "চামেরো",
+        "Language_co": "কর্সিকান",
+        "Language_cr": "ক্রি",
+        "Language_cs": "চেক",
+        "Language_cu": "চার্চ স্লাভিও",
+        "Language_cv": "চুবাস",
+        "Language_cy": "ওয়েলশ",
+        "Language_da": "ডেনিশ",
+        "Language_de": "জার্মান",
+        "Language_dv": "দিবেহি",
+        "Language_dz": "ভুটানি",
+        "Language_ee": "ইওয়ে",
+        "Language_el": "গ্রিক",
+        "Language_en": "ইংরেজি",
+        "Language_eo": "এস্পেরান্তো",
+        "Language_es": "স্পেনীয়",
+        "Language_et": "এস্তোনীয়",
+        "Language_eu": "বাস্ক",
+        "Language_fa": "ফার্সি",
+        "Language_ff": "ফুলাহ্",
+        "Language_fi": "ফিনিশ",
+        "Language_fj": "ফিজিও",
+        "Language_fo": "ফেরাউনি",
+        "Language_fr": "ফরাসি",
+        "Language_fy": "পশ্চিম ফ্রিসিয়",
+        "Language_ga": "আইরিশ",
+        "Language_gd": "স্কটস-গ্যেলিক",
+        "Language_gl": "গ্যালিশিয়",
+        "Language_gn": "গুয়ারানি",
+        "Language_gu": "গুজরাটি",
+        "Language_gv": "ম্যাঙ্কস",
+        "Language_ha": "হাউসা",
+        "Language_he": "হিব্রু",
+        "Language_hi": "হিন্দি",
+        "Language_ho": "হিরি মোতু",
+        "Language_hr": "ক্রোয়েশীয়",
+        "Language_ht": "হাইতিয়ান",
+        "Language_hu": "হাঙ্গেরীয়",
+        "Language_hy": "আর্মেনিয়",
+        "Language_hz": "হেরেরো",
+        "Language_ia": "ইন্টারলিঙ্গুয়া",
+        "Language_id": "ইন্দোনেশীয়",
+        "Language_ie": "ইন্টারলিঙ্গ",
+        "Language_ig": "ইগ্‌বো",
+        "Language_ii": "সিচুয়ান য়ি",
+        "Language_ik": "ইনুপিয়াক",
+        "Language_io": "ইডো",
+        "Language_is": "আইসল্যান্ডীয়",
+        "Language_it": "ইতালীয়",
+        "Language_iu": "ইনুক্টিটুট",
+        "Language_ja": "জাপানি",
+        "Language_jv": "জাভানি",
+        "Language_ka": "জর্জিয়ান",
+        "Language_kg": "কোঙ্গো",
+        "Language_ki": "কিকু্ইয়ু",
+        "Language_kj": "কোয়ানিয়ামা",
+        "Language_kk": "কাজাখ",
+        "Language_kl": "ক্যালাল্লিসুট",
+        "Language_km": "খমের",
+        "Language_kn": "কান্নাড়ী",
+        "Language_ko": "কোরিয়ান",
+        "Language_kr": "কানুরি",
+        "Language_ks": "কাশ্মীরী",
+        "Language_ku": "কুর্দি",
+        "Language_kv": "কোমি",
+        "Language_kw": "কর্ণিশ",
+        "Language_ky": "কির্গিজ",
+        "Language_la": "লাটিন",
+        "Language_lb": "লুক্সেমবার্গীয়",
+        "Language_lg": "গ্যান্ডা",
+        "Language_li": "লিম্বুর্গিশ",
+        "Language_ln": "লিঙ্গালা",
+        "Language_lo": "লাও",
+        "Language_lt": "লিথুয়েনীয",
+        "Language_lu": "লুবা-কাটাঙ্গা",
+        "Language_lv": "লাত্‌ভীয়",
+        "Language_mg": "মালাগাসি",
+        "Language_mh": "মার্শালিজ",
+        "Language_mi": "মাওরি",
+        "Language_mk": "ম্যাসেডোনীয",
+        "Language_ml": "মালেয়ালাম",
+        "Language_mn": "মঙ্গোলিয়",
+        "Language_mr": "মারাঠি",
+        "Language_ms": "মালে",
+        "Language_mt": "মল্টিয়",
+        "Language_my": "বর্মি",
+        "Language_na": "নাউরু",
+        "Language_nb": "নরওয়ে বোকমাল",
+        "Language_nd": "উত্তর এন্দেবিলি",
+        "Language_ne": "নেপালী",
+        "Language_ng": "এন্দোঙ্গা",
+        "Language_nl": "ডাচ",
+        "Language_nn": "নরওয়েজীয়ান নিনর্স্ক",
+        "Language_no": "নরওয়েজীয়",
+        "Language_nr": "দক্ষিণ এনডেবেলে",
+        "Language_nv": "নাভাজো",
+        "Language_ny": "নায়াঞ্জা",
+        "Language_oc": "অক্সিটান",
+        "Language_oj": "ওজিবওয়া",
+        "Language_om": "অরোমো",
+        "Language_or": "উড়িয়া",
+        "Language_os": "ওসেটিক",
+        "Language_pa": "পাঞ্জাবী",
+        "Language_pi": "পালি",
+        "Language_pl": "পোলিশ",
+        "Language_ps": "পশ্তু",
+        "Language_pt": "পর্তুগীজ",
+        "Language_qu": "কেচুয়া",
+        "Language_rm": "রেটো-রোমানীয়",
+        "Language_rn": "রুন্দি",
+        "Language_ro": "রোমানীয়",
+        "Language_ru": "রুশ",
+        "Language_rw": "কিনয়ারোয়ান্ডা",
+        "Language_sa": "সংষ্কৃত",
+        "Language_sc": "সার্ডিনিয়ান",
+        "Language_sd": "সিন্ধি",
+        "Language_se": "উত্তরাঞ্চলীয় সামি",
+        "Language_sg": "সাঙ্গো",
+        "Language_si": "সিংহলী",
+        "Language_sk": "স্লোভাক",
+        "Language_sl": "স্লোভেনীয়",
+        "Language_sm": "সামোয়ান",
+        "Language_sn": "শোনা",
+        "Language_so": "সোমালী",
+        "Language_sq": "আলবেনীয়",
+        "Language_sr": "সার্বীয়",
+        "Language_ss": "সোয়াতি",
+        "Language_st": "দক্ষিন সোথো",
+        "Language_su": "সুদানী",
+        "Language_sv": "সুইডিশ",
+        "Language_sw": "সোয়াহিলি",
+        "Language_ta": "তামিল",
+        "Language_te": "তেলেগু",
+        "Language_tg": "তাজিক",
+        "Language_th": "থাই",
+        "Language_ti": "তিগরিনিয়া",
+        "Language_tk": "তুর্কমেনী",
+        "Language_tl": "তাগালগ",
+        "Language_tn": "সোয়ানা",
+        "Language_to": "টঙ্গা",
+        "Language_tr": "তুর্কী",
+        "Language_ts": "সঙ্গা",
+        "Language_tt": "তাতার",
+        "Language_tw": "টোয়াই",
+        "Language_ty": "তাহিতিয়ান",
+        "Language_ug": "উইঘুর",
+        "Language_uk": "ইউক্রেনীয়",
+        "Language_ur": "উর্দু",
+        "Language_uz": "উজবেকীয়",
+        "Language_ve": "ভেন্ডা",
+        "Language_vi": "ভিয়েতনামী",
+        "Language_vo": "ভোলাপুক",
+        "Language_wa": "ওয়ালুন",
+        "Language_wo": "উওলোফ",
+        "Language_xh": "জোসা",
+        "Language_yi": "য়িদ্দিশ",
+        "Language_yo": "ইওরুবা",
+        "Language_za": "ঝু্য়াঙ",
+        "Language_zh": "চীনা",
+        "Language_zu": "জুলু"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/bs.json b/plugins/UserLanguage/lang/bs.json
new file mode 100644
index 0000000000..ca9c0b02d2
--- /dev/null
+++ b/plugins/UserLanguage/lang/bs.json
@@ -0,0 +1,188 @@
+{
+    "UserLanguage": {
+        "Language_aa": "afarski",
+        "Language_ab": "abkazijski",
+        "Language_ae": "avestanski",
+        "Language_af": "afrikaans",
+        "Language_ak": "akan",
+        "Language_am": "amharski",
+        "Language_an": "aragonežanski",
+        "Language_ar": "arapski",
+        "Language_as": "asameski",
+        "Language_av": "avarski",
+        "Language_ay": "ajmara",
+        "Language_az": "azerbejdžanski",
+        "Language_ba": "baškir",
+        "Language_be": "bjeloruski",
+        "Language_bg": "bugarski",
+        "Language_bh": "bihari",
+        "Language_bi": "bislama",
+        "Language_bm": "bambara",
+        "Language_bn": "bengalski",
+        "Language_bo": "tibetanski",
+        "Language_br": "bretonac",
+        "Language_bs": "bosanski",
+        "Language_ca": "katalonski",
+        "Language_ce": "čečenski",
+        "Language_ch": "čamoro",
+        "Language_co": "korzikanski",
+        "Language_cr": "kri",
+        "Language_cs": "češki",
+        "Language_cu": "staroslovenski",
+        "Language_cv": "čuvaški",
+        "Language_cy": "velški",
+        "Language_da": "danski",
+        "Language_de": "njemački",
+        "Language_dv": "divehijski",
+        "Language_dz": "džonga",
+        "Language_ee": "eve",
+        "Language_el": "grčki",
+        "Language_en": "engleski",
+        "Language_eo": "esperanto",
+        "Language_es": "španjolski",
+        "Language_et": "estonski",
+        "Language_eu": "baskijski",
+        "Language_fa": "perzijski",
+        "Language_ff": "fulah",
+        "Language_fi": "finski",
+        "Language_fj": "fidžijski",
+        "Language_fo": "farski",
+        "Language_fr": "francuski",
+        "Language_fy": "frizijski",
+        "Language_ga": "irski",
+        "Language_gd": "škotski gelski",
+        "Language_gl": "galicijski",
+        "Language_gn": "guarani",
+        "Language_gu": "gudžarati",
+        "Language_gv": "manks",
+        "Language_ha": "hausa",
+        "Language_he": "hebrejski",
+        "Language_hi": "hindu",
+        "Language_ho": "hiri motu",
+        "Language_hr": "hrvatski",
+        "Language_ht": "haićanski",
+        "Language_hu": "mađarski",
+        "Language_hy": "armenski",
+        "Language_hz": "herero",
+        "Language_ia": "interlingua",
+        "Language_id": "indonezijski",
+        "Language_ie": "međujezični",
+        "Language_ig": "igbo",
+        "Language_ii": "sičuan ji",
+        "Language_ik": "inupiak",
+        "Language_io": "ido",
+        "Language_is": "islandski",
+        "Language_it": "talijanski",
+        "Language_iu": "inuktitut",
+        "Language_ja": "japanski",
+        "Language_jv": "javanski",
+        "Language_ka": "gruzijski",
+        "Language_kg": "kongo",
+        "Language_ki": "kikuju",
+        "Language_kj": "kuanjama",
+        "Language_kk": "kozački",
+        "Language_kl": "kalalisutski",
+        "Language_km": "kambodžanski",
+        "Language_kn": "kannada",
+        "Language_ko": "koreanski",
+        "Language_kr": "kanuri",
+        "Language_ks": "kašmiri",
+        "Language_ku": "kurdski",
+        "Language_kv": "komi",
+        "Language_kw": "korniški",
+        "Language_ky": "kirgiski",
+        "Language_la": "latinski",
+        "Language_lb": "luksemburški",
+        "Language_lg": "ganda",
+        "Language_li": "limburgiš",
+        "Language_ln": "n\/a",
+        "Language_lo": "laothian",
+        "Language_lt": "litvanski",
+        "Language_lu": "luba-katanga",
+        "Language_lv": "latvijski",
+        "Language_mg": "malagazijski",
+        "Language_mh": "maršalski",
+        "Language_mi": "maorski",
+        "Language_mk": "makedonski",
+        "Language_ml": "malajalamski",
+        "Language_mn": "mongolski",
+        "Language_mr": "marati",
+        "Language_ms": "malajski",
+        "Language_mt": "malteški",
+        "Language_my": "burmanski",
+        "Language_na": "nauru",
+        "Language_nb": "norveški bokmål",
+        "Language_nd": "severni ndebele",
+        "Language_ne": "nepalski",
+        "Language_ng": "ndonga",
+        "Language_nl": "holandski",
+        "Language_nn": "norveški (novonorveški)",
+        "Language_no": "norveški",
+        "Language_nr": "južni ndebele",
+        "Language_nv": "navaho",
+        "Language_ny": "njanja",
+        "Language_oc": "oksitanski",
+        "Language_oj": "ojibva",
+        "Language_om": "oromo",
+        "Language_or": "indijski",
+        "Language_os": "osetski",
+        "Language_pa": "pendžabi",
+        "Language_pi": "pali",
+        "Language_pl": "poljski",
+        "Language_ps": "pakistanski",
+        "Language_pt": "portugalski",
+        "Language_qu": "kvenča",
+        "Language_rm": "reto-romanski",
+        "Language_rn": "rundi",
+        "Language_ro": "rumunski",
+        "Language_ru": "ruski",
+        "Language_rw": "kinjarvanda",
+        "Language_sa": "sanskrit",
+        "Language_sc": "sardinijski",
+        "Language_sd": "sindi",
+        "Language_se": "severni sami",
+        "Language_sg": "sango",
+        "Language_si": "sinhaleski",
+        "Language_sk": "slovački",
+        "Language_sl": "slovenački",
+        "Language_sm": "samoanski",
+        "Language_sn": "šona",
+        "Language_so": "somalski",
+        "Language_sq": "albanski",
+        "Language_sr": "srpski",
+        "Language_ss": "svati",
+        "Language_st": "sesoto",
+        "Language_su": "sudanski",
+        "Language_sv": "švedski",
+        "Language_sw": "svahili",
+        "Language_ta": "tamilski",
+        "Language_te": "telugu",
+        "Language_tg": "tađik",
+        "Language_th": "tajlandski",
+        "Language_ti": "tigrinya (eritrejski)",
+        "Language_tk": "turkmenski",
+        "Language_tl": "tagalski",
+        "Language_tn": "tsvana",
+        "Language_to": "tonga",
+        "Language_tr": "turski",
+        "Language_ts": "tsonga",
+        "Language_tt": "tatarski",
+        "Language_tw": "twi",
+        "Language_ty": "tahićanski",
+        "Language_ug": "uighur",
+        "Language_uk": "ukrajinski",
+        "Language_ur": "urdu",
+        "Language_uz": "uzbekistanski",
+        "Language_ve": "venda",
+        "Language_vi": "vijetnamski",
+        "Language_vo": "volapük",
+        "Language_wa": "valun",
+        "Language_wo": "volof",
+        "Language_xh": "bantu",
+        "Language_yi": "jidiš",
+        "Language_yo": "jorubanski",
+        "Language_za": "zuang",
+        "Language_zh": "kineski",
+        "Language_zu": "zulu"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/ca.json b/plugins/UserLanguage/lang/ca.json
new file mode 100644
index 0000000000..46c4b804ea
--- /dev/null
+++ b/plugins/UserLanguage/lang/ca.json
@@ -0,0 +1,189 @@
+{
+    "UserLanguage": {
+        "Language_aa": "Afar",
+        "Language_ab": "Abkhazian",
+        "Language_ae": "Avestan",
+        "Language_af": "Africaans",
+        "Language_ak": "Akan",
+        "Language_am": "Amharic",
+        "Language_an": "Aragonès",
+        "Language_ar": "Aràbic",
+        "Language_as": "Assamès",
+        "Language_av": "Avaric",
+        "Language_ay": "Aymara",
+        "Language_az": "Azerbaidjan",
+        "Language_ba": "Bashkir",
+        "Language_be": "Bielorúss",
+        "Language_bg": "Búlgar",
+        "Language_bh": "Bihari",
+        "Language_bi": "Bislama",
+        "Language_bm": "Bambara",
+        "Language_bn": "Bengalí",
+        "Language_bo": "Tibetà",
+        "Language_br": "Bretó",
+        "Language_bs": "Bosnià",
+        "Language_ca": "Català",
+        "Language_ce": "Txetxè",
+        "Language_ch": "Chamorro",
+        "Language_co": "Cors",
+        "Language_cr": "Cree",
+        "Language_cs": "Txec",
+        "Language_cu": "Eslau",
+        "Language_cv": "Chuvash",
+        "Language_cy": "Gal·lès",
+        "Language_da": "Danès",
+        "Language_de": "Alemany",
+        "Language_dv": "Divehi",
+        "Language_dz": "Dzongkha",
+        "Language_ee": "Ewe",
+        "Language_el": "Grec",
+        "Language_en": "Anglès",
+        "Language_eo": "Esperanto",
+        "Language_es": "Castellà",
+        "Language_et": "Estònia",
+        "Language_eu": "Basc",
+        "Language_fa": "Persa",
+        "Language_ff": "Fulah",
+        "Language_fi": "Finès",
+        "Language_fj": "Fiji",
+        "Language_fo": "Illes Fèroe",
+        "Language_fr": "Francès",
+        "Language_fy": "Frisian de l'est",
+        "Language_ga": "Irlandès",
+        "Language_gd": "Gaèlic escocès",
+        "Language_gl": "Gallec",
+        "Language_gn": "Guaraní",
+        "Language_gu": "Gujarati",
+        "Language_gv": "Illa de Man",
+        "Language_ha": "Hausa",
+        "Language_he": "Hebreu",
+        "Language_hi": "Hindi",
+        "Language_ho": "Hiri Motu",
+        "Language_hr": "Croat",
+        "Language_ht": "Creole haitià",
+        "Language_hu": "Hongarès",
+        "Language_hy": "Armeni",
+        "Language_hz": "Herero",
+        "Language_ia": "Interlingua",
+        "Language_id": "Indonesi",
+        "Language_ie": "Interlingue",
+        "Language_ig": "Igbo",
+        "Language_ii": "Sichuan Yi",
+        "Language_ik": "Inupiaq",
+        "Language_io": "Ido",
+        "Language_is": "Islandès",
+        "Language_it": "Italià",
+        "Language_iu": "Inuktitut",
+        "Language_ja": "Japonès",
+        "Language_jv": "Javanès",
+        "Language_ka": "Georgià",
+        "Language_kg": "Kongo",
+        "Language_ki": "Kukuyu",
+        "Language_kj": "Kuanyama",
+        "Language_kk": "Kazakhstan",
+        "Language_kl": "Groenlàndia",
+        "Language_km": "Khmer Central",
+        "Language_kn": "Kannada",
+        "Language_ko": "Coreà",
+        "Language_kr": "Kanuri",
+        "Language_ks": "Kashmiri",
+        "Language_ku": "Kurd",
+        "Language_kv": "Komi",
+        "Language_kw": "Cornish",
+        "Language_ky": "Kirghiz",
+        "Language_la": "LLatí",
+        "Language_lb": "Luxemburguès",
+        "Language_lg": "Ganda",
+        "Language_li": "Limburguès",
+        "Language_ln": "Lingala",
+        "Language_lo": "Lao",
+        "Language_lt": "Lituà",
+        "Language_lu": "Luba-Katanga",
+        "Language_lv": "Letó",
+        "Language_mg": "Malgaix",
+        "Language_mh": "Illes Marshall",
+        "Language_mi": "Maori",
+        "Language_mk": "Macedoni",
+        "Language_ml": "Malayalam",
+        "Language_mn": "Mongol",
+        "Language_mr": "Marathi",
+        "Language_ms": "Malai",
+        "Language_mt": "Maltès",
+        "Language_my": "Birmà",
+        "Language_na": "Nauru",
+        "Language_nb": "Bokmal Norueg",
+        "Language_nd": "Ndebele del Nord",
+        "Language_ne": "Nepalès",
+        "Language_ng": "Ndonga",
+        "Language_nl": "Holandès",
+        "Language_nn": "Nynorsk de Noruega",
+        "Language_no": "Noruec",
+        "Language_nr": "Ndebele del Sud",
+        "Language_nv": "Navajo",
+        "Language_ny": "Chichewa",
+        "Language_oc": "Occità",
+        "Language_oj": "Ojibwa",
+        "Language_om": "Oroma",
+        "Language_or": "Oriya",
+        "Language_os": "Ossètia",
+        "Language_pa": "Panjabí",
+        "Language_pi": "Pali",
+        "Language_pl": "Polonès",
+        "Language_ps": "Pashto",
+        "Language_pt": "Portuguès",
+        "Language_qu": "Quechua",
+        "Language_rm": "Retorromànic",
+        "Language_rn": "Rundi",
+        "Language_ro": "Romanès",
+        "Language_ru": "Rus",
+        "Language_rw": "Kinyarwanda",
+        "Language_sa": "Sànscrit",
+        "Language_sc": "Sardo",
+        "Language_sd": "Sindhi",
+        "Language_se": "Sami del Nord",
+        "Language_sg": "Sango",
+        "Language_si": "Sinhala",
+        "Language_sk": "Eslovac",
+        "Language_sl": "Eslovè",
+        "Language_sm": "Samoa",
+        "Language_sn": "Shona",
+        "Language_so": "Somali",
+        "Language_sq": "Albanès",
+        "Language_sr": "Serbi",
+        "Language_ss": "Swati",
+        "Language_st": "Sotho",
+        "Language_su": "Sudanès",
+        "Language_sv": "Suec",
+        "Language_sw": "Swahili",
+        "Language_ta": "Tamil",
+        "Language_te": "Telugu",
+        "Language_tg": "Tajik",
+        "Language_th": "Thai",
+        "Language_ti": "Tigrinya",
+        "Language_tk": "Turkmenistan",
+        "Language_tl": "Tagalog",
+        "Language_tn": "Tswana",
+        "Language_to": "Tonga",
+        "Language_tr": "Turc",
+        "Language_ts": "Tsonga",
+        "Language_tt": "Tatar",
+        "Language_tw": "Twi",
+        "Language_ty": "Tahitian",
+        "Language_ug": "Uighur",
+        "Language_uk": "Ucranià",
+        "Language_ur": "Urdu",
+        "Language_uz": "Uzbec",
+        "Language_ve": "Venda",
+        "Language_vi": "Vietnamita",
+        "Language_vo": "Volapük",
+        "Language_wa": "Valònia",
+        "Language_wo": "Wolof",
+        "Language_xh": "Xhosa",
+        "Language_yi": "Jiddisch",
+        "Language_yo": "Yoruba",
+        "Language_za": "Chuang",
+        "Language_zh": "Xinès",
+        "Language_zu": "Zulu",
+        "LanguageCode": "Codi de l'idioma"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/cs.json b/plugins/UserLanguage/lang/cs.json
new file mode 100644
index 0000000000..6ad46eca5a
--- /dev/null
+++ b/plugins/UserLanguage/lang/cs.json
@@ -0,0 +1,191 @@
+{
+    "UserLanguage": {
+        "BrowserLanguage": "Jazyk prohlížeče",
+        "Language_aa": "afarština",
+        "Language_ab": "abcházština",
+        "Language_ae": "avestánština",
+        "Language_af": "afrikánština",
+        "Language_ak": "akanština",
+        "Language_am": "amharština",
+        "Language_an": "aragonština",
+        "Language_ar": "arabština",
+        "Language_as": "assaméština",
+        "Language_av": "avarština",
+        "Language_ay": "aymárština",
+        "Language_az": "azerbajdžánština",
+        "Language_ba": "baskirština",
+        "Language_be": "běloruština",
+        "Language_bg": "bulharština",
+        "Language_bh": "biharština",
+        "Language_bi": "bislámština",
+        "Language_bm": "bambarština",
+        "Language_bn": "bengálština",
+        "Language_bo": "tibetština",
+        "Language_br": "bretaňština",
+        "Language_bs": "bosenština",
+        "Language_ca": "katalánština",
+        "Language_ce": "čečenština",
+        "Language_ch": "čamoro",
+        "Language_co": "korsičtina",
+        "Language_cr": "krí",
+        "Language_cs": "čeština",
+        "Language_cu": "staroslověnština",
+        "Language_cv": "čuvašština",
+        "Language_cy": "velština",
+        "Language_da": "dánština",
+        "Language_de": "němčina",
+        "Language_dv": "divehi",
+        "Language_dz": "bhútánština",
+        "Language_ee": "eweština",
+        "Language_el": "řečtina",
+        "Language_en": "angličtina",
+        "Language_eo": "esperanto",
+        "Language_es": "španělština",
+        "Language_et": "estonština",
+        "Language_eu": "baskičtina",
+        "Language_fa": "perština",
+        "Language_ff": "fulahština",
+        "Language_fi": "finština",
+        "Language_fj": "fidži",
+        "Language_fo": "faerština",
+        "Language_fr": "francouzština",
+        "Language_fy": "fríština",
+        "Language_ga": "irština",
+        "Language_gd": "skotská galština",
+        "Language_gl": "haličština",
+        "Language_gn": "guaranština",
+        "Language_gu": "gujaratština",
+        "Language_gv": "manština",
+        "Language_ha": "hausa",
+        "Language_he": "hebrejština",
+        "Language_hi": "hindština",
+        "Language_ho": "hiri motu",
+        "Language_hr": "chorvatština",
+        "Language_ht": "haitština",
+        "Language_hu": "maďarština",
+        "Language_hy": "arménština",
+        "Language_hz": "herero",
+        "Language_ia": "interlingua",
+        "Language_id": "indonéština",
+        "Language_ie": "interlingue",
+        "Language_ig": "igboština",
+        "Language_ii": "Jazyk Yi",
+        "Language_ik": "inupiakština",
+        "Language_io": "ido",
+        "Language_is": "islandština",
+        "Language_it": "italština",
+        "Language_iu": "inuktitutština",
+        "Language_ja": "japonština",
+        "Language_jv": "javánština",
+        "Language_ka": "gruzínština",
+        "Language_kg": "konžština",
+        "Language_ki": "kikujština",
+        "Language_kj": "kuaňamština",
+        "Language_kk": "kazachština",
+        "Language_kl": "grónština",
+        "Language_km": "kambodžština",
+        "Language_kn": "kannadština",
+        "Language_ko": "korejština",
+        "Language_kr": "kanuri",
+        "Language_ks": "kašmírština",
+        "Language_ku": "kurdština",
+        "Language_kv": "komijština",
+        "Language_kw": "kornština",
+        "Language_ky": "kirgizština",
+        "Language_la": "latina",
+        "Language_lb": "Lucemburština",
+        "Language_lg": "ganda",
+        "Language_li": "limburština",
+        "Language_ln": "lingalština",
+        "Language_lo": "laoština",
+        "Language_lt": "litevština",
+        "Language_lu": "lubu-katanžština",
+        "Language_lv": "lotyština",
+        "Language_mg": "malgaština",
+        "Language_mh": "maršálština",
+        "Language_mi": "maorština",
+        "Language_mk": "makedonština",
+        "Language_ml": "malabarština",
+        "Language_mn": "mongolština",
+        "Language_mr": "marathi",
+        "Language_ms": "malajština",
+        "Language_mt": "maltština",
+        "Language_my": "barmština",
+        "Language_na": "nauru",
+        "Language_nb": "norština (Bokmål)",
+        "Language_nd": "ndebele (Zimbabwe)",
+        "Language_ne": "nepálština",
+        "Language_ng": "ndondština",
+        "Language_nl": "nizozemština",
+        "Language_nn": "norština (nynorsk)",
+        "Language_no": "norština",
+        "Language_nr": "ndebele (Jižní Afrika)",
+        "Language_nv": "navažština",
+        "Language_ny": "ňandžština",
+        "Language_oc": "occitan",
+        "Language_oj": "odžibvejština",
+        "Language_om": "Oromo (Afan)",
+        "Language_or": "oriya",
+        "Language_os": "osetština",
+        "Language_pa": "paňdžábština",
+        "Language_pi": "pálí",
+        "Language_pl": "polština",
+        "Language_ps": "Pashto (Pushto)",
+        "Language_pt": "portugalština",
+        "Language_qu": "kečuánština",
+        "Language_rm": "rétorománština",
+        "Language_rn": "kirundi",
+        "Language_ro": "rumunština",
+        "Language_ru": "ruština",
+        "Language_rw": "kinyarwandština",
+        "Language_sa": "sanskrt",
+        "Language_sc": "sardština",
+        "Language_sd": "sindhi",
+        "Language_se": "sámština (severní)",
+        "Language_sg": "sangho",
+        "Language_si": "sinhálština",
+        "Language_sk": "slovenština",
+        "Language_sl": "slovinština",
+        "Language_sm": "samoyština",
+        "Language_sn": "shona",
+        "Language_so": "somálština",
+        "Language_sq": "albánština",
+        "Language_sr": "srbština",
+        "Language_ss": "siswatština",
+        "Language_st": "sesotho",
+        "Language_su": "sundanština",
+        "Language_sv": "švédština",
+        "Language_sw": "svahilština",
+        "Language_ta": "tamilština",
+        "Language_te": "telugština",
+        "Language_tg": "tádžičtina",
+        "Language_th": "thajština",
+        "Language_ti": "tigrinijština",
+        "Language_tk": "turkmenština",
+        "Language_tl": "tagalog",
+        "Language_tn": "setswanština",
+        "Language_to": "tonga",
+        "Language_tr": "turečtina",
+        "Language_ts": "tsonga",
+        "Language_tt": "tatarština",
+        "Language_tw": "twi",
+        "Language_ty": "tahitština",
+        "Language_ug": "uighurština",
+        "Language_uk": "ukrajinština",
+        "Language_ur": "urdština",
+        "Language_uz": "uzbečtina",
+        "Language_ve": "vendština",
+        "Language_vi": "vietnamština",
+        "Language_vo": "volapuk",
+        "Language_wa": "valonština",
+        "Language_wo": "wolof",
+        "Language_xh": "xhosa",
+        "Language_yi": "jidiš",
+        "Language_yo": "yoruba",
+        "Language_za": "zhuang",
+        "Language_zh": "čínština",
+        "Language_zu": "zulu",
+        "LanguageCode": "Jazykový kód",
+        "PluginDescription": "Hlásí jazyk prohlížeče vašich návštěvníků."
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/cy.json b/plugins/UserLanguage/lang/cy.json
new file mode 100644
index 0000000000..a5ade8256f
--- /dev/null
+++ b/plugins/UserLanguage/lang/cy.json
@@ -0,0 +1,174 @@
+{
+    "UserLanguage": {
+        "Language_aa": "Affareg",
+        "Language_ab": "Abchaseg",
+        "Language_ae": "Afestaneg",
+        "Language_af": "Affricaneg",
+        "Language_ak": "Acaneg",
+        "Language_am": "Amhareg",
+        "Language_an": "Aragoneg",
+        "Language_ar": "Arabeg",
+        "Language_as": "Asameg",
+        "Language_av": "Afareg",
+        "Language_az": "Azerbaijani",
+        "Language_ba": "Bashcorteg",
+        "Language_be": "Belarwsiyn",
+        "Language_bg": "Bwlgareg",
+        "Language_bh": "Bihari",
+        "Language_bi": "Bislama",
+        "Language_bm": "Bambareg",
+        "Language_bn": "Bengali; Bangla",
+        "Language_bo": "Tibeteg",
+        "Language_br": "Llydaweg",
+        "Language_bs": "Bosnieg",
+        "Language_ca": "Catalaneg",
+        "Language_ce": "Tsietsieneg",
+        "Language_ch": "Tsiamorro",
+        "Language_co": "Corseg",
+        "Language_cr": "Cri",
+        "Language_cs": "Tsiec",
+        "Language_cu": "Hen Slafoneg",
+        "Language_cy": "Cymraeg",
+        "Language_da": "Daneg",
+        "Language_de": "Almaeneg",
+        "Language_dv": "Difehi",
+        "Language_ee": "Ewe",
+        "Language_el": "Groeg",
+        "Language_en": "Saesneg",
+        "Language_eo": "Esperanto",
+        "Language_es": "Sbaeneg",
+        "Language_et": "Estoneg",
+        "Language_eu": "Basgeg",
+        "Language_fa": "Persieg",
+        "Language_ff": "Ffwla",
+        "Language_fi": "Ffineg",
+        "Language_fj": "Ffijïeg",
+        "Language_fo": "Ffaroeg",
+        "Language_fr": "Ffrangeg",
+        "Language_fy": "Ffrisieg",
+        "Language_ga": "Gwyddeleg",
+        "Language_gd": "Gaeleg yr Alban",
+        "Language_gl": "Galiseg",
+        "Language_gn": "Guarani",
+        "Language_gu": "Gwjarati",
+        "Language_gv": "Manaweg",
+        "Language_ha": "Hawsa",
+        "Language_he": "Hebraeg",
+        "Language_hi": "Hindi",
+        "Language_hr": "Croateg",
+        "Language_ht": "Creol Haiti",
+        "Language_hu": "Hwngareg",
+        "Language_hy": "Armeneg",
+        "Language_hz": "Herero",
+        "Language_ia": "Interlingua",
+        "Language_id": "Indonesieg",
+        "Language_ie": "Interlingue",
+        "Language_ig": "Igbo",
+        "Language_ii": "Nwosw",
+        "Language_ik": "Inwpiaceg",
+        "Language_is": "Islandeg",
+        "Language_it": "Eidaleg",
+        "Language_iu": "Inwctitwt",
+        "Language_ja": "Siapaneeg",
+        "Language_jv": "Jafanaeg",
+        "Language_ka": "Georgeg",
+        "Language_kg": "Congo",
+        "Language_ki": "Cicwyeg",
+        "Language_kk": "Casacheg",
+        "Language_km": "Cambodieg",
+        "Language_kn": "Kannada",
+        "Language_ko": "Corëeg",
+        "Language_kr": "Canwri",
+        "Language_ks": "Cashmireg",
+        "Language_ku": "Cwrdeg",
+        "Language_kv": "Comi",
+        "Language_kw": "Cernyweg",
+        "Language_ky": "Kyrgyz",
+        "Language_la": "Lladin",
+        "Language_lb": "Lwcsembwrgeg",
+        "Language_lg": "Ganda",
+        "Language_li": "Limbwrgeg",
+        "Language_ln": "Lingala",
+        "Language_lo": "Laoeg",
+        "Language_lt": "Lithwaneg",
+        "Language_lv": "Latfieg",
+        "Language_mg": "Malagaseg",
+        "Language_mh": "Marsialeg",
+        "Language_mi": "Maori",
+        "Language_mk": "Macedoneg",
+        "Language_ml": "Malayalam",
+        "Language_mn": "Mongoleg",
+        "Language_mr": "Marathi",
+        "Language_ms": "Malai",
+        "Language_mt": "Malteseg",
+        "Language_my": "Byrmaneg",
+        "Language_na": "Nawrŵeg",
+        "Language_nb": "Norwyeg Bokmål",
+        "Language_nd": "Ndebele Gogleddol",
+        "Language_ne": "Nepali",
+        "Language_nl": "Iseldireg",
+        "Language_nn": "Norwyeg (Nynorsk)",
+        "Language_no": "Norwyeg",
+        "Language_nr": "Ndebele Deheuol",
+        "Language_nv": "Nafaho",
+        "Language_ny": "Nianja",
+        "Language_oc": "Ocsitaneg",
+        "Language_oj": "Ojibwa",
+        "Language_om": "Oromo",
+        "Language_or": "Oriya",
+        "Language_os": "Oseteg",
+        "Language_pa": "Pwnjabi",
+        "Language_pl": "Pwyleg",
+        "Language_ps": "Pashto",
+        "Language_pt": "Portiwgaleg",
+        "Language_qu": "Quechua",
+        "Language_rm": "Romaunsch",
+        "Language_rn": "Rwndi",
+        "Language_ro": "Rwmaneg",
+        "Language_ru": "Rwsieg",
+        "Language_rw": "Ciniarŵandeg",
+        "Language_sa": "Sansgrit",
+        "Language_sc": "Sardeg",
+        "Language_sd": "Sindhi",
+        "Language_se": "Sami Gogleddol",
+        "Language_sg": "Sango",
+        "Language_si": "Sinhaleg",
+        "Language_sk": "Slofaceg",
+        "Language_sl": "Slofeneg",
+        "Language_sm": "Samöeg",
+        "Language_so": "Somaleg",
+        "Language_sq": "Albaneg",
+        "Language_sr": "Serbeg",
+        "Language_st": "Sesotheg",
+        "Language_su": "Sundaneg",
+        "Language_sv": "Swedeg",
+        "Language_sw": "Swahili",
+        "Language_ta": "Tamil",
+        "Language_te": "Telugu",
+        "Language_tg": "Tajiceg",
+        "Language_th": "Thai",
+        "Language_ti": "Tigrinya",
+        "Language_tk": "Tyrcmeneg",
+        "Language_tl": "Tagalog*",
+        "Language_tn": "Tswana",
+        "Language_to": "Tongeg",
+        "Language_tr": "Twrceg",
+        "Language_ts": "Tsongaeg",
+        "Language_tt": "Tatareg",
+        "Language_tw": "Twi",
+        "Language_ty": "Tahitïeg",
+        "Language_ug": "Uighur",
+        "Language_uk": "Wcreineg",
+        "Language_ur": "Urdu",
+        "Language_uz": "Wsbeceg",
+        "Language_ve": "Fendeg",
+        "Language_vi": "Fietnameg",
+        "Language_wa": "Walwneg",
+        "Language_wo": "Woloff",
+        "Language_xh": "Xhosa",
+        "Language_yi": "Iddew-Almaeneg",
+        "Language_yo": "Iorwba",
+        "Language_zh": "Tseineeg",
+        "Language_zu": "Zwlw"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/da.json b/plugins/UserLanguage/lang/da.json
new file mode 100644
index 0000000000..fb0dce7faf
--- /dev/null
+++ b/plugins/UserLanguage/lang/da.json
@@ -0,0 +1,190 @@
+{
+    "UserLanguage": {
+        "BrowserLanguage": "Browser sprog",
+        "Language_aa": "Afar",
+        "Language_ab": "Abkhasisk",
+        "Language_ae": "Avestisk",
+        "Language_af": "Afrikaans",
+        "Language_ak": "Akan",
+        "Language_am": "Amharisk",
+        "Language_an": "Aragonisk",
+        "Language_ar": "Arabisk",
+        "Language_as": "Assamesisk",
+        "Language_av": "Avarisk",
+        "Language_ay": "Aymara",
+        "Language_az": "Aserbajdsjansk",
+        "Language_ba": "Basjkirsk",
+        "Language_be": "Hviderussisk",
+        "Language_bg": "Bulgarsk",
+        "Language_bh": "Bihari",
+        "Language_bi": "Bislama",
+        "Language_bm": "Bambara",
+        "Language_bn": "Bengali",
+        "Language_bo": "Tibetansk",
+        "Language_br": "Bretonsk",
+        "Language_bs": "Bosnisk",
+        "Language_ca": "Katalansk",
+        "Language_ce": "Tjetjensk",
+        "Language_ch": "Chamorro",
+        "Language_co": "Korsikansk",
+        "Language_cr": "Cree",
+        "Language_cs": "Tjekkisk",
+        "Language_cu": "Kirkeslavisk",
+        "Language_cv": "Tsjuvansk",
+        "Language_cy": "Walisisk",
+        "Language_da": "Dansk",
+        "Language_de": "Tysk",
+        "Language_dv": "Dhivehi",
+        "Language_dz": "Dzongkha",
+        "Language_ee": "Ewe",
+        "Language_el": "Græsk",
+        "Language_en": "Engelsk",
+        "Language_eo": "Esperanto",
+        "Language_es": "Spansk",
+        "Language_et": "Estisk",
+        "Language_eu": "Baskisk",
+        "Language_fa": "Persisk",
+        "Language_ff": "Fulfulde",
+        "Language_fi": "Finsk",
+        "Language_fj": "Fijisk",
+        "Language_fo": "Færøsk",
+        "Language_fr": "Fransk",
+        "Language_fy": "Frisisk",
+        "Language_ga": "Irsk",
+        "Language_gd": "Skotsk gælisk",
+        "Language_gl": "Galicisk",
+        "Language_gn": "Guaraní",
+        "Language_gu": "Gujarati",
+        "Language_gv": "Mansk",
+        "Language_ha": "Hausa",
+        "Language_he": "Hebraisk",
+        "Language_hi": "Hindi",
+        "Language_ho": "Hiri motu",
+        "Language_hr": "Kroatisk",
+        "Language_ht": "Haitisk kreolsk",
+        "Language_hu": "Ungarsk",
+        "Language_hy": "Armensk",
+        "Language_hz": "Herero",
+        "Language_ia": "Interlingua",
+        "Language_id": "Indonesisk",
+        "Language_ie": "Interlingue",
+        "Language_ig": "Ibo",
+        "Language_ii": "Yi",
+        "Language_ik": "Inupiak",
+        "Language_io": "Ido",
+        "Language_is": "Islandsk",
+        "Language_it": "Italiensk",
+        "Language_iu": "Inuittisk",
+        "Language_ja": "Japansk",
+        "Language_jv": "Javanesisk",
+        "Language_ka": "Georgisk",
+        "Language_kg": "Congolesisk",
+        "Language_ki": "Gikuyu",
+        "Language_kj": "Kwanyama",
+        "Language_kk": "Kasakhisk",
+        "Language_kl": "Kalaallisut",
+        "Language_km": "Khmer",
+        "Language_kn": "Kannada",
+        "Language_ko": "Koreansk",
+        "Language_kr": "Kanuri",
+        "Language_ks": "Kashmirisk",
+        "Language_ku": "Kurdisk",
+        "Language_kv": "Komi",
+        "Language_kw": "Kornisk",
+        "Language_ky": "Kirgisisk",
+        "Language_la": "Latinsk",
+        "Language_lb": "Luxembourgsk",
+        "Language_lg": "Luganda",
+        "Language_li": "Limburgisk",
+        "Language_ln": "Lingala",
+        "Language_lo": "Laotisk",
+        "Language_lt": "Litauisk",
+        "Language_lu": "Luba-Katanga",
+        "Language_lv": "Lettisk",
+        "Language_mg": "Gassisk",
+        "Language_mh": "Marshallesisk",
+        "Language_mi": "Maoriski",
+        "Language_mk": "Makedonsk",
+        "Language_ml": "Malayalam",
+        "Language_mn": "Mongolsk",
+        "Language_mr": "Marathi",
+        "Language_ms": "Malajisk",
+        "Language_mt": "Maltesisk",
+        "Language_my": "Burmesisk",
+        "Language_na": "Naurisk",
+        "Language_nb": "Norsk Bokmål",
+        "Language_nd": "Nord-ndebele",
+        "Language_ne": "Nepali",
+        "Language_ng": "Ndonga",
+        "Language_nl": "Hollandsk",
+        "Language_nn": "Norsk (Nynorsk)",
+        "Language_no": "Norsk",
+        "Language_nr": "Syd-ndebele",
+        "Language_nv": "Navajo",
+        "Language_ny": "Chichewa",
+        "Language_oc": "Occitansk",
+        "Language_oj": "Ojibwa",
+        "Language_om": "Oromo",
+        "Language_or": "Oriya",
+        "Language_os": "Ossetisk",
+        "Language_pa": "Punjabi",
+        "Language_pi": "Pali",
+        "Language_pl": "Polsk",
+        "Language_ps": "Pashto",
+        "Language_pt": "Portugisisk",
+        "Language_qu": "Quechua",
+        "Language_rm": "Rætoromansk",
+        "Language_rn": "Kirundi",
+        "Language_ro": "Rumænsk",
+        "Language_ru": "Russisk",
+        "Language_rw": "Kinyarwanda",
+        "Language_sa": "Sanskrit",
+        "Language_sc": "Sardisk",
+        "Language_sd": "Sindhi",
+        "Language_se": "Nordsamisk",
+        "Language_sg": "Sango",
+        "Language_si": "Singalesisk",
+        "Language_sk": "Slovakisk",
+        "Language_sl": "Slovensk",
+        "Language_sm": "Samoansk",
+        "Language_sn": "Shona",
+        "Language_so": "Somali",
+        "Language_sq": "Albansk",
+        "Language_sr": "Serbisk",
+        "Language_ss": "Swati",
+        "Language_st": "Sesotho",
+        "Language_su": "Sundanesisk",
+        "Language_sv": "Svensk",
+        "Language_sw": "Swahili",
+        "Language_ta": "Tamilsk",
+        "Language_te": "Telugu",
+        "Language_tg": "Tadtjikkisk",
+        "Language_th": "Thai",
+        "Language_ti": "Tigrinya",
+        "Language_tk": "Turkmensk",
+        "Language_tl": "Tagalog",
+        "Language_tn": "Tswana",
+        "Language_to": "Tonganesisk",
+        "Language_tr": "Turkisk",
+        "Language_ts": "Tsonga",
+        "Language_tt": "Tatarsk",
+        "Language_tw": "Twi",
+        "Language_ty": "Tahitisk",
+        "Language_ug": "Uighur",
+        "Language_uk": "Ukainsk",
+        "Language_ur": "Urdu",
+        "Language_uz": "Usbekisk",
+        "Language_ve": "Venda",
+        "Language_vi": "Vietnamesisk",
+        "Language_vo": "Volapük",
+        "Language_wa": "Vallonsk",
+        "Language_wo": "Wolof",
+        "Language_xh": "Xhosa",
+        "Language_yi": "Jiddisch",
+        "Language_yo": "Yoruba",
+        "Language_za": "Zhuang",
+        "Language_zh": "Kinesisk",
+        "Language_zu": "Zulu",
+        "LanguageCode": "Sprogkode"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/de.json b/plugins/UserLanguage/lang/de.json
new file mode 100644
index 0000000000..5bc6200a47
--- /dev/null
+++ b/plugins/UserLanguage/lang/de.json
@@ -0,0 +1,191 @@
+{
+    "UserLanguage": {
+        "BrowserLanguage": "Browsersprache",
+        "Language_aa": "Afar",
+        "Language_ab": "Abchasisch",
+        "Language_ae": "Avestisch",
+        "Language_af": "Afrikaans",
+        "Language_ak": "Akan",
+        "Language_am": "Amharisch",
+        "Language_an": "Aragonesisch",
+        "Language_ar": "Arabisch",
+        "Language_as": "Assamesisch",
+        "Language_av": "Awarisch",
+        "Language_ay": "Aymara",
+        "Language_az": "Aserbaidschanisch",
+        "Language_ba": "Baschkirisch",
+        "Language_be": "Weissrussisch",
+        "Language_bg": "Bulgarisch",
+        "Language_bh": "Bihari",
+        "Language_bi": "Bislama",
+        "Language_bm": "Bambara",
+        "Language_bn": "Bengalisch",
+        "Language_bo": "Tibetisch",
+        "Language_br": "Bretonisch",
+        "Language_bs": "Bosnisch",
+        "Language_ca": "Katalanisch",
+        "Language_ce": "Tschetschenisch",
+        "Language_ch": "Chamorro",
+        "Language_co": "Korsisch",
+        "Language_cr": "Cree",
+        "Language_cs": "Tschechisch",
+        "Language_cu": "Altkirchenslawisch",
+        "Language_cv": "Tschuwaschisch",
+        "Language_cy": "Walisisch",
+        "Language_da": "Dänisch",
+        "Language_de": "Deutsch",
+        "Language_dv": "Divehi",
+        "Language_dz": "Dzongkha",
+        "Language_ee": "Ewe",
+        "Language_el": "Griechisch",
+        "Language_en": "Englisch",
+        "Language_eo": "Esperanto",
+        "Language_es": "Spanisch",
+        "Language_et": "Estnisch",
+        "Language_eu": "Baskisch",
+        "Language_fa": "Persisch",
+        "Language_ff": "Fulfulde",
+        "Language_fi": "Finnisch",
+        "Language_fj": "Fidschi",
+        "Language_fo": "Färöisch",
+        "Language_fr": "Französisch",
+        "Language_fy": "Westfrisisch",
+        "Language_ga": "Irisch",
+        "Language_gd": "Schottisch-Gälisch",
+        "Language_gl": "Galicisch",
+        "Language_gn": "Guaraní",
+        "Language_gu": "Gujarati",
+        "Language_gv": "Manx",
+        "Language_ha": "Hausa",
+        "Language_he": "Hebräisch",
+        "Language_hi": "Hindi",
+        "Language_ho": "Hiri Motu",
+        "Language_hr": "Kroatisch",
+        "Language_ht": "Haitianisch",
+        "Language_hu": "Ungarisch",
+        "Language_hy": "Armenisch",
+        "Language_hz": "Otjiherero",
+        "Language_ia": "Interlingua",
+        "Language_id": "Indonesisch",
+        "Language_ie": "Interlingue",
+        "Language_ig": "Igbo",
+        "Language_ii": "Sichuan Yi",
+        "Language_ik": "Inupiaq",
+        "Language_io": "Ido",
+        "Language_is": "Isländisch",
+        "Language_it": "Italienisch",
+        "Language_iu": "Inuktitut",
+        "Language_ja": "Japanisch",
+        "Language_jv": "Javanisch",
+        "Language_ka": "Georgisch",
+        "Language_kg": "Kikongo",
+        "Language_ki": "Kikuyu",
+        "Language_kj": "Kwanyama",
+        "Language_kk": "Kasachisch",
+        "Language_kl": "Kalaallisut",
+        "Language_km": "Khmer",
+        "Language_kn": "Kannada",
+        "Language_ko": "Koreanisch",
+        "Language_kr": "Kanuri",
+        "Language_ks": "Kashmiri",
+        "Language_ku": "Kurdisch",
+        "Language_kv": "Komi",
+        "Language_kw": "Kornisch",
+        "Language_ky": "Kirgisisch",
+        "Language_la": "Latein",
+        "Language_lb": "Luxemburgisch",
+        "Language_lg": "Luganda",
+        "Language_li": "Limburgisch",
+        "Language_ln": "Lingála",
+        "Language_lo": "Laotisch",
+        "Language_lt": "Lithauisch",
+        "Language_lu": "Tschiluba",
+        "Language_lv": "Lettisch",
+        "Language_mg": "Malagasy",
+        "Language_mh": "Marshallesisch",
+        "Language_mi": "Maorisch",
+        "Language_mk": "Mazedonisch",
+        "Language_ml": "Malayalam",
+        "Language_mn": "Mongolisch",
+        "Language_mr": "Marathi",
+        "Language_ms": "Malaiisch",
+        "Language_mt": "Maltesisch",
+        "Language_my": "Burmanisch",
+        "Language_na": "Nauruisch",
+        "Language_nb": "Norwegisch Bokmål",
+        "Language_nd": "(Nord) Ndebele",
+        "Language_ne": "Nepali",
+        "Language_ng": "Ndonga",
+        "Language_nl": "Niederländisch",
+        "Language_nn": "Norwegisch Nynorsk",
+        "Language_no": "Norwegisch",
+        "Language_nr": "(Süd) Ndebele",
+        "Language_nv": "Navajo",
+        "Language_ny": "Chichewa",
+        "Language_oc": "Okzitanisch",
+        "Language_oj": "Ojibwe",
+        "Language_om": "Oromo",
+        "Language_or": "Oriya",
+        "Language_os": "Ossetisch",
+        "Language_pa": "Panjabi",
+        "Language_pi": "Pali",
+        "Language_pl": "Polnisch",
+        "Language_ps": "Pashtunisch",
+        "Language_pt": "Portugiesisch",
+        "Language_qu": "Quechua",
+        "Language_rm": "Rätoromanisch",
+        "Language_rn": "Kirundi",
+        "Language_ro": "Rumänisch",
+        "Language_ru": "Russisch",
+        "Language_rw": "Kinyarwanda",
+        "Language_sa": "Sanskrit",
+        "Language_sc": "Sardisch",
+        "Language_sd": "Sindhi",
+        "Language_se": "Nordsamisch",
+        "Language_sg": "Sango",
+        "Language_si": "Singhalesisch",
+        "Language_sk": "Slovakisch",
+        "Language_sl": "Slovenisch",
+        "Language_sm": "Samoisch",
+        "Language_sn": "Shona",
+        "Language_so": "Somali",
+        "Language_sq": "Albanisch",
+        "Language_sr": "Serbisch",
+        "Language_ss": "Siswati",
+        "Language_st": "Süd-Sotho",
+        "Language_su": "Sundanesisch",
+        "Language_sv": "Schwedisch",
+        "Language_sw": "Swahili",
+        "Language_ta": "Tamil",
+        "Language_te": "Telugu",
+        "Language_tg": "Tadschikisch",
+        "Language_th": "Thailändisch",
+        "Language_ti": "Tigrinya",
+        "Language_tk": "Turkmenisch",
+        "Language_tl": "Tagalog",
+        "Language_tn": "Setswana",
+        "Language_to": "Tongaisch",
+        "Language_tr": "Türkisch",
+        "Language_ts": "Xitsonga",
+        "Language_tt": "Tatarisch",
+        "Language_tw": "Twi",
+        "Language_ty": "Tahitianisch",
+        "Language_ug": "Uigurisch",
+        "Language_uk": "Ukrainisch",
+        "Language_ur": "Urdu",
+        "Language_uz": "Uzbekisch",
+        "Language_ve": "Tshivenda",
+        "Language_vi": "Vietnamesisch",
+        "Language_vo": "Volapük",
+        "Language_wa": "Wallonisch",
+        "Language_wo": "Wolof",
+        "Language_xh": "IsiXhosa",
+        "Language_yi": "Jiddisch",
+        "Language_yo": "Yoruba",
+        "Language_za": "Zhuang",
+        "Language_zh": "Chinesisch",
+        "Language_zu": "IsiZulu",
+        "LanguageCode": "Sprach-Code",
+        "PluginDescription": "Bericht darüber, welche Sprache die Besucher im Browser eingestellt haben."
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/el.json b/plugins/UserLanguage/lang/el.json
new file mode 100644
index 0000000000..b802d1546b
--- /dev/null
+++ b/plugins/UserLanguage/lang/el.json
@@ -0,0 +1,191 @@
+{
+    "UserLanguage": {
+        "BrowserLanguage": "Γλώσσα φυλλομετρητή",
+        "Language_aa": "Αφαρικά",
+        "Language_ab": "Αμπχαζικά",
+        "Language_ae": "Αβεστανικά",
+        "Language_af": "Αφρικανικά",
+        "Language_ak": "Ακανικά",
+        "Language_am": "Αμχαρικά",
+        "Language_an": "Αραγονέζικα",
+        "Language_ar": "Αραβικά",
+        "Language_as": "Ασσαμέζικα",
+        "Language_av": "Αβαρικά",
+        "Language_ay": "Αγμαραϊκά",
+        "Language_az": "Αζέρικα",
+        "Language_ba": "Μπασκιρικά",
+        "Language_be": "Λευκορώσικα",
+        "Language_bg": "Βουλγάρικα",
+        "Language_bh": "Μπιχαρικά",
+        "Language_bi": "Μπισλαμαϊκά",
+        "Language_bm": "Μπαμπαραϊκά",
+        "Language_bn": "Βενγκαλικά",
+        "Language_bo": "Θιβετιανικά",
+        "Language_br": "Μπρετονικά",
+        "Language_bs": "Βοσνιακά",
+        "Language_ca": "Καταλανικά",
+        "Language_ce": "Χεχενικά",
+        "Language_ch": "Χαμορροϊκά",
+        "Language_co": "Κορσικανικά",
+        "Language_cr": "Κρεεϊκά",
+        "Language_cs": "Τσέχικα",
+        "Language_cu": "Εκκλησιαστικά Σλαβικά",
+        "Language_cv": "Χουβάς",
+        "Language_cy": "Ουαλικά",
+        "Language_da": "Δανικά",
+        "Language_de": "Γερμανικά",
+        "Language_dv": "Ντιβέχι",
+        "Language_dz": "Ντζόνγκχα",
+        "Language_ee": "Γι",
+        "Language_el": "Ελληνικά",
+        "Language_en": "Αγγλικά",
+        "Language_eo": "Εσπεράντο",
+        "Language_es": "Ισπανικά",
+        "Language_et": "Εσθονικά",
+        "Language_eu": "Βασκικά",
+        "Language_fa": "Περσικά",
+        "Language_ff": "Φουλάχ",
+        "Language_fi": "Φινλανδικά",
+        "Language_fj": "Φίτζι",
+        "Language_fo": "Φαρόε",
+        "Language_fr": "Γαλλικά",
+        "Language_fy": "Δυτικά Φριζιανά",
+        "Language_ga": "Ιρλανδικά",
+        "Language_gd": "Σκωτικά Κελτικά",
+        "Language_gl": "Γαλικιανά",
+        "Language_gn": "Γκουαρανί",
+        "Language_gu": "Γκουγιαράτι",
+        "Language_gv": "Μανξ",
+        "Language_ha": "Χάουσα",
+        "Language_he": "Εβραϊκά",
+        "Language_hi": "Χίντι",
+        "Language_ho": "Χίρι Μότου",
+        "Language_hr": "Κροατικά",
+        "Language_ht": "Αϊτιανά",
+        "Language_hu": "Ουγγρικά",
+        "Language_hy": "Αρμενικά",
+        "Language_hz": "Χερέρο",
+        "Language_ia": "Ιντερλίνγκουα",
+        "Language_id": "Ινδονησιακά",
+        "Language_ie": "Ιντερλίνγκουε",
+        "Language_ig": "Ίγκμπο",
+        "Language_ii": "Σικουάν Γι",
+        "Language_ik": "Ινουπιάκ",
+        "Language_io": "Ίντο",
+        "Language_is": "Ισλανδικά",
+        "Language_it": "Ιταλικά",
+        "Language_iu": "Ινουκτιτούτ",
+        "Language_ja": "Ιαπωνικά",
+        "Language_jv": "Ιαβανεζικά",
+        "Language_ka": "Γεωργιανά",
+        "Language_kg": "Κονγκό",
+        "Language_ki": "Κικούγιου",
+        "Language_kj": "Κουανιγιάμα",
+        "Language_kk": "Καζακικά",
+        "Language_kl": "Καλααλισούτ",
+        "Language_km": "Καμποτζιανά",
+        "Language_kn": "Κανάντα",
+        "Language_ko": "Κορεατικά",
+        "Language_kr": "Κανούρι",
+        "Language_ks": "Κασμίρι",
+        "Language_ku": "Κουρδικά",
+        "Language_kv": "Κόμι",
+        "Language_kw": "Κόρνις",
+        "Language_ky": "Κυργιζικά",
+        "Language_la": "Λατινικά",
+        "Language_lb": "Λουξεμβουργικά",
+        "Language_lg": "Γκάντα",
+        "Language_li": "Λιμβουργιανά",
+        "Language_ln": "Λινγκάλα",
+        "Language_lo": "Λαοθιανά",
+        "Language_lt": "Λιθουανικά",
+        "Language_lu": "Λούμπα-Κατάνγκα",
+        "Language_lv": "Λετονικά",
+        "Language_mg": "Μαλαγάσι",
+        "Language_mh": "Μάρσαλ",
+        "Language_mi": "Μάορι",
+        "Language_mk": "Σλαβομακεδονικά",
+        "Language_ml": "Μαλαγιαλάμ",
+        "Language_mn": "Μογγολικά",
+        "Language_mr": "Μαράθι",
+        "Language_ms": "Μαλάι",
+        "Language_mt": "Μαλτεζικά",
+        "Language_my": "Βιρμανικά",
+        "Language_na": "Ναούρου",
+        "Language_nb": "Νορβηγικά Μποκμάλ",
+        "Language_nd": "Ντεμπέλε Βορρά",
+        "Language_ne": "Νεπάλι",
+        "Language_ng": "Ντόνγκα",
+        "Language_nl": "Ολλανδικά",
+        "Language_nn": "Νορβηγικά Νινόρσκ",
+        "Language_no": "Νορβηγικά",
+        "Language_nr": "Ντεμπέλε Νότου",
+        "Language_nv": "Νάβαχο",
+        "Language_ny": "Νιάντζα",
+        "Language_oc": "Οκσιτανικά",
+        "Language_oj": "Οζιβίγουα",
+        "Language_om": "Ορόμο",
+        "Language_or": "Ορίγια",
+        "Language_os": "Οσετικά",
+        "Language_pa": "Παντζαπικά",
+        "Language_pi": "Πάλι",
+        "Language_pl": "Πολωνικά",
+        "Language_ps": "Πάστο",
+        "Language_pt": "Πορτογαλικά",
+        "Language_qu": "Κετσούα",
+        "Language_rm": "Ρετο-Ρομανικά",
+        "Language_rn": "Ρούντι",
+        "Language_ro": "Ρουμανικά",
+        "Language_ru": "Ρωσικά",
+        "Language_rw": "Κινιαρβάντα",
+        "Language_sa": "Σανσκριτικά",
+        "Language_sc": "Σαρδινικά",
+        "Language_sd": "Σίντι",
+        "Language_se": "Βόρεια Σάμι",
+        "Language_sg": "Σάνγκο",
+        "Language_si": "Σινχαλεζικά",
+        "Language_sk": "Σλοβακικά",
+        "Language_sl": "Σλοβενικά",
+        "Language_sm": "Σαμόαν",
+        "Language_sn": "Σχόνα",
+        "Language_so": "Σομάλι",
+        "Language_sq": "Αλβανικά",
+        "Language_sr": "Σερβικά",
+        "Language_ss": "Σουάτι",
+        "Language_st": "Νότια Σόθο",
+        "Language_su": "Σουδανικά",
+        "Language_sv": "Σουηδικά",
+        "Language_sw": "Σουαχίλι",
+        "Language_ta": "Ταμίλ",
+        "Language_te": "Τελούγκου",
+        "Language_tg": "Τατζίκ",
+        "Language_th": "Ταϊλανδικά",
+        "Language_ti": "Τιγκρίνυα",
+        "Language_tk": "Τουρκμενικά",
+        "Language_tl": "Ταγκαλόγκ",
+        "Language_tn": "Τσιγουάνα",
+        "Language_to": "Τόνγκα",
+        "Language_tr": "Τουρκικά",
+        "Language_ts": "Τσόνγκα",
+        "Language_tt": "Τατάρ",
+        "Language_tw": "Τούι",
+        "Language_ty": "Ταϊτιανά",
+        "Language_ug": "Ουιγουρικά",
+        "Language_uk": "Ουκρανικά",
+        "Language_ur": "Ουρντού",
+        "Language_uz": "Ουζμπεκικά",
+        "Language_ve": "Βένδα",
+        "Language_vi": "Βιετναμεζικά",
+        "Language_vo": "Βόλαπικ",
+        "Language_wa": "Γουαλούν",
+        "Language_wo": "Γουόλοφ",
+        "Language_xh": "Ζόσα",
+        "Language_yi": "Γίντις",
+        "Language_yo": "Γιορούμπα",
+        "Language_za": "Ζουάνγκ",
+        "Language_zh": "Κινεζικά",
+        "Language_zu": "Ζουλού",
+        "LanguageCode": "Κωδικός γλώσσας",
+        "PluginDescription": "Αναφέρει τη γλώσσα που χρησιμοποιούν τα προγράμματα πλοήγησης των επισκεπτών σας."
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/en.json b/plugins/UserLanguage/lang/en.json
new file mode 100644
index 0000000000..65e14566ad
--- /dev/null
+++ b/plugins/UserLanguage/lang/en.json
@@ -0,0 +1,191 @@
+{
+    "UserLanguage": {
+        "BrowserLanguage": "Browser language",
+        "Language_aa": "Afar",
+        "Language_ab": "Abkhazian",
+        "Language_ae": "Avestan",
+        "Language_af": "Afrikaans",
+        "Language_ak": "Akan",
+        "Language_am": "Amharic",
+        "Language_an": "Aragonese",
+        "Language_ar": "Arabic",
+        "Language_as": "Assamese",
+        "Language_av": "Avaric",
+        "Language_ay": "Aymara",
+        "Language_az": "Azerbaijani",
+        "Language_ba": "Bashkir",
+        "Language_be": "Belarusian",
+        "Language_bg": "Bulgarian",
+        "Language_bh": "Bihari",
+        "Language_bi": "Bislama",
+        "Language_bm": "Bambara",
+        "Language_bn": "Bengali",
+        "Language_bo": "Tibetan",
+        "Language_br": "Breton",
+        "Language_bs": "Bosnian",
+        "Language_ca": "Catalan",
+        "Language_ce": "Chechen",
+        "Language_ch": "Chamorro",
+        "Language_co": "Corsican",
+        "Language_cr": "Cree",
+        "Language_cs": "Czech",
+        "Language_cu": "Church Slavic",
+        "Language_cv": "Chuvash",
+        "Language_cy": "Welsh",
+        "Language_da": "Danish",
+        "Language_de": "German",
+        "Language_dv": "Divehi",
+        "Language_dz": "Dzongkha",
+        "Language_ee": "Ewe",
+        "Language_el": "Greek",
+        "Language_en": "English",
+        "Language_eo": "Esperanto",
+        "Language_es": "Spanish",
+        "Language_et": "Estonian",
+        "Language_eu": "Basque",
+        "Language_fa": "Persian",
+        "Language_ff": "Fulah",
+        "Language_fi": "Finnish",
+        "Language_fj": "Fijian",
+        "Language_fo": "Faroese",
+        "Language_fr": "French",
+        "Language_fy": "Western Frisian",
+        "Language_ga": "Irish",
+        "Language_gd": "Scottish Gaelic",
+        "Language_gl": "Galician",
+        "Language_gn": "Guarani",
+        "Language_gu": "Gujarati",
+        "Language_gv": "Manx",
+        "Language_ha": "Hausa",
+        "Language_he": "Hebrew",
+        "Language_hi": "Hindi",
+        "Language_ho": "Hiri Motu",
+        "Language_hr": "Croatian",
+        "Language_ht": "Haitian Creole",
+        "Language_hu": "Hungarian",
+        "Language_hy": "Armenian",
+        "Language_hz": "Herero",
+        "Language_ia": "Interlingua",
+        "Language_id": "Indonesian",
+        "Language_ie": "Interlingue",
+        "Language_ig": "Igbo",
+        "Language_ii": "Sichuan Yi",
+        "Language_ik": "Inupiaq",
+        "Language_io": "Ido",
+        "Language_is": "Icelandic",
+        "Language_it": "Italian",
+        "Language_iu": "Inuktitut",
+        "Language_ja": "Japanese",
+        "Language_jv": "Javanese",
+        "Language_ka": "Georgian",
+        "Language_kg": "Kongo",
+        "Language_ki": "Kukuyu",
+        "Language_kj": "Kuanyama",
+        "Language_kk": "Kazakh",
+        "Language_kl": "Greenlandic",
+        "Language_km": "Central Khmer",
+        "Language_kn": "Kannada",
+        "Language_ko": "Korean",
+        "Language_kr": "Kanuri",
+        "Language_ks": "Kashmiri",
+        "Language_ku": "Kurdish",
+        "Language_kv": "Komi",
+        "Language_kw": "Cornish",
+        "Language_ky": "Kirghiz",
+        "Language_la": "Latin",
+        "Language_lb": "Luxembourgish",
+        "Language_lg": "Ganda",
+        "Language_li": "Limburgish",
+        "Language_ln": "Lingala",
+        "Language_lo": "Lao",
+        "Language_lt": "Lithuanian",
+        "Language_lu": "Luba-Katanga",
+        "Language_lv": "Latvian",
+        "Language_mg": "Malagasy",
+        "Language_mh": "Marshallese",
+        "Language_mi": "Maori",
+        "Language_mk": "Macedonian",
+        "Language_ml": "Malayalam",
+        "Language_mn": "Mongolian",
+        "Language_mr": "Marathi",
+        "Language_ms": "Malay",
+        "Language_mt": "Maltese",
+        "Language_my": "Burmese",
+        "Language_na": "Nauru",
+        "Language_nb": "Norwegian Bokm\u00e5l",
+        "Language_nd": "North Ndebele",
+        "Language_ne": "Nepali",
+        "Language_ng": "Ndonga",
+        "Language_nl": "Dutch",
+        "Language_nn": "Norwegian Nynorsk",
+        "Language_no": "Norwegian",
+        "Language_nr": "South Ndebele",
+        "Language_nv": "Navajo",
+        "Language_ny": "Chichewa",
+        "Language_oc": "Occitan",
+        "Language_oj": "Ojibwa",
+        "Language_om": "Oroma",
+        "Language_or": "Oriya",
+        "Language_os": "Ossetian",
+        "Language_pa": "Panjabi",
+        "Language_pi": "Pali",
+        "Language_pl": "Polish",
+        "Language_ps": "Pashto",
+        "Language_pt": "Portuguese",
+        "Language_qu": "Quechua",
+        "Language_rm": "Raeto-Romance",
+        "Language_rn": "Rundi",
+        "Language_ro": "Romanian",
+        "Language_ru": "Russian",
+        "Language_rw": "Kinyarwanda",
+        "Language_sa": "Sanskrit",
+        "Language_sc": "Sardinian",
+        "Language_sd": "Sindhi",
+        "Language_se": "Northern Sami",
+        "Language_sg": "Sango",
+        "Language_si": "Sinhala",
+        "Language_sk": "Slovak",
+        "Language_sl": "Slovenian",
+        "Language_sm": "Samoan",
+        "Language_sn": "Shona",
+        "Language_so": "Somali",
+        "Language_sq": "Albanian",
+        "Language_sr": "Serbian",
+        "Language_ss": "Swati",
+        "Language_st": "Sotho",
+        "Language_su": "Sundanese",
+        "Language_sv": "Swedish",
+        "Language_sw": "Swahili",
+        "Language_ta": "Tamil",
+        "Language_te": "Telugu",
+        "Language_tg": "Tajik",
+        "Language_th": "Thai",
+        "Language_ti": "Tigrinya",
+        "Language_tk": "Turkmen",
+        "Language_tl": "Tagalog",
+        "Language_tn": "Tswana",
+        "Language_to": "Tonga",
+        "Language_tr": "Turkish",
+        "Language_ts": "Tsonga",
+        "Language_tt": "Tatar",
+        "Language_tw": "Twi",
+        "Language_ty": "Tahitian",
+        "Language_ug": "Uighur",
+        "Language_uk": "Ukrainian",
+        "Language_ur": "Urdu",
+        "Language_uz": "Uzbek",
+        "Language_ve": "Venda",
+        "Language_vi": "Vietnamese",
+        "Language_vo": "Volap\u00fck",
+        "Language_wa": "Walloon",
+        "Language_wo": "Wolof",
+        "Language_xh": "Xhosa",
+        "Language_yi": "Yiddish",
+        "Language_yo": "Yoruba",
+        "Language_za": "Chuang",
+        "Language_zh": "Chinese",
+        "Language_zu": "Zulu",
+        "LanguageCode": "Language code",
+        "PluginDescription": "Reports the language used by your visitors' browsers."
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/es.json b/plugins/UserLanguage/lang/es.json
new file mode 100644
index 0000000000..07f4b0cf7b
--- /dev/null
+++ b/plugins/UserLanguage/lang/es.json
@@ -0,0 +1,190 @@
+{
+    "UserLanguage": {
+        "BrowserLanguage": "Idioma de Navegador",
+        "Language_aa": "Lejos",
+        "Language_ab": "Abjasia",
+        "Language_ae": "Avéstico",
+        "Language_af": "Africaans",
+        "Language_ak": "Akan",
+        "Language_am": "Amárico",
+        "Language_an": "Aragonés",
+        "Language_ar": "Árabe",
+        "Language_as": "Asamés",
+        "Language_av": "Ávaro",
+        "Language_ay": "Aimara",
+        "Language_az": "Azerí",
+        "Language_ba": "Baskir",
+        "Language_be": "Bieloruso",
+        "Language_bg": "Búlgaro",
+        "Language_bh": "Bihari",
+        "Language_bi": "Bislama",
+        "Language_bm": "Bambara",
+        "Language_bn": "Bengalí",
+        "Language_bo": "Tibetano",
+        "Language_br": "Bretón",
+        "Language_bs": "Bosnio",
+        "Language_ca": "Catalán",
+        "Language_ce": "Checheno",
+        "Language_ch": "Chamorro",
+        "Language_co": "Corso",
+        "Language_cr": "Cree",
+        "Language_cs": "Checo",
+        "Language_cu": "Esloveno",
+        "Language_cv": "Chuvasio",
+        "Language_cy": "Galés",
+        "Language_da": "Danés",
+        "Language_de": "Alemán",
+        "Language_dv": "Divehi",
+        "Language_dz": "Dzongkha",
+        "Language_ee": "Ewé",
+        "Language_el": "Griego",
+        "Language_en": "Inglés",
+        "Language_eo": "Esperanto",
+        "Language_es": "Español",
+        "Language_et": "Estonio",
+        "Language_eu": "Vasco",
+        "Language_fa": "Persa",
+        "Language_ff": "Fulah",
+        "Language_fi": "Finlandés",
+        "Language_fj": "Fiyiano",
+        "Language_fo": "Feroés",
+        "Language_fr": "Francés",
+        "Language_fy": "Frisio septentrional",
+        "Language_ga": "Irlandés",
+        "Language_gd": "Gaélico escocés",
+        "Language_gl": "Gallego",
+        "Language_gn": "Guaraní",
+        "Language_gu": "Guyaratí",
+        "Language_gv": "Manés",
+        "Language_ha": "Hausa",
+        "Language_he": "Hebreo",
+        "Language_hi": "Hindi",
+        "Language_ho": "Hiri motu",
+        "Language_hr": "Croata",
+        "Language_ht": "Criollo haitiano",
+        "Language_hu": "Húngaro",
+        "Language_hy": "Armenio",
+        "Language_hz": "Herero",
+        "Language_ia": "Interlingua",
+        "Language_id": "Indonesio",
+        "Language_ie": "Occidental",
+        "Language_ig": "Igbo",
+        "Language_ii": "Sichuan Yi",
+        "Language_ik": "Iñupiaq",
+        "Language_io": "Ido",
+        "Language_is": "Islandés",
+        "Language_it": "Italiano",
+        "Language_iu": "Inuit",
+        "Language_ja": "Japonés",
+        "Language_jv": "Javanés",
+        "Language_ka": "Georgiano",
+        "Language_kg": "Congo",
+        "Language_ki": "Kikuyu",
+        "Language_kj": "Kuanyama",
+        "Language_kk": "Kazajo",
+        "Language_kl": "Groenlandés",
+        "Language_km": "Camboyano",
+        "Language_kn": "Canarés",
+        "Language_ko": "Coreano",
+        "Language_kr": "Kanuri",
+        "Language_ks": "Cachemiro",
+        "Language_ku": "Kurdo",
+        "Language_kv": "Komi",
+        "Language_kw": "Córnico",
+        "Language_ky": "Kirguís",
+        "Language_la": "Latín",
+        "Language_lb": "Luxemburgués",
+        "Language_lg": "Luganda",
+        "Language_li": "Limburgués",
+        "Language_ln": "Lingala",
+        "Language_lo": "Lao",
+        "Language_lt": "Lituano",
+        "Language_lu": "Chiluba",
+        "Language_lv": "Letón",
+        "Language_mg": "Malgache",
+        "Language_mh": "Marshallés",
+        "Language_mi": "Maorí",
+        "Language_mk": "Macedonio",
+        "Language_ml": "Malabar",
+        "Language_mn": "Mongol",
+        "Language_mr": "Maratí",
+        "Language_ms": "Malayo",
+        "Language_mt": "Maltés",
+        "Language_my": "Birmano",
+        "Language_na": "Nauruano",
+        "Language_nb": "Bokmål noruego",
+        "Language_nd": "Ndebele del norte",
+        "Language_ne": "Nepalés",
+        "Language_ng": "Ndonga",
+        "Language_nl": "Holandés",
+        "Language_nn": "Nuevo noruego",
+        "Language_no": "Noruego",
+        "Language_nr": "Ndebele del sur",
+        "Language_nv": "Navajo",
+        "Language_ny": "Chichewa",
+        "Language_oc": "Occitano",
+        "Language_oj": "Ojibwa",
+        "Language_om": "Oromo",
+        "Language_or": "Oriya",
+        "Language_os": "Osetio",
+        "Language_pa": "Panyabí",
+        "Language_pi": "Pali",
+        "Language_pl": "Polaco",
+        "Language_ps": "Pastún",
+        "Language_pt": "Portugués",
+        "Language_qu": "Quechua",
+        "Language_rm": "Raeto-Romance",
+        "Language_rn": "Rundi",
+        "Language_ro": "Rumano",
+        "Language_ru": "Ruso",
+        "Language_rw": "Kinyarwanda",
+        "Language_sa": "Sánscrito",
+        "Language_sc": "Sardo",
+        "Language_sd": "Sindhi",
+        "Language_se": "Sami septentrional",
+        "Language_sg": "Sango",
+        "Language_si": "Cingalés",
+        "Language_sk": "Eslovaco",
+        "Language_sl": "Esloveno",
+        "Language_sm": "Samoano",
+        "Language_sn": "Shona",
+        "Language_so": "Somalí",
+        "Language_sq": "Albanés",
+        "Language_sr": "Serbio",
+        "Language_ss": "Suazi",
+        "Language_st": "Sotho",
+        "Language_su": "Sudanés",
+        "Language_sv": "Sueco",
+        "Language_sw": "Suajili",
+        "Language_ta": "Tamil",
+        "Language_te": "Telugu",
+        "Language_tg": "Tayiko",
+        "Language_th": "Tailandés",
+        "Language_ti": "Tigriña",
+        "Language_tk": "Turcomano",
+        "Language_tl": "Tagalo",
+        "Language_tn": "Tsuana",
+        "Language_to": "Tonga",
+        "Language_tr": "Turco",
+        "Language_ts": "Tsonga",
+        "Language_tt": "Tártaro",
+        "Language_tw": "Twi",
+        "Language_ty": "Tahitiano",
+        "Language_ug": "Uigur",
+        "Language_uk": "Ucraniano",
+        "Language_ur": "Urdú",
+        "Language_uz": "Uzbeko",
+        "Language_ve": "Venda",
+        "Language_vi": "Vietnamita",
+        "Language_vo": "Volapük",
+        "Language_wa": "Valonia",
+        "Language_wo": "Wólof",
+        "Language_xh": "Xosa",
+        "Language_yi": "Idish",
+        "Language_yo": "Yoruba",
+        "Language_za": "Chuang",
+        "Language_zh": "Chino",
+        "Language_zu": "Zulú",
+        "LanguageCode": "Código de idioma"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/et.json b/plugins/UserLanguage/lang/et.json
new file mode 100644
index 0000000000..21d96c38ef
--- /dev/null
+++ b/plugins/UserLanguage/lang/et.json
@@ -0,0 +1,190 @@
+{
+    "UserLanguage": {
+        "BrowserLanguage": "Veebisirvija keel",
+        "Language_aa": "afari",
+        "Language_ab": "abhaasi",
+        "Language_ae": "avesta",
+        "Language_af": "afrikaani",
+        "Language_ak": "akani",
+        "Language_am": "amhari",
+        "Language_an": "aragoni",
+        "Language_ar": "araabia",
+        "Language_as": "assami",
+        "Language_av": "avaari",
+        "Language_ay": "aimara",
+        "Language_az": "aserbaidžaani",
+        "Language_ba": "baškiiri",
+        "Language_be": "valgevene",
+        "Language_bg": "bulgaaria",
+        "Language_bh": "bihaari",
+        "Language_bi": "bislama",
+        "Language_bm": "bambara",
+        "Language_bn": "bengali",
+        "Language_bo": "tiibeti",
+        "Language_br": "bretooni",
+        "Language_bs": "bosnia",
+        "Language_ca": "katalaani",
+        "Language_ce": "tšetšeeni",
+        "Language_ch": "tšamorro",
+        "Language_co": "korsika",
+        "Language_cr": "krii",
+        "Language_cs": "tšehhi",
+        "Language_cu": "kirikuslaavi",
+        "Language_cv": "tšuvaši",
+        "Language_cy": "kõmri",
+        "Language_da": "taani",
+        "Language_de": "saksa",
+        "Language_dv": "maldiivi",
+        "Language_dz": "bhutani",
+        "Language_ee": "eve",
+        "Language_el": "kreeka",
+        "Language_en": "inglise",
+        "Language_eo": "esperanto",
+        "Language_es": "hispaania",
+        "Language_et": "eesti",
+        "Language_eu": "baski",
+        "Language_fa": "pärsia",
+        "Language_ff": "fulbe",
+        "Language_fi": "soome",
+        "Language_fj": "fidži",
+        "Language_fo": "fääri",
+        "Language_fr": "prantsuse",
+        "Language_fy": "läänefriisi",
+        "Language_ga": "iiri",
+        "Language_gd": "gaeli",
+        "Language_gl": "galeegi",
+        "Language_gn": "guaranii",
+        "Language_gu": "gudžarati",
+        "Language_gv": "mänksi",
+        "Language_ha": "hausa",
+        "Language_he": "heebrea",
+        "Language_hi": "hindi",
+        "Language_ho": "motu",
+        "Language_hr": "horvaadi",
+        "Language_ht": "haiti",
+        "Language_hu": "ungari",
+        "Language_hy": "armeenia",
+        "Language_hz": "herero",
+        "Language_ia": "interlingua",
+        "Language_id": "indoneesia",
+        "Language_ie": "interlingue",
+        "Language_ig": "ibo",
+        "Language_ii": "Sichuani jii",
+        "Language_ik": "injupiaki",
+        "Language_io": "ido",
+        "Language_is": "islandi",
+        "Language_it": "itaalia",
+        "Language_iu": "inuktituti",
+        "Language_ja": "jaapani",
+        "Language_jv": "jaava",
+        "Language_ka": "gruusia",
+        "Language_kg": "kongo",
+        "Language_ki": "kikuju",
+        "Language_kj": "ambo",
+        "Language_kk": "kasahhi",
+        "Language_kl": "grööni",
+        "Language_km": "khmeeri",
+        "Language_kn": "kannada",
+        "Language_ko": "korea",
+        "Language_kr": "kanuri",
+        "Language_ks": "kašmiiri",
+        "Language_ku": "kurdi",
+        "Language_kv": "komi",
+        "Language_kw": "korni",
+        "Language_ky": "kirgiisi",
+        "Language_la": "ladina",
+        "Language_lb": "letseburgi",
+        "Language_lg": "ganda",
+        "Language_li": "limburgi",
+        "Language_ln": "lingala",
+        "Language_lo": "lao",
+        "Language_lt": "leedu",
+        "Language_lu": "luba",
+        "Language_lv": "läti",
+        "Language_mg": "malagassi",
+        "Language_mh": "maršalli",
+        "Language_mi": "maoori",
+        "Language_mk": "makedoonia",
+        "Language_ml": "malajalami",
+        "Language_mn": "mongoli",
+        "Language_mr": "marathi",
+        "Language_ms": "malai",
+        "Language_mt": "malta",
+        "Language_my": "birma",
+        "Language_na": "nauru",
+        "Language_nb": "norra bokmål",
+        "Language_nd": "põhjandebele",
+        "Language_ne": "nepali",
+        "Language_ng": "ndonga",
+        "Language_nl": "hollandi",
+        "Language_nn": "norra nynorsk",
+        "Language_no": "norra",
+        "Language_nr": "lõunandebele",
+        "Language_nv": "navaho",
+        "Language_ny": "njandža",
+        "Language_oc": "oksitaani",
+        "Language_oj": "odžibvei",
+        "Language_om": "oromo",
+        "Language_or": "oria",
+        "Language_os": "osseedi",
+        "Language_pa": "pandžabi",
+        "Language_pi": "paali",
+        "Language_pl": "poola",
+        "Language_ps": "puštu",
+        "Language_pt": "portugali",
+        "Language_qu": "ketšua",
+        "Language_rm": "retoromaani",
+        "Language_rn": "rundi",
+        "Language_ro": "rumeenia",
+        "Language_ru": "vene",
+        "Language_rw": "ruanda",
+        "Language_sa": "sanskriti",
+        "Language_sc": "sardiinia",
+        "Language_sd": "sindhi",
+        "Language_se": "põhjasaami",
+        "Language_sg": "sango",
+        "Language_si": "singali",
+        "Language_sk": "slovaki",
+        "Language_sl": "sloveeni",
+        "Language_sm": "samoa",
+        "Language_sn": "šona",
+        "Language_so": "somaali",
+        "Language_sq": "albaania",
+        "Language_sr": "serbia",
+        "Language_ss": "svaasi",
+        "Language_st": "lõunasotho",
+        "Language_su": "sunda",
+        "Language_sv": "rootsi",
+        "Language_sw": "suahiili",
+        "Language_ta": "tamili",
+        "Language_te": "telugu",
+        "Language_tg": "tadžiki",
+        "Language_th": "tai",
+        "Language_ti": "tigrinja",
+        "Language_tk": "türkmeeni",
+        "Language_tl": "tagalogi",
+        "Language_tn": "tsvana",
+        "Language_to": "tonga",
+        "Language_tr": "türgi",
+        "Language_ts": "tsonga",
+        "Language_tt": "tatari",
+        "Language_tw": "tvii",
+        "Language_ty": "tahiti",
+        "Language_ug": "uiguuri",
+        "Language_uk": "ukraina",
+        "Language_ur": "urdu",
+        "Language_uz": "usbeki",
+        "Language_ve": "venda",
+        "Language_vi": "vietnami",
+        "Language_vo": "volapüki",
+        "Language_wa": "vallooni",
+        "Language_wo": "volofi",
+        "Language_xh": "koosa",
+        "Language_yi": "jidiši",
+        "Language_yo": "joruba",
+        "Language_za": "tšuangi",
+        "Language_zh": "hiina",
+        "Language_zu": "suulu",
+        "LanguageCode": "Keele kood"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/eu.json b/plugins/UserLanguage/lang/eu.json
new file mode 100644
index 0000000000..c3f072d669
--- /dev/null
+++ b/plugins/UserLanguage/lang/eu.json
@@ -0,0 +1,150 @@
+{
+    "UserLanguage": {
+        "Language_ab": "abkhazera",
+        "Language_af": "afrikaans",
+        "Language_ak": "Akanera",
+        "Language_am": "amharikera",
+        "Language_ar": "arabiera",
+        "Language_as": "assamera",
+        "Language_ay": "aimara",
+        "Language_az": "azerbaijanera",
+        "Language_be": "bielorrusiera",
+        "Language_bg": "bulgariera",
+        "Language_bh": "bihariera",
+        "Language_bn": "bengalera",
+        "Language_bo": "tibetera",
+        "Language_br": "bretoiera",
+        "Language_bs": "bosniera",
+        "Language_ca": "katalana",
+        "Language_co": "Korsikera",
+        "Language_cs": "txekiera",
+        "Language_cy": "galesera",
+        "Language_da": "daniera",
+        "Language_de": "alemanera",
+        "Language_dv": "divehiera",
+        "Language_dz": "dzongkha",
+        "Language_ee": "Eweera",
+        "Language_el": "greziera",
+        "Language_en": "ingelera",
+        "Language_eo": "esperantoa",
+        "Language_es": "espainiera",
+        "Language_et": "estoniera",
+        "Language_eu": "euskara",
+        "Language_fa": "pertsiera",
+        "Language_fi": "finlandiera",
+        "Language_fj": "fijiera",
+        "Language_fo": "faroera",
+        "Language_fr": "frantsesera",
+        "Language_fy": "frisiarra",
+        "Language_ga": "gaelikoa",
+        "Language_gd": "eskoziar gaelikoa",
+        "Language_gl": "galegoa",
+        "Language_gn": "guaraniera",
+        "Language_gu": "gujaratera",
+        "Language_ha": "hausa",
+        "Language_he": "hebreera",
+        "Language_hi": "hindia",
+        "Language_hr": "kroaziera",
+        "Language_ht": "haitiera",
+        "Language_hu": "hungariera",
+        "Language_hy": "armeniera",
+        "Language_ia": "interlingua",
+        "Language_id": "indonesiera",
+        "Language_ie": "interlingue",
+        "Language_ig": "igboera",
+        "Language_is": "islandiera",
+        "Language_it": "italiera",
+        "Language_ja": "japoniera",
+        "Language_jv": "javera",
+        "Language_ka": "georgiera",
+        "Language_kg": "Kikongoa",
+        "Language_kk": "kazakhera",
+        "Language_km": "khemerera",
+        "Language_kn": "kannada",
+        "Language_ko": "koreera",
+        "Language_ks": "kashmirera",
+        "Language_ku": "kurduera",
+        "Language_ky": "kirgizera",
+        "Language_la": "latina",
+        "Language_lb": "luxenburgera",
+        "Language_lg": "Gandera",
+        "Language_ln": "lingala",
+        "Language_lo": "laosera",
+        "Language_lt": "lituaniera",
+        "Language_lv": "letoniera",
+        "Language_mg": "malgaxea",
+        "Language_mi": "maoriera",
+        "Language_mk": "mazedoniera",
+        "Language_ml": "malayalamera",
+        "Language_mn": "mongoliera",
+        "Language_mr": "marathera",
+        "Language_ms": "malaysiera",
+        "Language_mt": "maltera",
+        "Language_my": "burmatarra",
+        "Language_nb": "bokmala (Norvegia)",
+        "Language_nd": "iparraldeko ndebeleera",
+        "Language_ne": "nepalera",
+        "Language_nl": "nederlandera",
+        "Language_nn": "norvegiera berria",
+        "Language_no": "norvegiera",
+        "Language_ny": "nyanja",
+        "Language_oc": "okzitaniera",
+        "Language_om": "Oromoera",
+        "Language_or": "oriya",
+        "Language_os": "osetiera",
+        "Language_pa": "punjabera",
+        "Language_pl": "poloniera",
+        "Language_ps": "paxtuera",
+        "Language_pt": "portugalera",
+        "Language_qu": "quechuera",
+        "Language_rm": "erromantxera",
+        "Language_rn": "rundiera",
+        "Language_ro": "errumaniera",
+        "Language_ru": "errusiera",
+        "Language_rw": "kinyaruanda",
+        "Language_sa": "sanskritoa",
+        "Language_sd": "sindhia",
+        "Language_se": "iparraldeko samiera",
+        "Language_sg": "sangoera",
+        "Language_si": "sinhala",
+        "Language_sk": "eslovakiera",
+        "Language_sl": "esloveniera",
+        "Language_sm": "samoera",
+        "Language_sn": "shonera",
+        "Language_so": "somaliera",
+        "Language_sq": "albaniera",
+        "Language_sr": "serbiera",
+        "Language_ss": "swatiera",
+        "Language_st": "sesothoera",
+        "Language_su": "sundanera",
+        "Language_sv": "suediera",
+        "Language_sw": "swahili",
+        "Language_ta": "tamilera",
+        "Language_te": "telugua",
+        "Language_tg": "tajikistanera",
+        "Language_th": "thailandiera",
+        "Language_ti": "tigrinya",
+        "Language_tk": "turkmeniera",
+        "Language_tl": "tagalog",
+        "Language_tn": "tswanera",
+        "Language_to": "tongera",
+        "Language_tr": "turkiera",
+        "Language_ts": "tsongera",
+        "Language_tt": "tatarera",
+        "Language_tw": "twia",
+        "Language_ty": "tahitiera",
+        "Language_ug": "uigurrera",
+        "Language_uk": "ukrainera",
+        "Language_ur": "urdu",
+        "Language_uz": "uzbekera",
+        "Language_ve": "vendera",
+        "Language_vi": "vietnamera",
+        "Language_wo": "wolofera",
+        "Language_xh": "xhosa",
+        "Language_yi": "yiddishera",
+        "Language_yo": "yorubera",
+        "Language_zh": "txinera",
+        "Language_zu": "zuluera",
+        "LanguageCode": "Hizkuntza-kodea"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/fa.json b/plugins/UserLanguage/lang/fa.json
new file mode 100644
index 0000000000..fcb4bd7071
--- /dev/null
+++ b/plugins/UserLanguage/lang/fa.json
@@ -0,0 +1,190 @@
+{
+    "UserLanguage": {
+        "BrowserLanguage": "زبان مرورگر",
+        "Language_aa": "آفاری",
+        "Language_ab": "آبخازیایی",
+        "Language_ae": "اوستایی",
+        "Language_af": "آفریقایی",
+        "Language_ak": "آکانی",
+        "Language_am": "امهری",
+        "Language_an": "آراگونی",
+        "Language_ar": "عربی",
+        "Language_as": "آسامی",
+        "Language_av": "آواری",
+        "Language_ay": "آیمارایی",
+        "Language_az": "آذربایجانی",
+        "Language_ba": "باشقیری",
+        "Language_be": "بلاروسی",
+        "Language_bg": "بلغاری",
+        "Language_bh": "بیهاری",
+        "Language_bi": "بیسلاما",
+        "Language_bm": "بامبارایی",
+        "Language_bn": "بنگالی",
+        "Language_bo": "تبتی",
+        "Language_br": "برتونی",
+        "Language_bs": "بسنیایی",
+        "Language_ca": "کاتالانی",
+        "Language_ce": "چچنی",
+        "Language_ch": "چامورویی",
+        "Language_co": "کرسی",
+        "Language_cr": "کربایی",
+        "Language_cs": "چکی",
+        "Language_cu": "اسلاوی کلیسایی",
+        "Language_cv": "چوواشی",
+        "Language_cy": "ولزی",
+        "Language_da": "دانمارکی",
+        "Language_de": "آلمانی",
+        "Language_dv": "دیوهی",
+        "Language_dz": "دزونگخایی",
+        "Language_ee": "اوه‌ای",
+        "Language_el": "یونانی",
+        "Language_en": "انگلیسی",
+        "Language_eo": "اسپرانتویی",
+        "Language_es": "اسپانیایی",
+        "Language_et": "استونیایی",
+        "Language_eu": "باسکی",
+        "Language_fa": "فارسی",
+        "Language_ff": "فولایی",
+        "Language_fi": "فنلاندی",
+        "Language_fj": "فیجی",
+        "Language_fo": "فاروئی",
+        "Language_fr": "فرانسوی",
+        "Language_fy": "فریزلندی باختری",
+        "Language_ga": "ایرلندی",
+        "Language_gd": "گالیک اسکاتلندی",
+        "Language_gl": "گالیسیایی",
+        "Language_gn": "گوارانی",
+        "Language_gu": "گجراتی",
+        "Language_gv": "مانکسی",
+        "Language_ha": "هوسیایی",
+        "Language_he": "عبری",
+        "Language_hi": "هندی",
+        "Language_ho": "موتویی هیری",
+        "Language_hr": "کروواتی",
+        "Language_ht": "هاییتیایی",
+        "Language_hu": "مجاری",
+        "Language_hy": "ارمنی",
+        "Language_hz": "هررویی",
+        "Language_ia": "اینترلینگوایی",
+        "Language_id": "اندونزیایی",
+        "Language_ie": "اکسیدنتالی",
+        "Language_ig": "ایگبویی",
+        "Language_ii": "یی سیچوانی",
+        "Language_ik": "اینوپیکی",
+        "Language_io": "ایدویی",
+        "Language_is": "ایسلندی",
+        "Language_it": "ایتالیایی",
+        "Language_iu": "اینوکتیتوتی",
+        "Language_ja": "ژاپنی",
+        "Language_jv": "جاوه‌ای",
+        "Language_ka": "گرجی",
+        "Language_kg": "کنگویی",
+        "Language_ki": "کیکویویی",
+        "Language_kj": "کوانیامایی",
+        "Language_kk": "قزاقی",
+        "Language_kl": "گرینلندی",
+        "Language_km": "خمری",
+        "Language_kn": "کانارایی",
+        "Language_ko": "کره ای",
+        "Language_kr": "کنوری",
+        "Language_ks": "کشمیری",
+        "Language_ku": "کردی",
+        "Language_kv": "کومی",
+        "Language_kw": "کورنی",
+        "Language_ky": "قرقیزی",
+        "Language_la": "لاتین",
+        "Language_lb": "لوکزامبورگی",
+        "Language_lg": "اوگاندایی",
+        "Language_li": "لیمبورگی",
+        "Language_ln": "لینگالایی",
+        "Language_lo": "لائو",
+        "Language_lt": "لیتوانیایی",
+        "Language_lu": "لوبایی‐کاتانگا",
+        "Language_lv": "لتونیایی",
+        "Language_mg": "مالاگاسی",
+        "Language_mh": "مارشالی",
+        "Language_mi": "مائوری",
+        "Language_mk": "مقدونی",
+        "Language_ml": "مالایالم",
+        "Language_mn": "مغولی",
+        "Language_mr": "مراتی",
+        "Language_ms": "مالایی",
+        "Language_mt": "مالتی",
+        "Language_my": "برمه ای",
+        "Language_na": "نائورویی",
+        "Language_nb": "بوکمال نروژی",
+        "Language_nd": "دبل شمالی",
+        "Language_ne": "نپالی",
+        "Language_ng": "اندوگایی",
+        "Language_nl": "هلندی",
+        "Language_nn": "نینورسک نروژی",
+        "Language_no": "نروژی",
+        "Language_nr": "دبل جنوبی",
+        "Language_nv": "واهویی",
+        "Language_ny": "نیانجایی",
+        "Language_oc": "اکسیتانی",
+        "Language_oj": "اوجیبوایی",
+        "Language_om": "اورومویی",
+        "Language_or": "اوریه",
+        "Language_os": "آسی",
+        "Language_pa": "پنجابی",
+        "Language_pi": "پالی",
+        "Language_pl": "لهستانی",
+        "Language_ps": "پشتو",
+        "Language_pt": "پرتغالی",
+        "Language_qu": "کچوآ",
+        "Language_rm": "رومانشی",
+        "Language_rn": "روندایی",
+        "Language_ro": "رومانی",
+        "Language_ru": "روسی",
+        "Language_rw": "کینیارواندایی",
+        "Language_sa": "سنسکریت",
+        "Language_sc": "ساردنیایی",
+        "Language_sd": "سندی",
+        "Language_se": "سامی شمالی",
+        "Language_sg": "سانگویی",
+        "Language_si": "سینهالی",
+        "Language_sk": "اسلواکی",
+        "Language_sl": "اسلونیایی",
+        "Language_sm": "ساموایی",
+        "Language_sn": "شونایی",
+        "Language_so": "سومالی",
+        "Language_sq": "آلبانی",
+        "Language_sr": "صربستانی",
+        "Language_ss": "سی سواتی",
+        "Language_st": "سوتویی",
+        "Language_su": "سودانی",
+        "Language_sv": "سوئدی",
+        "Language_sw": "سواحیلی",
+        "Language_ta": "تامیلی",
+        "Language_te": "تلگویی",
+        "Language_tg": "تاجیک",
+        "Language_th": "تایلندی",
+        "Language_ti": "تیگرایی",
+        "Language_tk": "ترکمن",
+        "Language_tl": "تاگالوگ",
+        "Language_tn": "تسوانایی",
+        "Language_to": "تونگایی",
+        "Language_tr": "ترکی",
+        "Language_ts": "شنگانی",
+        "Language_tt": "تاتار",
+        "Language_tw": "توی‌یایی",
+        "Language_ty": "تاهیتیایی",
+        "Language_ug": "اویغوری",
+        "Language_uk": "اوکراینی",
+        "Language_ur": "اردو",
+        "Language_uz": "ازبکی",
+        "Language_ve": "وندایی",
+        "Language_vi": "ویتنامی",
+        "Language_vo": "ولاپوکی",
+        "Language_wa": "والونی",
+        "Language_wo": "ولوفی",
+        "Language_xh": "خوسایی",
+        "Language_yi": "ییدیشی",
+        "Language_yo": "یوروبایی",
+        "Language_za": "چوانگی",
+        "Language_zh": "چینی",
+        "Language_zu": "زولویی",
+        "LanguageCode": "کد زبان"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/fi.json b/plugins/UserLanguage/lang/fi.json
new file mode 100644
index 0000000000..a49fb05355
--- /dev/null
+++ b/plugins/UserLanguage/lang/fi.json
@@ -0,0 +1,190 @@
+{
+    "UserLanguage": {
+        "BrowserLanguage": "Selaimen kieli",
+        "Language_aa": "afar",
+        "Language_ab": "abkhazian",
+        "Language_ae": "avestan",
+        "Language_af": "afrikaans",
+        "Language_ak": "akan",
+        "Language_am": "amharic",
+        "Language_an": "aragonese",
+        "Language_ar": "arabian kieli",
+        "Language_as": "assamese",
+        "Language_av": "avaric",
+        "Language_ay": "aymara",
+        "Language_az": "azeri",
+        "Language_ba": "bashkir",
+        "Language_be": "valko-venäjä",
+        "Language_bg": "bulgaria",
+        "Language_bh": "bihari",
+        "Language_bi": "bislama",
+        "Language_bm": "bambara",
+        "Language_bn": "bengalin kieli",
+        "Language_bo": "tiibetin kieli",
+        "Language_br": "breton",
+        "Language_bs": "bosnian kieli",
+        "Language_ca": "katalaanin kieli",
+        "Language_ce": "chechen",
+        "Language_ch": "chamorro",
+        "Language_co": "korsikan kieli",
+        "Language_cr": "cree",
+        "Language_cs": "Tsekin kieli",
+        "Language_cu": "kirkkoslaavi",
+        "Language_cv": "chuvash",
+        "Language_cy": "Walesin kieli",
+        "Language_da": "tanska",
+        "Language_de": "saksa",
+        "Language_dv": "divehi",
+        "Language_dz": "dzongkha",
+        "Language_ee": "ewe",
+        "Language_el": "kreikka",
+        "Language_en": "englanti",
+        "Language_eo": "esperanto",
+        "Language_es": "espanja",
+        "Language_et": "viro",
+        "Language_eu": "baski",
+        "Language_fa": "persian kieli",
+        "Language_ff": "fulah",
+        "Language_fi": "suomi",
+        "Language_fj": "fijian",
+        "Language_fo": "fääri",
+        "Language_fr": "ranska",
+        "Language_fy": "friisin kieli",
+        "Language_ga": "irlanti",
+        "Language_gd": "skotlannin gael",
+        "Language_gl": "galician",
+        "Language_gn": "guarani",
+        "Language_gu": "gujarati",
+        "Language_gv": "manx",
+        "Language_ha": "hausa",
+        "Language_he": "heprea",
+        "Language_hi": "hindi",
+        "Language_ho": "hiri motu",
+        "Language_hr": "kroatia",
+        "Language_ht": "haitin creole",
+        "Language_hu": "unkari",
+        "Language_hy": "armenia",
+        "Language_hz": "herero",
+        "Language_ia": "interlingua",
+        "Language_id": "indonesia",
+        "Language_ie": "interlingua",
+        "Language_ig": "igbo",
+        "Language_ii": "sichuan yi",
+        "Language_ik": "inuiitti",
+        "Language_io": "ido",
+        "Language_is": "islannin kieli",
+        "Language_it": "italia",
+        "Language_iu": "inuiitti",
+        "Language_ja": "japani",
+        "Language_jv": "jaava",
+        "Language_ka": "georgian kieli",
+        "Language_kg": "kongo",
+        "Language_ki": "kukuyu",
+        "Language_kj": "kuanyama",
+        "Language_kk": "kzakh",
+        "Language_kl": "grönlannin kieli",
+        "Language_km": "keski-khamer",
+        "Language_kn": "kannada",
+        "Language_ko": "korea",
+        "Language_kr": "kanuri",
+        "Language_ks": "kashmiri",
+        "Language_ku": "kurdi",
+        "Language_kv": "komi",
+        "Language_kw": "cornish",
+        "Language_ky": "kirghiz",
+        "Language_la": "latina",
+        "Language_lb": "luxemburgin kieli",
+        "Language_lg": "ganda",
+        "Language_li": "limburgin kieli",
+        "Language_ln": "lingala",
+        "Language_lo": "laon kieli",
+        "Language_lt": "liettuan kieli",
+        "Language_lu": "luba-katanga",
+        "Language_lv": "latvian kieli",
+        "Language_mg": "malagasy",
+        "Language_mh": "marshallien kieli",
+        "Language_mi": "maorin kieli",
+        "Language_mk": "makedonian kieli",
+        "Language_ml": "malesian kieli",
+        "Language_mn": "mongolian kieli",
+        "Language_mr": "marathi",
+        "Language_ms": "malay",
+        "Language_mt": "maltan kieli",
+        "Language_my": "burman kieli",
+        "Language_na": "naurun kieli",
+        "Language_nb": "norjan bokmål",
+        "Language_nd": "pohjoinen ndebele",
+        "Language_ne": "nepalin kieli",
+        "Language_ng": "ndonga",
+        "Language_nl": "hollanti",
+        "Language_nn": "norjan nynorsk",
+        "Language_no": "norja",
+        "Language_nr": "eteläinen ndebele",
+        "Language_nv": "navajo",
+        "Language_ny": "chichewa",
+        "Language_oc": "occitan",
+        "Language_oj": "ojibwa",
+        "Language_om": "oroma",
+        "Language_or": "oriya",
+        "Language_os": "ossetian kieli",
+        "Language_pa": "panjabi",
+        "Language_pi": "pali",
+        "Language_pl": "puola",
+        "Language_ps": "pashto",
+        "Language_pt": "portugalin kieli",
+        "Language_qu": "quechua",
+        "Language_rm": "raeto-romance",
+        "Language_rn": "rundi",
+        "Language_ro": "romania",
+        "Language_ru": "venäjä",
+        "Language_rw": "kinyarwanda",
+        "Language_sa": "sanskritin kieli",
+        "Language_sc": "sardinian kieli",
+        "Language_sd": "sindhi",
+        "Language_se": "pohjoinen saami",
+        "Language_sg": "sango",
+        "Language_si": "sinhala",
+        "Language_sk": "slovakian kieli",
+        "Language_sl": "slovenian kieli",
+        "Language_sm": "samoan kieli",
+        "Language_sn": "shona",
+        "Language_so": "somalian kieli",
+        "Language_sq": "albanian kieli",
+        "Language_sr": "serbian kieli",
+        "Language_ss": "swati",
+        "Language_st": "sotho",
+        "Language_su": "sundan kieli",
+        "Language_sv": "ruotsi",
+        "Language_sw": "swahili",
+        "Language_ta": "tamil",
+        "Language_te": "telugu",
+        "Language_tg": "tajik",
+        "Language_th": "thain kieli",
+        "Language_ti": "tigrinya",
+        "Language_tk": "turkin kieli",
+        "Language_tl": "tagalog",
+        "Language_tn": "tswana",
+        "Language_to": "tonga",
+        "Language_tr": "turkin kieli",
+        "Language_ts": "tsonga",
+        "Language_tt": "tatar",
+        "Language_tw": "twi",
+        "Language_ty": "tahiti",
+        "Language_ug": "uighur",
+        "Language_uk": "ukrainan kieli",
+        "Language_ur": "urdu",
+        "Language_uz": "uzbekin kieli",
+        "Language_ve": "venda",
+        "Language_vi": "vietnamin kieli",
+        "Language_vo": "volapük",
+        "Language_wa": "walloon",
+        "Language_wo": "wolof",
+        "Language_xh": "xhosa",
+        "Language_yi": "yiddin kieli",
+        "Language_yo": "yoruba",
+        "Language_za": "chuang",
+        "Language_zh": "kiinan kieli",
+        "Language_zu": "zulu",
+        "LanguageCode": "Kielikoodi"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/fr.json b/plugins/UserLanguage/lang/fr.json
new file mode 100644
index 0000000000..4ce253f215
--- /dev/null
+++ b/plugins/UserLanguage/lang/fr.json
@@ -0,0 +1,190 @@
+{
+    "UserLanguage": {
+        "BrowserLanguage": "Langage du navigateur",
+        "Language_aa": "Afar",
+        "Language_ab": "Abkhaze",
+        "Language_ae": "Avestique",
+        "Language_af": "Africain",
+        "Language_ak": "Akan",
+        "Language_am": "Amharique",
+        "Language_an": "Aragonais",
+        "Language_ar": "Arabe",
+        "Language_as": "Assamais",
+        "Language_av": "Avar",
+        "Language_ay": "Aymara",
+        "Language_az": "Azéri",
+        "Language_ba": "Bachkir",
+        "Language_be": "Biélorusse",
+        "Language_bg": "Bulgare",
+        "Language_bh": "Bihari",
+        "Language_bi": "Bichelamar",
+        "Language_bm": "Bambara",
+        "Language_bn": "Bengali",
+        "Language_bo": "Tibétain",
+        "Language_br": "Breton",
+        "Language_bs": "Bosniaque",
+        "Language_ca": "Catalan",
+        "Language_ce": "Tchétchène",
+        "Language_ch": "Chamorro",
+        "Language_co": "Corse",
+        "Language_cr": "Cri",
+        "Language_cs": "Tchèque",
+        "Language_cu": "Vieux-slave liturgique",
+        "Language_cv": "Tchouvache",
+        "Language_cy": "Gallois",
+        "Language_da": "Danois",
+        "Language_de": "Allemand",
+        "Language_dv": "Divehi",
+        "Language_dz": "Dzongkha",
+        "Language_ee": "Ewe",
+        "Language_el": "Grecque",
+        "Language_en": "Anglais",
+        "Language_eo": "Espéranto",
+        "Language_es": "Espagnol",
+        "Language_et": "Estonien",
+        "Language_eu": "Basque",
+        "Language_fa": "Persan",
+        "Language_ff": "Peul",
+        "Language_fi": "Finlandais",
+        "Language_fj": "Fidjien",
+        "Language_fo": "Féroïen",
+        "Language_fr": "Français",
+        "Language_fy": "Frison occidental",
+        "Language_ga": "Irlandais",
+        "Language_gd": "Gaélique écossais",
+        "Language_gl": "Galicien",
+        "Language_gn": "Guarani",
+        "Language_gu": "Gujarati",
+        "Language_gv": "Mannois",
+        "Language_ha": "Haoussa",
+        "Language_he": "Hébreu",
+        "Language_hi": "Hindi",
+        "Language_ho": "Hiri Motu",
+        "Language_hr": "Croate",
+        "Language_ht": "Créole Haïtien",
+        "Language_hu": "Hongrois",
+        "Language_hy": "Arménien",
+        "Language_hz": "Héréro",
+        "Language_ia": "Interlingue",
+        "Language_id": "Indonésien",
+        "Language_ie": "Interlingue",
+        "Language_ig": "Igbo",
+        "Language_ii": "Sichuan Yi",
+        "Language_ik": "Inupiak",
+        "Language_io": "Ido",
+        "Language_is": "Islandais",
+        "Language_it": "Italien",
+        "Language_iu": "Inuktitut",
+        "Language_ja": "Japonais",
+        "Language_jv": "Javanais",
+        "Language_ka": "Géorgien",
+        "Language_kg": "Kikongo",
+        "Language_ki": "Kikuyu",
+        "Language_kj": "Kuanyama",
+        "Language_kk": "Kazakh",
+        "Language_kl": "Groenlandais",
+        "Language_km": "Khmer",
+        "Language_kn": "Kannada",
+        "Language_ko": "Coréen",
+        "Language_kr": "Kanuri",
+        "Language_ks": "Cachemiri",
+        "Language_ku": "Kurde",
+        "Language_kv": "Komi",
+        "Language_kw": "Cornique",
+        "Language_ky": "Kirghize",
+        "Language_la": "Latin",
+        "Language_lb": "Luxembourgeois",
+        "Language_lg": "Luganda",
+        "Language_li": "Limbourgeois",
+        "Language_ln": "Lingala",
+        "Language_lo": "Lao",
+        "Language_lt": "Lituanien",
+        "Language_lu": "Luba-Katanga",
+        "Language_lv": "Letton",
+        "Language_mg": "Malgache",
+        "Language_mh": "Marshallais",
+        "Language_mi": "Maori",
+        "Language_mk": "Macédonien",
+        "Language_ml": "Malayalam",
+        "Language_mn": "Mongolien",
+        "Language_mr": "Marathi",
+        "Language_ms": "Malais",
+        "Language_mt": "Maltais",
+        "Language_my": "Birman",
+        "Language_na": "Nauruan",
+        "Language_nb": "Bokmål",
+        "Language_nd": "Sindebele",
+        "Language_ne": "Népalais",
+        "Language_ng": "Ndonga",
+        "Language_nl": "Néerlandais",
+        "Language_nn": "Nynorsk",
+        "Language_no": "Norvégien",
+        "Language_nr": "Nrebele",
+        "Language_nv": "Navajo",
+        "Language_ny": "Chichewa",
+        "Language_oc": "Occitan",
+        "Language_oj": "Ojibwé",
+        "Language_om": "Oromo",
+        "Language_or": "Oriya",
+        "Language_os": "Ossète",
+        "Language_pa": "Panjābī",
+        "Language_pi": "Pali",
+        "Language_pl": "Polonais",
+        "Language_ps": "Pachto",
+        "Language_pt": "Portuguais",
+        "Language_qu": "Quechua",
+        "Language_rm": "Rhéto-roman",
+        "Language_rn": "Kirundi",
+        "Language_ro": "Roumain",
+        "Language_ru": "Russe",
+        "Language_rw": "Kinyarwanda",
+        "Language_sa": "Sanskrit",
+        "Language_sc": "Sarde",
+        "Language_sd": "Sindhi",
+        "Language_se": "Same",
+        "Language_sg": "Sango",
+        "Language_si": "Cingalais",
+        "Language_sk": "Slovaque",
+        "Language_sl": "Slovène",
+        "Language_sm": "Samoan",
+        "Language_sn": "Shona",
+        "Language_so": "Somali",
+        "Language_sq": "Albanais",
+        "Language_sr": "Serbe",
+        "Language_ss": "Swati",
+        "Language_st": "Sotho",
+        "Language_su": "Soundanais",
+        "Language_sv": "Suédois",
+        "Language_sw": "Swahili",
+        "Language_ta": "Tamoul",
+        "Language_te": "Télougou",
+        "Language_tg": "Tadjik",
+        "Language_th": "Thaï",
+        "Language_ti": "Tigrigna",
+        "Language_tk": "Turkmène",
+        "Language_tl": "Tagalog",
+        "Language_tn": "Tswana",
+        "Language_to": "Tonguien",
+        "Language_tr": "Turc",
+        "Language_ts": "Tsonga",
+        "Language_tt": "Tatar",
+        "Language_tw": "Akan",
+        "Language_ty": "Tahitien",
+        "Language_ug": "Ouïghour",
+        "Language_uk": "Ukrainien",
+        "Language_ur": "Ourdou",
+        "Language_uz": "Ouzbek",
+        "Language_ve": "Venda",
+        "Language_vi": "Vietnamien",
+        "Language_vo": "Volapük",
+        "Language_wa": "Wallon",
+        "Language_wo": "Wolof",
+        "Language_xh": "Xhosa",
+        "Language_yi": "Yiddish",
+        "Language_yo": "Yoruba",
+        "Language_za": "Chuang",
+        "Language_zh": "Chinois",
+        "Language_zu": "Zoulou",
+        "LanguageCode": "Code langue"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/gl.json b/plugins/UserLanguage/lang/gl.json
new file mode 100644
index 0000000000..a0d8202653
--- /dev/null
+++ b/plugins/UserLanguage/lang/gl.json
@@ -0,0 +1,151 @@
+{
+    "UserLanguage": {
+        "Language_ab": "abkhazo",
+        "Language_af": "Afrikaans",
+        "Language_ak": "Akán",
+        "Language_am": "Amárico",
+        "Language_an": "Aragonés",
+        "Language_ar": "Árabe",
+        "Language_as": "Assamés",
+        "Language_ay": "aimará",
+        "Language_az": "Azerbaiano",
+        "Language_be": "Bielorruso",
+        "Language_bg": "Búlgaro",
+        "Language_bh": "Bihariano",
+        "Language_bn": "Bengalí",
+        "Language_bo": "tibetano",
+        "Language_br": "Bretón",
+        "Language_bs": "Bosnio",
+        "Language_ca": "Catalán",
+        "Language_co": "Corso",
+        "Language_cs": "Checo",
+        "Language_cu": "Eslavo eclesiástico",
+        "Language_cy": "Galés",
+        "Language_da": "Dinamarqués",
+        "Language_de": "Alemán",
+        "Language_dv": "divehi",
+        "Language_dz": "dzongkha",
+        "Language_ee": "Ewé",
+        "Language_el": "Grego",
+        "Language_en": "Inglés",
+        "Language_eo": "Esperanto",
+        "Language_es": "Español",
+        "Language_et": "Estoniano",
+        "Language_eu": "Éuscaro",
+        "Language_fa": "Persa",
+        "Language_fi": "Finés",
+        "Language_fj": "fixiano",
+        "Language_fo": "Faroés",
+        "Language_fr": "Francés",
+        "Language_fy": "Frisón",
+        "Language_ga": "Irlandés",
+        "Language_gd": "Gaélico escocés",
+        "Language_gl": "galego",
+        "Language_gn": "Guaraní",
+        "Language_gu": "Guxaratiano",
+        "Language_ha": "hausa",
+        "Language_he": "Hebreo",
+        "Language_hi": "Hindi",
+        "Language_hr": "Croata",
+        "Language_ht": "haitiano",
+        "Language_hu": "Húngaro",
+        "Language_hy": "Armenio",
+        "Language_ia": "Interlingua",
+        "Language_id": "Indonesio",
+        "Language_ig": "ibo",
+        "Language_is": "Islandés",
+        "Language_it": "Italiano",
+        "Language_ja": "Xaponés",
+        "Language_jv": "Xavanés",
+        "Language_ka": "Xeorxiano",
+        "Language_kg": "Congolés",
+        "Language_kk": "casaco",
+        "Language_km": "Cambodiano",
+        "Language_kn": "Kannada",
+        "Language_ko": "Coreano",
+        "Language_ks": "cachemir",
+        "Language_ku": "Kurdo",
+        "Language_ky": "Kyrgiz",
+        "Language_la": "Latín",
+        "Language_lb": "luxemburgués",
+        "Language_lg": "Ganda",
+        "Language_ln": "Lingala",
+        "Language_lo": "Laotiano",
+        "Language_lt": "Lituano",
+        "Language_lv": "Letón",
+        "Language_mg": "malgaxe",
+        "Language_mi": "maorí",
+        "Language_mk": "Macedonio",
+        "Language_ml": "Malaialam",
+        "Language_mn": "Mongol",
+        "Language_mr": "Marathi",
+        "Language_ms": "Malaio",
+        "Language_mt": "Maltés",
+        "Language_my": "birmano",
+        "Language_nb": "Noruegués Bokmal",
+        "Language_nd": "ndebele do norte",
+        "Language_ne": "Nepalí",
+        "Language_nl": "Holandés",
+        "Language_nn": "Noruegués nynorsk",
+        "Language_no": "Noruegués",
+        "Language_ny": "chewa",
+        "Language_oc": "Occitano",
+        "Language_om": "Oromo",
+        "Language_or": "Orissa",
+        "Language_os": "osetio",
+        "Language_pa": "Punjabi",
+        "Language_pl": "Polaco",
+        "Language_ps": "Pashto",
+        "Language_pt": "Portugués",
+        "Language_qu": "quechua",
+        "Language_rm": "romanche",
+        "Language_rn": "rundi",
+        "Language_ro": "Romanés",
+        "Language_ru": "Ruso",
+        "Language_rw": "ruandés",
+        "Language_sa": "Sánscrito",
+        "Language_sd": "Sindhi",
+        "Language_se": "sami do norte",
+        "Language_sg": "sango",
+        "Language_si": "Sinhalés",
+        "Language_sk": "Eslovaco",
+        "Language_sl": "Esloveno",
+        "Language_sm": "samoano",
+        "Language_sn": "shona",
+        "Language_so": "Somalí",
+        "Language_sq": "Albanés",
+        "Language_sr": "Serbio",
+        "Language_ss": "swati",
+        "Language_st": "Sesotho",
+        "Language_su": "Sondanés",
+        "Language_sv": "Sueco",
+        "Language_sw": "Suaxili",
+        "Language_ta": "Tamil",
+        "Language_te": "Telugu",
+        "Language_tg": "taxico",
+        "Language_th": "Tailandés",
+        "Language_ti": "Tigriña",
+        "Language_tk": "turcomano",
+        "Language_tl": "Tagalo",
+        "Language_tn": "tswana",
+        "Language_to": "tonganés",
+        "Language_tr": "Turco",
+        "Language_ts": "xitsonga",
+        "Language_tt": "tártaro",
+        "Language_tw": "Twi",
+        "Language_ty": "tahitiano",
+        "Language_ug": "Uighur",
+        "Language_uk": "Ucraíno",
+        "Language_ur": "Urdú",
+        "Language_uz": "Uzbeco",
+        "Language_ve": "venda",
+        "Language_vi": "Vietnamita",
+        "Language_wo": "wólof",
+        "Language_xh": "Xhosa",
+        "Language_yi": "Yiddish",
+        "Language_yo": "ioruba",
+        "Language_zh": "Chinés",
+        "Language_zu": "Zulú",
+        "LanguageCode": "Código de idioma"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/he.json b/plugins/UserLanguage/lang/he.json
new file mode 100644
index 0000000000..e7109e39ad
--- /dev/null
+++ b/plugins/UserLanguage/lang/he.json
@@ -0,0 +1,189 @@
+{
+    "UserLanguage": {
+        "Language_aa": "אפארית",
+        "Language_ab": "אבחזית",
+        "Language_ae": "אבסטן",
+        "Language_af": "אפריקאנס",
+        "Language_ak": "אקאן",
+        "Language_am": "אמהרית",
+        "Language_an": "אראגונית",
+        "Language_ar": "ערבית",
+        "Language_as": "אסאמית",
+        "Language_av": "אבארית",
+        "Language_ay": "איימארית",
+        "Language_az": "אזרית",
+        "Language_ba": "בשקירית",
+        "Language_be": "בלארוסית",
+        "Language_bg": "בולגרית",
+        "Language_bh": "ביהארי",
+        "Language_bi": "ביסלמה",
+        "Language_bm": "במבארה",
+        "Language_bn": "בנגלית",
+        "Language_bo": "טיבטית",
+        "Language_br": "ברטונית",
+        "Language_bs": "בוסנית",
+        "Language_ca": "קטלאנית",
+        "Language_ce": "צ'צ'נית",
+        "Language_ch": "צ'מורו",
+        "Language_co": "קורסיקנית",
+        "Language_cr": "קרי",
+        "Language_cs": "צ׳כית",
+        "Language_cu": "סלאבית כנסייתית עתיקה",
+        "Language_cv": "צ'ובאש",
+        "Language_cy": "וולשית",
+        "Language_da": "דנית",
+        "Language_de": "גרמנית",
+        "Language_dv": "דיבהי",
+        "Language_dz": "דזונקה",
+        "Language_ee": "אווה",
+        "Language_el": "יוונית",
+        "Language_en": "אנגלית",
+        "Language_eo": "אספרנטו",
+        "Language_es": "ספרדית",
+        "Language_et": "אסטונית",
+        "Language_eu": "בסקית",
+        "Language_fa": "פרסית",
+        "Language_ff": "פולה",
+        "Language_fi": "פינית",
+        "Language_fj": "פיג'ית",
+        "Language_fo": "פארואזית",
+        "Language_fr": "צרפתית",
+        "Language_fy": "פריזית",
+        "Language_ga": "אירית",
+        "Language_gd": "גאלית סקוטית",
+        "Language_gl": "גליציאנית",
+        "Language_gn": "גוארני",
+        "Language_gu": "גוג'ראטית",
+        "Language_gv": "מאנית",
+        "Language_ha": "האוסה",
+        "Language_he": "עברית",
+        "Language_hi": "הינדי",
+        "Language_ho": "הארי מוטו",
+        "Language_hr": "קרואטית",
+        "Language_ht": "האיטית",
+        "Language_hu": "הונגרית",
+        "Language_hy": "ארמנית",
+        "Language_hz": "הררו",
+        "Language_ia": "‏אינטרלינגואה",
+        "Language_id": "אינדונזית",
+        "Language_ie": "אינטרלינגה",
+        "Language_ig": "איגבו",
+        "Language_ii": "סיצ'ואן יי",
+        "Language_ik": "ik",
+        "Language_io": "אידו",
+        "Language_is": "איסלנדית",
+        "Language_it": "איטלקית",
+        "Language_iu": "אינוקטיטוט",
+        "Language_ja": "יפנית",
+        "Language_jv": "יאוונית",
+        "Language_ka": "גיאורגית",
+        "Language_kg": "קונגו",
+        "Language_ki": "קיקויו",
+        "Language_kj": "קואניאמה",
+        "Language_kk": "קזחית",
+        "Language_kl": "קאלאליסוטית",
+        "Language_km": "קמרית",
+        "Language_kn": "קנאדה",
+        "Language_ko": "קוריאנית",
+        "Language_kr": "קאנורי",
+        "Language_ks": "קשמירית",
+        "Language_ku": "כורדית",
+        "Language_kv": "קומי",
+        "Language_kw": "קורנית",
+        "Language_ky": "קירגיזית",
+        "Language_la": "לטינית",
+        "Language_lb": "לוקסמבורגית",
+        "Language_lg": "גאנדה",
+        "Language_li": "לימבורגיש",
+        "Language_ln": "לינגלה",
+        "Language_lo": "לאית",
+        "Language_lt": "ליטאית",
+        "Language_lu": "לובה-קטנגה",
+        "Language_lv": "לטבית",
+        "Language_mg": "מלגשית",
+        "Language_mh": "מרשאלס",
+        "Language_mi": "מאורית",
+        "Language_mk": "מקדונית",
+        "Language_ml": "מלאיאלם",
+        "Language_mn": "מונגולית",
+        "Language_mr": "מרטהי",
+        "Language_ms": "מלאית",
+        "Language_mt": "מלטית",
+        "Language_my": "בורמזית",
+        "Language_na": "נאורית",
+        "Language_nb": "‏נורבגית ספרותית",
+        "Language_nd": "צפון נדבלה",
+        "Language_ne": "נפאלית",
+        "Language_ng": "נדונגה",
+        "Language_nl": "הולנדית",
+        "Language_nn": "נורבגית חדשה - נינורשק",
+        "Language_no": "נורווגית",
+        "Language_nr": "דרום נדבלה",
+        "Language_nv": "נבחו",
+        "Language_ny": "ניאנג'ה",
+        "Language_oc": "אוקסיטנית",
+        "Language_oj": "אוג'יבווה",
+        "Language_om": "אורומו",
+        "Language_or": "אוריה",
+        "Language_os": "אוסטית",
+        "Language_pa": "פנג'אבית",
+        "Language_pi": "פאלי",
+        "Language_pl": "פולנית",
+        "Language_ps": "פאשטו",
+        "Language_pt": "פורטוגלית",
+        "Language_qu": "קצ'ואה",
+        "Language_rm": "רומאנש",
+        "Language_rn": "קירונדי",
+        "Language_ro": "רומנית",
+        "Language_ru": "רוסית",
+        "Language_rw": "קינירואנדה",
+        "Language_sa": "סנסקריט",
+        "Language_sc": "סרדינית",
+        "Language_sd": "סינדהית",
+        "Language_se": "לאפית צפונית",
+        "Language_sg": "סנגו",
+        "Language_si": "סינהלה",
+        "Language_sk": "סלובקית",
+        "Language_sl": "סלובנית",
+        "Language_sm": "סמואית",
+        "Language_sn": "שונה",
+        "Language_so": "סומלית",
+        "Language_sq": "אלבנית",
+        "Language_sr": "סרבית",
+        "Language_ss": "סיסוואטי",
+        "Language_st": "ססות'ו",
+        "Language_su": "סודנית",
+        "Language_sv": "שוודית",
+        "Language_sw": "סווהילית",
+        "Language_ta": "טמילית",
+        "Language_te": "טלוגו",
+        "Language_tg": "טג'יקית",
+        "Language_th": "תאי",
+        "Language_ti": "טיגרינאית",
+        "Language_tk": "טורקמנית",
+        "Language_tl": "טגלוג",
+        "Language_tn": "צוואנה",
+        "Language_to": "טונגאית",
+        "Language_tr": "טורקית",
+        "Language_ts": "טסונגה",
+        "Language_tt": "טטרית",
+        "Language_tw": "טווי",
+        "Language_ty": "טהיטית",
+        "Language_ug": "אויגהור",
+        "Language_uk": "אוקראינית",
+        "Language_ur": "אורדו",
+        "Language_uz": "אוזבקית",
+        "Language_ve": "וונדה",
+        "Language_vi": "ויאטנמית",
+        "Language_vo": "‏וולאפיק",
+        "Language_wa": "וואלון",
+        "Language_wo": "ג'ולוף",
+        "Language_xh": "קסוסה",
+        "Language_yi": "יידיש",
+        "Language_yo": "יורובה",
+        "Language_za": "ז'ואנג",
+        "Language_zh": "סינית",
+        "Language_zu": "זולו",
+        "LanguageCode": "קוד שפה"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/hi.json b/plugins/UserLanguage/lang/hi.json
new file mode 100644
index 0000000000..8edd9333ca
--- /dev/null
+++ b/plugins/UserLanguage/lang/hi.json
@@ -0,0 +1,190 @@
+{
+    "UserLanguage": {
+        "BrowserLanguage": "ब्राउज़र की भाषा",
+        "Language_aa": "अफ़ार",
+        "Language_ab": "अब्खाज़ियन्",
+        "Language_ae": "अवेस्तन",
+        "Language_af": "अफ्रीकी",
+        "Language_ak": "अकन",
+        "Language_am": "अम्हारिक्",
+        "Language_an": "अर्गोनी",
+        "Language_ar": "अरबी",
+        "Language_as": "असामी",
+        "Language_av": "अवेरिक",
+        "Language_ay": "आयमारा",
+        "Language_az": "अज़रबैंजानी",
+        "Language_ba": "बशख़िर",
+        "Language_be": "बैलोरूशियन्",
+        "Language_bg": "बल्गेरियाई",
+        "Language_bh": "बिहारी",
+        "Language_bi": "बिस्लामा",
+        "Language_bm": "बाम्बारा",
+        "Language_bn": "बँगाली",
+        "Language_bo": "तिब्बती",
+        "Language_br": "ब्रेटन",
+        "Language_bs": "बोस्नियाई",
+        "Language_ca": "कातालान",
+        "Language_ce": "चेचन",
+        "Language_ch": "कमोरो",
+        "Language_co": "कोर्सीकन",
+        "Language_cr": "क्री",
+        "Language_cs": "चेक",
+        "Language_cu": "चर्च साल्विक",
+        "Language_cv": "चूवाश",
+        "Language_cy": "वेल्श",
+        "Language_da": "डैनीश",
+        "Language_de": "ज़र्मन",
+        "Language_dv": "दिवेही",
+        "Language_dz": "ज़ोन्गखा",
+        "Language_ee": "ईवे",
+        "Language_el": "ग्रीक",
+        "Language_en": "अंग्रेजी",
+        "Language_eo": "एस्पेरान्तो",
+        "Language_es": "स्पेनिश",
+        "Language_et": "ऐस्तोनियन्",
+        "Language_eu": "बास्क्",
+        "Language_fa": "पर्शियन्",
+        "Language_ff": "फुलाह",
+        "Language_fi": "फिनिश",
+        "Language_fj": "फ़ीजी",
+        "Language_fo": "फिरोज़ी",
+        "Language_fr": "फ्रेंच",
+        "Language_fy": "पश्चिमी फ़्रिसियाई",
+        "Language_ga": "आयरिश",
+        "Language_gd": "स्काट्स् गायेलिक्",
+        "Language_gl": "गैलिशियन्",
+        "Language_gn": "गुआरानी",
+        "Language_gu": "गुज़राती",
+        "Language_gv": "मैंक्स",
+        "Language_ha": "होउसा",
+        "Language_he": "हीब्रू",
+        "Language_hi": "हिन्दी",
+        "Language_ho": "हिरी मोटू",
+        "Language_hr": "क्रोएशन्",
+        "Language_ht": "हैतीयन",
+        "Language_hu": "हंगेरी",
+        "Language_hy": "अरमेनियन्",
+        "Language_hz": "हरैरो",
+        "Language_ia": "ईन्टरलिंगुआ",
+        "Language_id": "इन्डोनेशियाई",
+        "Language_ie": "ईन्टरलिंगुइ",
+        "Language_ig": "ईग्बो",
+        "Language_ii": "सिचुआन यी",
+        "Language_ik": "इनुपियाक्",
+        "Language_io": "इडौ",
+        "Language_is": "आईस्लैंडिक्",
+        "Language_it": "इतालवी",
+        "Language_iu": "इनूकीटूत्",
+        "Language_ja": "जापानी",
+        "Language_jv": "जावानीस",
+        "Language_ka": "जॉर्जीयन्",
+        "Language_kg": "कोंगो",
+        "Language_ki": "किकुयू",
+        "Language_kj": "क्वान्यामा",
+        "Language_kk": "कज़ाख",
+        "Language_kl": "ग्रीनलैंडिक",
+        "Language_km": "कैम्बोडियन्",
+        "Language_kn": "कन्नड़",
+        "Language_ko": "कोरीयन्",
+        "Language_kr": "कनुरी",
+        "Language_ks": "कश्मीरी",
+        "Language_ku": "कुरदीश",
+        "Language_kv": "कोमी",
+        "Language_kw": "कोर्निश",
+        "Language_ky": "किरघिज़",
+        "Language_la": "लैटीन",
+        "Language_lb": "लक्ष्ज़ेमबर्गिश",
+        "Language_lg": "गांडा",
+        "Language_li": "लिंबर्गिश",
+        "Language_ln": "लिंगाला",
+        "Language_lo": "लाओथीयन्",
+        "Language_lt": "लिथुनियन्",
+        "Language_lu": "ल्यूबा-कटांगा",
+        "Language_lv": "लातवी",
+        "Language_mg": "मालागासी",
+        "Language_mh": "मार्शलीज़",
+        "Language_mi": "मेओरी",
+        "Language_mk": "मैसेडोनियन्",
+        "Language_ml": "मलयालम",
+        "Language_mn": "मंगोलीयाई",
+        "Language_mr": "मराठी",
+        "Language_ms": "मलय",
+        "Language_mt": "मालटिस्",
+        "Language_my": "बर्लिस",
+        "Language_na": "नाउरू",
+        "Language_nb": "नॉर्वेजियन बोकमाल",
+        "Language_nd": "उत्तरी देबेल",
+        "Language_ne": "नेपाली",
+        "Language_ng": "डोन्गा",
+        "Language_nl": "डच्",
+        "Language_nn": "नॉर्वेजियन नाइनोर्स्क",
+        "Language_no": "नार्वेजियन",
+        "Language_nr": "दक्षिण देबेल",
+        "Language_nv": "नावाजो",
+        "Language_ny": "न्यानजा",
+        "Language_oc": "ओसीटान",
+        "Language_oj": "ओजिब्वा",
+        "Language_om": "ओरोमो",
+        "Language_or": "उड़िया",
+        "Language_os": "ओस्सेटिक",
+        "Language_pa": "पंजाबी",
+        "Language_pi": "पाली",
+        "Language_pl": "पॉलिश",
+        "Language_ps": "पॉशतो",
+        "Language_pt": "पुर्तगाली",
+        "Language_qu": "क्वेशुआ",
+        "Language_rm": "रहेय्टो-रोमान्स",
+        "Language_rn": "रुन्दी",
+        "Language_ro": "रोमानियाई",
+        "Language_ru": "रूसी",
+        "Language_rw": "किन्यारवाण्डा",
+        "Language_sa": "संस्कृत",
+        "Language_sc": "सार्दिनियन",
+        "Language_sd": "सिन्धी",
+        "Language_se": "नॉर्दन सामी",
+        "Language_sg": "सांगो",
+        "Language_si": "शिंघालीस्",
+        "Language_sk": "स्लोवाक्",
+        "Language_sl": "स्लोवेनियन्",
+        "Language_sm": "सामोन",
+        "Language_sn": "सोणा",
+        "Language_so": "सोमाली",
+        "Language_sq": "अल्बेनियन्",
+        "Language_sr": "सर्बियन्",
+        "Language_ss": "स्वाती",
+        "Language_st": "सेसोथो",
+        "Language_su": "सुंडानी",
+        "Language_sv": "स्विडिश",
+        "Language_sw": "स्वाहिली",
+        "Language_ta": "तमिल",
+        "Language_te": "तेलेगु",
+        "Language_tg": "ताजिक्",
+        "Language_th": "थाई",
+        "Language_ti": "तिग्रीन्या",
+        "Language_tk": "तुक्रमेन",
+        "Language_tl": "तागालोग",
+        "Language_tn": "सेत्स्वाना",
+        "Language_to": "टोंगा",
+        "Language_tr": "तुर्की",
+        "Language_ts": "सोंगा",
+        "Language_tt": "टाटर",
+        "Language_tw": "ट्वी",
+        "Language_ty": "ताहितियन",
+        "Language_ug": "उईघुर",
+        "Language_uk": "यूक्रेनी",
+        "Language_ur": "उर्दू",
+        "Language_uz": "उज़्बेक",
+        "Language_ve": "वेन्दा",
+        "Language_vi": "वियेतनामी",
+        "Language_vo": "वोलापुक",
+        "Language_wa": "वाल्लून",
+        "Language_wo": "वोलोफ",
+        "Language_xh": "षोसा",
+        "Language_yi": "येहुदी",
+        "Language_yo": "योरूबा",
+        "Language_za": "ज़ुआंग",
+        "Language_zh": "चीनी",
+        "Language_zu": "ज़ुलू",
+        "LanguageCode": "भाषा कोड"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/hr.json b/plugins/UserLanguage/lang/hr.json
new file mode 100644
index 0000000000..1c5d7a9d54
--- /dev/null
+++ b/plugins/UserLanguage/lang/hr.json
@@ -0,0 +1,188 @@
+{
+    "UserLanguage": {
+        "Language_aa": "afarski",
+        "Language_ab": "abhaski",
+        "Language_ae": "avestan",
+        "Language_af": "afrikaans",
+        "Language_ak": "akanski",
+        "Language_am": "amharik",
+        "Language_an": "aragonski",
+        "Language_ar": "arapski",
+        "Language_as": "asamski",
+        "Language_av": "avarski",
+        "Language_ay": "aymara",
+        "Language_az": "azerbajdžanski",
+        "Language_ba": "baškirski",
+        "Language_be": "bjeloruski",
+        "Language_bg": "bugarski",
+        "Language_bh": "bihari",
+        "Language_bi": "bislama",
+        "Language_bm": "bambara",
+        "Language_bn": "bengalski",
+        "Language_bo": "tibetanski",
+        "Language_br": "bretonski",
+        "Language_bs": "bosanski",
+        "Language_ca": "katalonski",
+        "Language_ce": "čečenski",
+        "Language_ch": "chamorro",
+        "Language_co": "korzički",
+        "Language_cr": "cree",
+        "Language_cs": "češki",
+        "Language_cu": "crkvenoslavenski",
+        "Language_cv": "chuvash",
+        "Language_cy": "velški",
+        "Language_da": "danski",
+        "Language_de": "njemački",
+        "Language_dv": "divehi",
+        "Language_dz": "dzongkha",
+        "Language_ee": "ewe",
+        "Language_el": "grčki",
+        "Language_en": "engleski",
+        "Language_eo": "esperanto",
+        "Language_es": "španjolski",
+        "Language_et": "estonijski",
+        "Language_eu": "baskijski",
+        "Language_fa": "perzijski",
+        "Language_ff": "fulah",
+        "Language_fi": "finski",
+        "Language_fj": "fidžijski",
+        "Language_fo": "faroanski",
+        "Language_fr": "francuski",
+        "Language_fy": "frizijski",
+        "Language_ga": "irski",
+        "Language_gd": "škotski-galski",
+        "Language_gl": "galicijski",
+        "Language_gn": "guarani",
+        "Language_gu": "gujarati",
+        "Language_gv": "manx",
+        "Language_ha": "hausa",
+        "Language_he": "hebrejski",
+        "Language_hi": "hindu",
+        "Language_ho": "hiri motu",
+        "Language_hr": "hrvatski",
+        "Language_ht": "kreolski",
+        "Language_hu": "mađarski",
+        "Language_hy": "armenski",
+        "Language_hz": "herero",
+        "Language_ia": "interlingua",
+        "Language_id": "indonezijski",
+        "Language_ie": "interligua",
+        "Language_ig": "igbo",
+        "Language_ii": "sichuan yi",
+        "Language_ik": "inupiaq",
+        "Language_io": "ido",
+        "Language_is": "islandski",
+        "Language_it": "talijanski",
+        "Language_iu": "inuktitut",
+        "Language_ja": "japanski",
+        "Language_jv": "javanski",
+        "Language_ka": "gruzijski",
+        "Language_kg": "kongo",
+        "Language_ki": "kikuyu",
+        "Language_kj": "kuanyama",
+        "Language_kk": "kazaški",
+        "Language_kl": "kalaallisut",
+        "Language_km": "kmerski",
+        "Language_kn": "kannada",
+        "Language_ko": "korejski",
+        "Language_kr": "kanuri",
+        "Language_ks": "kašmirski",
+        "Language_ku": "kurdski",
+        "Language_kv": "komi",
+        "Language_kw": "kornski",
+        "Language_ky": "kirgiški",
+        "Language_la": "latinski",
+        "Language_lb": "luksemburški",
+        "Language_lg": "ganda",
+        "Language_li": "limburgish",
+        "Language_ln": "lingala",
+        "Language_lo": "laoski",
+        "Language_lt": "litvanski",
+        "Language_lu": "luba-katanga",
+        "Language_lv": "latvijski",
+        "Language_mg": "malgaški",
+        "Language_mh": "maršalski",
+        "Language_mi": "maorski",
+        "Language_mk": "makedonski",
+        "Language_ml": "malayalam",
+        "Language_mn": "mongolski",
+        "Language_mr": "marathi",
+        "Language_ms": "malajski",
+        "Language_mt": "malteški",
+        "Language_my": "burmanski",
+        "Language_na": "nauru",
+        "Language_nb": "književni norveški",
+        "Language_nd": "sjeverni ndebele",
+        "Language_ne": "nepalski",
+        "Language_ng": "ndonga",
+        "Language_nl": "nizozemski",
+        "Language_nn": "novonorveški",
+        "Language_no": "norveški",
+        "Language_nr": "južni ndebele",
+        "Language_nv": "navajo",
+        "Language_ny": "nyanja",
+        "Language_oc": "okcitanski",
+        "Language_oj": "ojibwa",
+        "Language_om": "oromo",
+        "Language_or": "orijski",
+        "Language_os": "osetski",
+        "Language_pa": "punjabi",
+        "Language_pi": "pali",
+        "Language_pl": "poljski",
+        "Language_ps": "paštu",
+        "Language_pt": "portugalski",
+        "Language_qu": "quechua",
+        "Language_rm": "retoromanski",
+        "Language_rn": "rundi",
+        "Language_ro": "rumunjski",
+        "Language_ru": "ruski",
+        "Language_rw": "kinyarwanda",
+        "Language_sa": "sanskrtski",
+        "Language_sc": "sardski",
+        "Language_sd": "sindhi",
+        "Language_se": "južni sami",
+        "Language_sg": "sango",
+        "Language_si": "singaleški",
+        "Language_sk": "slovački",
+        "Language_sl": "slovenski",
+        "Language_sm": "samoanski",
+        "Language_sn": "shona",
+        "Language_so": "somalski",
+        "Language_sq": "albanski",
+        "Language_sr": "srpski",
+        "Language_ss": "svati",
+        "Language_st": "sesotski",
+        "Language_su": "sundanski",
+        "Language_sv": "švedski",
+        "Language_sw": "svahili",
+        "Language_ta": "tamilski",
+        "Language_te": "telugu",
+        "Language_tg": "tajik",
+        "Language_th": "tajlandski",
+        "Language_ti": "tigrinya",
+        "Language_tk": "turkmenski",
+        "Language_tl": "tagalog",
+        "Language_tn": "cvana",
+        "Language_to": "tonga",
+        "Language_tr": "turski",
+        "Language_ts": "tsonga",
+        "Language_tt": "tatarski",
+        "Language_tw": "twi",
+        "Language_ty": "tahićanski",
+        "Language_ug": "uighur",
+        "Language_uk": "ukrajinski",
+        "Language_ur": "urdu",
+        "Language_uz": "uzbečki",
+        "Language_ve": "venda",
+        "Language_vi": "vijetnamski",
+        "Language_vo": "volapük",
+        "Language_wa": "valonski",
+        "Language_wo": "wolof",
+        "Language_xh": "xhosa",
+        "Language_yi": "jidiš",
+        "Language_yo": "joruba",
+        "Language_za": "zhuang",
+        "Language_zh": "kineski",
+        "Language_zu": "zulu"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/hu.json b/plugins/UserLanguage/lang/hu.json
new file mode 100644
index 0000000000..a8db5c2c63
--- /dev/null
+++ b/plugins/UserLanguage/lang/hu.json
@@ -0,0 +1,189 @@
+{
+    "UserLanguage": {
+        "Language_aa": "afar",
+        "Language_ab": "abház",
+        "Language_ae": "avesztán",
+        "Language_af": "afrikaans",
+        "Language_ak": "akan",
+        "Language_am": "amhara",
+        "Language_an": "aragonéz",
+        "Language_ar": "arab",
+        "Language_as": "asszámi",
+        "Language_av": "avar",
+        "Language_ay": "ajmara",
+        "Language_az": "azerbajdzsáni",
+        "Language_ba": "baskír",
+        "Language_be": "belorusz",
+        "Language_bg": "bolgár",
+        "Language_bh": "bihari",
+        "Language_bi": "bislama",
+        "Language_bm": "bambara",
+        "Language_bn": "bengáli",
+        "Language_bo": "tibeti",
+        "Language_br": "breton",
+        "Language_bs": "bosnyák",
+        "Language_ca": "katalán",
+        "Language_ce": "csecsen",
+        "Language_ch": "csamoró",
+        "Language_co": "korzikai",
+        "Language_cr": "krí",
+        "Language_cs": "cseh",
+        "Language_cu": "egyházi szláv",
+        "Language_cv": "csuvas",
+        "Language_cy": "walesi",
+        "Language_da": "dán",
+        "Language_de": "német",
+        "Language_dv": "divehi",
+        "Language_dz": "butáni",
+        "Language_ee": "eve",
+        "Language_el": "görög",
+        "Language_en": "angol",
+        "Language_eo": "eszperantó",
+        "Language_es": "spanyol",
+        "Language_et": "észt",
+        "Language_eu": "baszk",
+        "Language_fa": "perzsa",
+        "Language_ff": "fulani",
+        "Language_fi": "finn",
+        "Language_fj": "fidzsi",
+        "Language_fo": "feröeri",
+        "Language_fr": "francia",
+        "Language_fy": "fríz",
+        "Language_ga": "ír",
+        "Language_gd": "skót gael",
+        "Language_gl": "galíciai",
+        "Language_gn": "guarani",
+        "Language_gu": "gudzsarati",
+        "Language_gv": "Man-szigeti",
+        "Language_ha": "hausza",
+        "Language_he": "héber",
+        "Language_hi": "hindi",
+        "Language_ho": "hiri motu",
+        "Language_hr": "horvát",
+        "Language_ht": "haiti",
+        "Language_hu": "magyar",
+        "Language_hy": "örmény",
+        "Language_hz": "herero",
+        "Language_ia": "interlingva",
+        "Language_id": "indonéz",
+        "Language_ie": "interlingue",
+        "Language_ig": "igbó",
+        "Language_ii": "szecsuán ji",
+        "Language_ik": "inupiak",
+        "Language_io": "idó",
+        "Language_is": "izlandi",
+        "Language_it": "olasz",
+        "Language_iu": "inuktitut",
+        "Language_ja": "japán",
+        "Language_jv": "jávai",
+        "Language_ka": "grúz",
+        "Language_kg": "kongo",
+        "Language_ki": "kikuju",
+        "Language_kj": "kuanyama",
+        "Language_kk": "kazah",
+        "Language_kl": "grönlandi",
+        "Language_km": "kambodzsai",
+        "Language_kn": "kannada",
+        "Language_ko": "koreai",
+        "Language_kr": "kanuri",
+        "Language_ks": "kásmíri",
+        "Language_ku": "kurd",
+        "Language_kv": "komi",
+        "Language_kw": "korni",
+        "Language_ky": "kirgiz",
+        "Language_la": "latin",
+        "Language_lb": "luxemburgi",
+        "Language_lg": "ganda",
+        "Language_li": "limburgi",
+        "Language_ln": "lingala",
+        "Language_lo": "laoszi",
+        "Language_lt": "litván",
+        "Language_lu": "luba-katanga",
+        "Language_lv": "lett",
+        "Language_mg": "málgas",
+        "Language_mh": "marshalli",
+        "Language_mi": "maori",
+        "Language_mk": "macedón",
+        "Language_ml": "malajálam",
+        "Language_mn": "mongol",
+        "Language_mr": "marathi",
+        "Language_ms": "maláj",
+        "Language_mt": "máltai",
+        "Language_my": "burmai",
+        "Language_na": "naurui",
+        "Language_nb": "norvég bokmal",
+        "Language_nd": "északi ndebele",
+        "Language_ne": "nepáli",
+        "Language_ng": "ndonga",
+        "Language_nl": "holland",
+        "Language_nn": "norvég nynorsk",
+        "Language_no": "norvég",
+        "Language_nr": "déli ndebele",
+        "Language_nv": "navahó",
+        "Language_ny": "nyanja",
+        "Language_oc": "okszitán",
+        "Language_oj": "ojibva",
+        "Language_om": "oromói",
+        "Language_or": "orija",
+        "Language_os": "oszét",
+        "Language_pa": "pandzsábi",
+        "Language_pi": "pali",
+        "Language_pl": "lengyel",
+        "Language_ps": "pastu",
+        "Language_pt": "portugál",
+        "Language_qu": "kecsua",
+        "Language_rm": "réto-román",
+        "Language_rn": "kirundi",
+        "Language_ro": "román",
+        "Language_ru": "orosz",
+        "Language_rw": "kiruanda",
+        "Language_sa": "szanszkrit",
+        "Language_sc": "szardíniai",
+        "Language_sd": "szindhi",
+        "Language_se": "északi számi",
+        "Language_sg": "szangó",
+        "Language_si": "szingaléz",
+        "Language_sk": "szlovák",
+        "Language_sl": "szlovén",
+        "Language_sm": "szamoai",
+        "Language_sn": "sona",
+        "Language_so": "szomáliai",
+        "Language_sq": "albán",
+        "Language_sr": "szerb",
+        "Language_ss": "sziszuati",
+        "Language_st": "szeszotó",
+        "Language_su": "szundanéz",
+        "Language_sv": "svéd",
+        "Language_sw": "szuahéli",
+        "Language_ta": "tamil",
+        "Language_te": "telugu",
+        "Language_tg": "tadzsik",
+        "Language_th": "thai",
+        "Language_ti": "tigrinja",
+        "Language_tk": "türkmén",
+        "Language_tl": "tagalog",
+        "Language_tn": "szecsuáni",
+        "Language_to": "tonga",
+        "Language_tr": "török",
+        "Language_ts": "conga",
+        "Language_tt": "tatár",
+        "Language_tw": "twi",
+        "Language_ty": "tahiti",
+        "Language_ug": "ujgur",
+        "Language_uk": "ukrán",
+        "Language_ur": "urdu",
+        "Language_uz": "üzbég",
+        "Language_ve": "venda",
+        "Language_vi": "vietnámi",
+        "Language_vo": "volapük",
+        "Language_wa": "vallon",
+        "Language_wo": "volof",
+        "Language_xh": "hosza",
+        "Language_yi": "jiddis",
+        "Language_yo": "joruba",
+        "Language_za": "zsuang",
+        "Language_zh": "kínai",
+        "Language_zu": "zulu",
+        "LanguageCode": "Nyelvi kód"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/id.json b/plugins/UserLanguage/lang/id.json
new file mode 100644
index 0000000000..cfe49baf4b
--- /dev/null
+++ b/plugins/UserLanguage/lang/id.json
@@ -0,0 +1,190 @@
+{
+    "UserLanguage": {
+        "BrowserLanguage": "Bahasa Peramban",
+        "Language_aa": "Afar",
+        "Language_ab": "Abkhaz",
+        "Language_ae": "Avestan",
+        "Language_af": "Afrikaans",
+        "Language_ak": "Akan",
+        "Language_am": "Amharik",
+        "Language_an": "Aragon",
+        "Language_ar": "Arab",
+        "Language_as": "Assam",
+        "Language_av": "Avarik",
+        "Language_ay": "Aymara",
+        "Language_az": "Azerbaijan",
+        "Language_ba": "Bashkir",
+        "Language_be": "Belarusia",
+        "Language_bg": "Bulgaria",
+        "Language_bh": "Bihari",
+        "Language_bi": "Bislama",
+        "Language_bm": "Bambara",
+        "Language_bn": "Bengal",
+        "Language_bo": "Tibet",
+        "Language_br": "Breton",
+        "Language_bs": "Bosnia",
+        "Language_ca": "Catalan",
+        "Language_ce": "Chechen",
+        "Language_ch": "Chamorro",
+        "Language_co": "Korsika",
+        "Language_cr": "Cree",
+        "Language_cs": "Ceko",
+        "Language_cu": "Church Slavic",
+        "Language_cv": "Chuvash",
+        "Language_cy": "Welsh",
+        "Language_da": "Denmark",
+        "Language_de": "Jerman",
+        "Language_dv": "Divehi",
+        "Language_dz": "Dzongkha",
+        "Language_ee": "Ewe",
+        "Language_el": "Yunani",
+        "Language_en": "Inggris",
+        "Language_eo": "Esperanto",
+        "Language_es": "Spanyol",
+        "Language_et": "Estonian",
+        "Language_eu": "Basque",
+        "Language_fa": "Persia",
+        "Language_ff": "Fulah",
+        "Language_fi": "Finlandia",
+        "Language_fj": "Fiji",
+        "Language_fo": "Faro",
+        "Language_fr": "Perancis",
+        "Language_fy": "Frisi",
+        "Language_ga": "Irlandia",
+        "Language_gd": "Gaelik Skotlandia",
+        "Language_gl": "Gallegan",
+        "Language_gn": "Guarani",
+        "Language_gu": "Gujarati",
+        "Language_gv": "Manx",
+        "Language_ha": "Hausa",
+        "Language_he": "Ibrani",
+        "Language_hi": "Hindi",
+        "Language_ho": "Hiri Motu",
+        "Language_hr": "Kroasia",
+        "Language_ht": "Haiti",
+        "Language_hu": "Hungaria",
+        "Language_hy": "Armenia",
+        "Language_hz": "Herero",
+        "Language_ia": "Interlingua",
+        "Language_id": "Bahasa Indonesia",
+        "Language_ie": "Interlingue",
+        "Language_ig": "Igbo",
+        "Language_ii": "Sichuan Yi",
+        "Language_ik": "Inupiaq",
+        "Language_io": "Ido",
+        "Language_is": "Icelandic",
+        "Language_it": "Italian",
+        "Language_iu": "Inuktitut",
+        "Language_ja": "Japanese",
+        "Language_jv": "Jawa",
+        "Language_ka": "Georgian",
+        "Language_kg": "Kongo",
+        "Language_ki": "Kikuyu",
+        "Language_kj": "Kuanyama",
+        "Language_kk": "Kazakh",
+        "Language_kl": "Kalaallisut",
+        "Language_km": "Khmer",
+        "Language_kn": "Kannada",
+        "Language_ko": "Korea",
+        "Language_kr": "Kanuri",
+        "Language_ks": "Kashmir",
+        "Language_ku": "Kurdi",
+        "Language_kv": "Komi",
+        "Language_kw": "Cornish",
+        "Language_ky": "Kirghiz",
+        "Language_la": "Latin",
+        "Language_lb": "Luxembourg",
+        "Language_lg": "Ganda",
+        "Language_li": "Limburg",
+        "Language_ln": "Lingala",
+        "Language_lo": "Lao",
+        "Language_lt": "Lithuania",
+        "Language_lu": "Luba-Katanga",
+        "Language_lv": "Latvian",
+        "Language_mg": "Malagasi",
+        "Language_mh": "Marshall",
+        "Language_mi": "Maori",
+        "Language_mk": "Macedonian",
+        "Language_ml": "Malayalam",
+        "Language_mn": "Mongolian",
+        "Language_mr": "Marathi",
+        "Language_ms": "Malay",
+        "Language_mt": "Maltese",
+        "Language_my": "Burma",
+        "Language_na": "Nauru",
+        "Language_nb": "Norwegian Bokmål",
+        "Language_nd": "Ndebele Utara",
+        "Language_ne": "Nepal",
+        "Language_ng": "Ndonga",
+        "Language_nl": "Belanda",
+        "Language_nn": "Norwegian Nynorsk",
+        "Language_no": "Norwegian",
+        "Language_nr": "Ndebele Selatan",
+        "Language_nv": "Navajo",
+        "Language_ny": "Nyanja; Chichewa; Chewa",
+        "Language_oc": "Bahasa Occit",
+        "Language_oj": "Ojibwa",
+        "Language_om": "Oromo",
+        "Language_or": "Oriya",
+        "Language_os": "Ossetic",
+        "Language_pa": "Punjabi",
+        "Language_pi": "Pali",
+        "Language_pl": "Polish",
+        "Language_ps": "Pashto (Pushto)",
+        "Language_pt": "Portugis",
+        "Language_qu": "Quechua",
+        "Language_rm": "Rhaeto-Romance",
+        "Language_rn": "Rundi",
+        "Language_ro": "Romanian",
+        "Language_ru": "Russian",
+        "Language_rw": "Kinyarwanda",
+        "Language_sa": "Sanskrit",
+        "Language_sc": "Sardinian",
+        "Language_sd": "Sindhi",
+        "Language_se": "Northern Sami",
+        "Language_sg": "Sango",
+        "Language_si": "Sinhalese",
+        "Language_sk": "Slovak",
+        "Language_sl": "Slovenian",
+        "Language_sm": "Samoan",
+        "Language_sn": "Shona",
+        "Language_so": "Somali",
+        "Language_sq": "Albanian",
+        "Language_sr": "Serbian",
+        "Language_ss": "Swati",
+        "Language_st": "Sotho Selatan",
+        "Language_su": "Sundan",
+        "Language_sv": "Swedia",
+        "Language_sw": "Swahili",
+        "Language_ta": "Tamil",
+        "Language_te": "Telugu",
+        "Language_tg": "Tajik",
+        "Language_th": "Thai",
+        "Language_ti": "Tigrinya",
+        "Language_tk": "Turkmen",
+        "Language_tl": "Tagalog",
+        "Language_tn": "Tswana",
+        "Language_to": "Tonga",
+        "Language_tr": "Turkish",
+        "Language_ts": "Tsonga",
+        "Language_tt": "Tatar",
+        "Language_tw": "Twi",
+        "Language_ty": "Tahitian",
+        "Language_ug": "Uighur",
+        "Language_uk": "Ukrainian",
+        "Language_ur": "Urdu",
+        "Language_uz": "Uzbek",
+        "Language_ve": "Venda",
+        "Language_vi": "Vietnamese",
+        "Language_vo": "Volapük",
+        "Language_wa": "Walloon",
+        "Language_wo": "Wolof",
+        "Language_xh": "Xhosa",
+        "Language_yi": "Yiddish",
+        "Language_yo": "Yoruba",
+        "Language_za": "Zhuang",
+        "Language_zh": "Cina",
+        "Language_zu": "Zulu",
+        "LanguageCode": "Kode Bahasa"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/is.json b/plugins/UserLanguage/lang/is.json
new file mode 100644
index 0000000000..b8752b4ac2
--- /dev/null
+++ b/plugins/UserLanguage/lang/is.json
@@ -0,0 +1,189 @@
+{
+    "UserLanguage": {
+        "Language_aa": "afár",
+        "Language_ab": "abkasíska",
+        "Language_ae": "avestíska",
+        "Language_af": "afríkanska",
+        "Language_ak": "akan",
+        "Language_am": "amharíska",
+        "Language_an": "aragonska",
+        "Language_ar": "arabíska",
+        "Language_as": "assamska",
+        "Language_av": "avaríska",
+        "Language_ay": "aímara",
+        "Language_az": "aserska",
+        "Language_ba": "baskír",
+        "Language_be": "hvítrússneska",
+        "Language_bg": "búlgarska",
+        "Language_bh": "bíharí",
+        "Language_bi": "bíslama",
+        "Language_bm": "bambara",
+        "Language_bn": "bengalska",
+        "Language_bo": "tíbeska",
+        "Language_br": "bretónska",
+        "Language_bs": "bosníska",
+        "Language_ca": "katalónska",
+        "Language_ce": "tsjetsjenska",
+        "Language_ch": "kamorró",
+        "Language_co": "korsíska",
+        "Language_cr": "krí",
+        "Language_cs": "tékkneska",
+        "Language_cu": "kirkjuslavneska",
+        "Language_cv": "sjúvas",
+        "Language_cy": "velska",
+        "Language_da": "danska",
+        "Language_de": "þýska",
+        "Language_dv": "dívehí",
+        "Language_dz": "dsongka",
+        "Language_ee": "eve",
+        "Language_el": "nýgríska (1453-)",
+        "Language_en": "enska",
+        "Language_eo": "esperantó",
+        "Language_es": "spænska",
+        "Language_et": "eistneska",
+        "Language_eu": "baskneska",
+        "Language_fa": "persneska",
+        "Language_ff": "fúla",
+        "Language_fi": "finnska",
+        "Language_fj": "fídjeyska",
+        "Language_fo": "færeyska",
+        "Language_fr": "franska",
+        "Language_fy": "frísneska",
+        "Language_ga": "írska",
+        "Language_gd": "skosk gelíska",
+        "Language_gl": "gallegska",
+        "Language_gn": "gvaraní",
+        "Language_gu": "gújaratí",
+        "Language_gv": "manx",
+        "Language_ha": "hása",
+        "Language_he": "hebreska",
+        "Language_hi": "hindí",
+        "Language_ho": "hírímótú",
+        "Language_hr": "króatíska",
+        "Language_ht": "haítíska",
+        "Language_hu": "ungverska",
+        "Language_hy": "armenska",
+        "Language_hz": "hereró",
+        "Language_ia": "interlingva",
+        "Language_id": "indónesíska",
+        "Language_ie": "interlingve",
+        "Language_ig": "ígbó",
+        "Language_ii": "sísúanjí",
+        "Language_ik": "ínúpíak",
+        "Language_io": "ídó",
+        "Language_is": "íslenska",
+        "Language_it": "ítalska",
+        "Language_iu": "inúktitút",
+        "Language_ja": "japanska",
+        "Language_jv": "javanska",
+        "Language_ka": "georgíska",
+        "Language_kg": "kongó",
+        "Language_ki": "kíkújú",
+        "Language_kj": "kúanjama",
+        "Language_kk": "kasakska",
+        "Language_kl": "grænlenska",
+        "Language_km": "kmer",
+        "Language_kn": "kannada",
+        "Language_ko": "kóreska",
+        "Language_kr": "kanúrí",
+        "Language_ks": "kasmírska",
+        "Language_ku": "kúrdneska",
+        "Language_kv": "komíska",
+        "Language_kw": "korníska",
+        "Language_ky": "kirgiska",
+        "Language_la": "latína",
+        "Language_lb": "lúxemborgíska",
+        "Language_lg": "ganda",
+        "Language_li": "limbúrgíska",
+        "Language_ln": "lingala",
+        "Language_lo": "laó",
+        "Language_lt": "litháíska",
+        "Language_lu": "lúbakatanga",
+        "Language_lv": "lettneska",
+        "Language_mg": "malagasíska",
+        "Language_mh": "marshallska",
+        "Language_mi": "maórí",
+        "Language_mk": "makedónska",
+        "Language_ml": "malajalam",
+        "Language_mn": "mongólska",
+        "Language_mr": "maratí",
+        "Language_ms": "malaíska",
+        "Language_mt": "maltneska",
+        "Language_my": "burmneska",
+        "Language_na": "nárúska",
+        "Language_nb": "norskt bókmál",
+        "Language_nd": "norðurndebele",
+        "Language_ne": "nepalska",
+        "Language_ng": "ndonga",
+        "Language_nl": "hollenska",
+        "Language_nn": "nýnorska",
+        "Language_no": "norska",
+        "Language_nr": "suðurndebele",
+        "Language_nv": "navahó",
+        "Language_ny": "Njanja; Sísjeva; Sjeva",
+        "Language_oc": "Okkitíska (eftir 1500); Próvensalska",
+        "Language_oj": "ojibva",
+        "Language_om": "órómó",
+        "Language_or": "óría",
+        "Language_os": "ossetíska",
+        "Language_pa": "púnjabí",
+        "Language_pi": "palí",
+        "Language_pl": "pólska",
+        "Language_ps": "pastú",
+        "Language_pt": "portúgalska",
+        "Language_qu": "kvesjúa",
+        "Language_rm": "retórómanska",
+        "Language_rn": "rúndí",
+        "Language_ro": "rúmenska",
+        "Language_ru": "rússneska",
+        "Language_rw": "kínjarvanda",
+        "Language_sa": "sanskrít",
+        "Language_sc": "sardínska",
+        "Language_sd": "sindí",
+        "Language_se": "norðursamíska",
+        "Language_sg": "sangó",
+        "Language_si": "singalesíska",
+        "Language_sk": "slóvakíska",
+        "Language_sl": "slóvenska",
+        "Language_sm": "samóska",
+        "Language_sn": "shóna",
+        "Language_so": "sómalska",
+        "Language_sq": "albanska",
+        "Language_sr": "serbneska",
+        "Language_ss": "svatí",
+        "Language_st": "suðursótó",
+        "Language_su": "súndanska",
+        "Language_sv": "sænska",
+        "Language_sw": "svahílí",
+        "Language_ta": "tamílska",
+        "Language_te": "telúgú",
+        "Language_tg": "tadsjikska",
+        "Language_th": "taílenska",
+        "Language_ti": "tígrinja",
+        "Language_tk": "túrkmenska",
+        "Language_tl": "tagalog",
+        "Language_tn": "tsúana",
+        "Language_to": "Tongverska (Tongaeyjar)",
+        "Language_tr": "tyrkneska",
+        "Language_ts": "tsonga",
+        "Language_tt": "tatarska",
+        "Language_tw": "tví",
+        "Language_ty": "tahítíska",
+        "Language_ug": "úígúr",
+        "Language_uk": "úkraínska",
+        "Language_ur": "úrdú",
+        "Language_uz": "úsbekska",
+        "Language_ve": "venda",
+        "Language_vi": "víetnamska",
+        "Language_vo": "volapyk",
+        "Language_wa": "vallónska",
+        "Language_wo": "volof",
+        "Language_xh": "sósa",
+        "Language_yi": "jiddíska",
+        "Language_yo": "jórúba",
+        "Language_za": "súang",
+        "Language_zh": "kínverska",
+        "Language_zu": "súlú",
+        "LanguageCode": "Kóði tungumáls"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/it.json b/plugins/UserLanguage/lang/it.json
new file mode 100644
index 0000000000..703bf3c0b3
--- /dev/null
+++ b/plugins/UserLanguage/lang/it.json
@@ -0,0 +1,191 @@
+{
+    "UserLanguage": {
+        "BrowserLanguage": "Lingua Browser",
+        "Language_aa": "afar",
+        "Language_ab": "abkhazian",
+        "Language_ae": "avestan",
+        "Language_af": "afrikaans",
+        "Language_ak": "akan",
+        "Language_am": "amarico",
+        "Language_an": "aragonese",
+        "Language_ar": "arabo",
+        "Language_as": "assamese",
+        "Language_av": "avaro",
+        "Language_ay": "aymara",
+        "Language_az": "azerbaigiano",
+        "Language_ba": "baschiro",
+        "Language_be": "bielorusso",
+        "Language_bg": "bulgaro",
+        "Language_bh": "bihari",
+        "Language_bi": "bislama",
+        "Language_bm": "bambara",
+        "Language_bn": "bengalese",
+        "Language_bo": "tibetano",
+        "Language_br": "bretone",
+        "Language_bs": "bosniaco",
+        "Language_ca": "catalano",
+        "Language_ce": "ceceno",
+        "Language_ch": "chamorro",
+        "Language_co": "corso",
+        "Language_cr": "cree",
+        "Language_cs": "ceco",
+        "Language_cu": "slavo della Chiesa",
+        "Language_cv": "chuvash",
+        "Language_cy": "gallese",
+        "Language_da": "danese",
+        "Language_de": "tedesco",
+        "Language_dv": "divehi",
+        "Language_dz": "dzongkha",
+        "Language_ee": "ewe",
+        "Language_el": "greco",
+        "Language_en": "inglese",
+        "Language_eo": "esperanto",
+        "Language_es": "spagnolo",
+        "Language_et": "estone",
+        "Language_eu": "basco",
+        "Language_fa": "persiano",
+        "Language_ff": "fulah",
+        "Language_fi": "finlandese",
+        "Language_fj": "figiano",
+        "Language_fo": "faroese",
+        "Language_fr": "francese",
+        "Language_fy": "frisone",
+        "Language_ga": "irlandese",
+        "Language_gd": "gaelico scozzese",
+        "Language_gl": "galiziano",
+        "Language_gn": "guarana",
+        "Language_gu": "gujarati",
+        "Language_gv": "manx",
+        "Language_ha": "haussa",
+        "Language_he": "ebraico",
+        "Language_hi": "hindi",
+        "Language_ho": "hiri motu",
+        "Language_hr": "croato",
+        "Language_ht": "haitiano",
+        "Language_hu": "ungherese",
+        "Language_hy": "armeno",
+        "Language_hz": "herero",
+        "Language_ia": "interlingua",
+        "Language_id": "indonesiano",
+        "Language_ie": "interlingue",
+        "Language_ig": "igbo",
+        "Language_ii": "sichuan yi",
+        "Language_ik": "inupiak",
+        "Language_io": "ido",
+        "Language_is": "islandese",
+        "Language_it": "italiano",
+        "Language_iu": "inuktitut",
+        "Language_ja": "giapponese",
+        "Language_jv": "giavanese",
+        "Language_ka": "georgiano",
+        "Language_kg": "kongo",
+        "Language_ki": "kikuyu",
+        "Language_kj": "kuanyama",
+        "Language_kk": "kazako",
+        "Language_kl": "kalaallisut",
+        "Language_km": "khmer",
+        "Language_kn": "kannada",
+        "Language_ko": "coreano",
+        "Language_kr": "kanuri",
+        "Language_ks": "kashmiri",
+        "Language_ku": "curdo",
+        "Language_kv": "komi",
+        "Language_kw": "cornico",
+        "Language_ky": "kirghiso",
+        "Language_la": "latino",
+        "Language_lb": "lussemburghese",
+        "Language_lg": "ganda",
+        "Language_li": "limburgese",
+        "Language_ln": "lingala",
+        "Language_lo": "lao",
+        "Language_lt": "lituano",
+        "Language_lu": "luba-katanga",
+        "Language_lv": "lettone",
+        "Language_mg": "malgascio",
+        "Language_mh": "marshallese",
+        "Language_mi": "maori",
+        "Language_mk": "macedone",
+        "Language_ml": "malayalam",
+        "Language_mn": "mongolo",
+        "Language_mr": "marathi",
+        "Language_ms": "malese",
+        "Language_mt": "maltese",
+        "Language_my": "birmano",
+        "Language_na": "nauru",
+        "Language_nb": "norvegese bokmal",
+        "Language_nd": "ndebele del nord",
+        "Language_ne": "nepalese",
+        "Language_ng": "ndonga",
+        "Language_nl": "olandese",
+        "Language_nn": "norvegese nynorsk",
+        "Language_no": "norvegese",
+        "Language_nr": "ndebele del sud",
+        "Language_nv": "navajo",
+        "Language_ny": "nyanja",
+        "Language_oc": "occitano",
+        "Language_oj": "ojibwa",
+        "Language_om": "oromo",
+        "Language_or": "oriya",
+        "Language_os": "ossetico",
+        "Language_pa": "punjabi",
+        "Language_pi": "pali",
+        "Language_pl": "polacco",
+        "Language_ps": "pashto",
+        "Language_pt": "portoghese",
+        "Language_qu": "quechua",
+        "Language_rm": "lingua rhaeto-romance",
+        "Language_rn": "rundi",
+        "Language_ro": "rumeno",
+        "Language_ru": "russo",
+        "Language_rw": "kinyarwanda",
+        "Language_sa": "sanscrito",
+        "Language_sc": "sardo",
+        "Language_sd": "sindhi",
+        "Language_se": "sami del nord",
+        "Language_sg": "sango",
+        "Language_si": "singalese",
+        "Language_sk": "slovacco",
+        "Language_sl": "sloveno",
+        "Language_sm": "samoano",
+        "Language_sn": "shona",
+        "Language_so": "somalo",
+        "Language_sq": "albanese",
+        "Language_sr": "serbo",
+        "Language_ss": "swati",
+        "Language_st": "sotho del sud",
+        "Language_su": "sundanese",
+        "Language_sv": "svedese",
+        "Language_sw": "swahili",
+        "Language_ta": "tamil",
+        "Language_te": "telugu",
+        "Language_tg": "tagicco",
+        "Language_th": "thai",
+        "Language_ti": "tigrinya",
+        "Language_tk": "turcomanno",
+        "Language_tl": "tagalog",
+        "Language_tn": "tswana",
+        "Language_to": "tonga",
+        "Language_tr": "turco",
+        "Language_ts": "tsonga",
+        "Language_tt": "tatarico",
+        "Language_tw": "ci",
+        "Language_ty": "taitiano",
+        "Language_ug": "uigurico",
+        "Language_uk": "ucraino",
+        "Language_ur": "urdu",
+        "Language_uz": "usbeco",
+        "Language_ve": "venda",
+        "Language_vi": "vietnamita",
+        "Language_vo": "volapük",
+        "Language_wa": "vallone",
+        "Language_wo": "volof",
+        "Language_xh": "xosa",
+        "Language_yi": "yiddish",
+        "Language_yo": "yoruba",
+        "Language_za": "zhuang",
+        "Language_zh": "cinese",
+        "Language_zu": "zulu",
+        "LanguageCode": "Codice della lingua",
+        "PluginDescription": "Restituisce la lingua utilizzata dai browser dei tuoi visitatori."
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/ja.json b/plugins/UserLanguage/lang/ja.json
new file mode 100644
index 0000000000..d16b5563e5
--- /dev/null
+++ b/plugins/UserLanguage/lang/ja.json
@@ -0,0 +1,190 @@
+{
+    "UserLanguage": {
+        "BrowserLanguage": "ブラウザの言語",
+        "Language_aa": "アファル語",
+        "Language_ab": "アブハズ語",
+        "Language_ae": "アヴェスタ語",
+        "Language_af": "アフリカーンス語",
+        "Language_ak": "アカン語",
+        "Language_am": "アムハラ語",
+        "Language_an": "アラゴン語",
+        "Language_ar": "アラビア語",
+        "Language_as": "アッサム語",
+        "Language_av": "アヴァル語",
+        "Language_ay": "アイマラ語",
+        "Language_az": "アゼルバイジャン語",
+        "Language_ba": "バシキール語",
+        "Language_be": "ベラルーシ語",
+        "Language_bg": "ブルガリア語",
+        "Language_bh": "ビハール語",
+        "Language_bi": "ビスラマ語",
+        "Language_bm": "バンバラ語",
+        "Language_bn": "ベンガル語",
+        "Language_bo": "チベット語",
+        "Language_br": "ブルトン語",
+        "Language_bs": "ボスニア語",
+        "Language_ca": "カタロニア語",
+        "Language_ce": "チェチェン語",
+        "Language_ch": "チャモロ語",
+        "Language_co": "コルシカ語",
+        "Language_cr": "クリー語",
+        "Language_cs": "チェコ語",
+        "Language_cu": "教会スラブ語",
+        "Language_cv": "チュヴァシュ語",
+        "Language_cy": "ウェールズ語",
+        "Language_da": "デンマーク語",
+        "Language_de": "ドイツ語",
+        "Language_dv": "ディベヒ語",
+        "Language_dz": "ゾンカ語",
+        "Language_ee": "エウェ語",
+        "Language_el": "ギリシャ語",
+        "Language_en": "英語",
+        "Language_eo": "エスペラント語",
+        "Language_es": "スペイン語",
+        "Language_et": "エストニア語",
+        "Language_eu": "バスク語",
+        "Language_fa": "ペルシア語",
+        "Language_ff": "フラニ語",
+        "Language_fi": "フィンランド語",
+        "Language_fj": "フィジー語",
+        "Language_fo": "フェロー語",
+        "Language_fr": "フランス語",
+        "Language_fy": "フリジア語",
+        "Language_ga": "アイルランド語",
+        "Language_gd": "スコットランド・ゲール語",
+        "Language_gl": "ガリシア語",
+        "Language_gn": "グアラニー語",
+        "Language_gu": "グジャラート語",
+        "Language_gv": "マン島語",
+        "Language_ha": "ハウサ語",
+        "Language_he": "ヘブライ語",
+        "Language_hi": "ヒンディー語",
+        "Language_ho": "ヒリモトゥ語",
+        "Language_hr": "クロアチア語",
+        "Language_ht": "ハイチ語",
+        "Language_hu": "ハンガリー語",
+        "Language_hy": "アルメニア語",
+        "Language_hz": "ヘレロ語",
+        "Language_ia": "インターリングア語",
+        "Language_id": "インドネシア語",
+        "Language_ie": "インターリング語",
+        "Language_ig": "イボ語",
+        "Language_ii": "四川イ語",
+        "Language_ik": "イヌピアック語",
+        "Language_io": "イド語",
+        "Language_is": "アイスランド語",
+        "Language_it": "イタリア語",
+        "Language_iu": "イヌクウティトット語",
+        "Language_ja": "日本語",
+        "Language_jv": "ジャワ語",
+        "Language_ka": "グルジア語",
+        "Language_kg": "コンゴ語",
+        "Language_ki": "キクユ語",
+        "Language_kj": "クアニャマ語",
+        "Language_kk": "カザフ語",
+        "Language_kl": "グリーンランド語",
+        "Language_km": "クメール語",
+        "Language_kn": "カンナダ語",
+        "Language_ko": "韓国語",
+        "Language_kr": "カヌリ語",
+        "Language_ks": "カシミール語",
+        "Language_ku": "クルド語",
+        "Language_kv": "コミ語",
+        "Language_kw": "コーンウォール語",
+        "Language_ky": "キルギス語",
+        "Language_la": "ラテン語",
+        "Language_lb": "ルクセンブルク語",
+        "Language_lg": "ガンダ語",
+        "Language_li": "リンブルフ語",
+        "Language_ln": "リンガラ語",
+        "Language_lo": "ラオ語",
+        "Language_lt": "リトアニア語",
+        "Language_lu": "ルバ・カタンガ語",
+        "Language_lv": "ラトビア語",
+        "Language_mg": "マダガスカル語",
+        "Language_mh": "マーシャル語",
+        "Language_mi": "マオリ語",
+        "Language_mk": "マケドニア語",
+        "Language_ml": "マラヤーラム語",
+        "Language_mn": "モンゴル語",
+        "Language_mr": "マラーティー語",
+        "Language_ms": "マレー語",
+        "Language_mt": "マルタ語",
+        "Language_my": "ビルマ語",
+        "Language_na": "ナウル語",
+        "Language_nb": "ノルウェー語 (ブークモール)",
+        "Language_nd": "北ンデベレ語",
+        "Language_ne": "ネパール語",
+        "Language_ng": "ンドンガ語",
+        "Language_nl": "オランダ語",
+        "Language_nn": "ノルウェー語 (ニーノシュク)",
+        "Language_no": "ノルウェー語",
+        "Language_nr": "南ンデベレ語",
+        "Language_nv": "ナバホ語",
+        "Language_ny": "ニャンジャ語、チチェワ語、チェワ語",
+        "Language_oc": "オック語",
+        "Language_oj": "オブジワ語",
+        "Language_om": "オロモ語",
+        "Language_or": "オリヤー語",
+        "Language_os": "オセト語",
+        "Language_pa": "パンジャブ語",
+        "Language_pi": "パーリ語",
+        "Language_pl": "ポーランド語",
+        "Language_ps": "パシュトゥー語",
+        "Language_pt": "ポルトガル語",
+        "Language_qu": "ケチュア語",
+        "Language_rm": "レト・ロマン語",
+        "Language_rn": "ルンディ語",
+        "Language_ro": "ルーマニア語",
+        "Language_ru": "ロシア語",
+        "Language_rw": "ルワンダ語",
+        "Language_sa": "サンスクリット語",
+        "Language_sc": "サルデーニャ語",
+        "Language_sd": "シンド語",
+        "Language_se": "北サーミ語",
+        "Language_sg": "サンゴ語",
+        "Language_si": "シンハラ語",
+        "Language_sk": "スロバキア語",
+        "Language_sl": "スロベニア語",
+        "Language_sm": "サモア語",
+        "Language_sn": "ショナ語",
+        "Language_so": "ソマリ語",
+        "Language_sq": "アルバニア語",
+        "Language_sr": "セルビア語",
+        "Language_ss": "シスワティ語",
+        "Language_st": "南部ソト語",
+        "Language_su": "スンダ語",
+        "Language_sv": "スウェーデン語",
+        "Language_sw": "スワヒリ語",
+        "Language_ta": "タミール語",
+        "Language_te": "テルグ語",
+        "Language_tg": "タジク語",
+        "Language_th": "タイ語",
+        "Language_ti": "ティグリニア語",
+        "Language_tk": "トルクメン語",
+        "Language_tl": "タガログ語",
+        "Language_tn": "ツワナ語",
+        "Language_to": "トンガ語",
+        "Language_tr": "トルコ語",
+        "Language_ts": "ツォンガ語",
+        "Language_tt": "タタール語",
+        "Language_tw": "トウィ語",
+        "Language_ty": "タヒチ語",
+        "Language_ug": "ウイグル語",
+        "Language_uk": "ウクライナ語",
+        "Language_ur": "ウルドゥー語",
+        "Language_uz": "ウズベク語",
+        "Language_ve": "ベンダ語",
+        "Language_vi": "ベトナム語",
+        "Language_vo": "ボラピュク語",
+        "Language_wa": "ワロン語",
+        "Language_wo": "ウォロフ語",
+        "Language_xh": "コサ語",
+        "Language_yi": "イディッシュ語",
+        "Language_yo": "ヨルバ語",
+        "Language_za": "チワン語",
+        "Language_zh": "中国語",
+        "Language_zu": "ズールー語",
+        "LanguageCode": "言語コード"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/ka.json b/plugins/UserLanguage/lang/ka.json
new file mode 100644
index 0000000000..6002246265
--- /dev/null
+++ b/plugins/UserLanguage/lang/ka.json
@@ -0,0 +1,162 @@
+{
+    "UserLanguage": {
+        "Language_aa": "აფარი",
+        "Language_ab": "აფხაზური",
+        "Language_ae": "ავესტა",
+        "Language_af": "აფრიკული",
+        "Language_ak": "აკანი",
+        "Language_am": "ამჰარული",
+        "Language_an": "არაგონული",
+        "Language_ar": "არაბული",
+        "Language_as": "ასამური",
+        "Language_av": "ხუნძური",
+        "Language_ay": "აიმარა",
+        "Language_az": "აზერბაიჯანული",
+        "Language_ba": "ბაშკირული",
+        "Language_be": "ბელორუსული",
+        "Language_bg": "ბულგარული",
+        "Language_bh": "ბიჰარი",
+        "Language_bn": "ბენგალური",
+        "Language_bo": "ტიბეტური",
+        "Language_br": "ბრეტონული",
+        "Language_bs": "ბოსნიური",
+        "Language_ca": "კატალანური",
+        "Language_ce": "ჩეჩნური",
+        "Language_co": "კორსიკული",
+        "Language_cr": "კრი",
+        "Language_cs": "ჩეხური",
+        "Language_cu": "საეკლესიო სლავური",
+        "Language_cv": "ჩუვაშური",
+        "Language_cy": "უელსური",
+        "Language_da": "დანიური",
+        "Language_de": "გერმანული",
+        "Language_dv": "დივეჰი",
+        "Language_dz": "ძონგხა",
+        "Language_ee": "ევე",
+        "Language_el": "ბერძნული",
+        "Language_en": "ინგლისური",
+        "Language_eo": "ესპერანტო",
+        "Language_es": "ესპანური",
+        "Language_et": "ესტონური",
+        "Language_eu": "ბასკური",
+        "Language_fa": "სპარსული",
+        "Language_fi": "ფინური",
+        "Language_fj": "ფიჯი",
+        "Language_fo": "ფარერული",
+        "Language_fr": "ფრანგული",
+        "Language_fy": "დასავლეთფრიზიული",
+        "Language_ga": "ირლანდიური",
+        "Language_gd": "შოტლანდიურ-გალური",
+        "Language_gl": "გალური",
+        "Language_gn": "გუარანი",
+        "Language_gu": "გუჯარათი",
+        "Language_gv": "მენური",
+        "Language_ha": "ჰაუსა",
+        "Language_he": "ებრაული",
+        "Language_hi": "ჰინდი",
+        "Language_hr": "ხორვატიული",
+        "Language_ht": "ჰაიტიური",
+        "Language_hu": "უნგრული",
+        "Language_hy": "სომხური",
+        "Language_ia": "ინტერლინგუალური",
+        "Language_id": "ინდონეზიური",
+        "Language_ie": "ინტერლინგი",
+        "Language_ig": "იგბო",
+        "Language_io": "იდო",
+        "Language_is": "ისლანდიური",
+        "Language_it": "იტალიური",
+        "Language_iu": "ინუკტიტუტი",
+        "Language_ja": "იაპონური",
+        "Language_jv": "იავანური",
+        "Language_ka": "ქართული",
+        "Language_kg": "კონგო",
+        "Language_kk": "ყაზახური",
+        "Language_kl": "გრენლანდიური",
+        "Language_km": "კამბოჯიური",
+        "Language_kn": "კანადა",
+        "Language_ko": "კორეული",
+        "Language_kr": "კანური",
+        "Language_ks": "ქაშმირული",
+        "Language_ku": "ქურთული",
+        "Language_kv": "კომი",
+        "Language_kw": "კორნული",
+        "Language_ky": "ყირგიზული",
+        "Language_la": "ლათინური",
+        "Language_lb": "ლუქსემბურგული",
+        "Language_lg": "განდა",
+        "Language_li": "ლიმბურგული",
+        "Language_ln": "ლინგალა",
+        "Language_lo": "ლაოსური",
+        "Language_lt": "ლიტვური",
+        "Language_lu": "ლუბა-კატანგა",
+        "Language_lv": "ლატვიური",
+        "Language_mg": "მალაგასიური",
+        "Language_mi": "მაორი",
+        "Language_mk": "მაკედონიური",
+        "Language_ml": "მალაიალამური",
+        "Language_mn": "მონღოლური",
+        "Language_mr": "მარათჰი",
+        "Language_ms": "მალაიზიური",
+        "Language_mt": "მალტური",
+        "Language_my": "ბირმული",
+        "Language_na": "ნაურუ",
+        "Language_nb": "ნორვეგიული ბუკმოლი",
+        "Language_ne": "ნეპალური",
+        "Language_nl": "ჰოლანდიური",
+        "Language_nn": "ნორვეგიული ნინორსკი",
+        "Language_no": "ნორვეგიული",
+        "Language_nv": "ნავახო",
+        "Language_ny": "ნიანჯა",
+        "Language_oc": "ოციტანური",
+        "Language_oj": "ოჯიბვე",
+        "Language_or": "ორიული",
+        "Language_os": "ოსური",
+        "Language_pa": "პენჯაბური",
+        "Language_pi": "პალი",
+        "Language_pl": "პოლონური",
+        "Language_ps": "პუშტუ",
+        "Language_pt": "პორტუგალიური",
+        "Language_qu": "კეჩუა",
+        "Language_rm": "რეტორომანული",
+        "Language_rn": "რუნდი",
+        "Language_ro": "რუმინული",
+        "Language_ru": "რუსული",
+        "Language_sa": "სანსკრიტი",
+        "Language_sc": "სარდინიული",
+        "Language_sd": "სინდური",
+        "Language_si": "სინჰალური",
+        "Language_sk": "სლოვაკური",
+        "Language_sl": "სლოვენური",
+        "Language_sm": "სამოა",
+        "Language_so": "სომალიური",
+        "Language_sq": "ალბანური",
+        "Language_sr": "სერბული",
+        "Language_st": "სამხრეთ სოთოს ენა",
+        "Language_su": "სუნდური",
+        "Language_sv": "შვედური",
+        "Language_sw": "სუაჰილი",
+        "Language_ta": "ტამილური",
+        "Language_te": "ტელუგუ",
+        "Language_tg": "ტაჯიკური",
+        "Language_th": "ტაილანდური",
+        "Language_ti": "ტიგრინია",
+        "Language_tk": "თურქმენული",
+        "Language_tn": "ტსვანა",
+        "Language_to": "ტონგანური",
+        "Language_tr": "თურქული",
+        "Language_tt": "თათრული",
+        "Language_tw": "თუი",
+        "Language_ug": "უიგურული",
+        "Language_uk": "უკრაინული",
+        "Language_ur": "ურდუ",
+        "Language_uz": "უზბეკური",
+        "Language_vi": "ვიეტნამური",
+        "Language_wo": "ვოლოფური",
+        "Language_xh": "ქსოზა",
+        "Language_yi": "იდიში",
+        "Language_yo": "იორუბა",
+        "Language_zh": "ჩინური",
+        "Language_zu": "ზულუ",
+        "LanguageCode": "ენის კოდი"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/ko.json b/plugins/UserLanguage/lang/ko.json
new file mode 100644
index 0000000000..07a2b0e3a7
--- /dev/null
+++ b/plugins/UserLanguage/lang/ko.json
@@ -0,0 +1,190 @@
+{
+    "UserLanguage": {
+        "BrowserLanguage": "브라우저 언어",
+        "Language_aa": "아파르어",
+        "Language_ab": "압하스어",
+        "Language_ae": "아베스타어",
+        "Language_af": "아프리카어",
+        "Language_ak": "아칸어",
+        "Language_am": "암하라어",
+        "Language_an": "아라곤어",
+        "Language_ar": "아라비아어",
+        "Language_as": "아삼어",
+        "Language_av": "아바르어",
+        "Language_ay": "아이마라어",
+        "Language_az": "아제르바이잔어",
+        "Language_ba": "바슈키르어",
+        "Language_be": "벨라루스어",
+        "Language_bg": "불가리아어",
+        "Language_bh": "비하르어",
+        "Language_bi": "비슐라마어",
+        "Language_bm": "밤바라어",
+        "Language_bn": "벵골어",
+        "Language_bo": "티베트어",
+        "Language_br": "브르타뉴어",
+        "Language_bs": "보스니아어",
+        "Language_ca": "카탈루냐어",
+        "Language_ce": "체첸어",
+        "Language_ch": "차모로어",
+        "Language_co": "코르시카어",
+        "Language_cr": "크리어",
+        "Language_cs": "체코어",
+        "Language_cu": "슬라브어",
+        "Language_cv": "추바슈어",
+        "Language_cy": "웨일스어",
+        "Language_da": "덴마크어",
+        "Language_de": "독일어",
+        "Language_dv": "디베히어",
+        "Language_dz": "종카어",
+        "Language_ee": "에웨어",
+        "Language_el": "그리스어",
+        "Language_en": "영어",
+        "Language_eo": "에스페란토어",
+        "Language_es": "스페인어",
+        "Language_et": "에스토니아어",
+        "Language_eu": "바스크어",
+        "Language_fa": "페르시아어",
+        "Language_ff": "풀라어",
+        "Language_fi": "핀란드어",
+        "Language_fj": "피지어",
+        "Language_fo": "페로어",
+        "Language_fr": "프랑스어",
+        "Language_fy": "프리지아어",
+        "Language_ga": "아일랜드어",
+        "Language_gd": "게일어",
+        "Language_gl": "갈리시아어",
+        "Language_gn": "과라니어",
+        "Language_gu": "구자라트어",
+        "Language_gv": "맨어",
+        "Language_ha": "하우사어",
+        "Language_he": "히브리어",
+        "Language_hi": "힌디어",
+        "Language_ho": "히리모투어",
+        "Language_hr": "크로아티아어",
+        "Language_ht": "아이티크리올어",
+        "Language_hu": "헝가리어",
+        "Language_hy": "아르메니아어",
+        "Language_hz": "헤레로어",
+        "Language_ia": "국제어",
+        "Language_id": "인도네시아어",
+        "Language_ie": "인테르링구에",
+        "Language_ig": "이그보어",
+        "Language_ii": "쓰촨이어",
+        "Language_ik": "이누피아크어",
+        "Language_io": "이도",
+        "Language_is": "아이슬란드어",
+        "Language_it": "이탈리아어",
+        "Language_iu": "이누이트어",
+        "Language_ja": "일본어",
+        "Language_jv": "자바어",
+        "Language_ka": "조지아어",
+        "Language_kg": "콩고어",
+        "Language_ki": "키쿠유어",
+        "Language_kj": "콴야마어",
+        "Language_kk": "카자흐어",
+        "Language_kl": "그린란드어",
+        "Language_km": "중앙 크메르어",
+        "Language_kn": "칸나다어",
+        "Language_ko": "한국어",
+        "Language_kr": "카누리어",
+        "Language_ks": "카슈미르어",
+        "Language_ku": "쿠르드어",
+        "Language_kv": "코미어",
+        "Language_kw": "콘월어",
+        "Language_ky": "키르기스어",
+        "Language_la": "라틴어",
+        "Language_lb": "룩셈부르크어",
+        "Language_lg": "간다어",
+        "Language_li": "림뷔르흐어",
+        "Language_ln": "링갈라어",
+        "Language_lo": "라오어",
+        "Language_lt": "리투아니아어",
+        "Language_lu": "루바-카탕가어",
+        "Language_lv": "라트비아어",
+        "Language_mg": "마다가스카르어",
+        "Language_mh": "마셜어",
+        "Language_mi": "마오리어",
+        "Language_mk": "마케도니아어",
+        "Language_ml": "말라얄람어",
+        "Language_mn": "몽골어",
+        "Language_mr": "마라타어",
+        "Language_ms": "말라얄람어",
+        "Language_mt": "몰타어",
+        "Language_my": "버마어",
+        "Language_na": "나우루어",
+        "Language_nb": "노르웨이어",
+        "Language_nd": "은데벨레어",
+        "Language_ne": "네팔어",
+        "Language_ng": "은동가어",
+        "Language_nl": "네덜란드어",
+        "Language_nn": "노르웨이어 뉘노르스크",
+        "Language_no": "노르웨이어",
+        "Language_nr": "은데벨레어",
+        "Language_nv": "나바호어",
+        "Language_ny": "니안자어",
+        "Language_oc": "오크어",
+        "Language_oj": "오지브와어",
+        "Language_om": "오로모어",
+        "Language_or": "오리야어",
+        "Language_os": "오세트어",
+        "Language_pa": "펀자브어",
+        "Language_pi": "팔리어",
+        "Language_pl": "폴란드어",
+        "Language_ps": "파슈토어",
+        "Language_pt": "포르투갈어",
+        "Language_qu": "케추아어",
+        "Language_rm": "로망슈어",
+        "Language_rn": "룬디어",
+        "Language_ro": "루마니아어",
+        "Language_ru": "러시아어",
+        "Language_rw": "르완다어",
+        "Language_sa": "산스크리트어",
+        "Language_sc": "사르데냐어",
+        "Language_sd": "신드어",
+        "Language_se": "사미어",
+        "Language_sg": "상고어",
+        "Language_si": "싱할라어",
+        "Language_sk": "슬로바키아어",
+        "Language_sl": "슬로베니아어",
+        "Language_sm": "사모아어",
+        "Language_sn": "쇼나어",
+        "Language_so": "소말리어",
+        "Language_sq": "알바니아어",
+        "Language_sr": "세르비아어",
+        "Language_ss": "스와티어",
+        "Language_st": "소토어",
+        "Language_su": "순다어",
+        "Language_sv": "스웨덴어",
+        "Language_sw": "스와힐리어",
+        "Language_ta": "타밀어",
+        "Language_te": "텔루구어",
+        "Language_tg": "타지크어",
+        "Language_th": "타이어",
+        "Language_ti": "티그리냐어",
+        "Language_tk": "투르크멘어",
+        "Language_tl": "타갈로그어",
+        "Language_tn": "츠와나어",
+        "Language_to": "통가어",
+        "Language_tr": "터키어",
+        "Language_ts": "총가어",
+        "Language_tt": "타타르어",
+        "Language_tw": "트위어",
+        "Language_ty": "타히티어",
+        "Language_ug": "위구르어",
+        "Language_uk": "우크라이나어",
+        "Language_ur": "우르두어",
+        "Language_uz": "우즈베크어",
+        "Language_ve": "벤다어",
+        "Language_vi": "베트남어",
+        "Language_vo": "볼라퓌크어",
+        "Language_wa": "왈론어",
+        "Language_wo": "월로프어",
+        "Language_xh": "코사어",
+        "Language_yi": "이디시어",
+        "Language_yo": "요루바어",
+        "Language_za": "주앙어",
+        "Language_zh": "중국어",
+        "Language_zu": "줄루어",
+        "LanguageCode": "언어 코드"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/lt.json b/plugins/UserLanguage/lang/lt.json
new file mode 100644
index 0000000000..75f6dd4209
--- /dev/null
+++ b/plugins/UserLanguage/lang/lt.json
@@ -0,0 +1,189 @@
+{
+    "UserLanguage": {
+        "Language_aa": "afarų",
+        "Language_ab": "abchazų",
+        "Language_ae": "avestų",
+        "Language_af": "afrikanų",
+        "Language_ak": "akanų",
+        "Language_am": "amharų",
+        "Language_an": "aragonesų",
+        "Language_ar": "arabų",
+        "Language_as": "asamų",
+        "Language_av": "avarikų",
+        "Language_ay": "aimarų",
+        "Language_az": "azerbaidžaniečių",
+        "Language_ba": "baškirų",
+        "Language_be": "baltarusių",
+        "Language_bg": "bulgarų",
+        "Language_bh": "biharų",
+        "Language_bi": "bislama",
+        "Language_bm": "bambarų",
+        "Language_bn": "bengalų",
+        "Language_bo": "tibetiečių",
+        "Language_br": "bretonų",
+        "Language_bs": "bosnių",
+        "Language_ca": "katalonų",
+        "Language_ce": "čečėnų",
+        "Language_ch": "čamorų",
+        "Language_co": "korsikiečių",
+        "Language_cr": "kry",
+        "Language_cs": "čekų",
+        "Language_cu": "bažnytinė slavų",
+        "Language_cv": "čiuvašų",
+        "Language_cy": "valų",
+        "Language_da": "danų",
+        "Language_de": "vokiečių",
+        "Language_dv": "divehi",
+        "Language_dz": "svazilando",
+        "Language_ee": "eve",
+        "Language_el": "graikų",
+        "Language_en": "anglų",
+        "Language_eo": "esperanto",
+        "Language_es": "ispanų",
+        "Language_et": "estų",
+        "Language_eu": "baskų",
+        "Language_fa": "persų",
+        "Language_ff": "fulahų",
+        "Language_fi": "suomių",
+        "Language_fj": "fidžio",
+        "Language_fo": "farerų kalba",
+        "Language_fr": "prancūzų",
+        "Language_fy": "vakarų fryzų",
+        "Language_ga": "airių",
+        "Language_gd": "škotų (gėlų)",
+        "Language_gl": "galisų",
+        "Language_gn": "gvaranių",
+        "Language_gu": "gudžaratų",
+        "Language_gv": "manks",
+        "Language_ha": "hausų",
+        "Language_he": "hebrajų",
+        "Language_hi": "hindi",
+        "Language_ho": "hiri motu",
+        "Language_hr": "kroatų",
+        "Language_ht": "haičio",
+        "Language_hu": "vengrų",
+        "Language_hy": "armėnų",
+        "Language_hz": "herero",
+        "Language_ia": "interlingva",
+        "Language_id": "indoneziečių",
+        "Language_ie": "interkalba",
+        "Language_ig": "igbo",
+        "Language_ii": "sičuan ji",
+        "Language_ik": "inupiak",
+        "Language_io": "ido",
+        "Language_is": "islandų",
+        "Language_it": "italų",
+        "Language_iu": "inukitut",
+        "Language_ja": "japonų",
+        "Language_jv": "javiečių",
+        "Language_ka": "gruzinų",
+        "Language_kg": "kongo",
+        "Language_ki": "kikui",
+        "Language_kj": "kuaniama",
+        "Language_kk": "kazachų",
+        "Language_kl": "kalalisut",
+        "Language_km": "khmerų",
+        "Language_kn": "kanadų",
+        "Language_ko": "korėjiečių",
+        "Language_kr": "kanuri",
+        "Language_ks": "kašmyro",
+        "Language_ku": "kurdų",
+        "Language_kv": "komi",
+        "Language_kw": "kornų",
+        "Language_ky": "kirgizų",
+        "Language_la": "lotynų",
+        "Language_lb": "liuksemburgiečių",
+        "Language_lg": "ganda",
+        "Language_li": "limburgiš",
+        "Language_ln": "lingala",
+        "Language_lo": "laosiečių",
+        "Language_lt": "lietuvių",
+        "Language_lu": "luba katanga",
+        "Language_lv": "latvių",
+        "Language_mg": "malagasijos",
+        "Language_mh": "Maršalo salų",
+        "Language_mi": "maorių",
+        "Language_mk": "makedonų",
+        "Language_ml": "malajalių",
+        "Language_mn": "mongolų",
+        "Language_mr": "maratų",
+        "Language_ms": "malajiečių",
+        "Language_mt": "maltiečių",
+        "Language_my": "birmiečių",
+        "Language_na": "naurų",
+        "Language_nb": "Norvegijos bokmal",
+        "Language_nd": "šiaurės ndebelų",
+        "Language_ne": "nepalų",
+        "Language_ng": "ndongų",
+        "Language_nl": "olandų",
+        "Language_nn": "naujoji norvegų",
+        "Language_no": "norvegų",
+        "Language_nr": "pietų ndebele",
+        "Language_nv": "navajų",
+        "Language_ny": "nianja",
+        "Language_oc": "provansalų",
+        "Language_oj": "ojibva",
+        "Language_om": "oromo",
+        "Language_or": "orijų",
+        "Language_os": "osetinų",
+        "Language_pa": "pandžabų",
+        "Language_pi": "pali",
+        "Language_pl": "lenkų",
+        "Language_ps": "puštūnų",
+        "Language_pt": "portugalų",
+        "Language_qu": "kečujų",
+        "Language_rm": "raeto romanų",
+        "Language_rn": "rundi",
+        "Language_ro": "rumunų",
+        "Language_ru": "rusų",
+        "Language_rw": "kinjarvanda",
+        "Language_sa": "sanskritas",
+        "Language_sc": "sardiniečių",
+        "Language_sd": "sindų",
+        "Language_se": "šiaurinių samių",
+        "Language_sg": "sango",
+        "Language_si": "sinhalų",
+        "Language_sk": "slovakų",
+        "Language_sl": "slovėnų",
+        "Language_sm": "samoa",
+        "Language_sn": "šona",
+        "Language_so": "somalių",
+        "Language_sq": "albanų",
+        "Language_sr": "serbų",
+        "Language_ss": "svati",
+        "Language_st": "pietų sesuto",
+        "Language_su": "sundų",
+        "Language_sv": "švedų",
+        "Language_sw": "svahili",
+        "Language_ta": "tamilų",
+        "Language_te": "telugų",
+        "Language_tg": "tadžikų",
+        "Language_th": "tajų",
+        "Language_ti": "tigrajų",
+        "Language_tk": "turkmėnų",
+        "Language_tl": "tagalogų",
+        "Language_tn": "tsvana",
+        "Language_to": "tonga",
+        "Language_tr": "turkų",
+        "Language_ts": "tsonga",
+        "Language_tt": "totorių",
+        "Language_tw": "tvi",
+        "Language_ty": "taitiečių",
+        "Language_ug": "uigūrų",
+        "Language_uk": "ukrainiečių",
+        "Language_ur": "urdų",
+        "Language_uz": "uzbekų",
+        "Language_ve": "venda",
+        "Language_vi": "vietnamiečių",
+        "Language_vo": "volapiuk",
+        "Language_wa": "valonų",
+        "Language_wo": "volof",
+        "Language_xh": "kosų",
+        "Language_yi": "jidiš",
+        "Language_yo": "joruba",
+        "Language_za": "chuang",
+        "Language_zh": "kinų",
+        "Language_zu": "zulų",
+        "LanguageCode": "Kalbos kodas"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/lv.json b/plugins/UserLanguage/lang/lv.json
new file mode 100644
index 0000000000..bed7f8edeb
--- /dev/null
+++ b/plugins/UserLanguage/lang/lv.json
@@ -0,0 +1,189 @@
+{
+    "UserLanguage": {
+        "Language_aa": "afāru",
+        "Language_ab": "abhāzu",
+        "Language_ae": "avesta",
+        "Language_af": "afrikandu",
+        "Language_ak": "akanu",
+        "Language_am": "amharu",
+        "Language_an": "aragoniešu",
+        "Language_ar": "arābu",
+        "Language_as": "asamiešu",
+        "Language_av": "avāru",
+        "Language_ay": "aimaru",
+        "Language_az": "azerbaidžāņu",
+        "Language_ba": "baškīru",
+        "Language_be": "baltkrievu",
+        "Language_bg": "bulgāru",
+        "Language_bh": "biharu",
+        "Language_bi": "bišlamā",
+        "Language_bm": "bambaru",
+        "Language_bn": "bengāļu",
+        "Language_bo": "tibetiešu",
+        "Language_br": "bretoņu",
+        "Language_bs": "bosniešu",
+        "Language_ca": "katalāņu",
+        "Language_ce": "čečenu",
+        "Language_ch": "čamorru",
+        "Language_co": "korsikāņu",
+        "Language_cr": "krī",
+        "Language_cs": "čehu",
+        "Language_cu": "baznīcslāvu",
+        "Language_cv": "čuvašu",
+        "Language_cy": "velsiešu",
+        "Language_da": "dāņu",
+        "Language_de": "vācu",
+        "Language_dv": "maldīviešu",
+        "Language_dz": "dzongke",
+        "Language_ee": "evu",
+        "Language_el": "grieķu",
+        "Language_en": "angļu",
+        "Language_eo": "esperanto",
+        "Language_es": "spāņu",
+        "Language_et": "igauņu",
+        "Language_eu": "basku",
+        "Language_fa": "persiešu",
+        "Language_ff": "fulu",
+        "Language_fi": "somu",
+        "Language_fj": "fidžiešu",
+        "Language_fo": "fēru",
+        "Language_fr": "franču",
+        "Language_fy": "rietumfrīzu",
+        "Language_ga": "īru",
+        "Language_gd": "gēlu",
+        "Language_gl": "galisiešu",
+        "Language_gn": "gvaranu",
+        "Language_gu": "gudžaratu",
+        "Language_gv": "meniešu",
+        "Language_ha": "hausu",
+        "Language_he": "ivrits",
+        "Language_hi": "hindi",
+        "Language_ho": "hirimotu",
+        "Language_hr": "horvātu",
+        "Language_ht": "haitiešu",
+        "Language_hu": "ungāru",
+        "Language_hy": "armēņu",
+        "Language_hz": "hereru",
+        "Language_ia": "interlingva",
+        "Language_id": "indonēziešu",
+        "Language_ie": "interlingve",
+        "Language_ig": "igbo",
+        "Language_ii": "Sičuaņas ji",
+        "Language_ik": "inupiaku",
+        "Language_io": "ido",
+        "Language_is": "īslandiešu",
+        "Language_it": "itāliešu",
+        "Language_iu": "inuītu",
+        "Language_ja": "japāņu",
+        "Language_jv": "javiešu",
+        "Language_ka": "gruzīnu",
+        "Language_kg": "kongu",
+        "Language_ki": "kikuju",
+        "Language_kj": "kvaņamu",
+        "Language_kk": "kazahu",
+        "Language_kl": "grenlandiešu",
+        "Language_km": "khmeru",
+        "Language_kn": "kannadu",
+        "Language_ko": "korejiešu",
+        "Language_kr": "kanuru",
+        "Language_ks": "kašmiriešu",
+        "Language_ku": "kurdu",
+        "Language_kv": "komiešu",
+        "Language_kw": "korniešu",
+        "Language_ky": "kirgīzu",
+        "Language_la": "latīņu",
+        "Language_lb": "luksemburgiešu",
+        "Language_lg": "gandu",
+        "Language_li": "limburgiešu",
+        "Language_ln": "lingala",
+        "Language_lo": "laosiešu",
+        "Language_lt": "lietuviešu",
+        "Language_lu": "lubakatanga",
+        "Language_lv": "latviešu",
+        "Language_mg": "malagasu",
+        "Language_mh": "māršaliešu",
+        "Language_mi": "maoru",
+        "Language_mk": "maķedoniešu",
+        "Language_ml": "malajalu",
+        "Language_mn": "mongoļu",
+        "Language_mr": "maratu",
+        "Language_ms": "malajiešu",
+        "Language_mt": "maltiešu",
+        "Language_my": "birmiešu",
+        "Language_na": "nauruiešu",
+        "Language_nb": "norvēģu bukmols",
+        "Language_nd": "ziemeļndebelu",
+        "Language_ne": "nepāliešu",
+        "Language_ng": "ndongu",
+        "Language_nl": "holandiešu",
+        "Language_nn": "jaunnorvēģu",
+        "Language_no": "norvēģu",
+        "Language_nr": "dienvidndebelu",
+        "Language_nv": "navahu",
+        "Language_ny": "čičeva",
+        "Language_oc": "oksitāņu",
+        "Language_oj": "odžibvu",
+        "Language_om": "oromu",
+        "Language_or": "orisiešu",
+        "Language_os": "osetīnu",
+        "Language_pa": "pandžabu",
+        "Language_pi": "pāli",
+        "Language_pl": "poļu",
+        "Language_ps": "puštu",
+        "Language_pt": "portugāļu",
+        "Language_qu": "kečvu",
+        "Language_rm": "retoromāņu",
+        "Language_rn": "rundu",
+        "Language_ro": "rumāņu",
+        "Language_ru": "krievu",
+        "Language_rw": "kiņaruanda",
+        "Language_sa": "sanskrits",
+        "Language_sc": "sardīniešu",
+        "Language_sd": "sindhu",
+        "Language_se": "ziemeļsāmu",
+        "Language_sg": "sangu",
+        "Language_si": "singāļu",
+        "Language_sk": "slovāku",
+        "Language_sl": "slovēņu",
+        "Language_sm": "samoāņu",
+        "Language_sn": "šonu",
+        "Language_so": "somāļu",
+        "Language_sq": "albāņu",
+        "Language_sr": "serbu",
+        "Language_ss": "svatu",
+        "Language_st": "sesoto",
+        "Language_su": "sundaniešu",
+        "Language_sv": "zviedru",
+        "Language_sw": "svahili",
+        "Language_ta": "tamilu",
+        "Language_te": "telugu",
+        "Language_tg": "tadžiku",
+        "Language_th": "taju",
+        "Language_ti": "tigrinja",
+        "Language_tk": "turkmēņu",
+        "Language_tl": "tagalu",
+        "Language_tn": "cvanu",
+        "Language_to": "tongu",
+        "Language_tr": "turku",
+        "Language_ts": "congu",
+        "Language_tt": "tatāru",
+        "Language_tw": "tvī",
+        "Language_ty": "taitiešu",
+        "Language_ug": "uiguru",
+        "Language_uk": "ukraiņu",
+        "Language_ur": "urdu",
+        "Language_uz": "uzbeku",
+        "Language_ve": "vendu",
+        "Language_vi": "vjetnamiešu",
+        "Language_vo": "volapiks",
+        "Language_wa": "valoņu",
+        "Language_wo": "volofu",
+        "Language_xh": "khosu",
+        "Language_yi": "jidišs",
+        "Language_yo": "jorubu",
+        "Language_za": "džuanu",
+        "Language_zh": "ķīniešu",
+        "Language_zu": "zulu",
+        "LanguageCode": "Valodas kods"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/nb.json b/plugins/UserLanguage/lang/nb.json
new file mode 100644
index 0000000000..0a8f7d6b0c
--- /dev/null
+++ b/plugins/UserLanguage/lang/nb.json
@@ -0,0 +1,189 @@
+{
+    "UserLanguage": {
+        "Language_aa": "afar",
+        "Language_ab": "abkhasisk",
+        "Language_ae": "avestisk",
+        "Language_af": "afrikaans",
+        "Language_ak": "akan",
+        "Language_am": "amharisk",
+        "Language_an": "aragonsk",
+        "Language_ar": "arabisk",
+        "Language_as": "assamisk",
+        "Language_av": "avarisk",
+        "Language_ay": "aymara",
+        "Language_az": "aserbajdsjansk",
+        "Language_ba": "basjkirsk",
+        "Language_be": "hviterussisk",
+        "Language_bg": "bulgarsk",
+        "Language_bh": "bihari",
+        "Language_bi": "bislama",
+        "Language_bm": "bambara",
+        "Language_bn": "bengali",
+        "Language_bo": "tibetansk",
+        "Language_br": "bretonsk",
+        "Language_bs": "bosnisk",
+        "Language_ca": "katalansk",
+        "Language_ce": "tsjetsjensk",
+        "Language_ch": "chamorro",
+        "Language_co": "korsikansk",
+        "Language_cr": "cree",
+        "Language_cs": "tsjekkisk",
+        "Language_cu": "kirkeslavisk",
+        "Language_cv": "tsjuvansk",
+        "Language_cy": "walisisk",
+        "Language_da": "dansk",
+        "Language_de": "tysk",
+        "Language_dv": "divehi",
+        "Language_dz": "dzongkha",
+        "Language_ee": "ewe",
+        "Language_el": "gresk",
+        "Language_en": "engelsk",
+        "Language_eo": "esperanto",
+        "Language_es": "spansk",
+        "Language_et": "estisk",
+        "Language_eu": "baskisk",
+        "Language_fa": "persisk",
+        "Language_ff": "fulani",
+        "Language_fi": "finsk",
+        "Language_fj": "fijiansk",
+        "Language_fo": "færøysk",
+        "Language_fr": "fransk",
+        "Language_fy": "vestfrisisk",
+        "Language_ga": "irsk",
+        "Language_gd": "skotsk gælisk",
+        "Language_gl": "galisisk",
+        "Language_gn": "guarani",
+        "Language_gu": "gujarati",
+        "Language_gv": "manx",
+        "Language_ha": "hausa",
+        "Language_he": "hebraisk",
+        "Language_hi": "hindi",
+        "Language_ho": "hiri motu",
+        "Language_hr": "kroatisk",
+        "Language_ht": "haitisk",
+        "Language_hu": "ungarsk",
+        "Language_hy": "armensk",
+        "Language_hz": "herero",
+        "Language_ia": "interlingua",
+        "Language_id": "indonesisk",
+        "Language_ie": "interlingue",
+        "Language_ig": "ibo",
+        "Language_ii": "sichuan-yi",
+        "Language_ik": "inupiak",
+        "Language_io": "ido",
+        "Language_is": "islandsk",
+        "Language_it": "italiensk",
+        "Language_iu": "inuktitut",
+        "Language_ja": "japansk",
+        "Language_jv": "javanesisk",
+        "Language_ka": "georgisk",
+        "Language_kg": "kikongo",
+        "Language_ki": "kikuyu",
+        "Language_kj": "kuanyama",
+        "Language_kk": "kasakhisk",
+        "Language_kl": "grønlandsk",
+        "Language_km": "khmer",
+        "Language_kn": "kannada",
+        "Language_ko": "koreansk",
+        "Language_kr": "kanuri",
+        "Language_ks": "kasjmiri",
+        "Language_ku": "kurdisk",
+        "Language_kv": "komi",
+        "Language_kw": "kornisk",
+        "Language_ky": "kirgisisk",
+        "Language_la": "latin",
+        "Language_lb": "luxemburgsk",
+        "Language_lg": "ganda",
+        "Language_li": "limburgisk",
+        "Language_ln": "lingala",
+        "Language_lo": "laotisk",
+        "Language_lt": "litauisk",
+        "Language_lu": "luba-katanga",
+        "Language_lv": "latvisk",
+        "Language_mg": "madagassisk",
+        "Language_mh": "marshallesisk",
+        "Language_mi": "maori",
+        "Language_mk": "makedonsk",
+        "Language_ml": "malayalam",
+        "Language_mn": "mongolsk",
+        "Language_mr": "marathi",
+        "Language_ms": "malayisk",
+        "Language_mt": "maltesisk",
+        "Language_my": "burmesisk",
+        "Language_na": "nauru",
+        "Language_nb": "norsk bokmål",
+        "Language_nd": "nord-ndebele",
+        "Language_ne": "nepalsk",
+        "Language_ng": "ndonga",
+        "Language_nl": "nederlandsk",
+        "Language_nn": "norsk nynorsk",
+        "Language_no": "norsk",
+        "Language_nr": "sør-ndebele",
+        "Language_nv": "navajo",
+        "Language_ny": "nyanja",
+        "Language_oc": "oksitansk",
+        "Language_oj": "ojibwa",
+        "Language_om": "oromo",
+        "Language_or": "oriya",
+        "Language_os": "ossetisk",
+        "Language_pa": "panjabi",
+        "Language_pi": "pali",
+        "Language_pl": "polsk",
+        "Language_ps": "pashto",
+        "Language_pt": "portugisisk",
+        "Language_qu": "quechua",
+        "Language_rm": "retoromansk",
+        "Language_rn": "rundi",
+        "Language_ro": "rumensk",
+        "Language_ru": "russisk",
+        "Language_rw": "kinjarwanda",
+        "Language_sa": "sanskrit",
+        "Language_sc": "sardinsk",
+        "Language_sd": "sindhi",
+        "Language_se": "nordsamisk",
+        "Language_sg": "sango",
+        "Language_si": "singalesisk",
+        "Language_sk": "slovakisk",
+        "Language_sl": "slovensk",
+        "Language_sm": "samoansk",
+        "Language_sn": "shona",
+        "Language_so": "somali",
+        "Language_sq": "albansk",
+        "Language_sr": "serbisk",
+        "Language_ss": "swati",
+        "Language_st": "sør-sotho",
+        "Language_su": "sundanesisk",
+        "Language_sv": "svensk",
+        "Language_sw": "swahili",
+        "Language_ta": "tamil",
+        "Language_te": "telugu",
+        "Language_tg": "tadsjikisk",
+        "Language_th": "thai",
+        "Language_ti": "tigrinja",
+        "Language_tk": "turkmensk",
+        "Language_tl": "tagalog",
+        "Language_tn": "setswana",
+        "Language_to": "tongansk",
+        "Language_tr": "tyrkisk",
+        "Language_ts": "tsonga",
+        "Language_tt": "tatarisk",
+        "Language_tw": "twi",
+        "Language_ty": "tahitisk",
+        "Language_ug": "uigurisk",
+        "Language_uk": "ukrainsk",
+        "Language_ur": "urdu",
+        "Language_uz": "usbekisk",
+        "Language_ve": "venda",
+        "Language_vi": "vietnamesisk",
+        "Language_vo": "volapyk",
+        "Language_wa": "vallonsk",
+        "Language_wo": "wolof",
+        "Language_xh": "xhosa",
+        "Language_yi": "jiddisk",
+        "Language_yo": "joruba",
+        "Language_za": "zhuang",
+        "Language_zh": "kinesisk",
+        "Language_zu": "zulu",
+        "LanguageCode": "Språkkode"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/nl.json b/plugins/UserLanguage/lang/nl.json
new file mode 100644
index 0000000000..708e3b034f
--- /dev/null
+++ b/plugins/UserLanguage/lang/nl.json
@@ -0,0 +1,190 @@
+{
+    "UserLanguage": {
+        "BrowserLanguage": "Browsertaal",
+        "Language_aa": "Afar",
+        "Language_ab": "Abchazisch",
+        "Language_ae": "Avestisch",
+        "Language_af": "Afrikaans",
+        "Language_ak": "Akan",
+        "Language_am": "Amhaars",
+        "Language_an": "Aragonees",
+        "Language_ar": "Arabisch",
+        "Language_as": "Assamees",
+        "Language_av": "Avarisch",
+        "Language_ay": "Aymara",
+        "Language_az": "Azerbeidzjaans",
+        "Language_ba": "Basjkiers",
+        "Language_be": "Wit-Russisch",
+        "Language_bg": "Bulgaars",
+        "Language_bh": "Bihari",
+        "Language_bi": "Bislama",
+        "Language_bm": "Bambara",
+        "Language_bn": "Bengalees",
+        "Language_bo": "Tibetaans",
+        "Language_br": "Bretons",
+        "Language_bs": "Bosnisch",
+        "Language_ca": "Catalaans",
+        "Language_ce": "Chechen",
+        "Language_ch": "Chamorro",
+        "Language_co": "Corsicaans",
+        "Language_cr": "Cree",
+        "Language_cs": "Tsjechisch",
+        "Language_cu": "Kerkslavisch",
+        "Language_cv": "Tsjoevasjisch",
+        "Language_cy": "Welsh",
+        "Language_da": "Deens",
+        "Language_de": "Duits",
+        "Language_dv": "Divehi",
+        "Language_dz": "Dzongkha",
+        "Language_ee": "Ewe",
+        "Language_el": "Grieks",
+        "Language_en": "Engels",
+        "Language_eo": "Esperanto",
+        "Language_es": "Spaans",
+        "Language_et": "Estlands",
+        "Language_eu": "Baskisch",
+        "Language_fa": "Perzisch",
+        "Language_ff": "Fulah",
+        "Language_fi": "Fins",
+        "Language_fj": "Fijisch",
+        "Language_fo": "Faeröers",
+        "Language_fr": "Frans",
+        "Language_fy": "Fries",
+        "Language_ga": "Iers",
+        "Language_gd": "Schots Gaelic",
+        "Language_gl": "Galicisch",
+        "Language_gn": "Guarani",
+        "Language_gu": "Gujarati",
+        "Language_gv": "Manx",
+        "Language_ha": "Hausa",
+        "Language_he": "Hebreeuws",
+        "Language_hi": "Hindi",
+        "Language_ho": "Hiri Motu",
+        "Language_hr": "Kroatisch",
+        "Language_ht": "Haïtiaans",
+        "Language_hu": "Hongaars",
+        "Language_hy": "Armeens",
+        "Language_hz": "Herero",
+        "Language_ia": "Interlingua",
+        "Language_id": "Indonesisch",
+        "Language_ie": "Interlingue",
+        "Language_ig": "Igbo",
+        "Language_ii": "Sichuan Yi",
+        "Language_ik": "Inupiaq",
+        "Language_io": "Ido",
+        "Language_is": "IJslands",
+        "Language_it": "Italiaans",
+        "Language_iu": "Inuktitut",
+        "Language_ja": "Japans",
+        "Language_jv": "Javaans",
+        "Language_ka": "Georgisch",
+        "Language_kg": "Kongo",
+        "Language_ki": "Kikuyu",
+        "Language_kj": "Kuanyama",
+        "Language_kk": "Kazachs",
+        "Language_kl": "Kalaallisut",
+        "Language_km": "Khmer",
+        "Language_kn": "Kannada",
+        "Language_ko": "Koreaans",
+        "Language_kr": "Kanuri",
+        "Language_ks": "Kashmiri",
+        "Language_ku": "Koerdisch",
+        "Language_kv": "Komi",
+        "Language_kw": "Cornish",
+        "Language_ky": "Kirgizisch",
+        "Language_la": "Latijn",
+        "Language_lb": "Luxemburgs",
+        "Language_lg": "Ganda",
+        "Language_li": "Limburgs",
+        "Language_ln": "Lingala",
+        "Language_lo": "Lao",
+        "Language_lt": "Litouws",
+        "Language_lu": "Luba-Katanga",
+        "Language_lv": "Letlands",
+        "Language_mg": "Malagasisch",
+        "Language_mh": "Marshallees",
+        "Language_mi": "Maori",
+        "Language_mk": "Macedonisch",
+        "Language_ml": "Malayalam",
+        "Language_mn": "Mongools",
+        "Language_mr": "Marathi",
+        "Language_ms": "Maleis",
+        "Language_mt": "Maltees",
+        "Language_my": "Birmees",
+        "Language_na": "Nauru",
+        "Language_nb": "Noors - Bokmål",
+        "Language_nd": "Noord-Ndbele",
+        "Language_ne": "Nepalees",
+        "Language_ng": "Ndonga",
+        "Language_nl": "Nederlands",
+        "Language_nn": "Noors - Nynorsk",
+        "Language_no": "Noors",
+        "Language_nr": "Zuid-Ndbele",
+        "Language_nv": "Navajo",
+        "Language_ny": "Nyanja",
+        "Language_oc": "Occitaans",
+        "Language_oj": "Ojibwa",
+        "Language_om": "Oromo",
+        "Language_or": "Oriya",
+        "Language_os": "Ossetisch",
+        "Language_pa": "Punjabi",
+        "Language_pi": "Pali",
+        "Language_pl": "Pools",
+        "Language_ps": "Pasjtoe",
+        "Language_pt": "Portugees",
+        "Language_qu": "Quechua",
+        "Language_rm": "Reto-Romaans",
+        "Language_rn": "Rundi",
+        "Language_ro": "Roemeens",
+        "Language_ru": "Russisch",
+        "Language_rw": "Kinyarwanda",
+        "Language_sa": "Sanskriet",
+        "Language_sc": "Sardinisch",
+        "Language_sd": "Sindhi",
+        "Language_se": "Noord-Samisch",
+        "Language_sg": "Sango",
+        "Language_si": "Singalees",
+        "Language_sk": "Slowaaks",
+        "Language_sl": "Sloveens",
+        "Language_sm": "Samoaans",
+        "Language_sn": "Shona",
+        "Language_so": "Somalisch",
+        "Language_sq": "Albanees",
+        "Language_sr": "Servisch",
+        "Language_ss": "Swati",
+        "Language_st": "Zuid-Sotho",
+        "Language_su": "Soendanees",
+        "Language_sv": "Zweeds",
+        "Language_sw": "Swahili",
+        "Language_ta": "Tamil",
+        "Language_te": "Teloegoe",
+        "Language_tg": "Tadzjieks",
+        "Language_th": "Thais",
+        "Language_ti": "Tigrinya",
+        "Language_tk": "Turkmeens",
+        "Language_tl": "Tagalog",
+        "Language_tn": "Tswana",
+        "Language_to": "Tonga",
+        "Language_tr": "Turks",
+        "Language_ts": "Tsonga",
+        "Language_tt": "Tataars",
+        "Language_tw": "Twi",
+        "Language_ty": "Tahitisch",
+        "Language_ug": "Oeigoers",
+        "Language_uk": "Oekraïens",
+        "Language_ur": "Urdu",
+        "Language_uz": "Oezbeeks",
+        "Language_ve": "Venda",
+        "Language_vi": "Vietnamees",
+        "Language_vo": "Volapük",
+        "Language_wa": "Wallonisch",
+        "Language_wo": "Wolof",
+        "Language_xh": "Xhosa",
+        "Language_yi": "Jiddisch",
+        "Language_yo": "Yoruba",
+        "Language_za": "Zhuang",
+        "Language_zh": "Chinees",
+        "Language_zu": "Zulu",
+        "LanguageCode": "Taal code"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/nn.json b/plugins/UserLanguage/lang/nn.json
new file mode 100644
index 0000000000..35699b3a50
--- /dev/null
+++ b/plugins/UserLanguage/lang/nn.json
@@ -0,0 +1,189 @@
+{
+    "UserLanguage": {
+        "Language_aa": "afar",
+        "Language_ab": "abkhasisk",
+        "Language_ae": "avestisk",
+        "Language_af": "afrikaans",
+        "Language_ak": "akan",
+        "Language_am": "amharisk",
+        "Language_an": "aragonsk",
+        "Language_ar": "arabisk",
+        "Language_as": "assamisk",
+        "Language_av": "avarisk",
+        "Language_ay": "aymara",
+        "Language_az": "aserbajdsjansk",
+        "Language_ba": "basjkirsk",
+        "Language_be": "kviterussisk",
+        "Language_bg": "bulgarsk",
+        "Language_bh": "bihari",
+        "Language_bi": "bislama",
+        "Language_bm": "bambara",
+        "Language_bn": "bengali",
+        "Language_bo": "tibetansk",
+        "Language_br": "bretonsk",
+        "Language_bs": "bosnisk",
+        "Language_ca": "katalansk",
+        "Language_ce": "tsjetsjensk",
+        "Language_ch": "chamorro",
+        "Language_co": "korsikansk",
+        "Language_cr": "cree",
+        "Language_cs": "tsjekkisk",
+        "Language_cu": "kyrkjeslavisk",
+        "Language_cv": "tsjuvansk",
+        "Language_cy": "walisisk",
+        "Language_da": "dansk",
+        "Language_de": "tysk",
+        "Language_dv": "divehi",
+        "Language_dz": "dzongkha",
+        "Language_ee": "ewe",
+        "Language_el": "gresk",
+        "Language_en": "engelsk",
+        "Language_eo": "esperanto",
+        "Language_es": "spansk",
+        "Language_et": "estisk",
+        "Language_eu": "baskisk",
+        "Language_fa": "persisk",
+        "Language_ff": "fulani",
+        "Language_fi": "finsk",
+        "Language_fj": "fijiansk",
+        "Language_fo": "færøysk",
+        "Language_fr": "fransk",
+        "Language_fy": "vestfrisisk",
+        "Language_ga": "irsk",
+        "Language_gd": "skotsk-gælisk",
+        "Language_gl": "galicisk",
+        "Language_gn": "guarani",
+        "Language_gu": "gujarati",
+        "Language_gv": "manx",
+        "Language_ha": "hausa",
+        "Language_he": "hebraisk",
+        "Language_hi": "hindi",
+        "Language_ho": "hiri motu",
+        "Language_hr": "kroatisk",
+        "Language_ht": "haitisk",
+        "Language_hu": "ungarsk",
+        "Language_hy": "armensk",
+        "Language_hz": "herero",
+        "Language_ia": "interlingua",
+        "Language_id": "indonesisk",
+        "Language_ie": "interlingue",
+        "Language_ig": "ibo",
+        "Language_ii": "sichuan-yi",
+        "Language_ik": "inupiak",
+        "Language_io": "ido",
+        "Language_is": "islandsk",
+        "Language_it": "italiensk",
+        "Language_iu": "inuktitut",
+        "Language_ja": "japansk",
+        "Language_jv": "javanesisk",
+        "Language_ka": "georgisk",
+        "Language_kg": "kikongo",
+        "Language_ki": "kikuyu",
+        "Language_kj": "kuanyama",
+        "Language_kk": "kasakhisk",
+        "Language_kl": "kalaallisut; grønlandsk",
+        "Language_km": "khmer",
+        "Language_kn": "kannada",
+        "Language_ko": "koreansk",
+        "Language_kr": "kanuri",
+        "Language_ks": "kasjmiri",
+        "Language_ku": "kurdisk",
+        "Language_kv": "komi",
+        "Language_kw": "kornisk",
+        "Language_ky": "kirgisisk",
+        "Language_la": "latin",
+        "Language_lb": "luxemburgsk",
+        "Language_lg": "ganda",
+        "Language_li": "limburgisk",
+        "Language_ln": "lingala",
+        "Language_lo": "laotisk",
+        "Language_lt": "litauisk",
+        "Language_lu": "luba-katanga",
+        "Language_lv": "latvisk",
+        "Language_mg": "madagassisk",
+        "Language_mh": "marshallesisk",
+        "Language_mi": "maori",
+        "Language_mk": "makedonsk",
+        "Language_ml": "malayalam",
+        "Language_mn": "mongolsk",
+        "Language_mr": "marathi",
+        "Language_ms": "malayisk",
+        "Language_mt": "maltesisk",
+        "Language_my": "burmesisk",
+        "Language_na": "nauru",
+        "Language_nb": "bokmål",
+        "Language_nd": "nord-ndebele",
+        "Language_ne": "nepalsk",
+        "Language_ng": "ndonga",
+        "Language_nl": "nederlandsk",
+        "Language_nn": "nynorsk",
+        "Language_no": "norsk",
+        "Language_nr": "sør-ndebele",
+        "Language_nv": "navajo",
+        "Language_ny": "nyanja",
+        "Language_oc": "oksitansk",
+        "Language_oj": "ojibwa",
+        "Language_om": "oromo",
+        "Language_or": "oriya",
+        "Language_os": "ossetisk",
+        "Language_pa": "panjabi",
+        "Language_pi": "pali",
+        "Language_pl": "polsk",
+        "Language_ps": "pashto",
+        "Language_pt": "portugisisk",
+        "Language_qu": "quechua",
+        "Language_rm": "retoromansk",
+        "Language_rn": "rundi",
+        "Language_ro": "rumensk",
+        "Language_ru": "russisk",
+        "Language_rw": "kinjarwanda",
+        "Language_sa": "sanskrit",
+        "Language_sc": "sardinsk",
+        "Language_sd": "sindhi",
+        "Language_se": "nordsamisk",
+        "Language_sg": "sango",
+        "Language_si": "singalesisk",
+        "Language_sk": "slovakisk",
+        "Language_sl": "slovensk",
+        "Language_sm": "samoansk",
+        "Language_sn": "shona",
+        "Language_so": "somali",
+        "Language_sq": "albansk",
+        "Language_sr": "serbisk",
+        "Language_ss": "swati",
+        "Language_st": "sørsotho",
+        "Language_su": "sundanesisk",
+        "Language_sv": "svensk",
+        "Language_sw": "swahili",
+        "Language_ta": "tamil",
+        "Language_te": "telugu",
+        "Language_tg": "tatsjikisk",
+        "Language_th": "thai",
+        "Language_ti": "tigrinja",
+        "Language_tk": "turkmensk",
+        "Language_tl": "tagalog",
+        "Language_tn": "tswana",
+        "Language_to": "tonga (Tonga-øyane)",
+        "Language_tr": "tyrkisk",
+        "Language_ts": "tsonga",
+        "Language_tt": "tatarisk",
+        "Language_tw": "twi",
+        "Language_ty": "tahitisk",
+        "Language_ug": "uigurisk",
+        "Language_uk": "ukrainsk",
+        "Language_ur": "urdu",
+        "Language_uz": "usbekisk",
+        "Language_ve": "venda",
+        "Language_vi": "vietnamesisk",
+        "Language_vo": "volapyk",
+        "Language_wa": "vallonsk",
+        "Language_wo": "wolof",
+        "Language_xh": "xhosa",
+        "Language_yi": "jiddisk",
+        "Language_yo": "joruba",
+        "Language_za": "zhuang",
+        "Language_zh": "kinesisk",
+        "Language_zu": "zulu",
+        "LanguageCode": "Språkkode"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/pl.json b/plugins/UserLanguage/lang/pl.json
new file mode 100644
index 0000000000..8ff635e825
--- /dev/null
+++ b/plugins/UserLanguage/lang/pl.json
@@ -0,0 +1,190 @@
+{
+    "UserLanguage": {
+        "BrowserLanguage": "Język przeglądarki",
+        "Language_aa": "afar",
+        "Language_ab": "abchaski",
+        "Language_ae": "awestyjski",
+        "Language_af": "afrikaans",
+        "Language_ak": "akan",
+        "Language_am": "amharski",
+        "Language_an": "aragoński",
+        "Language_ar": "arabski",
+        "Language_as": "asamski",
+        "Language_av": "awarski",
+        "Language_ay": "ajmara",
+        "Language_az": "azerski",
+        "Language_ba": "baszkirski",
+        "Language_be": "białoruski",
+        "Language_bg": "bułgarski",
+        "Language_bh": "biharski",
+        "Language_bi": "Bislama",
+        "Language_bm": "bambara",
+        "Language_bn": "bengalski",
+        "Language_bo": "tybetański",
+        "Language_br": "bretoński",
+        "Language_bs": "bośniacki",
+        "Language_ca": "kataloński",
+        "Language_ce": "czeczeński",
+        "Language_ch": "chamorro",
+        "Language_co": "korsykański",
+        "Language_cr": "kri",
+        "Language_cs": "czeski",
+        "Language_cu": "staro-cerkiewno-słowiański",
+        "Language_cv": "czuwaski",
+        "Language_cy": "walijski",
+        "Language_da": "duński",
+        "Language_de": "niemiecki",
+        "Language_dv": "malediwski",
+        "Language_dz": "dzongkha",
+        "Language_ee": "ewe",
+        "Language_el": "grecki",
+        "Language_en": "angielski",
+        "Language_eo": "esperanto",
+        "Language_es": "hiszpański",
+        "Language_et": "estoński",
+        "Language_eu": "baskijski",
+        "Language_fa": "perski",
+        "Language_ff": "fulani",
+        "Language_fi": "fiński",
+        "Language_fj": "fidżijski",
+        "Language_fo": "farerski",
+        "Language_fr": "francuski",
+        "Language_fy": "fryzyjski",
+        "Language_ga": "irlandzki",
+        "Language_gd": "szkocki gaelicki",
+        "Language_gl": "galisyjski",
+        "Language_gn": "guarani",
+        "Language_gu": "gudźaracki",
+        "Language_gv": "manx",
+        "Language_ha": "hausa",
+        "Language_he": "hebrajski",
+        "Language_hi": "hindi",
+        "Language_ho": "hiri motu",
+        "Language_hr": "chorwacki",
+        "Language_ht": "haitański",
+        "Language_hu": "węgierski",
+        "Language_hy": "ormiański",
+        "Language_hz": "herero",
+        "Language_ia": "interlingua",
+        "Language_id": "indonezyjski",
+        "Language_ie": "interlingue",
+        "Language_ig": "igbo",
+        "Language_ii": "syczuański",
+        "Language_ik": "inupiak",
+        "Language_io": "ido",
+        "Language_is": "islandzki",
+        "Language_it": "włoski",
+        "Language_iu": "inuktitut",
+        "Language_ja": "japoński",
+        "Language_jv": "jawajski",
+        "Language_ka": "gruziński",
+        "Language_kg": "kongo",
+        "Language_ki": "kikuju",
+        "Language_kj": "kwanyama",
+        "Language_kk": "kazachski",
+        "Language_kl": "grenlandzki",
+        "Language_km": "khmerski",
+        "Language_kn": "kannada",
+        "Language_ko": "koreański",
+        "Language_kr": "kanuri",
+        "Language_ks": "kaszmirski",
+        "Language_ku": "kurdyjski",
+        "Language_kv": "komi",
+        "Language_kw": "kornijski",
+        "Language_ky": "kirgiski",
+        "Language_la": "łaciński",
+        "Language_lb": "luksemburski",
+        "Language_lg": "ganda",
+        "Language_li": "limburgijski",
+        "Language_ln": "lingala",
+        "Language_lo": "laotański",
+        "Language_lt": "litewski",
+        "Language_lu": "luba-katanga",
+        "Language_lv": "łotewski",
+        "Language_mg": "malgaski",
+        "Language_mh": "marshall",
+        "Language_mi": "maoryjski",
+        "Language_mk": "macedoński",
+        "Language_ml": "malajalam",
+        "Language_mn": "mongolski",
+        "Language_mr": "marathi",
+        "Language_ms": "malajski",
+        "Language_mt": "maltański",
+        "Language_my": "birmański",
+        "Language_na": "nauru",
+        "Language_nb": "norweski Bokmål",
+        "Language_nd": "ndebele północny",
+        "Language_ne": "nepalski",
+        "Language_ng": "ndonga",
+        "Language_nl": "niderlandzki",
+        "Language_nn": "norweski Nynorsk",
+        "Language_no": "norweski",
+        "Language_nr": "ndebele południowy",
+        "Language_nv": "nawaho",
+        "Language_ny": "njandża",
+        "Language_oc": "prowansalski",
+        "Language_oj": "odżibwa",
+        "Language_om": "oromski",
+        "Language_or": "orija",
+        "Language_os": "osetyjski",
+        "Language_pa": "pendżabski",
+        "Language_pi": "palijski",
+        "Language_pl": "polski",
+        "Language_ps": "paszto",
+        "Language_pt": "portugalski",
+        "Language_qu": "keczua",
+        "Language_rm": "retoromański",
+        "Language_rn": "rundi",
+        "Language_ro": "rumuński",
+        "Language_ru": "rosyjski",
+        "Language_rw": "kinya-ruanda",
+        "Language_sa": "sanskryt",
+        "Language_sc": "sardyński",
+        "Language_sd": "sindhi",
+        "Language_se": "lapoński północny",
+        "Language_sg": "sango",
+        "Language_si": "syngaleski",
+        "Language_sk": "słowacki",
+        "Language_sl": "słoweński",
+        "Language_sm": "samoański",
+        "Language_sn": "szona",
+        "Language_so": "somalijski",
+        "Language_sq": "albański",
+        "Language_sr": "serbski",
+        "Language_ss": "siswati",
+        "Language_st": "sotho południowy",
+        "Language_su": "sundajski",
+        "Language_sv": "szwedzki",
+        "Language_sw": "suahili",
+        "Language_ta": "tamilski",
+        "Language_te": "telugu",
+        "Language_tg": "tadżycki",
+        "Language_th": "tajski",
+        "Language_ti": "tigrinia",
+        "Language_tk": "turkmeński",
+        "Language_tl": "tagalski",
+        "Language_tn": "setswana",
+        "Language_to": "tonga",
+        "Language_tr": "turecki",
+        "Language_ts": "tsonga",
+        "Language_tt": "tatarski",
+        "Language_tw": "twi",
+        "Language_ty": "tahitański",
+        "Language_ug": "ujgurski",
+        "Language_uk": "ukraiński",
+        "Language_ur": "urdu",
+        "Language_uz": "uzbecki",
+        "Language_ve": "venda",
+        "Language_vi": "wietnamski",
+        "Language_vo": "volapuk",
+        "Language_wa": "waloński",
+        "Language_wo": "wolof",
+        "Language_xh": "khosa",
+        "Language_yi": "jidysz",
+        "Language_yo": "joruba",
+        "Language_za": "czuang",
+        "Language_zh": "chiński",
+        "Language_zu": "zulu",
+        "LanguageCode": "Kod języka"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/pt-br.json b/plugins/UserLanguage/lang/pt-br.json
new file mode 100644
index 0000000000..dae4601280
--- /dev/null
+++ b/plugins/UserLanguage/lang/pt-br.json
@@ -0,0 +1,190 @@
+{
+    "UserLanguage": {
+        "BrowserLanguage": "Idioma do navegador",
+        "Language_aa": "afar",
+        "Language_ab": "abcázio",
+        "Language_ae": "avéstico",
+        "Language_af": "africâner",
+        "Language_ak": "akan",
+        "Language_am": "amárico",
+        "Language_an": "aragonês",
+        "Language_ar": "árabe",
+        "Language_as": "assamês",
+        "Language_av": "avaric",
+        "Language_ay": "aimara",
+        "Language_az": "azerbaijano",
+        "Language_ba": "bashkir",
+        "Language_be": "bielo-russo",
+        "Language_bg": "búlgaro",
+        "Language_bh": "biari",
+        "Language_bi": "bislamá",
+        "Language_bm": "bambara",
+        "Language_bn": "bengali",
+        "Language_bo": "tibetano",
+        "Language_br": "bretão",
+        "Language_bs": "bósnio",
+        "Language_ca": "catalão",
+        "Language_ce": "checheno",
+        "Language_ch": "chamorro",
+        "Language_co": "córsico",
+        "Language_cr": "cree",
+        "Language_cs": "tcheco",
+        "Language_cu": "eslavo eclesiástico",
+        "Language_cv": "chuvash",
+        "Language_cy": "galês",
+        "Language_da": "dinamarquês",
+        "Language_de": "alemão",
+        "Language_dv": "divehi",
+        "Language_dz": "dzonga",
+        "Language_ee": "eve",
+        "Language_el": "grego",
+        "Language_en": "inglês",
+        "Language_eo": "esperanto",
+        "Language_es": "espanhol",
+        "Language_et": "estoniano",
+        "Language_eu": "basco",
+        "Language_fa": "persa",
+        "Language_ff": "fula",
+        "Language_fi": "finlandês",
+        "Language_fj": "fijiano",
+        "Language_fo": "feroês",
+        "Language_fr": "francês",
+        "Language_fy": "frísio ocidental",
+        "Language_ga": "irlandês",
+        "Language_gd": "gaélico escocês",
+        "Language_gl": "galego",
+        "Language_gn": "guarani",
+        "Language_gu": "guzerate",
+        "Language_gv": "manx",
+        "Language_ha": "hauçá",
+        "Language_he": "hebraico",
+        "Language_hi": "híndi",
+        "Language_ho": "hiri motu",
+        "Language_hr": "croata",
+        "Language_ht": "haitiano",
+        "Language_hu": "húngaro",
+        "Language_hy": "armênio",
+        "Language_hz": "herero",
+        "Language_ia": "interlíngua",
+        "Language_id": "indonésio",
+        "Language_ie": "interlingue",
+        "Language_ig": "ibo",
+        "Language_ii": "sichuan yi",
+        "Language_ik": "inupiaque",
+        "Language_io": "ido",
+        "Language_is": "islandês",
+        "Language_it": "italiano",
+        "Language_iu": "inuktitut",
+        "Language_ja": "japonês",
+        "Language_jv": "javanês",
+        "Language_ka": "georgiano",
+        "Language_kg": "congolês",
+        "Language_ki": "quicuio",
+        "Language_kj": "kuanyama",
+        "Language_kk": "cazaque",
+        "Language_kl": "groenlandês",
+        "Language_km": "cmer",
+        "Language_kn": "canarês",
+        "Language_ko": "coreano",
+        "Language_kr": "canúri",
+        "Language_ks": "caxemira",
+        "Language_ku": "curdo",
+        "Language_kv": "komi",
+        "Language_kw": "córnico",
+        "Language_ky": "quirguiz",
+        "Language_la": "latim",
+        "Language_lb": "luxemburguês",
+        "Language_lg": "luganda",
+        "Language_li": "limburguês",
+        "Language_ln": "lingala",
+        "Language_lo": "laosiano",
+        "Language_lt": "lituano",
+        "Language_lu": "luba-catanga",
+        "Language_lv": "letão",
+        "Language_mg": "malgaxe",
+        "Language_mh": "marshalês",
+        "Language_mi": "maori",
+        "Language_mk": "macedônio",
+        "Language_ml": "malaiala",
+        "Language_mn": "mongol",
+        "Language_mr": "marata",
+        "Language_ms": "malaio",
+        "Language_mt": "maltês",
+        "Language_my": "birmanês",
+        "Language_na": "nauruano",
+        "Language_nb": "bokmål norueguês",
+        "Language_nd": "ndebele do norte",
+        "Language_ne": "nepali",
+        "Language_ng": "dongo",
+        "Language_nl": "holandês",
+        "Language_nn": "nynorsk norueguês",
+        "Language_no": "norueguês",
+        "Language_nr": "ndebele do sul",
+        "Language_nv": "navajo",
+        "Language_ny": "nianja",
+        "Language_oc": "occitânico",
+        "Language_oj": "ojibwa",
+        "Language_om": "oromo",
+        "Language_or": "oriya",
+        "Language_os": "ossetic",
+        "Language_pa": "panjabi",
+        "Language_pi": "páli",
+        "Language_pl": "polonês",
+        "Language_ps": "pashto",
+        "Language_pt": "português",
+        "Language_qu": "quíchua",
+        "Language_rm": "reto-romano",
+        "Language_rn": "rundi",
+        "Language_ro": "romeno",
+        "Language_ru": "russo",
+        "Language_rw": "kinyarwanda",
+        "Language_sa": "sânscrito",
+        "Language_sc": "sardo",
+        "Language_sd": "sindi",
+        "Language_se": "sami do norte",
+        "Language_sg": "sango",
+        "Language_si": "cingalês",
+        "Language_sk": "eslovaco",
+        "Language_sl": "esloveno",
+        "Language_sm": "samoano",
+        "Language_sn": "shona",
+        "Language_so": "somali",
+        "Language_sq": "albanês",
+        "Language_sr": "sérvio",
+        "Language_ss": "swati",
+        "Language_st": "soto do sul",
+        "Language_su": "sundanês",
+        "Language_sv": "sueco",
+        "Language_sw": "suaili",
+        "Language_ta": "tâmil",
+        "Language_te": "telugu",
+        "Language_tg": "tadjique",
+        "Language_th": "tailandês",
+        "Language_ti": "tigrínia",
+        "Language_tk": "turcomano",
+        "Language_tl": "tagalo",
+        "Language_tn": "tswana",
+        "Language_to": "tonganês",
+        "Language_tr": "turco",
+        "Language_ts": "tsonga",
+        "Language_tt": "tatar",
+        "Language_tw": "twi",
+        "Language_ty": "taitiano",
+        "Language_ug": "uighur",
+        "Language_uk": "ucraniano",
+        "Language_ur": "urdu",
+        "Language_uz": "usbeque",
+        "Language_ve": "venda",
+        "Language_vi": "vietnamita",
+        "Language_vo": "volapuque",
+        "Language_wa": "valão",
+        "Language_wo": "uólofe",
+        "Language_xh": "xosa",
+        "Language_yi": "iídiche",
+        "Language_yo": "ioruba",
+        "Language_za": "zhuang",
+        "Language_zh": "chinês",
+        "Language_zu": "zulu",
+        "LanguageCode": "Código do Idioma"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/pt.json b/plugins/UserLanguage/lang/pt.json
new file mode 100644
index 0000000000..7a0e0e8615
--- /dev/null
+++ b/plugins/UserLanguage/lang/pt.json
@@ -0,0 +1,189 @@
+{
+    "UserLanguage": {
+        "Language_aa": "afar",
+        "Language_ab": "abcázio",
+        "Language_ae": "avéstico",
+        "Language_af": "africâner",
+        "Language_ak": "akan",
+        "Language_am": "amárico",
+        "Language_an": "aragonês",
+        "Language_ar": "árabe",
+        "Language_as": "assamês",
+        "Language_av": "avaric",
+        "Language_ay": "aimara",
+        "Language_az": "azerbaijano",
+        "Language_ba": "bashkir",
+        "Language_be": "bielo-russo",
+        "Language_bg": "búlgaro",
+        "Language_bh": "biari",
+        "Language_bi": "bislamá",
+        "Language_bm": "bambara",
+        "Language_bn": "bengali",
+        "Language_bo": "tibetano",
+        "Language_br": "bretão",
+        "Language_bs": "bósnio",
+        "Language_ca": "catalão",
+        "Language_ce": "checheno",
+        "Language_ch": "chamorro",
+        "Language_co": "córsico",
+        "Language_cr": "cree",
+        "Language_cs": "tcheco",
+        "Language_cu": "eslavo eclesiástico",
+        "Language_cv": "chuvash",
+        "Language_cy": "galês",
+        "Language_da": "dinamarquês",
+        "Language_de": "alemão",
+        "Language_dv": "divehi",
+        "Language_dz": "dzonga",
+        "Language_ee": "eve",
+        "Language_el": "grego",
+        "Language_en": "inglês",
+        "Language_eo": "esperanto",
+        "Language_es": "espanhol",
+        "Language_et": "estoniano",
+        "Language_eu": "basco",
+        "Language_fa": "persa",
+        "Language_ff": "fula",
+        "Language_fi": "finlandês",
+        "Language_fj": "fijiano",
+        "Language_fo": "feroês",
+        "Language_fr": "francês",
+        "Language_fy": "frísio ocidental",
+        "Language_ga": "irlandês",
+        "Language_gd": "gaélico escocês",
+        "Language_gl": "galego",
+        "Language_gn": "guarani",
+        "Language_gu": "guzerate",
+        "Language_gv": "manx",
+        "Language_ha": "hauçá",
+        "Language_he": "hebraico",
+        "Language_hi": "híndi",
+        "Language_ho": "hiri motu",
+        "Language_hr": "croata",
+        "Language_ht": "haitiano",
+        "Language_hu": "húngaro",
+        "Language_hy": "armênio",
+        "Language_hz": "herero",
+        "Language_ia": "interlíngua",
+        "Language_id": "indonésio",
+        "Language_ie": "interlingue",
+        "Language_ig": "ibo",
+        "Language_ii": "sichuan yi",
+        "Language_ik": "inupiaque",
+        "Language_io": "ido",
+        "Language_is": "islandês",
+        "Language_it": "italiano",
+        "Language_iu": "inuktitut",
+        "Language_ja": "japonês",
+        "Language_jv": "javanês",
+        "Language_ka": "georgiano",
+        "Language_kg": "congolês",
+        "Language_ki": "quicuio",
+        "Language_kj": "kuanyama",
+        "Language_kk": "cazaque",
+        "Language_kl": "groenlandês",
+        "Language_km": "cmer",
+        "Language_kn": "canarês",
+        "Language_ko": "coreano",
+        "Language_kr": "canúri",
+        "Language_ks": "caxemira",
+        "Language_ku": "curdo",
+        "Language_kv": "komi",
+        "Language_kw": "córnico",
+        "Language_ky": "quirguiz",
+        "Language_la": "latim",
+        "Language_lb": "luxemburguês",
+        "Language_lg": "luganda",
+        "Language_li": "limburguês",
+        "Language_ln": "lingala",
+        "Language_lo": "laosiano",
+        "Language_lt": "lituano",
+        "Language_lu": "luba-catanga",
+        "Language_lv": "letão",
+        "Language_mg": "malgaxe",
+        "Language_mh": "marshalês",
+        "Language_mi": "maori",
+        "Language_mk": "macedônio",
+        "Language_ml": "malaiala",
+        "Language_mn": "mongol",
+        "Language_mr": "marata",
+        "Language_ms": "malaio",
+        "Language_mt": "maltês",
+        "Language_my": "birmanês",
+        "Language_na": "nauruano",
+        "Language_nb": "bokmål norueguês",
+        "Language_nd": "ndebele do norte",
+        "Language_ne": "nepali",
+        "Language_ng": "dongo",
+        "Language_nl": "holandês",
+        "Language_nn": "nynorsk norueguês",
+        "Language_no": "norueguês",
+        "Language_nr": "ndebele do sul",
+        "Language_nv": "navajo",
+        "Language_ny": "nianja",
+        "Language_oc": "occitânico",
+        "Language_oj": "ojibwa",
+        "Language_om": "oromo",
+        "Language_or": "oriya",
+        "Language_os": "ossetic",
+        "Language_pa": "panjabi",
+        "Language_pi": "páli",
+        "Language_pl": "polonês",
+        "Language_ps": "pashto",
+        "Language_pt": "português",
+        "Language_qu": "quíchua",
+        "Language_rm": "reto-romano",
+        "Language_rn": "rundi",
+        "Language_ro": "romeno",
+        "Language_ru": "russo",
+        "Language_rw": "kinyarwanda",
+        "Language_sa": "sânscrito",
+        "Language_sc": "sardo",
+        "Language_sd": "sindi",
+        "Language_se": "sami do norte",
+        "Language_sg": "sango",
+        "Language_si": "cingalês",
+        "Language_sk": "eslovaco",
+        "Language_sl": "esloveno",
+        "Language_sm": "samoano",
+        "Language_sn": "shona",
+        "Language_so": "somali",
+        "Language_sq": "albanês",
+        "Language_sr": "sérvio",
+        "Language_ss": "swati",
+        "Language_st": "soto do sul",
+        "Language_su": "sundanês",
+        "Language_sv": "sueco",
+        "Language_sw": "suaili",
+        "Language_ta": "tâmil",
+        "Language_te": "telugu",
+        "Language_tg": "tadjique",
+        "Language_th": "tailandês",
+        "Language_ti": "tigrínia",
+        "Language_tk": "turcomano",
+        "Language_tl": "tagalo",
+        "Language_tn": "tswana",
+        "Language_to": "tonganês",
+        "Language_tr": "turco",
+        "Language_ts": "tsonga",
+        "Language_tt": "tatar",
+        "Language_tw": "twi",
+        "Language_ty": "taitiano",
+        "Language_ug": "uighur",
+        "Language_uk": "ucraniano",
+        "Language_ur": "urdu",
+        "Language_uz": "usbeque",
+        "Language_ve": "venda",
+        "Language_vi": "vietnamita",
+        "Language_vo": "volapuque",
+        "Language_wa": "valão",
+        "Language_wo": "uólofe",
+        "Language_xh": "xosa",
+        "Language_yi": "iídiche",
+        "Language_yo": "ioruba",
+        "Language_za": "zhuang",
+        "Language_zh": "chinês",
+        "Language_zu": "zulu",
+        "LanguageCode": "Código do idioma"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/ro.json b/plugins/UserLanguage/lang/ro.json
new file mode 100644
index 0000000000..b6362e4267
--- /dev/null
+++ b/plugins/UserLanguage/lang/ro.json
@@ -0,0 +1,190 @@
+{
+    "UserLanguage": {
+        "BrowserLanguage": "Limba browser-ului",
+        "Language_aa": "Afar",
+        "Language_ab": "abhază",
+        "Language_ae": "avestană",
+        "Language_af": "afrikaans",
+        "Language_ak": "akan",
+        "Language_am": "amharică",
+        "Language_an": "aragoneză",
+        "Language_ar": "arabă",
+        "Language_as": "asameză",
+        "Language_av": "avară",
+        "Language_ay": "aymara",
+        "Language_az": "azeră",
+        "Language_ba": "bașkiră",
+        "Language_be": "bielorusă",
+        "Language_bg": "bulgară",
+        "Language_bh": "bihari",
+        "Language_bi": "bislama",
+        "Language_bm": "bambara",
+        "Language_bn": "bengaleză",
+        "Language_bo": "tibetană",
+        "Language_br": "bretonă",
+        "Language_bs": "bosniacă",
+        "Language_ca": "catalană",
+        "Language_ce": "cecenă",
+        "Language_ch": "chamorro",
+        "Language_co": "corsicană",
+        "Language_cr": "cree",
+        "Language_cs": "cehă",
+        "Language_cu": "slavonă",
+        "Language_cv": "ciuvașă",
+        "Language_cy": "velșă",
+        "Language_da": "daneză",
+        "Language_de": "germană",
+        "Language_dv": "divehi",
+        "Language_dz": "dzongkha",
+        "Language_ee": "ewe",
+        "Language_el": "greacă",
+        "Language_en": "engleză",
+        "Language_eo": "esperanto",
+        "Language_es": "spaniolă",
+        "Language_et": "estoniană",
+        "Language_eu": "bască",
+        "Language_fa": "persană",
+        "Language_ff": "fulah",
+        "Language_fi": "finlandeză",
+        "Language_fj": "fijiană",
+        "Language_fo": "faroeză",
+        "Language_fr": "franceză",
+        "Language_fy": "frizonă occidentală",
+        "Language_ga": "irlandeză",
+        "Language_gd": "gaelică scoțiană",
+        "Language_gl": "galiciană",
+        "Language_gn": "guarani",
+        "Language_gu": "gujarati",
+        "Language_gv": "manx",
+        "Language_ha": "hausa",
+        "Language_he": "ebraică",
+        "Language_hi": "hindi",
+        "Language_ho": "hiri motu",
+        "Language_hr": "croată",
+        "Language_ht": "haitiană",
+        "Language_hu": "maghiară",
+        "Language_hy": "armeană",
+        "Language_hz": "herero",
+        "Language_ia": "interlingua",
+        "Language_id": "indoneziană",
+        "Language_ie": "interlingue",
+        "Language_ig": "igbo",
+        "Language_ii": "sichuan yi",
+        "Language_ik": "inupiak",
+        "Language_io": "ido",
+        "Language_is": "islandeză",
+        "Language_it": "italiană",
+        "Language_iu": "inuktitut",
+        "Language_ja": "japoneză",
+        "Language_jv": "javaneză",
+        "Language_ka": "georgiană",
+        "Language_kg": "congoleză",
+        "Language_ki": "kikuyu",
+        "Language_kj": "kuanyama",
+        "Language_kk": "kazahă",
+        "Language_kl": "kalaallisut",
+        "Language_km": "khmeră",
+        "Language_kn": "kannada",
+        "Language_ko": "coreeană",
+        "Language_kr": "kanuri",
+        "Language_ks": "cașmireză",
+        "Language_ku": "kurdă",
+        "Language_kv": "komi",
+        "Language_kw": "cornică",
+        "Language_ky": "kîrgîză",
+        "Language_la": "latină",
+        "Language_lb": "luxemburgheză",
+        "Language_lg": "ganda",
+        "Language_li": "limburgheză",
+        "Language_ln": "lingala",
+        "Language_lo": "laoțiană",
+        "Language_lt": "lituaniană",
+        "Language_lu": "luba-katanga",
+        "Language_lv": "letonă",
+        "Language_mg": "malgașă",
+        "Language_mh": "marshalleză",
+        "Language_mi": "maori",
+        "Language_mk": "macedoneană",
+        "Language_ml": "malayalam",
+        "Language_mn": "mongolă",
+        "Language_mr": "marathi",
+        "Language_ms": "malay",
+        "Language_mt": "malteză",
+        "Language_my": "birmaneză",
+        "Language_na": "nauru",
+        "Language_nb": "norvegiana bokmål",
+        "Language_nd": "ndebele de nord",
+        "Language_ne": "nepaleză",
+        "Language_ng": "ndonga",
+        "Language_nl": "olandeză",
+        "Language_nn": "norvegiană nynorsk",
+        "Language_no": "norvegiană",
+        "Language_nr": "ndebele de sud",
+        "Language_nv": "navajo",
+        "Language_ny": "nyanja",
+        "Language_oc": "occitană",
+        "Language_oj": "ojibwa",
+        "Language_om": "oromo",
+        "Language_or": "oriya",
+        "Language_os": "osetă",
+        "Language_pa": "punjabi",
+        "Language_pi": "pali",
+        "Language_pl": "poloneză",
+        "Language_ps": "pașto",
+        "Language_pt": "portugheză",
+        "Language_qu": "quechua",
+        "Language_rm": "retoromană",
+        "Language_rn": "kirundi",
+        "Language_ro": "română",
+        "Language_ru": "rusă",
+        "Language_rw": "kinyarwanda",
+        "Language_sa": "sanscrită",
+        "Language_sc": "sardiniană",
+        "Language_sd": "sindhi",
+        "Language_se": "sami de nord",
+        "Language_sg": "sango",
+        "Language_si": "singaleză",
+        "Language_sk": "slovacă",
+        "Language_sl": "slovenă",
+        "Language_sm": "samoană",
+        "Language_sn": "shona",
+        "Language_so": "somaleză",
+        "Language_sq": "albaneză",
+        "Language_sr": "sârbă",
+        "Language_ss": "swati",
+        "Language_st": "sesotho",
+        "Language_su": "sundaneză",
+        "Language_sv": "suedeză",
+        "Language_sw": "swahili",
+        "Language_ta": "tamilă",
+        "Language_te": "telugu",
+        "Language_tg": "tadjică",
+        "Language_th": "thailandeză",
+        "Language_ti": "tigrinya",
+        "Language_tk": "turkmenă",
+        "Language_tl": "tagalog",
+        "Language_tn": "setswana",
+        "Language_to": "tonga",
+        "Language_tr": "turcă",
+        "Language_ts": "tsonga",
+        "Language_tt": "tătară",
+        "Language_tw": "twi",
+        "Language_ty": "tahitiană",
+        "Language_ug": "uigură",
+        "Language_uk": "ucraineană",
+        "Language_ur": "urdu",
+        "Language_uz": "uzbecă",
+        "Language_ve": "venda",
+        "Language_vi": "vietnameză",
+        "Language_vo": "volapuk",
+        "Language_wa": "valonă",
+        "Language_wo": "wolof",
+        "Language_xh": "xhosa",
+        "Language_yi": "idiș",
+        "Language_yo": "yoruba",
+        "Language_za": "zhuang",
+        "Language_zh": "chineză",
+        "Language_zu": "zulu",
+        "LanguageCode": "Cod limbă"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/ru.json b/plugins/UserLanguage/lang/ru.json
new file mode 100644
index 0000000000..7362daece6
--- /dev/null
+++ b/plugins/UserLanguage/lang/ru.json
@@ -0,0 +1,190 @@
+{
+    "UserLanguage": {
+        "BrowserLanguage": "Язык браузера",
+        "Language_aa": "афар",
+        "Language_ab": "абхазский",
+        "Language_ae": "авестийский",
+        "Language_af": "африкаанс",
+        "Language_ak": "акан",
+        "Language_am": "амхарский",
+        "Language_an": "арагонский",
+        "Language_ar": "арабский",
+        "Language_as": "ассамский",
+        "Language_av": "аварский",
+        "Language_ay": "аймара",
+        "Language_az": "азербайджанский",
+        "Language_ba": "башкирский",
+        "Language_be": "белорусский",
+        "Language_bg": "болгарский",
+        "Language_bh": "бихари",
+        "Language_bi": "бислама",
+        "Language_bm": "бамбарийский",
+        "Language_bn": "бенгальский",
+        "Language_bo": "тибетский",
+        "Language_br": "бретонский",
+        "Language_bs": "боснийский",
+        "Language_ca": "каталанский",
+        "Language_ce": "чеченский",
+        "Language_ch": "чаморро",
+        "Language_co": "корсиканский",
+        "Language_cr": "криийский",
+        "Language_cs": "чешский",
+        "Language_cu": "церковнославянский",
+        "Language_cv": "чувашский",
+        "Language_cy": "валлийский",
+        "Language_da": "датский",
+        "Language_de": "немецкий",
+        "Language_dv": "мальдивский",
+        "Language_dz": "дзонг-кэ",
+        "Language_ee": "эве",
+        "Language_el": "греческий",
+        "Language_en": "английский",
+        "Language_eo": "эсперанто",
+        "Language_es": "испанский",
+        "Language_et": "эстонский",
+        "Language_eu": "баскский",
+        "Language_fa": "персидский",
+        "Language_ff": "фулах",
+        "Language_fi": "финский",
+        "Language_fj": "фиджи",
+        "Language_fo": "фарерский",
+        "Language_fr": "французский",
+        "Language_fy": "фризский",
+        "Language_ga": "ирландский",
+        "Language_gd": "гэльский",
+        "Language_gl": "галисийский",
+        "Language_gn": "гуарани",
+        "Language_gu": "гуджарати",
+        "Language_gv": "мэнский",
+        "Language_ha": "хауса",
+        "Language_he": "иврит",
+        "Language_hi": "хинди",
+        "Language_ho": "хиримоту",
+        "Language_hr": "хорватский",
+        "Language_ht": "гаитянский",
+        "Language_hu": "венгерский",
+        "Language_hy": "армянский",
+        "Language_hz": "гереро",
+        "Language_ia": "интерлингва",
+        "Language_id": "индонезийский",
+        "Language_ie": "интерлингве",
+        "Language_ig": "игбо",
+        "Language_ii": "сычуань",
+        "Language_ik": "инупиак",
+        "Language_io": "идо",
+        "Language_is": "исландский",
+        "Language_it": "итальянский",
+        "Language_iu": "инуктитут",
+        "Language_ja": "японский",
+        "Language_jv": "яванский",
+        "Language_ka": "грузинский",
+        "Language_kg": "конго",
+        "Language_ki": "кикуйю",
+        "Language_kj": "кунама",
+        "Language_kk": "казахский",
+        "Language_kl": "эскимосский (гренландский)",
+        "Language_km": "кхмерский",
+        "Language_kn": "каннада",
+        "Language_ko": "корейский",
+        "Language_kr": "канури",
+        "Language_ks": "кашмири",
+        "Language_ku": "курдский",
+        "Language_kv": "коми",
+        "Language_kw": "корнийский",
+        "Language_ky": "киргизский",
+        "Language_la": "латинский",
+        "Language_lb": "люксембургский",
+        "Language_lg": "ганда",
+        "Language_li": "лимбургский",
+        "Language_ln": "лингала",
+        "Language_lo": "лаосский",
+        "Language_lt": "литовский",
+        "Language_lu": "луба-катанга",
+        "Language_lv": "латышский",
+        "Language_mg": "малагасийский",
+        "Language_mh": "маршалльский",
+        "Language_mi": "маори",
+        "Language_mk": "македонский",
+        "Language_ml": "малаялам",
+        "Language_mn": "монгольский",
+        "Language_mr": "маратхи",
+        "Language_ms": "малайский",
+        "Language_mt": "мальтийский",
+        "Language_my": "бирманский",
+        "Language_na": "науру",
+        "Language_nb": "норвежский букмол",
+        "Language_nd": "ндебели (северный)",
+        "Language_ne": "непальский",
+        "Language_ng": "ндонга",
+        "Language_nl": "голландский",
+        "Language_nn": "норвежский нюнорск",
+        "Language_no": "норвежский",
+        "Language_nr": "ндебели южный",
+        "Language_nv": "навахо",
+        "Language_ny": "ньянджа",
+        "Language_oc": "окситанский",
+        "Language_oj": "оджибва",
+        "Language_om": "оромо",
+        "Language_or": "ория",
+        "Language_os": "осетинский",
+        "Language_pa": "панджаби (пенджаби)",
+        "Language_pi": "пали",
+        "Language_pl": "польский",
+        "Language_ps": "пашто (пушту)",
+        "Language_pt": "португальский",
+        "Language_qu": "кечуа",
+        "Language_rm": "ретороманский",
+        "Language_rn": "рунди",
+        "Language_ro": "румынский",
+        "Language_ru": "русский",
+        "Language_rw": "киньяруанда",
+        "Language_sa": "санскрит",
+        "Language_sc": "сардинский",
+        "Language_sd": "синдхи",
+        "Language_se": "саамский (северный)",
+        "Language_sg": "санго",
+        "Language_si": "сингальский",
+        "Language_sk": "словацкий",
+        "Language_sl": "словенский",
+        "Language_sm": "самоанский",
+        "Language_sn": "шона",
+        "Language_so": "сомали",
+        "Language_sq": "албанский",
+        "Language_sr": "сербский",
+        "Language_ss": "свази",
+        "Language_st": "сото южный",
+        "Language_su": "сунданский",
+        "Language_sv": "шведский",
+        "Language_sw": "суахили",
+        "Language_ta": "тамильский",
+        "Language_te": "телугу",
+        "Language_tg": "таджикский",
+        "Language_th": "тайский",
+        "Language_ti": "тигринья",
+        "Language_tk": "туркменский",
+        "Language_tl": "тагалог",
+        "Language_tn": "тсвана",
+        "Language_to": "тонга",
+        "Language_tr": "турецкий",
+        "Language_ts": "тсонга",
+        "Language_tt": "татарский",
+        "Language_tw": "тви",
+        "Language_ty": "таитянский",
+        "Language_ug": "уйгурский",
+        "Language_uk": "украинский",
+        "Language_ur": "урду",
+        "Language_uz": "узбекский",
+        "Language_ve": "венда",
+        "Language_vi": "вьетнамский",
+        "Language_vo": "волапюк",
+        "Language_wa": "валлонский",
+        "Language_wo": "волоф",
+        "Language_xh": "ксоза",
+        "Language_yi": "идиш",
+        "Language_yo": "йоруба",
+        "Language_za": "чжуань",
+        "Language_zh": "китайский",
+        "Language_zu": "зулу",
+        "LanguageCode": "Код языка"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/sk.json b/plugins/UserLanguage/lang/sk.json
new file mode 100644
index 0000000000..eeefdc8545
--- /dev/null
+++ b/plugins/UserLanguage/lang/sk.json
@@ -0,0 +1,189 @@
+{
+    "UserLanguage": {
+        "Language_aa": "afarčina",
+        "Language_ab": "abcházština",
+        "Language_ae": "avestčina",
+        "Language_af": "afrikánčina",
+        "Language_ak": "akančina",
+        "Language_am": "amharčina",
+        "Language_an": "aragónčina",
+        "Language_ar": "arabčina",
+        "Language_as": "ásámčina",
+        "Language_av": "avarčina",
+        "Language_ay": "aymarčina",
+        "Language_az": "azerbajdžančina",
+        "Language_ba": "baskirčina",
+        "Language_be": "bieloruština",
+        "Language_bg": "bulharčina",
+        "Language_bh": "bihárske jazyky",
+        "Language_bi": "bislama",
+        "Language_bm": "bambarčina",
+        "Language_bn": "bengálčina",
+        "Language_bo": "tibetčina",
+        "Language_br": "bretónčina",
+        "Language_bs": "bosniačtina",
+        "Language_ca": "katalánčina",
+        "Language_ce": "čečenčina",
+        "Language_ch": "čamorčina",
+        "Language_co": "korzičtina",
+        "Language_cr": "krí",
+        "Language_cs": "čeština",
+        "Language_cu": "cirkevná slovančina",
+        "Language_cv": "čuvaština",
+        "Language_cy": "waleština",
+        "Language_da": "dánčina",
+        "Language_de": "nemčina",
+        "Language_dv": "divehi",
+        "Language_dz": "dzongkä",
+        "Language_ee": "eweština",
+        "Language_el": "gréčtina",
+        "Language_en": "angličtina",
+        "Language_eo": "esperanto",
+        "Language_es": "španielčina",
+        "Language_et": "estónčina",
+        "Language_eu": "baskičtina",
+        "Language_fa": "perzština",
+        "Language_ff": "fulbčina",
+        "Language_fi": "fínčina",
+        "Language_fj": "fidžijčina",
+        "Language_fo": "faerčina",
+        "Language_fr": "francúzština",
+        "Language_fy": "západná frízština",
+        "Language_ga": "írčina",
+        "Language_gd": "škótčina",
+        "Language_gl": "galícijčina",
+        "Language_gn": "guaraní",
+        "Language_gu": "gudžarátčina",
+        "Language_gv": "mančina",
+        "Language_ha": "hauština",
+        "Language_he": "hebrejčina",
+        "Language_hi": "hindčina",
+        "Language_ho": "hiri motu",
+        "Language_hr": "chorvátčina",
+        "Language_ht": "haitský",
+        "Language_hu": "maďarčina",
+        "Language_hy": "arménčina",
+        "Language_hz": "herero",
+        "Language_ia": "interlingua",
+        "Language_id": "indonézština",
+        "Language_ie": "interlingue",
+        "Language_ig": "igboština",
+        "Language_ii": "s’čchuanská ioština",
+        "Language_ik": "inupiaq",
+        "Language_io": "ido",
+        "Language_is": "islandčina",
+        "Language_it": "taliančina",
+        "Language_iu": "inuktitut",
+        "Language_ja": "japončina",
+        "Language_jv": "jávčina",
+        "Language_ka": "gruzínčina",
+        "Language_kg": "konžština",
+        "Language_ki": "kikuju",
+        "Language_kj": "kuaňama",
+        "Language_kk": "kazaština",
+        "Language_kl": "grónska eskimáčtina",
+        "Language_km": "kambodžská khmérčina",
+        "Language_kn": "kannadčina",
+        "Language_ko": "kórejčina",
+        "Language_kr": "kanurijčina",
+        "Language_ks": "kašmírčina",
+        "Language_ku": "kurdčina",
+        "Language_kv": "komijčina",
+        "Language_kw": "kornčina",
+        "Language_ky": "kirgizština",
+        "Language_la": "latinčina",
+        "Language_lb": "luxemburčina",
+        "Language_lg": "gandčina",
+        "Language_li": "limburčina",
+        "Language_ln": "lingalčina",
+        "Language_lo": "laoština",
+        "Language_lt": "litovčina",
+        "Language_lu": "luba-katanga",
+        "Language_lv": "lotyština",
+        "Language_mg": "malgaština",
+        "Language_mh": "kajin-majol",
+        "Language_mi": "maorijčina",
+        "Language_mk": "macedónčina",
+        "Language_ml": "malajálamčina",
+        "Language_mn": "mongolčina",
+        "Language_mr": "maráthčina",
+        "Language_ms": "malajčina",
+        "Language_mt": "maltčina",
+        "Language_my": "barmčina",
+        "Language_na": "nauru",
+        "Language_nb": "bokmål",
+        "Language_nd": "severné ndbele",
+        "Language_ne": "nepálčina",
+        "Language_ng": "ndonga",
+        "Language_nl": "holandčina",
+        "Language_nn": "nórsky nynorsk",
+        "Language_no": "nórčina",
+        "Language_nr": "južná ndebelčina",
+        "Language_nv": "navajo",
+        "Language_ny": "čewa",
+        "Language_oc": "okcitánčina",
+        "Language_oj": "odžibva",
+        "Language_om": "oromčina",
+        "Language_or": "uríjčina",
+        "Language_os": "osetčina",
+        "Language_pa": "pandžábčina",
+        "Language_pi": "pálí",
+        "Language_pl": "poľština",
+        "Language_ps": "paštúnčina",
+        "Language_pt": "portugalčina",
+        "Language_qu": "kečuánčina",
+        "Language_rm": "rétorománčina",
+        "Language_rn": "rundčina",
+        "Language_ro": "rumunčina",
+        "Language_ru": "ruština",
+        "Language_rw": "rwandčina",
+        "Language_sa": "sanskrit",
+        "Language_sc": "sardínčina",
+        "Language_sd": "sindhčina",
+        "Language_se": "severná saamčina",
+        "Language_sg": "sango",
+        "Language_si": "sinhalčina",
+        "Language_sk": "slovenčina",
+        "Language_sl": "slovinčina",
+        "Language_sm": "samojčina",
+        "Language_sn": "šončina",
+        "Language_so": "somálčina",
+        "Language_sq": "albánčina",
+        "Language_sr": "srbčina",
+        "Language_ss": "svazijčina",
+        "Language_st": "južná sothčina",
+        "Language_su": "sundčina",
+        "Language_sv": "švédčina",
+        "Language_sw": "swahilčina",
+        "Language_ta": "tamilčina",
+        "Language_te": "telugčina",
+        "Language_tg": "tadžičtina",
+        "Language_th": "thajčina",
+        "Language_ti": "tigrejčina",
+        "Language_tk": "turkménčina",
+        "Language_tl": "tagalčina",
+        "Language_tn": "tswančina",
+        "Language_to": "tonžtina",
+        "Language_tr": "turečtina",
+        "Language_ts": "tsonga",
+        "Language_tt": "tatárčina",
+        "Language_tw": "twi",
+        "Language_ty": "tahitčina",
+        "Language_ug": "ujgurčina",
+        "Language_uk": "ukrajinčina",
+        "Language_ur": "urdčina",
+        "Language_uz": "uzbečtina",
+        "Language_ve": "vendčina",
+        "Language_vi": "vietnamčina",
+        "Language_vo": "volapük",
+        "Language_wa": "valónčina",
+        "Language_wo": "wolof",
+        "Language_xh": "xhosa",
+        "Language_yi": "jidiš",
+        "Language_yo": "jorubčina",
+        "Language_za": "čuangčina",
+        "Language_zh": "čínština",
+        "Language_zu": "zuluština",
+        "LanguageCode": "Kód jazyka"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/sl.json b/plugins/UserLanguage/lang/sl.json
new file mode 100644
index 0000000000..6529bc25fa
--- /dev/null
+++ b/plugins/UserLanguage/lang/sl.json
@@ -0,0 +1,190 @@
+{
+    "UserLanguage": {
+        "BrowserLanguage": "Jezik brskalnika",
+        "Language_aa": "afarščina",
+        "Language_ab": "abhaščina",
+        "Language_ae": "avestijščina",
+        "Language_af": "afrikanščina",
+        "Language_ak": "akanščina",
+        "Language_am": "amharščina",
+        "Language_an": "aragonščina",
+        "Language_ar": "arabščina",
+        "Language_as": "asamščina",
+        "Language_av": "avarščina",
+        "Language_ay": "ajmarščina",
+        "Language_az": "azerbajdžanščina",
+        "Language_ba": "baškirščina",
+        "Language_be": "beloruščina",
+        "Language_bg": "bolgarščina",
+        "Language_bh": "biharščina",
+        "Language_bi": "bislamščina",
+        "Language_bm": "bambarščina",
+        "Language_bn": "bengalščina",
+        "Language_bo": "tibetanščina",
+        "Language_br": "bretonščina",
+        "Language_bs": "bosanščina",
+        "Language_ca": "katalonščina",
+        "Language_ce": "čečenščina",
+        "Language_ch": "čamorščina",
+        "Language_co": "korziščina",
+        "Language_cr": "krijščina",
+        "Language_cs": "češčina",
+        "Language_cu": "stara cerkvena slovanščina",
+        "Language_cv": "čuvaščina",
+        "Language_cy": "valižanščina",
+        "Language_da": "danščina",
+        "Language_de": "nemščina",
+        "Language_dv": "diveščina",
+        "Language_dz": "dzonka",
+        "Language_ee": "evenščina",
+        "Language_el": "grščina",
+        "Language_en": "angleščina",
+        "Language_eo": "esperanto",
+        "Language_es": "španščina",
+        "Language_et": "estonščina",
+        "Language_eu": "baskovščina",
+        "Language_fa": "perzijščina",
+        "Language_ff": "fulščina",
+        "Language_fi": "finščina",
+        "Language_fj": "fidžijščina",
+        "Language_fo": "ferščina",
+        "Language_fr": "francoščina",
+        "Language_fy": "frizijščina",
+        "Language_ga": "irščina",
+        "Language_gd": "škotska gelščina",
+        "Language_gl": "galicijščina",
+        "Language_gn": "gvaranijščina",
+        "Language_gu": "gudžaratščina",
+        "Language_gv": "manščina",
+        "Language_ha": "havščina",
+        "Language_he": "hebrejščina",
+        "Language_hi": "hindujščina",
+        "Language_ho": "hiri motu",
+        "Language_hr": "hrvaščina",
+        "Language_ht": "haitijska kreolščina",
+        "Language_hu": "madžarščina",
+        "Language_hy": "armenščina",
+        "Language_hz": "herero",
+        "Language_ia": "interlingva",
+        "Language_id": "indonezijščina",
+        "Language_ie": "interlingve",
+        "Language_ig": "igboščina",
+        "Language_ii": "ii",
+        "Language_ik": "inupiaščina",
+        "Language_io": "ido",
+        "Language_is": "islandščina",
+        "Language_it": "italijanščina",
+        "Language_iu": "inuktitutščina",
+        "Language_ja": "japonščina",
+        "Language_jv": "javanščina",
+        "Language_ka": "gruzinščina",
+        "Language_kg": "kongovščina",
+        "Language_ki": "kikujščina",
+        "Language_kj": "kvanjama",
+        "Language_kk": "kazaščina",
+        "Language_kl": "grenlandščina",
+        "Language_km": "kmerščina",
+        "Language_kn": "kanada",
+        "Language_ko": "korejščina",
+        "Language_kr": "kanurščina",
+        "Language_ks": "kašmirščina",
+        "Language_ku": "kurdščina",
+        "Language_kv": "komijščina",
+        "Language_kw": "kornijščina",
+        "Language_ky": "kirgiščina",
+        "Language_la": "latinščina",
+        "Language_lb": "luksemburščina",
+        "Language_lg": "ganda",
+        "Language_li": "limburščina",
+        "Language_ln": "lingala",
+        "Language_lo": "laoščina",
+        "Language_lt": "litovščina",
+        "Language_lu": "luba-katanga",
+        "Language_lv": "latvijščina",
+        "Language_mg": "malagaščina",
+        "Language_mh": "marshallovščina",
+        "Language_mi": "maorščina",
+        "Language_mk": "makedonščina",
+        "Language_ml": "malajalamščina",
+        "Language_mn": "mongolščina",
+        "Language_mr": "maratščina",
+        "Language_ms": "malajščina",
+        "Language_mt": "malteščina",
+        "Language_my": "burmanščina",
+        "Language_na": "naurujščina",
+        "Language_nb": "knjižna norveščina",
+        "Language_nd": "severna ndebelščina",
+        "Language_ne": "nepalščina",
+        "Language_ng": "ng",
+        "Language_nl": "nizozemščina",
+        "Language_nn": "novonorveščina",
+        "Language_no": "norveščina",
+        "Language_nr": "južna ndebelščina",
+        "Language_nv": "navajščina",
+        "Language_ny": "njanščina",
+        "Language_oc": "okcitanščina",
+        "Language_oj": "anašinabščina",
+        "Language_om": "oromo",
+        "Language_or": "orijščina",
+        "Language_os": "osetinščina",
+        "Language_pa": "pandžabščina",
+        "Language_pi": "palijščina",
+        "Language_pl": "poljščina",
+        "Language_ps": "paštu",
+        "Language_pt": "portugalščina",
+        "Language_qu": "kečuanščina",
+        "Language_rm": "retoromanščina",
+        "Language_rn": "rundščina",
+        "Language_ro": "romunščina",
+        "Language_ru": "ruščina",
+        "Language_rw": "ruandščina",
+        "Language_sa": "sanskrt",
+        "Language_sc": "sardinščina",
+        "Language_sd": "sindščina",
+        "Language_se": "severna samijščina",
+        "Language_sg": "sango",
+        "Language_si": "singalščina",
+        "Language_sk": "slovaščina",
+        "Language_sl": "slovenščina",
+        "Language_sm": "samoanščina",
+        "Language_sn": "šonščina",
+        "Language_so": "somalščina",
+        "Language_sq": "albanščina",
+        "Language_sr": "srbščina",
+        "Language_ss": "svazijščina",
+        "Language_st": "sesoto",
+        "Language_su": "sundanščina",
+        "Language_sv": "švedščina",
+        "Language_sw": "svahili",
+        "Language_ta": "tamilščina",
+        "Language_te": "telugijščina",
+        "Language_tg": "tadžiščina",
+        "Language_th": "tajščina",
+        "Language_ti": "tigrajščina",
+        "Language_tk": "turkmenščina",
+        "Language_tl": "tagalogščina",
+        "Language_tn": "cvanščina",
+        "Language_to": "tongščina",
+        "Language_tr": "turščina",
+        "Language_ts": "tsonga",
+        "Language_tt": "tatarščina",
+        "Language_tw": "tvi",
+        "Language_ty": "tahitščina",
+        "Language_ug": "ujgurščina",
+        "Language_uk": "ukrajinščina",
+        "Language_ur": "urdujščina",
+        "Language_uz": "uzbeščina",
+        "Language_ve": "venda",
+        "Language_vi": "vietnamščina",
+        "Language_vo": "volapuk",
+        "Language_wa": "valonščina",
+        "Language_wo": "volofščina",
+        "Language_xh": "xhosa",
+        "Language_yi": "jidiš",
+        "Language_yo": "jorubščina",
+        "Language_za": "za",
+        "Language_zh": "kitajščina",
+        "Language_zu": "zulujščina",
+        "LanguageCode": "Šifra jezika"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/sq.json b/plugins/UserLanguage/lang/sq.json
new file mode 100644
index 0000000000..e7c32170f2
--- /dev/null
+++ b/plugins/UserLanguage/lang/sq.json
@@ -0,0 +1,106 @@
+{
+    "UserLanguage": {
+        "Language_af": "Afrikanisht",
+        "Language_am": "Amharike",
+        "Language_ar": "Arabisht",
+        "Language_as": "Asamezisht",
+        "Language_az": "Azerbajxhanisht",
+        "Language_be": "Bjellorusisht",
+        "Language_bg": "Bullgarisht",
+        "Language_bh": "Bihari",
+        "Language_bn": "Bengalisht",
+        "Language_br": "Breton",
+        "Language_bs": "Boshnjakisht",
+        "Language_ca": "Katalonisht",
+        "Language_cs": "Çekisht",
+        "Language_cy": "Uellsisht",
+        "Language_da": "Danisht",
+        "Language_de": "Gjermanisht",
+        "Language_el": "Greqisht",
+        "Language_en": "Anglisht",
+        "Language_eo": "Esperanto",
+        "Language_es": "Spanjisht",
+        "Language_et": "Estonisht",
+        "Language_eu": "Baskisht",
+        "Language_fa": "Persisht",
+        "Language_fi": "Finlandisht",
+        "Language_fo": "Faroisht",
+        "Language_fr": "Frengjisht",
+        "Language_fy": "Frizianisht",
+        "Language_ga": "Irlandisht",
+        "Language_gd": "Galisht",
+        "Language_gl": "Galicianisht",
+        "Language_gn": "Guarani",
+        "Language_gu": "Guxharati",
+        "Language_he": "Hebraisht",
+        "Language_hi": "Hindi",
+        "Language_hr": "Kroatisht",
+        "Language_hu": "Hungarisht",
+        "Language_hy": "Armen",
+        "Language_ia": "Interlingua",
+        "Language_id": "Indonezisht",
+        "Language_ie": "Gjuha nderkombtare",
+        "Language_is": "Islandisht",
+        "Language_it": "Italisht",
+        "Language_ja": "Japanisht",
+        "Language_jv": "Javanisht",
+        "Language_ka": "Gjeorgjisht",
+        "Language_km": "Kamboxhiane",
+        "Language_kn": "Kanada",
+        "Language_ko": "Koreançe",
+        "Language_ku": "Kurd",
+        "Language_ky": "Kyrgyz",
+        "Language_la": "Latinisht",
+        "Language_ln": "Lingala",
+        "Language_lo": "Laosisht",
+        "Language_lt": "Lituanisht",
+        "Language_lv": "Letonisht",
+        "Language_mk": "Maqedonisht",
+        "Language_ml": "Malajalam",
+        "Language_mn": "Mongolisht",
+        "Language_mr": "Marati",
+        "Language_ms": "Malajzisht",
+        "Language_mt": "Maltisht",
+        "Language_ne": "Nepalisht",
+        "Language_nl": "Holandisht",
+        "Language_nn": "Norvegjisht (Nynorsk)",
+        "Language_no": "Norvegjisht",
+        "Language_oc": "Oksitanisht",
+        "Language_or": "Orija",
+        "Language_pa": "Punxhabi",
+        "Language_pl": "Polonisht",
+        "Language_ps": "Pashto",
+        "Language_pt": "Portugeze",
+        "Language_ro": "Rumanisht",
+        "Language_ru": "Rusisht",
+        "Language_sa": "Sanskritisht",
+        "Language_sd": "Si'ndi",
+        "Language_si": "Sinhalezisht",
+        "Language_sk": "Sllovakisht",
+        "Language_sl": "Sllovenisht",
+        "Language_so": "Somalisht",
+        "Language_sq": "shqipe",
+        "Language_sr": "Serbisht",
+        "Language_st": "Sesotho",
+        "Language_su": "Sundanisht",
+        "Language_sv": "Suedisht",
+        "Language_sw": "Suahilisht",
+        "Language_ta": "Tamil",
+        "Language_te": "Telugu",
+        "Language_th": "Tajlandisht",
+        "Language_ti": "Tigrinja",
+        "Language_tk": "Turk",
+        "Language_tr": "Turqisht",
+        "Language_tw": "Twi",
+        "Language_ug": "Ujgur",
+        "Language_uk": "Ukrainisht",
+        "Language_ur": "Urdu",
+        "Language_uz": "Uzbekistanisht",
+        "Language_vi": "Vietnamisht",
+        "Language_xh": "Xhosa",
+        "Language_yi": "Jiden",
+        "Language_zh": "Kineze",
+        "Language_zu": "Zulu",
+        "LanguageCode": "Kod Gjuhe"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/sr.json b/plugins/UserLanguage/lang/sr.json
new file mode 100644
index 0000000000..d967828998
--- /dev/null
+++ b/plugins/UserLanguage/lang/sr.json
@@ -0,0 +1,190 @@
+{
+    "UserLanguage": {
+        "BrowserLanguage": "Jezik brauzera",
+        "Language_aa": "Afar",
+        "Language_ab": "Abhazijski",
+        "Language_ae": "Avestan",
+        "Language_af": "Afrikans",
+        "Language_ak": "Akan",
+        "Language_am": "Amarik",
+        "Language_an": "Aragonesi",
+        "Language_ar": "Arapski",
+        "Language_as": "Asamesi",
+        "Language_av": "Avarski",
+        "Language_ay": "Ajmara",
+        "Language_az": "Azerbejdžanski",
+        "Language_ba": "Baškiri",
+        "Language_be": "Beloruski",
+        "Language_bg": "Bugarski",
+        "Language_bh": "Bihari",
+        "Language_bi": "Bislami",
+        "Language_bm": "Bambara",
+        "Language_bn": "Bengalski",
+        "Language_bo": "Tibetanski",
+        "Language_br": "Bretonski",
+        "Language_bs": "Bosanski",
+        "Language_ca": "Katalonski",
+        "Language_ce": "Čečenski",
+        "Language_ch": "Čamoro",
+        "Language_co": "Korzikanski",
+        "Language_cr": "Kri",
+        "Language_cs": "Češki",
+        "Language_cu": "Staroslovenski",
+        "Language_cv": "Čuvaši",
+        "Language_cy": "Velški",
+        "Language_da": "Danski",
+        "Language_de": "Nemački",
+        "Language_dv": "Divehi",
+        "Language_dz": "Džonga",
+        "Language_ee": "Ive",
+        "Language_el": "Grčki",
+        "Language_en": "Engleski",
+        "Language_eo": "Esperanto",
+        "Language_es": "Španski",
+        "Language_et": "Estonski",
+        "Language_eu": "Baskijski",
+        "Language_fa": "Persijski",
+        "Language_ff": "Fala",
+        "Language_fi": "Finski",
+        "Language_fj": "Fidži",
+        "Language_fo": "Farski",
+        "Language_fr": "Francuski",
+        "Language_fy": "Zapadni frizijski",
+        "Language_ga": "Irski",
+        "Language_gd": "Škotski keltski",
+        "Language_gl": "Galicijski",
+        "Language_gn": "Guarani",
+        "Language_gu": "Gujarati",
+        "Language_gv": "Manks",
+        "Language_ha": "Hauza",
+        "Language_he": "Hebrejski",
+        "Language_hi": "Hindi",
+        "Language_ho": "Hiri motu",
+        "Language_hr": "Hrvatski",
+        "Language_ht": "Haiti kreolski",
+        "Language_hu": "Mađarski",
+        "Language_hy": "Jermenski",
+        "Language_hz": "Herero",
+        "Language_ia": "Interlingva",
+        "Language_id": "Indonežanski",
+        "Language_ie": "Interlingve",
+        "Language_ig": "Igbo",
+        "Language_ii": "Sičuan ji",
+        "Language_ik": "Inupijaki",
+        "Language_io": "Ido",
+        "Language_is": "Islandski",
+        "Language_it": "Italijanski",
+        "Language_iu": "Inuktituti",
+        "Language_ja": "Japanski",
+        "Language_jv": "Javanski",
+        "Language_ka": "Gruzijski",
+        "Language_kg": "Kongo",
+        "Language_ki": "Kukuju",
+        "Language_kj": "Kvanjama",
+        "Language_kk": "Kazahstanski",
+        "Language_kl": "Grenlandski",
+        "Language_km": "Central kmerski",
+        "Language_kn": "Kanada",
+        "Language_ko": "Korejski",
+        "Language_kr": "Kanuri",
+        "Language_ks": "Kašmirski",
+        "Language_ku": "Kurdski",
+        "Language_kv": "Komi",
+        "Language_kw": "Korniš",
+        "Language_ky": "Kirgizijski",
+        "Language_la": "Latinski",
+        "Language_lb": "Luksemburški",
+        "Language_lg": "Ganda",
+        "Language_li": "Limburški",
+        "Language_ln": "Lingala",
+        "Language_lo": "Laoški",
+        "Language_lt": "Litvanski",
+        "Language_lu": "Luba-Katanga",
+        "Language_lv": "Letonski",
+        "Language_mg": "Malagasi",
+        "Language_mh": "Maršalski",
+        "Language_mi": "Maorski",
+        "Language_mk": "Makedonski",
+        "Language_ml": "Malajalam",
+        "Language_mn": "Mongolski",
+        "Language_mr": "Marati",
+        "Language_ms": "Maležanski",
+        "Language_mt": "Malteški",
+        "Language_my": "Burmanski",
+        "Language_na": "Nauru",
+        "Language_nb": "Bokma",
+        "Language_nd": "Severni ndebele",
+        "Language_ne": "Nepalski",
+        "Language_ng": "Ndonga",
+        "Language_nl": "Holandski",
+        "Language_nn": "Njorsk",
+        "Language_no": "Norveški",
+        "Language_nr": "Južni ndebele",
+        "Language_nv": "Navaho",
+        "Language_ny": "Čičeva",
+        "Language_oc": "Očitan",
+        "Language_oj": "Odžibva",
+        "Language_om": "Oroma",
+        "Language_or": "Orija",
+        "Language_os": "Osetijski",
+        "Language_pa": "Pundžabi",
+        "Language_pi": "Pali",
+        "Language_pl": "Poljski",
+        "Language_ps": "Pašto",
+        "Language_pt": "Portugalski",
+        "Language_qu": "Kečua",
+        "Language_rm": "Reto romans",
+        "Language_rn": "Rundi",
+        "Language_ro": "Rumunski",
+        "Language_ru": "Ruski",
+        "Language_rw": "Kinjarvanda",
+        "Language_sa": "Sanskrit",
+        "Language_sc": "Sardinijski",
+        "Language_sd": "Sindi",
+        "Language_se": "Severni Sami",
+        "Language_sg": "Sango",
+        "Language_si": "Sinala",
+        "Language_sk": "Slovački",
+        "Language_sl": "Slovenački",
+        "Language_sm": "Samoanski",
+        "Language_sn": "Šona",
+        "Language_so": "Somalijski",
+        "Language_sq": "Albanski",
+        "Language_sr": "Srpski",
+        "Language_ss": "Svati",
+        "Language_st": "Soto",
+        "Language_su": "Sudanski",
+        "Language_sv": "Švedski",
+        "Language_sw": "Svahili",
+        "Language_ta": "Tamilski",
+        "Language_te": "Telugu",
+        "Language_tg": "Tadžikistanski",
+        "Language_th": "Tajlandski",
+        "Language_ti": "Tigrinija",
+        "Language_tk": "Turkmenistanski",
+        "Language_tl": "Tagalog",
+        "Language_tn": "Cvana",
+        "Language_to": "Tonga",
+        "Language_tr": "Turski",
+        "Language_ts": "Conga",
+        "Language_tt": "Tatarski",
+        "Language_tw": "Tui",
+        "Language_ty": "Tahićanski",
+        "Language_ug": "Jigur",
+        "Language_uk": "Ukrajinski",
+        "Language_ur": "Urdu",
+        "Language_uz": "Uzbekistanski",
+        "Language_ve": "Venda",
+        "Language_vi": "Vijetnamski",
+        "Language_vo": "Volapik",
+        "Language_wa": "Valon",
+        "Language_wo": "Volof",
+        "Language_xh": "Ćoša",
+        "Language_yi": "Jidiš",
+        "Language_yo": "Joruba",
+        "Language_za": "Čueng",
+        "Language_zh": "Kineski",
+        "Language_zu": "Zulu",
+        "LanguageCode": "Kod jezika"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/sv.json b/plugins/UserLanguage/lang/sv.json
new file mode 100644
index 0000000000..6bdb8ab128
--- /dev/null
+++ b/plugins/UserLanguage/lang/sv.json
@@ -0,0 +1,190 @@
+{
+    "UserLanguage": {
+        "BrowserLanguage": "Webbläsarspråk",
+        "Language_aa": "Afar",
+        "Language_ab": "Abchaziska",
+        "Language_ae": "Avestiska",
+        "Language_af": "Afrikaans",
+        "Language_ak": "Akan",
+        "Language_am": "Amhariska",
+        "Language_an": "Aragonesiska",
+        "Language_ar": "Arabiska",
+        "Language_as": "Assamesiska",
+        "Language_av": "Avariska",
+        "Language_ay": "Ayamara",
+        "Language_az": "Azerbajdzjanska",
+        "Language_ba": "Basjkiriska",
+        "Language_be": "Vitryska",
+        "Language_bg": "Bulgariska",
+        "Language_bh": "Bihari",
+        "Language_bi": "Bislama",
+        "Language_bm": "Bambara",
+        "Language_bn": "Bengali",
+        "Language_bo": "Tibetanska",
+        "Language_br": "Bretonska",
+        "Language_bs": "Bosniska",
+        "Language_ca": "Katalanska",
+        "Language_ce": "Tjetjenska",
+        "Language_ch": "Chamorro",
+        "Language_co": "Korsikanska",
+        "Language_cr": "Cree",
+        "Language_cs": "Tjeckiska",
+        "Language_cu": "Kyrkslaviska",
+        "Language_cv": "Tjuvasjiska",
+        "Language_cy": "Kymriska",
+        "Language_da": "Danska",
+        "Language_de": "Tyska",
+        "Language_dv": "Divehi",
+        "Language_dz": "Dzongkha",
+        "Language_ee": "Ewe",
+        "Language_el": "Grekiska",
+        "Language_en": "Engelska",
+        "Language_eo": "Esperanto",
+        "Language_es": "Spanska",
+        "Language_et": "Estniska",
+        "Language_eu": "Baskiska",
+        "Language_fa": "Persiska",
+        "Language_ff": "Fulah",
+        "Language_fi": "Finska",
+        "Language_fj": "Fijianska",
+        "Language_fo": "Färöiska",
+        "Language_fr": "Franska",
+        "Language_fy": "Frisiska",
+        "Language_ga": "Iriska",
+        "Language_gd": "Gaeliska",
+        "Language_gl": "Galiciska",
+        "Language_gn": "Guarani",
+        "Language_gu": "Gujarati",
+        "Language_gv": "Manx",
+        "Language_ha": "Hausa",
+        "Language_he": "Hebreiska",
+        "Language_hi": "Hindi",
+        "Language_ho": "Hiri Motu",
+        "Language_hr": "Kroatiska",
+        "Language_ht": "Haitisk kreol",
+        "Language_hu": "Ungerska",
+        "Language_hy": "Armeniska",
+        "Language_hz": "Herero",
+        "Language_ia": "Interlingua",
+        "Language_id": "Indonesiska",
+        "Language_ie": "Interlingue",
+        "Language_ig": "Igbo",
+        "Language_ii": "Sichuan Yi",
+        "Language_ik": "Iñupiaq",
+        "Language_io": "Ido",
+        "Language_is": "Isländska",
+        "Language_it": "Italienska",
+        "Language_iu": "Inuktitut",
+        "Language_ja": "Japanska",
+        "Language_jv": "Javanesiska",
+        "Language_ka": "Georgiska",
+        "Language_kg": "Kongolesiska",
+        "Language_ki": "Kukuyu",
+        "Language_kj": "Kuanyama",
+        "Language_kk": "Kazakiska",
+        "Language_kl": "Grönländska",
+        "Language_km": "Kambodjanska",
+        "Language_kn": "Kannada",
+        "Language_ko": "Koreanska",
+        "Language_kr": "Kanuri",
+        "Language_ks": "Kashmiri",
+        "Language_ku": "Kurdiska",
+        "Language_kv": "Komi",
+        "Language_kw": "Cornish",
+        "Language_ky": "Kirgiziska",
+        "Language_la": "Latin",
+        "Language_lb": "Luxemburgiska",
+        "Language_lg": "Ganda",
+        "Language_li": "Limburgiska",
+        "Language_ln": "Lingala",
+        "Language_lo": "Laotiska",
+        "Language_lt": "Litauiska",
+        "Language_lu": "Luba-Katanga",
+        "Language_lv": "Lettiska",
+        "Language_mg": "Madagaskiska",
+        "Language_mh": "Marshallese",
+        "Language_mi": "Maori",
+        "Language_mk": "Makedonska",
+        "Language_ml": "Malayalam",
+        "Language_mn": "Mongoliska",
+        "Language_mr": "Marathi",
+        "Language_ms": "Malajiska",
+        "Language_mt": "Maltesiska",
+        "Language_my": "Burmesiska",
+        "Language_na": "Nauriska",
+        "Language_nb": "Norskt bokmål",
+        "Language_nd": "North Ndebele",
+        "Language_ne": "Nepali",
+        "Language_ng": "Ndonga",
+        "Language_nl": "Nederländska",
+        "Language_nn": "Nynorska",
+        "Language_no": "Norska",
+        "Language_nr": "South Ndebele",
+        "Language_nv": "Navajo",
+        "Language_ny": "Chichewa",
+        "Language_oc": "Occitanska",
+        "Language_oj": "Ojibwa",
+        "Language_om": "Oromo",
+        "Language_or": "Oriya",
+        "Language_os": "Ossetian",
+        "Language_pa": "Punjabi",
+        "Language_pi": "Pali",
+        "Language_pl": "Polska",
+        "Language_ps": "Pashto",
+        "Language_pt": "Portugisiska",
+        "Language_qu": "Quechua",
+        "Language_rm": "Rumantsch",
+        "Language_rn": "Kirundi",
+        "Language_ro": "Rumänska",
+        "Language_ru": "Ryska",
+        "Language_rw": "Kinyarwanda",
+        "Language_sa": "Sanskrit",
+        "Language_sc": "Sardiska",
+        "Language_sd": "Sindhi",
+        "Language_se": "Nordsamiska",
+        "Language_sg": "Sangho",
+        "Language_si": "Singalesiska",
+        "Language_sk": "Slovakiska",
+        "Language_sl": "Slovenska",
+        "Language_sm": "Samoanska",
+        "Language_sn": "Shona",
+        "Language_so": "Somaliska",
+        "Language_sq": "Albanska",
+        "Language_sr": "Serbiska",
+        "Language_ss": "Siswati",
+        "Language_st": "Sesotho",
+        "Language_su": "Sundanesiska",
+        "Language_sv": "Svenska",
+        "Language_sw": "Swahili",
+        "Language_ta": "Tamil",
+        "Language_te": "Telugu",
+        "Language_tg": "Tadzjikiska",
+        "Language_th": "Thailändska",
+        "Language_ti": "Tigrinja",
+        "Language_tk": "Turkmenska",
+        "Language_tl": "Tagalog",
+        "Language_tn": "Setswana",
+        "Language_to": "Tonganska",
+        "Language_tr": "Turkiska",
+        "Language_ts": "Tsonga",
+        "Language_tt": "Tatariska",
+        "Language_tw": "Twi",
+        "Language_ty": "Tahitiska",
+        "Language_ug": "Uiguriska",
+        "Language_uk": "Ukrainska",
+        "Language_ur": "Urdu",
+        "Language_uz": "Uzbekiska",
+        "Language_ve": "Venda",
+        "Language_vi": "Vietnamesiska",
+        "Language_vo": "Volapük",
+        "Language_wa": "Vallonska",
+        "Language_wo": "Wolof",
+        "Language_xh": "Xhosa",
+        "Language_yi": "Jiddisch",
+        "Language_yo": "Yoruba",
+        "Language_za": "Zhuang",
+        "Language_zh": "Kinesiska",
+        "Language_zu": "Zulu",
+        "LanguageCode": "Språkkod"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/ta.json b/plugins/UserLanguage/lang/ta.json
new file mode 100644
index 0000000000..4ecd3d9fb9
--- /dev/null
+++ b/plugins/UserLanguage/lang/ta.json
@@ -0,0 +1,188 @@
+{
+    "UserLanguage": {
+        "Language_aa": "அஃபார்",
+        "Language_ab": "அப்காஜியான்",
+        "Language_ae": "அவெஸ்தான்",
+        "Language_af": "ஆஃப்ரிகான்ஸ்",
+        "Language_ak": "அகான்",
+        "Language_am": "அம்ஹாரிக்",
+        "Language_an": "ஆர்கோனீஸ்",
+        "Language_ar": "அரபு",
+        "Language_as": "அஸ்ஸாமி",
+        "Language_av": "அவேரிக்",
+        "Language_ay": "அய்மரா",
+        "Language_az": "அசர்பாய்ஜானி",
+        "Language_ba": "பாஷ்கிர்",
+        "Language_be": "பைலோருஷ்ன்",
+        "Language_bg": "பல்கேரியன்",
+        "Language_bh": "பிஹாரி",
+        "Language_bi": "பிஸ்லாமா",
+        "Language_bm": "பம்பாரா",
+        "Language_bn": "வங்காளம்",
+        "Language_bo": "திபெத்து",
+        "Language_br": "பிரிடன்",
+        "Language_bs": "போஸ்னியன்",
+        "Language_ca": "காடலான்",
+        "Language_ce": "செசென்",
+        "Language_ch": "சாமோரோ",
+        "Language_co": "கார்சியன்",
+        "Language_cr": "க்ரீ",
+        "Language_cs": "செக்",
+        "Language_cu": "சர்ச் ஸ்லாவிக்",
+        "Language_cv": "சுவாஷ்",
+        "Language_cy": "வெல்ஷ்",
+        "Language_da": "டானிஷ்",
+        "Language_de": "ஜெர்மன்",
+        "Language_dv": "திவேஹி",
+        "Language_dz": "பூடானி",
+        "Language_ee": "ஈஓயே",
+        "Language_el": "கிரேக்கம்",
+        "Language_en": "ஆங்கிலம்",
+        "Language_eo": "எஸ்பரேன்டோ",
+        "Language_es": "ஸ்பேனிஷ்",
+        "Language_et": "எஸ்டோனியன்",
+        "Language_eu": "பஸ்க்",
+        "Language_fa": "பர்ஸியன்",
+        "Language_ff": "ஃபுலா",
+        "Language_fi": "பின்னிஷ்",
+        "Language_fj": "ஃபிஜி",
+        "Language_fo": "ஃபரிஸ்த்",
+        "Language_fr": "பிரெஞ்சு",
+        "Language_fy": "மேற்கத்திய பிரிஷிய",
+        "Language_ga": "ஐரிஷ்",
+        "Language_gd": "ஸ்காட்ஸ் கேலிக்",
+        "Language_gl": "காலிஸியன்",
+        "Language_gn": "குரானி",
+        "Language_gu": "குஜராத்தி",
+        "Language_gv": "மேங்க்ஸ்",
+        "Language_ha": "ஹௌஸா",
+        "Language_he": "ஹுப்ரு",
+        "Language_hi": "இந்தி",
+        "Language_ho": "ஹிரி மோட்டு",
+        "Language_hr": "கரோஷியன்",
+        "Language_ht": "ஹைத்தியன்",
+        "Language_hu": "ஹங்கேரியன்",
+        "Language_hy": "ஆர்மேனியன்",
+        "Language_hz": "ஹெரேரோ",
+        "Language_ia": "இன்டர்லிங்குவா",
+        "Language_id": "இந்தோனேஷியன்",
+        "Language_ie": "இன்டர்லிங்",
+        "Language_ig": "இக்போ",
+        "Language_ii": "சிசுவான் ஈ",
+        "Language_ik": "இனுபியாக்",
+        "Language_io": "இடோ",
+        "Language_is": "ஐஸ்லென்டிக்",
+        "Language_it": "இத்தாலியன்",
+        "Language_iu": "இனுகிடூட்",
+        "Language_ja": "ஜப்பானீஸ்",
+        "Language_jv": "ஜாவானீஸ்",
+        "Language_ka": "ஜியோர்ஜியன்",
+        "Language_kg": "காங்கோ",
+        "Language_ki": "கிகுயூ",
+        "Language_kj": "குவான்யாமா",
+        "Language_kk": "கசாக்",
+        "Language_kl": "கலாலிசூட்",
+        "Language_km": "கெமெர்",
+        "Language_kn": "கன்னடம்",
+        "Language_ko": "கொரியன்",
+        "Language_kr": "கனுரி",
+        "Language_ks": "காஷ்மிரி",
+        "Language_ku": "குர்திஷ்",
+        "Language_kv": "கோமி",
+        "Language_kw": "கார்னிஷ்",
+        "Language_ky": "கிர்கிஷ்",
+        "Language_la": "லத்தின்",
+        "Language_lb": "லக்க்ஷெம்பர்கிஷ்",
+        "Language_lg": "கான்டா",
+        "Language_li": "லிம்பர்கிஷ்",
+        "Language_ln": "லிங்காலா",
+        "Language_lo": "லோத்தியன்",
+        "Language_lt": "லிதுவேனியன்",
+        "Language_lu": "லுபா-கடாங்கா",
+        "Language_lv": "லேட்வியன்",
+        "Language_mg": "மலகாஸி",
+        "Language_mh": "மார்ஷெலிஷ்",
+        "Language_mi": "மௌரி",
+        "Language_mk": "மாஸிடோனியன்",
+        "Language_ml": "மலையாளம்",
+        "Language_mn": "மங்கோலியன்",
+        "Language_mr": "மராத்தி",
+        "Language_ms": "மலாய்",
+        "Language_mt": "மால்டிஸ்",
+        "Language_my": "பர்மிஸ்",
+        "Language_na": "நவ்ரூ",
+        "Language_nb": "நார்வே பொக்மால்",
+        "Language_nd": "வடக்கு தெபெலே",
+        "Language_ne": "நேபாளி",
+        "Language_ng": "தோங்கா",
+        "Language_nl": "டச்சு",
+        "Language_nn": "நார்வேஜியன் நியூநார்ஸ்க்",
+        "Language_no": "நார்வே",
+        "Language_nr": "தெற்கு தெபெலே",
+        "Language_nv": "நவாஜோ",
+        "Language_ny": "நயன்ஜா",
+        "Language_oc": "ஆகிடியன்",
+        "Language_oj": "ஓஜிபவா",
+        "Language_om": "ஒரோமோ",
+        "Language_or": "ஒரியா",
+        "Language_os": "ஒசெட்டிக்",
+        "Language_pa": "பஞ்சாபி",
+        "Language_pi": "பாலி",
+        "Language_pl": "போலிஷ்",
+        "Language_ps": "பாஷ்டோ",
+        "Language_pt": "போர்ச்சுக்கீஸ்",
+        "Language_qu": "கிவேசுவா",
+        "Language_rm": "ரைட்டோ-ரோமென்ஸ்",
+        "Language_rn": "ருண்டி",
+        "Language_ro": "ரோமேனியன்",
+        "Language_ru": "ரஷியன்",
+        "Language_rw": "கின்யாருவான்டா",
+        "Language_sa": "சமஸ்கிருதம்",
+        "Language_sc": "சாடினியன்",
+        "Language_sd": "சிந்தி",
+        "Language_se": "வடக்கு சாமி",
+        "Language_sg": "சாங்கோ",
+        "Language_si": "சிங்களம்",
+        "Language_sk": "ஸ்லோவாக்",
+        "Language_sl": "ஸ்லோவினேயின்",
+        "Language_sm": "ஸாமோவான்",
+        "Language_sn": "ஷோனா",
+        "Language_so": "சோமாலி",
+        "Language_sq": "அல்பெனியன்",
+        "Language_sr": "சர்பியன்",
+        "Language_ss": "ஸ்வாடீ",
+        "Language_st": "தெற்கு ஸோதோ",
+        "Language_su": "சுடானீஸ்",
+        "Language_sv": "ஷீவிடிஸ்",
+        "Language_sw": "சுவாஹிலி",
+        "Language_ta": "தமிழ்",
+        "Language_te": "தெலுங்கு",
+        "Language_tg": "தாஜிக்",
+        "Language_th": "தாய்",
+        "Language_ti": "டிக்ரின்யா",
+        "Language_tk": "டர்க்மென்",
+        "Language_tl": "டாகாலோக்",
+        "Language_tn": "ஸ்வானா",
+        "Language_to": "டோங்கா",
+        "Language_tr": "டர்கிஷ்",
+        "Language_ts": "ஸோங்கா",
+        "Language_tt": "டாடர்",
+        "Language_tw": "ட்வி",
+        "Language_ty": "டஹிதியான்",
+        "Language_ug": "யுகுர்",
+        "Language_uk": "உக்ரேனியன்",
+        "Language_ur": "உருது",
+        "Language_uz": "உஸ்பெக்",
+        "Language_ve": "வென்டா",
+        "Language_vi": "வியட்நாமிஸ்",
+        "Language_vo": "ஒலாபூக்",
+        "Language_wa": "ஒவாலூன்",
+        "Language_wo": "ஒலூஃப்",
+        "Language_xh": "ஹோஷா",
+        "Language_yi": "ஈத்திஷ",
+        "Language_yo": "யோருப்பா",
+        "Language_za": "ஜுவாங்",
+        "Language_zh": "சீனம்",
+        "Language_zu": "ஜூலூ"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/te.json b/plugins/UserLanguage/lang/te.json
new file mode 100644
index 0000000000..60380c9be4
--- /dev/null
+++ b/plugins/UserLanguage/lang/te.json
@@ -0,0 +1,189 @@
+{
+    "UserLanguage": {
+        "Language_aa": "అఫార్",
+        "Language_ab": "అబ్ఖాజియన్",
+        "Language_ae": "అవేస్టాన్",
+        "Language_af": "ఆఫ్రికాన్స్",
+        "Language_ak": "అకాన్",
+        "Language_am": "అమ్హారిక్",
+        "Language_an": "అరగోనిస్",
+        "Language_ar": "అరబిక్",
+        "Language_as": "అస్సామీస్",
+        "Language_av": "అవారిక్",
+        "Language_ay": "ఐమారా",
+        "Language_az": "అజర్బైజాని",
+        "Language_ba": "బష్కిర్",
+        "Language_be": "బెలరుశియన్",
+        "Language_bg": "బల్గేరియన్",
+        "Language_bh": "బిహారి",
+        "Language_bi": "బిస్లామా",
+        "Language_bm": "బంబారా",
+        "Language_bn": "బెంగాలి",
+        "Language_bo": "టిబెటన్",
+        "Language_br": "బ్రెటన్",
+        "Language_bs": "బాస్నియన్",
+        "Language_ca": "కెటలాన్",
+        "Language_ce": "చెచెన్",
+        "Language_ch": "చమర్రో",
+        "Language_co": "కార్సికన్",
+        "Language_cr": "క్రి",
+        "Language_cs": "చెక్",
+        "Language_cu": "చర్చ స్లావిక్",
+        "Language_cv": "చువాష్",
+        "Language_cy": "వెల్ష్",
+        "Language_da": "డేనిష్",
+        "Language_de": "ఙర్మన్",
+        "Language_dv": "దివేహి",
+        "Language_dz": "జొన్ఖా",
+        "Language_ee": "ఇవే",
+        "Language_el": "గ్రీక్",
+        "Language_en": "ఆంగ్లం",
+        "Language_eo": "ఎస్పరెన్టొ",
+        "Language_es": "స్పానిష్",
+        "Language_et": "ఈస్టొనియన్",
+        "Language_eu": "బాస్క్",
+        "Language_fa": "పర్షియన్",
+        "Language_ff": "ఫ్యుల",
+        "Language_fi": "ఫిన్నిష్",
+        "Language_fj": "ఫిజియన్",
+        "Language_fo": "ఫారొఈస్",
+        "Language_fr": "ఫ్రెంచ్",
+        "Language_fy": "పశ్చిమ ఫ్రిసియన్",
+        "Language_ga": "ఐరిష్",
+        "Language_gd": "స్కాటిష్ గేలిక్",
+        "Language_gl": "గెలిషియన్",
+        "Language_gn": "గురాని",
+        "Language_gu": "గుజరాతి",
+        "Language_gv": "మంకస్",
+        "Language_ha": "హౌసా",
+        "Language_he": "హీబ్రు",
+        "Language_hi": "హిందీ",
+        "Language_ho": "హిరి మోటు",
+        "Language_hr": "క్రొయెషియన్",
+        "Language_ht": "హైయేతియన్",
+        "Language_hu": "హన్గేరియన్",
+        "Language_hy": "ఆర్మేనియన్",
+        "Language_hz": "హిరేరో",
+        "Language_ia": "ఇంటర్లింగువా",
+        "Language_id": "ఇండోనిషియ",
+        "Language_ie": "ఇంటర్ లింగ్",
+        "Language_ig": "ఇగ్బో",
+        "Language_ii": "శిషువన్ ఈ",
+        "Language_ik": "ఇనూపైఏక్",
+        "Language_io": "ఈడౌ",
+        "Language_is": "ఐస్లాండిక్",
+        "Language_it": "ఇటాలియన్",
+        "Language_iu": "ఇనుక్టిటుట్",
+        "Language_ja": "జాపనీస్",
+        "Language_jv": "జావనీస్",
+        "Language_ka": "జార్జియన్",
+        "Language_kg": "కాంగో",
+        "Language_ki": "కికుయు",
+        "Language_kj": "క్వాన్యామ",
+        "Language_kk": "కాజాక్",
+        "Language_kl": "కలాల్లిసూట్",
+        "Language_km": "ఖమ్ర్",
+        "Language_kn": "కన్నడ",
+        "Language_ko": "కొరియన్",
+        "Language_kr": "కానురి",
+        "Language_ks": "కాశ్మీరి",
+        "Language_ku": "కర్డిష్",
+        "Language_kv": "కోమి",
+        "Language_kw": "కోర్నిష్",
+        "Language_ky": "కిర్గిజ్",
+        "Language_la": "లాటిన్",
+        "Language_lb": "లుక్సంబర్గిష్",
+        "Language_lg": "గాండా",
+        "Language_li": "లిమ్బర్గిష్",
+        "Language_ln": "లింగాల",
+        "Language_lo": "లాఓ",
+        "Language_lt": "లిథుయేనియన్",
+        "Language_lu": "లూబ-కటాంగ",
+        "Language_lv": "లాట్వియన్",
+        "Language_mg": "మాలాగసి",
+        "Language_mh": "మార్షలీస్",
+        "Language_mi": "మయోరి",
+        "Language_mk": "మసడోనియన్",
+        "Language_ml": "మలయాళం",
+        "Language_mn": "మంగోలియన్",
+        "Language_mr": "మరాటి",
+        "Language_ms": "మలేయ్",
+        "Language_mt": "మాల్టీస్",
+        "Language_my": "బర్మీస్",
+        "Language_na": "నౌరు",
+        "Language_nb": "నార్వీజియన్ బొక్మాల్",
+        "Language_nd": "ఉత్తర దెబెలె",
+        "Language_ne": "నేపాలి",
+        "Language_ng": "దోంగా",
+        "Language_nl": "డచ్",
+        "Language_nn": "నార్విజియాన్ న్యోర్స్క్",
+        "Language_no": "నార్విజియాన్",
+        "Language_nr": "దక్షిణ దెబెలె",
+        "Language_nv": "నవాహో",
+        "Language_ny": "న్యాన్జా",
+        "Language_oc": "ఆక్సిటాన్",
+        "Language_oj": "చేవా",
+        "Language_om": "ఒరోమో",
+        "Language_or": "ఒరియా",
+        "Language_os": "ఒసేటిక్",
+        "Language_pa": "పంజాబీ",
+        "Language_pi": "పాలీ",
+        "Language_pl": "పోలిష్",
+        "Language_ps": "పాష్టో",
+        "Language_pt": "పోర్చుగీస్",
+        "Language_qu": "కెషుయా",
+        "Language_rm": "ర్హెతో-రోమాన్స్",
+        "Language_rn": "రండి",
+        "Language_ro": "రోమానియన్",
+        "Language_ru": "రష్యన్",
+        "Language_rw": "కిన్యర్వాండా",
+        "Language_sa": "సంసృతం",
+        "Language_sc": "సార్డీనియన్",
+        "Language_sd": "సింధీ",
+        "Language_se": "ఉత్తర సామి",
+        "Language_sg": "సాంగో",
+        "Language_si": "సింహాల",
+        "Language_sk": "స్లోవాక్",
+        "Language_sl": "స్లోవేనియాన్",
+        "Language_sm": "సమోవన్",
+        "Language_sn": "షోన",
+        "Language_so": "సోమాలి",
+        "Language_sq": "అల్బేనియన్",
+        "Language_sr": "సెర్బియన్",
+        "Language_ss": "స్వాతి",
+        "Language_st": "దక్షిణ సోతో",
+        "Language_su": "సుడానీస్",
+        "Language_sv": "స్వీడిష్",
+        "Language_sw": "స్వాహిలి",
+        "Language_ta": "తమిళము",
+        "Language_te": "తెలుగు",
+        "Language_tg": "తాజిక్",
+        "Language_th": "థాయ్",
+        "Language_ti": "తిగ్రిన్యా",
+        "Language_tk": "తుర్కమెన్",
+        "Language_tl": "తగలోగ్",
+        "Language_tn": "సెటస్వానా",
+        "Language_to": "టోంగా",
+        "Language_tr": "టర్కిష్",
+        "Language_ts": "సోంగా",
+        "Language_tt": "టాటర్",
+        "Language_tw": "ట్వి",
+        "Language_ty": "తహితియన్",
+        "Language_ug": "ఉయ్ఘుర్",
+        "Language_uk": "యుక్రేనియాన్",
+        "Language_ur": "ఉర్దూ",
+        "Language_uz": "ఉజ్బెక్",
+        "Language_ve": "వెండా",
+        "Language_vi": "వియత్నామీస్",
+        "Language_vo": "వోలాపుక్",
+        "Language_wa": "వాలూన్",
+        "Language_wo": "వొలాఫ్",
+        "Language_xh": "షోసా",
+        "Language_yi": "యిడ్డిష్",
+        "Language_yo": "యోరుబా",
+        "Language_za": "జువాన్",
+        "Language_zh": "చైనీస్",
+        "Language_zu": "జూలూ",
+        "LanguageCode": "భాషా సంకేతం"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/th.json b/plugins/UserLanguage/lang/th.json
new file mode 100644
index 0000000000..a4a07a3c70
--- /dev/null
+++ b/plugins/UserLanguage/lang/th.json
@@ -0,0 +1,189 @@
+{
+    "UserLanguage": {
+        "Language_aa": "อะฟาร์",
+        "Language_ab": "อับคาซ",
+        "Language_ae": "อเวสตะ",
+        "Language_af": "แอฟริกานส์",
+        "Language_ak": "อาคัน",
+        "Language_am": "อัมฮารา",
+        "Language_an": "อารากอน",
+        "Language_ar": "อาหรับ",
+        "Language_as": "อัสสัม",
+        "Language_av": "อาวาร์",
+        "Language_ay": "ไอย์มารา",
+        "Language_az": "อาเซอร์ไบจาน",
+        "Language_ba": "บัชคีร์",
+        "Language_be": "เบลารุส",
+        "Language_bg": "บัลแกเรีย",
+        "Language_bh": "พิหาร",
+        "Language_bi": "บิสลามา",
+        "Language_bm": "บัมบารา",
+        "Language_bn": "เบงกาลี",
+        "Language_bo": "ทิเบต",
+        "Language_br": "เบรตัน",
+        "Language_bs": "บอสเนีย",
+        "Language_ca": "กาตาลัง",
+        "Language_ce": "เชเชน",
+        "Language_ch": "ชามอร์โร",
+        "Language_co": "คอร์ซิกา",
+        "Language_cr": "ครี",
+        "Language_cs": "เช็ก",
+        "Language_cu": "เชอร์ชสลาวิก",
+        "Language_cv": "ชูวัช",
+        "Language_cy": "เวลส์",
+        "Language_da": "เดนมาร์ก",
+        "Language_de": "เยอรมัน",
+        "Language_dv": "ธิเวหิ",
+        "Language_dz": "ซองคา",
+        "Language_ee": "เอเว",
+        "Language_el": "กรีก",
+        "Language_en": "อังกฤษ",
+        "Language_eo": "เอสเปอรันโต",
+        "Language_es": "สเปน",
+        "Language_et": "เอสโตเนีย",
+        "Language_eu": "บัสเก",
+        "Language_fa": "เปอร์เซีย",
+        "Language_ff": "ฟูลาฮ์",
+        "Language_fi": "ฟินแลนด์",
+        "Language_fj": "ฟิจิ",
+        "Language_fo": "แฟโร",
+        "Language_fr": "ฝรั่งเศส",
+        "Language_fy": "ฟริเซียนตะวันตก",
+        "Language_ga": "ไอริช",
+        "Language_gd": "สกอตส์กาลิก",
+        "Language_gl": "กาลิเซีย",
+        "Language_gn": "กวารานี",
+        "Language_gu": "คุชราต",
+        "Language_gv": "มานซ์",
+        "Language_ha": "เฮาชา",
+        "Language_he": "ฮิบรู",
+        "Language_hi": "ฮินดี",
+        "Language_ho": "ฮีรีโมตู",
+        "Language_hr": "โครเอเชีย",
+        "Language_ht": "เฮติ",
+        "Language_hu": "ฮังการี",
+        "Language_hy": "อาร์เมเนีย",
+        "Language_hz": "เฮเรโร",
+        "Language_ia": "อินเตอร์ลิงกัว",
+        "Language_id": "อินโดนีเชีย",
+        "Language_ie": "อินเตอร์ลิงกิว",
+        "Language_ig": "อิกโบ",
+        "Language_ii": "เสฉวนยิ",
+        "Language_ik": "อีนูเปียก",
+        "Language_io": "อีโด",
+        "Language_is": "ไอซ์แลนด์",
+        "Language_it": "อิตาลี",
+        "Language_iu": "อินุกติตุต",
+        "Language_ja": "ญี่ปุ่น",
+        "Language_jv": "ชวา",
+        "Language_ka": "จอร์เจีย",
+        "Language_kg": "คองโก",
+        "Language_ki": "กีกูยู",
+        "Language_kj": "กวนยามา",
+        "Language_kk": "คาซัค",
+        "Language_kl": "กรีนแลนด์",
+        "Language_km": "เขมร",
+        "Language_kn": "กันนาดา",
+        "Language_ko": "เกาหลี",
+        "Language_kr": "คานูรี",
+        "Language_ks": "กัศมีร์",
+        "Language_ku": "เคิร์ด",
+        "Language_kv": "โกมิ",
+        "Language_kw": "คอร์นิช",
+        "Language_ky": "คีร์กีซ",
+        "Language_la": "ละติน",
+        "Language_lb": "ลักเซมเบิร์ก",
+        "Language_lg": "ยูกันดา",
+        "Language_li": "ลิมเบิร์ก",
+        "Language_ln": "ลิงกาลา",
+        "Language_lo": "ลาว",
+        "Language_lt": "ลิทัวเนีย",
+        "Language_lu": "ลูบา-กาตองกา",
+        "Language_lv": "ลัตเวีย",
+        "Language_mg": "มาลากาซี",
+        "Language_mh": "มาร์แชลลิส",
+        "Language_mi": "เมารี",
+        "Language_mk": "มาซิโดเนีย",
+        "Language_ml": "มาลายาลัม",
+        "Language_mn": "มองโกเลีย",
+        "Language_mr": "มราฐี",
+        "Language_ms": "มาเลย์",
+        "Language_mt": "มอลตา",
+        "Language_my": "พม่า",
+        "Language_na": "นาอูรู",
+        "Language_nb": "นอร์เวย์บุคมอล",
+        "Language_nd": "เอ็นเดเบเลเหนือ",
+        "Language_ne": "เนปาล",
+        "Language_ng": "ดองกา",
+        "Language_nl": "ดัตช์",
+        "Language_nn": "นอร์เวย์นีนอสก์",
+        "Language_no": "นอร์เวย์",
+        "Language_nr": "เอ็นเดเบเลใต้",
+        "Language_nv": "นาวาโฮ",
+        "Language_ny": "เนียนจา",
+        "Language_oc": "อ็อกซิตัน",
+        "Language_oj": "โอจิบวา",
+        "Language_om": "โอโรโม",
+        "Language_or": "โอริยา",
+        "Language_os": "ออสเซเตีย",
+        "Language_pa": "ปัญจาบ",
+        "Language_pi": "บาลี",
+        "Language_pl": "โปแลนด์",
+        "Language_ps": "พาชตู",
+        "Language_pt": "โปรตุเกส",
+        "Language_qu": "ควิชัว",
+        "Language_rm": "เรโต-โรแมนซ์",
+        "Language_rn": "บุรุนดี",
+        "Language_ro": "โรมาเนีย",
+        "Language_ru": "รัสเซีย",
+        "Language_rw": "รวันดา",
+        "Language_sa": "สันสกฤต",
+        "Language_sc": "ซาร์เดญา",
+        "Language_sd": "สินธุ",
+        "Language_se": "ซามิเหนือ",
+        "Language_sg": "แซงโก",
+        "Language_si": "สิงหล",
+        "Language_sk": "สโลวัก",
+        "Language_sl": "สโลวีเนีย",
+        "Language_sm": "ซามัว",
+        "Language_sn": "โชนา",
+        "Language_so": "โซมาลี",
+        "Language_sq": "แอลเบเนีย",
+        "Language_sr": "เซอร์เบีย",
+        "Language_ss": "สวาติ",
+        "Language_st": "โซโทใต้",
+        "Language_su": "ซุนดา",
+        "Language_sv": "สวีเดน",
+        "Language_sw": "สวาฮีลี",
+        "Language_ta": "ทมิฬ",
+        "Language_te": "เตลูกู",
+        "Language_tg": "ทาจิก",
+        "Language_th": "ไทย",
+        "Language_ti": "ติกริญญา",
+        "Language_tk": "เติร์กเมนิสถาน",
+        "Language_tl": "ตากาล็อก",
+        "Language_tn": "บอตสวานา",
+        "Language_to": "ตองกา",
+        "Language_tr": "ตุรกี",
+        "Language_ts": "ซิิตซองกา",
+        "Language_tt": "ตาตาร์",
+        "Language_tw": "ทวิ",
+        "Language_ty": "ตาฮิตี",
+        "Language_ug": "อุยกัว",
+        "Language_uk": "ยูเครน",
+        "Language_ur": "อูรดู",
+        "Language_uz": "อุซเบก",
+        "Language_ve": "เวนดา",
+        "Language_vi": "เวียดนาม",
+        "Language_vo": "โวลาพึค",
+        "Language_wa": "วาโลนี",
+        "Language_wo": "โวลอฟ",
+        "Language_xh": "คะห์โอซา",
+        "Language_yi": "ยิว",
+        "Language_yo": "โยรูบา",
+        "Language_za": "จ้วง",
+        "Language_zh": "จีน",
+        "Language_zu": "ซูลู",
+        "LanguageCode": "รหัสภาษา"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/tl.json b/plugins/UserLanguage/lang/tl.json
new file mode 100644
index 0000000000..96d6d77148
--- /dev/null
+++ b/plugins/UserLanguage/lang/tl.json
@@ -0,0 +1,189 @@
+{
+    "UserLanguage": {
+        "BrowserLanguage": "wika ng browser",
+        "Language_aa": "Afar",
+        "Language_ab": "Abkhazian",
+        "Language_ae": "Avestan",
+        "Language_af": "Aprikaans",
+        "Language_ak": "Akan",
+        "Language_am": "Amharic",
+        "Language_an": "Aragonese",
+        "Language_ar": "Arabe",
+        "Language_as": "Assamese",
+        "Language_av": "Avaric",
+        "Language_ay": "Aymara",
+        "Language_az": "Azerbaijani",
+        "Language_ba": "Bashkir",
+        "Language_be": "Belarusian",
+        "Language_bg": "Bulgarian",
+        "Language_bh": "Bihari",
+        "Language_bi": "Bislama",
+        "Language_bm": "Bambara",
+        "Language_bn": "Bengali",
+        "Language_bo": "Tibet",
+        "Language_br": "Breton",
+        "Language_bs": "Bosnian",
+        "Language_ca": "Katalan",
+        "Language_ce": "Chechen",
+        "Language_ch": "Chamorro",
+        "Language_co": "Cosican",
+        "Language_cr": "Cree",
+        "Language_cs": "Tsek",
+        "Language_cu": "Iglesia ng Eslabo",
+        "Language_cv": "Tsubas",
+        "Language_cy": "Welsh",
+        "Language_da": "Danish",
+        "Language_de": "Aleman",
+        "Language_dv": "Divehi",
+        "Language_dz": "Dzongka",
+        "Language_ee": "Ewe",
+        "Language_el": "Griyego",
+        "Language_en": "Ingles",
+        "Language_eo": "Esperanto",
+        "Language_es": "Espanyol",
+        "Language_et": "taga-Estonya",
+        "Language_eu": "Basko",
+        "Language_fa": "Persyano",
+        "Language_ff": "Fulah",
+        "Language_fi": "Finnish",
+        "Language_fj": "Fijian",
+        "Language_fo": "Faroese",
+        "Language_fr": "Pranses",
+        "Language_fy": "Western Frisian",
+        "Language_ga": "Irlandes",
+        "Language_gd": "Scottish Gaelic",
+        "Language_gl": "Galician",
+        "Language_gn": "Guarani",
+        "Language_gu": "Gujarati",
+        "Language_gv": "Manx",
+        "Language_ha": "Hausa",
+        "Language_he": "Hebrew",
+        "Language_hi": "Hindi",
+        "Language_ho": "Hiri Motu",
+        "Language_hr": "Kroatyano",
+        "Language_ht": "Haitian Creole",
+        "Language_hu": "Hanggaryan",
+        "Language_hy": "Armenyo",
+        "Language_hz": "Herero",
+        "Language_ia": "Interlingua",
+        "Language_id": "Indonesiyo",
+        "Language_ie": "Interlingue",
+        "Language_ii": "Sichuan Yi",
+        "Language_ik": "Inupiaq",
+        "Language_io": "Ido",
+        "Language_is": "Icelandic",
+        "Language_it": "Italyano",
+        "Language_iu": "Inuktitut",
+        "Language_ja": "Nippongo",
+        "Language_jv": "Javanese",
+        "Language_ka": "taga-Georgia",
+        "Language_kg": "Kongo",
+        "Language_ki": "Kukuyu",
+        "Language_kj": "Kuanyama",
+        "Language_kk": "Kasak",
+        "Language_kl": "Greenlandic",
+        "Language_km": "Central Khmer",
+        "Language_kn": "Kannada",
+        "Language_ko": "Koreano",
+        "Language_kr": "Kanuri",
+        "Language_ks": "Kashmiri",
+        "Language_ku": "Kurdish",
+        "Language_kv": "Komi",
+        "Language_kw": "Cornish",
+        "Language_ky": "Kirgis",
+        "Language_la": "Latin",
+        "Language_lb": "Luxembourgish",
+        "Language_lg": "Ganda",
+        "Language_li": "Limburgish",
+        "Language_ln": "Lingala",
+        "Language_lo": "Lao",
+        "Language_lt": "Lithuanian",
+        "Language_lu": "Luba-Katanga",
+        "Language_lv": "Latvian",
+        "Language_mg": "Malagasi",
+        "Language_mh": "Marshallese",
+        "Language_mi": "Maori",
+        "Language_mk": "Masidoniyan",
+        "Language_ml": "Malayalam",
+        "Language_mn": "Monggolyan",
+        "Language_mr": "Marathi",
+        "Language_ms": "Malay",
+        "Language_mt": "Maltis",
+        "Language_my": "Burmese",
+        "Language_na": "Nauru",
+        "Language_nb": "Norwegian Bokmål",
+        "Language_nd": "North Ndebele",
+        "Language_ne": "Nepali",
+        "Language_ng": "Ndonga",
+        "Language_nl": "Olandes",
+        "Language_nn": "Norwegian Nynorsk",
+        "Language_no": "Norwegian",
+        "Language_nr": "South Ndebele",
+        "Language_nv": "Navajo",
+        "Language_ny": "Chichewa",
+        "Language_oc": "Occitan",
+        "Language_oj": "Ojibwa",
+        "Language_om": "Oroma",
+        "Language_or": "Oriya",
+        "Language_os": "Osit",
+        "Language_pa": "Panjabi",
+        "Language_pi": "Pali",
+        "Language_pl": "Polish",
+        "Language_ps": "Pashto",
+        "Language_pt": "Portuguese",
+        "Language_qu": "Quechua",
+        "Language_rm": "Raeto-Romance",
+        "Language_rn": "Rundi",
+        "Language_ro": "Romano",
+        "Language_ru": "Ruso",
+        "Language_rw": "Kinyarwanda",
+        "Language_sa": "Sanskrit",
+        "Language_sc": "Sardiniyan",
+        "Language_sd": "Sindhi",
+        "Language_se": "Northern Sami",
+        "Language_sg": "Sango",
+        "Language_si": "Sinhala",
+        "Language_sk": "Eslobako",
+        "Language_sl": "Eslobenyan",
+        "Language_sm": "Samoan",
+        "Language_sn": "Shona",
+        "Language_so": "Somali",
+        "Language_sq": "Albanes",
+        "Language_sr": "Serbyan",
+        "Language_ss": "Swati",
+        "Language_st": "Sotho",
+        "Language_su": "Sundanese",
+        "Language_sv": "Suweko",
+        "Language_sw": "Swahili",
+        "Language_ta": "Tamil",
+        "Language_te": "Telugu",
+        "Language_tg": "Tadyiko",
+        "Language_th": "Thai",
+        "Language_ti": "Tigrinya",
+        "Language_tk": "Turkmen",
+        "Language_tl": "Tagalog",
+        "Language_tn": "Tswana",
+        "Language_to": "Tonga",
+        "Language_tr": "Turko",
+        "Language_ts": "Tsonga",
+        "Language_tt": "Tartaro",
+        "Language_tw": "Twi",
+        "Language_ty": "Tahitian",
+        "Language_ug": "Uighur",
+        "Language_uk": "Ukranian",
+        "Language_ur": "Urdu",
+        "Language_uz": "Usbek",
+        "Language_ve": "Venda",
+        "Language_vi": "Vietnamese",
+        "Language_vo": "Volapuk",
+        "Language_wa": "Walloon",
+        "Language_wo": "Wolof",
+        "Language_xh": "Xhosa",
+        "Language_yi": "Yidish",
+        "Language_yo": "Yoruba",
+        "Language_za": "Chuang",
+        "Language_zh": "Tsino",
+        "Language_zu": "Zulu",
+        "LanguageCode": "wika ng code"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/tr.json b/plugins/UserLanguage/lang/tr.json
new file mode 100644
index 0000000000..79ae6fc82a
--- /dev/null
+++ b/plugins/UserLanguage/lang/tr.json
@@ -0,0 +1,189 @@
+{
+    "UserLanguage": {
+        "Language_aa": "Afar",
+        "Language_ab": "Abazca",
+        "Language_ae": "Avestçe",
+        "Language_af": "Afrikaan Dili",
+        "Language_ak": "Akan",
+        "Language_am": "Amharca",
+        "Language_an": "Aragonca",
+        "Language_ar": "Arapça",
+        "Language_as": "Assamca",
+        "Language_av": "Avar Dili",
+        "Language_ay": "Aymara",
+        "Language_az": "Azerice",
+        "Language_ba": "Başkırtça",
+        "Language_be": "Beyaz Rusça",
+        "Language_bg": "Bulgarca",
+        "Language_bh": "Bihari",
+        "Language_bi": "Bislama",
+        "Language_bm": "Bambara",
+        "Language_bn": "Bengalce",
+        "Language_bo": "Tibetçe",
+        "Language_br": "Bretonca",
+        "Language_bs": "Boşnakça",
+        "Language_ca": "Katalanca",
+        "Language_ce": "Çeçence",
+        "Language_ch": "Chamorro",
+        "Language_co": "Korsikaca",
+        "Language_cr": "Cree",
+        "Language_cs": "Çekçe",
+        "Language_cu": "Kilise Slavcası",
+        "Language_cv": "Çuvaşça",
+        "Language_cy": "Galce",
+        "Language_da": "Danca",
+        "Language_de": "Almanca",
+        "Language_dv": "Divehi",
+        "Language_dz": "Butan Dili",
+        "Language_ee": "Ewe",
+        "Language_el": "Yunanca",
+        "Language_en": "İngilizce",
+        "Language_eo": "Esperanto",
+        "Language_es": "İspanyolca",
+        "Language_et": "Estonya Dili",
+        "Language_eu": "Baskça",
+        "Language_fa": "Farsça",
+        "Language_ff": "Fulah",
+        "Language_fi": "Fince",
+        "Language_fj": "Fiji Dili",
+        "Language_fo": "Faroe Dili",
+        "Language_fr": "Fransızca",
+        "Language_fy": "Batı Frizcesi",
+        "Language_ga": "İrlanda Dili",
+        "Language_gd": "İskoç Gal Dili",
+        "Language_gl": "Galiçyaca",
+        "Language_gn": "Guarani",
+        "Language_gu": "Gujarati",
+        "Language_gv": "Manks",
+        "Language_ha": "Hausa",
+        "Language_he": "İbranice",
+        "Language_hi": "Hintçe",
+        "Language_ho": "Hiri Motu",
+        "Language_hr": "Hırvatça",
+        "Language_ht": "Haiti Dili",
+        "Language_hu": "Macarca",
+        "Language_hy": "Ermenice",
+        "Language_hz": "Herero",
+        "Language_ia": "Interlingua",
+        "Language_id": "Endonezce",
+        "Language_ie": "Interlingue",
+        "Language_ig": "İbo Dili",
+        "Language_ii": "Sichuan Yi",
+        "Language_ik": "Inupiak",
+        "Language_io": "Ido",
+        "Language_is": "İzlandaca",
+        "Language_it": "İtalyanca",
+        "Language_iu": "Inuktitut",
+        "Language_ja": "Japonca",
+        "Language_jv": "Cava Dili",
+        "Language_ka": "Gürcüce",
+        "Language_kg": "Kongo",
+        "Language_ki": "Kikuyu",
+        "Language_kj": "Kuanyama",
+        "Language_kk": "Kazakça",
+        "Language_kl": "Grönland Dili",
+        "Language_km": "Kamboçya Dili",
+        "Language_kn": "Kannada",
+        "Language_ko": "Korece",
+        "Language_kr": "Kanuri",
+        "Language_ks": "Keşmirce",
+        "Language_ku": "Kürtçe",
+        "Language_kv": "Komi",
+        "Language_kw": "Kernevekçe",
+        "Language_ky": "Kırgızca",
+        "Language_la": "Latince",
+        "Language_lb": "Lüksemburgca",
+        "Language_lg": "Ganda",
+        "Language_li": "Limburgca",
+        "Language_ln": "Lingala",
+        "Language_lo": "Laos Dili",
+        "Language_lt": "Litvanyaca",
+        "Language_lu": "Luba-Katanga",
+        "Language_lv": "Letonca",
+        "Language_mg": "Malagasi",
+        "Language_mh": "Marshall Adaları Dili",
+        "Language_mi": "Maori",
+        "Language_mk": "Makedonca",
+        "Language_ml": "Malayalam",
+        "Language_mn": "Moğolca",
+        "Language_mr": "Marathi",
+        "Language_ms": "Malay",
+        "Language_mt": "Malta Dili",
+        "Language_my": "Birmanya Dili",
+        "Language_na": "Nauru Dili",
+        "Language_nb": "Norveççe Bokmål",
+        "Language_nd": "Kuzey Ndebele",
+        "Language_ne": "Nepalce",
+        "Language_ng": "Ndonga",
+        "Language_nl": "Hollanda Dili",
+        "Language_nn": "Norveççe Nynorsk",
+        "Language_no": "Norveççe",
+        "Language_nr": "Güney Ndebele",
+        "Language_nv": "Navaho Dili",
+        "Language_ny": "Nyanja",
+        "Language_oc": "Oksitanca",
+        "Language_oj": "Ojibva Dili",
+        "Language_om": "Oromo",
+        "Language_or": "Oriya",
+        "Language_os": "Osetçe",
+        "Language_pa": "Pencap Dili",
+        "Language_pi": "Pali",
+        "Language_pl": "Lehçe",
+        "Language_ps": "Peştuca",
+        "Language_pt": "Portekizce",
+        "Language_qu": "Quechua",
+        "Language_rm": "Rhaeto-Roman Dili",
+        "Language_rn": "Kirundi",
+        "Language_ro": "Romence",
+        "Language_ru": "Rusça",
+        "Language_rw": "Kinyarwanda",
+        "Language_sa": "Sanskritçe",
+        "Language_sc": "Sardunya Dili",
+        "Language_sd": "Sindhi",
+        "Language_se": "Kuzey Sami",
+        "Language_sg": "Sangho",
+        "Language_si": "Seylanca",
+        "Language_sk": "Slovakça",
+        "Language_sl": "Slovence",
+        "Language_sm": "Samoa Dili",
+        "Language_sn": "Shona",
+        "Language_so": "Somali Dili",
+        "Language_sq": "Arnavutça",
+        "Language_sr": "Sırpça",
+        "Language_ss": "Siswati",
+        "Language_st": "Güney Sotho",
+        "Language_su": "Sunda Dili",
+        "Language_sv": "İsveççe",
+        "Language_sw": "Swahili",
+        "Language_ta": "Tamilce",
+        "Language_te": "Telugu",
+        "Language_tg": "Tacikçe",
+        "Language_th": "Tayca",
+        "Language_ti": "Tigrinya",
+        "Language_tk": "Türkmence",
+        "Language_tl": "Takalotça",
+        "Language_tn": "Setswana",
+        "Language_to": "Tonga",
+        "Language_tr": "Türkçe",
+        "Language_ts": "Tsonga",
+        "Language_tt": "Tatarca",
+        "Language_tw": "Twi",
+        "Language_ty": "Tahiti Dili",
+        "Language_ug": "Uygurca",
+        "Language_uk": "Ukraynaca",
+        "Language_ur": "Urduca",
+        "Language_uz": "Özbekçe",
+        "Language_ve": "Venda",
+        "Language_vi": "Vietnamca",
+        "Language_vo": "Volapük",
+        "Language_wa": "Valonca",
+        "Language_wo": "Volofca",
+        "Language_xh": "Xhosa",
+        "Language_yi": "Yidiş",
+        "Language_yo": "Yoruba",
+        "Language_za": "Zhuang",
+        "Language_zh": "Çince",
+        "Language_zu": "Zulu",
+        "LanguageCode": "Dil kodu"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/uk.json b/plugins/UserLanguage/lang/uk.json
new file mode 100644
index 0000000000..3a94be5699
--- /dev/null
+++ b/plugins/UserLanguage/lang/uk.json
@@ -0,0 +1,189 @@
+{
+    "UserLanguage": {
+        "Language_aa": "афарська",
+        "Language_ab": "абхазька",
+        "Language_ae": "авестійська",
+        "Language_af": "африкаанс",
+        "Language_ak": "акан",
+        "Language_am": "амхарська",
+        "Language_an": "арагонська",
+        "Language_ar": "арабська",
+        "Language_as": "ассамська",
+        "Language_av": "аварська",
+        "Language_ay": "аймара",
+        "Language_az": "азербайджанська",
+        "Language_ba": "башкирська",
+        "Language_be": "білоруська",
+        "Language_bg": "болгарська",
+        "Language_bh": "біхарі",
+        "Language_bi": "біслама",
+        "Language_bm": "бамбара",
+        "Language_bn": "бенгальська",
+        "Language_bo": "тибетська",
+        "Language_br": "бретонська",
+        "Language_bs": "боснійська",
+        "Language_ca": "каталонська",
+        "Language_ce": "чеченська",
+        "Language_ch": "чаморро",
+        "Language_co": "корсиканська",
+        "Language_cr": "крі",
+        "Language_cs": "чеська",
+        "Language_cu": "церковнослов’янська",
+        "Language_cv": "чуваська",
+        "Language_cy": "валлійська",
+        "Language_da": "данська",
+        "Language_de": "німецька",
+        "Language_dv": "дівехі",
+        "Language_dz": "дзонг-ке",
+        "Language_ee": "еве",
+        "Language_el": "грецька",
+        "Language_en": "англійська",
+        "Language_eo": "есперанто",
+        "Language_es": "іспанська",
+        "Language_et": "естонська",
+        "Language_eu": "басків",
+        "Language_fa": "перська",
+        "Language_ff": "фула",
+        "Language_fi": "фінська",
+        "Language_fj": "фіджі",
+        "Language_fo": "фарерська",
+        "Language_fr": "французька",
+        "Language_fy": "фризька",
+        "Language_ga": "ірландська",
+        "Language_gd": "гаельська",
+        "Language_gl": "галісійська",
+        "Language_gn": "гуарані",
+        "Language_gu": "гуджараті",
+        "Language_gv": "менкська",
+        "Language_ha": "хауса",
+        "Language_he": "іврит",
+        "Language_hi": "гінді",
+        "Language_ho": "хірі-моту",
+        "Language_hr": "хорватська",
+        "Language_ht": "гаїтянська",
+        "Language_hu": "угорська",
+        "Language_hy": "вірменська",
+        "Language_hz": "гереро",
+        "Language_ia": "інтерлінгва",
+        "Language_id": "індонезійська",
+        "Language_ie": "інтерлінгве",
+        "Language_ig": "ігбо",
+        "Language_ii": "сичуань",
+        "Language_ik": "інупіак",
+        "Language_io": "ідо",
+        "Language_is": "ісландська",
+        "Language_it": "італійська",
+        "Language_iu": "інуктітут",
+        "Language_ja": "японська",
+        "Language_jv": "яванська",
+        "Language_ka": "грузинська",
+        "Language_kg": "конґолезька",
+        "Language_ki": "кікуйю",
+        "Language_kj": "кунама",
+        "Language_kk": "казахська",
+        "Language_kl": "калааллісут",
+        "Language_km": "кхмерська",
+        "Language_kn": "каннада",
+        "Language_ko": "корейська",
+        "Language_kr": "канурі",
+        "Language_ks": "кашмірська",
+        "Language_ku": "курдська",
+        "Language_kv": "комі",
+        "Language_kw": "корнійська",
+        "Language_ky": "киргизька",
+        "Language_la": "латинська",
+        "Language_lb": "люксембурзька",
+        "Language_lg": "ганда",
+        "Language_li": "лімбургійська",
+        "Language_ln": "лінгала",
+        "Language_lo": "лаоська",
+        "Language_lt": "литовська",
+        "Language_lu": "луба-катанга",
+        "Language_lv": "латвійська",
+        "Language_mg": "малагасійська",
+        "Language_mh": "маршалльська",
+        "Language_mi": "маорі",
+        "Language_mk": "македонська",
+        "Language_ml": "малайялам",
+        "Language_mn": "монгольська",
+        "Language_mr": "маратхі",
+        "Language_ms": "малайська",
+        "Language_mt": "мальтійська",
+        "Language_my": "бірманська",
+        "Language_na": "науру",
+        "Language_nb": "норвезька букмол",
+        "Language_nd": "ндебелє північна",
+        "Language_ne": "непальська",
+        "Language_ng": "ндонга",
+        "Language_nl": "голландська",
+        "Language_nn": "норвезька нюнорськ",
+        "Language_no": "норвезька",
+        "Language_nr": "ндебелє південна",
+        "Language_nv": "навахо",
+        "Language_ny": "ньянджа",
+        "Language_oc": "окитан",
+        "Language_oj": "оджібва",
+        "Language_om": "оромо",
+        "Language_or": "орія",
+        "Language_os": "осетинська",
+        "Language_pa": "панджабі",
+        "Language_pi": "палі",
+        "Language_pl": "польська",
+        "Language_ps": "пушту",
+        "Language_pt": "португальська",
+        "Language_qu": "кечуа",
+        "Language_rm": "ретороманська",
+        "Language_rn": "рунді",
+        "Language_ro": "румунська",
+        "Language_ru": "російська",
+        "Language_rw": "кіньяруанда",
+        "Language_sa": "санскрит",
+        "Language_sc": "сардинська",
+        "Language_sd": "сіндхі",
+        "Language_se": "саамська північна",
+        "Language_sg": "санго",
+        "Language_si": "сингальська",
+        "Language_sk": "словацька",
+        "Language_sl": "словенська",
+        "Language_sm": "самоанська",
+        "Language_sn": "шона",
+        "Language_so": "сомалі",
+        "Language_sq": "албанська",
+        "Language_sr": "сербська",
+        "Language_ss": "сісваті",
+        "Language_st": "сото південна",
+        "Language_su": "сунданська",
+        "Language_sv": "шведська",
+        "Language_sw": "суахілі",
+        "Language_ta": "тамільська",
+        "Language_te": "телугу",
+        "Language_tg": "таджицька",
+        "Language_th": "тайська",
+        "Language_ti": "тигріні",
+        "Language_tk": "туркменська",
+        "Language_tl": "тагальська",
+        "Language_tn": "тсвана",
+        "Language_to": "Тонга",
+        "Language_tr": "турецька",
+        "Language_ts": "тсонга",
+        "Language_tt": "татарська",
+        "Language_tw": "тві",
+        "Language_ty": "таїтянська",
+        "Language_ug": "уйгурська",
+        "Language_uk": "українська",
+        "Language_ur": "урду",
+        "Language_uz": "узбецька",
+        "Language_ve": "венда",
+        "Language_vi": "вʼєтнамська",
+        "Language_vo": "волап’юк",
+        "Language_wa": "валлонська",
+        "Language_wo": "волоф",
+        "Language_xh": "кхоса",
+        "Language_yi": "ідиш",
+        "Language_yo": "йоруба",
+        "Language_za": "чжуан",
+        "Language_zh": "китайська",
+        "Language_zu": "зулуська",
+        "LanguageCode": "Код мови"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/vi.json b/plugins/UserLanguage/lang/vi.json
new file mode 100644
index 0000000000..8bb7e99f59
--- /dev/null
+++ b/plugins/UserLanguage/lang/vi.json
@@ -0,0 +1,190 @@
+{
+    "UserLanguage": {
+        "BrowserLanguage": "Ngôn ngữ trình duyệt",
+        "Language_aa": "Tiếng Afar",
+        "Language_ab": "Tiếng Abkhazia",
+        "Language_ae": "Tiếng Avestan",
+        "Language_af": "Tiếng Nam Phi",
+        "Language_ak": "Tiếng Akan",
+        "Language_am": "Tiếng Amharic",
+        "Language_an": "Tiếng Aragon",
+        "Language_ar": "Tiếng A-rập",
+        "Language_as": "Tiếng Assam",
+        "Language_av": "Tiếng Avaric",
+        "Language_ay": "Tiếng Aymara",
+        "Language_az": "Tiếng Ai-déc-bai-gian",
+        "Language_ba": "Tiếng Bashkir",
+        "Language_be": "Tiếng Bê-la-rút",
+        "Language_bg": "Tiếng Bun-ga-ri",
+        "Language_bh": "Tiếng Bihari",
+        "Language_bi": "Tiếng Bislama",
+        "Language_bm": "Tiếng Bambara",
+        "Language_bn": "Tiếng Bengali (Ấn Độ)",
+        "Language_bo": "Tiếng Tây Tạng",
+        "Language_br": "Tiếng Breton",
+        "Language_bs": "Tiếng Nam Tư",
+        "Language_ca": "Tiếng Ca-ta-lăng",
+        "Language_ce": "Tiếng Chechen",
+        "Language_ch": "Tiếng Chamorro",
+        "Language_co": "Tiếng Corse",
+        "Language_cr": "Tiếng Cree",
+        "Language_cs": "Tiếng Séc",
+        "Language_cu": "Tiếng Slavơ Nhà thờ",
+        "Language_cv": "Tiếng Chuvash",
+        "Language_cy": "Tiếng Xentơ",
+        "Language_da": "Tiếng Đan Mạch",
+        "Language_de": "Tiếng Đức",
+        "Language_dv": "Tiếng Divehi",
+        "Language_dz": "Tiếng Dzongkha",
+        "Language_ee": "Tiếng Ewe",
+        "Language_el": "Tiếng Hy Lạp",
+        "Language_en": "Tiếng Anh",
+        "Language_eo": "Tiếng Quốc Tế Ngữ",
+        "Language_es": "Tiếng Tây Ban Nha",
+        "Language_et": "Tiếng E-xtô-ni-a",
+        "Language_eu": "Tiếng Basque",
+        "Language_fa": "Tiếng Ba Tư",
+        "Language_ff": "Tiếng Fulah",
+        "Language_fi": "Tiếng Phần Lan",
+        "Language_fj": "Tiếng Fiji",
+        "Language_fo": "Tiếng Faore",
+        "Language_fr": "Tiếng Pháp",
+        "Language_fy": "Tiếng Frisian",
+        "Language_ga": "Tiếng Ai-len",
+        "Language_gd": "Tiếng Xentơ (Xcốt len)",
+        "Language_gl": "Tiếng Galician",
+        "Language_gn": "Tiếng Guarani",
+        "Language_gu": "Tiếng Gujarati",
+        "Language_gv": "Tiếng Manx",
+        "Language_ha": "Tiếng Hausa",
+        "Language_he": "Tiếng Hê-brơ",
+        "Language_hi": "Tiếng Hin-đi",
+        "Language_ho": "Tiếng Hiri Motu",
+        "Language_hr": "Tiếng Crô-a-ti-a",
+        "Language_ht": "Tiếng Haiti",
+        "Language_hu": "Tiếng Hung-ga-ri",
+        "Language_hy": "Tiếng Ác-mê-ni",
+        "Language_hz": "Tiếng Herero",
+        "Language_ia": "Tiếng Khoa Học Quốc Tế",
+        "Language_id": "Tiếng In-đô-nê-xia",
+        "Language_ie": "Tiếng Interlingue",
+        "Language_ig": "Tiếng Igbo",
+        "Language_ii": "Tiếng Di Tứ Xuyên",
+        "Language_ik": "Tiếng Inupiaq",
+        "Language_io": "Tiếng Ido",
+        "Language_is": "Tiếng Ai-xơ-len",
+        "Language_it": "Tiếng Ý",
+        "Language_iu": "Tiếng Inuktitut",
+        "Language_ja": "Tiếng Nhật",
+        "Language_jv": "Tiếng Gia-va",
+        "Language_ka": "Tiếng Georgian",
+        "Language_kg": "Tiếng Congo",
+        "Language_ki": "Tiếng Kikuyu",
+        "Language_kj": "Tiếng Kuanyama",
+        "Language_kk": "Tiếng Kazakh",
+        "Language_kl": "Tiếng Kalaallisut",
+        "Language_km": "Tiếng Campuchia",
+        "Language_kn": "Tiếng Kan-na-đa",
+        "Language_ko": "Tiếng Hàn Quốc",
+        "Language_kr": "Tiếng Kanuri",
+        "Language_ks": "Tiếng Kashmiri",
+        "Language_ku": "Tiếng Kurd (Iran)",
+        "Language_kv": "Tiếng Komi",
+        "Language_kw": "Tiếng Cornish",
+        "Language_ky": "Tiếng Kyrgyz",
+        "Language_la": "Tiếng La-tinh",
+        "Language_lb": "Tiếng Luxembourg",
+        "Language_lg": "Tiếng Ganda",
+        "Language_li": "Tiếng Limburg",
+        "Language_ln": "Tiếng Lingala",
+        "Language_lo": "Tiếng Lào",
+        "Language_lt": "Tiếng Lít-va",
+        "Language_lu": "Tiếng Luba-Katanga",
+        "Language_lv": "Tiếng Lát-vi-a",
+        "Language_mg": "Tiếng Malagasy",
+        "Language_mh": "Tiếng Marshall",
+        "Language_mi": "Tiếng Maori",
+        "Language_mk": "Tiếng Ma-xê-đô-ni-a",
+        "Language_ml": "Tiếng Malayalam",
+        "Language_mn": "Tiếng Mông Cổ",
+        "Language_mr": "Tiếng Marathi",
+        "Language_ms": "Tiếng Ma-lay-xi-a",
+        "Language_mt": "Tiếng Mantơ",
+        "Language_my": "Tiếng Miến Điện",
+        "Language_na": "Tiếng Nauru",
+        "Language_nb": "Tiếng Na Uy (Bokmål)",
+        "Language_nd": "Bắc Ndebele",
+        "Language_ne": "Tiếng Nê-pan",
+        "Language_ng": "Tiếng Ndonga",
+        "Language_nl": "Tiếng Hà Lan",
+        "Language_nn": "Tiếng Na Uy (Nynorsk)",
+        "Language_no": "Tiếng Na Uy",
+        "Language_nr": "Tiếng Ndebele Miền Nam",
+        "Language_nv": "Tiếng Navajo",
+        "Language_ny": "Tiếng Nyanja",
+        "Language_oc": "Tiếng Occitan",
+        "Language_oj": "Tiếng Ojibwa",
+        "Language_om": "Tiếng Oromo",
+        "Language_or": "Tiếng Ô-ri-a",
+        "Language_os": "Tiếng Ossetic",
+        "Language_pa": "Tiếng Punjabi",
+        "Language_pi": "Tiếng Pali",
+        "Language_pl": "Tiếng Ba Lan",
+        "Language_ps": "Tiếng Pa-tô",
+        "Language_pt": "Tiếng Bồ Đào Nha",
+        "Language_qu": "Tiếng Quechua",
+        "Language_rm": "Tiếng Rhaeto-Romance",
+        "Language_rn": "Tiếng Rundi",
+        "Language_ro": "Tiếng Ru-ma-ni",
+        "Language_ru": "Tiếng Nga",
+        "Language_rw": "Tiếng Kinyarwanda",
+        "Language_sa": "Tiếng Phạn",
+        "Language_sc": "Tiếng Sardinia",
+        "Language_sd": "Tiếng Sin-hi",
+        "Language_se": "Bắc Sami",
+        "Language_sg": "Tiếng Sango",
+        "Language_si": "Tiếng Sinhala",
+        "Language_sk": "Tiếng Xlô-vác",
+        "Language_sl": "Tiếng Xlô-ven",
+        "Language_sm": "Tiếng Samoa",
+        "Language_sn": "Tiếng Shona",
+        "Language_so": "Tiếng Xô-ma-li",
+        "Language_sq": "Tiếng An-ba-ni",
+        "Language_sr": "Tiếng Séc-bi",
+        "Language_ss": "Tiếng Swati",
+        "Language_st": "Tiếng Sesotho",
+        "Language_su": "Tiếng Xu đăng",
+        "Language_sv": "Tiếng Thụy Điển",
+        "Language_sw": "Tiếng Bantu (Đông Phi)",
+        "Language_ta": "Tiếng Tamil",
+        "Language_te": "Tiếng Telugu",
+        "Language_tg": "Tiếng Tajik",
+        "Language_th": "Tiếng Thái",
+        "Language_ti": "Tiếng Tigrigya",
+        "Language_tk": "Tiếng Tuôc-men",
+        "Language_tl": "Tiếng Tagalog",
+        "Language_tn": "Tiếng Tswana",
+        "Language_to": "Tiếng Tonga",
+        "Language_tr": "Tiếng Thổ Nhĩ Kỳ",
+        "Language_ts": "Tiếng Tsonga",
+        "Language_tt": "Tiếng Tatar",
+        "Language_tw": "Tiếng Twi",
+        "Language_ty": "Tiếng Tahiti",
+        "Language_ug": "Tiếng Uighur",
+        "Language_uk": "Tiếng U-crai-na",
+        "Language_ur": "Tiếng Uđu",
+        "Language_uz": "Tiếng U-dơ-bếch",
+        "Language_ve": "Tiếng Venda",
+        "Language_vi": "Tiếng Việt",
+        "Language_vo": "Tiếng Volapük",
+        "Language_wa": "Tiếng Walloon",
+        "Language_wo": "Tiếng Wolof",
+        "Language_xh": "Tiếng Bantu",
+        "Language_yi": "Tiếng Y-đit",
+        "Language_yo": "Tiếng Yoruba",
+        "Language_za": "Tiếng Zhuang",
+        "Language_zh": "Tiếng Trung Quốc",
+        "Language_zu": "Tiếng Zulu",
+        "LanguageCode": "Mã ngôn ngữ"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/zh-cn.json b/plugins/UserLanguage/lang/zh-cn.json
new file mode 100644
index 0000000000..792fea9b17
--- /dev/null
+++ b/plugins/UserLanguage/lang/zh-cn.json
@@ -0,0 +1,190 @@
+{
+    "UserLanguage": {
+        "BrowserLanguage": "浏览器语言",
+        "Language_aa": "阿法文",
+        "Language_ab": "阿布哈西亚文",
+        "Language_ae": "阿维斯塔文",
+        "Language_af": "南非荷兰文",
+        "Language_ak": "阿肯文",
+        "Language_am": "阿姆哈拉文",
+        "Language_an": "阿拉贡文",
+        "Language_ar": "阿拉伯文",
+        "Language_as": "阿萨姆文",
+        "Language_av": "阿瓦尔文",
+        "Language_ay": "艾马拉文",
+        "Language_az": "阿塞拜疆文",
+        "Language_ba": "巴什客尔文",
+        "Language_be": "白俄罗斯文",
+        "Language_bg": "保加利亚文",
+        "Language_bh": "比哈尔文",
+        "Language_bi": "比斯拉马文",
+        "Language_bm": "班巴拉文",
+        "Language_bn": "孟加拉文",
+        "Language_bo": "藏文",
+        "Language_br": "布里多尼文",
+        "Language_bs": "波斯尼亚文",
+        "Language_ca": "加泰罗尼亚文",
+        "Language_ce": "车臣文",
+        "Language_ch": "查莫罗文",
+        "Language_co": "科西嘉文",
+        "Language_cr": "克里族文",
+        "Language_cs": "捷克文",
+        "Language_cu": "宗教斯拉夫文",
+        "Language_cv": "楚瓦什文",
+        "Language_cy": "威尔士文",
+        "Language_da": "丹麦文",
+        "Language_de": "德文",
+        "Language_dv": "迪维希文",
+        "Language_dz": "不丹文",
+        "Language_ee": "埃维文",
+        "Language_el": "希腊文",
+        "Language_en": "英文",
+        "Language_eo": "世界文",
+        "Language_es": "西班牙文",
+        "Language_et": "爱沙尼亚文",
+        "Language_eu": "巴斯克文",
+        "Language_fa": "波斯文",
+        "Language_ff": "夫拉文",
+        "Language_fi": "芬兰文",
+        "Language_fj": "斐济文",
+        "Language_fo": "法罗文",
+        "Language_fr": "法文",
+        "Language_fy": "弗里斯兰文",
+        "Language_ga": "爱尔兰文",
+        "Language_gd": "苏格兰盖尔文",
+        "Language_gl": "加利西亚文",
+        "Language_gn": "瓜拉尼文",
+        "Language_gu": "古加拉提文",
+        "Language_gv": "马恩岛文",
+        "Language_ha": "豪撒文",
+        "Language_he": "希伯来文",
+        "Language_hi": "印地文",
+        "Language_ho": "希里莫图文",
+        "Language_hr": "克罗地亚文",
+        "Language_ht": "海地文",
+        "Language_hu": "匈牙利文",
+        "Language_hy": "亚美尼亚文",
+        "Language_hz": "赫雷罗文",
+        "Language_ia": "国际语",
+        "Language_id": "印度尼西亚文",
+        "Language_ie": "国际语E",
+        "Language_ig": "伊格博文",
+        "Language_ii": "四川话",
+        "Language_ik": "依奴皮维克文",
+        "Language_io": "伊多文",
+        "Language_is": "冰岛文",
+        "Language_it": "意大利文",
+        "Language_iu": "伊努伊特文",
+        "Language_ja": "日文",
+        "Language_jv": "爪哇文",
+        "Language_ka": "格鲁吉亚文",
+        "Language_kg": "刚果文",
+        "Language_ki": "吉库尤文",
+        "Language_kj": "宽亚玛文",
+        "Language_kk": "哈萨克文",
+        "Language_kl": "格陵兰文",
+        "Language_km": "柬埔寨文",
+        "Language_kn": "坎纳达文",
+        "Language_ko": "韩文",
+        "Language_kr": "卡努里文",
+        "Language_ks": "克什米尔文",
+        "Language_ku": "库尔德文",
+        "Language_kv": "科米文",
+        "Language_kw": "凯尔特文",
+        "Language_ky": "吉尔吉斯文",
+        "Language_la": "拉丁文",
+        "Language_lb": "卢森堡文",
+        "Language_lg": "卢干达文",
+        "Language_li": "淋布尔吉文",
+        "Language_ln": "林加拉文",
+        "Language_lo": "老挝文",
+        "Language_lt": "立陶宛文",
+        "Language_lu": "鲁巴加丹加文",
+        "Language_lv": "拉脱维亚文",
+        "Language_mg": "马尔加什文",
+        "Language_mh": "马绍尔文",
+        "Language_mi": "毛利文",
+        "Language_mk": "马其顿文",
+        "Language_ml": "马来亚拉姆文",
+        "Language_mn": "蒙古文",
+        "Language_mr": "马拉地文",
+        "Language_ms": "马来文",
+        "Language_mt": "马耳他文",
+        "Language_my": "缅甸文",
+        "Language_na": "瑙鲁文",
+        "Language_nb": "挪威博克马尔文",
+        "Language_nd": "北恩德贝勒文",
+        "Language_ne": "尼泊尔文",
+        "Language_ng": "恩东加文",
+        "Language_nl": "荷兰文",
+        "Language_nn": "挪威尼诺斯克文",
+        "Language_no": "挪威文",
+        "Language_nr": "南部恩德贝勒文",
+        "Language_nv": "纳瓦霍文",
+        "Language_ny": "尼扬贾文；齐切瓦文；切瓦文",
+        "Language_oc": "奥克西唐语",
+        "Language_oj": "奥吉布瓦文",
+        "Language_om": "奥洛莫文",
+        "Language_or": "欧里亚文",
+        "Language_os": "奥塞梯文",
+        "Language_pa": "旁遮普文",
+        "Language_pi": "巴利文",
+        "Language_pl": "波兰文",
+        "Language_ps": "普什图文",
+        "Language_pt": "葡萄牙文",
+        "Language_qu": "盖丘亚文",
+        "Language_rm": "列托－罗曼文",
+        "Language_rn": "基隆迪文",
+        "Language_ro": "罗马尼亚文",
+        "Language_ru": "俄文",
+        "Language_rw": "卢旺达文",
+        "Language_sa": "梵文",
+        "Language_sc": "萨丁文",
+        "Language_sd": "信德文",
+        "Language_se": "北萨米文",
+        "Language_sg": "桑戈文",
+        "Language_si": "僧伽罗文",
+        "Language_sk": "斯洛伐克文",
+        "Language_sl": "斯洛文尼亚文",
+        "Language_sm": "萨摩亚文",
+        "Language_sn": "绍纳文",
+        "Language_so": "索马里文",
+        "Language_sq": "阿尔巴尼亚文",
+        "Language_sr": "塞尔维亚文",
+        "Language_ss": "斯瓦特文",
+        "Language_st": "塞索托文",
+        "Language_su": "巽他语",
+        "Language_sv": "瑞典文",
+        "Language_sw": "斯瓦希里文",
+        "Language_ta": "泰米尔文",
+        "Language_te": "泰卢固文",
+        "Language_tg": "塔吉克文",
+        "Language_th": "泰文",
+        "Language_ti": "提格里尼亚文",
+        "Language_tk": "土库曼文",
+        "Language_tl": "塔加洛语",
+        "Language_tn": "塞茨瓦纳文",
+        "Language_to": "汤加文",
+        "Language_tr": "土耳其文",
+        "Language_ts": "宗加文",
+        "Language_tt": "塔塔尔文",
+        "Language_tw": "特威文",
+        "Language_ty": "塔西提文",
+        "Language_ug": "维吾尔文",
+        "Language_uk": "乌克兰文",
+        "Language_ur": "乌尔都文",
+        "Language_uz": "乌兹别克文",
+        "Language_ve": "文达文",
+        "Language_vi": "越南文",
+        "Language_vo": "沃拉普克文",
+        "Language_wa": "瓦隆文",
+        "Language_wo": "沃洛夫文",
+        "Language_xh": "科萨文",
+        "Language_yi": "依地文",
+        "Language_yo": "约鲁巴文",
+        "Language_za": "壮语",
+        "Language_zh": "中文",
+        "Language_zu": "祖鲁文",
+        "LanguageCode": "语言代码"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/zh-tw.json b/plugins/UserLanguage/lang/zh-tw.json
new file mode 100644
index 0000000000..4006c31d9d
--- /dev/null
+++ b/plugins/UserLanguage/lang/zh-tw.json
@@ -0,0 +1,190 @@
+{
+    "UserLanguage": {
+        "BrowserLanguage": "瀏覽器語系",
+        "Language_aa": "阿法文",
+        "Language_ab": "阿布哈西亚文",
+        "Language_ae": "阿维斯塔文",
+        "Language_af": "南非荷兰文",
+        "Language_ak": "阿肯文",
+        "Language_am": "阿姆哈拉文",
+        "Language_an": "阿拉贡文",
+        "Language_ar": "阿拉伯文",
+        "Language_as": "阿萨姆文",
+        "Language_av": "阿瓦尔文",
+        "Language_ay": "艾马拉文",
+        "Language_az": "阿塞拜疆文",
+        "Language_ba": "巴什客尔文",
+        "Language_be": "白俄罗斯文",
+        "Language_bg": "保加利亚文",
+        "Language_bh": "比哈尔文",
+        "Language_bi": "比斯拉马文",
+        "Language_bm": "班巴拉文",
+        "Language_bn": "孟加拉文",
+        "Language_bo": "藏文",
+        "Language_br": "布里多尼文",
+        "Language_bs": "波斯尼亚文",
+        "Language_ca": "加泰罗尼亚文",
+        "Language_ce": "车臣文",
+        "Language_ch": "查莫罗文",
+        "Language_co": "科西嘉文",
+        "Language_cr": "克里族文",
+        "Language_cs": "捷克文",
+        "Language_cu": "宗教斯拉夫文",
+        "Language_cv": "楚瓦什文",
+        "Language_cy": "威尔士文",
+        "Language_da": "丹麦文",
+        "Language_de": "德文",
+        "Language_dv": "迪维希文",
+        "Language_dz": "不丹文",
+        "Language_ee": "埃维文",
+        "Language_el": "希腊文",
+        "Language_en": "英文",
+        "Language_eo": "世界文",
+        "Language_es": "西班牙文",
+        "Language_et": "爱沙尼亚文",
+        "Language_eu": "巴斯克文",
+        "Language_fa": "波斯文",
+        "Language_ff": "夫拉文",
+        "Language_fi": "芬兰文",
+        "Language_fj": "斐济文",
+        "Language_fo": "法罗文",
+        "Language_fr": "法文",
+        "Language_fy": "弗里斯兰文",
+        "Language_ga": "爱尔兰文",
+        "Language_gd": "苏格兰盖尔文",
+        "Language_gl": "加利西亚文",
+        "Language_gn": "瓜拉尼文",
+        "Language_gu": "古加拉提文",
+        "Language_gv": "马恩岛文",
+        "Language_ha": "豪撒文",
+        "Language_he": "希伯来文",
+        "Language_hi": "印地文",
+        "Language_ho": "希里莫图文",
+        "Language_hr": "克罗地亚文",
+        "Language_ht": "海地文",
+        "Language_hu": "匈牙利文",
+        "Language_hy": "亚美尼亚文",
+        "Language_hz": "赫雷罗文",
+        "Language_ia": "国际语",
+        "Language_id": "印度尼西亚文",
+        "Language_ie": "国际语E",
+        "Language_ig": "伊格博文",
+        "Language_ii": "四川话",
+        "Language_ik": "依奴皮维克文",
+        "Language_io": "伊多文",
+        "Language_is": "冰岛文",
+        "Language_it": "意大利文",
+        "Language_iu": "伊努伊特文",
+        "Language_ja": "日文",
+        "Language_jv": "爪哇文",
+        "Language_ka": "格鲁吉亚文",
+        "Language_kg": "刚果文",
+        "Language_ki": "吉库尤文",
+        "Language_kj": "宽亚玛文",
+        "Language_kk": "哈萨克文",
+        "Language_kl": "格陵兰文",
+        "Language_km": "柬埔寨文",
+        "Language_kn": "坎纳达文",
+        "Language_ko": "韩文",
+        "Language_kr": "卡努里文",
+        "Language_ks": "克什米尔文",
+        "Language_ku": "库尔德文",
+        "Language_kv": "科米文",
+        "Language_kw": "凯尔特文",
+        "Language_ky": "吉尔吉斯文",
+        "Language_la": "拉丁文",
+        "Language_lb": "卢森堡文",
+        "Language_lg": "卢干达文",
+        "Language_li": "淋布尔吉文",
+        "Language_ln": "林加拉文",
+        "Language_lo": "老挝文",
+        "Language_lt": "立陶宛文",
+        "Language_lu": "鲁巴加丹加文",
+        "Language_lv": "拉脱维亚文",
+        "Language_mg": "马尔加什文",
+        "Language_mh": "马绍尔文",
+        "Language_mi": "毛利文",
+        "Language_mk": "马其顿文",
+        "Language_ml": "马来亚拉姆文",
+        "Language_mn": "蒙古文",
+        "Language_mr": "马拉地文",
+        "Language_ms": "马来文",
+        "Language_mt": "马耳他文",
+        "Language_my": "缅甸文",
+        "Language_na": "瑙鲁文",
+        "Language_nb": "挪威博克马尔文",
+        "Language_nd": "北恩德贝勒文",
+        "Language_ne": "尼泊尔文",
+        "Language_ng": "恩东加文",
+        "Language_nl": "荷兰文",
+        "Language_nn": "挪威尼诺斯克文",
+        "Language_no": "挪威文",
+        "Language_nr": "南部恩德贝勒文",
+        "Language_nv": "纳瓦霍文",
+        "Language_ny": "尼扬贾文；齐切瓦文；切瓦文",
+        "Language_oc": "奥克西唐语",
+        "Language_oj": "奥吉布瓦文",
+        "Language_om": "奥洛莫文",
+        "Language_or": "欧里亚文",
+        "Language_os": "奥塞梯文",
+        "Language_pa": "旁遮普文",
+        "Language_pi": "巴利文",
+        "Language_pl": "波兰文",
+        "Language_ps": "普什图文",
+        "Language_pt": "葡萄牙文",
+        "Language_qu": "盖丘亚文",
+        "Language_rm": "列托－罗曼文",
+        "Language_rn": "基隆迪文",
+        "Language_ro": "罗马尼亚文",
+        "Language_ru": "俄文",
+        "Language_rw": "卢旺达文",
+        "Language_sa": "梵文",
+        "Language_sc": "萨丁文",
+        "Language_sd": "信德文",
+        "Language_se": "北萨米文",
+        "Language_sg": "桑戈文",
+        "Language_si": "僧伽罗文",
+        "Language_sk": "斯洛伐克文",
+        "Language_sl": "斯洛文尼亚文",
+        "Language_sm": "萨摩亚文",
+        "Language_sn": "绍纳文",
+        "Language_so": "索马里文",
+        "Language_sq": "阿尔巴尼亚文",
+        "Language_sr": "塞尔维亚文",
+        "Language_ss": "斯瓦特文",
+        "Language_st": "塞索托文",
+        "Language_su": "巽他语",
+        "Language_sv": "瑞典文",
+        "Language_sw": "斯瓦希里文",
+        "Language_ta": "泰米尔文",
+        "Language_te": "泰卢固文",
+        "Language_tg": "塔吉克文",
+        "Language_th": "泰文",
+        "Language_ti": "提格里尼亚文",
+        "Language_tk": "土库曼文",
+        "Language_tl": "塔加洛语",
+        "Language_tn": "塞茨瓦纳文",
+        "Language_to": "汤加文",
+        "Language_tr": "土耳其文",
+        "Language_ts": "宗加文",
+        "Language_tt": "塔塔尔文",
+        "Language_tw": "特威文",
+        "Language_ty": "塔西提文",
+        "Language_ug": "维吾尔文",
+        "Language_uk": "乌克兰文",
+        "Language_ur": "乌尔都文",
+        "Language_uz": "乌兹别克文",
+        "Language_ve": "文达文",
+        "Language_vi": "越南文",
+        "Language_vo": "沃拉普克文",
+        "Language_wa": "瓦隆文",
+        "Language_wo": "沃洛夫文",
+        "Language_xh": "科萨文",
+        "Language_yi": "依地文",
+        "Language_yo": "约鲁巴文",
+        "Language_za": "壮语",
+        "Language_zh": "中文",
+        "Language_zu": "祖鲁文",
+        "LanguageCode": "語系代碼"
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserLanguage/tests/Fixtures/LanguageFixture.php b/plugins/UserLanguage/tests/Fixtures/LanguageFixture.php
new file mode 100644
index 0000000000..3e015f776a
--- /dev/null
+++ b/plugins/UserLanguage/tests/Fixtures/LanguageFixture.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\UserLanguage\tests\Fixtures;
+
+
+use Piwik\Tests\Framework\Fixture;
+use Piwik\Date;
+
+class LanguageFixture extends Fixture
+{
+    public $dateTime = '2014-09-04 00:00:00';
+    public $idSite = 1;
+
+    public function setUp()
+    {
+        $this->setUpWebsite();
+        $this->trackVisits();
+    }
+
+    public function tearDown()
+    {
+
+    }
+
+    private function setUpWebsite()
+    {
+        if (!self::siteCreated($this->idSite)) {
+            $idSite = self::createWebsite($this->dateTime);
+            $this->assertSame($this->idSite, $idSite);
+        }
+    }
+
+    private function getBrowserLangs() {
+        return array(
+            'fr-be', 'ar_QA', 'fr-ch', 'pl', 'pl', 'th_TH', 'zh_SG', 'eu_ES',
+            'sr_CS', 'el,fi', 'fr,en-us,en;q=', 'fr-be', 'en,en-us,en;q=',
+            'de,en-us,en;q=', 'cs_CZ', 'pl,en-us,en;q=',
+            'kpe_LR', 'en,en-us,en;q=',
+        );
+    }
+
+    private function trackVisits() {
+
+        $tracker = self::getTracker(
+            $this->idSite,
+            $this->dateTime,
+            $defaultInit = false
+        );
+        $tracker->setTokenAuth(self::getTokenAuth());
+
+        $hour = 1;
+        foreach ($this->getBrowserLangs() as $browserLang) {
+
+            $tracker->setForceVisitDateTime(
+                Date::factory($this->dateTime)->addHour($hour++)->getDatetime()
+            );
+
+            $tracker->setBrowserLanguage($browserLang);
+
+            self::checkResponse($tracker->doTrackPageView("Viewing homepage"));
+        }
+
+    }
+
+} 
\ No newline at end of file
diff --git a/plugins/UserLanguage/tests/System/GetLanguageSystemTest.php b/plugins/UserLanguage/tests/System/GetLanguageSystemTest.php
new file mode 100644
index 0000000000..2ce1c215d5
--- /dev/null
+++ b/plugins/UserLanguage/tests/System/GetLanguageSystemTest.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\UserLanguage\tests\System;
+
+
+use Piwik\Plugins\UserLanguage\tests\Fixtures\LanguageFixture;
+use Piwik\Tests\Framework\TestCase\SystemTestCase;
+
+/**
+ * Class GetLanguageSystemTest
+ * @package Piwik\Plugins\UserLanguage\tests
+ * @group GetLanguageSystemTest
+ * @group Plugins
+ * @group UserLanguage
+ */
+class GetLanguageSystemTest extends SystemTestCase {
+
+    public static $fixture = null;
+
+    public static function getOutputPrefix()
+    {
+        return '';
+    }
+
+    /**
+     * @param $api
+     * @param $params
+     * @dataProvider    getApiForTesting
+     * @group           GetLanguageSystemTest
+     */
+    public function testApi($api, $params)
+    {
+        $this->runApiTests($api, $params);
+    }
+
+    /**
+     * @return array
+     */
+    public function getApiForTesting()
+    {
+        $apiToCall = array(
+            "UserLanguage.getLanguage",
+            "UserLanguage.getLanguageCode"
+        );
+
+        $apiToTest = array();
+
+        $apiToTest[] = array(
+                            $apiToCall,
+                            array(
+                                'idSite'  => self::$fixture->idSite,
+                                'date'    => self::$fixture->dateTime,
+                                'periods' => array('day')
+                            )
+                       );
+
+        return $apiToTest;
+    }
+
+
+    public static function getPathToTestDirectory()
+    {
+        return dirname(__FILE__);
+    }
+
+}
+
+GetLanguageSystemTest::$fixture = new LanguageFixture();
\ No newline at end of file
diff --git a/plugins/UserSettings/tests/System/expected/test___UserSettings.getLanguageCode_day.xml b/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguageCode_day.xml
index 02c15ad520..02c15ad520 100644
--- a/plugins/UserSettings/tests/System/expected/test___UserSettings.getLanguageCode_day.xml
+++ b/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguageCode_day.xml
diff --git a/plugins/UserSettings/tests/System/expected/test___UserSettings.getLanguage_day.xml b/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguage_day.xml
index 18d4468a2e..18d4468a2e 100644
--- a/plugins/UserSettings/tests/System/expected/test___UserSettings.getLanguage_day.xml
+++ b/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguage_day.xml
diff --git a/plugins/UserSettings/API.php b/plugins/UserSettings/API.php
index 1a80da3e9f..68ff9b1f90 100644
--- a/plugins/UserSettings/API.php
+++ b/plugins/UserSettings/API.php
@@ -8,19 +8,7 @@
  */
 namespace Piwik\Plugins\UserSettings;
 
-use Piwik\Archive;
-use Piwik\DataTable;
-use Piwik\Metrics;
-use Piwik\Piwik;
-use Piwik\Plugins\DevicesDetection\Archiver AS DDArchiver;
-use Piwik\Plugins\CoreHome\Columns\Metrics\VisitsPercent;
-
-/**
- * @see plugins/UserSettings/functions.php
- */
-require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/functions.php';
-
-/**
+/*
  * The UserSettings API lets you access reports about some of your Visitors technical settings:
  * plugins supported in their browser, Screen resolution and Screen types (normal, widescreen, dual screen or mobile).
  *
@@ -28,28 +16,20 @@ require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/functions.php';
  */
 class API extends \Piwik\Plugin\API
 {
-    protected function getDataTable($name, $idSite, $period, $date, $segment)
-    {
-        Piwik::checkUserHasViewAccess($idSite);
-        $archive = Archive::build($idSite, $period, $date, $segment);
-        $dataTable = $archive->getDataTable($name);
-        $dataTable->filter('Sort', array(Metrics::INDEX_NB_VISITS));
-        $dataTable->queueFilter('ReplaceColumnNames');
-        $dataTable->queueFilter('ReplaceSummaryRowLabel');
-        return $dataTable;
-    }
-
+    /**
+     * @deprecated since 2.10.0   See {@link Piwik\Plugins\Resolution\API} for new implementation.
+     */
     public function getResolution($idSite, $period, $date, $segment = false)
     {
-        $dataTable = $this->getDataTable(Archiver::RESOLUTION_RECORD_NAME, $idSite, $period, $date, $segment);
-        return $dataTable;
+        return \Piwik\Plugins\Resolution\API::getInstance()->getResolution($idSite, $period, $date, $segment);
     }
 
+    /**
+     * @deprecated since 2.10.0   See {@link Piwik\Plugins\Resolution\API} for new implementation.
+     */
     public function getConfiguration($idSite, $period, $date, $segment = false)
     {
-        $dataTable = $this->getDataTable(Archiver::CONFIGURATION_RECORD_NAME, $idSite, $period, $date, $segment);
-        $dataTable->queueFilter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getConfigurationLabel'));
-        return $dataTable;
+        return \Piwik\Plugins\Resolution\API::getInstance()->getConfiguration($idSite, $period, $date, $segment);
     }
 
     protected function getDevicesDetectorApi()
@@ -74,7 +54,6 @@ class API extends \Piwik\Plugin\API
     }
 
     /**
-     * Gets a DataTable displaying number of visits by device type.
      * @deprecated since 2.10.0   See {@link Piwik\Plugins\DevicesDetector\API} for new implementation.
      */
     public function getMobileVsDesktop($idSite, $period, $date, $segment = false)
@@ -106,70 +85,27 @@ class API extends \Piwik\Plugin\API
         return $this->getDevicesDetectorApi()->getBrowserEngines($idSite, $period, $date, $segment);
     }
 
+    /**
+     * @deprecated since 2.10.0   See {@link Piwik\Plugins\DevicePlugins\API} for new implementation.
+     */
     public function getPlugin($idSite, $period, $date, $segment = false)
     {
-        // fetch all archive data required
-        $dataTable = $this->getDataTable(Archiver::PLUGIN_RECORD_NAME, $idSite, $period, $date, $segment);
-        $browserTypes = $this->getDataTable(DDArchiver::BROWSER_ENGINE_RECORD_NAME, $idSite, $period, $date, $segment);
-        $archive = Archive::build($idSite, $period, $date, $segment);
-        $visitsSums = $archive->getDataTableFromNumeric('nb_visits');
-
-        // check whether given tables are arrays
-        if ($dataTable instanceof DataTable\Map) {
-            $dataTableMap = $dataTable->getDataTables();
-            $browserTypesArray = $browserTypes->getDataTables();
-            $visitSumsArray = $visitsSums->getDataTables();
-        } else {
-            $dataTableMap = array($dataTable);
-            $browserTypesArray = array($browserTypes);
-            $visitSumsArray = array($visitsSums);
-        }
-
-        // walk through the results and calculate the percentage
-        foreach ($dataTableMap as $key => $table) {
-            // Calculate percentage, but ignore IE users because plugin detection doesn't work on IE
-            $ieVisits = 0;
-
-            $ieStats = $browserTypesArray[$key]->getRowFromLabel('Trident');
-            if ($ieStats !== false) {
-                $ieVisits = $ieStats->getColumn(Metrics::INDEX_NB_VISITS);
-            }
-
-            // get according visitsSum
-            $visits = $visitSumsArray[$key];
-            if ($visits->getRowsCount() == 0) {
-                $visitsSumTotal = 0;
-            } else {
-                $visitsSumTotal = (float) $visits->getFirstRow()->getColumn('nb_visits');
-            }
-
-            $visitsSum = $visitsSumTotal - $ieVisits;
-
-            $extraProcessedMetrics = $table->getMetadata(DataTable::EXTRA_PROCESSED_METRICS_METADATA_NAME);
-            $extraProcessedMetrics[] = new VisitsPercent($visitsSum);
-            $table->setMetadata(DataTable::EXTRA_PROCESSED_METRICS_METADATA_NAME, $extraProcessedMetrics);
-        }
-
-        $dataTable->queueFilter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getPluginsLogo'));
-        $dataTable->queueFilter('ColumnCallbackReplace', array('label', 'ucfirst'));
-
-        return $dataTable;
+        return \Piwik\Plugins\DevicePlugins\API::getInstance()->getPlugin($idSite, $period, $date, $segment);
     }
 
+    /**
+     * @deprecated since 2.11.0   See {@link Piwik\Plugins\UserLanguage\API} for new implementation.
+     */
     public function getLanguage($idSite, $period, $date, $segment = false)
     {
-        $dataTable = $this->getDataTable(Archiver::LANGUAGE_RECORD_NAME, $idSite, $period, $date, $segment);
-        $dataTable->filter('GroupBy', array('label', __NAMESPACE__ . '\groupByLangCallback'));
-        $dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\languageTranslate'));
-
-        return $dataTable;
+        return \Piwik\Plugins\UserLanguage\API::getInstance()->getLanguage($idSite, $period, $date, $segment);
     }
 
+    /**
+     * @deprecated since 2.11.0   See {@link Piwik\Plugins\UserLanguage\API} for new implementation.
+     */
     public function getLanguageCode($idSite, $period, $date, $segment = false)
     {
-        $dataTable = $this->getDataTable(Archiver::LANGUAGE_RECORD_NAME, $idSite, $period, $date, $segment);
-        $dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\languageTranslateWithCode'));
-
-        return $dataTable;
+        return \Piwik\Plugins\UserLanguage\API::getInstance()->getLanguageCode($idSite, $period, $date, $segment);
     }
 }
diff --git a/plugins/UserSettings/Archiver.php b/plugins/UserSettings/Archiver.php
deleted file mode 100644
index 740e5d4d94..0000000000
--- a/plugins/UserSettings/Archiver.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-
-namespace Piwik\Plugins\UserSettings;
-
-use Piwik\Common;
-use Piwik\DataAccess\LogAggregator;
-use Piwik\DataArray;
-use Piwik\DataTable;
-use Piwik\Metrics;
-
-require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/functions.php';
-
-/**
- * Archiver for UserSettings Plugin
- *
- * @see PluginsArchiver
- */
-class Archiver extends \Piwik\Plugin\Archiver
-{
-    const LANGUAGE_RECORD_NAME = 'UserSettings_language';
-    const PLUGIN_RECORD_NAME = 'UserSettings_plugin';
-    const RESOLUTION_RECORD_NAME = 'UserSettings_resolution';
-    const CONFIGURATION_RECORD_NAME = 'UserSettings_configuration';
-
-    const LANGUAGE_DIMENSION = "log_visit.location_browser_lang";
-    const RESOLUTION_DIMENSION = "log_visit.config_resolution";
-    const CONFIGURATION_DIMENSION = "CONCAT(log_visit.config_os, ';', log_visit.config_browser_name, ';', log_visit.config_resolution)";
-
-    /**
-     * Daily archive of User Settings report. Processes reports for Visits by Resolution,
-     * browser plugins, etc. Some reports are built from the logs, some reports are superset of an existing report
-     */
-    public function aggregateDayReport()
-    {
-        $this->aggregateByConfiguration();
-        $this->aggregateByResolution();
-        $this->aggregateByPlugin();
-        $this->aggregateByLanguage();
-    }
-
-    /**
-     * Period archiving: simply sums up daily archives
-     */
-    public function aggregateMultipleReports()
-    {
-        $dataTableRecords = array(
-            self::CONFIGURATION_RECORD_NAME,
-            self::RESOLUTION_RECORD_NAME,
-            self::PLUGIN_RECORD_NAME,
-            self::LANGUAGE_RECORD_NAME,
-        );
-        $this->getProcessor()->aggregateDataTableRecords($dataTableRecords, $this->maximumRows);
-    }
-
-    protected function aggregateByConfiguration()
-    {
-        $metrics = $this->getLogAggregator()->getMetricsFromVisitByDimension(self::CONFIGURATION_DIMENSION)->asDataTable();
-        $this->insertTable(self::CONFIGURATION_RECORD_NAME, $metrics);
-    }
-
-    protected function aggregateByResolution()
-    {
-        $table = $this->getLogAggregator()->getMetricsFromVisitByDimension(self::RESOLUTION_DIMENSION)->asDataTable();
-        $table->filter('ColumnCallbackDeleteRow', array('label', function ($value) {
-            return strlen($value) <= 5;
-        }));
-        $this->insertTable(self::RESOLUTION_RECORD_NAME, $table);
-        return $table;
-    }
-
-    protected function aggregateByPlugin()
-    {
-        $selects = array(
-            "sum(case log_visit.config_pdf when 1 then 1 else 0 end) as pdf",
-            "sum(case log_visit.config_flash when 1 then 1 else 0 end) as flash",
-            "sum(case log_visit.config_java when 1 then 1 else 0 end) as java",
-            "sum(case log_visit.config_director when 1 then 1 else 0 end) as director",
-            "sum(case log_visit.config_quicktime when 1 then 1 else 0 end) as quicktime",
-            "sum(case log_visit.config_realplayer when 1 then 1 else 0 end) as realplayer",
-            "sum(case log_visit.config_windowsmedia when 1 then 1 else 0 end) as windowsmedia",
-            "sum(case log_visit.config_gears when 1 then 1 else 0 end) as gears",
-            "sum(case log_visit.config_silverlight when 1 then 1 else 0 end) as silverlight",
-            "sum(case log_visit.config_cookie when 1 then 1 else 0 end) as cookie"
-        );
-
-        $query = $this->getLogAggregator()->queryVisitsByDimension(array(), false, $selects, $metrics = array());
-        $data = $query->fetch();
-        $cleanRow = LogAggregator::makeArrayOneColumn($data, Metrics::INDEX_NB_VISITS);
-        $table = DataTable::makeFromIndexedArray($cleanRow);
-        $this->insertTable(self::PLUGIN_RECORD_NAME, $table);
-    }
-
-    protected function aggregateByLanguage()
-    {
-        $query = $this->getLogAggregator()->queryVisitsByDimension(array("label" => self::LANGUAGE_DIMENSION));
-        $countryCodes = Common::getCountriesList($includeInternalCodes = true);
-        $metricsByLanguage = new DataArray();
-
-        while ($row = $query->fetch()) {
-            $langCode = Common::extractLanguageCodeFromBrowserLanguage($row['label']);
-            $countryCode = Common::extractCountryCodeFromBrowserLanguage($row['label'], $countryCodes, $enableLanguageToCountryGuess = true);
-
-            if ($countryCode == 'xx' || $countryCode == $langCode) {
-                $metricsByLanguage->sumMetricsVisits($langCode, $row);
-            } else {
-                $metricsByLanguage->sumMetricsVisits($langCode . '-' . $countryCode, $row);
-            }
-        }
-
-        $report = $metricsByLanguage->asDataTable();
-        $this->insertTable(self::LANGUAGE_RECORD_NAME, $report);
-    }
-
-
-    protected function insertTable($recordName, DataTable $table)
-    {
-        $report = $table->getSerialized($this->maximumRows, null, Metrics::INDEX_NB_VISITS);
-        return $this->getProcessor()->insertBlobRecord($recordName, $report);
-    }
-
-}
-
diff --git a/plugins/UserSettings/Columns/Configuration.php b/plugins/UserSettings/Columns/Configuration.php
deleted file mode 100644
index 7577c06495..0000000000
--- a/plugins/UserSettings/Columns/Configuration.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\UserSettings\Columns;
-
-use Piwik\Columns\Dimension;
-use Piwik\Piwik;
-
-class Configuration extends Dimension
-{
-    public function getName()
-    {
-        return Piwik::translate('UserSettings_ColumnConfiguration');
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/Columns/Language.php b/plugins/UserSettings/Columns/Language.php
deleted file mode 100644
index 4f31778e2d..0000000000
--- a/plugins/UserSettings/Columns/Language.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\UserSettings\Columns;
-
-use Piwik\Common;
-use Piwik\Piwik;
-use Piwik\Plugin\Dimension\VisitDimension;
-use Piwik\Tracker\Action;
-use Piwik\Tracker\Request;
-use Piwik\Tracker\Visitor;
-
-class Language extends VisitDimension
-{
-    protected $columnName = 'location_browser_lang';
-    protected $columnType = 'VARCHAR(20) NOT NULL';
-
-    public function getName()
-    {
-        return Piwik::translate('General_Language');
-    }
-
-    /**
-     * @param Request $request
-     * @param Visitor $visitor
-     * @param Action|null $action
-     * @return mixed
-     */
-    public function onNewVisit(Request $request, Visitor $visitor, $action)
-    {
-        return $this->getSingleLanguageFromAcceptedLanguages($request->getBrowserLanguage());
-    }
-
-    /**
-     * For better privacy we store only the main language code, instead of the whole browser language string.
-     * 
-     * @param $acceptLanguagesString
-     * @return string
-     */
-    protected function getSingleLanguageFromAcceptedLanguages($acceptLanguagesString)
-    {
-        if (empty($acceptLanguagesString)) {
-            return '';
-        }
-
-        $languageCode = Common::extractLanguageAndRegionCodeFromBrowserLanguage($acceptLanguagesString);
-        return $languageCode;
-    }
-}
diff --git a/plugins/UserSettings/Columns/Plugin.php b/plugins/UserSettings/Columns/Plugin.php
deleted file mode 100644
index a6ecef0c29..0000000000
--- a/plugins/UserSettings/Columns/Plugin.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\UserSettings\Columns;
-
-use Piwik\Columns\Dimension;
-use Piwik\Piwik;
-
-class Plugin extends Dimension
-{
-    public function getName()
-    {
-        return Piwik::translate('General_Plugin');
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/Columns/PluginCookie.php b/plugins/UserSettings/Columns/PluginCookie.php
deleted file mode 100644
index 8af841ca52..0000000000
--- a/plugins/UserSettings/Columns/PluginCookie.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\UserSettings\Columns;
-
-use Piwik\Common;
-use Piwik\Plugin\Dimension\VisitDimension;
-use Piwik\Tracker\Request;
-use Piwik\Tracker\Visitor;
-use Piwik\Tracker\Action;
-
-class PluginCookie extends VisitDimension
-{
-    protected $columnName = 'config_cookie';
-    protected $columnType = 'TINYINT(1) NOT NULL';
-
-    /**
-     * @param Request $request
-     * @param Visitor $visitor
-     * @param Action|null $action
-     * @return mixed
-     */
-    public function onNewVisit(Request $request, Visitor $visitor, $action)
-    {
-        return Common::getRequestVar('cookie', 0, 'int', $request->getParams());
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/Columns/PluginDirector.php b/plugins/UserSettings/Columns/PluginDirector.php
deleted file mode 100644
index 58019826ce..0000000000
--- a/plugins/UserSettings/Columns/PluginDirector.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\UserSettings\Columns;
-
-use Piwik\Common;
-use Piwik\Plugin\Dimension\VisitDimension;
-use Piwik\Tracker\Request;
-use Piwik\Tracker\Visitor;
-use Piwik\Tracker\Action;
-
-class PluginDirector extends VisitDimension
-{
-    protected $columnName = 'config_director';
-    protected $columnType = 'TINYINT(1) NOT NULL';
-
-    /**
-     * @param Request $request
-     * @param Visitor $visitor
-     * @param Action|null $action
-     * @return mixed
-     */
-    public function onNewVisit(Request $request, Visitor $visitor, $action)
-    {
-        return Common::getRequestVar('dir', 0, 'int', $request->getParams());
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/Columns/PluginFlash.php b/plugins/UserSettings/Columns/PluginFlash.php
deleted file mode 100644
index d691d200a4..0000000000
--- a/plugins/UserSettings/Columns/PluginFlash.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\UserSettings\Columns;
-
-use Piwik\Common;
-use Piwik\Plugin\Dimension\VisitDimension;
-use Piwik\Tracker\Request;
-use Piwik\Tracker\Visitor;
-use Piwik\Tracker\Action;
-
-class PluginFlash extends VisitDimension
-{
-    protected $columnName = 'config_flash';
-    protected $columnType = 'TINYINT(1) NOT NULL';
-
-    /**
-     * @param Request $request
-     * @param Visitor $visitor
-     * @param Action|null $action
-     * @return mixed
-     */
-    public function onNewVisit(Request $request, Visitor $visitor, $action)
-    {
-        return Common::getRequestVar('fla', 0, 'int', $request->getParams());
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/Columns/PluginGears.php b/plugins/UserSettings/Columns/PluginGears.php
deleted file mode 100644
index edf024877e..0000000000
--- a/plugins/UserSettings/Columns/PluginGears.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\UserSettings\Columns;
-
-use Piwik\Common;
-use Piwik\Plugin\Dimension\VisitDimension;
-use Piwik\Tracker\Request;
-use Piwik\Tracker\Visitor;
-use Piwik\Tracker\Action;
-
-class PluginGears extends VisitDimension
-{
-    protected $columnName = 'config_gears';
-    protected $columnType = 'TINYINT(1) NOT NULL';
-
-    /**
-     * @param Request $request
-     * @param Visitor $visitor
-     * @param Action|null $action
-     * @return mixed
-     */
-    public function onNewVisit(Request $request, Visitor $visitor, $action)
-    {
-        return Common::getRequestVar('gears', 0, 'int', $request->getParams());
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/Columns/PluginJava.php b/plugins/UserSettings/Columns/PluginJava.php
deleted file mode 100644
index 0db9b81778..0000000000
--- a/plugins/UserSettings/Columns/PluginJava.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\UserSettings\Columns;
-
-use Piwik\Common;
-use Piwik\Plugin\Dimension\VisitDimension;
-use Piwik\Tracker\Request;
-use Piwik\Tracker\Visitor;
-use Piwik\Tracker\Action;
-
-class PluginJava extends VisitDimension
-{
-    protected $columnName = 'config_java';
-    protected $columnType = 'TINYINT(1) NOT NULL';
-
-    /**
-     * @param Request $request
-     * @param Visitor $visitor
-     * @param Action|null $action
-     * @return mixed
-     */
-    public function onNewVisit(Request $request, Visitor $visitor, $action)
-    {
-        return Common::getRequestVar('java', 0, 'int', $request->getParams());
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/Columns/PluginPdf.php b/plugins/UserSettings/Columns/PluginPdf.php
deleted file mode 100644
index c50f92c53e..0000000000
--- a/plugins/UserSettings/Columns/PluginPdf.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\UserSettings\Columns;
-
-use Piwik\Common;
-use Piwik\Plugin\Dimension\VisitDimension;
-use Piwik\Tracker\Request;
-use Piwik\Tracker\Visitor;
-use Piwik\Tracker\Action;
-
-class PluginPdf extends VisitDimension
-{
-    protected $columnName = 'config_pdf';
-    protected $columnType = 'TINYINT(1) NOT NULL';
-
-    /**
-     * @param Request $request
-     * @param Visitor $visitor
-     * @param Action|null $action
-     * @return mixed
-     */
-    public function onNewVisit(Request $request, Visitor $visitor, $action)
-    {
-        return Common::getRequestVar('pdf', 0, 'int', $request->getParams());
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/Columns/PluginQuickTime.php b/plugins/UserSettings/Columns/PluginQuickTime.php
deleted file mode 100644
index ea2f85ad0b..0000000000
--- a/plugins/UserSettings/Columns/PluginQuickTime.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\UserSettings\Columns;
-
-use Piwik\Common;
-use Piwik\Plugin\Dimension\VisitDimension;
-use Piwik\Tracker\Request;
-use Piwik\Tracker\Visitor;
-use Piwik\Tracker\Action;
-
-class PluginQuickTime extends VisitDimension
-{
-    protected $columnName = 'config_quicktime';
-    protected $columnType = 'TINYINT(1) NOT NULL';
-
-    /**
-     * @param Request $request
-     * @param Visitor $visitor
-     * @param Action|null $action
-     * @return mixed
-     */
-    public function onNewVisit(Request $request, Visitor $visitor, $action)
-    {
-        return Common::getRequestVar('qt', 0, 'int', $request->getParams());
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/Columns/PluginRealPlayer.php b/plugins/UserSettings/Columns/PluginRealPlayer.php
deleted file mode 100644
index b8e17c605c..0000000000
--- a/plugins/UserSettings/Columns/PluginRealPlayer.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\UserSettings\Columns;
-
-use Piwik\Common;
-use Piwik\Plugin\Dimension\VisitDimension;
-use Piwik\Tracker\Request;
-use Piwik\Tracker\Visitor;
-use Piwik\Tracker\Action;
-
-class PluginRealPlayer extends VisitDimension
-{
-    protected $columnName = 'config_realplayer';
-    protected $columnType = 'TINYINT(1) NOT NULL';
-
-    /**
-     * @param Request $request
-     * @param Visitor $visitor
-     * @param Action|null $action
-     * @return mixed
-     */
-    public function onNewVisit(Request $request, Visitor $visitor, $action)
-    {
-        return Common::getRequestVar('realp', 0, 'int', $request->getParams());
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/Columns/PluginSilverlight.php b/plugins/UserSettings/Columns/PluginSilverlight.php
deleted file mode 100644
index f917c3d296..0000000000
--- a/plugins/UserSettings/Columns/PluginSilverlight.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\UserSettings\Columns;
-
-use Piwik\Common;
-use Piwik\Plugin\Dimension\VisitDimension;
-use Piwik\Tracker\Request;
-use Piwik\Tracker\Visitor;
-use Piwik\Tracker\Action;
-
-class PluginSilverlight extends VisitDimension
-{
-    protected $columnName = 'config_silverlight';
-    protected $columnType = 'TINYINT(1) NOT NULL';
-
-    /**
-     * @param Request $request
-     * @param Visitor $visitor
-     * @param Action|null $action
-     * @return mixed
-     */
-    public function onNewVisit(Request $request, Visitor $visitor, $action)
-    {
-        return Common::getRequestVar('ag', 0, 'int', $request->getParams());
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/Columns/PluginWindowsMedia.php b/plugins/UserSettings/Columns/PluginWindowsMedia.php
deleted file mode 100644
index 02e7088ce0..0000000000
--- a/plugins/UserSettings/Columns/PluginWindowsMedia.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\UserSettings\Columns;
-
-use Piwik\Common;
-use Piwik\Plugin\Dimension\VisitDimension;
-use Piwik\Tracker\Request;
-use Piwik\Tracker\Visitor;
-use Piwik\Tracker\Action;
-
-class PluginWindowsMedia extends VisitDimension
-{
-    protected $columnName = 'config_windowsmedia';
-    protected $columnType = 'TINYINT(1) NOT NULL';
-
-    /**
-     * @param Request $request
-     * @param Visitor $visitor
-     * @param Action|null $action
-     * @return mixed
-     */
-    public function onNewVisit(Request $request, Visitor $visitor, $action)
-    {
-        return Common::getRequestVar('wma', 0, 'int', $request->getParams());
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/Columns/Resolution.php b/plugins/UserSettings/Columns/Resolution.php
deleted file mode 100644
index 35aaf4a23e..0000000000
--- a/plugins/UserSettings/Columns/Resolution.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\UserSettings\Columns;
-
-use Piwik\Piwik;
-use Piwik\Plugin\Dimension\VisitDimension;
-use Piwik\Plugins\UserSettings\Segment;
-use Piwik\Tracker\Action;
-use Piwik\Tracker\Request;
-use Piwik\Tracker\Visitor;
-
-class Resolution extends VisitDimension
-{
-    protected $columnName = 'config_resolution';
-    protected $columnType = 'VARCHAR(9) NOT NULL';
-
-    protected function configureSegments()
-    {
-        $segment = new Segment();
-        $segment->setSegment('resolution');
-        $segment->setName('UserSettings_ColumnResolution');
-        $segment->setAcceptedValues('1280x1024, 800x600, etc.');
-        $this->addSegment($segment);
-    }
-
-    /**
-     * @param Request $request
-     * @param Visitor $visitor
-     * @param Action|null $action
-     * @return mixed
-     */
-    public function onNewVisit(Request $request, Visitor $visitor, $action)
-    {
-        $resolution = $request->getParam('res');
-
-        if (!empty($resolution)) {
-            return substr($resolution, 0, 9);
-        }
-
-        return $resolution;
-    }
-
-    public function getName()
-    {
-        return Piwik::translate('UserSettings_ColumnResolution');
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/Controller.php b/plugins/UserSettings/Controller.php
index a6154b5f29..948f2c5a25 100644
--- a/plugins/UserSettings/Controller.php
+++ b/plugins/UserSettings/Controller.php
@@ -8,10 +8,11 @@
  */
 namespace Piwik\Plugins\UserSettings;
 
-use Piwik\Plugins\UserSettings\Reports\GetConfiguration;
-use Piwik\Plugins\UserSettings\Reports\GetLanguage;
-use Piwik\Plugins\UserSettings\Reports\GetPlugin;
-use Piwik\Plugins\UserSettings\Reports\GetResolution;
+use Piwik\Plugin\Manager as PluginManager;
+use Piwik\Plugins\Resolution\Reports\GetConfiguration;
+use Piwik\Plugins\UserLanguage\Reports\GetLanguage;
+use Piwik\Plugins\DevicePlugins\Reports\GetPlugin;
+use Piwik\Plugins\Resolution\Reports\GetResolution;
 use Piwik\View;
 
 /**
@@ -23,10 +24,16 @@ class Controller extends \Piwik\Plugin\Controller
     {
         $view = new View('@UserSettings/index');
 
-        $view->dataTablePlugin = $this->renderReport(new GetPlugin());
-        $view->dataTableResolution = $this->renderReport(new GetResolution());
-        $view->dataTableConfiguration = $this->renderReport(new GetConfiguration());
-        $view->dataTableBrowserLanguage = $this->renderReport(new GetLanguage());
+        $isDeviceDetectionEnabled = PluginManager::getInstance()->isPluginActivated('DevicePlugins');
+        if ($isDeviceDetectionEnabled) {
+            $view->dataTablePlugin = $this->renderReport(new GetPlugin());
+        }
+
+        $isResolutionEnabled = PluginManager::getInstance()->isPluginActivated('Resolution');
+        if ($isResolutionEnabled) {
+            $view->dataTableResolution = $this->renderReport(new GetResolution());
+            $view->dataTableConfiguration = $this->renderReport(new GetConfiguration());
+        }
 
         return $view->render();
     }
diff --git a/plugins/UserSettings/Reports/Base.php b/plugins/UserSettings/Reports/Base.php
deleted file mode 100644
index e802c9a3f1..0000000000
--- a/plugins/UserSettings/Reports/Base.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\UserSettings\Reports;
-
-use Piwik\Plugin\ViewDataTable;
-use Piwik\Plugins\CoreVisualizations\Visualizations\Graph;
-
-abstract class Base extends \Piwik\Plugin\Report
-{
-    protected function init()
-    {
-        $this->category = 'UserSettings_VisitorSettings';
-    }
-
-    protected function getBasicUserSettingsDisplayProperties(ViewDataTable $view)
-    {
-        $view->config->show_search = false;
-        $view->config->show_exclude_low_population = false;
-
-        $view->requestConfig->filter_limit = 5;
-
-        if ($view->isViewDataTableId(Graph::ID)) {
-            $view->config->max_graph_elements = 5;
-        }
-    }
-}
diff --git a/plugins/UserSettings/Reports/GetConfiguration.php b/plugins/UserSettings/Reports/GetConfiguration.php
deleted file mode 100644
index 67b00f8b7d..0000000000
--- a/plugins/UserSettings/Reports/GetConfiguration.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\UserSettings\Reports;
-
-use Piwik\Piwik;
-use Piwik\Plugin\ViewDataTable;
-use Piwik\Plugins\UserSettings\Columns\Configuration;
-
-class GetConfiguration extends Base
-{
-    protected function init()
-    {
-        parent::init();
-        $this->dimension     = new Configuration();
-        $this->name          = Piwik::translate('UserSettings_WidgetGlobalVisitors');
-        $this->documentation = Piwik::translate('UserSettings_WidgetGlobalVisitorsDocumentation', '<br />');
-        $this->order = 7;
-        $this->widgetTitle  = 'UserSettings_WidgetGlobalVisitors';
-    }
-
-    public function configureView(ViewDataTable $view)
-    {
-        $this->getBasicUserSettingsDisplayProperties($view);
-
-        $view->config->addTranslation('label', $this->dimension->getName());
-
-        $view->requestConfig->filter_limit = 3;
-    }
-
-}
diff --git a/plugins/UserSettings/Reports/GetLanguage.php b/plugins/UserSettings/Reports/GetLanguage.php
deleted file mode 100644
index 9c67e8b8ea..0000000000
--- a/plugins/UserSettings/Reports/GetLanguage.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\UserSettings\Reports;
-
-use Piwik\Piwik;
-use Piwik\Plugin\ViewDataTable;
-use Piwik\Plugins\UserSettings\Columns\Language;
-
-class GetLanguage extends Base
-{
-    protected function init()
-    {
-        parent::init();
-        $this->dimension     = new Language();
-        $this->name          = Piwik::translate('UserSettings_BrowserLanguage');
-        $this->documentation = ''; // TODO
-        $this->order = 10;
-        $this->widgetTitle  = 'UserSettings_BrowserLanguage';
-    }
-
-    public function configureView(ViewDataTable $view)
-    {
-        $view->config->show_search = false;
-        $view->config->columns_to_display = array('label', 'nb_visits');
-        $view->config->show_exclude_low_population = false;
-        $view->config->addTranslation('label', $this->dimension->getName());
-
-        $view->requestConfig->filter_sort_column = 'nb_visits';
-        $view->requestConfig->filter_sort_order  = 'desc';
-    }
-
-    public function getRelatedReports() {
-        return array(
-            new GetLanguageCode()
-        );
-    }
-
-}
diff --git a/plugins/UserSettings/Reports/GetLanguageCode.php b/plugins/UserSettings/Reports/GetLanguageCode.php
deleted file mode 100644
index c6b609c8f9..0000000000
--- a/plugins/UserSettings/Reports/GetLanguageCode.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\UserSettings\Reports;
-
-use Piwik\Piwik;
-use Piwik\Plugins\UserSettings\Columns\Language;
-
-class GetLanguageCode extends GetLanguage
-{
-    protected function init()
-    {
-        parent::init();
-        $this->dimension     = new Language();
-        $this->name          = Piwik::translate('UserSettings_LanguageCode');
-        $this->documentation = '';
-        $this->order = 11;
-        $this->widgetTitle  = 'UserSettings_LanguageCode';
-    }
-
-    public function getRelatedReports()
-    {
-        return array(
-            new GetLanguage()
-        );
-    }
-
-}
diff --git a/plugins/UserSettings/Reports/GetPlugin.php b/plugins/UserSettings/Reports/GetPlugin.php
deleted file mode 100644
index e9512c4256..0000000000
--- a/plugins/UserSettings/Reports/GetPlugin.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\UserSettings\Reports;
-
-use Piwik\Piwik;
-use Piwik\Plugin\ViewDataTable;
-use Piwik\Plugins\UserSettings\Columns\Plugin;
-
-class GetPlugin extends Base
-{
-    protected function init()
-    {
-        parent::init();
-        $this->dimension     = new Plugin();
-        $this->name          = Piwik::translate('UserSettings_WidgetPlugins');
-        $this->documentation = Piwik::translate('UserSettings_WidgetPluginsDocumentation', '<br />');
-        $this->metrics       = array('nb_visits');
-        $this->constantRowsCount = true;
-        $this->processedMetrics = array('nb_visits_percentage');
-        $this->order = 4;
-        $this->widgetTitle  = 'UserSettings_WidgetPlugins';
-    }
-
-    public function configureView(ViewDataTable $view)
-    {
-        $this->getBasicUserSettingsDisplayProperties($view);
-
-        $view->config->addTranslations(array(
-            'label'                => $this->dimension->getName(),
-            'nb_visits_percentage' =>
-            str_replace(' ', '&nbsp;', Piwik::translate('General_ColumnPercentageVisits'))
-        ));
-
-        $view->config->show_offset_information = false;
-        $view->config->show_pagination_control = false;
-        $view->config->show_limit_control      = false;
-        $view->config->show_all_views_icons    = false;
-        $view->config->show_table_all_columns  = false;
-        $view->config->columns_to_display  = array('label', 'nb_visits_percentage', 'nb_visits');
-        $view->config->show_footer_message = Piwik::translate('UserSettings_PluginDetectionDoesNotWorkInIE');
-
-        $view->requestConfig->filter_sort_column = 'nb_visits_percentage';
-        $view->requestConfig->filter_sort_order  = 'desc';
-        $view->requestConfig->filter_limit       = 10;
-    }
-
-}
diff --git a/plugins/UserSettings/Reports/GetResolution.php b/plugins/UserSettings/Reports/GetResolution.php
deleted file mode 100644
index 2c8012a8d1..0000000000
--- a/plugins/UserSettings/Reports/GetResolution.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\UserSettings\Reports;
-
-use Piwik\Piwik;
-use Piwik\Plugin\ViewDataTable;
-use Piwik\Plugins\UserSettings\Columns\Resolution;
-
-class GetResolution extends Base
-{
-    protected function init()
-    {
-        parent::init();
-        $this->dimension     = new Resolution();
-        $this->name          = Piwik::translate('UserSettings_WidgetResolutions');
-        $this->documentation = ''; // TODO
-        $this->order = 0;
-        $this->widgetTitle  = 'UserSettings_WidgetResolutions';
-    }
-
-    public function configureView(ViewDataTable $view)
-    {
-        $this->getBasicUserSettingsDisplayProperties($view);
-
-        $view->config->addTranslation('label', $this->dimension->getName());
-    }
-
-}
diff --git a/plugins/UserSettings/Segment.php b/plugins/UserSettings/Segment.php
deleted file mode 100644
index 194ab6314a..0000000000
--- a/plugins/UserSettings/Segment.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\UserSettings;
-
-/**
- * UserSettings segment base class.
- *
- */
-class Segment extends \Piwik\Plugin\Segment
-{
-    protected  function init()
-    {
-        $this->setCategory('General_Visit');
-    }
-}
diff --git a/plugins/UserSettings/UserSettings.php b/plugins/UserSettings/UserSettings.php
index 8158470544..7c90528502 100644
--- a/plugins/UserSettings/UserSettings.php
+++ b/plugins/UserSettings/UserSettings.php
@@ -23,9 +23,7 @@ class UserSettings extends \Piwik\Plugin
     public function getListHooksRegistered()
     {
         return array(
-            'Metrics.getDefaultMetricTranslations' => 'addMetricTranslations',
-            'Live.getAllVisitorDetails'            => 'extendVisitorDetails',
-            'Request.dispatch'                     => 'mapDeprecatedActions'
+            'Request.getRenamedModuleAndAction'    => 'renameDeprecatedModuleAndAction',
         );
     }
 
@@ -35,9 +33,8 @@ class UserSettings extends \Piwik\Plugin
      * @deprecated since 2.10.0 and will be removed from May 1st 2015
      * @param $module
      * @param $action
-     * @param $parameters
      */
-    public function mapDeprecatedActions(&$module, &$action, &$parameters)
+    public function renameDeprecatedModuleAndAction(&$module, &$action)
     {
         $movedMethods = array(
             'getBrowser' => 'getBrowsers',
@@ -45,31 +42,24 @@ class UserSettings extends \Piwik\Plugin
             'getMobileVsDesktop' => 'getType',
             'getOS' => 'getOsVersions',
             'getOSFamily' => 'getOsFamilies',
-            'getBrowserType' => 'getBrowserEngines'
+            'getBrowserType' => 'getBrowserEngines',
         );
 
         if ($module == 'UserSettings' && array_key_exists($action, $movedMethods)) {
             $module = 'DevicesDetection';
             $action = $movedMethods[$action];
         }
-    }
-
-    public function extendVisitorDetails(&$visitor, $details)
-    {
-        $instance = new Visitor($details);
 
-        $visitor['resolution']               = $instance->getResolution();
-        $visitor['plugins']                  = $instance->getPlugins();
-        $visitor['pluginsIcons']             = $instance->getPluginIcons();
-    }
+        if ($module == 'UserSettings' && ($action == 'getResolution' || $action == 'getConfiguration')) {
+            $module = 'Resolution';
+        }
 
-    public function addMetricTranslations(&$translations)
-    {
-        $metrics = array(
-            'nb_visits_percentage' => Piwik::translate('General_ColumnPercentageVisits')
-        );
+        if ($module == 'UserSettings' && ($action == 'getLanguage' || $action == 'getLanguageCode')) {
+            $module = 'UserLanguage';
+        }
 
-        $translations = array_merge($translations, $metrics);
+        if ($module == 'UserSettings' && $action == 'getPlugin') {
+            $module = 'DevicePlugins';
+        }
     }
-
 }
diff --git a/plugins/UserSettings/Visitor.php b/plugins/UserSettings/Visitor.php
deleted file mode 100644
index 33f3528487..0000000000
--- a/plugins/UserSettings/Visitor.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\UserSettings;
-
-require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/functions.php';
-
-class Visitor
-{
-    const DELIMITER_PLUGIN_NAME = ", ";
-
-    private $details = array();
-
-    public function __construct($details)
-    {
-        $this->details = $details;
-    }
-
-    function getPlugins()
-    {
-        $plugins = array(
-            'config_pdf',
-            'config_flash',
-            'config_java',
-            'config_director',
-            'config_quicktime',
-            'config_realplayer',
-            'config_windowsmedia',
-            'config_gears',
-            'config_silverlight',
-        );
-        $pluginShortNames = array();
-
-        foreach ($plugins as $plugin) {
-            if (array_key_exists($plugin, $this->details) && $this->details[$plugin] == 1) {
-                $pluginShortName    = substr($plugin, 7);
-                $pluginShortNames[] = $pluginShortName;
-            }
-        }
-
-        return implode(self::DELIMITER_PLUGIN_NAME, $pluginShortNames);
-    }
-
-    function getPluginIcons()
-    {
-        $pluginNames = $this->getPlugins();
-        if (!empty($pluginNames)) {
-            $pluginNames = explode(self::DELIMITER_PLUGIN_NAME, $pluginNames);
-            $pluginIcons = array();
-
-            foreach ($pluginNames as $plugin) {
-                $pluginIcons[] = array("pluginIcon" => getPluginsLogo($plugin), "pluginName" => $plugin);
-            }
-
-            return $pluginIcons;
-        }
-
-        return null;
-    }
-
-    function getResolution()
-    {
-        if (!array_key_exists('config_resolution', $this->details)) {
-            return null;
-        }
-
-        return $this->details['config_resolution'];
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/functions.php b/plugins/UserSettings/functions.php
deleted file mode 100644
index eaab5557c7..0000000000
--- a/plugins/UserSettings/functions.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-
-namespace Piwik\Plugins\UserSettings;
-
-use Piwik\Piwik;
-use Piwik\Tracker\Request;
-
-function getPluginsLogo($oldLabel)
-{
-    if ($oldLabel == Piwik::translate('General_Others')) {
-        return false;
-    }
-    return 'plugins/UserSettings/images/plugins/' . $oldLabel . '.gif';
-}
-
-function getConfigurationLabel($str)
-{
-    if (strpos($str, ';') === false) {
-        return $str;
-    }
-    $values = explode(";", $str);
-
-    $os = \Piwik\Plugins\DevicesDetection\getOsFullName($values[0]);
-    $name = $values[1];
-    $browser = \Piwik\Plugins\DevicesDetection\getBrowserName($name);
-    if ($browser === false) {
-        $browser = Piwik::translate('General_Unknown');
-    }
-    $resolution = $values[2];
-    return $os . " / " . $browser . " / " . $resolution;
-}
-
-/**
- * Returns the given language code to translated language name
- *
- * @param $label
- *
- * @return string
- */
-function languageTranslate($label)
-{
-    if ($label == '' || $label == 'xx') {
-        return Piwik::translate('General_Unknown');
-    }
-
-    $key = 'UserSettings_Language_' . $label;
-
-    $translation = Piwik::translate($key);
-
-    // Show language code if unknown code
-    if ($translation == $key) {
-        $translation = Piwik::translate('UserSettings_LanguageCode') . ' ' . $label;
-    }
-
-    return $translation;
-}
-
-/**
- * @param $label
- * @return string
- */
-function languageTranslateWithCode($label)
-{
-    $ex = explode('-', $label);
-    $lang = languageTranslate($ex[0]);
-
-    if (count($ex) == 2 && $ex[0] != $ex[1]) {
-        $countryKey = 'UserCountry_country_' . $ex[1];
-        $country = Piwik::translate($countryKey);
-
-        if ($country == $countryKey) {
-            return sprintf("%s (%s)", $lang, $ex[0]);
-        }
-
-        return sprintf("%s - %s (%s)", $lang, $country, $label);
-
-    } else {
-        return sprintf("%s (%s)", $lang, $ex[0]);
-    }
-
-}
-
-/**
- * @param $lang
- * @return mixed
- */
-function groupByLangCallback($lang)
-{
-    $ex = explode('-', $lang);
-    return $ex[0];
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/images/os/W10.gif b/plugins/UserSettings/images/os/W10.gif
deleted file mode 100644
index 76ffe21587..0000000000
--- a/plugins/UserSettings/images/os/W10.gif
+++ /dev/null
diff --git a/plugins/UserSettings/images/os/W2K.gif b/plugins/UserSettings/images/os/W2K.gif
deleted file mode 100644
index db610368b9..0000000000
--- a/plugins/UserSettings/images/os/W2K.gif
+++ /dev/null
diff --git a/plugins/UserSettings/images/os/W61.gif b/plugins/UserSettings/images/os/W61.gif
deleted file mode 100644
index 773c4d48d1..0000000000
--- a/plugins/UserSettings/images/os/W61.gif
+++ /dev/null
diff --git a/plugins/UserSettings/images/os/W65.gif b/plugins/UserSettings/images/os/W65.gif
deleted file mode 100644
index 773c4d48d1..0000000000
--- a/plugins/UserSettings/images/os/W65.gif
+++ /dev/null
diff --git a/plugins/UserSettings/images/os/W75.gif b/plugins/UserSettings/images/os/W75.gif
deleted file mode 100644
index 3ca9cebca0..0000000000
--- a/plugins/UserSettings/images/os/W75.gif
+++ /dev/null
diff --git a/plugins/UserSettings/images/os/W81.gif b/plugins/UserSettings/images/os/W81.gif
deleted file mode 100644
index 76ffe21587..0000000000
--- a/plugins/UserSettings/images/os/W81.gif
+++ /dev/null
diff --git a/plugins/UserSettings/images/os/W95.gif b/plugins/UserSettings/images/os/W95.gif
deleted file mode 100644
index db610368b9..0000000000
--- a/plugins/UserSettings/images/os/W95.gif
+++ /dev/null
diff --git a/plugins/UserSettings/images/os/W98.gif b/plugins/UserSettings/images/os/W98.gif
deleted file mode 100644
index db610368b9..0000000000
--- a/plugins/UserSettings/images/os/W98.gif
+++ /dev/null
diff --git a/plugins/UserSettings/images/os/WI7.gif b/plugins/UserSettings/images/os/WI7.gif
deleted file mode 100644
index 486f78064a..0000000000
--- a/plugins/UserSettings/images/os/WI7.gif
+++ /dev/null
diff --git a/plugins/UserSettings/images/os/WI8.gif b/plugins/UserSettings/images/os/WI8.gif
deleted file mode 100644
index 76ffe21587..0000000000
--- a/plugins/UserSettings/images/os/WI8.gif
+++ /dev/null
diff --git a/plugins/UserSettings/images/os/WME.gif b/plugins/UserSettings/images/os/WME.gif
deleted file mode 100644
index 1ba0336426..0000000000
--- a/plugins/UserSettings/images/os/WME.gif
+++ /dev/null
diff --git a/plugins/UserSettings/images/os/WNT.gif b/plugins/UserSettings/images/os/WNT.gif
deleted file mode 100644
index db610368b9..0000000000
--- a/plugins/UserSettings/images/os/WNT.gif
+++ /dev/null
diff --git a/plugins/UserSettings/images/os/WP7.gif b/plugins/UserSettings/images/os/WP7.gif
deleted file mode 100644
index 3ca9cebca0..0000000000
--- a/plugins/UserSettings/images/os/WP7.gif
+++ /dev/null
diff --git a/plugins/UserSettings/images/os/WS3.gif b/plugins/UserSettings/images/os/WS3.gif
deleted file mode 100644
index 486f78064a..0000000000
--- a/plugins/UserSettings/images/os/WS3.gif
+++ /dev/null
diff --git a/plugins/UserSettings/images/os/WVI.gif b/plugins/UserSettings/images/os/WVI.gif
deleted file mode 100644
index 486f78064a..0000000000
--- a/plugins/UserSettings/images/os/WVI.gif
+++ /dev/null
diff --git a/plugins/UserSettings/images/os/WXP.gif b/plugins/UserSettings/images/os/WXP.gif
deleted file mode 100644
index 486f78064a..0000000000
--- a/plugins/UserSettings/images/os/WXP.gif
+++ /dev/null
diff --git a/plugins/UserSettings/images/screens/dual.gif b/plugins/UserSettings/images/screens/dual.gif
deleted file mode 100644
index a8cb8b2963..0000000000
--- a/plugins/UserSettings/images/screens/dual.gif
+++ /dev/null
diff --git a/plugins/UserSettings/images/screens/mobile.gif b/plugins/UserSettings/images/screens/mobile.gif
deleted file mode 100644
index 814642933f..0000000000
--- a/plugins/UserSettings/images/screens/mobile.gif
+++ /dev/null
diff --git a/plugins/UserSettings/images/screens/normal.gif b/plugins/UserSettings/images/screens/normal.gif
deleted file mode 100644
index afe97e9d9f..0000000000
--- a/plugins/UserSettings/images/screens/normal.gif
+++ /dev/null
diff --git a/plugins/UserSettings/images/screens/unknown.gif b/plugins/UserSettings/images/screens/unknown.gif
deleted file mode 100644
index 2c44083422..0000000000
--- a/plugins/UserSettings/images/screens/unknown.gif
+++ /dev/null
diff --git a/plugins/UserSettings/images/screens/wide.gif b/plugins/UserSettings/images/screens/wide.gif
deleted file mode 100644
index 1b09fc529b..0000000000
--- a/plugins/UserSettings/images/screens/wide.gif
+++ /dev/null
diff --git a/plugins/UserSettings/lang/am.json b/plugins/UserSettings/lang/am.json
deleted file mode 100644
index 2897ffa618..0000000000
--- a/plugins/UserSettings/lang/am.json
+++ /dev/null
@@ -1,167 +0,0 @@
-{
-    "UserSettings": {
-        "ColumnConfiguration": "ውቅረት",
-        "ColumnResolution": "ጥራት",
-        "Configurations": "ውቅረቶች",
-        "Language_aa": "አፋርኛ",
-        "Language_ab": "አብሐዚኛ",
-        "Language_af": "አፍሪካንስኛ",
-        "Language_ak": "አካንኛ",
-        "Language_am": "አማርኛ",
-        "Language_ar": "ዐርቢኛ",
-        "Language_as": "አሳሜዛዊ",
-        "Language_ay": "አያማርኛ",
-        "Language_az": "አዜርባይጃንኛ",
-        "Language_ba": "ባስኪርኛ",
-        "Language_be": "ቤላራሻኛ",
-        "Language_bg": "ቡልጋሪኛ",
-        "Language_bh": "ቢሃሪ",
-        "Language_bi": "ቢስላምኛ",
-        "Language_bn": "በንጋሊኛ",
-        "Language_bo": "ትበትንኛ",
-        "Language_br": "ብሬቶንኛ",
-        "Language_bs": "ቦስኒያንኛ",
-        "Language_ca": "ካታላንኛ",
-        "Language_co": "ኮርሲካኛ",
-        "Language_cs": "ቼክኛ",
-        "Language_cy": "ወልሽ",
-        "Language_da": "ዴኒሽ",
-        "Language_de": "ጀርመን",
-        "Language_dv": "ዲቬህ",
-        "Language_dz": "ድዞንግኻኛ",
-        "Language_ee": "ኢዊ",
-        "Language_el": "ግሪክኛ",
-        "Language_en": "እንግሊዝኛ",
-        "Language_eo": "ኤስፐራንቶ",
-        "Language_es": "ስፓኒሽ",
-        "Language_et": "ኤስቶኒአን",
-        "Language_eu": "ባስክኛ",
-        "Language_fa": "ፐርሲያኛ",
-        "Language_fi": "ፊኒሽ",
-        "Language_fj": "ፊጂኛ",
-        "Language_fo": "ፋሮኛ",
-        "Language_fr": "ፈረንሳይኛ",
-        "Language_fy": "ፍሪስኛ",
-        "Language_ga": "አይሪሽ",
-        "Language_gd": "እስኮትስ ጌልክኛ",
-        "Language_gl": "ጋለጋኛ",
-        "Language_gn": "ጓራኒኛ",
-        "Language_gu": "ጉጃርቲኛ",
-        "Language_ha": "ሃውሳኛ",
-        "Language_he": "ዕብራስጥ",
-        "Language_hi": "ሐንድኛ",
-        "Language_hr": "ክሮሽያንኛ",
-        "Language_ht": "ሃይትኛ",
-        "Language_hu": "ሀንጋሪኛ",
-        "Language_hy": "አርመናዊ",
-        "Language_ia": "ኢንቴርሊንጓ",
-        "Language_id": "እንዶኒሲኛ",
-        "Language_ie": "እንተርሊንግወ",
-        "Language_ig": "ኢግቦኛ",
-        "Language_ik": "እኑፒያቅኛ",
-        "Language_is": "አይስላንድኛ",
-        "Language_it": "ጣሊያንኛ",
-        "Language_iu": "እኑክቲቱትኛ",
-        "Language_ja": "ጃፓንኛ",
-        "Language_jv": "ጃቫንኛ",
-        "Language_ka": "ጊዮርጊያን",
-        "Language_kg": "ኮንጎኛ",
-        "Language_kk": "ካዛክኛ",
-        "Language_kl": "ካላሊሱትኛ",
-        "Language_km": "ክመርኛ",
-        "Language_kn": "ካናዳኛ",
-        "Language_ko": "ኮሪያኛ",
-        "Language_ks": "ካሽሚርኛ",
-        "Language_ku": "ኩርድሽኛ",
-        "Language_ky": "ኪርጊዝኛ",
-        "Language_la": "ላቲንኛ",
-        "Language_lb": "ሉክዘምበርገርኛ",
-        "Language_lg": "ጋንዳኛ",
-        "Language_ln": "ሊንጋላኛ",
-        "Language_lo": "ላውስኛ",
-        "Language_lt": "ሊቱአኒያን",
-        "Language_lv": "ላትቪያን",
-        "Language_mg": "ማላጋስኛ",
-        "Language_mi": "ማዮሪኛ",
-        "Language_mk": "ማከዶኒኛ",
-        "Language_ml": "ማላያላምኛ",
-        "Language_mn": "ሞንጎላዊኛ",
-        "Language_mr": "ማራዚኛ",
-        "Language_ms": "ማላይኛ",
-        "Language_mt": "ማልቲስኛ",
-        "Language_my": "ቡርማኛ",
-        "Language_na": "ናኡሩ",
-        "Language_nb": "የኖርዌይ ቦክማል",
-        "Language_nd": "ሰሜን ንዴብሌ",
-        "Language_ne": "ኔፓሊኛ",
-        "Language_nl": "ደች",
-        "Language_nn": "የኖርዌ አዲሱ ኖርዌጅያንኛ",
-        "Language_no": "ኖርዌጂያን",
-        "Language_ny": "ንያንጃ",
-        "Language_oc": "ኦኪታንኛ",
-        "Language_om": "ኦሮምኛ",
-        "Language_or": "ኦሪያኛ",
-        "Language_os": "ኦሴቲክ",
-        "Language_pa": "ፓንጃቢኛ",
-        "Language_pl": "ፖሊሽ",
-        "Language_ps": "ፑሽቶኛ",
-        "Language_pt": "ፖርቱጋሊኛ",
-        "Language_qu": "ኵቿኛ",
-        "Language_rm": "ሮማንስ",
-        "Language_rn": "ሩንዲኛ",
-        "Language_ro": "ሮማኒያን",
-        "Language_ru": "ራሽኛ",
-        "Language_rw": "ኪንያርዋንድኛ",
-        "Language_sa": "ሳንስክሪትኛ",
-        "Language_sd": "ሲንድሂኛ",
-        "Language_se": "ሰሜናዊ ሳሚ",
-        "Language_sg": "ሳንጎኛ",
-        "Language_si": "ስንሃልኛ",
-        "Language_sk": "ስሎቫክኛ",
-        "Language_sl": "ስሎቪኛ",
-        "Language_sm": "ሳሞአኛ",
-        "Language_sn": "ሾናኛ",
-        "Language_so": "ሱማልኛ",
-        "Language_sq": "ልቤኒኛ",
-        "Language_sr": "ሰርቢኛ",
-        "Language_ss": "ስዋቲኛ",
-        "Language_st": "ሶዞኛ",
-        "Language_su": "ሱዳንኛ",
-        "Language_sv": "ስዊድንኛ",
-        "Language_sw": "ስዋሂሊኛ",
-        "Language_ta": "ታሚልኛ",
-        "Language_te": "ተሉጉኛ",
-        "Language_tg": "ታጂኪኛ",
-        "Language_th": "ታይኛ",
-        "Language_ti": "ትግርኛ",
-        "Language_tk": "ቱርክመንኛ",
-        "Language_tl": "ታጋሎገኛ",
-        "Language_tn": "ጽዋናዊኛ",
-        "Language_to": "ቶንጋ",
-        "Language_tr": "ቱርክኛ",
-        "Language_ts": "ጾንጋኛ",
-        "Language_tt": "ታታርኛ",
-        "Language_tw": "ትዊኛ",
-        "Language_ty": "ታሂታንኛ",
-        "Language_ug": "ኡዊግሁርኛ",
-        "Language_uk": "ዩክረኒኛ",
-        "Language_ur": "ኡርዱኛ",
-        "Language_uz": "ኡዝበክኛ",
-        "Language_ve": "ቬንዳ",
-        "Language_vi": "ቪትናምኛ",
-        "Language_vo": "ቮላፑክኛ",
-        "Language_wo": "ዎሎፍኛ",
-        "Language_xh": "ዞሳኛ",
-        "Language_yi": "ይዲሻዊኛ",
-        "Language_yo": "ዮሩባዊኛ",
-        "Language_za": "ዡዋንግኛ",
-        "Language_zh": "ቻይንኛ",
-        "Language_zu": "ዙሉኛ",
-        "LanguageCode": "የቋንቋ ኮድ",
-        "Resolutions": "ጥራቶች",
-        "VisitorSettings": "የጎበኚዎች ቅንብሮች",
-        "WidgetGlobalVisitors": "የሁሉም ጎብኚዎች ውቅረት",
-        "WidgetPlugins": "የተሰኪዎች ዝርዝር",
-        "WidgetResolutions": "የማያ ጥራቶች"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/ar.json b/plugins/UserSettings/lang/ar.json
deleted file mode 100644
index cd0a0568c2..0000000000
--- a/plugins/UserSettings/lang/ar.json
+++ /dev/null
@@ -1,198 +0,0 @@
-{
-    "UserSettings": {
-        "ColumnConfiguration": "الإعداد",
-        "ColumnResolution": "الكثافة النقطية",
-        "Configurations": "الإعدادات",
-        "Language_aa": "الأفارية",
-        "Language_ab": "الأبخازية",
-        "Language_ae": "الأفستية",
-        "Language_af": "الأفريقية",
-        "Language_ak": "الأكانية",
-        "Language_am": "الأمهرية",
-        "Language_an": "الأراجونية",
-        "Language_ar": "العربية",
-        "Language_as": "الأسامية",
-        "Language_av": "الأفاريكية",
-        "Language_ay": "الأيمارا",
-        "Language_az": "الأذرية",
-        "Language_ba": "الباشكيرية",
-        "Language_be": "البيلوروسية",
-        "Language_bg": "البلغارية",
-        "Language_bh": "البيهارية",
-        "Language_bi": "البيسلامية",
-        "Language_bm": "البامبارا",
-        "Language_bn": "البنغالية",
-        "Language_bo": "التبتية",
-        "Language_br": "البريتونية",
-        "Language_bs": "البوسنية",
-        "Language_ca": "الكاتالوينية",
-        "Language_ce": "الشيشانية",
-        "Language_ch": "التشامورو",
-        "Language_co": "الكورسيكية",
-        "Language_cr": "الكرى",
-        "Language_cs": "التشيكية",
-        "Language_cu": "سلافية كنسية",
-        "Language_cv": "التشفاش",
-        "Language_cy": "الولزية",
-        "Language_da": "الدانماركية",
-        "Language_de": "الألمانية",
-        "Language_dv": "المالديفية",
-        "Language_dz": "الزونخاية",
-        "Language_ee": "الايوي",
-        "Language_el": "اليونانية",
-        "Language_en": "الانجليزية",
-        "Language_eo": "اسبرانتو",
-        "Language_es": "الأسبانية",
-        "Language_et": "الأستونية",
-        "Language_eu": "لغة الباسك",
-        "Language_fa": "الفارسية",
-        "Language_ff": "الفلة",
-        "Language_fi": "الفنلندية",
-        "Language_fj": "الفيجية",
-        "Language_fo": "الفارويز",
-        "Language_fr": "الفرنسية",
-        "Language_fy": "الفريزيان",
-        "Language_ga": "الأيرلندية",
-        "Language_gd": "الغيلية الأسكتلندية",
-        "Language_gl": "الجاليكية",
-        "Language_gn": "الجوارانى",
-        "Language_gu": "الغوجاراتية",
-        "Language_gv": "المنكية",
-        "Language_ha": "الهوسا",
-        "Language_he": "العبرية",
-        "Language_hi": "الهندية",
-        "Language_ho": "الهيرى موتو",
-        "Language_hr": "الكرواتية",
-        "Language_ht": "الهايتية",
-        "Language_hu": "الهنغارية",
-        "Language_hy": "الأرمينية",
-        "Language_hz": "الهيريرو",
-        "Language_ia": "اللّغة الوسيطة",
-        "Language_id": "الأندونيسية",
-        "Language_ie": "الانترلينج",
-        "Language_ig": "الايجبو",
-        "Language_ii": "السيتشيون يى",
-        "Language_ik": "الاينبياك",
-        "Language_io": "الايدو",
-        "Language_is": "الأيسلاندية",
-        "Language_it": "الايطالية",
-        "Language_iu": "الاينكتيتت",
-        "Language_ja": "اليابانية",
-        "Language_jv": "الجاوية",
-        "Language_ka": "الجورجية",
-        "Language_kg": "الكونغو",
-        "Language_ki": "الكيكيو",
-        "Language_kj": "الكيونياما",
-        "Language_kk": "الكازاخستانية",
-        "Language_kl": "الكالاليست",
-        "Language_km": "الخميرية",
-        "Language_kn": "الكانادا",
-        "Language_ko": "الكورية",
-        "Language_kr": "الكانيوري",
-        "Language_ks": "الكاشميرية",
-        "Language_ku": "الكردية",
-        "Language_kv": "الكومي",
-        "Language_kw": "الكورنية",
-        "Language_ky": "القيرغستانية",
-        "Language_la": "اللاتينية",
-        "Language_lb": "اللوكسمبرجية",
-        "Language_lg": "الجاندا",
-        "Language_li": "الليمبرجيشية",
-        "Language_ln": "اللينجالا",
-        "Language_lo": "اللاوية",
-        "Language_lt": "اللتوانية",
-        "Language_lu": "اللبا-كاتانجا",
-        "Language_lv": "اللاتفية",
-        "Language_mg": "المالاجاشية",
-        "Language_mh": "المارشالية",
-        "Language_mi": "الماورية",
-        "Language_mk": "المقدونية",
-        "Language_ml": "الماليالام",
-        "Language_mn": "المنغولية",
-        "Language_mr": "الماراثى",
-        "Language_ms": "لغة الملايو",
-        "Language_mt": "المالطية",
-        "Language_my": "البورمية",
-        "Language_na": "النورو",
-        "Language_nb": "البوكمالية النرويجية",
-        "Language_nd": "النديبيل الشمالى",
-        "Language_ne": "النيبالية",
-        "Language_ng": "الندونجا",
-        "Language_nl": "الهولندية",
-        "Language_nn": "النينورسك النرويجي",
-        "Language_no": "النرويجية",
-        "Language_nr": "النديبيل الجنوبى",
-        "Language_nv": "النافاجو",
-        "Language_ny": "النيانجا، التشيتشوا، التشوا",
-        "Language_oc": "الأوكيتانية",
-        "Language_oj": "الأوجيبوا",
-        "Language_om": "الأورومو",
-        "Language_or": "الأورييا",
-        "Language_os": "الأوسيتيك",
-        "Language_pa": "البنجابية",
-        "Language_pi": "البالية",
-        "Language_pl": "البولندية",
-        "Language_ps": "البشتونية",
-        "Language_pt": "البرتغالية",
-        "Language_qu": "الكويتشوا",
-        "Language_rm": "الرهايتو-رومانس",
-        "Language_rn": "الرندى",
-        "Language_ro": "الرومانية",
-        "Language_ru": "الروسية",
-        "Language_rw": "الكينيارواندا",
-        "Language_sa": "السنسكريتية",
-        "Language_sc": "السردينية",
-        "Language_sd": "السيندى",
-        "Language_se": "السامي الشمالى",
-        "Language_sg": "السانجو",
-        "Language_si": "السريلانكية",
-        "Language_sk": "السلوفاكية",
-        "Language_sl": "السلوفانية",
-        "Language_sm": "الساموائية",
-        "Language_sn": "الشونا",
-        "Language_so": "الصومالية",
-        "Language_sq": "الألبانية",
-        "Language_sr": "الصربية",
-        "Language_ss": "السواتى",
-        "Language_st": "السوتو الجنوبية",
-        "Language_su": "السودانية",
-        "Language_sv": "السويدية",
-        "Language_sw": "السواحلية",
-        "Language_ta": "التاميلية",
-        "Language_te": "التيلجو",
-        "Language_tg": "الطاجيكية",
-        "Language_th": "التايلاندية",
-        "Language_ti": "التيجرينيا",
-        "Language_tk": "التركمانية",
-        "Language_tl": "التاغالوغية",
-        "Language_tn": "التسوانية",
-        "Language_to": "تونجا - جزر تونجا",
-        "Language_tr": "التركية",
-        "Language_ts": "السونجا",
-        "Language_tt": "التتارية",
-        "Language_tw": "التوي",
-        "Language_ty": "التاهيتية",
-        "Language_ug": "الأغورية",
-        "Language_uk": "الأوكرانية",
-        "Language_ur": "الأردية",
-        "Language_uz": "الاوزباكية",
-        "Language_ve": "الفيندا",
-        "Language_vi": "الفيتنامية",
-        "Language_wa": "الولونية",
-        "Language_wo": "الولوف",
-        "Language_xh": "الخوسا",
-        "Language_yi": "اليديشية",
-        "Language_yo": "اليوروبية",
-        "Language_za": "الزهيونج",
-        "Language_zh": "الصينية",
-        "Language_zu": "الزولو",
-        "LanguageCode": "كود اللغة",
-        "PluginDescription": "تقارير عن إعدادات المستخدمين المختلفة: المتصفح، عائلة المتصفح، نظام التشغيل، الإضافات البرمجية، كثافة الشاشة النقطية، الإعدادات العامة.",
-        "PluginDetectionDoesNotWorkInIE": "ملاحظة: اكتشاف الإضافات البرمجية لا تعمل في متصفح إنترنت إكسبلورر. هذه الخاصية ترتكز للمتصفحات من العائلات الأخرى غير إنترنت إكسبلورر.",
-        "Resolutions": "الكثافات النقطية",
-        "VisitorSettings": "إعدادات الزوار",
-        "WidgetGlobalVisitors": "الإعدادات العامة للزوار",
-        "WidgetPlugins": "قائمة الإضافات",
-        "WidgetResolutions": "كثافات الشاشة النقطية"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/be.json b/plugins/UserSettings/lang/be.json
deleted file mode 100644
index 7e0d6090ae..0000000000
--- a/plugins/UserSettings/lang/be.json
+++ /dev/null
@@ -1,131 +0,0 @@
-{
-    "UserSettings": {
-        "ColumnConfiguration": "Канфігурацыя",
-        "ColumnResolution": "Дазвол",
-        "Configurations": "Па канфігурацыі",
-        "Language_ab": "абхазская",
-        "Language_af": "афрыкаанс",
-        "Language_am": "амхарская",
-        "Language_an": "арагонская",
-        "Language_ar": "арабская",
-        "Language_as": "асамская",
-        "Language_av": "аварская",
-        "Language_ay": "аймара",
-        "Language_az": "азербайджанская",
-        "Language_ba": "башкірская",
-        "Language_be": "беларуская",
-        "Language_bg": "балгарская",
-        "Language_bh": "біхары",
-        "Language_bn": "бенгальская",
-        "Language_br": "брэтонская",
-        "Language_bs": "баснійская",
-        "Language_ca": "каталонская",
-        "Language_ce": "чачэнская",
-        "Language_cs": "чэшская",
-        "Language_cv": "чувашская",
-        "Language_cy": "валійская",
-        "Language_da": "дацкая",
-        "Language_de": "нямецкая",
-        "Language_el": "грэцкая",
-        "Language_en": "англійская",
-        "Language_eo": "эсперанта",
-        "Language_es": "іспанская",
-        "Language_et": "эстонская",
-        "Language_eu": "баскская",
-        "Language_fa": "фарсі",
-        "Language_fi": "фінская",
-        "Language_fo": "фарэрская",
-        "Language_fr": "французская",
-        "Language_fy": "фрызская",
-        "Language_ga": "ірландская",
-        "Language_gd": "шатландская гэльская",
-        "Language_gl": "галісійская",
-        "Language_gn": "гуарані",
-        "Language_gu": "гуяраці",
-        "Language_he": "іўрыт",
-        "Language_hi": "хіндзі",
-        "Language_hr": "харвацкая",
-        "Language_hu": "венгерская",
-        "Language_hy": "армянская",
-        "Language_ia": "інтэрлінгва",
-        "Language_id": "інданезійская",
-        "Language_ie": "інтэрлінгве",
-        "Language_is": "ісландская",
-        "Language_it": "італьянская",
-        "Language_ja": "японская",
-        "Language_jv": "яванская",
-        "Language_ka": "грузінская",
-        "Language_kk": "казахская",
-        "Language_kn": "каннада",
-        "Language_ko": "карэйская",
-        "Language_ku": "курдская",
-        "Language_la": "лацінская",
-        "Language_ln": "лінгала",
-        "Language_lo": "лаоская",
-        "Language_lt": "літоўская",
-        "Language_lv": "латышская",
-        "Language_mg": "мальгашская",
-        "Language_mk": "македонская",
-        "Language_ml": "малаяламская",
-        "Language_mn": "мангольская",
-        "Language_mr": "маратхі",
-        "Language_ms": "малайская",
-        "Language_mt": "мальтыйская",
-        "Language_nb": "нарвэская букмал",
-        "Language_ne": "непальская",
-        "Language_nl": "галандская",
-        "Language_nn": "нарвежская (нюнорск)",
-        "Language_no": "нарвежская",
-        "Language_oc": "правансальская",
-        "Language_oj": "аджыбве",
-        "Language_or": "орыя",
-        "Language_os": "асецінская",
-        "Language_pa": "панджабі",
-        "Language_pl": "польская",
-        "Language_ps": "пушту",
-        "Language_pt": "партугальская",
-        "Language_qu": "кечуа",
-        "Language_rm": "рэта-раманская",
-        "Language_ro": "румынская",
-        "Language_ru": "руская",
-        "Language_sa": "санскрыт",
-        "Language_sd": "сіндхі",
-        "Language_si": "сінгальская",
-        "Language_sk": "славацкая",
-        "Language_sl": "славенская",
-        "Language_so": "самалійская",
-        "Language_sq": "албанская",
-        "Language_sr": "сербская",
-        "Language_su": "суданская",
-        "Language_sv": "шведская",
-        "Language_sw": "суахілі",
-        "Language_ta": "тамільская",
-        "Language_te": "тэлугу",
-        "Language_tg": "таджыкская",
-        "Language_th": "тайская",
-        "Language_ti": "тыгрынья",
-        "Language_tk": "туркменская",
-        "Language_tr": "турэцкая",
-        "Language_tt": "татарская",
-        "Language_ug": "уйгурская",
-        "Language_uk": "украінская",
-        "Language_ur": "урду",
-        "Language_uz": "узбекская",
-        "Language_vi": "в'етнамская",
-        "Language_vo": "валапюк",
-        "Language_xh": "хоса",
-        "Language_yi": "ідыш",
-        "Language_zh": "кітайская",
-        "Language_zu": "зулу",
-        "LanguageCode": "Код мовы",
-        "PluginDescription": "Справаздачы наладак карыстальнікаў: Браўзэр, Сямейства Браўзэр сям'і, Аперацыйная сістэма, Плагіны, Глабальныя параметры.",
-        "PluginDetectionDoesNotWorkInIE": "Заўважце: Плагіны не вызначаюцца ў Internet Explorer. Гэта справаздача заснавана на не-IE браўзарах.",
-        "Resolutions": "Па дазволе манітораў",
-        "VisitorSettings": "Налады карыстача",
-        "WidgetGlobalVisitors": "Глабальная канфігурацыя",
-        "WidgetGlobalVisitorsDocumentation": "Гэтая справаздача паказвае найбольш распаўсюджаныя агульныя канфігурацыі, якія мелі вашы наведвальнікі. Канфігурацыя - гэта спалучэнне аперацыйнай сістэмы, тыпу браўзэра і дазволу экрана.",
-        "WidgetPlugins": "Спіс плагінаў",
-        "WidgetPluginsDocumentation": "Гэтая справаздача паказвае, якія плагіны были ўключаны ў браўзэраў Вашых наведвальнікаў. Гэтая інфармацыя можа мець важнае значэнне для выбару правільнага спосабу дастаўкі кантэнту.",
-        "WidgetResolutions": "Дазвол манітораў"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/bg.json b/plugins/UserSettings/lang/bg.json
deleted file mode 100644
index 857681dd6f..0000000000
--- a/plugins/UserSettings/lang/bg.json
+++ /dev/null
@@ -1,204 +0,0 @@
-{
-    "UserSettings": {
-        "BrowserLanguage": "Език на браузъра",
-        "BrowserWithNoPluginsEnabled": "%1$s без активни добавки",
-        "BrowserWithPluginsEnabled": "%1$s с добавки %2$s активиран",
-        "ColumnConfiguration": "Обобщена конфигурация",
-        "ColumnResolution": "Разделителна способност на екрана",
-        "Configurations": "Конфигурации",
-        "Language_aa": "афарски",
-        "Language_ab": "абхазки",
-        "Language_ae": "авестийски",
-        "Language_af": "бурски език",
-        "Language_ak": "акански",
-        "Language_am": "амхарски",
-        "Language_an": "арагонски",
-        "Language_ar": "арабски",
-        "Language_as": "асамски",
-        "Language_av": "аварски",
-        "Language_ay": "аймара",
-        "Language_az": "азербайджански",
-        "Language_ba": "башкирски",
-        "Language_be": "беларуски",
-        "Language_bg": "български",
-        "Language_bh": "бихари",
-        "Language_bi": "бислама",
-        "Language_bm": "бамбара",
-        "Language_bn": "бенгалски",
-        "Language_bo": "тибетски",
-        "Language_br": "бретонски",
-        "Language_bs": "босненски",
-        "Language_ca": "каталонски",
-        "Language_ce": "чеченски",
-        "Language_ch": "чаморо",
-        "Language_co": "корсикански",
-        "Language_cr": "крии",
-        "Language_cs": "чешки",
-        "Language_cu": "църковно славянски",
-        "Language_cv": "чувашки",
-        "Language_cy": "уелски",
-        "Language_da": "датски",
-        "Language_de": "немски",
-        "Language_dv": "дивехи",
-        "Language_dz": "дзонха",
-        "Language_ee": "еуе",
-        "Language_el": "гръцки",
-        "Language_en": "английски",
-        "Language_eo": "есперанто",
-        "Language_es": "испански",
-        "Language_et": "естонски",
-        "Language_eu": "баски",
-        "Language_fa": "персийски",
-        "Language_ff": "фула",
-        "Language_fi": "фински",
-        "Language_fj": "фиджийски",
-        "Language_fo": "фарьорски",
-        "Language_fr": "френски",
-        "Language_fy": "фризийски",
-        "Language_ga": "ирландски",
-        "Language_gd": "шотландски галски",
-        "Language_gl": "галисийски",
-        "Language_gn": "гуарани",
-        "Language_gu": "гуджарати",
-        "Language_gv": "манкски",
-        "Language_ha": "хауза",
-        "Language_he": "иврит",
-        "Language_hi": "хинди",
-        "Language_ho": "хири моту",
-        "Language_hr": "хърватски",
-        "Language_ht": "хаитянски",
-        "Language_hu": "унгарски",
-        "Language_hy": "арменски",
-        "Language_hz": "хереро",
-        "Language_ia": "интерлингва",
-        "Language_id": "индонезийски",
-        "Language_ie": "оксидентал",
-        "Language_ig": "игбо",
-        "Language_ii": "сечуански",
-        "Language_ik": "инупиак",
-        "Language_io": "идо",
-        "Language_is": "исландски",
-        "Language_it": "италиански",
-        "Language_iu": "инуктитут",
-        "Language_ja": "японски",
-        "Language_jv": "явански",
-        "Language_ka": "грузински",
-        "Language_kg": "конгоански",
-        "Language_ki": "кикуйу",
-        "Language_kj": "кваняма",
-        "Language_kk": "казахски",
-        "Language_kl": "гренландски ескимоски",
-        "Language_km": "кхмерски",
-        "Language_kn": "каннада",
-        "Language_ko": "корейски",
-        "Language_kr": "канури",
-        "Language_ks": "кашмирски",
-        "Language_ku": "кюрдски",
-        "Language_kv": "Коми",
-        "Language_kw": "корнуолски келтски",
-        "Language_ky": "киргизски",
-        "Language_la": "латински",
-        "Language_lb": "люксембургски",
-        "Language_lg": "ганда",
-        "Language_li": "лимбургски",
-        "Language_ln": "лингала",
-        "Language_lo": "лаоски",
-        "Language_lt": "литовски",
-        "Language_lu": "луба катанга",
-        "Language_lv": "латвийски",
-        "Language_mg": "малгашки",
-        "Language_mh": "маршалезе",
-        "Language_mi": "маорски",
-        "Language_mk": "македонски",
-        "Language_ml": "малаялам",
-        "Language_mn": "монголски",
-        "Language_mr": "маратхи",
-        "Language_ms": "малайски",
-        "Language_mt": "малтийски",
-        "Language_my": "бирмански",
-        "Language_na": "науру",
-        "Language_nb": "норвежки бокмал",
-        "Language_nd": "северен ндебеле",
-        "Language_ne": "непалски",
-        "Language_ng": "ндонга",
-        "Language_nl": "холандски",
-        "Language_nn": "съвременен норвежки",
-        "Language_no": "норвежки",
-        "Language_nr": "южен ндебеле",
-        "Language_nv": "навахо",
-        "Language_ny": "чинянджа",
-        "Language_oc": "окситански",
-        "Language_oj": "оджибва",
-        "Language_om": "оромо",
-        "Language_or": "ория",
-        "Language_os": "осетски",
-        "Language_pa": "пенджабски",
-        "Language_pi": "пали",
-        "Language_pl": "полски",
-        "Language_ps": "пущу",
-        "Language_pt": "португалски",
-        "Language_qu": "кечуа",
-        "Language_rm": "реторомански",
-        "Language_rn": "рунди",
-        "Language_ro": "румънски",
-        "Language_ru": "руски",
-        "Language_rw": "киняруанда",
-        "Language_sa": "санкскритски",
-        "Language_sc": "сардински",
-        "Language_sd": "синдхи",
-        "Language_se": "северен сами",
-        "Language_sg": "санго",
-        "Language_si": "синхалски",
-        "Language_sk": "словашки",
-        "Language_sl": "словенски",
-        "Language_sm": "самоански",
-        "Language_sn": "шона",
-        "Language_so": "сомалийски",
-        "Language_sq": "албански",
-        "Language_sr": "сръбски",
-        "Language_ss": "суази",
-        "Language_st": "сесуто",
-        "Language_su": "сундански",
-        "Language_sv": "шведски",
-        "Language_sw": "суахили",
-        "Language_ta": "тамилски",
-        "Language_te": "телугу",
-        "Language_tg": "таджикски",
-        "Language_th": "таи",
-        "Language_ti": "тигриня",
-        "Language_tk": "туркменски",
-        "Language_tl": "тагалог",
-        "Language_tn": "тсвана",
-        "Language_to": "тонга",
-        "Language_tr": "турски",
-        "Language_ts": "тсонга",
-        "Language_tt": "татарски",
-        "Language_tw": "туи",
-        "Language_ty": "таитянски",
-        "Language_ug": "уйгурски",
-        "Language_uk": "украински",
-        "Language_ur": "урду",
-        "Language_uz": "узбекски",
-        "Language_ve": "венда",
-        "Language_vi": "виетнамски",
-        "Language_vo": "волапюк",
-        "Language_wa": "валонски",
-        "Language_wo": "волоф",
-        "Language_xh": "ксоса",
-        "Language_yi": "идиш",
-        "Language_yo": "йоруба",
-        "Language_za": "зуанг",
-        "Language_zh": "китайски",
-        "Language_zu": "зулуски",
-        "LanguageCode": "Код на езика",
-        "PluginDescription": "Докладът за различните потребителски настройки: Браузър, Браузър Семейство, операционна система, модули, резолюция, Глобални настройки.",
-        "PluginDetectionDoesNotWorkInIE": "Забележка: Засичането на добавки не работи при Internet Explorer. Този доклад е базиран само на браузъри, различни от IE.",
-        "Resolutions": "Разделителна способност",
-        "VisitorSettings": "Настройки на посетителя",
-        "WidgetGlobalVisitors": "Конфигурация на гло",
-        "WidgetGlobalVisitorsDocumentation": "Този отчет показва повечето общопознати цялостни конфигурации, които вашите посетители са имали. Конфигурация е комбинацията от операционна система, тип на браузера и резолюция на екрана.",
-        "WidgetPlugins": "Добавки",
-        "WidgetPluginsDocumentation": "Този отчет показва каква добавка на браузъра са използвали вашите посетители. Тази информация може да е важна, за да изберете правилния начин за доставяне на вашето съдържание.",
-        "WidgetResolutions": "Разделителна способност"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/bn.json b/plugins/UserSettings/lang/bn.json
deleted file mode 100644
index 5b8fcf773b..0000000000
--- a/plugins/UserSettings/lang/bn.json
+++ /dev/null
@@ -1,188 +0,0 @@
-{
-    "UserSettings": {
-        "Language_aa": "আফার",
-        "Language_ab": "আব্খাজিয়",
-        "Language_ae": "আবেস্তীয়",
-        "Language_af": "আফ্রিকান্স",
-        "Language_ak": "আকান",
-        "Language_am": "আমহারিক",
-        "Language_an": "আর্গোনিজ",
-        "Language_ar": "আরবী",
-        "Language_as": "আসামি",
-        "Language_av": "আভেরিক",
-        "Language_ay": "আয়মারা",
-        "Language_az": "আজারবাইজানীয়",
-        "Language_ba": "বাশকির",
-        "Language_be": "বেলারুশিয়",
-        "Language_bg": "বুলগেরিয়",
-        "Language_bh": "বিহারি",
-        "Language_bi": "বিসলামা",
-        "Language_bm": "বামবারা",
-        "Language_bn": "বাংলা",
-        "Language_bo": "তিব্বতি",
-        "Language_br": "ব্রেটোন",
-        "Language_bs": "বসনীয়",
-        "Language_ca": "কাতালান",
-        "Language_ce": "চেচেন",
-        "Language_ch": "চামেরো",
-        "Language_co": "কর্সিকান",
-        "Language_cr": "ক্রি",
-        "Language_cs": "চেক",
-        "Language_cu": "চার্চ স্লাভিও",
-        "Language_cv": "চুবাস",
-        "Language_cy": "ওয়েলশ",
-        "Language_da": "ডেনিশ",
-        "Language_de": "জার্মান",
-        "Language_dv": "দিবেহি",
-        "Language_dz": "ভুটানি",
-        "Language_ee": "ইওয়ে",
-        "Language_el": "গ্রিক",
-        "Language_en": "ইংরেজি",
-        "Language_eo": "এস্পেরান্তো",
-        "Language_es": "স্পেনীয়",
-        "Language_et": "এস্তোনীয়",
-        "Language_eu": "বাস্ক",
-        "Language_fa": "ফার্সি",
-        "Language_ff": "ফুলাহ্",
-        "Language_fi": "ফিনিশ",
-        "Language_fj": "ফিজিও",
-        "Language_fo": "ফেরাউনি",
-        "Language_fr": "ফরাসি",
-        "Language_fy": "পশ্চিম ফ্রিসিয়",
-        "Language_ga": "আইরিশ",
-        "Language_gd": "স্কটস-গ্যেলিক",
-        "Language_gl": "গ্যালিশিয়",
-        "Language_gn": "গুয়ারানি",
-        "Language_gu": "গুজরাটি",
-        "Language_gv": "ম্যাঙ্কস",
-        "Language_ha": "হাউসা",
-        "Language_he": "হিব্রু",
-        "Language_hi": "হিন্দি",
-        "Language_ho": "হিরি মোতু",
-        "Language_hr": "ক্রোয়েশীয়",
-        "Language_ht": "হাইতিয়ান",
-        "Language_hu": "হাঙ্গেরীয়",
-        "Language_hy": "আর্মেনিয়",
-        "Language_hz": "হেরেরো",
-        "Language_ia": "ইন্টারলিঙ্গুয়া",
-        "Language_id": "ইন্দোনেশীয়",
-        "Language_ie": "ইন্টারলিঙ্গ",
-        "Language_ig": "ইগ্‌বো",
-        "Language_ii": "সিচুয়ান য়ি",
-        "Language_ik": "ইনুপিয়াক",
-        "Language_io": "ইডো",
-        "Language_is": "আইসল্যান্ডীয়",
-        "Language_it": "ইতালীয়",
-        "Language_iu": "ইনুক্টিটুট",
-        "Language_ja": "জাপানি",
-        "Language_jv": "জাভানি",
-        "Language_ka": "জর্জিয়ান",
-        "Language_kg": "কোঙ্গো",
-        "Language_ki": "কিকু্ইয়ু",
-        "Language_kj": "কোয়ানিয়ামা",
-        "Language_kk": "কাজাখ",
-        "Language_kl": "ক্যালাল্লিসুট",
-        "Language_km": "খমের",
-        "Language_kn": "কান্নাড়ী",
-        "Language_ko": "কোরিয়ান",
-        "Language_kr": "কানুরি",
-        "Language_ks": "কাশ্মীরী",
-        "Language_ku": "কুর্দি",
-        "Language_kv": "কোমি",
-        "Language_kw": "কর্ণিশ",
-        "Language_ky": "কির্গিজ",
-        "Language_la": "লাটিন",
-        "Language_lb": "লুক্সেমবার্গীয়",
-        "Language_lg": "গ্যান্ডা",
-        "Language_li": "লিম্বুর্গিশ",
-        "Language_ln": "লিঙ্গালা",
-        "Language_lo": "লাও",
-        "Language_lt": "লিথুয়েনীয",
-        "Language_lu": "লুবা-কাটাঙ্গা",
-        "Language_lv": "লাত্‌ভীয়",
-        "Language_mg": "মালাগাসি",
-        "Language_mh": "মার্শালিজ",
-        "Language_mi": "মাওরি",
-        "Language_mk": "ম্যাসেডোনীয",
-        "Language_ml": "মালেয়ালাম",
-        "Language_mn": "মঙ্গোলিয়",
-        "Language_mr": "মারাঠি",
-        "Language_ms": "মালে",
-        "Language_mt": "মল্টিয়",
-        "Language_my": "বর্মি",
-        "Language_na": "নাউরু",
-        "Language_nb": "নরওয়ে বোকমাল",
-        "Language_nd": "উত্তর এন্দেবিলি",
-        "Language_ne": "নেপালী",
-        "Language_ng": "এন্দোঙ্গা",
-        "Language_nl": "ডাচ",
-        "Language_nn": "নরওয়েজীয়ান নিনর্স্ক",
-        "Language_no": "নরওয়েজীয়",
-        "Language_nr": "দক্ষিণ এনডেবেলে",
-        "Language_nv": "নাভাজো",
-        "Language_ny": "নায়াঞ্জা",
-        "Language_oc": "অক্সিটান",
-        "Language_oj": "ওজিবওয়া",
-        "Language_om": "অরোমো",
-        "Language_or": "উড়িয়া",
-        "Language_os": "ওসেটিক",
-        "Language_pa": "পাঞ্জাবী",
-        "Language_pi": "পালি",
-        "Language_pl": "পোলিশ",
-        "Language_ps": "পশ্তু",
-        "Language_pt": "পর্তুগীজ",
-        "Language_qu": "কেচুয়া",
-        "Language_rm": "রেটো-রোমানীয়",
-        "Language_rn": "রুন্দি",
-        "Language_ro": "রোমানীয়",
-        "Language_ru": "রুশ",
-        "Language_rw": "কিনয়ারোয়ান্ডা",
-        "Language_sa": "সংষ্কৃত",
-        "Language_sc": "সার্ডিনিয়ান",
-        "Language_sd": "সিন্ধি",
-        "Language_se": "উত্তরাঞ্চলীয় সামি",
-        "Language_sg": "সাঙ্গো",
-        "Language_si": "সিংহলী",
-        "Language_sk": "স্লোভাক",
-        "Language_sl": "স্লোভেনীয়",
-        "Language_sm": "সামোয়ান",
-        "Language_sn": "শোনা",
-        "Language_so": "সোমালী",
-        "Language_sq": "আলবেনীয়",
-        "Language_sr": "সার্বীয়",
-        "Language_ss": "সোয়াতি",
-        "Language_st": "দক্ষিন সোথো",
-        "Language_su": "সুদানী",
-        "Language_sv": "সুইডিশ",
-        "Language_sw": "সোয়াহিলি",
-        "Language_ta": "তামিল",
-        "Language_te": "তেলেগু",
-        "Language_tg": "তাজিক",
-        "Language_th": "থাই",
-        "Language_ti": "তিগরিনিয়া",
-        "Language_tk": "তুর্কমেনী",
-        "Language_tl": "তাগালগ",
-        "Language_tn": "সোয়ানা",
-        "Language_to": "টঙ্গা",
-        "Language_tr": "তুর্কী",
-        "Language_ts": "সঙ্গা",
-        "Language_tt": "তাতার",
-        "Language_tw": "টোয়াই",
-        "Language_ty": "তাহিতিয়ান",
-        "Language_ug": "উইঘুর",
-        "Language_uk": "ইউক্রেনীয়",
-        "Language_ur": "উর্দু",
-        "Language_uz": "উজবেকীয়",
-        "Language_ve": "ভেন্ডা",
-        "Language_vi": "ভিয়েতনামী",
-        "Language_vo": "ভোলাপুক",
-        "Language_wa": "ওয়ালুন",
-        "Language_wo": "উওলোফ",
-        "Language_xh": "জোসা",
-        "Language_yi": "য়িদ্দিশ",
-        "Language_yo": "ইওরুবা",
-        "Language_za": "ঝু্য়াঙ",
-        "Language_zh": "চীনা",
-        "Language_zu": "জুলু"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/bs.json b/plugins/UserSettings/lang/bs.json
deleted file mode 100644
index f1fe068ab9..0000000000
--- a/plugins/UserSettings/lang/bs.json
+++ /dev/null
@@ -1,188 +0,0 @@
-{
-    "UserSettings": {
-        "Language_aa": "afarski",
-        "Language_ab": "abkazijski",
-        "Language_ae": "avestanski",
-        "Language_af": "afrikaans",
-        "Language_ak": "akan",
-        "Language_am": "amharski",
-        "Language_an": "aragonežanski",
-        "Language_ar": "arapski",
-        "Language_as": "asameski",
-        "Language_av": "avarski",
-        "Language_ay": "ajmara",
-        "Language_az": "azerbejdžanski",
-        "Language_ba": "baškir",
-        "Language_be": "bjeloruski",
-        "Language_bg": "bugarski",
-        "Language_bh": "bihari",
-        "Language_bi": "bislama",
-        "Language_bm": "bambara",
-        "Language_bn": "bengalski",
-        "Language_bo": "tibetanski",
-        "Language_br": "bretonac",
-        "Language_bs": "bosanski",
-        "Language_ca": "katalonski",
-        "Language_ce": "čečenski",
-        "Language_ch": "čamoro",
-        "Language_co": "korzikanski",
-        "Language_cr": "kri",
-        "Language_cs": "češki",
-        "Language_cu": "staroslovenski",
-        "Language_cv": "čuvaški",
-        "Language_cy": "velški",
-        "Language_da": "danski",
-        "Language_de": "njemački",
-        "Language_dv": "divehijski",
-        "Language_dz": "džonga",
-        "Language_ee": "eve",
-        "Language_el": "grčki",
-        "Language_en": "engleski",
-        "Language_eo": "esperanto",
-        "Language_es": "španjolski",
-        "Language_et": "estonski",
-        "Language_eu": "baskijski",
-        "Language_fa": "perzijski",
-        "Language_ff": "fulah",
-        "Language_fi": "finski",
-        "Language_fj": "fidžijski",
-        "Language_fo": "farski",
-        "Language_fr": "francuski",
-        "Language_fy": "frizijski",
-        "Language_ga": "irski",
-        "Language_gd": "škotski gelski",
-        "Language_gl": "galicijski",
-        "Language_gn": "guarani",
-        "Language_gu": "gudžarati",
-        "Language_gv": "manks",
-        "Language_ha": "hausa",
-        "Language_he": "hebrejski",
-        "Language_hi": "hindu",
-        "Language_ho": "hiri motu",
-        "Language_hr": "hrvatski",
-        "Language_ht": "haićanski",
-        "Language_hu": "mađarski",
-        "Language_hy": "armenski",
-        "Language_hz": "herero",
-        "Language_ia": "interlingua",
-        "Language_id": "indonezijski",
-        "Language_ie": "međujezični",
-        "Language_ig": "igbo",
-        "Language_ii": "sičuan ji",
-        "Language_ik": "inupiak",
-        "Language_io": "ido",
-        "Language_is": "islandski",
-        "Language_it": "talijanski",
-        "Language_iu": "inuktitut",
-        "Language_ja": "japanski",
-        "Language_jv": "javanski",
-        "Language_ka": "gruzijski",
-        "Language_kg": "kongo",
-        "Language_ki": "kikuju",
-        "Language_kj": "kuanjama",
-        "Language_kk": "kozački",
-        "Language_kl": "kalalisutski",
-        "Language_km": "kambodžanski",
-        "Language_kn": "kannada",
-        "Language_ko": "koreanski",
-        "Language_kr": "kanuri",
-        "Language_ks": "kašmiri",
-        "Language_ku": "kurdski",
-        "Language_kv": "komi",
-        "Language_kw": "korniški",
-        "Language_ky": "kirgiski",
-        "Language_la": "latinski",
-        "Language_lb": "luksemburški",
-        "Language_lg": "ganda",
-        "Language_li": "limburgiš",
-        "Language_ln": "n\/a",
-        "Language_lo": "laothian",
-        "Language_lt": "litvanski",
-        "Language_lu": "luba-katanga",
-        "Language_lv": "latvijski",
-        "Language_mg": "malagazijski",
-        "Language_mh": "maršalski",
-        "Language_mi": "maorski",
-        "Language_mk": "makedonski",
-        "Language_ml": "malajalamski",
-        "Language_mn": "mongolski",
-        "Language_mr": "marati",
-        "Language_ms": "malajski",
-        "Language_mt": "malteški",
-        "Language_my": "burmanski",
-        "Language_na": "nauru",
-        "Language_nb": "norveški bokmål",
-        "Language_nd": "severni ndebele",
-        "Language_ne": "nepalski",
-        "Language_ng": "ndonga",
-        "Language_nl": "holandski",
-        "Language_nn": "norveški (novonorveški)",
-        "Language_no": "norveški",
-        "Language_nr": "južni ndebele",
-        "Language_nv": "navaho",
-        "Language_ny": "njanja",
-        "Language_oc": "oksitanski",
-        "Language_oj": "ojibva",
-        "Language_om": "oromo",
-        "Language_or": "indijski",
-        "Language_os": "osetski",
-        "Language_pa": "pendžabi",
-        "Language_pi": "pali",
-        "Language_pl": "poljski",
-        "Language_ps": "pakistanski",
-        "Language_pt": "portugalski",
-        "Language_qu": "kvenča",
-        "Language_rm": "reto-romanski",
-        "Language_rn": "rundi",
-        "Language_ro": "rumunski",
-        "Language_ru": "ruski",
-        "Language_rw": "kinjarvanda",
-        "Language_sa": "sanskrit",
-        "Language_sc": "sardinijski",
-        "Language_sd": "sindi",
-        "Language_se": "severni sami",
-        "Language_sg": "sango",
-        "Language_si": "sinhaleski",
-        "Language_sk": "slovački",
-        "Language_sl": "slovenački",
-        "Language_sm": "samoanski",
-        "Language_sn": "šona",
-        "Language_so": "somalski",
-        "Language_sq": "albanski",
-        "Language_sr": "srpski",
-        "Language_ss": "svati",
-        "Language_st": "sesoto",
-        "Language_su": "sudanski",
-        "Language_sv": "švedski",
-        "Language_sw": "svahili",
-        "Language_ta": "tamilski",
-        "Language_te": "telugu",
-        "Language_tg": "tađik",
-        "Language_th": "tajlandski",
-        "Language_ti": "tigrinya (eritrejski)",
-        "Language_tk": "turkmenski",
-        "Language_tl": "tagalski",
-        "Language_tn": "tsvana",
-        "Language_to": "tonga",
-        "Language_tr": "turski",
-        "Language_ts": "tsonga",
-        "Language_tt": "tatarski",
-        "Language_tw": "twi",
-        "Language_ty": "tahićanski",
-        "Language_ug": "uighur",
-        "Language_uk": "ukrajinski",
-        "Language_ur": "urdu",
-        "Language_uz": "uzbekistanski",
-        "Language_ve": "venda",
-        "Language_vi": "vijetnamski",
-        "Language_vo": "volapük",
-        "Language_wa": "valun",
-        "Language_wo": "volof",
-        "Language_xh": "bantu",
-        "Language_yi": "jidiš",
-        "Language_yo": "jorubanski",
-        "Language_za": "zuang",
-        "Language_zh": "kineski",
-        "Language_zu": "zulu"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/ca.json b/plugins/UserSettings/lang/ca.json
deleted file mode 100644
index 9fedf7f751..0000000000
--- a/plugins/UserSettings/lang/ca.json
+++ /dev/null
@@ -1,201 +0,0 @@
-{
-    "UserSettings": {
-        "ColumnConfiguration": "Configuració",
-        "ColumnResolution": "Resolució",
-        "Configurations": "Configuracions",
-        "Language_aa": "Afar",
-        "Language_ab": "Abkhazian",
-        "Language_ae": "Avestan",
-        "Language_af": "Africaans",
-        "Language_ak": "Akan",
-        "Language_am": "Amharic",
-        "Language_an": "Aragonès",
-        "Language_ar": "Aràbic",
-        "Language_as": "Assamès",
-        "Language_av": "Avaric",
-        "Language_ay": "Aymara",
-        "Language_az": "Azerbaidjan",
-        "Language_ba": "Bashkir",
-        "Language_be": "Bielorúss",
-        "Language_bg": "Búlgar",
-        "Language_bh": "Bihari",
-        "Language_bi": "Bislama",
-        "Language_bm": "Bambara",
-        "Language_bn": "Bengalí",
-        "Language_bo": "Tibetà",
-        "Language_br": "Bretó",
-        "Language_bs": "Bosnià",
-        "Language_ca": "Català",
-        "Language_ce": "Txetxè",
-        "Language_ch": "Chamorro",
-        "Language_co": "Cors",
-        "Language_cr": "Cree",
-        "Language_cs": "Txec",
-        "Language_cu": "Eslau",
-        "Language_cv": "Chuvash",
-        "Language_cy": "Gal·lès",
-        "Language_da": "Danès",
-        "Language_de": "Alemany",
-        "Language_dv": "Divehi",
-        "Language_dz": "Dzongkha",
-        "Language_ee": "Ewe",
-        "Language_el": "Grec",
-        "Language_en": "Anglès",
-        "Language_eo": "Esperanto",
-        "Language_es": "Castellà",
-        "Language_et": "Estònia",
-        "Language_eu": "Basc",
-        "Language_fa": "Persa",
-        "Language_ff": "Fulah",
-        "Language_fi": "Finès",
-        "Language_fj": "Fiji",
-        "Language_fo": "Illes Fèroe",
-        "Language_fr": "Francès",
-        "Language_fy": "Frisian de l'est",
-        "Language_ga": "Irlandès",
-        "Language_gd": "Gaèlic escocès",
-        "Language_gl": "Gallec",
-        "Language_gn": "Guaraní",
-        "Language_gu": "Gujarati",
-        "Language_gv": "Illa de Man",
-        "Language_ha": "Hausa",
-        "Language_he": "Hebreu",
-        "Language_hi": "Hindi",
-        "Language_ho": "Hiri Motu",
-        "Language_hr": "Croat",
-        "Language_ht": "Creole haitià",
-        "Language_hu": "Hongarès",
-        "Language_hy": "Armeni",
-        "Language_hz": "Herero",
-        "Language_ia": "Interlingua",
-        "Language_id": "Indonesi",
-        "Language_ie": "Interlingue",
-        "Language_ig": "Igbo",
-        "Language_ii": "Sichuan Yi",
-        "Language_ik": "Inupiaq",
-        "Language_io": "Ido",
-        "Language_is": "Islandès",
-        "Language_it": "Italià",
-        "Language_iu": "Inuktitut",
-        "Language_ja": "Japonès",
-        "Language_jv": "Javanès",
-        "Language_ka": "Georgià",
-        "Language_kg": "Kongo",
-        "Language_ki": "Kukuyu",
-        "Language_kj": "Kuanyama",
-        "Language_kk": "Kazakhstan",
-        "Language_kl": "Groenlàndia",
-        "Language_km": "Khmer Central",
-        "Language_kn": "Kannada",
-        "Language_ko": "Coreà",
-        "Language_kr": "Kanuri",
-        "Language_ks": "Kashmiri",
-        "Language_ku": "Kurd",
-        "Language_kv": "Komi",
-        "Language_kw": "Cornish",
-        "Language_ky": "Kirghiz",
-        "Language_la": "LLatí",
-        "Language_lb": "Luxemburguès",
-        "Language_lg": "Ganda",
-        "Language_li": "Limburguès",
-        "Language_ln": "Lingala",
-        "Language_lo": "Lao",
-        "Language_lt": "Lituà",
-        "Language_lu": "Luba-Katanga",
-        "Language_lv": "Letó",
-        "Language_mg": "Malgaix",
-        "Language_mh": "Illes Marshall",
-        "Language_mi": "Maori",
-        "Language_mk": "Macedoni",
-        "Language_ml": "Malayalam",
-        "Language_mn": "Mongol",
-        "Language_mr": "Marathi",
-        "Language_ms": "Malai",
-        "Language_mt": "Maltès",
-        "Language_my": "Birmà",
-        "Language_na": "Nauru",
-        "Language_nb": "Bokmal Norueg",
-        "Language_nd": "Ndebele del Nord",
-        "Language_ne": "Nepalès",
-        "Language_ng": "Ndonga",
-        "Language_nl": "Holandès",
-        "Language_nn": "Nynorsk de Noruega",
-        "Language_no": "Noruec",
-        "Language_nr": "Ndebele del Sud",
-        "Language_nv": "Navajo",
-        "Language_ny": "Chichewa",
-        "Language_oc": "Occità",
-        "Language_oj": "Ojibwa",
-        "Language_om": "Oroma",
-        "Language_or": "Oriya",
-        "Language_os": "Ossètia",
-        "Language_pa": "Panjabí",
-        "Language_pi": "Pali",
-        "Language_pl": "Polonès",
-        "Language_ps": "Pashto",
-        "Language_pt": "Portuguès",
-        "Language_qu": "Quechua",
-        "Language_rm": "Retorromànic",
-        "Language_rn": "Rundi",
-        "Language_ro": "Romanès",
-        "Language_ru": "Rus",
-        "Language_rw": "Kinyarwanda",
-        "Language_sa": "Sànscrit",
-        "Language_sc": "Sardo",
-        "Language_sd": "Sindhi",
-        "Language_se": "Sami del Nord",
-        "Language_sg": "Sango",
-        "Language_si": "Sinhala",
-        "Language_sk": "Eslovac",
-        "Language_sl": "Eslovè",
-        "Language_sm": "Samoa",
-        "Language_sn": "Shona",
-        "Language_so": "Somali",
-        "Language_sq": "Albanès",
-        "Language_sr": "Serbi",
-        "Language_ss": "Swati",
-        "Language_st": "Sotho",
-        "Language_su": "Sudanès",
-        "Language_sv": "Suec",
-        "Language_sw": "Swahili",
-        "Language_ta": "Tamil",
-        "Language_te": "Telugu",
-        "Language_tg": "Tajik",
-        "Language_th": "Thai",
-        "Language_ti": "Tigrinya",
-        "Language_tk": "Turkmenistan",
-        "Language_tl": "Tagalog",
-        "Language_tn": "Tswana",
-        "Language_to": "Tonga",
-        "Language_tr": "Turc",
-        "Language_ts": "Tsonga",
-        "Language_tt": "Tatar",
-        "Language_tw": "Twi",
-        "Language_ty": "Tahitian",
-        "Language_ug": "Uighur",
-        "Language_uk": "Ucranià",
-        "Language_ur": "Urdu",
-        "Language_uz": "Uzbec",
-        "Language_ve": "Venda",
-        "Language_vi": "Vietnamita",
-        "Language_vo": "Volapük",
-        "Language_wa": "Valònia",
-        "Language_wo": "Wolof",
-        "Language_xh": "Xhosa",
-        "Language_yi": "Jiddisch",
-        "Language_yo": "Yoruba",
-        "Language_za": "Chuang",
-        "Language_zh": "Xinès",
-        "Language_zu": "Zulu",
-        "LanguageCode": "Codi de l'idioma",
-        "PluginDescription": "Informe sobre les preferències del usuari: Navegador, Família del navegador, Sistema Operatiu, Extensions, Resolució, Preferències Globals",
-        "PluginDetectionDoesNotWorkInIE": "Nota: La detecció d'extensions no funciona amb Internet Explorer. L'informe es basa nomes amb navegadors diferents de l'Internet Explorer",
-        "Resolutions": "Resolucions",
-        "VisitorSettings": "Configuració del visitant",
-        "WidgetGlobalVisitors": "Configuracions globals dels visitants",
-        "WidgetGlobalVisitorsDocumentation": "Aquest informe mostra les configuracions més comuns que tenen els vostres visitants. Una configuració es la combinació de Sistema Operatiu, tipus de navegador i resolució de pantalla.",
-        "WidgetPlugins": "Llistat de connectors",
-        "WidgetPluginsDocumentation": "Aquest informe mostra quines extensions tenen els vostres visitants activades. Aquesta informació pot ser important per determinar la forma correcta de mostrar el contingut.",
-        "WidgetResolutions": "Resolucions"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/cs.json b/plugins/UserSettings/lang/cs.json
deleted file mode 100644
index 50fc946965..0000000000
--- a/plugins/UserSettings/lang/cs.json
+++ /dev/null
@@ -1,204 +0,0 @@
-{
-    "UserSettings": {
-        "BrowserLanguage": "Jazyk prohlížeče",
-        "BrowserWithNoPluginsEnabled": "%1$s bez povolených zásuvných modulů",
-        "BrowserWithPluginsEnabled": "%1$s s povolenými zásuvnými moduly %2$s",
-        "ColumnConfiguration": "Konfigurace",
-        "ColumnResolution": "Rozlišení",
-        "Configurations": "Nastavení",
-        "Language_aa": "afarština",
-        "Language_ab": "abcházština",
-        "Language_ae": "avestánština",
-        "Language_af": "afrikánština",
-        "Language_ak": "akanština",
-        "Language_am": "amharština",
-        "Language_an": "aragonština",
-        "Language_ar": "arabština",
-        "Language_as": "assaméština",
-        "Language_av": "avarština",
-        "Language_ay": "aymárština",
-        "Language_az": "azerbajdžánština",
-        "Language_ba": "baskirština",
-        "Language_be": "běloruština",
-        "Language_bg": "bulharština",
-        "Language_bh": "biharština",
-        "Language_bi": "bislámština",
-        "Language_bm": "bambarština",
-        "Language_bn": "bengálština",
-        "Language_bo": "tibetština",
-        "Language_br": "bretaňština",
-        "Language_bs": "bosenština",
-        "Language_ca": "katalánština",
-        "Language_ce": "čečenština",
-        "Language_ch": "čamoro",
-        "Language_co": "korsičtina",
-        "Language_cr": "krí",
-        "Language_cs": "čeština",
-        "Language_cu": "staroslověnština",
-        "Language_cv": "čuvašština",
-        "Language_cy": "velština",
-        "Language_da": "dánština",
-        "Language_de": "němčina",
-        "Language_dv": "divehi",
-        "Language_dz": "bhútánština",
-        "Language_ee": "eweština",
-        "Language_el": "řečtina",
-        "Language_en": "angličtina",
-        "Language_eo": "esperanto",
-        "Language_es": "španělština",
-        "Language_et": "estonština",
-        "Language_eu": "baskičtina",
-        "Language_fa": "perština",
-        "Language_ff": "fulahština",
-        "Language_fi": "finština",
-        "Language_fj": "fidži",
-        "Language_fo": "faerština",
-        "Language_fr": "francouzština",
-        "Language_fy": "fríština",
-        "Language_ga": "irština",
-        "Language_gd": "skotská galština",
-        "Language_gl": "haličština",
-        "Language_gn": "guaranština",
-        "Language_gu": "gujaratština",
-        "Language_gv": "manština",
-        "Language_ha": "hausa",
-        "Language_he": "hebrejština",
-        "Language_hi": "hindština",
-        "Language_ho": "hiri motu",
-        "Language_hr": "chorvatština",
-        "Language_ht": "haitština",
-        "Language_hu": "maďarština",
-        "Language_hy": "arménština",
-        "Language_hz": "herero",
-        "Language_ia": "interlingua",
-        "Language_id": "indonéština",
-        "Language_ie": "interlingue",
-        "Language_ig": "igboština",
-        "Language_ii": "Jazyk Yi",
-        "Language_ik": "inupiakština",
-        "Language_io": "ido",
-        "Language_is": "islandština",
-        "Language_it": "italština",
-        "Language_iu": "inuktitutština",
-        "Language_ja": "japonština",
-        "Language_jv": "javánština",
-        "Language_ka": "gruzínština",
-        "Language_kg": "konžština",
-        "Language_ki": "kikujština",
-        "Language_kj": "kuaňamština",
-        "Language_kk": "kazachština",
-        "Language_kl": "grónština",
-        "Language_km": "kambodžština",
-        "Language_kn": "kannadština",
-        "Language_ko": "korejština",
-        "Language_kr": "kanuri",
-        "Language_ks": "kašmírština",
-        "Language_ku": "kurdština",
-        "Language_kv": "komijština",
-        "Language_kw": "kornština",
-        "Language_ky": "kirgizština",
-        "Language_la": "latina",
-        "Language_lb": "Lucemburština",
-        "Language_lg": "ganda",
-        "Language_li": "limburština",
-        "Language_ln": "lingalština",
-        "Language_lo": "laoština",
-        "Language_lt": "litevština",
-        "Language_lu": "lubu-katanžština",
-        "Language_lv": "lotyština",
-        "Language_mg": "malgaština",
-        "Language_mh": "maršálština",
-        "Language_mi": "maorština",
-        "Language_mk": "makedonština",
-        "Language_ml": "malabarština",
-        "Language_mn": "mongolština",
-        "Language_mr": "marathi",
-        "Language_ms": "malajština",
-        "Language_mt": "maltština",
-        "Language_my": "barmština",
-        "Language_na": "nauru",
-        "Language_nb": "norština (Bokmål)",
-        "Language_nd": "ndebele (Zimbabwe)",
-        "Language_ne": "nepálština",
-        "Language_ng": "ndondština",
-        "Language_nl": "nizozemština",
-        "Language_nn": "norština (nynorsk)",
-        "Language_no": "norština",
-        "Language_nr": "ndebele (Jižní Afrika)",
-        "Language_nv": "navažština",
-        "Language_ny": "ňandžština",
-        "Language_oc": "occitan",
-        "Language_oj": "odžibvejština",
-        "Language_om": "Oromo (Afan)",
-        "Language_or": "oriya",
-        "Language_os": "osetština",
-        "Language_pa": "paňdžábština",
-        "Language_pi": "pálí",
-        "Language_pl": "polština",
-        "Language_ps": "Pashto (Pushto)",
-        "Language_pt": "portugalština",
-        "Language_qu": "kečuánština",
-        "Language_rm": "rétorománština",
-        "Language_rn": "kirundi",
-        "Language_ro": "rumunština",
-        "Language_ru": "ruština",
-        "Language_rw": "kinyarwandština",
-        "Language_sa": "sanskrt",
-        "Language_sc": "sardština",
-        "Language_sd": "sindhi",
-        "Language_se": "sámština (severní)",
-        "Language_sg": "sangho",
-        "Language_si": "sinhálština",
-        "Language_sk": "slovenština",
-        "Language_sl": "slovinština",
-        "Language_sm": "samoyština",
-        "Language_sn": "shona",
-        "Language_so": "somálština",
-        "Language_sq": "albánština",
-        "Language_sr": "srbština",
-        "Language_ss": "siswatština",
-        "Language_st": "sesotho",
-        "Language_su": "sundanština",
-        "Language_sv": "švédština",
-        "Language_sw": "svahilština",
-        "Language_ta": "tamilština",
-        "Language_te": "telugština",
-        "Language_tg": "tádžičtina",
-        "Language_th": "thajština",
-        "Language_ti": "tigrinijština",
-        "Language_tk": "turkmenština",
-        "Language_tl": "tagalog",
-        "Language_tn": "setswanština",
-        "Language_to": "tonga",
-        "Language_tr": "turečtina",
-        "Language_ts": "tsonga",
-        "Language_tt": "tatarština",
-        "Language_tw": "twi",
-        "Language_ty": "tahitština",
-        "Language_ug": "uighurština",
-        "Language_uk": "ukrajinština",
-        "Language_ur": "urdština",
-        "Language_uz": "uzbečtina",
-        "Language_ve": "vendština",
-        "Language_vi": "vietnamština",
-        "Language_vo": "volapuk",
-        "Language_wa": "valonština",
-        "Language_wo": "wolof",
-        "Language_xh": "xhosa",
-        "Language_yi": "jidiš",
-        "Language_yo": "yoruba",
-        "Language_za": "zhuang",
-        "Language_zh": "čínština",
-        "Language_zu": "zulu",
-        "LanguageCode": "Jazykový kód",
-        "PluginDescription": "Zobrazí různá uživatelská nastavení: prohlížeč, rodinu prohlížečů, operační systém, zásuvné moduly, rozlišení, globální nastavení.",
-        "PluginDetectionDoesNotWorkInIE": "Poznámka: Detekce zásuvných modulů nepracuje v prohlížeči Interet Explorer. Toto hlášení je založeno na ostatních prohlížečích",
-        "Resolutions": "Rozlišení",
-        "VisitorSettings": "Nastavení návštěvníků",
-        "WidgetGlobalVisitors": "Hlavní nastavení návštěvníků",
-        "WidgetGlobalVisitorsDocumentation": "Toto hlášení zobrazuje nejčastější konfigurace, které vaši návštěvníci měli. Konfigurace je kombinace operačního systému, prohlížeče a rozlišení.",
-        "WidgetPlugins": "Seznam zásuvných modulů",
-        "WidgetPluginsDocumentation": "Toto hlášení zobrazuje zásuvné moduly, které měli vaši návštěvníci povoleny. Tato informace může být důležitá při rozhodování o tom, jakým způsobem prezentovat obsah.",
-        "WidgetResolutions": "Rozlišení obrazovky"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/cy.json b/plugins/UserSettings/lang/cy.json
deleted file mode 100644
index 10a3d95f56..0000000000
--- a/plugins/UserSettings/lang/cy.json
+++ /dev/null
@@ -1,174 +0,0 @@
-{
-    "UserSettings": {
-        "Language_aa": "Affareg",
-        "Language_ab": "Abchaseg",
-        "Language_ae": "Afestaneg",
-        "Language_af": "Affricaneg",
-        "Language_ak": "Acaneg",
-        "Language_am": "Amhareg",
-        "Language_an": "Aragoneg",
-        "Language_ar": "Arabeg",
-        "Language_as": "Asameg",
-        "Language_av": "Afareg",
-        "Language_az": "Azerbaijani",
-        "Language_ba": "Bashcorteg",
-        "Language_be": "Belarwsiyn",
-        "Language_bg": "Bwlgareg",
-        "Language_bh": "Bihari",
-        "Language_bi": "Bislama",
-        "Language_bm": "Bambareg",
-        "Language_bn": "Bengali; Bangla",
-        "Language_bo": "Tibeteg",
-        "Language_br": "Llydaweg",
-        "Language_bs": "Bosnieg",
-        "Language_ca": "Catalaneg",
-        "Language_ce": "Tsietsieneg",
-        "Language_ch": "Tsiamorro",
-        "Language_co": "Corseg",
-        "Language_cr": "Cri",
-        "Language_cs": "Tsiec",
-        "Language_cu": "Hen Slafoneg",
-        "Language_cy": "Cymraeg",
-        "Language_da": "Daneg",
-        "Language_de": "Almaeneg",
-        "Language_dv": "Difehi",
-        "Language_ee": "Ewe",
-        "Language_el": "Groeg",
-        "Language_en": "Saesneg",
-        "Language_eo": "Esperanto",
-        "Language_es": "Sbaeneg",
-        "Language_et": "Estoneg",
-        "Language_eu": "Basgeg",
-        "Language_fa": "Persieg",
-        "Language_ff": "Ffwla",
-        "Language_fi": "Ffineg",
-        "Language_fj": "Ffijïeg",
-        "Language_fo": "Ffaroeg",
-        "Language_fr": "Ffrangeg",
-        "Language_fy": "Ffrisieg",
-        "Language_ga": "Gwyddeleg",
-        "Language_gd": "Gaeleg yr Alban",
-        "Language_gl": "Galiseg",
-        "Language_gn": "Guarani",
-        "Language_gu": "Gwjarati",
-        "Language_gv": "Manaweg",
-        "Language_ha": "Hawsa",
-        "Language_he": "Hebraeg",
-        "Language_hi": "Hindi",
-        "Language_hr": "Croateg",
-        "Language_ht": "Creol Haiti",
-        "Language_hu": "Hwngareg",
-        "Language_hy": "Armeneg",
-        "Language_hz": "Herero",
-        "Language_ia": "Interlingua",
-        "Language_id": "Indonesieg",
-        "Language_ie": "Interlingue",
-        "Language_ig": "Igbo",
-        "Language_ii": "Nwosw",
-        "Language_ik": "Inwpiaceg",
-        "Language_is": "Islandeg",
-        "Language_it": "Eidaleg",
-        "Language_iu": "Inwctitwt",
-        "Language_ja": "Siapaneeg",
-        "Language_jv": "Jafanaeg",
-        "Language_ka": "Georgeg",
-        "Language_kg": "Congo",
-        "Language_ki": "Cicwyeg",
-        "Language_kk": "Casacheg",
-        "Language_km": "Cambodieg",
-        "Language_kn": "Kannada",
-        "Language_ko": "Corëeg",
-        "Language_kr": "Canwri",
-        "Language_ks": "Cashmireg",
-        "Language_ku": "Cwrdeg",
-        "Language_kv": "Comi",
-        "Language_kw": "Cernyweg",
-        "Language_ky": "Kyrgyz",
-        "Language_la": "Lladin",
-        "Language_lb": "Lwcsembwrgeg",
-        "Language_lg": "Ganda",
-        "Language_li": "Limbwrgeg",
-        "Language_ln": "Lingala",
-        "Language_lo": "Laoeg",
-        "Language_lt": "Lithwaneg",
-        "Language_lv": "Latfieg",
-        "Language_mg": "Malagaseg",
-        "Language_mh": "Marsialeg",
-        "Language_mi": "Maori",
-        "Language_mk": "Macedoneg",
-        "Language_ml": "Malayalam",
-        "Language_mn": "Mongoleg",
-        "Language_mr": "Marathi",
-        "Language_ms": "Malai",
-        "Language_mt": "Malteseg",
-        "Language_my": "Byrmaneg",
-        "Language_na": "Nawrŵeg",
-        "Language_nb": "Norwyeg Bokmål",
-        "Language_nd": "Ndebele Gogleddol",
-        "Language_ne": "Nepali",
-        "Language_nl": "Iseldireg",
-        "Language_nn": "Norwyeg (Nynorsk)",
-        "Language_no": "Norwyeg",
-        "Language_nr": "Ndebele Deheuol",
-        "Language_nv": "Nafaho",
-        "Language_ny": "Nianja",
-        "Language_oc": "Ocsitaneg",
-        "Language_oj": "Ojibwa",
-        "Language_om": "Oromo",
-        "Language_or": "Oriya",
-        "Language_os": "Oseteg",
-        "Language_pa": "Pwnjabi",
-        "Language_pl": "Pwyleg",
-        "Language_ps": "Pashto",
-        "Language_pt": "Portiwgaleg",
-        "Language_qu": "Quechua",
-        "Language_rm": "Romaunsch",
-        "Language_rn": "Rwndi",
-        "Language_ro": "Rwmaneg",
-        "Language_ru": "Rwsieg",
-        "Language_rw": "Ciniarŵandeg",
-        "Language_sa": "Sansgrit",
-        "Language_sc": "Sardeg",
-        "Language_sd": "Sindhi",
-        "Language_se": "Sami Gogleddol",
-        "Language_sg": "Sango",
-        "Language_si": "Sinhaleg",
-        "Language_sk": "Slofaceg",
-        "Language_sl": "Slofeneg",
-        "Language_sm": "Samöeg",
-        "Language_so": "Somaleg",
-        "Language_sq": "Albaneg",
-        "Language_sr": "Serbeg",
-        "Language_st": "Sesotheg",
-        "Language_su": "Sundaneg",
-        "Language_sv": "Swedeg",
-        "Language_sw": "Swahili",
-        "Language_ta": "Tamil",
-        "Language_te": "Telugu",
-        "Language_tg": "Tajiceg",
-        "Language_th": "Thai",
-        "Language_ti": "Tigrinya",
-        "Language_tk": "Tyrcmeneg",
-        "Language_tl": "Tagalog*",
-        "Language_tn": "Tswana",
-        "Language_to": "Tongeg",
-        "Language_tr": "Twrceg",
-        "Language_ts": "Tsongaeg",
-        "Language_tt": "Tatareg",
-        "Language_tw": "Twi",
-        "Language_ty": "Tahitïeg",
-        "Language_ug": "Uighur",
-        "Language_uk": "Wcreineg",
-        "Language_ur": "Urdu",
-        "Language_uz": "Wsbeceg",
-        "Language_ve": "Fendeg",
-        "Language_vi": "Fietnameg",
-        "Language_wa": "Walwneg",
-        "Language_wo": "Woloff",
-        "Language_xh": "Xhosa",
-        "Language_yi": "Iddew-Almaeneg",
-        "Language_yo": "Iorwba",
-        "Language_zh": "Tseineeg",
-        "Language_zu": "Zwlw"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/da.json b/plugins/UserSettings/lang/da.json
deleted file mode 100644
index a031640225..0000000000
--- a/plugins/UserSettings/lang/da.json
+++ /dev/null
@@ -1,204 +0,0 @@
-{
-    "UserSettings": {
-        "BrowserLanguage": "Browser sprog",
-        "BrowserWithNoPluginsEnabled": "%1$s med ingen aktiverede udvidelsesmoduler",
-        "BrowserWithPluginsEnabled": "%1$s med udvidelsesmoduler %2$s aktiveret",
-        "ColumnConfiguration": "Konfiguration",
-        "ColumnResolution": "Opløsning",
-        "Configurations": "Indstillinger",
-        "Language_aa": "Afar",
-        "Language_ab": "Abkhasisk",
-        "Language_ae": "Avestisk",
-        "Language_af": "Afrikaans",
-        "Language_ak": "Akan",
-        "Language_am": "Amharisk",
-        "Language_an": "Aragonisk",
-        "Language_ar": "Arabisk",
-        "Language_as": "Assamesisk",
-        "Language_av": "Avarisk",
-        "Language_ay": "Aymara",
-        "Language_az": "Aserbajdsjansk",
-        "Language_ba": "Basjkirsk",
-        "Language_be": "Hviderussisk",
-        "Language_bg": "Bulgarsk",
-        "Language_bh": "Bihari",
-        "Language_bi": "Bislama",
-        "Language_bm": "Bambara",
-        "Language_bn": "Bengali",
-        "Language_bo": "Tibetansk",
-        "Language_br": "Bretonsk",
-        "Language_bs": "Bosnisk",
-        "Language_ca": "Katalansk",
-        "Language_ce": "Tjetjensk",
-        "Language_ch": "Chamorro",
-        "Language_co": "Korsikansk",
-        "Language_cr": "Cree",
-        "Language_cs": "Tjekkisk",
-        "Language_cu": "Kirkeslavisk",
-        "Language_cv": "Tsjuvansk",
-        "Language_cy": "Walisisk",
-        "Language_da": "Dansk",
-        "Language_de": "Tysk",
-        "Language_dv": "Dhivehi",
-        "Language_dz": "Dzongkha",
-        "Language_ee": "Ewe",
-        "Language_el": "Græsk",
-        "Language_en": "Engelsk",
-        "Language_eo": "Esperanto",
-        "Language_es": "Spansk",
-        "Language_et": "Estisk",
-        "Language_eu": "Baskisk",
-        "Language_fa": "Persisk",
-        "Language_ff": "Fulfulde",
-        "Language_fi": "Finsk",
-        "Language_fj": "Fijisk",
-        "Language_fo": "Færøsk",
-        "Language_fr": "Fransk",
-        "Language_fy": "Frisisk",
-        "Language_ga": "Irsk",
-        "Language_gd": "Skotsk gælisk",
-        "Language_gl": "Galicisk",
-        "Language_gn": "Guaraní",
-        "Language_gu": "Gujarati",
-        "Language_gv": "Mansk",
-        "Language_ha": "Hausa",
-        "Language_he": "Hebraisk",
-        "Language_hi": "Hindi",
-        "Language_ho": "Hiri motu",
-        "Language_hr": "Kroatisk",
-        "Language_ht": "Haitisk kreolsk",
-        "Language_hu": "Ungarsk",
-        "Language_hy": "Armensk",
-        "Language_hz": "Herero",
-        "Language_ia": "Interlingua",
-        "Language_id": "Indonesisk",
-        "Language_ie": "Interlingue",
-        "Language_ig": "Ibo",
-        "Language_ii": "Yi",
-        "Language_ik": "Inupiak",
-        "Language_io": "Ido",
-        "Language_is": "Islandsk",
-        "Language_it": "Italiensk",
-        "Language_iu": "Inuittisk",
-        "Language_ja": "Japansk",
-        "Language_jv": "Javanesisk",
-        "Language_ka": "Georgisk",
-        "Language_kg": "Congolesisk",
-        "Language_ki": "Gikuyu",
-        "Language_kj": "Kwanyama",
-        "Language_kk": "Kasakhisk",
-        "Language_kl": "Kalaallisut",
-        "Language_km": "Khmer",
-        "Language_kn": "Kannada",
-        "Language_ko": "Koreansk",
-        "Language_kr": "Kanuri",
-        "Language_ks": "Kashmirisk",
-        "Language_ku": "Kurdisk",
-        "Language_kv": "Komi",
-        "Language_kw": "Kornisk",
-        "Language_ky": "Kirgisisk",
-        "Language_la": "Latinsk",
-        "Language_lb": "Luxembourgsk",
-        "Language_lg": "Luganda",
-        "Language_li": "Limburgisk",
-        "Language_ln": "Lingala",
-        "Language_lo": "Laotisk",
-        "Language_lt": "Litauisk",
-        "Language_lu": "Luba-Katanga",
-        "Language_lv": "Lettisk",
-        "Language_mg": "Gassisk",
-        "Language_mh": "Marshallesisk",
-        "Language_mi": "Maoriski",
-        "Language_mk": "Makedonsk",
-        "Language_ml": "Malayalam",
-        "Language_mn": "Mongolsk",
-        "Language_mr": "Marathi",
-        "Language_ms": "Malajisk",
-        "Language_mt": "Maltesisk",
-        "Language_my": "Burmesisk",
-        "Language_na": "Naurisk",
-        "Language_nb": "Norsk Bokmål",
-        "Language_nd": "Nord-ndebele",
-        "Language_ne": "Nepali",
-        "Language_ng": "Ndonga",
-        "Language_nl": "Hollandsk",
-        "Language_nn": "Norsk (Nynorsk)",
-        "Language_no": "Norsk",
-        "Language_nr": "Syd-ndebele",
-        "Language_nv": "Navajo",
-        "Language_ny": "Chichewa",
-        "Language_oc": "Occitansk",
-        "Language_oj": "Ojibwa",
-        "Language_om": "Oromo",
-        "Language_or": "Oriya",
-        "Language_os": "Ossetisk",
-        "Language_pa": "Punjabi",
-        "Language_pi": "Pali",
-        "Language_pl": "Polsk",
-        "Language_ps": "Pashto",
-        "Language_pt": "Portugisisk",
-        "Language_qu": "Quechua",
-        "Language_rm": "Rætoromansk",
-        "Language_rn": "Kirundi",
-        "Language_ro": "Rumænsk",
-        "Language_ru": "Russisk",
-        "Language_rw": "Kinyarwanda",
-        "Language_sa": "Sanskrit",
-        "Language_sc": "Sardisk",
-        "Language_sd": "Sindhi",
-        "Language_se": "Nordsamisk",
-        "Language_sg": "Sango",
-        "Language_si": "Singalesisk",
-        "Language_sk": "Slovakisk",
-        "Language_sl": "Slovensk",
-        "Language_sm": "Samoansk",
-        "Language_sn": "Shona",
-        "Language_so": "Somali",
-        "Language_sq": "Albansk",
-        "Language_sr": "Serbisk",
-        "Language_ss": "Swati",
-        "Language_st": "Sesotho",
-        "Language_su": "Sundanesisk",
-        "Language_sv": "Svensk",
-        "Language_sw": "Swahili",
-        "Language_ta": "Tamilsk",
-        "Language_te": "Telugu",
-        "Language_tg": "Tadtjikkisk",
-        "Language_th": "Thai",
-        "Language_ti": "Tigrinya",
-        "Language_tk": "Turkmensk",
-        "Language_tl": "Tagalog",
-        "Language_tn": "Tswana",
-        "Language_to": "Tonganesisk",
-        "Language_tr": "Turkisk",
-        "Language_ts": "Tsonga",
-        "Language_tt": "Tatarsk",
-        "Language_tw": "Twi",
-        "Language_ty": "Tahitisk",
-        "Language_ug": "Uighur",
-        "Language_uk": "Ukainsk",
-        "Language_ur": "Urdu",
-        "Language_uz": "Usbekisk",
-        "Language_ve": "Venda",
-        "Language_vi": "Vietnamesisk",
-        "Language_vo": "Volapük",
-        "Language_wa": "Vallonsk",
-        "Language_wo": "Wolof",
-        "Language_xh": "Xhosa",
-        "Language_yi": "Jiddisch",
-        "Language_yo": "Yoruba",
-        "Language_za": "Zhuang",
-        "Language_zh": "Kinesisk",
-        "Language_zu": "Zulu",
-        "LanguageCode": "Sprogkode",
-        "PluginDescription": "Rapporter brugerindstillinger: browser, browsertype, operativsystem, udvidelsesmoduler, opløsning, globale indstillinger.",
-        "PluginDetectionDoesNotWorkInIE": "Note: Udvidelsesmodul detektering virker ikke i Internet Explorer. Rapport viser kun ikke-IE browsere.",
-        "Resolutions": "Opløsninger",
-        "VisitorSettings": "Besøgendes indstillinger",
-        "WidgetGlobalVisitors": "Besøgendes konfiguration",
-        "WidgetGlobalVisitorsDocumentation": "Rapporten viser de mest almindelige samlede konfigurationer, som de besøgende havde. En konfiguration er en kombination af et styresystem, en browsertype og en skærmopløsning.",
-        "WidgetPlugins": "Udvidelsesmoduler",
-        "WidgetPluginsDocumentation": "Rapporten viser, hvilke browserudvidelser de besøgende havde aktiveret. Oplysningerne kan være vigtigt for at vælge den rigtige måde at levere indholdet på.",
-        "WidgetResolutions": "Skærmopløsninger"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/de.json b/plugins/UserSettings/lang/de.json
deleted file mode 100644
index 0b2cf46081..0000000000
--- a/plugins/UserSettings/lang/de.json
+++ /dev/null
@@ -1,204 +0,0 @@
-{
-    "UserSettings": {
-        "BrowserLanguage": "Browsersprache",
-        "BrowserWithNoPluginsEnabled": "%1$s mit keinen aktivierten Plugins",
-        "BrowserWithPluginsEnabled": "%1$s mit den Plugins %2$s aktiviert",
-        "ColumnConfiguration": "Konfiguration",
-        "ColumnResolution": "Auflösung",
-        "Configurations": "Konfigurationen",
-        "Language_aa": "Afar",
-        "Language_ab": "Abchasisch",
-        "Language_ae": "Avestisch",
-        "Language_af": "Afrikaans",
-        "Language_ak": "Akan",
-        "Language_am": "Amharisch",
-        "Language_an": "Aragonesisch",
-        "Language_ar": "Arabisch",
-        "Language_as": "Assamesisch",
-        "Language_av": "Awarisch",
-        "Language_ay": "Aymara",
-        "Language_az": "Aserbaidschanisch",
-        "Language_ba": "Baschkirisch",
-        "Language_be": "Weissrussisch",
-        "Language_bg": "Bulgarisch",
-        "Language_bh": "Bihari",
-        "Language_bi": "Bislama",
-        "Language_bm": "Bambara",
-        "Language_bn": "Bengalisch",
-        "Language_bo": "Tibetisch",
-        "Language_br": "Bretonisch",
-        "Language_bs": "Bosnisch",
-        "Language_ca": "Katalanisch",
-        "Language_ce": "Tschetschenisch",
-        "Language_ch": "Chamorro",
-        "Language_co": "Korsisch",
-        "Language_cr": "Cree",
-        "Language_cs": "Tschechisch",
-        "Language_cu": "Altkirchenslawisch",
-        "Language_cv": "Tschuwaschisch",
-        "Language_cy": "Walisisch",
-        "Language_da": "Dänisch",
-        "Language_de": "Deutsch",
-        "Language_dv": "Divehi",
-        "Language_dz": "Dzongkha",
-        "Language_ee": "Ewe",
-        "Language_el": "Griechisch",
-        "Language_en": "Englisch",
-        "Language_eo": "Esperanto",
-        "Language_es": "Spanisch",
-        "Language_et": "Estnisch",
-        "Language_eu": "Baskisch",
-        "Language_fa": "Persisch",
-        "Language_ff": "Fulfulde",
-        "Language_fi": "Finnisch",
-        "Language_fj": "Fidschi",
-        "Language_fo": "Färöisch",
-        "Language_fr": "Französisch",
-        "Language_fy": "Westfrisisch",
-        "Language_ga": "Irisch",
-        "Language_gd": "Schottisch-Gälisch",
-        "Language_gl": "Galicisch",
-        "Language_gn": "Guaraní",
-        "Language_gu": "Gujarati",
-        "Language_gv": "Manx",
-        "Language_ha": "Hausa",
-        "Language_he": "Hebräisch",
-        "Language_hi": "Hindi",
-        "Language_ho": "Hiri Motu",
-        "Language_hr": "Kroatisch",
-        "Language_ht": "Haitianisch",
-        "Language_hu": "Ungarisch",
-        "Language_hy": "Armenisch",
-        "Language_hz": "Otjiherero",
-        "Language_ia": "Interlingua",
-        "Language_id": "Indonesisch",
-        "Language_ie": "Interlingue",
-        "Language_ig": "Igbo",
-        "Language_ii": "Sichuan Yi",
-        "Language_ik": "Inupiaq",
-        "Language_io": "Ido",
-        "Language_is": "Isländisch",
-        "Language_it": "Italienisch",
-        "Language_iu": "Inuktitut",
-        "Language_ja": "Japanisch",
-        "Language_jv": "Javanisch",
-        "Language_ka": "Georgisch",
-        "Language_kg": "Kikongo",
-        "Language_ki": "Kikuyu",
-        "Language_kj": "Kwanyama",
-        "Language_kk": "Kasachisch",
-        "Language_kl": "Kalaallisut",
-        "Language_km": "Khmer",
-        "Language_kn": "Kannada",
-        "Language_ko": "Koreanisch",
-        "Language_kr": "Kanuri",
-        "Language_ks": "Kashmiri",
-        "Language_ku": "Kurdisch",
-        "Language_kv": "Komi",
-        "Language_kw": "Kornisch",
-        "Language_ky": "Kirgisisch",
-        "Language_la": "Latein",
-        "Language_lb": "Luxemburgisch",
-        "Language_lg": "Luganda",
-        "Language_li": "Limburgisch",
-        "Language_ln": "Lingála",
-        "Language_lo": "Laotisch",
-        "Language_lt": "Lithauisch",
-        "Language_lu": "Tschiluba",
-        "Language_lv": "Lettisch",
-        "Language_mg": "Malagasy",
-        "Language_mh": "Marshallesisch",
-        "Language_mi": "Maorisch",
-        "Language_mk": "Mazedonisch",
-        "Language_ml": "Malayalam",
-        "Language_mn": "Mongolisch",
-        "Language_mr": "Marathi",
-        "Language_ms": "Malaiisch",
-        "Language_mt": "Maltesisch",
-        "Language_my": "Burmanisch",
-        "Language_na": "Nauruisch",
-        "Language_nb": "Norwegisch Bokmål",
-        "Language_nd": "(Nord) Ndebele",
-        "Language_ne": "Nepali",
-        "Language_ng": "Ndonga",
-        "Language_nl": "Niederländisch",
-        "Language_nn": "Norwegisch Nynorsk",
-        "Language_no": "Norwegisch",
-        "Language_nr": "(Süd) Ndebele",
-        "Language_nv": "Navajo",
-        "Language_ny": "Chichewa",
-        "Language_oc": "Okzitanisch",
-        "Language_oj": "Ojibwe",
-        "Language_om": "Oromo",
-        "Language_or": "Oriya",
-        "Language_os": "Ossetisch",
-        "Language_pa": "Panjabi",
-        "Language_pi": "Pali",
-        "Language_pl": "Polnisch",
-        "Language_ps": "Pashtunisch",
-        "Language_pt": "Portugiesisch",
-        "Language_qu": "Quechua",
-        "Language_rm": "Rätoromanisch",
-        "Language_rn": "Kirundi",
-        "Language_ro": "Rumänisch",
-        "Language_ru": "Russisch",
-        "Language_rw": "Kinyarwanda",
-        "Language_sa": "Sanskrit",
-        "Language_sc": "Sardisch",
-        "Language_sd": "Sindhi",
-        "Language_se": "Nordsamisch",
-        "Language_sg": "Sango",
-        "Language_si": "Singhalesisch",
-        "Language_sk": "Slovakisch",
-        "Language_sl": "Slovenisch",
-        "Language_sm": "Samoisch",
-        "Language_sn": "Shona",
-        "Language_so": "Somali",
-        "Language_sq": "Albanisch",
-        "Language_sr": "Serbisch",
-        "Language_ss": "Siswati",
-        "Language_st": "Süd-Sotho",
-        "Language_su": "Sundanesisch",
-        "Language_sv": "Schwedisch",
-        "Language_sw": "Swahili",
-        "Language_ta": "Tamil",
-        "Language_te": "Telugu",
-        "Language_tg": "Tadschikisch",
-        "Language_th": "Thailändisch",
-        "Language_ti": "Tigrinya",
-        "Language_tk": "Turkmenisch",
-        "Language_tl": "Tagalog",
-        "Language_tn": "Setswana",
-        "Language_to": "Tongaisch",
-        "Language_tr": "Türkisch",
-        "Language_ts": "Xitsonga",
-        "Language_tt": "Tatarisch",
-        "Language_tw": "Twi",
-        "Language_ty": "Tahitianisch",
-        "Language_ug": "Uigurisch",
-        "Language_uk": "Ukrainisch",
-        "Language_ur": "Urdu",
-        "Language_uz": "Uzbekisch",
-        "Language_ve": "Tshivenda",
-        "Language_vi": "Vietnamesisch",
-        "Language_vo": "Volapük",
-        "Language_wa": "Wallonisch",
-        "Language_wo": "Wolof",
-        "Language_xh": "IsiXhosa",
-        "Language_yi": "Jiddisch",
-        "Language_yo": "Yoruba",
-        "Language_za": "Zhuang",
-        "Language_zh": "Chinesisch",
-        "Language_zu": "IsiZulu",
-        "LanguageCode": "Sprach-Code",
-        "PluginDescription": "Bericht über verschiedene Benutzereinstellungen: Browser, Browserfamilie, Betriebssystem, Plugins, Auflösung, Allgemeine Einstellungen.",
-        "PluginDetectionDoesNotWorkInIE": "Hinweis: Die Erkennung von Plugins funktioniert nicht im Internet Explorer. Diese Statistik beruht nur auf Nicht-IE Browsern.",
-        "Resolutions": "Auflösungen",
-        "VisitorSettings": "Besuchereinstellungen",
-        "WidgetGlobalVisitors": "Globale Besucherkonfiguration",
-        "WidgetGlobalVisitorsDocumentation": "Dieser Bericht zeigt Ihnen die häufigsten Gesamtkonfigurationen der Besucher. Eine Konfiguration ist die Kombination aus Betriebssystem, Browsertyp und Bildschirmauflösung.",
-        "WidgetPlugins": "Liste der Plugins",
-        "WidgetPluginsDocumentation": "Dieser Bericht zeigt Ihnen, welche Plugins Ihre Besucher in Ihren Browser aktiviert haben. Diese Informationen kann Ihnen dabei helfen, die beste Art zu finden, Ihre Inhalte auszuliefern.",
-        "WidgetResolutions": "Bildschirmauflösungen"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/el.json b/plugins/UserSettings/lang/el.json
deleted file mode 100644
index 9b7f7395f6..0000000000
--- a/plugins/UserSettings/lang/el.json
+++ /dev/null
@@ -1,204 +0,0 @@
-{
-    "UserSettings": {
-        "BrowserLanguage": "Γλώσσα φυλλομετρητή",
-        "BrowserWithNoPluginsEnabled": "%1$s με ανενεργά πρόσθετα",
-        "BrowserWithPluginsEnabled": "%1$s με %2$s πρόσθετα ενεργά",
-        "ColumnConfiguration": "Ρύθμιση",
-        "ColumnResolution": "Ανάλυση",
-        "Configurations": "Ρυθμίσεις",
-        "Language_aa": "Αφαρικά",
-        "Language_ab": "Αμπχαζικά",
-        "Language_ae": "Αβεστανικά",
-        "Language_af": "Αφρικανικά",
-        "Language_ak": "Ακανικά",
-        "Language_am": "Αμχαρικά",
-        "Language_an": "Αραγονέζικα",
-        "Language_ar": "Αραβικά",
-        "Language_as": "Ασσαμέζικα",
-        "Language_av": "Αβαρικά",
-        "Language_ay": "Αγμαραϊκά",
-        "Language_az": "Αζέρικα",
-        "Language_ba": "Μπασκιρικά",
-        "Language_be": "Λευκορώσικα",
-        "Language_bg": "Βουλγάρικα",
-        "Language_bh": "Μπιχαρικά",
-        "Language_bi": "Μπισλαμαϊκά",
-        "Language_bm": "Μπαμπαραϊκά",
-        "Language_bn": "Βενγκαλικά",
-        "Language_bo": "Θιβετιανικά",
-        "Language_br": "Μπρετονικά",
-        "Language_bs": "Βοσνιακά",
-        "Language_ca": "Καταλανικά",
-        "Language_ce": "Χεχενικά",
-        "Language_ch": "Χαμορροϊκά",
-        "Language_co": "Κορσικανικά",
-        "Language_cr": "Κρεεϊκά",
-        "Language_cs": "Τσέχικα",
-        "Language_cu": "Εκκλησιαστικά Σλαβικά",
-        "Language_cv": "Χουβάς",
-        "Language_cy": "Ουαλικά",
-        "Language_da": "Δανικά",
-        "Language_de": "Γερμανικά",
-        "Language_dv": "Ντιβέχι",
-        "Language_dz": "Ντζόνγκχα",
-        "Language_ee": "Γι",
-        "Language_el": "Ελληνικά",
-        "Language_en": "Αγγλικά",
-        "Language_eo": "Εσπεράντο",
-        "Language_es": "Ισπανικά",
-        "Language_et": "Εσθονικά",
-        "Language_eu": "Βασκικά",
-        "Language_fa": "Περσικά",
-        "Language_ff": "Φουλάχ",
-        "Language_fi": "Φινλανδικά",
-        "Language_fj": "Φίτζι",
-        "Language_fo": "Φαρόε",
-        "Language_fr": "Γαλλικά",
-        "Language_fy": "Δυτικά Φριζιανά",
-        "Language_ga": "Ιρλανδικά",
-        "Language_gd": "Σκωτικά Κελτικά",
-        "Language_gl": "Γαλικιανά",
-        "Language_gn": "Γκουαρανί",
-        "Language_gu": "Γκουγιαράτι",
-        "Language_gv": "Μανξ",
-        "Language_ha": "Χάουσα",
-        "Language_he": "Εβραϊκά",
-        "Language_hi": "Χίντι",
-        "Language_ho": "Χίρι Μότου",
-        "Language_hr": "Κροατικά",
-        "Language_ht": "Αϊτιανά",
-        "Language_hu": "Ουγγρικά",
-        "Language_hy": "Αρμενικά",
-        "Language_hz": "Χερέρο",
-        "Language_ia": "Ιντερλίνγκουα",
-        "Language_id": "Ινδονησιακά",
-        "Language_ie": "Ιντερλίνγκουε",
-        "Language_ig": "Ίγκμπο",
-        "Language_ii": "Σικουάν Γι",
-        "Language_ik": "Ινουπιάκ",
-        "Language_io": "Ίντο",
-        "Language_is": "Ισλανδικά",
-        "Language_it": "Ιταλικά",
-        "Language_iu": "Ινουκτιτούτ",
-        "Language_ja": "Ιαπωνικά",
-        "Language_jv": "Ιαβανεζικά",
-        "Language_ka": "Γεωργιανά",
-        "Language_kg": "Κονγκό",
-        "Language_ki": "Κικούγιου",
-        "Language_kj": "Κουανιγιάμα",
-        "Language_kk": "Καζακικά",
-        "Language_kl": "Καλααλισούτ",
-        "Language_km": "Καμποτζιανά",
-        "Language_kn": "Κανάντα",
-        "Language_ko": "Κορεατικά",
-        "Language_kr": "Κανούρι",
-        "Language_ks": "Κασμίρι",
-        "Language_ku": "Κουρδικά",
-        "Language_kv": "Κόμι",
-        "Language_kw": "Κόρνις",
-        "Language_ky": "Κυργιζικά",
-        "Language_la": "Λατινικά",
-        "Language_lb": "Λουξεμβουργικά",
-        "Language_lg": "Γκάντα",
-        "Language_li": "Λιμβουργιανά",
-        "Language_ln": "Λινγκάλα",
-        "Language_lo": "Λαοθιανά",
-        "Language_lt": "Λιθουανικά",
-        "Language_lu": "Λούμπα-Κατάνγκα",
-        "Language_lv": "Λετονικά",
-        "Language_mg": "Μαλαγάσι",
-        "Language_mh": "Μάρσαλ",
-        "Language_mi": "Μάορι",
-        "Language_mk": "Σλαβομακεδονικά",
-        "Language_ml": "Μαλαγιαλάμ",
-        "Language_mn": "Μογγολικά",
-        "Language_mr": "Μαράθι",
-        "Language_ms": "Μαλάι",
-        "Language_mt": "Μαλτεζικά",
-        "Language_my": "Βιρμανικά",
-        "Language_na": "Ναούρου",
-        "Language_nb": "Νορβηγικά Μποκμάλ",
-        "Language_nd": "Ντεμπέλε Βορρά",
-        "Language_ne": "Νεπάλι",
-        "Language_ng": "Ντόνγκα",
-        "Language_nl": "Ολλανδικά",
-        "Language_nn": "Νορβηγικά Νινόρσκ",
-        "Language_no": "Νορβηγικά",
-        "Language_nr": "Ντεμπέλε Νότου",
-        "Language_nv": "Νάβαχο",
-        "Language_ny": "Νιάντζα",
-        "Language_oc": "Οκσιτανικά",
-        "Language_oj": "Οζιβίγουα",
-        "Language_om": "Ορόμο",
-        "Language_or": "Ορίγια",
-        "Language_os": "Οσετικά",
-        "Language_pa": "Παντζαπικά",
-        "Language_pi": "Πάλι",
-        "Language_pl": "Πολωνικά",
-        "Language_ps": "Πάστο",
-        "Language_pt": "Πορτογαλικά",
-        "Language_qu": "Κετσούα",
-        "Language_rm": "Ρετο-Ρομανικά",
-        "Language_rn": "Ρούντι",
-        "Language_ro": "Ρουμανικά",
-        "Language_ru": "Ρωσικά",
-        "Language_rw": "Κινιαρβάντα",
-        "Language_sa": "Σανσκριτικά",
-        "Language_sc": "Σαρδινικά",
-        "Language_sd": "Σίντι",
-        "Language_se": "Βόρεια Σάμι",
-        "Language_sg": "Σάνγκο",
-        "Language_si": "Σινχαλεζικά",
-        "Language_sk": "Σλοβακικά",
-        "Language_sl": "Σλοβενικά",
-        "Language_sm": "Σαμόαν",
-        "Language_sn": "Σχόνα",
-        "Language_so": "Σομάλι",
-        "Language_sq": "Αλβανικά",
-        "Language_sr": "Σερβικά",
-        "Language_ss": "Σουάτι",
-        "Language_st": "Νότια Σόθο",
-        "Language_su": "Σουδανικά",
-        "Language_sv": "Σουηδικά",
-        "Language_sw": "Σουαχίλι",
-        "Language_ta": "Ταμίλ",
-        "Language_te": "Τελούγκου",
-        "Language_tg": "Τατζίκ",
-        "Language_th": "Ταϊλανδικά",
-        "Language_ti": "Τιγκρίνυα",
-        "Language_tk": "Τουρκμενικά",
-        "Language_tl": "Ταγκαλόγκ",
-        "Language_tn": "Τσιγουάνα",
-        "Language_to": "Τόνγκα",
-        "Language_tr": "Τουρκικά",
-        "Language_ts": "Τσόνγκα",
-        "Language_tt": "Τατάρ",
-        "Language_tw": "Τούι",
-        "Language_ty": "Ταϊτιανά",
-        "Language_ug": "Ουιγουρικά",
-        "Language_uk": "Ουκρανικά",
-        "Language_ur": "Ουρντού",
-        "Language_uz": "Ουζμπεκικά",
-        "Language_ve": "Βένδα",
-        "Language_vi": "Βιετναμεζικά",
-        "Language_vo": "Βόλαπικ",
-        "Language_wa": "Γουαλούν",
-        "Language_wo": "Γουόλοφ",
-        "Language_xh": "Ζόσα",
-        "Language_yi": "Γίντις",
-        "Language_yo": "Γιορούμπα",
-        "Language_za": "Ζουάνγκ",
-        "Language_zh": "Κινεζικά",
-        "Language_zu": "Ζουλού",
-        "LanguageCode": "Κωδικός γλώσσας",
-        "PluginDescription": "Αναφέρει διάφορες Ρυθμίσεις Χρήστη: Φυλλομετρητής, Ομάδα Φυλλομετρητών, Λειτουργικό Σύστημα, Πρόσθετα, Ανάλυση, Γενικές Ρυθμίσεις.",
-        "PluginDetectionDoesNotWorkInIE": "Σημείωση: η ανίχνευση Προσθέτων δεν λειτουργεί στον Internet Explorer. Αυτή η αναφορά βασίζεται μόνο σε μη IE φυλλομετρητές.",
-        "Resolutions": "Αναλύσεις οθόνης",
-        "VisitorSettings": "Ρυθμίσεις επισκέπτη",
-        "WidgetGlobalVisitors": "Γενικές ρυθμίσεις χρηστών",
-        "WidgetGlobalVisitorsDocumentation": "Αυτή η αναφορά δείχνει τις πιο συχνές καθολικές ρυθμίσεις που έχουν οι επισκέπτες σας. Μια ρύθμιση είναι ο συνδυασμός του λειτουργικού συστήματος, του τύπου φυλλομετρητή και της ανάλυσης οθόνης.",
-        "WidgetPlugins": "Λίστα προσθέτων",
-        "WidgetPluginsDocumentation": "Αυτή η αναφορά δείχνει ποια πρόσθετα φυλλομετρητή έχουν ενεργά οι επισκέπτες σας. Αυτή η πληροφορία ίσως είναι σημαντική για την επιλογή του πιο σωστού τρόπου απόδοσης του περιεχομένου σας.",
-        "WidgetResolutions": "Αναλύσεις οθόνης"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/en.json b/plugins/UserSettings/lang/en.json
index c692af975c..0dde158fc4 100644
--- a/plugins/UserSettings/lang/en.json
+++ b/plugins/UserSettings/lang/en.json
@@ -1,204 +1,5 @@
 {
     "UserSettings": {
-        "BrowserLanguage": "Browser language",
-        "BrowserWithNoPluginsEnabled": "%1$s with no plugins enabled",
-        "BrowserWithPluginsEnabled": "%1$s with plugins %2$s enabled",
-        "ColumnConfiguration": "Configuration",
-        "ColumnResolution": "Resolution",
-        "Configurations": "Configurations",
-        "Language_aa": "Afar",
-        "Language_ab": "Abkhazian",
-        "Language_ae": "Avestan",
-        "Language_af": "Afrikaans",
-        "Language_ak": "Akan",
-        "Language_am": "Amharic",
-        "Language_an": "Aragonese",
-        "Language_ar": "Arabic",
-        "Language_as": "Assamese",
-        "Language_av": "Avaric",
-        "Language_ay": "Aymara",
-        "Language_az": "Azerbaijani",
-        "Language_ba": "Bashkir",
-        "Language_be": "Belarusian",
-        "Language_bg": "Bulgarian",
-        "Language_bh": "Bihari",
-        "Language_bi": "Bislama",
-        "Language_bm": "Bambara",
-        "Language_bn": "Bengali",
-        "Language_bo": "Tibetan",
-        "Language_br": "Breton",
-        "Language_bs": "Bosnian",
-        "Language_ca": "Catalan",
-        "Language_ce": "Chechen",
-        "Language_ch": "Chamorro",
-        "Language_co": "Corsican",
-        "Language_cr": "Cree",
-        "Language_cs": "Czech",
-        "Language_cu": "Church Slavic",
-        "Language_cv": "Chuvash",
-        "Language_cy": "Welsh",
-        "Language_da": "Danish",
-        "Language_de": "German",
-        "Language_dv": "Divehi",
-        "Language_dz": "Dzongkha",
-        "Language_ee": "Ewe",
-        "Language_el": "Greek",
-        "Language_en": "English",
-        "Language_eo": "Esperanto",
-        "Language_es": "Spanish",
-        "Language_et": "Estonian",
-        "Language_eu": "Basque",
-        "Language_fa": "Persian",
-        "Language_ff": "Fulah",
-        "Language_fi": "Finnish",
-        "Language_fj": "Fijian",
-        "Language_fo": "Faroese",
-        "Language_fr": "French",
-        "Language_fy": "Western Frisian",
-        "Language_ga": "Irish",
-        "Language_gd": "Scottish Gaelic",
-        "Language_gl": "Galician",
-        "Language_gn": "Guarani",
-        "Language_gu": "Gujarati",
-        "Language_gv": "Manx",
-        "Language_ha": "Hausa",
-        "Language_he": "Hebrew",
-        "Language_hi": "Hindi",
-        "Language_ho": "Hiri Motu",
-        "Language_hr": "Croatian",
-        "Language_ht": "Haitian Creole",
-        "Language_hu": "Hungarian",
-        "Language_hy": "Armenian",
-        "Language_hz": "Herero",
-        "Language_ia": "Interlingua",
-        "Language_id": "Indonesian",
-        "Language_ie": "Interlingue",
-        "Language_ig": "Igbo",
-        "Language_ii": "Sichuan Yi",
-        "Language_ik": "Inupiaq",
-        "Language_io": "Ido",
-        "Language_is": "Icelandic",
-        "Language_it": "Italian",
-        "Language_iu": "Inuktitut",
-        "Language_ja": "Japanese",
-        "Language_jv": "Javanese",
-        "Language_ka": "Georgian",
-        "Language_kg": "Kongo",
-        "Language_ki": "Kukuyu",
-        "Language_kj": "Kuanyama",
-        "Language_kk": "Kazakh",
-        "Language_kl": "Greenlandic",
-        "Language_km": "Central Khmer",
-        "Language_kn": "Kannada",
-        "Language_ko": "Korean",
-        "Language_kr": "Kanuri",
-        "Language_ks": "Kashmiri",
-        "Language_ku": "Kurdish",
-        "Language_kv": "Komi",
-        "Language_kw": "Cornish",
-        "Language_ky": "Kirghiz",
-        "Language_la": "Latin",
-        "Language_lb": "Luxembourgish",
-        "Language_lg": "Ganda",
-        "Language_li": "Limburgish",
-        "Language_ln": "Lingala",
-        "Language_lo": "Lao",
-        "Language_lt": "Lithuanian",
-        "Language_lu": "Luba-Katanga",
-        "Language_lv": "Latvian",
-        "Language_mg": "Malagasy",
-        "Language_mh": "Marshallese",
-        "Language_mi": "Maori",
-        "Language_mk": "Macedonian",
-        "Language_ml": "Malayalam",
-        "Language_mn": "Mongolian",
-        "Language_mr": "Marathi",
-        "Language_ms": "Malay",
-        "Language_mt": "Maltese",
-        "Language_my": "Burmese",
-        "Language_na": "Nauru",
-        "Language_nb": "Norwegian Bokm\u00e5l",
-        "Language_nd": "North Ndebele",
-        "Language_ne": "Nepali",
-        "Language_ng": "Ndonga",
-        "Language_nl": "Dutch",
-        "Language_nn": "Norwegian Nynorsk",
-        "Language_no": "Norwegian",
-        "Language_nr": "South Ndebele",
-        "Language_nv": "Navajo",
-        "Language_ny": "Chichewa",
-        "Language_oc": "Occitan",
-        "Language_oj": "Ojibwa",
-        "Language_om": "Oroma",
-        "Language_or": "Oriya",
-        "Language_os": "Ossetian",
-        "Language_pa": "Panjabi",
-        "Language_pi": "Pali",
-        "Language_pl": "Polish",
-        "Language_ps": "Pashto",
-        "Language_pt": "Portuguese",
-        "Language_qu": "Quechua",
-        "Language_rm": "Raeto-Romance",
-        "Language_rn": "Rundi",
-        "Language_ro": "Romanian",
-        "Language_ru": "Russian",
-        "Language_rw": "Kinyarwanda",
-        "Language_sa": "Sanskrit",
-        "Language_sc": "Sardinian",
-        "Language_sd": "Sindhi",
-        "Language_se": "Northern Sami",
-        "Language_sg": "Sango",
-        "Language_si": "Sinhala",
-        "Language_sk": "Slovak",
-        "Language_sl": "Slovenian",
-        "Language_sm": "Samoan",
-        "Language_sn": "Shona",
-        "Language_so": "Somali",
-        "Language_sq": "Albanian",
-        "Language_sr": "Serbian",
-        "Language_ss": "Swati",
-        "Language_st": "Sotho",
-        "Language_su": "Sundanese",
-        "Language_sv": "Swedish",
-        "Language_sw": "Swahili",
-        "Language_ta": "Tamil",
-        "Language_te": "Telugu",
-        "Language_tg": "Tajik",
-        "Language_th": "Thai",
-        "Language_ti": "Tigrinya",
-        "Language_tk": "Turkmen",
-        "Language_tl": "Tagalog",
-        "Language_tn": "Tswana",
-        "Language_to": "Tonga",
-        "Language_tr": "Turkish",
-        "Language_ts": "Tsonga",
-        "Language_tt": "Tatar",
-        "Language_tw": "Twi",
-        "Language_ty": "Tahitian",
-        "Language_ug": "Uighur",
-        "Language_uk": "Ukrainian",
-        "Language_ur": "Urdu",
-        "Language_uz": "Uzbek",
-        "Language_ve": "Venda",
-        "Language_vi": "Vietnamese",
-        "Language_vo": "Volap\u00fck",
-        "Language_wa": "Walloon",
-        "Language_wo": "Wolof",
-        "Language_xh": "Xhosa",
-        "Language_yi": "Yiddish",
-        "Language_yo": "Yoruba",
-        "Language_za": "Chuang",
-        "Language_zh": "Chinese",
-        "Language_zu": "Zulu",
-        "LanguageCode": "Language code",
-        "PluginDescription": "Reports various User Settings: Browser, Browser Family, Operating System, Plugins, Resolution, Global Settings.",
-        "PluginDetectionDoesNotWorkInIE": "Note: Plugins detection doesn't work in Internet Explorer. This report is only based on non-IE browsers.",
-        "Resolutions": "Resolutions",
-        "VisitorSettings": "Visitor Settings",
-        "WidgetGlobalVisitors": "Visitor Configuration",
-        "WidgetGlobalVisitorsDocumentation": "This report shows the most common overall configurations that your visitors had. A configuration is the combination of an operating system, a browser type and a screen resolution.",
-        "WidgetPlugins": "Browser Plugins",
-        "WidgetPluginsDocumentation": "This report shows which browser plugins your visitors had enabled. This information might be important for choosing the right way to deliver your content.",
-        "WidgetResolutions": "Screen Resolution"
+        "PluginDescription": "<i><b>Deprecated</b> Provides only fallbacks for deprecated methods. Will be removed in May 2015</i>"
     }
 }
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/es.json b/plugins/UserSettings/lang/es.json
deleted file mode 100644
index 5a9898f09c..0000000000
--- a/plugins/UserSettings/lang/es.json
+++ /dev/null
@@ -1,204 +0,0 @@
-{
-    "UserSettings": {
-        "BrowserLanguage": "Idioma de Navegador",
-        "BrowserWithNoPluginsEnabled": "%1$s sin complementos habilitados",
-        "BrowserWithPluginsEnabled": "%1$s con los complementos %2$s habilitados",
-        "ColumnConfiguration": "Configuración",
-        "ColumnResolution": "Resoluciones",
-        "Configurations": "Configuración",
-        "Language_aa": "Lejos",
-        "Language_ab": "Abjasia",
-        "Language_ae": "Avéstico",
-        "Language_af": "Africaans",
-        "Language_ak": "Akan",
-        "Language_am": "Amárico",
-        "Language_an": "Aragonés",
-        "Language_ar": "Árabe",
-        "Language_as": "Asamés",
-        "Language_av": "Ávaro",
-        "Language_ay": "Aimara",
-        "Language_az": "Azerí",
-        "Language_ba": "Baskir",
-        "Language_be": "Bieloruso",
-        "Language_bg": "Búlgaro",
-        "Language_bh": "Bihari",
-        "Language_bi": "Bislama",
-        "Language_bm": "Bambara",
-        "Language_bn": "Bengalí",
-        "Language_bo": "Tibetano",
-        "Language_br": "Bretón",
-        "Language_bs": "Bosnio",
-        "Language_ca": "Catalán",
-        "Language_ce": "Checheno",
-        "Language_ch": "Chamorro",
-        "Language_co": "Corso",
-        "Language_cr": "Cree",
-        "Language_cs": "Checo",
-        "Language_cu": "Esloveno",
-        "Language_cv": "Chuvasio",
-        "Language_cy": "Galés",
-        "Language_da": "Danés",
-        "Language_de": "Alemán",
-        "Language_dv": "Divehi",
-        "Language_dz": "Dzongkha",
-        "Language_ee": "Ewé",
-        "Language_el": "Griego",
-        "Language_en": "Inglés",
-        "Language_eo": "Esperanto",
-        "Language_es": "Español",
-        "Language_et": "Estonio",
-        "Language_eu": "Vasco",
-        "Language_fa": "Persa",
-        "Language_ff": "Fulah",
-        "Language_fi": "Finlandés",
-        "Language_fj": "Fiyiano",
-        "Language_fo": "Feroés",
-        "Language_fr": "Francés",
-        "Language_fy": "Frisio septentrional",
-        "Language_ga": "Irlandés",
-        "Language_gd": "Gaélico escocés",
-        "Language_gl": "Gallego",
-        "Language_gn": "Guaraní",
-        "Language_gu": "Guyaratí",
-        "Language_gv": "Manés",
-        "Language_ha": "Hausa",
-        "Language_he": "Hebreo",
-        "Language_hi": "Hindi",
-        "Language_ho": "Hiri motu",
-        "Language_hr": "Croata",
-        "Language_ht": "Criollo haitiano",
-        "Language_hu": "Húngaro",
-        "Language_hy": "Armenio",
-        "Language_hz": "Herero",
-        "Language_ia": "Interlingua",
-        "Language_id": "Indonesio",
-        "Language_ie": "Occidental",
-        "Language_ig": "Igbo",
-        "Language_ii": "Sichuan Yi",
-        "Language_ik": "Iñupiaq",
-        "Language_io": "Ido",
-        "Language_is": "Islandés",
-        "Language_it": "Italiano",
-        "Language_iu": "Inuit",
-        "Language_ja": "Japonés",
-        "Language_jv": "Javanés",
-        "Language_ka": "Georgiano",
-        "Language_kg": "Congo",
-        "Language_ki": "Kikuyu",
-        "Language_kj": "Kuanyama",
-        "Language_kk": "Kazajo",
-        "Language_kl": "Groenlandés",
-        "Language_km": "Camboyano",
-        "Language_kn": "Canarés",
-        "Language_ko": "Coreano",
-        "Language_kr": "Kanuri",
-        "Language_ks": "Cachemiro",
-        "Language_ku": "Kurdo",
-        "Language_kv": "Komi",
-        "Language_kw": "Córnico",
-        "Language_ky": "Kirguís",
-        "Language_la": "Latín",
-        "Language_lb": "Luxemburgués",
-        "Language_lg": "Luganda",
-        "Language_li": "Limburgués",
-        "Language_ln": "Lingala",
-        "Language_lo": "Lao",
-        "Language_lt": "Lituano",
-        "Language_lu": "Chiluba",
-        "Language_lv": "Letón",
-        "Language_mg": "Malgache",
-        "Language_mh": "Marshallés",
-        "Language_mi": "Maorí",
-        "Language_mk": "Macedonio",
-        "Language_ml": "Malabar",
-        "Language_mn": "Mongol",
-        "Language_mr": "Maratí",
-        "Language_ms": "Malayo",
-        "Language_mt": "Maltés",
-        "Language_my": "Birmano",
-        "Language_na": "Nauruano",
-        "Language_nb": "Bokmål noruego",
-        "Language_nd": "Ndebele del norte",
-        "Language_ne": "Nepalés",
-        "Language_ng": "Ndonga",
-        "Language_nl": "Holandés",
-        "Language_nn": "Nuevo noruego",
-        "Language_no": "Noruego",
-        "Language_nr": "Ndebele del sur",
-        "Language_nv": "Navajo",
-        "Language_ny": "Chichewa",
-        "Language_oc": "Occitano",
-        "Language_oj": "Ojibwa",
-        "Language_om": "Oromo",
-        "Language_or": "Oriya",
-        "Language_os": "Osetio",
-        "Language_pa": "Panyabí",
-        "Language_pi": "Pali",
-        "Language_pl": "Polaco",
-        "Language_ps": "Pastún",
-        "Language_pt": "Portugués",
-        "Language_qu": "Quechua",
-        "Language_rm": "Raeto-Romance",
-        "Language_rn": "Rundi",
-        "Language_ro": "Rumano",
-        "Language_ru": "Ruso",
-        "Language_rw": "Kinyarwanda",
-        "Language_sa": "Sánscrito",
-        "Language_sc": "Sardo",
-        "Language_sd": "Sindhi",
-        "Language_se": "Sami septentrional",
-        "Language_sg": "Sango",
-        "Language_si": "Cingalés",
-        "Language_sk": "Eslovaco",
-        "Language_sl": "Esloveno",
-        "Language_sm": "Samoano",
-        "Language_sn": "Shona",
-        "Language_so": "Somalí",
-        "Language_sq": "Albanés",
-        "Language_sr": "Serbio",
-        "Language_ss": "Suazi",
-        "Language_st": "Sotho",
-        "Language_su": "Sudanés",
-        "Language_sv": "Sueco",
-        "Language_sw": "Suajili",
-        "Language_ta": "Tamil",
-        "Language_te": "Telugu",
-        "Language_tg": "Tayiko",
-        "Language_th": "Tailandés",
-        "Language_ti": "Tigriña",
-        "Language_tk": "Turcomano",
-        "Language_tl": "Tagalo",
-        "Language_tn": "Tsuana",
-        "Language_to": "Tonga",
-        "Language_tr": "Turco",
-        "Language_ts": "Tsonga",
-        "Language_tt": "Tártaro",
-        "Language_tw": "Twi",
-        "Language_ty": "Tahitiano",
-        "Language_ug": "Uigur",
-        "Language_uk": "Ucraniano",
-        "Language_ur": "Urdú",
-        "Language_uz": "Uzbeko",
-        "Language_ve": "Venda",
-        "Language_vi": "Vietnamita",
-        "Language_vo": "Volapük",
-        "Language_wa": "Valonia",
-        "Language_wo": "Wólof",
-        "Language_xh": "Xosa",
-        "Language_yi": "Idish",
-        "Language_yo": "Yoruba",
-        "Language_za": "Chuang",
-        "Language_zh": "Chino",
-        "Language_zu": "Zulú",
-        "LanguageCode": "Código de idioma",
-        "PluginDescription": "Reporta varias configuraciones de usuario: Navegador, Familia del Navegador, Sistema Operativo, Plugins, Resolución, Configuración General.",
-        "PluginDetectionDoesNotWorkInIE": "Nota: la detección de Plugins no funciona con Internet Explorer. Este reporte solo funciona con navegadores no-IE.",
-        "Resolutions": "Resoluciones",
-        "VisitorSettings": "Configuración de visitantes",
-        "WidgetGlobalVisitors": "Configuración global de visitantes",
-        "WidgetGlobalVisitorsDocumentation": "Este informe muestra las más usuales configuraciones que poseen sus visitantes. Una configuración es una combinación de un sistema operativo, un tipo de navegador de internet y una resolución de pantalla.",
-        "WidgetPlugins": "Lista de Plugins",
-        "WidgetPluginsDocumentation": "Este informe muestra que extensiones del navegador sus visitantes han habilitado. Esta información puede ser importante sea para elegir el método eficiente de enviar su contenido.",
-        "WidgetResolutions": "Resoluciones de pantalla"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/et.json b/plugins/UserSettings/lang/et.json
deleted file mode 100644
index 4905768aca..0000000000
--- a/plugins/UserSettings/lang/et.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-    "UserSettings": {
-        "BrowserLanguage": "Veebisirvija keel",
-        "ColumnConfiguration": "Konfiguratsioon",
-        "ColumnResolution": "Resolutsioon",
-        "Configurations": "Konfiguratsioonid",
-        "Language_aa": "afari",
-        "Language_ab": "abhaasi",
-        "Language_ae": "avesta",
-        "Language_af": "afrikaani",
-        "Language_ak": "akani",
-        "Language_am": "amhari",
-        "Language_an": "aragoni",
-        "Language_ar": "araabia",
-        "Language_as": "assami",
-        "Language_av": "avaari",
-        "Language_ay": "aimara",
-        "Language_az": "aserbaidžaani",
-        "Language_ba": "baškiiri",
-        "Language_be": "valgevene",
-        "Language_bg": "bulgaaria",
-        "Language_bh": "bihaari",
-        "Language_bi": "bislama",
-        "Language_bm": "bambara",
-        "Language_bn": "bengali",
-        "Language_bo": "tiibeti",
-        "Language_br": "bretooni",
-        "Language_bs": "bosnia",
-        "Language_ca": "katalaani",
-        "Language_ce": "tšetšeeni",
-        "Language_ch": "tšamorro",
-        "Language_co": "korsika",
-        "Language_cr": "krii",
-        "Language_cs": "tšehhi",
-        "Language_cu": "kirikuslaavi",
-        "Language_cv": "tšuvaši",
-        "Language_cy": "kõmri",
-        "Language_da": "taani",
-        "Language_de": "saksa",
-        "Language_dv": "maldiivi",
-        "Language_dz": "bhutani",
-        "Language_ee": "eve",
-        "Language_el": "kreeka",
-        "Language_en": "inglise",
-        "Language_eo": "esperanto",
-        "Language_es": "hispaania",
-        "Language_et": "eesti",
-        "Language_eu": "baski",
-        "Language_fa": "pärsia",
-        "Language_ff": "fulbe",
-        "Language_fi": "soome",
-        "Language_fj": "fidži",
-        "Language_fo": "fääri",
-        "Language_fr": "prantsuse",
-        "Language_fy": "läänefriisi",
-        "Language_ga": "iiri",
-        "Language_gd": "gaeli",
-        "Language_gl": "galeegi",
-        "Language_gn": "guaranii",
-        "Language_gu": "gudžarati",
-        "Language_gv": "mänksi",
-        "Language_ha": "hausa",
-        "Language_he": "heebrea",
-        "Language_hi": "hindi",
-        "Language_ho": "motu",
-        "Language_hr": "horvaadi",
-        "Language_ht": "haiti",
-        "Language_hu": "ungari",
-        "Language_hy": "armeenia",
-        "Language_hz": "herero",
-        "Language_ia": "interlingua",
-        "Language_id": "indoneesia",
-        "Language_ie": "interlingue",
-        "Language_ig": "ibo",
-        "Language_ii": "Sichuani jii",
-        "Language_ik": "injupiaki",
-        "Language_io": "ido",
-        "Language_is": "islandi",
-        "Language_it": "itaalia",
-        "Language_iu": "inuktituti",
-        "Language_ja": "jaapani",
-        "Language_jv": "jaava",
-        "Language_ka": "gruusia",
-        "Language_kg": "kongo",
-        "Language_ki": "kikuju",
-        "Language_kj": "ambo",
-        "Language_kk": "kasahhi",
-        "Language_kl": "grööni",
-        "Language_km": "khmeeri",
-        "Language_kn": "kannada",
-        "Language_ko": "korea",
-        "Language_kr": "kanuri",
-        "Language_ks": "kašmiiri",
-        "Language_ku": "kurdi",
-        "Language_kv": "komi",
-        "Language_kw": "korni",
-        "Language_ky": "kirgiisi",
-        "Language_la": "ladina",
-        "Language_lb": "letseburgi",
-        "Language_lg": "ganda",
-        "Language_li": "limburgi",
-        "Language_ln": "lingala",
-        "Language_lo": "lao",
-        "Language_lt": "leedu",
-        "Language_lu": "luba",
-        "Language_lv": "läti",
-        "Language_mg": "malagassi",
-        "Language_mh": "maršalli",
-        "Language_mi": "maoori",
-        "Language_mk": "makedoonia",
-        "Language_ml": "malajalami",
-        "Language_mn": "mongoli",
-        "Language_mr": "marathi",
-        "Language_ms": "malai",
-        "Language_mt": "malta",
-        "Language_my": "birma",
-        "Language_na": "nauru",
-        "Language_nb": "norra bokmål",
-        "Language_nd": "põhjandebele",
-        "Language_ne": "nepali",
-        "Language_ng": "ndonga",
-        "Language_nl": "hollandi",
-        "Language_nn": "norra nynorsk",
-        "Language_no": "norra",
-        "Language_nr": "lõunandebele",
-        "Language_nv": "navaho",
-        "Language_ny": "njandža",
-        "Language_oc": "oksitaani",
-        "Language_oj": "odžibvei",
-        "Language_om": "oromo",
-        "Language_or": "oria",
-        "Language_os": "osseedi",
-        "Language_pa": "pandžabi",
-        "Language_pi": "paali",
-        "Language_pl": "poola",
-        "Language_ps": "puštu",
-        "Language_pt": "portugali",
-        "Language_qu": "ketšua",
-        "Language_rm": "retoromaani",
-        "Language_rn": "rundi",
-        "Language_ro": "rumeenia",
-        "Language_ru": "vene",
-        "Language_rw": "ruanda",
-        "Language_sa": "sanskriti",
-        "Language_sc": "sardiinia",
-        "Language_sd": "sindhi",
-        "Language_se": "põhjasaami",
-        "Language_sg": "sango",
-        "Language_si": "singali",
-        "Language_sk": "slovaki",
-        "Language_sl": "sloveeni",
-        "Language_sm": "samoa",
-        "Language_sn": "šona",
-        "Language_so": "somaali",
-        "Language_sq": "albaania",
-        "Language_sr": "serbia",
-        "Language_ss": "svaasi",
-        "Language_st": "lõunasotho",
-        "Language_su": "sunda",
-        "Language_sv": "rootsi",
-        "Language_sw": "suahiili",
-        "Language_ta": "tamili",
-        "Language_te": "telugu",
-        "Language_tg": "tadžiki",
-        "Language_th": "tai",
-        "Language_ti": "tigrinja",
-        "Language_tk": "türkmeeni",
-        "Language_tl": "tagalogi",
-        "Language_tn": "tsvana",
-        "Language_to": "tonga",
-        "Language_tr": "türgi",
-        "Language_ts": "tsonga",
-        "Language_tt": "tatari",
-        "Language_tw": "tvii",
-        "Language_ty": "tahiti",
-        "Language_ug": "uiguuri",
-        "Language_uk": "ukraina",
-        "Language_ur": "urdu",
-        "Language_uz": "usbeki",
-        "Language_ve": "venda",
-        "Language_vi": "vietnami",
-        "Language_vo": "volapüki",
-        "Language_wa": "vallooni",
-        "Language_wo": "volofi",
-        "Language_xh": "koosa",
-        "Language_yi": "jidiši",
-        "Language_yo": "joruba",
-        "Language_za": "tšuangi",
-        "Language_zh": "hiina",
-        "Language_zu": "suulu",
-        "LanguageCode": "Keele kood",
-        "PluginDetectionDoesNotWorkInIE": "Märge: Lisatarkvara tuvastamine ei tööta Internet Exploreriga külastajatel. See raport kuvab andmeid mitte-IE veebisirvikute kohta.",
-        "Resolutions": "Ekraani resolutsioonid",
-        "VisitorSettings": "Külastajate seaded",
-        "WidgetGlobalVisitors": "Kohalike külastajate seaded",
-        "WidgetPlugins": "Sirviku lisatarkvarad",
-        "WidgetResolutions": "Ekraani resolutsioonid"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/eu.json b/plugins/UserSettings/lang/eu.json
deleted file mode 100644
index 902a023d2e..0000000000
--- a/plugins/UserSettings/lang/eu.json
+++ /dev/null
@@ -1,158 +0,0 @@
-{
-    "UserSettings": {
-        "ColumnConfiguration": "Konfigurazioa",
-        "ColumnResolution": "Bereizmena",
-        "Configurations": "Konfigurazioak",
-        "Language_ab": "abkhazera",
-        "Language_af": "afrikaans",
-        "Language_ak": "Akanera",
-        "Language_am": "amharikera",
-        "Language_ar": "arabiera",
-        "Language_as": "assamera",
-        "Language_ay": "aimara",
-        "Language_az": "azerbaijanera",
-        "Language_be": "bielorrusiera",
-        "Language_bg": "bulgariera",
-        "Language_bh": "bihariera",
-        "Language_bn": "bengalera",
-        "Language_bo": "tibetera",
-        "Language_br": "bretoiera",
-        "Language_bs": "bosniera",
-        "Language_ca": "katalana",
-        "Language_co": "Korsikera",
-        "Language_cs": "txekiera",
-        "Language_cy": "galesera",
-        "Language_da": "daniera",
-        "Language_de": "alemanera",
-        "Language_dv": "divehiera",
-        "Language_dz": "dzongkha",
-        "Language_ee": "Eweera",
-        "Language_el": "greziera",
-        "Language_en": "ingelera",
-        "Language_eo": "esperantoa",
-        "Language_es": "espainiera",
-        "Language_et": "estoniera",
-        "Language_eu": "euskara",
-        "Language_fa": "pertsiera",
-        "Language_fi": "finlandiera",
-        "Language_fj": "fijiera",
-        "Language_fo": "faroera",
-        "Language_fr": "frantsesera",
-        "Language_fy": "frisiarra",
-        "Language_ga": "gaelikoa",
-        "Language_gd": "eskoziar gaelikoa",
-        "Language_gl": "galegoa",
-        "Language_gn": "guaraniera",
-        "Language_gu": "gujaratera",
-        "Language_ha": "hausa",
-        "Language_he": "hebreera",
-        "Language_hi": "hindia",
-        "Language_hr": "kroaziera",
-        "Language_ht": "haitiera",
-        "Language_hu": "hungariera",
-        "Language_hy": "armeniera",
-        "Language_ia": "interlingua",
-        "Language_id": "indonesiera",
-        "Language_ie": "interlingue",
-        "Language_ig": "igboera",
-        "Language_is": "islandiera",
-        "Language_it": "italiera",
-        "Language_ja": "japoniera",
-        "Language_jv": "javera",
-        "Language_ka": "georgiera",
-        "Language_kg": "Kikongoa",
-        "Language_kk": "kazakhera",
-        "Language_km": "khemerera",
-        "Language_kn": "kannada",
-        "Language_ko": "koreera",
-        "Language_ks": "kashmirera",
-        "Language_ku": "kurduera",
-        "Language_ky": "kirgizera",
-        "Language_la": "latina",
-        "Language_lb": "luxenburgera",
-        "Language_lg": "Gandera",
-        "Language_ln": "lingala",
-        "Language_lo": "laosera",
-        "Language_lt": "lituaniera",
-        "Language_lv": "letoniera",
-        "Language_mg": "malgaxea",
-        "Language_mi": "maoriera",
-        "Language_mk": "mazedoniera",
-        "Language_ml": "malayalamera",
-        "Language_mn": "mongoliera",
-        "Language_mr": "marathera",
-        "Language_ms": "malaysiera",
-        "Language_mt": "maltera",
-        "Language_my": "burmatarra",
-        "Language_nb": "bokmala (Norvegia)",
-        "Language_nd": "iparraldeko ndebeleera",
-        "Language_ne": "nepalera",
-        "Language_nl": "nederlandera",
-        "Language_nn": "norvegiera berria",
-        "Language_no": "norvegiera",
-        "Language_ny": "nyanja",
-        "Language_oc": "okzitaniera",
-        "Language_om": "Oromoera",
-        "Language_or": "oriya",
-        "Language_os": "osetiera",
-        "Language_pa": "punjabera",
-        "Language_pl": "poloniera",
-        "Language_ps": "paxtuera",
-        "Language_pt": "portugalera",
-        "Language_qu": "quechuera",
-        "Language_rm": "erromantxera",
-        "Language_rn": "rundiera",
-        "Language_ro": "errumaniera",
-        "Language_ru": "errusiera",
-        "Language_rw": "kinyaruanda",
-        "Language_sa": "sanskritoa",
-        "Language_sd": "sindhia",
-        "Language_se": "iparraldeko samiera",
-        "Language_sg": "sangoera",
-        "Language_si": "sinhala",
-        "Language_sk": "eslovakiera",
-        "Language_sl": "esloveniera",
-        "Language_sm": "samoera",
-        "Language_sn": "shonera",
-        "Language_so": "somaliera",
-        "Language_sq": "albaniera",
-        "Language_sr": "serbiera",
-        "Language_ss": "swatiera",
-        "Language_st": "sesothoera",
-        "Language_su": "sundanera",
-        "Language_sv": "suediera",
-        "Language_sw": "swahili",
-        "Language_ta": "tamilera",
-        "Language_te": "telugua",
-        "Language_tg": "tajikistanera",
-        "Language_th": "thailandiera",
-        "Language_ti": "tigrinya",
-        "Language_tk": "turkmeniera",
-        "Language_tl": "tagalog",
-        "Language_tn": "tswanera",
-        "Language_to": "tongera",
-        "Language_tr": "turkiera",
-        "Language_ts": "tsongera",
-        "Language_tt": "tatarera",
-        "Language_tw": "twia",
-        "Language_ty": "tahitiera",
-        "Language_ug": "uigurrera",
-        "Language_uk": "ukrainera",
-        "Language_ur": "urdu",
-        "Language_uz": "uzbekera",
-        "Language_ve": "vendera",
-        "Language_vi": "vietnamera",
-        "Language_wo": "wolofera",
-        "Language_xh": "xhosa",
-        "Language_yi": "yiddishera",
-        "Language_yo": "yorubera",
-        "Language_zh": "txinera",
-        "Language_zu": "zuluera",
-        "LanguageCode": "Hizkuntza-kodea",
-        "Resolutions": "Bereizmenak",
-        "VisitorSettings": "Bisitariaren ezarpenak",
-        "WidgetGlobalVisitors": "Bisitarien konfigurazioa",
-        "WidgetPlugins": "Pluginen zerrenda",
-        "WidgetResolutions": "Pantailaren bereizmenak"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/fa.json b/plugins/UserSettings/lang/fa.json
deleted file mode 100644
index eb38d32cb5..0000000000
--- a/plugins/UserSettings/lang/fa.json
+++ /dev/null
@@ -1,203 +0,0 @@
-{
-    "UserSettings": {
-        "BrowserLanguage": "زبان مرورگر",
-        "BrowserWithNoPluginsEnabled": "%1$s با هیچ پلاگین را فعال کنید",
-        "ColumnConfiguration": "پیکربندی",
-        "ColumnResolution": "رزلوشن",
-        "Configurations": "پیکربندی",
-        "Language_aa": "آفاری",
-        "Language_ab": "آبخازیایی",
-        "Language_ae": "اوستایی",
-        "Language_af": "آفریقایی",
-        "Language_ak": "آکانی",
-        "Language_am": "امهری",
-        "Language_an": "آراگونی",
-        "Language_ar": "عربی",
-        "Language_as": "آسامی",
-        "Language_av": "آواری",
-        "Language_ay": "آیمارایی",
-        "Language_az": "آذربایجانی",
-        "Language_ba": "باشقیری",
-        "Language_be": "بلاروسی",
-        "Language_bg": "بلغاری",
-        "Language_bh": "بیهاری",
-        "Language_bi": "بیسلاما",
-        "Language_bm": "بامبارایی",
-        "Language_bn": "بنگالی",
-        "Language_bo": "تبتی",
-        "Language_br": "برتونی",
-        "Language_bs": "بسنیایی",
-        "Language_ca": "کاتالانی",
-        "Language_ce": "چچنی",
-        "Language_ch": "چامورویی",
-        "Language_co": "کرسی",
-        "Language_cr": "کربایی",
-        "Language_cs": "چکی",
-        "Language_cu": "اسلاوی کلیسایی",
-        "Language_cv": "چوواشی",
-        "Language_cy": "ولزی",
-        "Language_da": "دانمارکی",
-        "Language_de": "آلمانی",
-        "Language_dv": "دیوهی",
-        "Language_dz": "دزونگخایی",
-        "Language_ee": "اوه‌ای",
-        "Language_el": "یونانی",
-        "Language_en": "انگلیسی",
-        "Language_eo": "اسپرانتویی",
-        "Language_es": "اسپانیایی",
-        "Language_et": "استونیایی",
-        "Language_eu": "باسکی",
-        "Language_fa": "فارسی",
-        "Language_ff": "فولایی",
-        "Language_fi": "فنلاندی",
-        "Language_fj": "فیجی",
-        "Language_fo": "فاروئی",
-        "Language_fr": "فرانسوی",
-        "Language_fy": "فریزلندی باختری",
-        "Language_ga": "ایرلندی",
-        "Language_gd": "گالیک اسکاتلندی",
-        "Language_gl": "گالیسیایی",
-        "Language_gn": "گوارانی",
-        "Language_gu": "گجراتی",
-        "Language_gv": "مانکسی",
-        "Language_ha": "هوسیایی",
-        "Language_he": "عبری",
-        "Language_hi": "هندی",
-        "Language_ho": "موتویی هیری",
-        "Language_hr": "کروواتی",
-        "Language_ht": "هاییتیایی",
-        "Language_hu": "مجاری",
-        "Language_hy": "ارمنی",
-        "Language_hz": "هررویی",
-        "Language_ia": "اینترلینگوایی",
-        "Language_id": "اندونزیایی",
-        "Language_ie": "اکسیدنتالی",
-        "Language_ig": "ایگبویی",
-        "Language_ii": "یی سیچوانی",
-        "Language_ik": "اینوپیکی",
-        "Language_io": "ایدویی",
-        "Language_is": "ایسلندی",
-        "Language_it": "ایتالیایی",
-        "Language_iu": "اینوکتیتوتی",
-        "Language_ja": "ژاپنی",
-        "Language_jv": "جاوه‌ای",
-        "Language_ka": "گرجی",
-        "Language_kg": "کنگویی",
-        "Language_ki": "کیکویویی",
-        "Language_kj": "کوانیامایی",
-        "Language_kk": "قزاقی",
-        "Language_kl": "گرینلندی",
-        "Language_km": "خمری",
-        "Language_kn": "کانارایی",
-        "Language_ko": "کره ای",
-        "Language_kr": "کنوری",
-        "Language_ks": "کشمیری",
-        "Language_ku": "کردی",
-        "Language_kv": "کومی",
-        "Language_kw": "کورنی",
-        "Language_ky": "قرقیزی",
-        "Language_la": "لاتین",
-        "Language_lb": "لوکزامبورگی",
-        "Language_lg": "اوگاندایی",
-        "Language_li": "لیمبورگی",
-        "Language_ln": "لینگالایی",
-        "Language_lo": "لائو",
-        "Language_lt": "لیتوانیایی",
-        "Language_lu": "لوبایی‐کاتانگا",
-        "Language_lv": "لتونیایی",
-        "Language_mg": "مالاگاسی",
-        "Language_mh": "مارشالی",
-        "Language_mi": "مائوری",
-        "Language_mk": "مقدونی",
-        "Language_ml": "مالایالم",
-        "Language_mn": "مغولی",
-        "Language_mr": "مراتی",
-        "Language_ms": "مالایی",
-        "Language_mt": "مالتی",
-        "Language_my": "برمه ای",
-        "Language_na": "نائورویی",
-        "Language_nb": "بوکمال نروژی",
-        "Language_nd": "دبل شمالی",
-        "Language_ne": "نپالی",
-        "Language_ng": "اندوگایی",
-        "Language_nl": "هلندی",
-        "Language_nn": "نینورسک نروژی",
-        "Language_no": "نروژی",
-        "Language_nr": "دبل جنوبی",
-        "Language_nv": "واهویی",
-        "Language_ny": "نیانجایی",
-        "Language_oc": "اکسیتانی",
-        "Language_oj": "اوجیبوایی",
-        "Language_om": "اورومویی",
-        "Language_or": "اوریه",
-        "Language_os": "آسی",
-        "Language_pa": "پنجابی",
-        "Language_pi": "پالی",
-        "Language_pl": "لهستانی",
-        "Language_ps": "پشتو",
-        "Language_pt": "پرتغالی",
-        "Language_qu": "کچوآ",
-        "Language_rm": "رومانشی",
-        "Language_rn": "روندایی",
-        "Language_ro": "رومانی",
-        "Language_ru": "روسی",
-        "Language_rw": "کینیارواندایی",
-        "Language_sa": "سنسکریت",
-        "Language_sc": "ساردنیایی",
-        "Language_sd": "سندی",
-        "Language_se": "سامی شمالی",
-        "Language_sg": "سانگویی",
-        "Language_si": "سینهالی",
-        "Language_sk": "اسلواکی",
-        "Language_sl": "اسلونیایی",
-        "Language_sm": "ساموایی",
-        "Language_sn": "شونایی",
-        "Language_so": "سومالی",
-        "Language_sq": "آلبانی",
-        "Language_sr": "صربستانی",
-        "Language_ss": "سی سواتی",
-        "Language_st": "سوتویی",
-        "Language_su": "سودانی",
-        "Language_sv": "سوئدی",
-        "Language_sw": "سواحیلی",
-        "Language_ta": "تامیلی",
-        "Language_te": "تلگویی",
-        "Language_tg": "تاجیک",
-        "Language_th": "تایلندی",
-        "Language_ti": "تیگرایی",
-        "Language_tk": "ترکمن",
-        "Language_tl": "تاگالوگ",
-        "Language_tn": "تسوانایی",
-        "Language_to": "تونگایی",
-        "Language_tr": "ترکی",
-        "Language_ts": "شنگانی",
-        "Language_tt": "تاتار",
-        "Language_tw": "توی‌یایی",
-        "Language_ty": "تاهیتیایی",
-        "Language_ug": "اویغوری",
-        "Language_uk": "اوکراینی",
-        "Language_ur": "اردو",
-        "Language_uz": "ازبکی",
-        "Language_ve": "وندایی",
-        "Language_vi": "ویتنامی",
-        "Language_vo": "ولاپوکی",
-        "Language_wa": "والونی",
-        "Language_wo": "ولوفی",
-        "Language_xh": "خوسایی",
-        "Language_yi": "ییدیشی",
-        "Language_yo": "یوروبایی",
-        "Language_za": "چوانگی",
-        "Language_zh": "چینی",
-        "Language_zu": "زولویی",
-        "LanguageCode": "کد زبان",
-        "PluginDescription": "گزارش تنظیمات کاربر های مختلف: مرورگر، Family (خانواده) مرورگر، سیستم عامل، پلاگین، سایز تصویر، تنظیمات جهانی است.",
-        "PluginDetectionDoesNotWorkInIE": "توجه: تشخیص پلاگین در مرورگر اینترنت اکسپلورر کار نمی کند. این گزارش تنها بر روی مرورگرهای غیر اینترنت اکسپلورر است.",
-        "Resolutions": "رزلوشن",
-        "VisitorSettings": "تنظیمات بازدید کننده",
-        "WidgetGlobalVisitors": "پیکربندی بازدیدکنندگان جهانی",
-        "WidgetGlobalVisitorsDocumentation": "این گزارش نشان می دهد پیکربندی کلی شایع ترین است که بازدید کنندگان شما است. پیکربندی ترکیبی از سیستم عامل، نوع مرورگر و صفحه نمایش با وضوح است.",
-        "WidgetPlugins": "لیست افزونه ها",
-        "WidgetPluginsDocumentation": "این گزارش نشان می دهد که پلاگین مرورگر بازدید کننده خود را فعال کرده بود. این اطلاعات ممکن است مهم برای انتخاب راه درست برای ارائه محتوای خود را.",
-        "WidgetResolutions": "رزلوشن نمایشگر"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/fi.json b/plugins/UserSettings/lang/fi.json
deleted file mode 100644
index f6bb711136..0000000000
--- a/plugins/UserSettings/lang/fi.json
+++ /dev/null
@@ -1,204 +0,0 @@
-{
-    "UserSettings": {
-        "BrowserLanguage": "Selaimen kieli",
-        "BrowserWithNoPluginsEnabled": "%1$s ilman liitännäisiä aktivoitu",
-        "BrowserWithPluginsEnabled": "%1$s liitännäisillä %2$s on aktivoitu",
-        "ColumnConfiguration": "Asetukset",
-        "ColumnResolution": "Resoluutio",
-        "Configurations": "Asetukset",
-        "Language_aa": "afar",
-        "Language_ab": "abkhazian",
-        "Language_ae": "avestan",
-        "Language_af": "afrikaans",
-        "Language_ak": "akan",
-        "Language_am": "amharic",
-        "Language_an": "aragonese",
-        "Language_ar": "arabian kieli",
-        "Language_as": "assamese",
-        "Language_av": "avaric",
-        "Language_ay": "aymara",
-        "Language_az": "azeri",
-        "Language_ba": "bashkir",
-        "Language_be": "valko-venäjä",
-        "Language_bg": "bulgaria",
-        "Language_bh": "bihari",
-        "Language_bi": "bislama",
-        "Language_bm": "bambara",
-        "Language_bn": "bengalin kieli",
-        "Language_bo": "tiibetin kieli",
-        "Language_br": "breton",
-        "Language_bs": "bosnian kieli",
-        "Language_ca": "katalaanin kieli",
-        "Language_ce": "chechen",
-        "Language_ch": "chamorro",
-        "Language_co": "korsikan kieli",
-        "Language_cr": "cree",
-        "Language_cs": "Tsekin kieli",
-        "Language_cu": "kirkkoslaavi",
-        "Language_cv": "chuvash",
-        "Language_cy": "Walesin kieli",
-        "Language_da": "tanska",
-        "Language_de": "saksa",
-        "Language_dv": "divehi",
-        "Language_dz": "dzongkha",
-        "Language_ee": "ewe",
-        "Language_el": "kreikka",
-        "Language_en": "englanti",
-        "Language_eo": "esperanto",
-        "Language_es": "espanja",
-        "Language_et": "viro",
-        "Language_eu": "baski",
-        "Language_fa": "persian kieli",
-        "Language_ff": "fulah",
-        "Language_fi": "suomi",
-        "Language_fj": "fijian",
-        "Language_fo": "fääri",
-        "Language_fr": "ranska",
-        "Language_fy": "friisin kieli",
-        "Language_ga": "irlanti",
-        "Language_gd": "skotlannin gael",
-        "Language_gl": "galician",
-        "Language_gn": "guarani",
-        "Language_gu": "gujarati",
-        "Language_gv": "manx",
-        "Language_ha": "hausa",
-        "Language_he": "heprea",
-        "Language_hi": "hindi",
-        "Language_ho": "hiri motu",
-        "Language_hr": "kroatia",
-        "Language_ht": "haitin creole",
-        "Language_hu": "unkari",
-        "Language_hy": "armenia",
-        "Language_hz": "herero",
-        "Language_ia": "interlingua",
-        "Language_id": "indonesia",
-        "Language_ie": "interlingua",
-        "Language_ig": "igbo",
-        "Language_ii": "sichuan yi",
-        "Language_ik": "inuiitti",
-        "Language_io": "ido",
-        "Language_is": "islannin kieli",
-        "Language_it": "italia",
-        "Language_iu": "inuiitti",
-        "Language_ja": "japani",
-        "Language_jv": "jaava",
-        "Language_ka": "georgian kieli",
-        "Language_kg": "kongo",
-        "Language_ki": "kukuyu",
-        "Language_kj": "kuanyama",
-        "Language_kk": "kzakh",
-        "Language_kl": "grönlannin kieli",
-        "Language_km": "keski-khamer",
-        "Language_kn": "kannada",
-        "Language_ko": "korea",
-        "Language_kr": "kanuri",
-        "Language_ks": "kashmiri",
-        "Language_ku": "kurdi",
-        "Language_kv": "komi",
-        "Language_kw": "cornish",
-        "Language_ky": "kirghiz",
-        "Language_la": "latina",
-        "Language_lb": "luxemburgin kieli",
-        "Language_lg": "ganda",
-        "Language_li": "limburgin kieli",
-        "Language_ln": "lingala",
-        "Language_lo": "laon kieli",
-        "Language_lt": "liettuan kieli",
-        "Language_lu": "luba-katanga",
-        "Language_lv": "latvian kieli",
-        "Language_mg": "malagasy",
-        "Language_mh": "marshallien kieli",
-        "Language_mi": "maorin kieli",
-        "Language_mk": "makedonian kieli",
-        "Language_ml": "malesian kieli",
-        "Language_mn": "mongolian kieli",
-        "Language_mr": "marathi",
-        "Language_ms": "malay",
-        "Language_mt": "maltan kieli",
-        "Language_my": "burman kieli",
-        "Language_na": "naurun kieli",
-        "Language_nb": "norjan bokmål",
-        "Language_nd": "pohjoinen ndebele",
-        "Language_ne": "nepalin kieli",
-        "Language_ng": "ndonga",
-        "Language_nl": "hollanti",
-        "Language_nn": "norjan nynorsk",
-        "Language_no": "norja",
-        "Language_nr": "eteläinen ndebele",
-        "Language_nv": "navajo",
-        "Language_ny": "chichewa",
-        "Language_oc": "occitan",
-        "Language_oj": "ojibwa",
-        "Language_om": "oroma",
-        "Language_or": "oriya",
-        "Language_os": "ossetian kieli",
-        "Language_pa": "panjabi",
-        "Language_pi": "pali",
-        "Language_pl": "puola",
-        "Language_ps": "pashto",
-        "Language_pt": "portugalin kieli",
-        "Language_qu": "quechua",
-        "Language_rm": "raeto-romance",
-        "Language_rn": "rundi",
-        "Language_ro": "romania",
-        "Language_ru": "venäjä",
-        "Language_rw": "kinyarwanda",
-        "Language_sa": "sanskritin kieli",
-        "Language_sc": "sardinian kieli",
-        "Language_sd": "sindhi",
-        "Language_se": "pohjoinen saami",
-        "Language_sg": "sango",
-        "Language_si": "sinhala",
-        "Language_sk": "slovakian kieli",
-        "Language_sl": "slovenian kieli",
-        "Language_sm": "samoan kieli",
-        "Language_sn": "shona",
-        "Language_so": "somalian kieli",
-        "Language_sq": "albanian kieli",
-        "Language_sr": "serbian kieli",
-        "Language_ss": "swati",
-        "Language_st": "sotho",
-        "Language_su": "sundan kieli",
-        "Language_sv": "ruotsi",
-        "Language_sw": "swahili",
-        "Language_ta": "tamil",
-        "Language_te": "telugu",
-        "Language_tg": "tajik",
-        "Language_th": "thain kieli",
-        "Language_ti": "tigrinya",
-        "Language_tk": "turkin kieli",
-        "Language_tl": "tagalog",
-        "Language_tn": "tswana",
-        "Language_to": "tonga",
-        "Language_tr": "turkin kieli",
-        "Language_ts": "tsonga",
-        "Language_tt": "tatar",
-        "Language_tw": "twi",
-        "Language_ty": "tahiti",
-        "Language_ug": "uighur",
-        "Language_uk": "ukrainan kieli",
-        "Language_ur": "urdu",
-        "Language_uz": "uzbekin kieli",
-        "Language_ve": "venda",
-        "Language_vi": "vietnamin kieli",
-        "Language_vo": "volapük",
-        "Language_wa": "walloon",
-        "Language_wo": "wolof",
-        "Language_xh": "xhosa",
-        "Language_yi": "yiddin kieli",
-        "Language_yo": "yoruba",
-        "Language_za": "chuang",
-        "Language_zh": "kiinan kieli",
-        "Language_zu": "zulu",
-        "LanguageCode": "Kielikoodi",
-        "PluginDescription": "Raportit käyttäjien asetuksista: selain, selaimen perhe, käyttöjärjestelmä, lisäosat, resoluutio, yleiset asetukset.",
-        "PluginDetectionDoesNotWorkInIE": "Huom: lisäosien tunnistus ei toimi Internet Explorerissa. Tämä raportti perustuu vain ei-IE-selaimiin.",
-        "Resolutions": "Resoluutio",
-        "VisitorSettings": "Kävijöiden asetukset",
-        "WidgetGlobalVisitors": "Kaikkien kävijöiden asetukset",
-        "WidgetGlobalVisitorsDocumentation": "Tämä raportti näyttää yleiskuvan eri käyttäjien asetuksista. Asetukset on yhdistelmä käyttöjärjestelmästä, selaimen tyypistä ja näytön resoluutiosta.",
-        "WidgetPlugins": "Lista lisäosista",
-        "WidgetPluginsDocumentation": "Tämä raportti näyttää, mitä selainlisäosia vierailijoillasi oli käytössä. Tästä tiedosta voi olla hyötyä, kun joudut valitsemaan, miten tietoa esitetään ja välitetään vierailijoille.",
-        "WidgetResolutions": "Näytön resoluutio"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/fr.json b/plugins/UserSettings/lang/fr.json
deleted file mode 100644
index cb009e289c..0000000000
--- a/plugins/UserSettings/lang/fr.json
+++ /dev/null
@@ -1,204 +0,0 @@
-{
-    "UserSettings": {
-        "BrowserLanguage": "Langage du navigateur",
-        "BrowserWithNoPluginsEnabled": "%1$s avec aucun plugin activé",
-        "BrowserWithPluginsEnabled": "%1$s avec les plugins %2$s activés",
-        "ColumnConfiguration": "Configuration",
-        "ColumnResolution": "Résolution",
-        "Configurations": "Configurations",
-        "Language_aa": "Afar",
-        "Language_ab": "Abkhaze",
-        "Language_ae": "Avestique",
-        "Language_af": "Africain",
-        "Language_ak": "Akan",
-        "Language_am": "Amharique",
-        "Language_an": "Aragonais",
-        "Language_ar": "Arabe",
-        "Language_as": "Assamais",
-        "Language_av": "Avar",
-        "Language_ay": "Aymara",
-        "Language_az": "Azéri",
-        "Language_ba": "Bachkir",
-        "Language_be": "Biélorusse",
-        "Language_bg": "Bulgare",
-        "Language_bh": "Bihari",
-        "Language_bi": "Bichelamar",
-        "Language_bm": "Bambara",
-        "Language_bn": "Bengali",
-        "Language_bo": "Tibétain",
-        "Language_br": "Breton",
-        "Language_bs": "Bosniaque",
-        "Language_ca": "Catalan",
-        "Language_ce": "Tchétchène",
-        "Language_ch": "Chamorro",
-        "Language_co": "Corse",
-        "Language_cr": "Cri",
-        "Language_cs": "Tchèque",
-        "Language_cu": "Vieux-slave liturgique",
-        "Language_cv": "Tchouvache",
-        "Language_cy": "Gallois",
-        "Language_da": "Danois",
-        "Language_de": "Allemand",
-        "Language_dv": "Divehi",
-        "Language_dz": "Dzongkha",
-        "Language_ee": "Ewe",
-        "Language_el": "Grecque",
-        "Language_en": "Anglais",
-        "Language_eo": "Espéranto",
-        "Language_es": "Espagnol",
-        "Language_et": "Estonien",
-        "Language_eu": "Basque",
-        "Language_fa": "Persan",
-        "Language_ff": "Peul",
-        "Language_fi": "Finlandais",
-        "Language_fj": "Fidjien",
-        "Language_fo": "Féroïen",
-        "Language_fr": "Français",
-        "Language_fy": "Frison occidental",
-        "Language_ga": "Irlandais",
-        "Language_gd": "Gaélique écossais",
-        "Language_gl": "Galicien",
-        "Language_gn": "Guarani",
-        "Language_gu": "Gujarati",
-        "Language_gv": "Mannois",
-        "Language_ha": "Haoussa",
-        "Language_he": "Hébreu",
-        "Language_hi": "Hindi",
-        "Language_ho": "Hiri Motu",
-        "Language_hr": "Croate",
-        "Language_ht": "Créole Haïtien",
-        "Language_hu": "Hongrois",
-        "Language_hy": "Arménien",
-        "Language_hz": "Héréro",
-        "Language_ia": "Interlingue",
-        "Language_id": "Indonésien",
-        "Language_ie": "Interlingue",
-        "Language_ig": "Igbo",
-        "Language_ii": "Sichuan Yi",
-        "Language_ik": "Inupiak",
-        "Language_io": "Ido",
-        "Language_is": "Islandais",
-        "Language_it": "Italien",
-        "Language_iu": "Inuktitut",
-        "Language_ja": "Japonais",
-        "Language_jv": "Javanais",
-        "Language_ka": "Géorgien",
-        "Language_kg": "Kikongo",
-        "Language_ki": "Kikuyu",
-        "Language_kj": "Kuanyama",
-        "Language_kk": "Kazakh",
-        "Language_kl": "Groenlandais",
-        "Language_km": "Khmer",
-        "Language_kn": "Kannada",
-        "Language_ko": "Coréen",
-        "Language_kr": "Kanuri",
-        "Language_ks": "Cachemiri",
-        "Language_ku": "Kurde",
-        "Language_kv": "Komi",
-        "Language_kw": "Cornique",
-        "Language_ky": "Kirghize",
-        "Language_la": "Latin",
-        "Language_lb": "Luxembourgeois",
-        "Language_lg": "Luganda",
-        "Language_li": "Limbourgeois",
-        "Language_ln": "Lingala",
-        "Language_lo": "Lao",
-        "Language_lt": "Lituanien",
-        "Language_lu": "Luba-Katanga",
-        "Language_lv": "Letton",
-        "Language_mg": "Malgache",
-        "Language_mh": "Marshallais",
-        "Language_mi": "Maori",
-        "Language_mk": "Macédonien",
-        "Language_ml": "Malayalam",
-        "Language_mn": "Mongolien",
-        "Language_mr": "Marathi",
-        "Language_ms": "Malais",
-        "Language_mt": "Maltais",
-        "Language_my": "Birman",
-        "Language_na": "Nauruan",
-        "Language_nb": "Bokmål",
-        "Language_nd": "Sindebele",
-        "Language_ne": "Népalais",
-        "Language_ng": "Ndonga",
-        "Language_nl": "Néerlandais",
-        "Language_nn": "Nynorsk",
-        "Language_no": "Norvégien",
-        "Language_nr": "Nrebele",
-        "Language_nv": "Navajo",
-        "Language_ny": "Chichewa",
-        "Language_oc": "Occitan",
-        "Language_oj": "Ojibwé",
-        "Language_om": "Oromo",
-        "Language_or": "Oriya",
-        "Language_os": "Ossète",
-        "Language_pa": "Panjābī",
-        "Language_pi": "Pali",
-        "Language_pl": "Polonais",
-        "Language_ps": "Pachto",
-        "Language_pt": "Portuguais",
-        "Language_qu": "Quechua",
-        "Language_rm": "Rhéto-roman",
-        "Language_rn": "Kirundi",
-        "Language_ro": "Roumain",
-        "Language_ru": "Russe",
-        "Language_rw": "Kinyarwanda",
-        "Language_sa": "Sanskrit",
-        "Language_sc": "Sarde",
-        "Language_sd": "Sindhi",
-        "Language_se": "Same",
-        "Language_sg": "Sango",
-        "Language_si": "Cingalais",
-        "Language_sk": "Slovaque",
-        "Language_sl": "Slovène",
-        "Language_sm": "Samoan",
-        "Language_sn": "Shona",
-        "Language_so": "Somali",
-        "Language_sq": "Albanais",
-        "Language_sr": "Serbe",
-        "Language_ss": "Swati",
-        "Language_st": "Sotho",
-        "Language_su": "Soundanais",
-        "Language_sv": "Suédois",
-        "Language_sw": "Swahili",
-        "Language_ta": "Tamoul",
-        "Language_te": "Télougou",
-        "Language_tg": "Tadjik",
-        "Language_th": "Thaï",
-        "Language_ti": "Tigrigna",
-        "Language_tk": "Turkmène",
-        "Language_tl": "Tagalog",
-        "Language_tn": "Tswana",
-        "Language_to": "Tonguien",
-        "Language_tr": "Turc",
-        "Language_ts": "Tsonga",
-        "Language_tt": "Tatar",
-        "Language_tw": "Akan",
-        "Language_ty": "Tahitien",
-        "Language_ug": "Ouïghour",
-        "Language_uk": "Ukrainien",
-        "Language_ur": "Ourdou",
-        "Language_uz": "Ouzbek",
-        "Language_ve": "Venda",
-        "Language_vi": "Vietnamien",
-        "Language_vo": "Volapük",
-        "Language_wa": "Wallon",
-        "Language_wo": "Wolof",
-        "Language_xh": "Xhosa",
-        "Language_yi": "Yiddish",
-        "Language_yo": "Yoruba",
-        "Language_za": "Chuang",
-        "Language_zh": "Chinois",
-        "Language_zu": "Zoulou",
-        "LanguageCode": "Code langue",
-        "PluginDescription": "Effectue des rapports variés sur les paramètres utilisateurs: navigateur, famille du navigateur, système d'exploitation, plugins, résolution, paramètres généraux.",
-        "PluginDetectionDoesNotWorkInIE": "Note : La détection des plugins ne fonctionne pas avec Internet Explorer. Ce rapport est basé sur les autres navigateurs.",
-        "Resolutions": "Résolutions",
-        "VisitorSettings": "Paramètres visiteur",
-        "WidgetGlobalVisitors": "Configuration globale des visiteurs",
-        "WidgetGlobalVisitorsDocumentation": "Ce rapport montre les configurations globales les plus communes de vos visiteurs. Une configuration est la combinaison d'un système d'exploitation, d'un type de navigateur et d'une résolution d'écran.",
-        "WidgetPlugins": "Liste de Plugins",
-        "WidgetPluginsDocumentation": "Ce rapport montre quels plugins du navigateur vos visiteurs ont activés. Cette information peut être importante pour choisir le bon moyen de délivrer le contenu.",
-        "WidgetResolutions": "Résolutions d'écran"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/gl.json b/plugins/UserSettings/lang/gl.json
deleted file mode 100644
index e461b383d8..0000000000
--- a/plugins/UserSettings/lang/gl.json
+++ /dev/null
@@ -1,156 +0,0 @@
-{
-    "UserSettings": {
-        "Configurations": "Configuracións",
-        "Language_ab": "abkhazo",
-        "Language_af": "Afrikaans",
-        "Language_ak": "Akán",
-        "Language_am": "Amárico",
-        "Language_an": "Aragonés",
-        "Language_ar": "Árabe",
-        "Language_as": "Assamés",
-        "Language_ay": "aimará",
-        "Language_az": "Azerbaiano",
-        "Language_be": "Bielorruso",
-        "Language_bg": "Búlgaro",
-        "Language_bh": "Bihariano",
-        "Language_bn": "Bengalí",
-        "Language_bo": "tibetano",
-        "Language_br": "Bretón",
-        "Language_bs": "Bosnio",
-        "Language_ca": "Catalán",
-        "Language_co": "Corso",
-        "Language_cs": "Checo",
-        "Language_cu": "Eslavo eclesiástico",
-        "Language_cy": "Galés",
-        "Language_da": "Dinamarqués",
-        "Language_de": "Alemán",
-        "Language_dv": "divehi",
-        "Language_dz": "dzongkha",
-        "Language_ee": "Ewé",
-        "Language_el": "Grego",
-        "Language_en": "Inglés",
-        "Language_eo": "Esperanto",
-        "Language_es": "Español",
-        "Language_et": "Estoniano",
-        "Language_eu": "Éuscaro",
-        "Language_fa": "Persa",
-        "Language_fi": "Finés",
-        "Language_fj": "fixiano",
-        "Language_fo": "Faroés",
-        "Language_fr": "Francés",
-        "Language_fy": "Frisón",
-        "Language_ga": "Irlandés",
-        "Language_gd": "Gaélico escocés",
-        "Language_gl": "galego",
-        "Language_gn": "Guaraní",
-        "Language_gu": "Guxaratiano",
-        "Language_ha": "hausa",
-        "Language_he": "Hebreo",
-        "Language_hi": "Hindi",
-        "Language_hr": "Croata",
-        "Language_ht": "haitiano",
-        "Language_hu": "Húngaro",
-        "Language_hy": "Armenio",
-        "Language_ia": "Interlingua",
-        "Language_id": "Indonesio",
-        "Language_ig": "ibo",
-        "Language_is": "Islandés",
-        "Language_it": "Italiano",
-        "Language_ja": "Xaponés",
-        "Language_jv": "Xavanés",
-        "Language_ka": "Xeorxiano",
-        "Language_kg": "Congolés",
-        "Language_kk": "casaco",
-        "Language_km": "Cambodiano",
-        "Language_kn": "Kannada",
-        "Language_ko": "Coreano",
-        "Language_ks": "cachemir",
-        "Language_ku": "Kurdo",
-        "Language_ky": "Kyrgiz",
-        "Language_la": "Latín",
-        "Language_lb": "luxemburgués",
-        "Language_lg": "Ganda",
-        "Language_ln": "Lingala",
-        "Language_lo": "Laotiano",
-        "Language_lt": "Lituano",
-        "Language_lv": "Letón",
-        "Language_mg": "malgaxe",
-        "Language_mi": "maorí",
-        "Language_mk": "Macedonio",
-        "Language_ml": "Malaialam",
-        "Language_mn": "Mongol",
-        "Language_mr": "Marathi",
-        "Language_ms": "Malaio",
-        "Language_mt": "Maltés",
-        "Language_my": "birmano",
-        "Language_nb": "Noruegués Bokmal",
-        "Language_nd": "ndebele do norte",
-        "Language_ne": "Nepalí",
-        "Language_nl": "Holandés",
-        "Language_nn": "Noruegués nynorsk",
-        "Language_no": "Noruegués",
-        "Language_ny": "chewa",
-        "Language_oc": "Occitano",
-        "Language_om": "Oromo",
-        "Language_or": "Orissa",
-        "Language_os": "osetio",
-        "Language_pa": "Punjabi",
-        "Language_pl": "Polaco",
-        "Language_ps": "Pashto",
-        "Language_pt": "Portugués",
-        "Language_qu": "quechua",
-        "Language_rm": "romanche",
-        "Language_rn": "rundi",
-        "Language_ro": "Romanés",
-        "Language_ru": "Ruso",
-        "Language_rw": "ruandés",
-        "Language_sa": "Sánscrito",
-        "Language_sd": "Sindhi",
-        "Language_se": "sami do norte",
-        "Language_sg": "sango",
-        "Language_si": "Sinhalés",
-        "Language_sk": "Eslovaco",
-        "Language_sl": "Esloveno",
-        "Language_sm": "samoano",
-        "Language_sn": "shona",
-        "Language_so": "Somalí",
-        "Language_sq": "Albanés",
-        "Language_sr": "Serbio",
-        "Language_ss": "swati",
-        "Language_st": "Sesotho",
-        "Language_su": "Sondanés",
-        "Language_sv": "Sueco",
-        "Language_sw": "Suaxili",
-        "Language_ta": "Tamil",
-        "Language_te": "Telugu",
-        "Language_tg": "taxico",
-        "Language_th": "Tailandés",
-        "Language_ti": "Tigriña",
-        "Language_tk": "turcomano",
-        "Language_tl": "Tagalo",
-        "Language_tn": "tswana",
-        "Language_to": "tonganés",
-        "Language_tr": "Turco",
-        "Language_ts": "xitsonga",
-        "Language_tt": "tártaro",
-        "Language_tw": "Twi",
-        "Language_ty": "tahitiano",
-        "Language_ug": "Uighur",
-        "Language_uk": "Ucraíno",
-        "Language_ur": "Urdú",
-        "Language_uz": "Uzbeco",
-        "Language_ve": "venda",
-        "Language_vi": "Vietnamita",
-        "Language_wo": "wólof",
-        "Language_xh": "Xhosa",
-        "Language_yi": "Yiddish",
-        "Language_yo": "ioruba",
-        "Language_zh": "Chinés",
-        "Language_zu": "Zulú",
-        "LanguageCode": "Código de idioma",
-        "Resolutions": "Resolucións",
-        "WidgetGlobalVisitors": "Configuración global de visitantes",
-        "WidgetPlugins": "Lista de plugins",
-        "WidgetResolutions": "Resolucións de pantalla"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/he.json b/plugins/UserSettings/lang/he.json
deleted file mode 100644
index b6d08a31e7..0000000000
--- a/plugins/UserSettings/lang/he.json
+++ /dev/null
@@ -1,190 +0,0 @@
-{
-    "UserSettings": {
-        "Language_aa": "אפארית",
-        "Language_ab": "אבחזית",
-        "Language_ae": "אבסטן",
-        "Language_af": "אפריקאנס",
-        "Language_ak": "אקאן",
-        "Language_am": "אמהרית",
-        "Language_an": "אראגונית",
-        "Language_ar": "ערבית",
-        "Language_as": "אסאמית",
-        "Language_av": "אבארית",
-        "Language_ay": "איימארית",
-        "Language_az": "אזרית",
-        "Language_ba": "בשקירית",
-        "Language_be": "בלארוסית",
-        "Language_bg": "בולגרית",
-        "Language_bh": "ביהארי",
-        "Language_bi": "ביסלמה",
-        "Language_bm": "במבארה",
-        "Language_bn": "בנגלית",
-        "Language_bo": "טיבטית",
-        "Language_br": "ברטונית",
-        "Language_bs": "בוסנית",
-        "Language_ca": "קטלאנית",
-        "Language_ce": "צ'צ'נית",
-        "Language_ch": "צ'מורו",
-        "Language_co": "קורסיקנית",
-        "Language_cr": "קרי",
-        "Language_cs": "צ׳כית",
-        "Language_cu": "סלאבית כנסייתית עתיקה",
-        "Language_cv": "צ'ובאש",
-        "Language_cy": "וולשית",
-        "Language_da": "דנית",
-        "Language_de": "גרמנית",
-        "Language_dv": "דיבהי",
-        "Language_dz": "דזונקה",
-        "Language_ee": "אווה",
-        "Language_el": "יוונית",
-        "Language_en": "אנגלית",
-        "Language_eo": "אספרנטו",
-        "Language_es": "ספרדית",
-        "Language_et": "אסטונית",
-        "Language_eu": "בסקית",
-        "Language_fa": "פרסית",
-        "Language_ff": "פולה",
-        "Language_fi": "פינית",
-        "Language_fj": "פיג'ית",
-        "Language_fo": "פארואזית",
-        "Language_fr": "צרפתית",
-        "Language_fy": "פריזית",
-        "Language_ga": "אירית",
-        "Language_gd": "גאלית סקוטית",
-        "Language_gl": "גליציאנית",
-        "Language_gn": "גוארני",
-        "Language_gu": "גוג'ראטית",
-        "Language_gv": "מאנית",
-        "Language_ha": "האוסה",
-        "Language_he": "עברית",
-        "Language_hi": "הינדי",
-        "Language_ho": "הארי מוטו",
-        "Language_hr": "קרואטית",
-        "Language_ht": "האיטית",
-        "Language_hu": "הונגרית",
-        "Language_hy": "ארמנית",
-        "Language_hz": "הררו",
-        "Language_ia": "‏אינטרלינגואה",
-        "Language_id": "אינדונזית",
-        "Language_ie": "אינטרלינגה",
-        "Language_ig": "איגבו",
-        "Language_ii": "סיצ'ואן יי",
-        "Language_ik": "ik",
-        "Language_io": "אידו",
-        "Language_is": "איסלנדית",
-        "Language_it": "איטלקית",
-        "Language_iu": "אינוקטיטוט",
-        "Language_ja": "יפנית",
-        "Language_jv": "יאוונית",
-        "Language_ka": "גיאורגית",
-        "Language_kg": "קונגו",
-        "Language_ki": "קיקויו",
-        "Language_kj": "קואניאמה",
-        "Language_kk": "קזחית",
-        "Language_kl": "קאלאליסוטית",
-        "Language_km": "קמרית",
-        "Language_kn": "קנאדה",
-        "Language_ko": "קוריאנית",
-        "Language_kr": "קאנורי",
-        "Language_ks": "קשמירית",
-        "Language_ku": "כורדית",
-        "Language_kv": "קומי",
-        "Language_kw": "קורנית",
-        "Language_ky": "קירגיזית",
-        "Language_la": "לטינית",
-        "Language_lb": "לוקסמבורגית",
-        "Language_lg": "גאנדה",
-        "Language_li": "לימבורגיש",
-        "Language_ln": "לינגלה",
-        "Language_lo": "לאית",
-        "Language_lt": "ליטאית",
-        "Language_lu": "לובה-קטנגה",
-        "Language_lv": "לטבית",
-        "Language_mg": "מלגשית",
-        "Language_mh": "מרשאלס",
-        "Language_mi": "מאורית",
-        "Language_mk": "מקדונית",
-        "Language_ml": "מלאיאלם",
-        "Language_mn": "מונגולית",
-        "Language_mr": "מרטהי",
-        "Language_ms": "מלאית",
-        "Language_mt": "מלטית",
-        "Language_my": "בורמזית",
-        "Language_na": "נאורית",
-        "Language_nb": "‏נורבגית ספרותית",
-        "Language_nd": "צפון נדבלה",
-        "Language_ne": "נפאלית",
-        "Language_ng": "נדונגה",
-        "Language_nl": "הולנדית",
-        "Language_nn": "נורבגית חדשה - נינורשק",
-        "Language_no": "נורווגית",
-        "Language_nr": "דרום נדבלה",
-        "Language_nv": "נבחו",
-        "Language_ny": "ניאנג'ה",
-        "Language_oc": "אוקסיטנית",
-        "Language_oj": "אוג'יבווה",
-        "Language_om": "אורומו",
-        "Language_or": "אוריה",
-        "Language_os": "אוסטית",
-        "Language_pa": "פנג'אבית",
-        "Language_pi": "פאלי",
-        "Language_pl": "פולנית",
-        "Language_ps": "פאשטו",
-        "Language_pt": "פורטוגלית",
-        "Language_qu": "קצ'ואה",
-        "Language_rm": "רומאנש",
-        "Language_rn": "קירונדי",
-        "Language_ro": "רומנית",
-        "Language_ru": "רוסית",
-        "Language_rw": "קינירואנדה",
-        "Language_sa": "סנסקריט",
-        "Language_sc": "סרדינית",
-        "Language_sd": "סינדהית",
-        "Language_se": "לאפית צפונית",
-        "Language_sg": "סנגו",
-        "Language_si": "סינהלה",
-        "Language_sk": "סלובקית",
-        "Language_sl": "סלובנית",
-        "Language_sm": "סמואית",
-        "Language_sn": "שונה",
-        "Language_so": "סומלית",
-        "Language_sq": "אלבנית",
-        "Language_sr": "סרבית",
-        "Language_ss": "סיסוואטי",
-        "Language_st": "ססות'ו",
-        "Language_su": "סודנית",
-        "Language_sv": "שוודית",
-        "Language_sw": "סווהילית",
-        "Language_ta": "טמילית",
-        "Language_te": "טלוגו",
-        "Language_tg": "טג'יקית",
-        "Language_th": "תאי",
-        "Language_ti": "טיגרינאית",
-        "Language_tk": "טורקמנית",
-        "Language_tl": "טגלוג",
-        "Language_tn": "צוואנה",
-        "Language_to": "טונגאית",
-        "Language_tr": "טורקית",
-        "Language_ts": "טסונגה",
-        "Language_tt": "טטרית",
-        "Language_tw": "טווי",
-        "Language_ty": "טהיטית",
-        "Language_ug": "אויגהור",
-        "Language_uk": "אוקראינית",
-        "Language_ur": "אורדו",
-        "Language_uz": "אוזבקית",
-        "Language_ve": "וונדה",
-        "Language_vi": "ויאטנמית",
-        "Language_vo": "‏וולאפיק",
-        "Language_wa": "וואלון",
-        "Language_wo": "ג'ולוף",
-        "Language_xh": "קסוסה",
-        "Language_yi": "יידיש",
-        "Language_yo": "יורובה",
-        "Language_za": "ז'ואנג",
-        "Language_zh": "סינית",
-        "Language_zu": "זולו",
-        "LanguageCode": "קוד שפה",
-        "WidgetResolutions": "רזולוציית מסך"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/hi.json b/plugins/UserSettings/lang/hi.json
deleted file mode 100644
index d6963d29e5..0000000000
--- a/plugins/UserSettings/lang/hi.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-    "UserSettings": {
-        "BrowserLanguage": "ब्राउज़र की भाषा",
-        "BrowserWithNoPluginsEnabled": "%1$s के साथ प्लगइन सक्रिय नहीं",
-        "BrowserWithPluginsEnabled": "प्लगिन %2$s से %1$s सक्षम",
-        "ColumnConfiguration": "विन्यास",
-        "ColumnResolution": "संकल्प",
-        "Configurations": "विन्यास",
-        "Language_aa": "अफ़ार",
-        "Language_ab": "अब्खाज़ियन्",
-        "Language_ae": "अवेस्तन",
-        "Language_af": "अफ्रीकी",
-        "Language_ak": "अकन",
-        "Language_am": "अम्हारिक्",
-        "Language_an": "अर्गोनी",
-        "Language_ar": "अरबी",
-        "Language_as": "असामी",
-        "Language_av": "अवेरिक",
-        "Language_ay": "आयमारा",
-        "Language_az": "अज़रबैंजानी",
-        "Language_ba": "बशख़िर",
-        "Language_be": "बैलोरूशियन्",
-        "Language_bg": "बल्गेरियाई",
-        "Language_bh": "बिहारी",
-        "Language_bi": "बिस्लामा",
-        "Language_bm": "बाम्बारा",
-        "Language_bn": "बँगाली",
-        "Language_bo": "तिब्बती",
-        "Language_br": "ब्रेटन",
-        "Language_bs": "बोस्नियाई",
-        "Language_ca": "कातालान",
-        "Language_ce": "चेचन",
-        "Language_ch": "कमोरो",
-        "Language_co": "कोर्सीकन",
-        "Language_cr": "क्री",
-        "Language_cs": "चेक",
-        "Language_cu": "चर्च साल्विक",
-        "Language_cv": "चूवाश",
-        "Language_cy": "वेल्श",
-        "Language_da": "डैनीश",
-        "Language_de": "ज़र्मन",
-        "Language_dv": "दिवेही",
-        "Language_dz": "ज़ोन्गखा",
-        "Language_ee": "ईवे",
-        "Language_el": "ग्रीक",
-        "Language_en": "अंग्रेजी",
-        "Language_eo": "एस्पेरान्तो",
-        "Language_es": "स्पेनिश",
-        "Language_et": "ऐस्तोनियन्",
-        "Language_eu": "बास्क्",
-        "Language_fa": "पर्शियन्",
-        "Language_ff": "फुलाह",
-        "Language_fi": "फिनिश",
-        "Language_fj": "फ़ीजी",
-        "Language_fo": "फिरोज़ी",
-        "Language_fr": "फ्रेंच",
-        "Language_fy": "पश्चिमी फ़्रिसियाई",
-        "Language_ga": "आयरिश",
-        "Language_gd": "स्काट्स् गायेलिक्",
-        "Language_gl": "गैलिशियन्",
-        "Language_gn": "गुआरानी",
-        "Language_gu": "गुज़राती",
-        "Language_gv": "मैंक्स",
-        "Language_ha": "होउसा",
-        "Language_he": "हीब्रू",
-        "Language_hi": "हिन्दी",
-        "Language_ho": "हिरी मोटू",
-        "Language_hr": "क्रोएशन्",
-        "Language_ht": "हैतीयन",
-        "Language_hu": "हंगेरी",
-        "Language_hy": "अरमेनियन्",
-        "Language_hz": "हरैरो",
-        "Language_ia": "ईन्टरलिंगुआ",
-        "Language_id": "इन्डोनेशियाई",
-        "Language_ie": "ईन्टरलिंगुइ",
-        "Language_ig": "ईग्बो",
-        "Language_ii": "सिचुआन यी",
-        "Language_ik": "इनुपियाक्",
-        "Language_io": "इडौ",
-        "Language_is": "आईस्लैंडिक्",
-        "Language_it": "इतालवी",
-        "Language_iu": "इनूकीटूत्",
-        "Language_ja": "जापानी",
-        "Language_jv": "जावानीस",
-        "Language_ka": "जॉर्जीयन्",
-        "Language_kg": "कोंगो",
-        "Language_ki": "किकुयू",
-        "Language_kj": "क्वान्यामा",
-        "Language_kk": "कज़ाख",
-        "Language_kl": "ग्रीनलैंडिक",
-        "Language_km": "कैम्बोडियन्",
-        "Language_kn": "कन्नड़",
-        "Language_ko": "कोरीयन्",
-        "Language_kr": "कनुरी",
-        "Language_ks": "कश्मीरी",
-        "Language_ku": "कुरदीश",
-        "Language_kv": "कोमी",
-        "Language_kw": "कोर्निश",
-        "Language_ky": "किरघिज़",
-        "Language_la": "लैटीन",
-        "Language_lb": "लक्ष्ज़ेमबर्गिश",
-        "Language_lg": "गांडा",
-        "Language_li": "लिंबर्गिश",
-        "Language_ln": "लिंगाला",
-        "Language_lo": "लाओथीयन्",
-        "Language_lt": "लिथुनियन्",
-        "Language_lu": "ल्यूबा-कटांगा",
-        "Language_lv": "लातवी",
-        "Language_mg": "मालागासी",
-        "Language_mh": "मार्शलीज़",
-        "Language_mi": "मेओरी",
-        "Language_mk": "मैसेडोनियन्",
-        "Language_ml": "मलयालम",
-        "Language_mn": "मंगोलीयाई",
-        "Language_mr": "मराठी",
-        "Language_ms": "मलय",
-        "Language_mt": "मालटिस्",
-        "Language_my": "बर्लिस",
-        "Language_na": "नाउरू",
-        "Language_nb": "नॉर्वेजियन बोकमाल",
-        "Language_nd": "उत्तरी देबेल",
-        "Language_ne": "नेपाली",
-        "Language_ng": "डोन्गा",
-        "Language_nl": "डच्",
-        "Language_nn": "नॉर्वेजियन नाइनोर्स्क",
-        "Language_no": "नार्वेजियन",
-        "Language_nr": "दक्षिण देबेल",
-        "Language_nv": "नावाजो",
-        "Language_ny": "न्यानजा",
-        "Language_oc": "ओसीटान",
-        "Language_oj": "ओजिब्वा",
-        "Language_om": "ओरोमो",
-        "Language_or": "उड़िया",
-        "Language_os": "ओस्सेटिक",
-        "Language_pa": "पंजाबी",
-        "Language_pi": "पाली",
-        "Language_pl": "पॉलिश",
-        "Language_ps": "पॉशतो",
-        "Language_pt": "पुर्तगाली",
-        "Language_qu": "क्वेशुआ",
-        "Language_rm": "रहेय्टो-रोमान्स",
-        "Language_rn": "रुन्दी",
-        "Language_ro": "रोमानियाई",
-        "Language_ru": "रूसी",
-        "Language_rw": "किन्यारवाण्डा",
-        "Language_sa": "संस्कृत",
-        "Language_sc": "सार्दिनियन",
-        "Language_sd": "सिन्धी",
-        "Language_se": "नॉर्दन सामी",
-        "Language_sg": "सांगो",
-        "Language_si": "शिंघालीस्",
-        "Language_sk": "स्लोवाक्",
-        "Language_sl": "स्लोवेनियन्",
-        "Language_sm": "सामोन",
-        "Language_sn": "सोणा",
-        "Language_so": "सोमाली",
-        "Language_sq": "अल्बेनियन्",
-        "Language_sr": "सर्बियन्",
-        "Language_ss": "स्वाती",
-        "Language_st": "सेसोथो",
-        "Language_su": "सुंडानी",
-        "Language_sv": "स्विडिश",
-        "Language_sw": "स्वाहिली",
-        "Language_ta": "तमिल",
-        "Language_te": "तेलेगु",
-        "Language_tg": "ताजिक्",
-        "Language_th": "थाई",
-        "Language_ti": "तिग्रीन्या",
-        "Language_tk": "तुक्रमेन",
-        "Language_tl": "तागालोग",
-        "Language_tn": "सेत्स्वाना",
-        "Language_to": "टोंगा",
-        "Language_tr": "तुर्की",
-        "Language_ts": "सोंगा",
-        "Language_tt": "टाटर",
-        "Language_tw": "ट्वी",
-        "Language_ty": "ताहितियन",
-        "Language_ug": "उईघुर",
-        "Language_uk": "यूक्रेनी",
-        "Language_ur": "उर्दू",
-        "Language_uz": "उज़्बेक",
-        "Language_ve": "वेन्दा",
-        "Language_vi": "वियेतनामी",
-        "Language_vo": "वोलापुक",
-        "Language_wa": "वाल्लून",
-        "Language_wo": "वोलोफ",
-        "Language_xh": "षोसा",
-        "Language_yi": "येहुदी",
-        "Language_yo": "योरूबा",
-        "Language_za": "ज़ुआंग",
-        "Language_zh": "चीनी",
-        "Language_zu": "ज़ुलू",
-        "LanguageCode": "भाषा कोड",
-        "PluginDescription": "विभिन्न उपयोगकर्ता सेटिंग्स की रिपोर्ट: ब्राउज़र, ब्राउज़र परिवार, आपरेटिंग सिस्टम, प्लगइन्स, संकल्प, वैश्विक सेटिंग्स.",
-        "PluginDetectionDoesNotWorkInIE": "नोट: प्लगइन्स का पता लगाने इंटरनेट एक्सप्लोरर में काम नहीं करता है. यह रिपोर्ट केवल गैर आईई ब्राउज़रों पर आधारित है.",
-        "Resolutions": "संकल्प",
-        "VisitorSettings": "आगंतुक सेटिंग्स",
-        "WidgetGlobalVisitors": "आगंतुक विन्यास"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/hr.json b/plugins/UserSettings/lang/hr.json
deleted file mode 100644
index 91cfd9bc1c..0000000000
--- a/plugins/UserSettings/lang/hr.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-    "UserSettings": {
-        "ColumnConfiguration": "KOnfiguracija",
-        "ColumnResolution": "Rezolucija",
-        "Configurations": "Konfiguracija",
-        "Language_aa": "afarski",
-        "Language_ab": "abhaski",
-        "Language_ae": "avestan",
-        "Language_af": "afrikaans",
-        "Language_ak": "akanski",
-        "Language_am": "amharik",
-        "Language_an": "aragonski",
-        "Language_ar": "arapski",
-        "Language_as": "asamski",
-        "Language_av": "avarski",
-        "Language_ay": "aymara",
-        "Language_az": "azerbajdžanski",
-        "Language_ba": "baškirski",
-        "Language_be": "bjeloruski",
-        "Language_bg": "bugarski",
-        "Language_bh": "bihari",
-        "Language_bi": "bislama",
-        "Language_bm": "bambara",
-        "Language_bn": "bengalski",
-        "Language_bo": "tibetanski",
-        "Language_br": "bretonski",
-        "Language_bs": "bosanski",
-        "Language_ca": "katalonski",
-        "Language_ce": "čečenski",
-        "Language_ch": "chamorro",
-        "Language_co": "korzički",
-        "Language_cr": "cree",
-        "Language_cs": "češki",
-        "Language_cu": "crkvenoslavenski",
-        "Language_cv": "chuvash",
-        "Language_cy": "velški",
-        "Language_da": "danski",
-        "Language_de": "njemački",
-        "Language_dv": "divehi",
-        "Language_dz": "dzongkha",
-        "Language_ee": "ewe",
-        "Language_el": "grčki",
-        "Language_en": "engleski",
-        "Language_eo": "esperanto",
-        "Language_es": "španjolski",
-        "Language_et": "estonijski",
-        "Language_eu": "baskijski",
-        "Language_fa": "perzijski",
-        "Language_ff": "fulah",
-        "Language_fi": "finski",
-        "Language_fj": "fidžijski",
-        "Language_fo": "faroanski",
-        "Language_fr": "francuski",
-        "Language_fy": "frizijski",
-        "Language_ga": "irski",
-        "Language_gd": "škotski-galski",
-        "Language_gl": "galicijski",
-        "Language_gn": "guarani",
-        "Language_gu": "gujarati",
-        "Language_gv": "manx",
-        "Language_ha": "hausa",
-        "Language_he": "hebrejski",
-        "Language_hi": "hindu",
-        "Language_ho": "hiri motu",
-        "Language_hr": "hrvatski",
-        "Language_ht": "kreolski",
-        "Language_hu": "mađarski",
-        "Language_hy": "armenski",
-        "Language_hz": "herero",
-        "Language_ia": "interlingua",
-        "Language_id": "indonezijski",
-        "Language_ie": "interligua",
-        "Language_ig": "igbo",
-        "Language_ii": "sichuan yi",
-        "Language_ik": "inupiaq",
-        "Language_io": "ido",
-        "Language_is": "islandski",
-        "Language_it": "talijanski",
-        "Language_iu": "inuktitut",
-        "Language_ja": "japanski",
-        "Language_jv": "javanski",
-        "Language_ka": "gruzijski",
-        "Language_kg": "kongo",
-        "Language_ki": "kikuyu",
-        "Language_kj": "kuanyama",
-        "Language_kk": "kazaški",
-        "Language_kl": "kalaallisut",
-        "Language_km": "kmerski",
-        "Language_kn": "kannada",
-        "Language_ko": "korejski",
-        "Language_kr": "kanuri",
-        "Language_ks": "kašmirski",
-        "Language_ku": "kurdski",
-        "Language_kv": "komi",
-        "Language_kw": "kornski",
-        "Language_ky": "kirgiški",
-        "Language_la": "latinski",
-        "Language_lb": "luksemburški",
-        "Language_lg": "ganda",
-        "Language_li": "limburgish",
-        "Language_ln": "lingala",
-        "Language_lo": "laoski",
-        "Language_lt": "litvanski",
-        "Language_lu": "luba-katanga",
-        "Language_lv": "latvijski",
-        "Language_mg": "malgaški",
-        "Language_mh": "maršalski",
-        "Language_mi": "maorski",
-        "Language_mk": "makedonski",
-        "Language_ml": "malayalam",
-        "Language_mn": "mongolski",
-        "Language_mr": "marathi",
-        "Language_ms": "malajski",
-        "Language_mt": "malteški",
-        "Language_my": "burmanski",
-        "Language_na": "nauru",
-        "Language_nb": "književni norveški",
-        "Language_nd": "sjeverni ndebele",
-        "Language_ne": "nepalski",
-        "Language_ng": "ndonga",
-        "Language_nl": "nizozemski",
-        "Language_nn": "novonorveški",
-        "Language_no": "norveški",
-        "Language_nr": "južni ndebele",
-        "Language_nv": "navajo",
-        "Language_ny": "nyanja",
-        "Language_oc": "okcitanski",
-        "Language_oj": "ojibwa",
-        "Language_om": "oromo",
-        "Language_or": "orijski",
-        "Language_os": "osetski",
-        "Language_pa": "punjabi",
-        "Language_pi": "pali",
-        "Language_pl": "poljski",
-        "Language_ps": "paštu",
-        "Language_pt": "portugalski",
-        "Language_qu": "quechua",
-        "Language_rm": "retoromanski",
-        "Language_rn": "rundi",
-        "Language_ro": "rumunjski",
-        "Language_ru": "ruski",
-        "Language_rw": "kinyarwanda",
-        "Language_sa": "sanskrtski",
-        "Language_sc": "sardski",
-        "Language_sd": "sindhi",
-        "Language_se": "južni sami",
-        "Language_sg": "sango",
-        "Language_si": "singaleški",
-        "Language_sk": "slovački",
-        "Language_sl": "slovenski",
-        "Language_sm": "samoanski",
-        "Language_sn": "shona",
-        "Language_so": "somalski",
-        "Language_sq": "albanski",
-        "Language_sr": "srpski",
-        "Language_ss": "svati",
-        "Language_st": "sesotski",
-        "Language_su": "sundanski",
-        "Language_sv": "švedski",
-        "Language_sw": "svahili",
-        "Language_ta": "tamilski",
-        "Language_te": "telugu",
-        "Language_tg": "tajik",
-        "Language_th": "tajlandski",
-        "Language_ti": "tigrinya",
-        "Language_tk": "turkmenski",
-        "Language_tl": "tagalog",
-        "Language_tn": "cvana",
-        "Language_to": "tonga",
-        "Language_tr": "turski",
-        "Language_ts": "tsonga",
-        "Language_tt": "tatarski",
-        "Language_tw": "twi",
-        "Language_ty": "tahićanski",
-        "Language_ug": "uighur",
-        "Language_uk": "ukrajinski",
-        "Language_ur": "urdu",
-        "Language_uz": "uzbečki",
-        "Language_ve": "venda",
-        "Language_vi": "vijetnamski",
-        "Language_vo": "volapük",
-        "Language_wa": "valonski",
-        "Language_wo": "wolof",
-        "Language_xh": "xhosa",
-        "Language_yi": "jidiš",
-        "Language_yo": "joruba",
-        "Language_za": "zhuang",
-        "Language_zh": "kineski",
-        "Language_zu": "zulu",
-        "VisitorSettings": "Postavke posjetitelja"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/hu.json b/plugins/UserSettings/lang/hu.json
deleted file mode 100644
index 2bdabbf3c4..0000000000
--- a/plugins/UserSettings/lang/hu.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-    "UserSettings": {
-        "ColumnConfiguration": "Konfiguráció",
-        "ColumnResolution": "Felbontás",
-        "Configurations": "Konfigurációk",
-        "Language_aa": "afar",
-        "Language_ab": "abház",
-        "Language_ae": "avesztán",
-        "Language_af": "afrikaans",
-        "Language_ak": "akan",
-        "Language_am": "amhara",
-        "Language_an": "aragonéz",
-        "Language_ar": "arab",
-        "Language_as": "asszámi",
-        "Language_av": "avar",
-        "Language_ay": "ajmara",
-        "Language_az": "azerbajdzsáni",
-        "Language_ba": "baskír",
-        "Language_be": "belorusz",
-        "Language_bg": "bolgár",
-        "Language_bh": "bihari",
-        "Language_bi": "bislama",
-        "Language_bm": "bambara",
-        "Language_bn": "bengáli",
-        "Language_bo": "tibeti",
-        "Language_br": "breton",
-        "Language_bs": "bosnyák",
-        "Language_ca": "katalán",
-        "Language_ce": "csecsen",
-        "Language_ch": "csamoró",
-        "Language_co": "korzikai",
-        "Language_cr": "krí",
-        "Language_cs": "cseh",
-        "Language_cu": "egyházi szláv",
-        "Language_cv": "csuvas",
-        "Language_cy": "walesi",
-        "Language_da": "dán",
-        "Language_de": "német",
-        "Language_dv": "divehi",
-        "Language_dz": "butáni",
-        "Language_ee": "eve",
-        "Language_el": "görög",
-        "Language_en": "angol",
-        "Language_eo": "eszperantó",
-        "Language_es": "spanyol",
-        "Language_et": "észt",
-        "Language_eu": "baszk",
-        "Language_fa": "perzsa",
-        "Language_ff": "fulani",
-        "Language_fi": "finn",
-        "Language_fj": "fidzsi",
-        "Language_fo": "feröeri",
-        "Language_fr": "francia",
-        "Language_fy": "fríz",
-        "Language_ga": "ír",
-        "Language_gd": "skót gael",
-        "Language_gl": "galíciai",
-        "Language_gn": "guarani",
-        "Language_gu": "gudzsarati",
-        "Language_gv": "Man-szigeti",
-        "Language_ha": "hausza",
-        "Language_he": "héber",
-        "Language_hi": "hindi",
-        "Language_ho": "hiri motu",
-        "Language_hr": "horvát",
-        "Language_ht": "haiti",
-        "Language_hu": "magyar",
-        "Language_hy": "örmény",
-        "Language_hz": "herero",
-        "Language_ia": "interlingva",
-        "Language_id": "indonéz",
-        "Language_ie": "interlingue",
-        "Language_ig": "igbó",
-        "Language_ii": "szecsuán ji",
-        "Language_ik": "inupiak",
-        "Language_io": "idó",
-        "Language_is": "izlandi",
-        "Language_it": "olasz",
-        "Language_iu": "inuktitut",
-        "Language_ja": "japán",
-        "Language_jv": "jávai",
-        "Language_ka": "grúz",
-        "Language_kg": "kongo",
-        "Language_ki": "kikuju",
-        "Language_kj": "kuanyama",
-        "Language_kk": "kazah",
-        "Language_kl": "grönlandi",
-        "Language_km": "kambodzsai",
-        "Language_kn": "kannada",
-        "Language_ko": "koreai",
-        "Language_kr": "kanuri",
-        "Language_ks": "kásmíri",
-        "Language_ku": "kurd",
-        "Language_kv": "komi",
-        "Language_kw": "korni",
-        "Language_ky": "kirgiz",
-        "Language_la": "latin",
-        "Language_lb": "luxemburgi",
-        "Language_lg": "ganda",
-        "Language_li": "limburgi",
-        "Language_ln": "lingala",
-        "Language_lo": "laoszi",
-        "Language_lt": "litván",
-        "Language_lu": "luba-katanga",
-        "Language_lv": "lett",
-        "Language_mg": "málgas",
-        "Language_mh": "marshalli",
-        "Language_mi": "maori",
-        "Language_mk": "macedón",
-        "Language_ml": "malajálam",
-        "Language_mn": "mongol",
-        "Language_mr": "marathi",
-        "Language_ms": "maláj",
-        "Language_mt": "máltai",
-        "Language_my": "burmai",
-        "Language_na": "naurui",
-        "Language_nb": "norvég bokmal",
-        "Language_nd": "északi ndebele",
-        "Language_ne": "nepáli",
-        "Language_ng": "ndonga",
-        "Language_nl": "holland",
-        "Language_nn": "norvég nynorsk",
-        "Language_no": "norvég",
-        "Language_nr": "déli ndebele",
-        "Language_nv": "navahó",
-        "Language_ny": "nyanja",
-        "Language_oc": "okszitán",
-        "Language_oj": "ojibva",
-        "Language_om": "oromói",
-        "Language_or": "orija",
-        "Language_os": "oszét",
-        "Language_pa": "pandzsábi",
-        "Language_pi": "pali",
-        "Language_pl": "lengyel",
-        "Language_ps": "pastu",
-        "Language_pt": "portugál",
-        "Language_qu": "kecsua",
-        "Language_rm": "réto-román",
-        "Language_rn": "kirundi",
-        "Language_ro": "román",
-        "Language_ru": "orosz",
-        "Language_rw": "kiruanda",
-        "Language_sa": "szanszkrit",
-        "Language_sc": "szardíniai",
-        "Language_sd": "szindhi",
-        "Language_se": "északi számi",
-        "Language_sg": "szangó",
-        "Language_si": "szingaléz",
-        "Language_sk": "szlovák",
-        "Language_sl": "szlovén",
-        "Language_sm": "szamoai",
-        "Language_sn": "sona",
-        "Language_so": "szomáliai",
-        "Language_sq": "albán",
-        "Language_sr": "szerb",
-        "Language_ss": "sziszuati",
-        "Language_st": "szeszotó",
-        "Language_su": "szundanéz",
-        "Language_sv": "svéd",
-        "Language_sw": "szuahéli",
-        "Language_ta": "tamil",
-        "Language_te": "telugu",
-        "Language_tg": "tadzsik",
-        "Language_th": "thai",
-        "Language_ti": "tigrinja",
-        "Language_tk": "türkmén",
-        "Language_tl": "tagalog",
-        "Language_tn": "szecsuáni",
-        "Language_to": "tonga",
-        "Language_tr": "török",
-        "Language_ts": "conga",
-        "Language_tt": "tatár",
-        "Language_tw": "twi",
-        "Language_ty": "tahiti",
-        "Language_ug": "ujgur",
-        "Language_uk": "ukrán",
-        "Language_ur": "urdu",
-        "Language_uz": "üzbég",
-        "Language_ve": "venda",
-        "Language_vi": "vietnámi",
-        "Language_vo": "volapük",
-        "Language_wa": "vallon",
-        "Language_wo": "volof",
-        "Language_xh": "hosza",
-        "Language_yi": "jiddis",
-        "Language_yo": "joruba",
-        "Language_za": "zsuang",
-        "Language_zh": "kínai",
-        "Language_zu": "zulu",
-        "LanguageCode": "Nyelvi kód",
-        "PluginDescription": "Jelentéseket készít a látogatóknál észlelt beállításokról és rendszerkörnyezetről mint például: böngésző típusa, böngészőcsaládok, operációs rendszer, böngésző bővítmények, képernyőfelbontás, globális beállítások.",
-        "PluginDetectionDoesNotWorkInIE": "A böngészők bővítményeinek detektálása nem működik az Internet Exlporernél, így ez a jelentés csak a nem Internet Explorert használó látogatók adatait jeleníti meg.",
-        "Resolutions": "Képernyőfelbontások",
-        "VisitorSettings": "Látogatók adatai",
-        "WidgetGlobalVisitors": "Globális látogatói beállítások",
-        "WidgetPlugins": "Bővítmények listája",
-        "WidgetResolutions": "Képernyőfelbontások"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/id.json b/plugins/UserSettings/lang/id.json
deleted file mode 100644
index 990dbd67b1..0000000000
--- a/plugins/UserSettings/lang/id.json
+++ /dev/null
@@ -1,204 +0,0 @@
-{
-    "UserSettings": {
-        "BrowserLanguage": "Bahasa Peramban",
-        "BrowserWithNoPluginsEnabled": "%1$s dengan tanpa pengaya diaktifkan",
-        "BrowserWithPluginsEnabled": "%1$s dengan %2$s pengaya diaktifkan",
-        "ColumnConfiguration": "Pengaturan",
-        "ColumnResolution": "Resolusi",
-        "Configurations": "Pengaturan",
-        "Language_aa": "Afar",
-        "Language_ab": "Abkhaz",
-        "Language_ae": "Avestan",
-        "Language_af": "Afrikaans",
-        "Language_ak": "Akan",
-        "Language_am": "Amharik",
-        "Language_an": "Aragon",
-        "Language_ar": "Arab",
-        "Language_as": "Assam",
-        "Language_av": "Avarik",
-        "Language_ay": "Aymara",
-        "Language_az": "Azerbaijan",
-        "Language_ba": "Bashkir",
-        "Language_be": "Belarusia",
-        "Language_bg": "Bulgaria",
-        "Language_bh": "Bihari",
-        "Language_bi": "Bislama",
-        "Language_bm": "Bambara",
-        "Language_bn": "Bengal",
-        "Language_bo": "Tibet",
-        "Language_br": "Breton",
-        "Language_bs": "Bosnia",
-        "Language_ca": "Catalan",
-        "Language_ce": "Chechen",
-        "Language_ch": "Chamorro",
-        "Language_co": "Korsika",
-        "Language_cr": "Cree",
-        "Language_cs": "Ceko",
-        "Language_cu": "Church Slavic",
-        "Language_cv": "Chuvash",
-        "Language_cy": "Welsh",
-        "Language_da": "Denmark",
-        "Language_de": "Jerman",
-        "Language_dv": "Divehi",
-        "Language_dz": "Dzongkha",
-        "Language_ee": "Ewe",
-        "Language_el": "Yunani",
-        "Language_en": "Inggris",
-        "Language_eo": "Esperanto",
-        "Language_es": "Spanyol",
-        "Language_et": "Estonian",
-        "Language_eu": "Basque",
-        "Language_fa": "Persia",
-        "Language_ff": "Fulah",
-        "Language_fi": "Finlandia",
-        "Language_fj": "Fiji",
-        "Language_fo": "Faro",
-        "Language_fr": "Perancis",
-        "Language_fy": "Frisi",
-        "Language_ga": "Irlandia",
-        "Language_gd": "Gaelik Skotlandia",
-        "Language_gl": "Gallegan",
-        "Language_gn": "Guarani",
-        "Language_gu": "Gujarati",
-        "Language_gv": "Manx",
-        "Language_ha": "Hausa",
-        "Language_he": "Ibrani",
-        "Language_hi": "Hindi",
-        "Language_ho": "Hiri Motu",
-        "Language_hr": "Kroasia",
-        "Language_ht": "Haiti",
-        "Language_hu": "Hungaria",
-        "Language_hy": "Armenia",
-        "Language_hz": "Herero",
-        "Language_ia": "Interlingua",
-        "Language_id": "Bahasa Indonesia",
-        "Language_ie": "Interlingue",
-        "Language_ig": "Igbo",
-        "Language_ii": "Sichuan Yi",
-        "Language_ik": "Inupiaq",
-        "Language_io": "Ido",
-        "Language_is": "Icelandic",
-        "Language_it": "Italian",
-        "Language_iu": "Inuktitut",
-        "Language_ja": "Japanese",
-        "Language_jv": "Jawa",
-        "Language_ka": "Georgian",
-        "Language_kg": "Kongo",
-        "Language_ki": "Kikuyu",
-        "Language_kj": "Kuanyama",
-        "Language_kk": "Kazakh",
-        "Language_kl": "Kalaallisut",
-        "Language_km": "Khmer",
-        "Language_kn": "Kannada",
-        "Language_ko": "Korea",
-        "Language_kr": "Kanuri",
-        "Language_ks": "Kashmir",
-        "Language_ku": "Kurdi",
-        "Language_kv": "Komi",
-        "Language_kw": "Cornish",
-        "Language_ky": "Kirghiz",
-        "Language_la": "Latin",
-        "Language_lb": "Luxembourg",
-        "Language_lg": "Ganda",
-        "Language_li": "Limburg",
-        "Language_ln": "Lingala",
-        "Language_lo": "Lao",
-        "Language_lt": "Lithuania",
-        "Language_lu": "Luba-Katanga",
-        "Language_lv": "Latvian",
-        "Language_mg": "Malagasi",
-        "Language_mh": "Marshall",
-        "Language_mi": "Maori",
-        "Language_mk": "Macedonian",
-        "Language_ml": "Malayalam",
-        "Language_mn": "Mongolian",
-        "Language_mr": "Marathi",
-        "Language_ms": "Malay",
-        "Language_mt": "Maltese",
-        "Language_my": "Burma",
-        "Language_na": "Nauru",
-        "Language_nb": "Norwegian Bokmål",
-        "Language_nd": "Ndebele Utara",
-        "Language_ne": "Nepal",
-        "Language_ng": "Ndonga",
-        "Language_nl": "Belanda",
-        "Language_nn": "Norwegian Nynorsk",
-        "Language_no": "Norwegian",
-        "Language_nr": "Ndebele Selatan",
-        "Language_nv": "Navajo",
-        "Language_ny": "Nyanja; Chichewa; Chewa",
-        "Language_oc": "Bahasa Occit",
-        "Language_oj": "Ojibwa",
-        "Language_om": "Oromo",
-        "Language_or": "Oriya",
-        "Language_os": "Ossetic",
-        "Language_pa": "Punjabi",
-        "Language_pi": "Pali",
-        "Language_pl": "Polish",
-        "Language_ps": "Pashto (Pushto)",
-        "Language_pt": "Portugis",
-        "Language_qu": "Quechua",
-        "Language_rm": "Rhaeto-Romance",
-        "Language_rn": "Rundi",
-        "Language_ro": "Romanian",
-        "Language_ru": "Russian",
-        "Language_rw": "Kinyarwanda",
-        "Language_sa": "Sanskrit",
-        "Language_sc": "Sardinian",
-        "Language_sd": "Sindhi",
-        "Language_se": "Northern Sami",
-        "Language_sg": "Sango",
-        "Language_si": "Sinhalese",
-        "Language_sk": "Slovak",
-        "Language_sl": "Slovenian",
-        "Language_sm": "Samoan",
-        "Language_sn": "Shona",
-        "Language_so": "Somali",
-        "Language_sq": "Albanian",
-        "Language_sr": "Serbian",
-        "Language_ss": "Swati",
-        "Language_st": "Sotho Selatan",
-        "Language_su": "Sundan",
-        "Language_sv": "Swedia",
-        "Language_sw": "Swahili",
-        "Language_ta": "Tamil",
-        "Language_te": "Telugu",
-        "Language_tg": "Tajik",
-        "Language_th": "Thai",
-        "Language_ti": "Tigrinya",
-        "Language_tk": "Turkmen",
-        "Language_tl": "Tagalog",
-        "Language_tn": "Tswana",
-        "Language_to": "Tonga",
-        "Language_tr": "Turkish",
-        "Language_ts": "Tsonga",
-        "Language_tt": "Tatar",
-        "Language_tw": "Twi",
-        "Language_ty": "Tahitian",
-        "Language_ug": "Uighur",
-        "Language_uk": "Ukrainian",
-        "Language_ur": "Urdu",
-        "Language_uz": "Uzbek",
-        "Language_ve": "Venda",
-        "Language_vi": "Vietnamese",
-        "Language_vo": "Volapük",
-        "Language_wa": "Walloon",
-        "Language_wo": "Wolof",
-        "Language_xh": "Xhosa",
-        "Language_yi": "Yiddish",
-        "Language_yo": "Yoruba",
-        "Language_za": "Zhuang",
-        "Language_zh": "Cina",
-        "Language_zu": "Zulu",
-        "LanguageCode": "Kode Bahasa",
-        "PluginDescription": "Laporan Pengaturan Pengguna: Peramban, Keluarga Peramban, Sistem Operasi, Pengaya, Resolusi Layar, Pengaturan Umum.",
-        "PluginDetectionDoesNotWorkInIE": "Catatan: Pendeteksian pengaya tidak bekerja di Internet Explorer. Laporan ini hanya berdasarkan pada peramban bukan-IE.",
-        "Resolutions": "Resolusi",
-        "VisitorSettings": "Pengaturan Pengunjung",
-        "WidgetGlobalVisitors": "Pengaturan pengunjung umum",
-        "WidgetGlobalVisitorsDocumentation": "Laporan ini menunjukkan pengaturan paling umum yang pengunjung miliki. Subuah pengaturan terdiri atas sistem operasi, jenis peramban, dan resolusi layar.",
-        "WidgetPlugins": "Daftar Pengaya",
-        "WidgetPluginsDocumentation": "Laporan ini menunjukkan pengaya peramban yang diaktifkan oleh pengunjung. Informasi yang tersedia kemungkinan penting untuk memilih cara terbaik untuk menyampaikan konten Anda.",
-        "WidgetResolutions": "Resolusi layar"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/is.json b/plugins/UserSettings/lang/is.json
deleted file mode 100644
index ff81439a86..0000000000
--- a/plugins/UserSettings/lang/is.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-    "UserSettings": {
-        "ColumnConfiguration": "Uppsetning",
-        "ColumnResolution": "Skjáupplausn",
-        "Configurations": "Uppsetningar",
-        "Language_aa": "afár",
-        "Language_ab": "abkasíska",
-        "Language_ae": "avestíska",
-        "Language_af": "afríkanska",
-        "Language_ak": "akan",
-        "Language_am": "amharíska",
-        "Language_an": "aragonska",
-        "Language_ar": "arabíska",
-        "Language_as": "assamska",
-        "Language_av": "avaríska",
-        "Language_ay": "aímara",
-        "Language_az": "aserska",
-        "Language_ba": "baskír",
-        "Language_be": "hvítrússneska",
-        "Language_bg": "búlgarska",
-        "Language_bh": "bíharí",
-        "Language_bi": "bíslama",
-        "Language_bm": "bambara",
-        "Language_bn": "bengalska",
-        "Language_bo": "tíbeska",
-        "Language_br": "bretónska",
-        "Language_bs": "bosníska",
-        "Language_ca": "katalónska",
-        "Language_ce": "tsjetsjenska",
-        "Language_ch": "kamorró",
-        "Language_co": "korsíska",
-        "Language_cr": "krí",
-        "Language_cs": "tékkneska",
-        "Language_cu": "kirkjuslavneska",
-        "Language_cv": "sjúvas",
-        "Language_cy": "velska",
-        "Language_da": "danska",
-        "Language_de": "þýska",
-        "Language_dv": "dívehí",
-        "Language_dz": "dsongka",
-        "Language_ee": "eve",
-        "Language_el": "nýgríska (1453-)",
-        "Language_en": "enska",
-        "Language_eo": "esperantó",
-        "Language_es": "spænska",
-        "Language_et": "eistneska",
-        "Language_eu": "baskneska",
-        "Language_fa": "persneska",
-        "Language_ff": "fúla",
-        "Language_fi": "finnska",
-        "Language_fj": "fídjeyska",
-        "Language_fo": "færeyska",
-        "Language_fr": "franska",
-        "Language_fy": "frísneska",
-        "Language_ga": "írska",
-        "Language_gd": "skosk gelíska",
-        "Language_gl": "gallegska",
-        "Language_gn": "gvaraní",
-        "Language_gu": "gújaratí",
-        "Language_gv": "manx",
-        "Language_ha": "hása",
-        "Language_he": "hebreska",
-        "Language_hi": "hindí",
-        "Language_ho": "hírímótú",
-        "Language_hr": "króatíska",
-        "Language_ht": "haítíska",
-        "Language_hu": "ungverska",
-        "Language_hy": "armenska",
-        "Language_hz": "hereró",
-        "Language_ia": "interlingva",
-        "Language_id": "indónesíska",
-        "Language_ie": "interlingve",
-        "Language_ig": "ígbó",
-        "Language_ii": "sísúanjí",
-        "Language_ik": "ínúpíak",
-        "Language_io": "ídó",
-        "Language_is": "íslenska",
-        "Language_it": "ítalska",
-        "Language_iu": "inúktitút",
-        "Language_ja": "japanska",
-        "Language_jv": "javanska",
-        "Language_ka": "georgíska",
-        "Language_kg": "kongó",
-        "Language_ki": "kíkújú",
-        "Language_kj": "kúanjama",
-        "Language_kk": "kasakska",
-        "Language_kl": "grænlenska",
-        "Language_km": "kmer",
-        "Language_kn": "kannada",
-        "Language_ko": "kóreska",
-        "Language_kr": "kanúrí",
-        "Language_ks": "kasmírska",
-        "Language_ku": "kúrdneska",
-        "Language_kv": "komíska",
-        "Language_kw": "korníska",
-        "Language_ky": "kirgiska",
-        "Language_la": "latína",
-        "Language_lb": "lúxemborgíska",
-        "Language_lg": "ganda",
-        "Language_li": "limbúrgíska",
-        "Language_ln": "lingala",
-        "Language_lo": "laó",
-        "Language_lt": "litháíska",
-        "Language_lu": "lúbakatanga",
-        "Language_lv": "lettneska",
-        "Language_mg": "malagasíska",
-        "Language_mh": "marshallska",
-        "Language_mi": "maórí",
-        "Language_mk": "makedónska",
-        "Language_ml": "malajalam",
-        "Language_mn": "mongólska",
-        "Language_mr": "maratí",
-        "Language_ms": "malaíska",
-        "Language_mt": "maltneska",
-        "Language_my": "burmneska",
-        "Language_na": "nárúska",
-        "Language_nb": "norskt bókmál",
-        "Language_nd": "norðurndebele",
-        "Language_ne": "nepalska",
-        "Language_ng": "ndonga",
-        "Language_nl": "hollenska",
-        "Language_nn": "nýnorska",
-        "Language_no": "norska",
-        "Language_nr": "suðurndebele",
-        "Language_nv": "navahó",
-        "Language_ny": "Njanja; Sísjeva; Sjeva",
-        "Language_oc": "Okkitíska (eftir 1500); Próvensalska",
-        "Language_oj": "ojibva",
-        "Language_om": "órómó",
-        "Language_or": "óría",
-        "Language_os": "ossetíska",
-        "Language_pa": "púnjabí",
-        "Language_pi": "palí",
-        "Language_pl": "pólska",
-        "Language_ps": "pastú",
-        "Language_pt": "portúgalska",
-        "Language_qu": "kvesjúa",
-        "Language_rm": "retórómanska",
-        "Language_rn": "rúndí",
-        "Language_ro": "rúmenska",
-        "Language_ru": "rússneska",
-        "Language_rw": "kínjarvanda",
-        "Language_sa": "sanskrít",
-        "Language_sc": "sardínska",
-        "Language_sd": "sindí",
-        "Language_se": "norðursamíska",
-        "Language_sg": "sangó",
-        "Language_si": "singalesíska",
-        "Language_sk": "slóvakíska",
-        "Language_sl": "slóvenska",
-        "Language_sm": "samóska",
-        "Language_sn": "shóna",
-        "Language_so": "sómalska",
-        "Language_sq": "albanska",
-        "Language_sr": "serbneska",
-        "Language_ss": "svatí",
-        "Language_st": "suðursótó",
-        "Language_su": "súndanska",
-        "Language_sv": "sænska",
-        "Language_sw": "svahílí",
-        "Language_ta": "tamílska",
-        "Language_te": "telúgú",
-        "Language_tg": "tadsjikska",
-        "Language_th": "taílenska",
-        "Language_ti": "tígrinja",
-        "Language_tk": "túrkmenska",
-        "Language_tl": "tagalog",
-        "Language_tn": "tsúana",
-        "Language_to": "Tongverska (Tongaeyjar)",
-        "Language_tr": "tyrkneska",
-        "Language_ts": "tsonga",
-        "Language_tt": "tatarska",
-        "Language_tw": "tví",
-        "Language_ty": "tahítíska",
-        "Language_ug": "úígúr",
-        "Language_uk": "úkraínska",
-        "Language_ur": "úrdú",
-        "Language_uz": "úsbekska",
-        "Language_ve": "venda",
-        "Language_vi": "víetnamska",
-        "Language_vo": "volapyk",
-        "Language_wa": "vallónska",
-        "Language_wo": "volof",
-        "Language_xh": "sósa",
-        "Language_yi": "jiddíska",
-        "Language_yo": "jórúba",
-        "Language_za": "súang",
-        "Language_zh": "kínverska",
-        "Language_zu": "súlú",
-        "LanguageCode": "Kóði tungumáls",
-        "PluginDescription": "Gefur skýrslu um ýmsar stillingar gesta:Vafra, Vafrafjölskyldu, Stýrikerfi, Íbætur, Skjáupplausn, altækar stillingar.",
-        "PluginDetectionDoesNotWorkInIE": "Ath: uppgötvun á íbótum virkar ekki með Internet Explorer. Þessi skýrsla er aðeins unnin út frá öðrum vöfrum en IE.",
-        "Resolutions": "Skjáupplausnir",
-        "VisitorSettings": "Stillingar gesta",
-        "WidgetGlobalVisitors": "Altæk gestastilling",
-        "WidgetPlugins": "Listi yfir íbætur",
-        "WidgetResolutions": "Skjáupplausnir"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/it.json b/plugins/UserSettings/lang/it.json
deleted file mode 100644
index 70d39f1544..0000000000
--- a/plugins/UserSettings/lang/it.json
+++ /dev/null
@@ -1,205 +0,0 @@
-{
-    "UserSettings": {
-        "BrowserLanguage": "Lingua Browser",
-        "BrowserWithNoPluginsEnabled": "%1$s con nessun plugin abilitato",
-        "BrowserWithPluginsEnabled": "%1$s con plugin %2$s abilitati",
-        "ColumnConfiguration": "Configurazione",
-        "ColumnResolution": "Risoluzione",
-        "Configurations": "Configurazioni",
-        "Language_aa": "afar",
-        "Language_ab": "abkhazian",
-        "Language_ae": "avestan",
-        "Language_af": "afrikaans",
-        "Language_ak": "akan",
-        "Language_am": "amarico",
-        "Language_an": "aragonese",
-        "Language_ar": "arabo",
-        "Language_as": "assamese",
-        "Language_av": "avaro",
-        "Language_ay": "aymara",
-        "Language_az": "azerbaigiano",
-        "Language_ba": "baschiro",
-        "Language_be": "bielorusso",
-        "Language_bg": "bulgaro",
-        "Language_bh": "bihari",
-        "Language_bi": "bislama",
-        "Language_bm": "bambara",
-        "Language_bn": "bengalese",
-        "Language_bo": "tibetano",
-        "Language_br": "bretone",
-        "Language_bs": "bosniaco",
-        "Language_ca": "catalano",
-        "Language_ce": "ceceno",
-        "Language_ch": "chamorro",
-        "Language_co": "corso",
-        "Language_cr": "cree",
-        "Language_cs": "ceco",
-        "Language_cu": "slavo della Chiesa",
-        "Language_cv": "chuvash",
-        "Language_cy": "gallese",
-        "Language_da": "danese",
-        "Language_de": "tedesco",
-        "Language_dv": "divehi",
-        "Language_dz": "dzongkha",
-        "Language_ee": "ewe",
-        "Language_el": "greco",
-        "Language_en": "inglese",
-        "Language_eo": "esperanto",
-        "Language_es": "spagnolo",
-        "Language_et": "estone",
-        "Language_eu": "basco",
-        "Language_fa": "persiano",
-        "Language_ff": "fulah",
-        "Language_fi": "finlandese",
-        "Language_fj": "figiano",
-        "Language_fo": "faroese",
-        "Language_fr": "francese",
-        "Language_fy": "frisone",
-        "Language_ga": "irlandese",
-        "Language_gd": "gaelico scozzese",
-        "Language_gl": "galiziano",
-        "Language_gn": "guarana",
-        "Language_gu": "gujarati",
-        "Language_gv": "manx",
-        "Language_ha": "haussa",
-        "Language_he": "ebraico",
-        "Language_hi": "hindi",
-        "Language_ho": "hiri motu",
-        "Language_hr": "croato",
-        "Language_ht": "haitiano",
-        "Language_hu": "ungherese",
-        "Language_hy": "armeno",
-        "Language_hz": "herero",
-        "Language_ia": "interlingua",
-        "Language_id": "indonesiano",
-        "Language_ie": "interlingue",
-        "Language_ig": "igbo",
-        "Language_ii": "sichuan yi",
-        "Language_ik": "inupiak",
-        "Language_io": "ido",
-        "Language_is": "islandese",
-        "Language_it": "italiano",
-        "Language_iu": "inuktitut",
-        "Language_ja": "giapponese",
-        "Language_jv": "giavanese",
-        "Language_ka": "georgiano",
-        "Language_kg": "kongo",
-        "Language_ki": "kikuyu",
-        "Language_kj": "kuanyama",
-        "Language_kk": "kazako",
-        "Language_kl": "kalaallisut",
-        "Language_km": "khmer",
-        "Language_kn": "kannada",
-        "Language_ko": "coreano",
-        "Language_kr": "kanuri",
-        "Language_ks": "kashmiri",
-        "Language_ku": "curdo",
-        "Language_kv": "komi",
-        "Language_kw": "cornico",
-        "Language_ky": "kirghiso",
-        "Language_la": "latino",
-        "Language_lb": "lussemburghese",
-        "Language_lg": "ganda",
-        "Language_li": "limburgese",
-        "Language_ln": "lingala",
-        "Language_lo": "lao",
-        "Language_lt": "lituano",
-        "Language_lu": "luba-katanga",
-        "Language_lv": "lettone",
-        "Language_mg": "malgascio",
-        "Language_mh": "marshallese",
-        "Language_mi": "maori",
-        "Language_mk": "macedone",
-        "Language_ml": "malayalam",
-        "Language_mn": "mongolo",
-        "Language_mr": "marathi",
-        "Language_ms": "malese",
-        "Language_mt": "maltese",
-        "Language_my": "birmano",
-        "Language_na": "nauru",
-        "Language_nb": "norvegese bokmal",
-        "Language_nd": "ndebele del nord",
-        "Language_ne": "nepalese",
-        "Language_ng": "ndonga",
-        "Language_nl": "olandese",
-        "Language_nn": "norvegese nynorsk",
-        "Language_no": "norvegese",
-        "Language_nr": "ndebele del sud",
-        "Language_nv": "navajo",
-        "Language_ny": "nyanja",
-        "Language_oc": "occitano",
-        "Language_oj": "ojibwa",
-        "Language_om": "oromo",
-        "Language_or": "oriya",
-        "Language_os": "ossetico",
-        "Language_pa": "punjabi",
-        "Language_pi": "pali",
-        "Language_pl": "polacco",
-        "Language_ps": "pashto",
-        "Language_pt": "portoghese",
-        "Language_qu": "quechua",
-        "Language_rm": "lingua rhaeto-romance",
-        "Language_rn": "rundi",
-        "Language_ro": "rumeno",
-        "Language_ru": "russo",
-        "Language_rw": "kinyarwanda",
-        "Language_sa": "sanscrito",
-        "Language_sc": "sardo",
-        "Language_sd": "sindhi",
-        "Language_se": "sami del nord",
-        "Language_sg": "sango",
-        "Language_si": "singalese",
-        "Language_sk": "slovacco",
-        "Language_sl": "sloveno",
-        "Language_sm": "samoano",
-        "Language_sn": "shona",
-        "Language_so": "somalo",
-        "Language_sq": "albanese",
-        "Language_sr": "serbo",
-        "Language_ss": "swati",
-        "Language_st": "sotho del sud",
-        "Language_su": "sundanese",
-        "Language_sv": "svedese",
-        "Language_sw": "swahili",
-        "Language_ta": "tamil",
-        "Language_te": "telugu",
-        "Language_tg": "tagicco",
-        "Language_th": "thai",
-        "Language_ti": "tigrinya",
-        "Language_tk": "turcomanno",
-        "Language_tl": "tagalog",
-        "Language_tn": "tswana",
-        "Language_to": "tonga",
-        "Language_tr": "turco",
-        "Language_ts": "tsonga",
-        "Language_tt": "tatarico",
-        "Language_tw": "ci",
-        "Language_ty": "taitiano",
-        "Language_ug": "uigurico",
-        "Language_uk": "ucraino",
-        "Language_ur": "urdu",
-        "Language_uz": "usbeco",
-        "Language_ve": "venda",
-        "Language_vi": "vietnamita",
-        "Language_vo": "volapük",
-        "Language_wa": "vallone",
-        "Language_wo": "volof",
-        "Language_xh": "xosa",
-        "Language_yi": "yiddish",
-        "Language_yo": "yoruba",
-        "Language_za": "zhuang",
-        "Language_zh": "cinese",
-        "Language_zu": "zulu",
-        "LanguageCode": "Codice della lingua",
-        "PluginDescription": "Mostra le varie impostazioni per gli utenti: Browser, Famiglia del Browser, Sistema Operativo, Plugin, Risoluzione, Impostazioni Globali.",
-        "PluginDetectionDoesNotWorkInIE": "N.B.: Questo plugin non funziona su Internet Explorer. Questo report è basato solamente sugli utenti di altri browser.",
-        "Resolutions": "Risoluzioni",
-        "ScreenTypes": "Tipi di schermo",
-        "VisitorSettings": "Impostazioni visitatori",
-        "WidgetGlobalVisitors": "Riepilogo configurazione visitatori",
-        "WidgetGlobalVisitorsDocumentation": "Questo report mostra le configurazioni globali più comuni che i visitatori avevano. Una configurazione è la combinazione di un sistema operativo, un tipo browser e una risoluzione di schermo.",
-        "WidgetPlugins": "Lista dei Plugin",
-        "WidgetPluginsDocumentation": "Questo report mostra quali plugin del browser i visitatori avevano abilitato. Questa informazione potrebbe essere importante per la scelta del giusto modo di inviare i tuoi contenuti.",
-        "WidgetResolutions": "Risoluzione schermo"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/ja.json b/plugins/UserSettings/lang/ja.json
deleted file mode 100644
index 7e409d6a05..0000000000
--- a/plugins/UserSettings/lang/ja.json
+++ /dev/null
@@ -1,204 +0,0 @@
-{
-    "UserSettings": {
-        "BrowserLanguage": "ブラウザの言語",
-        "BrowserWithNoPluginsEnabled": "%1$s のプラグインが有効ではありません",
-        "BrowserWithPluginsEnabled": "%1$s のプラグイン %2$s は有効",
-        "ColumnConfiguration": "環境設定",
-        "ColumnResolution": "解像度",
-        "Configurations": "環境設定",
-        "Language_aa": "アファル語",
-        "Language_ab": "アブハズ語",
-        "Language_ae": "アヴェスタ語",
-        "Language_af": "アフリカーンス語",
-        "Language_ak": "アカン語",
-        "Language_am": "アムハラ語",
-        "Language_an": "アラゴン語",
-        "Language_ar": "アラビア語",
-        "Language_as": "アッサム語",
-        "Language_av": "アヴァル語",
-        "Language_ay": "アイマラ語",
-        "Language_az": "アゼルバイジャン語",
-        "Language_ba": "バシキール語",
-        "Language_be": "ベラルーシ語",
-        "Language_bg": "ブルガリア語",
-        "Language_bh": "ビハール語",
-        "Language_bi": "ビスラマ語",
-        "Language_bm": "バンバラ語",
-        "Language_bn": "ベンガル語",
-        "Language_bo": "チベット語",
-        "Language_br": "ブルトン語",
-        "Language_bs": "ボスニア語",
-        "Language_ca": "カタロニア語",
-        "Language_ce": "チェチェン語",
-        "Language_ch": "チャモロ語",
-        "Language_co": "コルシカ語",
-        "Language_cr": "クリー語",
-        "Language_cs": "チェコ語",
-        "Language_cu": "教会スラブ語",
-        "Language_cv": "チュヴァシュ語",
-        "Language_cy": "ウェールズ語",
-        "Language_da": "デンマーク語",
-        "Language_de": "ドイツ語",
-        "Language_dv": "ディベヒ語",
-        "Language_dz": "ゾンカ語",
-        "Language_ee": "エウェ語",
-        "Language_el": "ギリシャ語",
-        "Language_en": "英語",
-        "Language_eo": "エスペラント語",
-        "Language_es": "スペイン語",
-        "Language_et": "エストニア語",
-        "Language_eu": "バスク語",
-        "Language_fa": "ペルシア語",
-        "Language_ff": "フラニ語",
-        "Language_fi": "フィンランド語",
-        "Language_fj": "フィジー語",
-        "Language_fo": "フェロー語",
-        "Language_fr": "フランス語",
-        "Language_fy": "フリジア語",
-        "Language_ga": "アイルランド語",
-        "Language_gd": "スコットランド・ゲール語",
-        "Language_gl": "ガリシア語",
-        "Language_gn": "グアラニー語",
-        "Language_gu": "グジャラート語",
-        "Language_gv": "マン島語",
-        "Language_ha": "ハウサ語",
-        "Language_he": "ヘブライ語",
-        "Language_hi": "ヒンディー語",
-        "Language_ho": "ヒリモトゥ語",
-        "Language_hr": "クロアチア語",
-        "Language_ht": "ハイチ語",
-        "Language_hu": "ハンガリー語",
-        "Language_hy": "アルメニア語",
-        "Language_hz": "ヘレロ語",
-        "Language_ia": "インターリングア語",
-        "Language_id": "インドネシア語",
-        "Language_ie": "インターリング語",
-        "Language_ig": "イボ語",
-        "Language_ii": "四川イ語",
-        "Language_ik": "イヌピアック語",
-        "Language_io": "イド語",
-        "Language_is": "アイスランド語",
-        "Language_it": "イタリア語",
-        "Language_iu": "イヌクウティトット語",
-        "Language_ja": "日本語",
-        "Language_jv": "ジャワ語",
-        "Language_ka": "グルジア語",
-        "Language_kg": "コンゴ語",
-        "Language_ki": "キクユ語",
-        "Language_kj": "クアニャマ語",
-        "Language_kk": "カザフ語",
-        "Language_kl": "グリーンランド語",
-        "Language_km": "クメール語",
-        "Language_kn": "カンナダ語",
-        "Language_ko": "韓国語",
-        "Language_kr": "カヌリ語",
-        "Language_ks": "カシミール語",
-        "Language_ku": "クルド語",
-        "Language_kv": "コミ語",
-        "Language_kw": "コーンウォール語",
-        "Language_ky": "キルギス語",
-        "Language_la": "ラテン語",
-        "Language_lb": "ルクセンブルク語",
-        "Language_lg": "ガンダ語",
-        "Language_li": "リンブルフ語",
-        "Language_ln": "リンガラ語",
-        "Language_lo": "ラオ語",
-        "Language_lt": "リトアニア語",
-        "Language_lu": "ルバ・カタンガ語",
-        "Language_lv": "ラトビア語",
-        "Language_mg": "マダガスカル語",
-        "Language_mh": "マーシャル語",
-        "Language_mi": "マオリ語",
-        "Language_mk": "マケドニア語",
-        "Language_ml": "マラヤーラム語",
-        "Language_mn": "モンゴル語",
-        "Language_mr": "マラーティー語",
-        "Language_ms": "マレー語",
-        "Language_mt": "マルタ語",
-        "Language_my": "ビルマ語",
-        "Language_na": "ナウル語",
-        "Language_nb": "ノルウェー語 (ブークモール)",
-        "Language_nd": "北ンデベレ語",
-        "Language_ne": "ネパール語",
-        "Language_ng": "ンドンガ語",
-        "Language_nl": "オランダ語",
-        "Language_nn": "ノルウェー語 (ニーノシュク)",
-        "Language_no": "ノルウェー語",
-        "Language_nr": "南ンデベレ語",
-        "Language_nv": "ナバホ語",
-        "Language_ny": "ニャンジャ語、チチェワ語、チェワ語",
-        "Language_oc": "オック語",
-        "Language_oj": "オブジワ語",
-        "Language_om": "オロモ語",
-        "Language_or": "オリヤー語",
-        "Language_os": "オセト語",
-        "Language_pa": "パンジャブ語",
-        "Language_pi": "パーリ語",
-        "Language_pl": "ポーランド語",
-        "Language_ps": "パシュトゥー語",
-        "Language_pt": "ポルトガル語",
-        "Language_qu": "ケチュア語",
-        "Language_rm": "レト・ロマン語",
-        "Language_rn": "ルンディ語",
-        "Language_ro": "ルーマニア語",
-        "Language_ru": "ロシア語",
-        "Language_rw": "ルワンダ語",
-        "Language_sa": "サンスクリット語",
-        "Language_sc": "サルデーニャ語",
-        "Language_sd": "シンド語",
-        "Language_se": "北サーミ語",
-        "Language_sg": "サンゴ語",
-        "Language_si": "シンハラ語",
-        "Language_sk": "スロバキア語",
-        "Language_sl": "スロベニア語",
-        "Language_sm": "サモア語",
-        "Language_sn": "ショナ語",
-        "Language_so": "ソマリ語",
-        "Language_sq": "アルバニア語",
-        "Language_sr": "セルビア語",
-        "Language_ss": "シスワティ語",
-        "Language_st": "南部ソト語",
-        "Language_su": "スンダ語",
-        "Language_sv": "スウェーデン語",
-        "Language_sw": "スワヒリ語",
-        "Language_ta": "タミール語",
-        "Language_te": "テルグ語",
-        "Language_tg": "タジク語",
-        "Language_th": "タイ語",
-        "Language_ti": "ティグリニア語",
-        "Language_tk": "トルクメン語",
-        "Language_tl": "タガログ語",
-        "Language_tn": "ツワナ語",
-        "Language_to": "トンガ語",
-        "Language_tr": "トルコ語",
-        "Language_ts": "ツォンガ語",
-        "Language_tt": "タタール語",
-        "Language_tw": "トウィ語",
-        "Language_ty": "タヒチ語",
-        "Language_ug": "ウイグル語",
-        "Language_uk": "ウクライナ語",
-        "Language_ur": "ウルドゥー語",
-        "Language_uz": "ウズベク語",
-        "Language_ve": "ベンダ語",
-        "Language_vi": "ベトナム語",
-        "Language_vo": "ボラピュク語",
-        "Language_wa": "ワロン語",
-        "Language_wo": "ウォロフ語",
-        "Language_xh": "コサ語",
-        "Language_yi": "イディッシュ語",
-        "Language_yo": "ヨルバ語",
-        "Language_za": "チワン語",
-        "Language_zh": "中国語",
-        "Language_zu": "ズールー語",
-        "LanguageCode": "言語コード",
-        "PluginDescription": "各種ユーザー設定（ブラウザ、ブラウザファミリー、オペレーティングシステム、プラグイン、解像度、全般設定）をリポートします。",
-        "PluginDetectionDoesNotWorkInIE": "注意： Internet Explorer ではプラグインの検出が動作しません。 このリポートは、非 IE ブラウザのみに基づきます。",
-        "Resolutions": "解像度",
-        "VisitorSettings": "ビジターの環境",
-        "WidgetGlobalVisitors": "ビジターの全般的な環境設定",
-        "WidgetGlobalVisitorsDocumentation": "ビジターの最も一般的な利用環境についてのリポートです。オペレーティングシステム、ブラウザの種類と画面の解像度の組合せで表示します。",
-        "WidgetPlugins": "プラグイン一覧",
-        "WidgetPluginsDocumentation": "ビジターが利用しているブラウザのプラグインについてのリポートです。コンテンツの最適な表示方法を選択するために重要な情報です。",
-        "WidgetResolutions": "画面解像度"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/ka.json b/plugins/UserSettings/lang/ka.json
deleted file mode 100644
index 7dab7a6d23..0000000000
--- a/plugins/UserSettings/lang/ka.json
+++ /dev/null
@@ -1,172 +0,0 @@
-{
-    "UserSettings": {
-        "ColumnConfiguration": "კონფიგურაცია",
-        "ColumnResolution": "რეზოლუცია",
-        "Configurations": "გონფიგურაციები",
-        "Language_aa": "აფარი",
-        "Language_ab": "აფხაზური",
-        "Language_ae": "ავესტა",
-        "Language_af": "აფრიკული",
-        "Language_ak": "აკანი",
-        "Language_am": "ამჰარული",
-        "Language_an": "არაგონული",
-        "Language_ar": "არაბული",
-        "Language_as": "ასამური",
-        "Language_av": "ხუნძური",
-        "Language_ay": "აიმარა",
-        "Language_az": "აზერბაიჯანული",
-        "Language_ba": "ბაშკირული",
-        "Language_be": "ბელორუსული",
-        "Language_bg": "ბულგარული",
-        "Language_bh": "ბიჰარი",
-        "Language_bn": "ბენგალური",
-        "Language_bo": "ტიბეტური",
-        "Language_br": "ბრეტონული",
-        "Language_bs": "ბოსნიური",
-        "Language_ca": "კატალანური",
-        "Language_ce": "ჩეჩნური",
-        "Language_co": "კორსიკული",
-        "Language_cr": "კრი",
-        "Language_cs": "ჩეხური",
-        "Language_cu": "საეკლესიო სლავური",
-        "Language_cv": "ჩუვაშური",
-        "Language_cy": "უელსური",
-        "Language_da": "დანიური",
-        "Language_de": "გერმანული",
-        "Language_dv": "დივეჰი",
-        "Language_dz": "ძონგხა",
-        "Language_ee": "ევე",
-        "Language_el": "ბერძნული",
-        "Language_en": "ინგლისური",
-        "Language_eo": "ესპერანტო",
-        "Language_es": "ესპანური",
-        "Language_et": "ესტონური",
-        "Language_eu": "ბასკური",
-        "Language_fa": "სპარსული",
-        "Language_fi": "ფინური",
-        "Language_fj": "ფიჯი",
-        "Language_fo": "ფარერული",
-        "Language_fr": "ფრანგული",
-        "Language_fy": "დასავლეთფრიზიული",
-        "Language_ga": "ირლანდიური",
-        "Language_gd": "შოტლანდიურ-გალური",
-        "Language_gl": "გალური",
-        "Language_gn": "გუარანი",
-        "Language_gu": "გუჯარათი",
-        "Language_gv": "მენური",
-        "Language_ha": "ჰაუსა",
-        "Language_he": "ებრაული",
-        "Language_hi": "ჰინდი",
-        "Language_hr": "ხორვატიული",
-        "Language_ht": "ჰაიტიური",
-        "Language_hu": "უნგრული",
-        "Language_hy": "სომხური",
-        "Language_ia": "ინტერლინგუალური",
-        "Language_id": "ინდონეზიური",
-        "Language_ie": "ინტერლინგი",
-        "Language_ig": "იგბო",
-        "Language_io": "იდო",
-        "Language_is": "ისლანდიური",
-        "Language_it": "იტალიური",
-        "Language_iu": "ინუკტიტუტი",
-        "Language_ja": "იაპონური",
-        "Language_jv": "იავანური",
-        "Language_ka": "ქართული",
-        "Language_kg": "კონგო",
-        "Language_kk": "ყაზახური",
-        "Language_kl": "გრენლანდიური",
-        "Language_km": "კამბოჯიური",
-        "Language_kn": "კანადა",
-        "Language_ko": "კორეული",
-        "Language_kr": "კანური",
-        "Language_ks": "ქაშმირული",
-        "Language_ku": "ქურთული",
-        "Language_kv": "კომი",
-        "Language_kw": "კორნული",
-        "Language_ky": "ყირგიზული",
-        "Language_la": "ლათინური",
-        "Language_lb": "ლუქსემბურგული",
-        "Language_lg": "განდა",
-        "Language_li": "ლიმბურგული",
-        "Language_ln": "ლინგალა",
-        "Language_lo": "ლაოსური",
-        "Language_lt": "ლიტვური",
-        "Language_lu": "ლუბა-კატანგა",
-        "Language_lv": "ლატვიური",
-        "Language_mg": "მალაგასიური",
-        "Language_mi": "მაორი",
-        "Language_mk": "მაკედონიური",
-        "Language_ml": "მალაიალამური",
-        "Language_mn": "მონღოლური",
-        "Language_mr": "მარათჰი",
-        "Language_ms": "მალაიზიური",
-        "Language_mt": "მალტური",
-        "Language_my": "ბირმული",
-        "Language_na": "ნაურუ",
-        "Language_nb": "ნორვეგიული ბუკმოლი",
-        "Language_ne": "ნეპალური",
-        "Language_nl": "ჰოლანდიური",
-        "Language_nn": "ნორვეგიული ნინორსკი",
-        "Language_no": "ნორვეგიული",
-        "Language_nv": "ნავახო",
-        "Language_ny": "ნიანჯა",
-        "Language_oc": "ოციტანური",
-        "Language_oj": "ოჯიბვე",
-        "Language_or": "ორიული",
-        "Language_os": "ოსური",
-        "Language_pa": "პენჯაბური",
-        "Language_pi": "პალი",
-        "Language_pl": "პოლონური",
-        "Language_ps": "პუშტუ",
-        "Language_pt": "პორტუგალიური",
-        "Language_qu": "კეჩუა",
-        "Language_rm": "რეტორომანული",
-        "Language_rn": "რუნდი",
-        "Language_ro": "რუმინული",
-        "Language_ru": "რუსული",
-        "Language_sa": "სანსკრიტი",
-        "Language_sc": "სარდინიული",
-        "Language_sd": "სინდური",
-        "Language_si": "სინჰალური",
-        "Language_sk": "სლოვაკური",
-        "Language_sl": "სლოვენური",
-        "Language_sm": "სამოა",
-        "Language_so": "სომალიური",
-        "Language_sq": "ალბანური",
-        "Language_sr": "სერბული",
-        "Language_st": "სამხრეთ სოთოს ენა",
-        "Language_su": "სუნდური",
-        "Language_sv": "შვედური",
-        "Language_sw": "სუაჰილი",
-        "Language_ta": "ტამილური",
-        "Language_te": "ტელუგუ",
-        "Language_tg": "ტაჯიკური",
-        "Language_th": "ტაილანდური",
-        "Language_ti": "ტიგრინია",
-        "Language_tk": "თურქმენული",
-        "Language_tn": "ტსვანა",
-        "Language_to": "ტონგანური",
-        "Language_tr": "თურქული",
-        "Language_tt": "თათრული",
-        "Language_tw": "თუი",
-        "Language_ug": "უიგურული",
-        "Language_uk": "უკრაინული",
-        "Language_ur": "ურდუ",
-        "Language_uz": "უზბეკური",
-        "Language_vi": "ვიეტნამური",
-        "Language_wo": "ვოლოფური",
-        "Language_xh": "ქსოზა",
-        "Language_yi": "იდიში",
-        "Language_yo": "იორუბა",
-        "Language_zh": "ჩინური",
-        "Language_zu": "ზულუ",
-        "LanguageCode": "ენის კოდი",
-        "PluginDescription": "იძლევა ანგარიშს მომხმარებლის სხვადასხვა პარამეტრებზე: ბრაუზერები, ბრაუზერის ოჯახი, ოპერაციული სისტემა, პლაგინები, რეზოლუცია, გლობალური პარამეტრები.",
-        "PluginDetectionDoesNotWorkInIE": "შენიშვნა: პლაგინების ამოცნობა არ ხდება ინტერნეტ ექსპლორერში. ეს რეპორტი მუშაოაბს მხოლოდ არა–IE ბრაუზერებზე.",
-        "Resolutions": "რეზოლუციები",
-        "VisitorSettings": "ვიზიტორის პარამეტრები",
-        "WidgetGlobalVisitors": "ვიზიტორების გლობალური კონფიგურაცია",
-        "WidgetPlugins": "პლაგინების სია",
-        "WidgetResolutions": "ეკრანის რეზოლუვიები"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/ko.json b/plugins/UserSettings/lang/ko.json
deleted file mode 100644
index 25a2077b83..0000000000
--- a/plugins/UserSettings/lang/ko.json
+++ /dev/null
@@ -1,202 +0,0 @@
-{
-    "UserSettings": {
-        "BrowserLanguage": "브라우저 언어",
-        "ColumnConfiguration": "구성",
-        "ColumnResolution": "해상도",
-        "Configurations": "구성",
-        "Language_aa": "아파르어",
-        "Language_ab": "압하스어",
-        "Language_ae": "아베스타어",
-        "Language_af": "아프리카어",
-        "Language_ak": "아칸어",
-        "Language_am": "암하라어",
-        "Language_an": "아라곤어",
-        "Language_ar": "아라비아어",
-        "Language_as": "아삼어",
-        "Language_av": "아바르어",
-        "Language_ay": "아이마라어",
-        "Language_az": "아제르바이잔어",
-        "Language_ba": "바슈키르어",
-        "Language_be": "벨라루스어",
-        "Language_bg": "불가리아어",
-        "Language_bh": "비하르어",
-        "Language_bi": "비슐라마어",
-        "Language_bm": "밤바라어",
-        "Language_bn": "벵골어",
-        "Language_bo": "티베트어",
-        "Language_br": "브르타뉴어",
-        "Language_bs": "보스니아어",
-        "Language_ca": "카탈루냐어",
-        "Language_ce": "체첸어",
-        "Language_ch": "차모로어",
-        "Language_co": "코르시카어",
-        "Language_cr": "크리어",
-        "Language_cs": "체코어",
-        "Language_cu": "슬라브어",
-        "Language_cv": "추바슈어",
-        "Language_cy": "웨일스어",
-        "Language_da": "덴마크어",
-        "Language_de": "독일어",
-        "Language_dv": "디베히어",
-        "Language_dz": "종카어",
-        "Language_ee": "에웨어",
-        "Language_el": "그리스어",
-        "Language_en": "영어",
-        "Language_eo": "에스페란토어",
-        "Language_es": "스페인어",
-        "Language_et": "에스토니아어",
-        "Language_eu": "바스크어",
-        "Language_fa": "페르시아어",
-        "Language_ff": "풀라어",
-        "Language_fi": "핀란드어",
-        "Language_fj": "피지어",
-        "Language_fo": "페로어",
-        "Language_fr": "프랑스어",
-        "Language_fy": "프리지아어",
-        "Language_ga": "아일랜드어",
-        "Language_gd": "게일어",
-        "Language_gl": "갈리시아어",
-        "Language_gn": "과라니어",
-        "Language_gu": "구자라트어",
-        "Language_gv": "맨어",
-        "Language_ha": "하우사어",
-        "Language_he": "히브리어",
-        "Language_hi": "힌디어",
-        "Language_ho": "히리모투어",
-        "Language_hr": "크로아티아어",
-        "Language_ht": "아이티크리올어",
-        "Language_hu": "헝가리어",
-        "Language_hy": "아르메니아어",
-        "Language_hz": "헤레로어",
-        "Language_ia": "국제어",
-        "Language_id": "인도네시아어",
-        "Language_ie": "인테르링구에",
-        "Language_ig": "이그보어",
-        "Language_ii": "쓰촨이어",
-        "Language_ik": "이누피아크어",
-        "Language_io": "이도",
-        "Language_is": "아이슬란드어",
-        "Language_it": "이탈리아어",
-        "Language_iu": "이누이트어",
-        "Language_ja": "일본어",
-        "Language_jv": "자바어",
-        "Language_ka": "조지아어",
-        "Language_kg": "콩고어",
-        "Language_ki": "키쿠유어",
-        "Language_kj": "콴야마어",
-        "Language_kk": "카자흐어",
-        "Language_kl": "그린란드어",
-        "Language_km": "중앙 크메르어",
-        "Language_kn": "칸나다어",
-        "Language_ko": "한국어",
-        "Language_kr": "카누리어",
-        "Language_ks": "카슈미르어",
-        "Language_ku": "쿠르드어",
-        "Language_kv": "코미어",
-        "Language_kw": "콘월어",
-        "Language_ky": "키르기스어",
-        "Language_la": "라틴어",
-        "Language_lb": "룩셈부르크어",
-        "Language_lg": "간다어",
-        "Language_li": "림뷔르흐어",
-        "Language_ln": "링갈라어",
-        "Language_lo": "라오어",
-        "Language_lt": "리투아니아어",
-        "Language_lu": "루바-카탕가어",
-        "Language_lv": "라트비아어",
-        "Language_mg": "마다가스카르어",
-        "Language_mh": "마셜어",
-        "Language_mi": "마오리어",
-        "Language_mk": "마케도니아어",
-        "Language_ml": "말라얄람어",
-        "Language_mn": "몽골어",
-        "Language_mr": "마라타어",
-        "Language_ms": "말라얄람어",
-        "Language_mt": "몰타어",
-        "Language_my": "버마어",
-        "Language_na": "나우루어",
-        "Language_nb": "노르웨이어",
-        "Language_nd": "은데벨레어",
-        "Language_ne": "네팔어",
-        "Language_ng": "은동가어",
-        "Language_nl": "네덜란드어",
-        "Language_nn": "노르웨이어 뉘노르스크",
-        "Language_no": "노르웨이어",
-        "Language_nr": "은데벨레어",
-        "Language_nv": "나바호어",
-        "Language_ny": "니안자어",
-        "Language_oc": "오크어",
-        "Language_oj": "오지브와어",
-        "Language_om": "오로모어",
-        "Language_or": "오리야어",
-        "Language_os": "오세트어",
-        "Language_pa": "펀자브어",
-        "Language_pi": "팔리어",
-        "Language_pl": "폴란드어",
-        "Language_ps": "파슈토어",
-        "Language_pt": "포르투갈어",
-        "Language_qu": "케추아어",
-        "Language_rm": "로망슈어",
-        "Language_rn": "룬디어",
-        "Language_ro": "루마니아어",
-        "Language_ru": "러시아어",
-        "Language_rw": "르완다어",
-        "Language_sa": "산스크리트어",
-        "Language_sc": "사르데냐어",
-        "Language_sd": "신드어",
-        "Language_se": "사미어",
-        "Language_sg": "상고어",
-        "Language_si": "싱할라어",
-        "Language_sk": "슬로바키아어",
-        "Language_sl": "슬로베니아어",
-        "Language_sm": "사모아어",
-        "Language_sn": "쇼나어",
-        "Language_so": "소말리어",
-        "Language_sq": "알바니아어",
-        "Language_sr": "세르비아어",
-        "Language_ss": "스와티어",
-        "Language_st": "소토어",
-        "Language_su": "순다어",
-        "Language_sv": "스웨덴어",
-        "Language_sw": "스와힐리어",
-        "Language_ta": "타밀어",
-        "Language_te": "텔루구어",
-        "Language_tg": "타지크어",
-        "Language_th": "타이어",
-        "Language_ti": "티그리냐어",
-        "Language_tk": "투르크멘어",
-        "Language_tl": "타갈로그어",
-        "Language_tn": "츠와나어",
-        "Language_to": "통가어",
-        "Language_tr": "터키어",
-        "Language_ts": "총가어",
-        "Language_tt": "타타르어",
-        "Language_tw": "트위어",
-        "Language_ty": "타히티어",
-        "Language_ug": "위구르어",
-        "Language_uk": "우크라이나어",
-        "Language_ur": "우르두어",
-        "Language_uz": "우즈베크어",
-        "Language_ve": "벤다어",
-        "Language_vi": "베트남어",
-        "Language_vo": "볼라퓌크어",
-        "Language_wa": "왈론어",
-        "Language_wo": "월로프어",
-        "Language_xh": "코사어",
-        "Language_yi": "이디시어",
-        "Language_yo": "요루바어",
-        "Language_za": "주앙어",
-        "Language_zh": "중국어",
-        "Language_zu": "줄루어",
-        "LanguageCode": "언어 코드",
-        "PluginDescription": "각종 사용자 설정 (브라우저, 브라우저 페밀리, 운영 시스템, 플러그인, 해상도, 일반 설정)를 보고합니다.",
-        "PluginDetectionDoesNotWorkInIE": "참고: Internet Explorer에서는 플러그인 검색이 작동하지 않습니다. 이 보고서는 IE 브라우저가 아닌것에 기반합니다.",
-        "Resolutions": "해상도",
-        "VisitorSettings": "방문자 설정",
-        "WidgetGlobalVisitors": "글로벌 방문자 구성",
-        "WidgetGlobalVisitorsDocumentation": "방문자의 가장 일반적인 사용 환경에 대한 보고서입니다. 운영 체제, 브라우저 종류와 화면 해상도의 조합으로 표시합니다.",
-        "WidgetPlugins": "플러그인 목록",
-        "WidgetPluginsDocumentation": "방문자가 사용하는 브라우저의 플러그인에 대한 보고서입니다. 컨텐츠에 대한 최적의 표시 방법을 선택하는 데 중요한 정보입니다.",
-        "WidgetResolutions": "스크린 해상도"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/lt.json b/plugins/UserSettings/lang/lt.json
deleted file mode 100644
index 321b8e4067..0000000000
--- a/plugins/UserSettings/lang/lt.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-    "UserSettings": {
-        "ColumnConfiguration": "Konfigūracija",
-        "ColumnResolution": "Ekrano raiška",
-        "Configurations": "Konfigūracijos",
-        "Language_aa": "afarų",
-        "Language_ab": "abchazų",
-        "Language_ae": "avestų",
-        "Language_af": "afrikanų",
-        "Language_ak": "akanų",
-        "Language_am": "amharų",
-        "Language_an": "aragonesų",
-        "Language_ar": "arabų",
-        "Language_as": "asamų",
-        "Language_av": "avarikų",
-        "Language_ay": "aimarų",
-        "Language_az": "azerbaidžaniečių",
-        "Language_ba": "baškirų",
-        "Language_be": "baltarusių",
-        "Language_bg": "bulgarų",
-        "Language_bh": "biharų",
-        "Language_bi": "bislama",
-        "Language_bm": "bambarų",
-        "Language_bn": "bengalų",
-        "Language_bo": "tibetiečių",
-        "Language_br": "bretonų",
-        "Language_bs": "bosnių",
-        "Language_ca": "katalonų",
-        "Language_ce": "čečėnų",
-        "Language_ch": "čamorų",
-        "Language_co": "korsikiečių",
-        "Language_cr": "kry",
-        "Language_cs": "čekų",
-        "Language_cu": "bažnytinė slavų",
-        "Language_cv": "čiuvašų",
-        "Language_cy": "valų",
-        "Language_da": "danų",
-        "Language_de": "vokiečių",
-        "Language_dv": "divehi",
-        "Language_dz": "svazilando",
-        "Language_ee": "eve",
-        "Language_el": "graikų",
-        "Language_en": "anglų",
-        "Language_eo": "esperanto",
-        "Language_es": "ispanų",
-        "Language_et": "estų",
-        "Language_eu": "baskų",
-        "Language_fa": "persų",
-        "Language_ff": "fulahų",
-        "Language_fi": "suomių",
-        "Language_fj": "fidžio",
-        "Language_fo": "farerų kalba",
-        "Language_fr": "prancūzų",
-        "Language_fy": "vakarų fryzų",
-        "Language_ga": "airių",
-        "Language_gd": "škotų (gėlų)",
-        "Language_gl": "galisų",
-        "Language_gn": "gvaranių",
-        "Language_gu": "gudžaratų",
-        "Language_gv": "manks",
-        "Language_ha": "hausų",
-        "Language_he": "hebrajų",
-        "Language_hi": "hindi",
-        "Language_ho": "hiri motu",
-        "Language_hr": "kroatų",
-        "Language_ht": "haičio",
-        "Language_hu": "vengrų",
-        "Language_hy": "armėnų",
-        "Language_hz": "herero",
-        "Language_ia": "interlingva",
-        "Language_id": "indoneziečių",
-        "Language_ie": "interkalba",
-        "Language_ig": "igbo",
-        "Language_ii": "sičuan ji",
-        "Language_ik": "inupiak",
-        "Language_io": "ido",
-        "Language_is": "islandų",
-        "Language_it": "italų",
-        "Language_iu": "inukitut",
-        "Language_ja": "japonų",
-        "Language_jv": "javiečių",
-        "Language_ka": "gruzinų",
-        "Language_kg": "kongo",
-        "Language_ki": "kikui",
-        "Language_kj": "kuaniama",
-        "Language_kk": "kazachų",
-        "Language_kl": "kalalisut",
-        "Language_km": "khmerų",
-        "Language_kn": "kanadų",
-        "Language_ko": "korėjiečių",
-        "Language_kr": "kanuri",
-        "Language_ks": "kašmyro",
-        "Language_ku": "kurdų",
-        "Language_kv": "komi",
-        "Language_kw": "kornų",
-        "Language_ky": "kirgizų",
-        "Language_la": "lotynų",
-        "Language_lb": "liuksemburgiečių",
-        "Language_lg": "ganda",
-        "Language_li": "limburgiš",
-        "Language_ln": "lingala",
-        "Language_lo": "laosiečių",
-        "Language_lt": "lietuvių",
-        "Language_lu": "luba katanga",
-        "Language_lv": "latvių",
-        "Language_mg": "malagasijos",
-        "Language_mh": "Maršalo salų",
-        "Language_mi": "maorių",
-        "Language_mk": "makedonų",
-        "Language_ml": "malajalių",
-        "Language_mn": "mongolų",
-        "Language_mr": "maratų",
-        "Language_ms": "malajiečių",
-        "Language_mt": "maltiečių",
-        "Language_my": "birmiečių",
-        "Language_na": "naurų",
-        "Language_nb": "Norvegijos bokmal",
-        "Language_nd": "šiaurės ndebelų",
-        "Language_ne": "nepalų",
-        "Language_ng": "ndongų",
-        "Language_nl": "olandų",
-        "Language_nn": "naujoji norvegų",
-        "Language_no": "norvegų",
-        "Language_nr": "pietų ndebele",
-        "Language_nv": "navajų",
-        "Language_ny": "nianja",
-        "Language_oc": "provansalų",
-        "Language_oj": "ojibva",
-        "Language_om": "oromo",
-        "Language_or": "orijų",
-        "Language_os": "osetinų",
-        "Language_pa": "pandžabų",
-        "Language_pi": "pali",
-        "Language_pl": "lenkų",
-        "Language_ps": "puštūnų",
-        "Language_pt": "portugalų",
-        "Language_qu": "kečujų",
-        "Language_rm": "raeto romanų",
-        "Language_rn": "rundi",
-        "Language_ro": "rumunų",
-        "Language_ru": "rusų",
-        "Language_rw": "kinjarvanda",
-        "Language_sa": "sanskritas",
-        "Language_sc": "sardiniečių",
-        "Language_sd": "sindų",
-        "Language_se": "šiaurinių samių",
-        "Language_sg": "sango",
-        "Language_si": "sinhalų",
-        "Language_sk": "slovakų",
-        "Language_sl": "slovėnų",
-        "Language_sm": "samoa",
-        "Language_sn": "šona",
-        "Language_so": "somalių",
-        "Language_sq": "albanų",
-        "Language_sr": "serbų",
-        "Language_ss": "svati",
-        "Language_st": "pietų sesuto",
-        "Language_su": "sundų",
-        "Language_sv": "švedų",
-        "Language_sw": "svahili",
-        "Language_ta": "tamilų",
-        "Language_te": "telugų",
-        "Language_tg": "tadžikų",
-        "Language_th": "tajų",
-        "Language_ti": "tigrajų",
-        "Language_tk": "turkmėnų",
-        "Language_tl": "tagalogų",
-        "Language_tn": "tsvana",
-        "Language_to": "tonga",
-        "Language_tr": "turkų",
-        "Language_ts": "tsonga",
-        "Language_tt": "totorių",
-        "Language_tw": "tvi",
-        "Language_ty": "taitiečių",
-        "Language_ug": "uigūrų",
-        "Language_uk": "ukrainiečių",
-        "Language_ur": "urdų",
-        "Language_uz": "uzbekų",
-        "Language_ve": "venda",
-        "Language_vi": "vietnamiečių",
-        "Language_vo": "volapiuk",
-        "Language_wa": "valonų",
-        "Language_wo": "volof",
-        "Language_xh": "kosų",
-        "Language_yi": "jidiš",
-        "Language_yo": "joruba",
-        "Language_za": "chuang",
-        "Language_zh": "kinų",
-        "Language_zu": "zulų",
-        "LanguageCode": "Kalbos kodas",
-        "PluginDescription": "Parodo įvairius lankytojo nustatymus: naršyklę, naršyklės šeimą, operacinę sistemą, papildinius, ekrano raišką, skiriamąją gebą, globalius nustatymus.",
-        "PluginDetectionDoesNotWorkInIE": "Pastaba: papildinio aptikimas neveikia Internet Explorer naršyklėje. Ši ataskaita bus sugeneruota tik kitose naršyklėse.",
-        "Resolutions": "Ekranų raiškos",
-        "VisitorSettings": "Lankytojų nustatymai",
-        "WidgetGlobalVisitors": "Bendri lankytojų nustatymai",
-        "WidgetPlugins": "Papildinių sąrašas",
-        "WidgetResolutions": "Ekrano raiška"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/lv.json b/plugins/UserSettings/lang/lv.json
deleted file mode 100644
index 30db114188..0000000000
--- a/plugins/UserSettings/lang/lv.json
+++ /dev/null
@@ -1,201 +0,0 @@
-{
-    "UserSettings": {
-        "ColumnConfiguration": "Konfigurācija",
-        "ColumnResolution": "Ekrāna izšķirtspēja",
-        "Configurations": "Konfigurācijas",
-        "Language_aa": "afāru",
-        "Language_ab": "abhāzu",
-        "Language_ae": "avesta",
-        "Language_af": "afrikandu",
-        "Language_ak": "akanu",
-        "Language_am": "amharu",
-        "Language_an": "aragoniešu",
-        "Language_ar": "arābu",
-        "Language_as": "asamiešu",
-        "Language_av": "avāru",
-        "Language_ay": "aimaru",
-        "Language_az": "azerbaidžāņu",
-        "Language_ba": "baškīru",
-        "Language_be": "baltkrievu",
-        "Language_bg": "bulgāru",
-        "Language_bh": "biharu",
-        "Language_bi": "bišlamā",
-        "Language_bm": "bambaru",
-        "Language_bn": "bengāļu",
-        "Language_bo": "tibetiešu",
-        "Language_br": "bretoņu",
-        "Language_bs": "bosniešu",
-        "Language_ca": "katalāņu",
-        "Language_ce": "čečenu",
-        "Language_ch": "čamorru",
-        "Language_co": "korsikāņu",
-        "Language_cr": "krī",
-        "Language_cs": "čehu",
-        "Language_cu": "baznīcslāvu",
-        "Language_cv": "čuvašu",
-        "Language_cy": "velsiešu",
-        "Language_da": "dāņu",
-        "Language_de": "vācu",
-        "Language_dv": "maldīviešu",
-        "Language_dz": "dzongke",
-        "Language_ee": "evu",
-        "Language_el": "grieķu",
-        "Language_en": "angļu",
-        "Language_eo": "esperanto",
-        "Language_es": "spāņu",
-        "Language_et": "igauņu",
-        "Language_eu": "basku",
-        "Language_fa": "persiešu",
-        "Language_ff": "fulu",
-        "Language_fi": "somu",
-        "Language_fj": "fidžiešu",
-        "Language_fo": "fēru",
-        "Language_fr": "franču",
-        "Language_fy": "rietumfrīzu",
-        "Language_ga": "īru",
-        "Language_gd": "gēlu",
-        "Language_gl": "galisiešu",
-        "Language_gn": "gvaranu",
-        "Language_gu": "gudžaratu",
-        "Language_gv": "meniešu",
-        "Language_ha": "hausu",
-        "Language_he": "ivrits",
-        "Language_hi": "hindi",
-        "Language_ho": "hirimotu",
-        "Language_hr": "horvātu",
-        "Language_ht": "haitiešu",
-        "Language_hu": "ungāru",
-        "Language_hy": "armēņu",
-        "Language_hz": "hereru",
-        "Language_ia": "interlingva",
-        "Language_id": "indonēziešu",
-        "Language_ie": "interlingve",
-        "Language_ig": "igbo",
-        "Language_ii": "Sičuaņas ji",
-        "Language_ik": "inupiaku",
-        "Language_io": "ido",
-        "Language_is": "īslandiešu",
-        "Language_it": "itāliešu",
-        "Language_iu": "inuītu",
-        "Language_ja": "japāņu",
-        "Language_jv": "javiešu",
-        "Language_ka": "gruzīnu",
-        "Language_kg": "kongu",
-        "Language_ki": "kikuju",
-        "Language_kj": "kvaņamu",
-        "Language_kk": "kazahu",
-        "Language_kl": "grenlandiešu",
-        "Language_km": "khmeru",
-        "Language_kn": "kannadu",
-        "Language_ko": "korejiešu",
-        "Language_kr": "kanuru",
-        "Language_ks": "kašmiriešu",
-        "Language_ku": "kurdu",
-        "Language_kv": "komiešu",
-        "Language_kw": "korniešu",
-        "Language_ky": "kirgīzu",
-        "Language_la": "latīņu",
-        "Language_lb": "luksemburgiešu",
-        "Language_lg": "gandu",
-        "Language_li": "limburgiešu",
-        "Language_ln": "lingala",
-        "Language_lo": "laosiešu",
-        "Language_lt": "lietuviešu",
-        "Language_lu": "lubakatanga",
-        "Language_lv": "latviešu",
-        "Language_mg": "malagasu",
-        "Language_mh": "māršaliešu",
-        "Language_mi": "maoru",
-        "Language_mk": "maķedoniešu",
-        "Language_ml": "malajalu",
-        "Language_mn": "mongoļu",
-        "Language_mr": "maratu",
-        "Language_ms": "malajiešu",
-        "Language_mt": "maltiešu",
-        "Language_my": "birmiešu",
-        "Language_na": "nauruiešu",
-        "Language_nb": "norvēģu bukmols",
-        "Language_nd": "ziemeļndebelu",
-        "Language_ne": "nepāliešu",
-        "Language_ng": "ndongu",
-        "Language_nl": "holandiešu",
-        "Language_nn": "jaunnorvēģu",
-        "Language_no": "norvēģu",
-        "Language_nr": "dienvidndebelu",
-        "Language_nv": "navahu",
-        "Language_ny": "čičeva",
-        "Language_oc": "oksitāņu",
-        "Language_oj": "odžibvu",
-        "Language_om": "oromu",
-        "Language_or": "orisiešu",
-        "Language_os": "osetīnu",
-        "Language_pa": "pandžabu",
-        "Language_pi": "pāli",
-        "Language_pl": "poļu",
-        "Language_ps": "puštu",
-        "Language_pt": "portugāļu",
-        "Language_qu": "kečvu",
-        "Language_rm": "retoromāņu",
-        "Language_rn": "rundu",
-        "Language_ro": "rumāņu",
-        "Language_ru": "krievu",
-        "Language_rw": "kiņaruanda",
-        "Language_sa": "sanskrits",
-        "Language_sc": "sardīniešu",
-        "Language_sd": "sindhu",
-        "Language_se": "ziemeļsāmu",
-        "Language_sg": "sangu",
-        "Language_si": "singāļu",
-        "Language_sk": "slovāku",
-        "Language_sl": "slovēņu",
-        "Language_sm": "samoāņu",
-        "Language_sn": "šonu",
-        "Language_so": "somāļu",
-        "Language_sq": "albāņu",
-        "Language_sr": "serbu",
-        "Language_ss": "svatu",
-        "Language_st": "sesoto",
-        "Language_su": "sundaniešu",
-        "Language_sv": "zviedru",
-        "Language_sw": "svahili",
-        "Language_ta": "tamilu",
-        "Language_te": "telugu",
-        "Language_tg": "tadžiku",
-        "Language_th": "taju",
-        "Language_ti": "tigrinja",
-        "Language_tk": "turkmēņu",
-        "Language_tl": "tagalu",
-        "Language_tn": "cvanu",
-        "Language_to": "tongu",
-        "Language_tr": "turku",
-        "Language_ts": "congu",
-        "Language_tt": "tatāru",
-        "Language_tw": "tvī",
-        "Language_ty": "taitiešu",
-        "Language_ug": "uiguru",
-        "Language_uk": "ukraiņu",
-        "Language_ur": "urdu",
-        "Language_uz": "uzbeku",
-        "Language_ve": "vendu",
-        "Language_vi": "vjetnamiešu",
-        "Language_vo": "volapiks",
-        "Language_wa": "valoņu",
-        "Language_wo": "volofu",
-        "Language_xh": "khosu",
-        "Language_yi": "jidišs",
-        "Language_yo": "jorubu",
-        "Language_za": "džuanu",
-        "Language_zh": "ķīniešu",
-        "Language_zu": "zulu",
-        "LanguageCode": "Valodas kods",
-        "PluginDescription": "Apskata dažādus lietotāju iestatījumus: pārlūku, pārlūku ģimeni, operētājsistēmu, spraudņus, ekrāna izšķirtspēju, globālos iestatījumus.",
-        "PluginDetectionDoesNotWorkInIE": "Piezīme: spraudņu noteikšana nedarbojas Internet Explorer pārlūkā. Šī atskaite ir bāzēta tikai uz ne-IE pārlūkiem.",
-        "Resolutions": "Ekrāna izšķirtspējas",
-        "VisitorSettings": "Apmeklētāju iestatījumi",
-        "WidgetGlobalVisitors": "Globālā apmeklētāju konfigurācija",
-        "WidgetGlobalVisitorsDocumentation": "Šajā atskaitē redzamas visbiežāk izmantotās apmeklētāju konfigurācijas. Konfigurācija ir operētājsistēmas, pārlūka tipa un ekrāna izšķirtspējas kombinācija.",
-        "WidgetPlugins": "Spraudņu saraksts",
-        "WidgetPluginsDocumentation": "Šajā atskaitē ir redzami pārlūku spraudņi, kuri bija ieslēgti apmeklētāju pārlūkos. Šī informācija ir svarīga, lai izvēlētos vislabāko veidu kā piegādāt saturu apmeklētājiem.",
-        "WidgetResolutions": "Ekrāna izšķirtspējas"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/nb.json b/plugins/UserSettings/lang/nb.json
deleted file mode 100644
index 3950648d83..0000000000
--- a/plugins/UserSettings/lang/nb.json
+++ /dev/null
@@ -1,198 +0,0 @@
-{
-    "UserSettings": {
-        "ColumnConfiguration": "Konfigurasjon",
-        "ColumnResolution": "Oppløsning",
-        "Configurations": "Konfigurasjon",
-        "Language_aa": "afar",
-        "Language_ab": "abkhasisk",
-        "Language_ae": "avestisk",
-        "Language_af": "afrikaans",
-        "Language_ak": "akan",
-        "Language_am": "amharisk",
-        "Language_an": "aragonsk",
-        "Language_ar": "arabisk",
-        "Language_as": "assamisk",
-        "Language_av": "avarisk",
-        "Language_ay": "aymara",
-        "Language_az": "aserbajdsjansk",
-        "Language_ba": "basjkirsk",
-        "Language_be": "hviterussisk",
-        "Language_bg": "bulgarsk",
-        "Language_bh": "bihari",
-        "Language_bi": "bislama",
-        "Language_bm": "bambara",
-        "Language_bn": "bengali",
-        "Language_bo": "tibetansk",
-        "Language_br": "bretonsk",
-        "Language_bs": "bosnisk",
-        "Language_ca": "katalansk",
-        "Language_ce": "tsjetsjensk",
-        "Language_ch": "chamorro",
-        "Language_co": "korsikansk",
-        "Language_cr": "cree",
-        "Language_cs": "tsjekkisk",
-        "Language_cu": "kirkeslavisk",
-        "Language_cv": "tsjuvansk",
-        "Language_cy": "walisisk",
-        "Language_da": "dansk",
-        "Language_de": "tysk",
-        "Language_dv": "divehi",
-        "Language_dz": "dzongkha",
-        "Language_ee": "ewe",
-        "Language_el": "gresk",
-        "Language_en": "engelsk",
-        "Language_eo": "esperanto",
-        "Language_es": "spansk",
-        "Language_et": "estisk",
-        "Language_eu": "baskisk",
-        "Language_fa": "persisk",
-        "Language_ff": "fulani",
-        "Language_fi": "finsk",
-        "Language_fj": "fijiansk",
-        "Language_fo": "færøysk",
-        "Language_fr": "fransk",
-        "Language_fy": "vestfrisisk",
-        "Language_ga": "irsk",
-        "Language_gd": "skotsk gælisk",
-        "Language_gl": "galisisk",
-        "Language_gn": "guarani",
-        "Language_gu": "gujarati",
-        "Language_gv": "manx",
-        "Language_ha": "hausa",
-        "Language_he": "hebraisk",
-        "Language_hi": "hindi",
-        "Language_ho": "hiri motu",
-        "Language_hr": "kroatisk",
-        "Language_ht": "haitisk",
-        "Language_hu": "ungarsk",
-        "Language_hy": "armensk",
-        "Language_hz": "herero",
-        "Language_ia": "interlingua",
-        "Language_id": "indonesisk",
-        "Language_ie": "interlingue",
-        "Language_ig": "ibo",
-        "Language_ii": "sichuan-yi",
-        "Language_ik": "inupiak",
-        "Language_io": "ido",
-        "Language_is": "islandsk",
-        "Language_it": "italiensk",
-        "Language_iu": "inuktitut",
-        "Language_ja": "japansk",
-        "Language_jv": "javanesisk",
-        "Language_ka": "georgisk",
-        "Language_kg": "kikongo",
-        "Language_ki": "kikuyu",
-        "Language_kj": "kuanyama",
-        "Language_kk": "kasakhisk",
-        "Language_kl": "grønlandsk",
-        "Language_km": "khmer",
-        "Language_kn": "kannada",
-        "Language_ko": "koreansk",
-        "Language_kr": "kanuri",
-        "Language_ks": "kasjmiri",
-        "Language_ku": "kurdisk",
-        "Language_kv": "komi",
-        "Language_kw": "kornisk",
-        "Language_ky": "kirgisisk",
-        "Language_la": "latin",
-        "Language_lb": "luxemburgsk",
-        "Language_lg": "ganda",
-        "Language_li": "limburgisk",
-        "Language_ln": "lingala",
-        "Language_lo": "laotisk",
-        "Language_lt": "litauisk",
-        "Language_lu": "luba-katanga",
-        "Language_lv": "latvisk",
-        "Language_mg": "madagassisk",
-        "Language_mh": "marshallesisk",
-        "Language_mi": "maori",
-        "Language_mk": "makedonsk",
-        "Language_ml": "malayalam",
-        "Language_mn": "mongolsk",
-        "Language_mr": "marathi",
-        "Language_ms": "malayisk",
-        "Language_mt": "maltesisk",
-        "Language_my": "burmesisk",
-        "Language_na": "nauru",
-        "Language_nb": "norsk bokmål",
-        "Language_nd": "nord-ndebele",
-        "Language_ne": "nepalsk",
-        "Language_ng": "ndonga",
-        "Language_nl": "nederlandsk",
-        "Language_nn": "norsk nynorsk",
-        "Language_no": "norsk",
-        "Language_nr": "sør-ndebele",
-        "Language_nv": "navajo",
-        "Language_ny": "nyanja",
-        "Language_oc": "oksitansk",
-        "Language_oj": "ojibwa",
-        "Language_om": "oromo",
-        "Language_or": "oriya",
-        "Language_os": "ossetisk",
-        "Language_pa": "panjabi",
-        "Language_pi": "pali",
-        "Language_pl": "polsk",
-        "Language_ps": "pashto",
-        "Language_pt": "portugisisk",
-        "Language_qu": "quechua",
-        "Language_rm": "retoromansk",
-        "Language_rn": "rundi",
-        "Language_ro": "rumensk",
-        "Language_ru": "russisk",
-        "Language_rw": "kinjarwanda",
-        "Language_sa": "sanskrit",
-        "Language_sc": "sardinsk",
-        "Language_sd": "sindhi",
-        "Language_se": "nordsamisk",
-        "Language_sg": "sango",
-        "Language_si": "singalesisk",
-        "Language_sk": "slovakisk",
-        "Language_sl": "slovensk",
-        "Language_sm": "samoansk",
-        "Language_sn": "shona",
-        "Language_so": "somali",
-        "Language_sq": "albansk",
-        "Language_sr": "serbisk",
-        "Language_ss": "swati",
-        "Language_st": "sør-sotho",
-        "Language_su": "sundanesisk",
-        "Language_sv": "svensk",
-        "Language_sw": "swahili",
-        "Language_ta": "tamil",
-        "Language_te": "telugu",
-        "Language_tg": "tadsjikisk",
-        "Language_th": "thai",
-        "Language_ti": "tigrinja",
-        "Language_tk": "turkmensk",
-        "Language_tl": "tagalog",
-        "Language_tn": "setswana",
-        "Language_to": "tongansk",
-        "Language_tr": "tyrkisk",
-        "Language_ts": "tsonga",
-        "Language_tt": "tatarisk",
-        "Language_tw": "twi",
-        "Language_ty": "tahitisk",
-        "Language_ug": "uigurisk",
-        "Language_uk": "ukrainsk",
-        "Language_ur": "urdu",
-        "Language_uz": "usbekisk",
-        "Language_ve": "venda",
-        "Language_vi": "vietnamesisk",
-        "Language_vo": "volapyk",
-        "Language_wa": "vallonsk",
-        "Language_wo": "wolof",
-        "Language_xh": "xhosa",
-        "Language_yi": "jiddisk",
-        "Language_yo": "joruba",
-        "Language_za": "zhuang",
-        "Language_zh": "kinesisk",
-        "Language_zu": "zulu",
-        "LanguageCode": "Språkkode",
-        "PluginDescription": "Rapporterer forskjellige brukerinnstillinger: Nettleser, nettleserfamilie, operativsystem, tillegg, oppløsning, globale innstillinger.",
-        "Resolutions": "Oppløsninger",
-        "VisitorSettings": "Besøkendes innstillinger",
-        "WidgetGlobalVisitors": "Besøkendes konfigurasjon",
-        "WidgetPlugins": "Liste over tillegg",
-        "WidgetResolutions": "Skjermoppløsninger"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/nl.json b/plugins/UserSettings/lang/nl.json
deleted file mode 100644
index 1f90affe5a..0000000000
--- a/plugins/UserSettings/lang/nl.json
+++ /dev/null
@@ -1,204 +0,0 @@
-{
-    "UserSettings": {
-        "BrowserLanguage": "Browsertaal",
-        "BrowserWithNoPluginsEnabled": "%1$s zonder plugins ingeschakeld",
-        "BrowserWithPluginsEnabled": "%1$s met plugins %2$s ingeschakeld",
-        "ColumnConfiguration": "Configuratie",
-        "ColumnResolution": "Resolutie",
-        "Configurations": "Configuraties",
-        "Language_aa": "Afar",
-        "Language_ab": "Abchazisch",
-        "Language_ae": "Avestisch",
-        "Language_af": "Afrikaans",
-        "Language_ak": "Akan",
-        "Language_am": "Amhaars",
-        "Language_an": "Aragonees",
-        "Language_ar": "Arabisch",
-        "Language_as": "Assamees",
-        "Language_av": "Avarisch",
-        "Language_ay": "Aymara",
-        "Language_az": "Azerbeidzjaans",
-        "Language_ba": "Basjkiers",
-        "Language_be": "Wit-Russisch",
-        "Language_bg": "Bulgaars",
-        "Language_bh": "Bihari",
-        "Language_bi": "Bislama",
-        "Language_bm": "Bambara",
-        "Language_bn": "Bengalees",
-        "Language_bo": "Tibetaans",
-        "Language_br": "Bretons",
-        "Language_bs": "Bosnisch",
-        "Language_ca": "Catalaans",
-        "Language_ce": "Chechen",
-        "Language_ch": "Chamorro",
-        "Language_co": "Corsicaans",
-        "Language_cr": "Cree",
-        "Language_cs": "Tsjechisch",
-        "Language_cu": "Kerkslavisch",
-        "Language_cv": "Tsjoevasjisch",
-        "Language_cy": "Welsh",
-        "Language_da": "Deens",
-        "Language_de": "Duits",
-        "Language_dv": "Divehi",
-        "Language_dz": "Dzongkha",
-        "Language_ee": "Ewe",
-        "Language_el": "Grieks",
-        "Language_en": "Engels",
-        "Language_eo": "Esperanto",
-        "Language_es": "Spaans",
-        "Language_et": "Estlands",
-        "Language_eu": "Baskisch",
-        "Language_fa": "Perzisch",
-        "Language_ff": "Fulah",
-        "Language_fi": "Fins",
-        "Language_fj": "Fijisch",
-        "Language_fo": "Faeröers",
-        "Language_fr": "Frans",
-        "Language_fy": "Fries",
-        "Language_ga": "Iers",
-        "Language_gd": "Schots Gaelic",
-        "Language_gl": "Galicisch",
-        "Language_gn": "Guarani",
-        "Language_gu": "Gujarati",
-        "Language_gv": "Manx",
-        "Language_ha": "Hausa",
-        "Language_he": "Hebreeuws",
-        "Language_hi": "Hindi",
-        "Language_ho": "Hiri Motu",
-        "Language_hr": "Kroatisch",
-        "Language_ht": "Haïtiaans",
-        "Language_hu": "Hongaars",
-        "Language_hy": "Armeens",
-        "Language_hz": "Herero",
-        "Language_ia": "Interlingua",
-        "Language_id": "Indonesisch",
-        "Language_ie": "Interlingue",
-        "Language_ig": "Igbo",
-        "Language_ii": "Sichuan Yi",
-        "Language_ik": "Inupiaq",
-        "Language_io": "Ido",
-        "Language_is": "IJslands",
-        "Language_it": "Italiaans",
-        "Language_iu": "Inuktitut",
-        "Language_ja": "Japans",
-        "Language_jv": "Javaans",
-        "Language_ka": "Georgisch",
-        "Language_kg": "Kongo",
-        "Language_ki": "Kikuyu",
-        "Language_kj": "Kuanyama",
-        "Language_kk": "Kazachs",
-        "Language_kl": "Kalaallisut",
-        "Language_km": "Khmer",
-        "Language_kn": "Kannada",
-        "Language_ko": "Koreaans",
-        "Language_kr": "Kanuri",
-        "Language_ks": "Kashmiri",
-        "Language_ku": "Koerdisch",
-        "Language_kv": "Komi",
-        "Language_kw": "Cornish",
-        "Language_ky": "Kirgizisch",
-        "Language_la": "Latijn",
-        "Language_lb": "Luxemburgs",
-        "Language_lg": "Ganda",
-        "Language_li": "Limburgs",
-        "Language_ln": "Lingala",
-        "Language_lo": "Lao",
-        "Language_lt": "Litouws",
-        "Language_lu": "Luba-Katanga",
-        "Language_lv": "Letlands",
-        "Language_mg": "Malagasisch",
-        "Language_mh": "Marshallees",
-        "Language_mi": "Maori",
-        "Language_mk": "Macedonisch",
-        "Language_ml": "Malayalam",
-        "Language_mn": "Mongools",
-        "Language_mr": "Marathi",
-        "Language_ms": "Maleis",
-        "Language_mt": "Maltees",
-        "Language_my": "Birmees",
-        "Language_na": "Nauru",
-        "Language_nb": "Noors - Bokmål",
-        "Language_nd": "Noord-Ndbele",
-        "Language_ne": "Nepalees",
-        "Language_ng": "Ndonga",
-        "Language_nl": "Nederlands",
-        "Language_nn": "Noors - Nynorsk",
-        "Language_no": "Noors",
-        "Language_nr": "Zuid-Ndbele",
-        "Language_nv": "Navajo",
-        "Language_ny": "Nyanja",
-        "Language_oc": "Occitaans",
-        "Language_oj": "Ojibwa",
-        "Language_om": "Oromo",
-        "Language_or": "Oriya",
-        "Language_os": "Ossetisch",
-        "Language_pa": "Punjabi",
-        "Language_pi": "Pali",
-        "Language_pl": "Pools",
-        "Language_ps": "Pasjtoe",
-        "Language_pt": "Portugees",
-        "Language_qu": "Quechua",
-        "Language_rm": "Reto-Romaans",
-        "Language_rn": "Rundi",
-        "Language_ro": "Roemeens",
-        "Language_ru": "Russisch",
-        "Language_rw": "Kinyarwanda",
-        "Language_sa": "Sanskriet",
-        "Language_sc": "Sardinisch",
-        "Language_sd": "Sindhi",
-        "Language_se": "Noord-Samisch",
-        "Language_sg": "Sango",
-        "Language_si": "Singalees",
-        "Language_sk": "Slowaaks",
-        "Language_sl": "Sloveens",
-        "Language_sm": "Samoaans",
-        "Language_sn": "Shona",
-        "Language_so": "Somalisch",
-        "Language_sq": "Albanees",
-        "Language_sr": "Servisch",
-        "Language_ss": "Swati",
-        "Language_st": "Zuid-Sotho",
-        "Language_su": "Soendanees",
-        "Language_sv": "Zweeds",
-        "Language_sw": "Swahili",
-        "Language_ta": "Tamil",
-        "Language_te": "Teloegoe",
-        "Language_tg": "Tadzjieks",
-        "Language_th": "Thais",
-        "Language_ti": "Tigrinya",
-        "Language_tk": "Turkmeens",
-        "Language_tl": "Tagalog",
-        "Language_tn": "Tswana",
-        "Language_to": "Tonga",
-        "Language_tr": "Turks",
-        "Language_ts": "Tsonga",
-        "Language_tt": "Tataars",
-        "Language_tw": "Twi",
-        "Language_ty": "Tahitisch",
-        "Language_ug": "Oeigoers",
-        "Language_uk": "Oekraïens",
-        "Language_ur": "Urdu",
-        "Language_uz": "Oezbeeks",
-        "Language_ve": "Venda",
-        "Language_vi": "Vietnamees",
-        "Language_vo": "Volapük",
-        "Language_wa": "Wallonisch",
-        "Language_wo": "Wolof",
-        "Language_xh": "Xhosa",
-        "Language_yi": "Jiddisch",
-        "Language_yo": "Yoruba",
-        "Language_za": "Zhuang",
-        "Language_zh": "Chinees",
-        "Language_zu": "Zulu",
-        "LanguageCode": "Taal code",
-        "PluginDescription": "Rapporteert verschillende gebruikers instellingen: Browser, Browser familie, Besturingssysteem, Plugins, Resolutie, Globale Instellingen.",
-        "PluginDetectionDoesNotWorkInIE": "Opmerking: plugin detectie werkt niet in Internet Explorer. Het rapport is alleen gebaseerd op andere browsers dan IE",
-        "Resolutions": "Schermresoluties",
-        "VisitorSettings": "Bezoekers Instellingen",
-        "WidgetGlobalVisitors": "Algemene configuratie",
-        "WidgetGlobalVisitorsDocumentation": "Dit rapport toont de meest voorkomende configuraties die uw bezoekers hadden. Een configuratie is de combinatie van een besturingssysteem, een browser type en een schermresolutie.",
-        "WidgetPlugins": "Geïnstalleerde plugins",
-        "WidgetPluginsDocumentation": "Dit rapport laat zien welke browserplugins uw bezoekers haden geïnstalleerd. Deze informatie kan van belang zijn voor het kiezen van de juiste manier om uw content aan te bieden.",
-        "WidgetResolutions": "Schermresoluties"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/nn.json b/plugins/UserSettings/lang/nn.json
deleted file mode 100644
index aa24a3f364..0000000000
--- a/plugins/UserSettings/lang/nn.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-    "UserSettings": {
-        "ColumnConfiguration": "Konfigurasjon",
-        "ColumnResolution": "Oppløysing",
-        "Configurations": "Konfigurasjonar",
-        "Language_aa": "afar",
-        "Language_ab": "abkhasisk",
-        "Language_ae": "avestisk",
-        "Language_af": "afrikaans",
-        "Language_ak": "akan",
-        "Language_am": "amharisk",
-        "Language_an": "aragonsk",
-        "Language_ar": "arabisk",
-        "Language_as": "assamisk",
-        "Language_av": "avarisk",
-        "Language_ay": "aymara",
-        "Language_az": "aserbajdsjansk",
-        "Language_ba": "basjkirsk",
-        "Language_be": "kviterussisk",
-        "Language_bg": "bulgarsk",
-        "Language_bh": "bihari",
-        "Language_bi": "bislama",
-        "Language_bm": "bambara",
-        "Language_bn": "bengali",
-        "Language_bo": "tibetansk",
-        "Language_br": "bretonsk",
-        "Language_bs": "bosnisk",
-        "Language_ca": "katalansk",
-        "Language_ce": "tsjetsjensk",
-        "Language_ch": "chamorro",
-        "Language_co": "korsikansk",
-        "Language_cr": "cree",
-        "Language_cs": "tsjekkisk",
-        "Language_cu": "kyrkjeslavisk",
-        "Language_cv": "tsjuvansk",
-        "Language_cy": "walisisk",
-        "Language_da": "dansk",
-        "Language_de": "tysk",
-        "Language_dv": "divehi",
-        "Language_dz": "dzongkha",
-        "Language_ee": "ewe",
-        "Language_el": "gresk",
-        "Language_en": "engelsk",
-        "Language_eo": "esperanto",
-        "Language_es": "spansk",
-        "Language_et": "estisk",
-        "Language_eu": "baskisk",
-        "Language_fa": "persisk",
-        "Language_ff": "fulani",
-        "Language_fi": "finsk",
-        "Language_fj": "fijiansk",
-        "Language_fo": "færøysk",
-        "Language_fr": "fransk",
-        "Language_fy": "vestfrisisk",
-        "Language_ga": "irsk",
-        "Language_gd": "skotsk-gælisk",
-        "Language_gl": "galicisk",
-        "Language_gn": "guarani",
-        "Language_gu": "gujarati",
-        "Language_gv": "manx",
-        "Language_ha": "hausa",
-        "Language_he": "hebraisk",
-        "Language_hi": "hindi",
-        "Language_ho": "hiri motu",
-        "Language_hr": "kroatisk",
-        "Language_ht": "haitisk",
-        "Language_hu": "ungarsk",
-        "Language_hy": "armensk",
-        "Language_hz": "herero",
-        "Language_ia": "interlingua",
-        "Language_id": "indonesisk",
-        "Language_ie": "interlingue",
-        "Language_ig": "ibo",
-        "Language_ii": "sichuan-yi",
-        "Language_ik": "inupiak",
-        "Language_io": "ido",
-        "Language_is": "islandsk",
-        "Language_it": "italiensk",
-        "Language_iu": "inuktitut",
-        "Language_ja": "japansk",
-        "Language_jv": "javanesisk",
-        "Language_ka": "georgisk",
-        "Language_kg": "kikongo",
-        "Language_ki": "kikuyu",
-        "Language_kj": "kuanyama",
-        "Language_kk": "kasakhisk",
-        "Language_kl": "kalaallisut; grønlandsk",
-        "Language_km": "khmer",
-        "Language_kn": "kannada",
-        "Language_ko": "koreansk",
-        "Language_kr": "kanuri",
-        "Language_ks": "kasjmiri",
-        "Language_ku": "kurdisk",
-        "Language_kv": "komi",
-        "Language_kw": "kornisk",
-        "Language_ky": "kirgisisk",
-        "Language_la": "latin",
-        "Language_lb": "luxemburgsk",
-        "Language_lg": "ganda",
-        "Language_li": "limburgisk",
-        "Language_ln": "lingala",
-        "Language_lo": "laotisk",
-        "Language_lt": "litauisk",
-        "Language_lu": "luba-katanga",
-        "Language_lv": "latvisk",
-        "Language_mg": "madagassisk",
-        "Language_mh": "marshallesisk",
-        "Language_mi": "maori",
-        "Language_mk": "makedonsk",
-        "Language_ml": "malayalam",
-        "Language_mn": "mongolsk",
-        "Language_mr": "marathi",
-        "Language_ms": "malayisk",
-        "Language_mt": "maltesisk",
-        "Language_my": "burmesisk",
-        "Language_na": "nauru",
-        "Language_nb": "bokmål",
-        "Language_nd": "nord-ndebele",
-        "Language_ne": "nepalsk",
-        "Language_ng": "ndonga",
-        "Language_nl": "nederlandsk",
-        "Language_nn": "nynorsk",
-        "Language_no": "norsk",
-        "Language_nr": "sør-ndebele",
-        "Language_nv": "navajo",
-        "Language_ny": "nyanja",
-        "Language_oc": "oksitansk",
-        "Language_oj": "ojibwa",
-        "Language_om": "oromo",
-        "Language_or": "oriya",
-        "Language_os": "ossetisk",
-        "Language_pa": "panjabi",
-        "Language_pi": "pali",
-        "Language_pl": "polsk",
-        "Language_ps": "pashto",
-        "Language_pt": "portugisisk",
-        "Language_qu": "quechua",
-        "Language_rm": "retoromansk",
-        "Language_rn": "rundi",
-        "Language_ro": "rumensk",
-        "Language_ru": "russisk",
-        "Language_rw": "kinjarwanda",
-        "Language_sa": "sanskrit",
-        "Language_sc": "sardinsk",
-        "Language_sd": "sindhi",
-        "Language_se": "nordsamisk",
-        "Language_sg": "sango",
-        "Language_si": "singalesisk",
-        "Language_sk": "slovakisk",
-        "Language_sl": "slovensk",
-        "Language_sm": "samoansk",
-        "Language_sn": "shona",
-        "Language_so": "somali",
-        "Language_sq": "albansk",
-        "Language_sr": "serbisk",
-        "Language_ss": "swati",
-        "Language_st": "sørsotho",
-        "Language_su": "sundanesisk",
-        "Language_sv": "svensk",
-        "Language_sw": "swahili",
-        "Language_ta": "tamil",
-        "Language_te": "telugu",
-        "Language_tg": "tatsjikisk",
-        "Language_th": "thai",
-        "Language_ti": "tigrinja",
-        "Language_tk": "turkmensk",
-        "Language_tl": "tagalog",
-        "Language_tn": "tswana",
-        "Language_to": "tonga (Tonga-øyane)",
-        "Language_tr": "tyrkisk",
-        "Language_ts": "tsonga",
-        "Language_tt": "tatarisk",
-        "Language_tw": "twi",
-        "Language_ty": "tahitisk",
-        "Language_ug": "uigurisk",
-        "Language_uk": "ukrainsk",
-        "Language_ur": "urdu",
-        "Language_uz": "usbekisk",
-        "Language_ve": "venda",
-        "Language_vi": "vietnamesisk",
-        "Language_vo": "volapyk",
-        "Language_wa": "vallonsk",
-        "Language_wo": "wolof",
-        "Language_xh": "xhosa",
-        "Language_yi": "jiddisk",
-        "Language_yo": "joruba",
-        "Language_za": "zhuang",
-        "Language_zh": "kinesisk",
-        "Language_zu": "zulu",
-        "LanguageCode": "Språkkode",
-        "PluginDescription": "Rapporter diverse vitjarinnstillingar: Nettlesar, Nettlesarfamilie, operativsystem, oppløysing og globale innstillingar.",
-        "PluginDetectionDoesNotWorkInIE": "Merk: Registrering av innstikk virkar ikkje i Internet Explorer. Denne rapporten er berre basert på andre nettlesarar enn IE.",
-        "Resolutions": "Oppløysingar",
-        "VisitorSettings": "Vitjarinnstillingar",
-        "WidgetGlobalVisitors": "Global vitjarkonfigurasjon",
-        "WidgetPlugins": "Liste over innstikk",
-        "WidgetResolutions": "Skjermoppløysing"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/pl.json b/plugins/UserSettings/lang/pl.json
deleted file mode 100644
index 69bc0e0122..0000000000
--- a/plugins/UserSettings/lang/pl.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-    "UserSettings": {
-        "BrowserLanguage": "Język przeglądarki",
-        "ColumnConfiguration": "Konfiguracja",
-        "ColumnResolution": "Rozdzielczość",
-        "Configurations": "Konfiguracje",
-        "Language_aa": "afar",
-        "Language_ab": "abchaski",
-        "Language_ae": "awestyjski",
-        "Language_af": "afrikaans",
-        "Language_ak": "akan",
-        "Language_am": "amharski",
-        "Language_an": "aragoński",
-        "Language_ar": "arabski",
-        "Language_as": "asamski",
-        "Language_av": "awarski",
-        "Language_ay": "ajmara",
-        "Language_az": "azerski",
-        "Language_ba": "baszkirski",
-        "Language_be": "białoruski",
-        "Language_bg": "bułgarski",
-        "Language_bh": "biharski",
-        "Language_bi": "Bislama",
-        "Language_bm": "bambara",
-        "Language_bn": "bengalski",
-        "Language_bo": "tybetański",
-        "Language_br": "bretoński",
-        "Language_bs": "bośniacki",
-        "Language_ca": "kataloński",
-        "Language_ce": "czeczeński",
-        "Language_ch": "chamorro",
-        "Language_co": "korsykański",
-        "Language_cr": "kri",
-        "Language_cs": "czeski",
-        "Language_cu": "staro-cerkiewno-słowiański",
-        "Language_cv": "czuwaski",
-        "Language_cy": "walijski",
-        "Language_da": "duński",
-        "Language_de": "niemiecki",
-        "Language_dv": "malediwski",
-        "Language_dz": "dzongkha",
-        "Language_ee": "ewe",
-        "Language_el": "grecki",
-        "Language_en": "angielski",
-        "Language_eo": "esperanto",
-        "Language_es": "hiszpański",
-        "Language_et": "estoński",
-        "Language_eu": "baskijski",
-        "Language_fa": "perski",
-        "Language_ff": "fulani",
-        "Language_fi": "fiński",
-        "Language_fj": "fidżijski",
-        "Language_fo": "farerski",
-        "Language_fr": "francuski",
-        "Language_fy": "fryzyjski",
-        "Language_ga": "irlandzki",
-        "Language_gd": "szkocki gaelicki",
-        "Language_gl": "galisyjski",
-        "Language_gn": "guarani",
-        "Language_gu": "gudźaracki",
-        "Language_gv": "manx",
-        "Language_ha": "hausa",
-        "Language_he": "hebrajski",
-        "Language_hi": "hindi",
-        "Language_ho": "hiri motu",
-        "Language_hr": "chorwacki",
-        "Language_ht": "haitański",
-        "Language_hu": "węgierski",
-        "Language_hy": "ormiański",
-        "Language_hz": "herero",
-        "Language_ia": "interlingua",
-        "Language_id": "indonezyjski",
-        "Language_ie": "interlingue",
-        "Language_ig": "igbo",
-        "Language_ii": "syczuański",
-        "Language_ik": "inupiak",
-        "Language_io": "ido",
-        "Language_is": "islandzki",
-        "Language_it": "włoski",
-        "Language_iu": "inuktitut",
-        "Language_ja": "japoński",
-        "Language_jv": "jawajski",
-        "Language_ka": "gruziński",
-        "Language_kg": "kongo",
-        "Language_ki": "kikuju",
-        "Language_kj": "kwanyama",
-        "Language_kk": "kazachski",
-        "Language_kl": "grenlandzki",
-        "Language_km": "khmerski",
-        "Language_kn": "kannada",
-        "Language_ko": "koreański",
-        "Language_kr": "kanuri",
-        "Language_ks": "kaszmirski",
-        "Language_ku": "kurdyjski",
-        "Language_kv": "komi",
-        "Language_kw": "kornijski",
-        "Language_ky": "kirgiski",
-        "Language_la": "łaciński",
-        "Language_lb": "luksemburski",
-        "Language_lg": "ganda",
-        "Language_li": "limburgijski",
-        "Language_ln": "lingala",
-        "Language_lo": "laotański",
-        "Language_lt": "litewski",
-        "Language_lu": "luba-katanga",
-        "Language_lv": "łotewski",
-        "Language_mg": "malgaski",
-        "Language_mh": "marshall",
-        "Language_mi": "maoryjski",
-        "Language_mk": "macedoński",
-        "Language_ml": "malajalam",
-        "Language_mn": "mongolski",
-        "Language_mr": "marathi",
-        "Language_ms": "malajski",
-        "Language_mt": "maltański",
-        "Language_my": "birmański",
-        "Language_na": "nauru",
-        "Language_nb": "norweski Bokmål",
-        "Language_nd": "ndebele północny",
-        "Language_ne": "nepalski",
-        "Language_ng": "ndonga",
-        "Language_nl": "niderlandzki",
-        "Language_nn": "norweski Nynorsk",
-        "Language_no": "norweski",
-        "Language_nr": "ndebele południowy",
-        "Language_nv": "nawaho",
-        "Language_ny": "njandża",
-        "Language_oc": "prowansalski",
-        "Language_oj": "odżibwa",
-        "Language_om": "oromski",
-        "Language_or": "orija",
-        "Language_os": "osetyjski",
-        "Language_pa": "pendżabski",
-        "Language_pi": "palijski",
-        "Language_pl": "polski",
-        "Language_ps": "paszto",
-        "Language_pt": "portugalski",
-        "Language_qu": "keczua",
-        "Language_rm": "retoromański",
-        "Language_rn": "rundi",
-        "Language_ro": "rumuński",
-        "Language_ru": "rosyjski",
-        "Language_rw": "kinya-ruanda",
-        "Language_sa": "sanskryt",
-        "Language_sc": "sardyński",
-        "Language_sd": "sindhi",
-        "Language_se": "lapoński północny",
-        "Language_sg": "sango",
-        "Language_si": "syngaleski",
-        "Language_sk": "słowacki",
-        "Language_sl": "słoweński",
-        "Language_sm": "samoański",
-        "Language_sn": "szona",
-        "Language_so": "somalijski",
-        "Language_sq": "albański",
-        "Language_sr": "serbski",
-        "Language_ss": "siswati",
-        "Language_st": "sotho południowy",
-        "Language_su": "sundajski",
-        "Language_sv": "szwedzki",
-        "Language_sw": "suahili",
-        "Language_ta": "tamilski",
-        "Language_te": "telugu",
-        "Language_tg": "tadżycki",
-        "Language_th": "tajski",
-        "Language_ti": "tigrinia",
-        "Language_tk": "turkmeński",
-        "Language_tl": "tagalski",
-        "Language_tn": "setswana",
-        "Language_to": "tonga",
-        "Language_tr": "turecki",
-        "Language_ts": "tsonga",
-        "Language_tt": "tatarski",
-        "Language_tw": "twi",
-        "Language_ty": "tahitański",
-        "Language_ug": "ujgurski",
-        "Language_uk": "ukraiński",
-        "Language_ur": "urdu",
-        "Language_uz": "uzbecki",
-        "Language_ve": "venda",
-        "Language_vi": "wietnamski",
-        "Language_vo": "volapuk",
-        "Language_wa": "waloński",
-        "Language_wo": "wolof",
-        "Language_xh": "khosa",
-        "Language_yi": "jidysz",
-        "Language_yo": "joruba",
-        "Language_za": "czuang",
-        "Language_zh": "chiński",
-        "Language_zu": "zulu",
-        "LanguageCode": "Kod języka",
-        "PluginDescription": "Raporty rozmaitych konfiguracji użytkownika: przeglądarki, rodziny przeglądarek, systemów operacyjnych, wtyczek, rozdzielczości, ogólnej konfiguracji.",
-        "PluginDetectionDoesNotWorkInIE": "Uwaga: wykrywanie wtyczek nie działa w przypadku Internet Explorera. Raport ten pokaże tylko wyniki w oparciu o badanie innych przeglądarek, nie opartych na silniku IE.",
-        "Resolutions": "Rozdzielczość",
-        "VisitorSettings": "Konfiguracje użytkownika",
-        "WidgetGlobalVisitors": "Ogólna konfiguracja odwiedzających",
-        "WidgetPlugins": "Lista wtyczek",
-        "WidgetResolutions": "Rozdzielczość ekranu"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/pt-br.json b/plugins/UserSettings/lang/pt-br.json
deleted file mode 100644
index 079ad711b4..0000000000
--- a/plugins/UserSettings/lang/pt-br.json
+++ /dev/null
@@ -1,204 +0,0 @@
-{
-    "UserSettings": {
-        "BrowserLanguage": "Idioma do navegador",
-        "BrowserWithNoPluginsEnabled": "%1$s sem plugins ativados",
-        "BrowserWithPluginsEnabled": "%1$s com os plugins %2$s ativados",
-        "ColumnConfiguration": "Configuração",
-        "ColumnResolution": "Resolução",
-        "Configurations": "Configurações",
-        "Language_aa": "afar",
-        "Language_ab": "abcázio",
-        "Language_ae": "avéstico",
-        "Language_af": "africâner",
-        "Language_ak": "akan",
-        "Language_am": "amárico",
-        "Language_an": "aragonês",
-        "Language_ar": "árabe",
-        "Language_as": "assamês",
-        "Language_av": "avaric",
-        "Language_ay": "aimara",
-        "Language_az": "azerbaijano",
-        "Language_ba": "bashkir",
-        "Language_be": "bielo-russo",
-        "Language_bg": "búlgaro",
-        "Language_bh": "biari",
-        "Language_bi": "bislamá",
-        "Language_bm": "bambara",
-        "Language_bn": "bengali",
-        "Language_bo": "tibetano",
-        "Language_br": "bretão",
-        "Language_bs": "bósnio",
-        "Language_ca": "catalão",
-        "Language_ce": "checheno",
-        "Language_ch": "chamorro",
-        "Language_co": "córsico",
-        "Language_cr": "cree",
-        "Language_cs": "tcheco",
-        "Language_cu": "eslavo eclesiástico",
-        "Language_cv": "chuvash",
-        "Language_cy": "galês",
-        "Language_da": "dinamarquês",
-        "Language_de": "alemão",
-        "Language_dv": "divehi",
-        "Language_dz": "dzonga",
-        "Language_ee": "eve",
-        "Language_el": "grego",
-        "Language_en": "inglês",
-        "Language_eo": "esperanto",
-        "Language_es": "espanhol",
-        "Language_et": "estoniano",
-        "Language_eu": "basco",
-        "Language_fa": "persa",
-        "Language_ff": "fula",
-        "Language_fi": "finlandês",
-        "Language_fj": "fijiano",
-        "Language_fo": "feroês",
-        "Language_fr": "francês",
-        "Language_fy": "frísio ocidental",
-        "Language_ga": "irlandês",
-        "Language_gd": "gaélico escocês",
-        "Language_gl": "galego",
-        "Language_gn": "guarani",
-        "Language_gu": "guzerate",
-        "Language_gv": "manx",
-        "Language_ha": "hauçá",
-        "Language_he": "hebraico",
-        "Language_hi": "híndi",
-        "Language_ho": "hiri motu",
-        "Language_hr": "croata",
-        "Language_ht": "haitiano",
-        "Language_hu": "húngaro",
-        "Language_hy": "armênio",
-        "Language_hz": "herero",
-        "Language_ia": "interlíngua",
-        "Language_id": "indonésio",
-        "Language_ie": "interlingue",
-        "Language_ig": "ibo",
-        "Language_ii": "sichuan yi",
-        "Language_ik": "inupiaque",
-        "Language_io": "ido",
-        "Language_is": "islandês",
-        "Language_it": "italiano",
-        "Language_iu": "inuktitut",
-        "Language_ja": "japonês",
-        "Language_jv": "javanês",
-        "Language_ka": "georgiano",
-        "Language_kg": "congolês",
-        "Language_ki": "quicuio",
-        "Language_kj": "kuanyama",
-        "Language_kk": "cazaque",
-        "Language_kl": "groenlandês",
-        "Language_km": "cmer",
-        "Language_kn": "canarês",
-        "Language_ko": "coreano",
-        "Language_kr": "canúri",
-        "Language_ks": "caxemira",
-        "Language_ku": "curdo",
-        "Language_kv": "komi",
-        "Language_kw": "córnico",
-        "Language_ky": "quirguiz",
-        "Language_la": "latim",
-        "Language_lb": "luxemburguês",
-        "Language_lg": "luganda",
-        "Language_li": "limburguês",
-        "Language_ln": "lingala",
-        "Language_lo": "laosiano",
-        "Language_lt": "lituano",
-        "Language_lu": "luba-catanga",
-        "Language_lv": "letão",
-        "Language_mg": "malgaxe",
-        "Language_mh": "marshalês",
-        "Language_mi": "maori",
-        "Language_mk": "macedônio",
-        "Language_ml": "malaiala",
-        "Language_mn": "mongol",
-        "Language_mr": "marata",
-        "Language_ms": "malaio",
-        "Language_mt": "maltês",
-        "Language_my": "birmanês",
-        "Language_na": "nauruano",
-        "Language_nb": "bokmål norueguês",
-        "Language_nd": "ndebele do norte",
-        "Language_ne": "nepali",
-        "Language_ng": "dongo",
-        "Language_nl": "holandês",
-        "Language_nn": "nynorsk norueguês",
-        "Language_no": "norueguês",
-        "Language_nr": "ndebele do sul",
-        "Language_nv": "navajo",
-        "Language_ny": "nianja",
-        "Language_oc": "occitânico",
-        "Language_oj": "ojibwa",
-        "Language_om": "oromo",
-        "Language_or": "oriya",
-        "Language_os": "ossetic",
-        "Language_pa": "panjabi",
-        "Language_pi": "páli",
-        "Language_pl": "polonês",
-        "Language_ps": "pashto",
-        "Language_pt": "português",
-        "Language_qu": "quíchua",
-        "Language_rm": "reto-romano",
-        "Language_rn": "rundi",
-        "Language_ro": "romeno",
-        "Language_ru": "russo",
-        "Language_rw": "kinyarwanda",
-        "Language_sa": "sânscrito",
-        "Language_sc": "sardo",
-        "Language_sd": "sindi",
-        "Language_se": "sami do norte",
-        "Language_sg": "sango",
-        "Language_si": "cingalês",
-        "Language_sk": "eslovaco",
-        "Language_sl": "esloveno",
-        "Language_sm": "samoano",
-        "Language_sn": "shona",
-        "Language_so": "somali",
-        "Language_sq": "albanês",
-        "Language_sr": "sérvio",
-        "Language_ss": "swati",
-        "Language_st": "soto do sul",
-        "Language_su": "sundanês",
-        "Language_sv": "sueco",
-        "Language_sw": "suaili",
-        "Language_ta": "tâmil",
-        "Language_te": "telugu",
-        "Language_tg": "tadjique",
-        "Language_th": "tailandês",
-        "Language_ti": "tigrínia",
-        "Language_tk": "turcomano",
-        "Language_tl": "tagalo",
-        "Language_tn": "tswana",
-        "Language_to": "tonganês",
-        "Language_tr": "turco",
-        "Language_ts": "tsonga",
-        "Language_tt": "tatar",
-        "Language_tw": "twi",
-        "Language_ty": "taitiano",
-        "Language_ug": "uighur",
-        "Language_uk": "ucraniano",
-        "Language_ur": "urdu",
-        "Language_uz": "usbeque",
-        "Language_ve": "venda",
-        "Language_vi": "vietnamita",
-        "Language_vo": "volapuque",
-        "Language_wa": "valão",
-        "Language_wo": "uólofe",
-        "Language_xh": "xosa",
-        "Language_yi": "iídiche",
-        "Language_yo": "ioruba",
-        "Language_za": "zhuang",
-        "Language_zh": "chinês",
-        "Language_zu": "zulu",
-        "LanguageCode": "Código do Idioma",
-        "PluginDescription": "Relatórios diversas configurações de usuário: navegador, navegador família, sistema operacional, plugins, resolução, configurações globais.",
-        "PluginDetectionDoesNotWorkInIE": "Nota: a detecção de plugins não funciona no Internet Explorer. Esse relatório é baseado apenas em navegadores não IE.",
-        "Resolutions": "Resoluções",
-        "VisitorSettings": "Configurações dos visitantes",
-        "WidgetGlobalVisitors": "Configuração Global de Visitante",
-        "WidgetGlobalVisitorsDocumentation": "Este relatório mostra as configurações mais comuns gerais que os visitantes tiveram. A configuração é a combinação de um sistema operacional, um tipo de navegador e uma resolução de tela.",
-        "WidgetPlugins": "Lista de Plugins",
-        "WidgetPluginsDocumentation": "Este relatório mostra quais plugins de navegador seus visitantes tinham ativado. Esta informação pode ser importante para escolher o caminho certo para levar o seu conteúdo.",
-        "WidgetResolutions": "Resoluções de Tela"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/pt.json b/plugins/UserSettings/lang/pt.json
deleted file mode 100644
index a5017d4a16..0000000000
--- a/plugins/UserSettings/lang/pt.json
+++ /dev/null
@@ -1,201 +0,0 @@
-{
-    "UserSettings": {
-        "ColumnConfiguration": "Configuração",
-        "ColumnResolution": "Resolução",
-        "Configurations": "Configurações",
-        "Language_aa": "afar",
-        "Language_ab": "abcázio",
-        "Language_ae": "avéstico",
-        "Language_af": "africâner",
-        "Language_ak": "akan",
-        "Language_am": "amárico",
-        "Language_an": "aragonês",
-        "Language_ar": "árabe",
-        "Language_as": "assamês",
-        "Language_av": "avaric",
-        "Language_ay": "aimara",
-        "Language_az": "azerbaijano",
-        "Language_ba": "bashkir",
-        "Language_be": "bielo-russo",
-        "Language_bg": "búlgaro",
-        "Language_bh": "biari",
-        "Language_bi": "bislamá",
-        "Language_bm": "bambara",
-        "Language_bn": "bengali",
-        "Language_bo": "tibetano",
-        "Language_br": "bretão",
-        "Language_bs": "bósnio",
-        "Language_ca": "catalão",
-        "Language_ce": "checheno",
-        "Language_ch": "chamorro",
-        "Language_co": "córsico",
-        "Language_cr": "cree",
-        "Language_cs": "tcheco",
-        "Language_cu": "eslavo eclesiástico",
-        "Language_cv": "chuvash",
-        "Language_cy": "galês",
-        "Language_da": "dinamarquês",
-        "Language_de": "alemão",
-        "Language_dv": "divehi",
-        "Language_dz": "dzonga",
-        "Language_ee": "eve",
-        "Language_el": "grego",
-        "Language_en": "inglês",
-        "Language_eo": "esperanto",
-        "Language_es": "espanhol",
-        "Language_et": "estoniano",
-        "Language_eu": "basco",
-        "Language_fa": "persa",
-        "Language_ff": "fula",
-        "Language_fi": "finlandês",
-        "Language_fj": "fijiano",
-        "Language_fo": "feroês",
-        "Language_fr": "francês",
-        "Language_fy": "frísio ocidental",
-        "Language_ga": "irlandês",
-        "Language_gd": "gaélico escocês",
-        "Language_gl": "galego",
-        "Language_gn": "guarani",
-        "Language_gu": "guzerate",
-        "Language_gv": "manx",
-        "Language_ha": "hauçá",
-        "Language_he": "hebraico",
-        "Language_hi": "híndi",
-        "Language_ho": "hiri motu",
-        "Language_hr": "croata",
-        "Language_ht": "haitiano",
-        "Language_hu": "húngaro",
-        "Language_hy": "armênio",
-        "Language_hz": "herero",
-        "Language_ia": "interlíngua",
-        "Language_id": "indonésio",
-        "Language_ie": "interlingue",
-        "Language_ig": "ibo",
-        "Language_ii": "sichuan yi",
-        "Language_ik": "inupiaque",
-        "Language_io": "ido",
-        "Language_is": "islandês",
-        "Language_it": "italiano",
-        "Language_iu": "inuktitut",
-        "Language_ja": "japonês",
-        "Language_jv": "javanês",
-        "Language_ka": "georgiano",
-        "Language_kg": "congolês",
-        "Language_ki": "quicuio",
-        "Language_kj": "kuanyama",
-        "Language_kk": "cazaque",
-        "Language_kl": "groenlandês",
-        "Language_km": "cmer",
-        "Language_kn": "canarês",
-        "Language_ko": "coreano",
-        "Language_kr": "canúri",
-        "Language_ks": "caxemira",
-        "Language_ku": "curdo",
-        "Language_kv": "komi",
-        "Language_kw": "córnico",
-        "Language_ky": "quirguiz",
-        "Language_la": "latim",
-        "Language_lb": "luxemburguês",
-        "Language_lg": "luganda",
-        "Language_li": "limburguês",
-        "Language_ln": "lingala",
-        "Language_lo": "laosiano",
-        "Language_lt": "lituano",
-        "Language_lu": "luba-catanga",
-        "Language_lv": "letão",
-        "Language_mg": "malgaxe",
-        "Language_mh": "marshalês",
-        "Language_mi": "maori",
-        "Language_mk": "macedônio",
-        "Language_ml": "malaiala",
-        "Language_mn": "mongol",
-        "Language_mr": "marata",
-        "Language_ms": "malaio",
-        "Language_mt": "maltês",
-        "Language_my": "birmanês",
-        "Language_na": "nauruano",
-        "Language_nb": "bokmål norueguês",
-        "Language_nd": "ndebele do norte",
-        "Language_ne": "nepali",
-        "Language_ng": "dongo",
-        "Language_nl": "holandês",
-        "Language_nn": "nynorsk norueguês",
-        "Language_no": "norueguês",
-        "Language_nr": "ndebele do sul",
-        "Language_nv": "navajo",
-        "Language_ny": "nianja",
-        "Language_oc": "occitânico",
-        "Language_oj": "ojibwa",
-        "Language_om": "oromo",
-        "Language_or": "oriya",
-        "Language_os": "ossetic",
-        "Language_pa": "panjabi",
-        "Language_pi": "páli",
-        "Language_pl": "polonês",
-        "Language_ps": "pashto",
-        "Language_pt": "português",
-        "Language_qu": "quíchua",
-        "Language_rm": "reto-romano",
-        "Language_rn": "rundi",
-        "Language_ro": "romeno",
-        "Language_ru": "russo",
-        "Language_rw": "kinyarwanda",
-        "Language_sa": "sânscrito",
-        "Language_sc": "sardo",
-        "Language_sd": "sindi",
-        "Language_se": "sami do norte",
-        "Language_sg": "sango",
-        "Language_si": "cingalês",
-        "Language_sk": "eslovaco",
-        "Language_sl": "esloveno",
-        "Language_sm": "samoano",
-        "Language_sn": "shona",
-        "Language_so": "somali",
-        "Language_sq": "albanês",
-        "Language_sr": "sérvio",
-        "Language_ss": "swati",
-        "Language_st": "soto do sul",
-        "Language_su": "sundanês",
-        "Language_sv": "sueco",
-        "Language_sw": "suaili",
-        "Language_ta": "tâmil",
-        "Language_te": "telugu",
-        "Language_tg": "tadjique",
-        "Language_th": "tailandês",
-        "Language_ti": "tigrínia",
-        "Language_tk": "turcomano",
-        "Language_tl": "tagalo",
-        "Language_tn": "tswana",
-        "Language_to": "tonganês",
-        "Language_tr": "turco",
-        "Language_ts": "tsonga",
-        "Language_tt": "tatar",
-        "Language_tw": "twi",
-        "Language_ty": "taitiano",
-        "Language_ug": "uighur",
-        "Language_uk": "ucraniano",
-        "Language_ur": "urdu",
-        "Language_uz": "usbeque",
-        "Language_ve": "venda",
-        "Language_vi": "vietnamita",
-        "Language_vo": "volapuque",
-        "Language_wa": "valão",
-        "Language_wo": "uólofe",
-        "Language_xh": "xosa",
-        "Language_yi": "iídiche",
-        "Language_yo": "ioruba",
-        "Language_za": "zhuang",
-        "Language_zh": "chinês",
-        "Language_zu": "zulu",
-        "LanguageCode": "Código do idioma",
-        "PluginDescription": "Relata várias Definições de Utilizador: Navegador, Família de Navegadores, Sistema Operativo, Plugins, Resolução, Definições Globais",
-        "PluginDetectionDoesNotWorkInIE": "Nota: Detecção de plugins não funciona no Internet Explorer. Este relatório só se baseia em navegadores não-IE.",
-        "Resolutions": "Resoluções",
-        "VisitorSettings": "Definições do Visitante",
-        "WidgetGlobalVisitors": "Configuração global dos visitantes",
-        "WidgetGlobalVisitorsDocumentation": "Este relatório mostra as configurações gerais mais comuns que os visitantes tiveram. Uma configuração é a combinação de um sistema operativo, um tipo de navegador e uma resolução de visualização.",
-        "WidgetPlugins": "Lista de Plugins",
-        "WidgetPluginsDocumentation": "Este relatório mostra quais os plugin que o navegador dos seus visitantes tinham. Esta informação pode ser importante para a escolha do caminho certo para distribuir o seu conteúdo.",
-        "WidgetResolutions": "Resoluções de Ecrã"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/ro.json b/plugins/UserSettings/lang/ro.json
deleted file mode 100644
index e39b81caff..0000000000
--- a/plugins/UserSettings/lang/ro.json
+++ /dev/null
@@ -1,204 +0,0 @@
-{
-    "UserSettings": {
-        "BrowserLanguage": "Limba browser-ului",
-        "BrowserWithNoPluginsEnabled": "%1$s fără plugin-uri activate",
-        "BrowserWithPluginsEnabled": "%1$s cu plugin-uri %2$s activate",
-        "ColumnConfiguration": "Configuraţia",
-        "ColumnResolution": "Rezoluţie ecran",
-        "Configurations": "Configurare",
-        "Language_aa": "Afar",
-        "Language_ab": "abhază",
-        "Language_ae": "avestană",
-        "Language_af": "afrikaans",
-        "Language_ak": "akan",
-        "Language_am": "amharică",
-        "Language_an": "aragoneză",
-        "Language_ar": "arabă",
-        "Language_as": "asameză",
-        "Language_av": "avară",
-        "Language_ay": "aymara",
-        "Language_az": "azeră",
-        "Language_ba": "bașkiră",
-        "Language_be": "bielorusă",
-        "Language_bg": "bulgară",
-        "Language_bh": "bihari",
-        "Language_bi": "bislama",
-        "Language_bm": "bambara",
-        "Language_bn": "bengaleză",
-        "Language_bo": "tibetană",
-        "Language_br": "bretonă",
-        "Language_bs": "bosniacă",
-        "Language_ca": "catalană",
-        "Language_ce": "cecenă",
-        "Language_ch": "chamorro",
-        "Language_co": "corsicană",
-        "Language_cr": "cree",
-        "Language_cs": "cehă",
-        "Language_cu": "slavonă",
-        "Language_cv": "ciuvașă",
-        "Language_cy": "velșă",
-        "Language_da": "daneză",
-        "Language_de": "germană",
-        "Language_dv": "divehi",
-        "Language_dz": "dzongkha",
-        "Language_ee": "ewe",
-        "Language_el": "greacă",
-        "Language_en": "engleză",
-        "Language_eo": "esperanto",
-        "Language_es": "spaniolă",
-        "Language_et": "estoniană",
-        "Language_eu": "bască",
-        "Language_fa": "persană",
-        "Language_ff": "fulah",
-        "Language_fi": "finlandeză",
-        "Language_fj": "fijiană",
-        "Language_fo": "faroeză",
-        "Language_fr": "franceză",
-        "Language_fy": "frizonă occidentală",
-        "Language_ga": "irlandeză",
-        "Language_gd": "gaelică scoțiană",
-        "Language_gl": "galiciană",
-        "Language_gn": "guarani",
-        "Language_gu": "gujarati",
-        "Language_gv": "manx",
-        "Language_ha": "hausa",
-        "Language_he": "ebraică",
-        "Language_hi": "hindi",
-        "Language_ho": "hiri motu",
-        "Language_hr": "croată",
-        "Language_ht": "haitiană",
-        "Language_hu": "maghiară",
-        "Language_hy": "armeană",
-        "Language_hz": "herero",
-        "Language_ia": "interlingua",
-        "Language_id": "indoneziană",
-        "Language_ie": "interlingue",
-        "Language_ig": "igbo",
-        "Language_ii": "sichuan yi",
-        "Language_ik": "inupiak",
-        "Language_io": "ido",
-        "Language_is": "islandeză",
-        "Language_it": "italiană",
-        "Language_iu": "inuktitut",
-        "Language_ja": "japoneză",
-        "Language_jv": "javaneză",
-        "Language_ka": "georgiană",
-        "Language_kg": "congoleză",
-        "Language_ki": "kikuyu",
-        "Language_kj": "kuanyama",
-        "Language_kk": "kazahă",
-        "Language_kl": "kalaallisut",
-        "Language_km": "khmeră",
-        "Language_kn": "kannada",
-        "Language_ko": "coreeană",
-        "Language_kr": "kanuri",
-        "Language_ks": "cașmireză",
-        "Language_ku": "kurdă",
-        "Language_kv": "komi",
-        "Language_kw": "cornică",
-        "Language_ky": "kîrgîză",
-        "Language_la": "latină",
-        "Language_lb": "luxemburgheză",
-        "Language_lg": "ganda",
-        "Language_li": "limburgheză",
-        "Language_ln": "lingala",
-        "Language_lo": "laoțiană",
-        "Language_lt": "lituaniană",
-        "Language_lu": "luba-katanga",
-        "Language_lv": "letonă",
-        "Language_mg": "malgașă",
-        "Language_mh": "marshalleză",
-        "Language_mi": "maori",
-        "Language_mk": "macedoneană",
-        "Language_ml": "malayalam",
-        "Language_mn": "mongolă",
-        "Language_mr": "marathi",
-        "Language_ms": "malay",
-        "Language_mt": "malteză",
-        "Language_my": "birmaneză",
-        "Language_na": "nauru",
-        "Language_nb": "norvegiana bokmål",
-        "Language_nd": "ndebele de nord",
-        "Language_ne": "nepaleză",
-        "Language_ng": "ndonga",
-        "Language_nl": "olandeză",
-        "Language_nn": "norvegiană nynorsk",
-        "Language_no": "norvegiană",
-        "Language_nr": "ndebele de sud",
-        "Language_nv": "navajo",
-        "Language_ny": "nyanja",
-        "Language_oc": "occitană",
-        "Language_oj": "ojibwa",
-        "Language_om": "oromo",
-        "Language_or": "oriya",
-        "Language_os": "osetă",
-        "Language_pa": "punjabi",
-        "Language_pi": "pali",
-        "Language_pl": "poloneză",
-        "Language_ps": "pașto",
-        "Language_pt": "portugheză",
-        "Language_qu": "quechua",
-        "Language_rm": "retoromană",
-        "Language_rn": "kirundi",
-        "Language_ro": "română",
-        "Language_ru": "rusă",
-        "Language_rw": "kinyarwanda",
-        "Language_sa": "sanscrită",
-        "Language_sc": "sardiniană",
-        "Language_sd": "sindhi",
-        "Language_se": "sami de nord",
-        "Language_sg": "sango",
-        "Language_si": "singaleză",
-        "Language_sk": "slovacă",
-        "Language_sl": "slovenă",
-        "Language_sm": "samoană",
-        "Language_sn": "shona",
-        "Language_so": "somaleză",
-        "Language_sq": "albaneză",
-        "Language_sr": "sârbă",
-        "Language_ss": "swati",
-        "Language_st": "sesotho",
-        "Language_su": "sundaneză",
-        "Language_sv": "suedeză",
-        "Language_sw": "swahili",
-        "Language_ta": "tamilă",
-        "Language_te": "telugu",
-        "Language_tg": "tadjică",
-        "Language_th": "thailandeză",
-        "Language_ti": "tigrinya",
-        "Language_tk": "turkmenă",
-        "Language_tl": "tagalog",
-        "Language_tn": "setswana",
-        "Language_to": "tonga",
-        "Language_tr": "turcă",
-        "Language_ts": "tsonga",
-        "Language_tt": "tătară",
-        "Language_tw": "twi",
-        "Language_ty": "tahitiană",
-        "Language_ug": "uigură",
-        "Language_uk": "ucraineană",
-        "Language_ur": "urdu",
-        "Language_uz": "uzbecă",
-        "Language_ve": "venda",
-        "Language_vi": "vietnameză",
-        "Language_vo": "volapuk",
-        "Language_wa": "valonă",
-        "Language_wo": "wolof",
-        "Language_xh": "xhosa",
-        "Language_yi": "idiș",
-        "Language_yo": "yoruba",
-        "Language_za": "zhuang",
-        "Language_zh": "chineză",
-        "Language_zu": "zulu",
-        "LanguageCode": "Cod limbă",
-        "PluginDescription": "Rapoarte difera la setări utilizator: Browser, Browser de familie, sistemul de operare, plugins, Rezolutie, Global Setări.",
-        "PluginDetectionDoesNotWorkInIE": "Notă: de detectare a plugin-uri nu funcționează în Internet Explorer. Acest raport se bazează doar pe browsere non-IE.",
-        "Resolutions": "Rezolutii",
-        "VisitorSettings": "Setări vizitatori",
-        "WidgetGlobalVisitors": "Configurare vizitatori globala",
-        "WidgetGlobalVisitorsDocumentation": "Acest raport arată cele mai comune configurații generale,pe care vizitatorii le au avut. O configurație este combinația dintre un sistem de operare, un tip de browser și o rezoluție a ecranului.",
-        "WidgetPlugins": "Lista pluginurilor",
-        "WidgetPluginsDocumentation": "Acest raport arată ce plugin-uri de browser-ul au activat vizitatorii. Aceste informație ar putea fi importanta pentru a alege modul corect de a livra conținut.",
-        "WidgetResolutions": "Rezolutii ecran"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/ru.json b/plugins/UserSettings/lang/ru.json
deleted file mode 100644
index a55776ea0c..0000000000
--- a/plugins/UserSettings/lang/ru.json
+++ /dev/null
@@ -1,202 +0,0 @@
-{
-    "UserSettings": {
-        "BrowserLanguage": "Язык браузера",
-        "ColumnConfiguration": "Конфигурация",
-        "ColumnResolution": "Разрешение",
-        "Configurations": "По конфигурации",
-        "Language_aa": "афар",
-        "Language_ab": "абхазский",
-        "Language_ae": "авестийский",
-        "Language_af": "африкаанс",
-        "Language_ak": "акан",
-        "Language_am": "амхарский",
-        "Language_an": "арагонский",
-        "Language_ar": "арабский",
-        "Language_as": "ассамский",
-        "Language_av": "аварский",
-        "Language_ay": "аймара",
-        "Language_az": "азербайджанский",
-        "Language_ba": "башкирский",
-        "Language_be": "белорусский",
-        "Language_bg": "болгарский",
-        "Language_bh": "бихари",
-        "Language_bi": "бислама",
-        "Language_bm": "бамбарийский",
-        "Language_bn": "бенгальский",
-        "Language_bo": "тибетский",
-        "Language_br": "бретонский",
-        "Language_bs": "боснийский",
-        "Language_ca": "каталанский",
-        "Language_ce": "чеченский",
-        "Language_ch": "чаморро",
-        "Language_co": "корсиканский",
-        "Language_cr": "криийский",
-        "Language_cs": "чешский",
-        "Language_cu": "церковнославянский",
-        "Language_cv": "чувашский",
-        "Language_cy": "валлийский",
-        "Language_da": "датский",
-        "Language_de": "немецкий",
-        "Language_dv": "мальдивский",
-        "Language_dz": "дзонг-кэ",
-        "Language_ee": "эве",
-        "Language_el": "греческий",
-        "Language_en": "английский",
-        "Language_eo": "эсперанто",
-        "Language_es": "испанский",
-        "Language_et": "эстонский",
-        "Language_eu": "баскский",
-        "Language_fa": "персидский",
-        "Language_ff": "фулах",
-        "Language_fi": "финский",
-        "Language_fj": "фиджи",
-        "Language_fo": "фарерский",
-        "Language_fr": "французский",
-        "Language_fy": "фризский",
-        "Language_ga": "ирландский",
-        "Language_gd": "гэльский",
-        "Language_gl": "галисийский",
-        "Language_gn": "гуарани",
-        "Language_gu": "гуджарати",
-        "Language_gv": "мэнский",
-        "Language_ha": "хауса",
-        "Language_he": "иврит",
-        "Language_hi": "хинди",
-        "Language_ho": "хиримоту",
-        "Language_hr": "хорватский",
-        "Language_ht": "гаитянский",
-        "Language_hu": "венгерский",
-        "Language_hy": "армянский",
-        "Language_hz": "гереро",
-        "Language_ia": "интерлингва",
-        "Language_id": "индонезийский",
-        "Language_ie": "интерлингве",
-        "Language_ig": "игбо",
-        "Language_ii": "сычуань",
-        "Language_ik": "инупиак",
-        "Language_io": "идо",
-        "Language_is": "исландский",
-        "Language_it": "итальянский",
-        "Language_iu": "инуктитут",
-        "Language_ja": "японский",
-        "Language_jv": "яванский",
-        "Language_ka": "грузинский",
-        "Language_kg": "конго",
-        "Language_ki": "кикуйю",
-        "Language_kj": "кунама",
-        "Language_kk": "казахский",
-        "Language_kl": "эскимосский (гренландский)",
-        "Language_km": "кхмерский",
-        "Language_kn": "каннада",
-        "Language_ko": "корейский",
-        "Language_kr": "канури",
-        "Language_ks": "кашмири",
-        "Language_ku": "курдский",
-        "Language_kv": "коми",
-        "Language_kw": "корнийский",
-        "Language_ky": "киргизский",
-        "Language_la": "латинский",
-        "Language_lb": "люксембургский",
-        "Language_lg": "ганда",
-        "Language_li": "лимбургский",
-        "Language_ln": "лингала",
-        "Language_lo": "лаосский",
-        "Language_lt": "литовский",
-        "Language_lu": "луба-катанга",
-        "Language_lv": "латышский",
-        "Language_mg": "малагасийский",
-        "Language_mh": "маршалльский",
-        "Language_mi": "маори",
-        "Language_mk": "македонский",
-        "Language_ml": "малаялам",
-        "Language_mn": "монгольский",
-        "Language_mr": "маратхи",
-        "Language_ms": "малайский",
-        "Language_mt": "мальтийский",
-        "Language_my": "бирманский",
-        "Language_na": "науру",
-        "Language_nb": "норвежский букмол",
-        "Language_nd": "ндебели (северный)",
-        "Language_ne": "непальский",
-        "Language_ng": "ндонга",
-        "Language_nl": "голландский",
-        "Language_nn": "норвежский нюнорск",
-        "Language_no": "норвежский",
-        "Language_nr": "ндебели южный",
-        "Language_nv": "навахо",
-        "Language_ny": "ньянджа",
-        "Language_oc": "окситанский",
-        "Language_oj": "оджибва",
-        "Language_om": "оромо",
-        "Language_or": "ория",
-        "Language_os": "осетинский",
-        "Language_pa": "панджаби (пенджаби)",
-        "Language_pi": "пали",
-        "Language_pl": "польский",
-        "Language_ps": "пашто (пушту)",
-        "Language_pt": "португальский",
-        "Language_qu": "кечуа",
-        "Language_rm": "ретороманский",
-        "Language_rn": "рунди",
-        "Language_ro": "румынский",
-        "Language_ru": "русский",
-        "Language_rw": "киньяруанда",
-        "Language_sa": "санскрит",
-        "Language_sc": "сардинский",
-        "Language_sd": "синдхи",
-        "Language_se": "саамский (северный)",
-        "Language_sg": "санго",
-        "Language_si": "сингальский",
-        "Language_sk": "словацкий",
-        "Language_sl": "словенский",
-        "Language_sm": "самоанский",
-        "Language_sn": "шона",
-        "Language_so": "сомали",
-        "Language_sq": "албанский",
-        "Language_sr": "сербский",
-        "Language_ss": "свази",
-        "Language_st": "сото южный",
-        "Language_su": "сунданский",
-        "Language_sv": "шведский",
-        "Language_sw": "суахили",
-        "Language_ta": "тамильский",
-        "Language_te": "телугу",
-        "Language_tg": "таджикский",
-        "Language_th": "тайский",
-        "Language_ti": "тигринья",
-        "Language_tk": "туркменский",
-        "Language_tl": "тагалог",
-        "Language_tn": "тсвана",
-        "Language_to": "тонга",
-        "Language_tr": "турецкий",
-        "Language_ts": "тсонга",
-        "Language_tt": "татарский",
-        "Language_tw": "тви",
-        "Language_ty": "таитянский",
-        "Language_ug": "уйгурский",
-        "Language_uk": "украинский",
-        "Language_ur": "урду",
-        "Language_uz": "узбекский",
-        "Language_ve": "венда",
-        "Language_vi": "вьетнамский",
-        "Language_vo": "волапюк",
-        "Language_wa": "валлонский",
-        "Language_wo": "волоф",
-        "Language_xh": "ксоза",
-        "Language_yi": "идиш",
-        "Language_yo": "йоруба",
-        "Language_za": "чжуань",
-        "Language_zh": "китайский",
-        "Language_zu": "зулу",
-        "LanguageCode": "Код языка",
-        "PluginDescription": "Ведет учет различных настроек пользователя: браузер, семейство браузера, операционная система, плагины, разрешение экрана, а также глобальные настройки.",
-        "PluginDetectionDoesNotWorkInIE": "Учтите: Определение плагинов не работает в Internet Explorer. Этот отчет содержит информацию о не-IE браузерах.",
-        "Resolutions": "По разрешению мониторов",
-        "VisitorSettings": "Настройки посетителей",
-        "WidgetGlobalVisitors": "Глобальная конфигурация",
-        "WidgetGlobalVisitorsDocumentation": "Этот отчет показывает общую информацию по наиболее популяоным конфигурациям системы ваших посетителей. Конфигурация - это комбинация операционной системы, браузера и разрешения экрана.",
-        "WidgetPlugins": "Список плагинов",
-        "WidgetPluginsDocumentation": "Этот отчет показывается какие плагины посетители используют в своих браузерах. Эта информация может быть важна для того, чтобы посетители смогли видеть ваш контент должным образом.",
-        "WidgetResolutions": "По разрешению мониторов"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/sk.json b/plugins/UserSettings/lang/sk.json
deleted file mode 100644
index 9874405ad0..0000000000
--- a/plugins/UserSettings/lang/sk.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-    "UserSettings": {
-        "ColumnConfiguration": "Konfigurácia",
-        "ColumnResolution": "Rozlíšenie",
-        "Configurations": "Konfigurácia",
-        "Language_aa": "afarčina",
-        "Language_ab": "abcházština",
-        "Language_ae": "avestčina",
-        "Language_af": "afrikánčina",
-        "Language_ak": "akančina",
-        "Language_am": "amharčina",
-        "Language_an": "aragónčina",
-        "Language_ar": "arabčina",
-        "Language_as": "ásámčina",
-        "Language_av": "avarčina",
-        "Language_ay": "aymarčina",
-        "Language_az": "azerbajdžančina",
-        "Language_ba": "baskirčina",
-        "Language_be": "bieloruština",
-        "Language_bg": "bulharčina",
-        "Language_bh": "bihárske jazyky",
-        "Language_bi": "bislama",
-        "Language_bm": "bambarčina",
-        "Language_bn": "bengálčina",
-        "Language_bo": "tibetčina",
-        "Language_br": "bretónčina",
-        "Language_bs": "bosniačtina",
-        "Language_ca": "katalánčina",
-        "Language_ce": "čečenčina",
-        "Language_ch": "čamorčina",
-        "Language_co": "korzičtina",
-        "Language_cr": "krí",
-        "Language_cs": "čeština",
-        "Language_cu": "cirkevná slovančina",
-        "Language_cv": "čuvaština",
-        "Language_cy": "waleština",
-        "Language_da": "dánčina",
-        "Language_de": "nemčina",
-        "Language_dv": "divehi",
-        "Language_dz": "dzongkä",
-        "Language_ee": "eweština",
-        "Language_el": "gréčtina",
-        "Language_en": "angličtina",
-        "Language_eo": "esperanto",
-        "Language_es": "španielčina",
-        "Language_et": "estónčina",
-        "Language_eu": "baskičtina",
-        "Language_fa": "perzština",
-        "Language_ff": "fulbčina",
-        "Language_fi": "fínčina",
-        "Language_fj": "fidžijčina",
-        "Language_fo": "faerčina",
-        "Language_fr": "francúzština",
-        "Language_fy": "západná frízština",
-        "Language_ga": "írčina",
-        "Language_gd": "škótčina",
-        "Language_gl": "galícijčina",
-        "Language_gn": "guaraní",
-        "Language_gu": "gudžarátčina",
-        "Language_gv": "mančina",
-        "Language_ha": "hauština",
-        "Language_he": "hebrejčina",
-        "Language_hi": "hindčina",
-        "Language_ho": "hiri motu",
-        "Language_hr": "chorvátčina",
-        "Language_ht": "haitský",
-        "Language_hu": "maďarčina",
-        "Language_hy": "arménčina",
-        "Language_hz": "herero",
-        "Language_ia": "interlingua",
-        "Language_id": "indonézština",
-        "Language_ie": "interlingue",
-        "Language_ig": "igboština",
-        "Language_ii": "s’čchuanská ioština",
-        "Language_ik": "inupiaq",
-        "Language_io": "ido",
-        "Language_is": "islandčina",
-        "Language_it": "taliančina",
-        "Language_iu": "inuktitut",
-        "Language_ja": "japončina",
-        "Language_jv": "jávčina",
-        "Language_ka": "gruzínčina",
-        "Language_kg": "konžština",
-        "Language_ki": "kikuju",
-        "Language_kj": "kuaňama",
-        "Language_kk": "kazaština",
-        "Language_kl": "grónska eskimáčtina",
-        "Language_km": "kambodžská khmérčina",
-        "Language_kn": "kannadčina",
-        "Language_ko": "kórejčina",
-        "Language_kr": "kanurijčina",
-        "Language_ks": "kašmírčina",
-        "Language_ku": "kurdčina",
-        "Language_kv": "komijčina",
-        "Language_kw": "kornčina",
-        "Language_ky": "kirgizština",
-        "Language_la": "latinčina",
-        "Language_lb": "luxemburčina",
-        "Language_lg": "gandčina",
-        "Language_li": "limburčina",
-        "Language_ln": "lingalčina",
-        "Language_lo": "laoština",
-        "Language_lt": "litovčina",
-        "Language_lu": "luba-katanga",
-        "Language_lv": "lotyština",
-        "Language_mg": "malgaština",
-        "Language_mh": "kajin-majol",
-        "Language_mi": "maorijčina",
-        "Language_mk": "macedónčina",
-        "Language_ml": "malajálamčina",
-        "Language_mn": "mongolčina",
-        "Language_mr": "maráthčina",
-        "Language_ms": "malajčina",
-        "Language_mt": "maltčina",
-        "Language_my": "barmčina",
-        "Language_na": "nauru",
-        "Language_nb": "bokmål",
-        "Language_nd": "severné ndbele",
-        "Language_ne": "nepálčina",
-        "Language_ng": "ndonga",
-        "Language_nl": "holandčina",
-        "Language_nn": "nórsky nynorsk",
-        "Language_no": "nórčina",
-        "Language_nr": "južná ndebelčina",
-        "Language_nv": "navajo",
-        "Language_ny": "čewa",
-        "Language_oc": "okcitánčina",
-        "Language_oj": "odžibva",
-        "Language_om": "oromčina",
-        "Language_or": "uríjčina",
-        "Language_os": "osetčina",
-        "Language_pa": "pandžábčina",
-        "Language_pi": "pálí",
-        "Language_pl": "poľština",
-        "Language_ps": "paštúnčina",
-        "Language_pt": "portugalčina",
-        "Language_qu": "kečuánčina",
-        "Language_rm": "rétorománčina",
-        "Language_rn": "rundčina",
-        "Language_ro": "rumunčina",
-        "Language_ru": "ruština",
-        "Language_rw": "rwandčina",
-        "Language_sa": "sanskrit",
-        "Language_sc": "sardínčina",
-        "Language_sd": "sindhčina",
-        "Language_se": "severná saamčina",
-        "Language_sg": "sango",
-        "Language_si": "sinhalčina",
-        "Language_sk": "slovenčina",
-        "Language_sl": "slovinčina",
-        "Language_sm": "samojčina",
-        "Language_sn": "šončina",
-        "Language_so": "somálčina",
-        "Language_sq": "albánčina",
-        "Language_sr": "srbčina",
-        "Language_ss": "svazijčina",
-        "Language_st": "južná sothčina",
-        "Language_su": "sundčina",
-        "Language_sv": "švédčina",
-        "Language_sw": "swahilčina",
-        "Language_ta": "tamilčina",
-        "Language_te": "telugčina",
-        "Language_tg": "tadžičtina",
-        "Language_th": "thajčina",
-        "Language_ti": "tigrejčina",
-        "Language_tk": "turkménčina",
-        "Language_tl": "tagalčina",
-        "Language_tn": "tswančina",
-        "Language_to": "tonžtina",
-        "Language_tr": "turečtina",
-        "Language_ts": "tsonga",
-        "Language_tt": "tatárčina",
-        "Language_tw": "twi",
-        "Language_ty": "tahitčina",
-        "Language_ug": "ujgurčina",
-        "Language_uk": "ukrajinčina",
-        "Language_ur": "urdčina",
-        "Language_uz": "uzbečtina",
-        "Language_ve": "vendčina",
-        "Language_vi": "vietnamčina",
-        "Language_vo": "volapük",
-        "Language_wa": "valónčina",
-        "Language_wo": "wolof",
-        "Language_xh": "xhosa",
-        "Language_yi": "jidiš",
-        "Language_yo": "jorubčina",
-        "Language_za": "čuangčina",
-        "Language_zh": "čínština",
-        "Language_zu": "zuluština",
-        "LanguageCode": "Kód jazyka",
-        "PluginDescription": "Rôzne reporty užívateľského nastavenia: Prehliadač, Rodina prehliadača, Operačný systém, Pluginy, Rozlíšenie, Globálne nastavenia.",
-        "PluginDetectionDoesNotWorkInIE": "Poznámka: Plugin detekcia nefunguje v Internet Exploreri. Táto správa je založená len na non-IE prehliadačov.",
-        "Resolutions": "Rozlíšenie",
-        "VisitorSettings": "Nastavenia návštevníkov",
-        "WidgetGlobalVisitors": "Globálne konfigurácie návštevníkov",
-        "WidgetPlugins": "Zoznam modulov",
-        "WidgetResolutions": "Rozlíšenie obrazovky"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/sl.json b/plugins/UserSettings/lang/sl.json
deleted file mode 100644
index 6a28d87223..0000000000
--- a/plugins/UserSettings/lang/sl.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-    "UserSettings": {
-        "BrowserLanguage": "Jezik brskalnika",
-        "BrowserWithNoPluginsEnabled": "%1$s brez omogočenih vtičnikov",
-        "BrowserWithPluginsEnabled": "%1$s z omogočenimi vtičniki %2$s",
-        "ColumnConfiguration": "Nastavitev",
-        "ColumnResolution": "Resolucija",
-        "Configurations": "Nastavitve",
-        "Language_aa": "afarščina",
-        "Language_ab": "abhaščina",
-        "Language_ae": "avestijščina",
-        "Language_af": "afrikanščina",
-        "Language_ak": "akanščina",
-        "Language_am": "amharščina",
-        "Language_an": "aragonščina",
-        "Language_ar": "arabščina",
-        "Language_as": "asamščina",
-        "Language_av": "avarščina",
-        "Language_ay": "ajmarščina",
-        "Language_az": "azerbajdžanščina",
-        "Language_ba": "baškirščina",
-        "Language_be": "beloruščina",
-        "Language_bg": "bolgarščina",
-        "Language_bh": "biharščina",
-        "Language_bi": "bislamščina",
-        "Language_bm": "bambarščina",
-        "Language_bn": "bengalščina",
-        "Language_bo": "tibetanščina",
-        "Language_br": "bretonščina",
-        "Language_bs": "bosanščina",
-        "Language_ca": "katalonščina",
-        "Language_ce": "čečenščina",
-        "Language_ch": "čamorščina",
-        "Language_co": "korziščina",
-        "Language_cr": "krijščina",
-        "Language_cs": "češčina",
-        "Language_cu": "stara cerkvena slovanščina",
-        "Language_cv": "čuvaščina",
-        "Language_cy": "valižanščina",
-        "Language_da": "danščina",
-        "Language_de": "nemščina",
-        "Language_dv": "diveščina",
-        "Language_dz": "dzonka",
-        "Language_ee": "evenščina",
-        "Language_el": "grščina",
-        "Language_en": "angleščina",
-        "Language_eo": "esperanto",
-        "Language_es": "španščina",
-        "Language_et": "estonščina",
-        "Language_eu": "baskovščina",
-        "Language_fa": "perzijščina",
-        "Language_ff": "fulščina",
-        "Language_fi": "finščina",
-        "Language_fj": "fidžijščina",
-        "Language_fo": "ferščina",
-        "Language_fr": "francoščina",
-        "Language_fy": "frizijščina",
-        "Language_ga": "irščina",
-        "Language_gd": "škotska gelščina",
-        "Language_gl": "galicijščina",
-        "Language_gn": "gvaranijščina",
-        "Language_gu": "gudžaratščina",
-        "Language_gv": "manščina",
-        "Language_ha": "havščina",
-        "Language_he": "hebrejščina",
-        "Language_hi": "hindujščina",
-        "Language_ho": "hiri motu",
-        "Language_hr": "hrvaščina",
-        "Language_ht": "haitijska kreolščina",
-        "Language_hu": "madžarščina",
-        "Language_hy": "armenščina",
-        "Language_hz": "herero",
-        "Language_ia": "interlingva",
-        "Language_id": "indonezijščina",
-        "Language_ie": "interlingve",
-        "Language_ig": "igboščina",
-        "Language_ii": "ii",
-        "Language_ik": "inupiaščina",
-        "Language_io": "ido",
-        "Language_is": "islandščina",
-        "Language_it": "italijanščina",
-        "Language_iu": "inuktitutščina",
-        "Language_ja": "japonščina",
-        "Language_jv": "javanščina",
-        "Language_ka": "gruzinščina",
-        "Language_kg": "kongovščina",
-        "Language_ki": "kikujščina",
-        "Language_kj": "kvanjama",
-        "Language_kk": "kazaščina",
-        "Language_kl": "grenlandščina",
-        "Language_km": "kmerščina",
-        "Language_kn": "kanada",
-        "Language_ko": "korejščina",
-        "Language_kr": "kanurščina",
-        "Language_ks": "kašmirščina",
-        "Language_ku": "kurdščina",
-        "Language_kv": "komijščina",
-        "Language_kw": "kornijščina",
-        "Language_ky": "kirgiščina",
-        "Language_la": "latinščina",
-        "Language_lb": "luksemburščina",
-        "Language_lg": "ganda",
-        "Language_li": "limburščina",
-        "Language_ln": "lingala",
-        "Language_lo": "laoščina",
-        "Language_lt": "litovščina",
-        "Language_lu": "luba-katanga",
-        "Language_lv": "latvijščina",
-        "Language_mg": "malagaščina",
-        "Language_mh": "marshallovščina",
-        "Language_mi": "maorščina",
-        "Language_mk": "makedonščina",
-        "Language_ml": "malajalamščina",
-        "Language_mn": "mongolščina",
-        "Language_mr": "maratščina",
-        "Language_ms": "malajščina",
-        "Language_mt": "malteščina",
-        "Language_my": "burmanščina",
-        "Language_na": "naurujščina",
-        "Language_nb": "knjižna norveščina",
-        "Language_nd": "severna ndebelščina",
-        "Language_ne": "nepalščina",
-        "Language_ng": "ng",
-        "Language_nl": "nizozemščina",
-        "Language_nn": "novonorveščina",
-        "Language_no": "norveščina",
-        "Language_nr": "južna ndebelščina",
-        "Language_nv": "navajščina",
-        "Language_ny": "njanščina",
-        "Language_oc": "okcitanščina",
-        "Language_oj": "anašinabščina",
-        "Language_om": "oromo",
-        "Language_or": "orijščina",
-        "Language_os": "osetinščina",
-        "Language_pa": "pandžabščina",
-        "Language_pi": "palijščina",
-        "Language_pl": "poljščina",
-        "Language_ps": "paštu",
-        "Language_pt": "portugalščina",
-        "Language_qu": "kečuanščina",
-        "Language_rm": "retoromanščina",
-        "Language_rn": "rundščina",
-        "Language_ro": "romunščina",
-        "Language_ru": "ruščina",
-        "Language_rw": "ruandščina",
-        "Language_sa": "sanskrt",
-        "Language_sc": "sardinščina",
-        "Language_sd": "sindščina",
-        "Language_se": "severna samijščina",
-        "Language_sg": "sango",
-        "Language_si": "singalščina",
-        "Language_sk": "slovaščina",
-        "Language_sl": "slovenščina",
-        "Language_sm": "samoanščina",
-        "Language_sn": "šonščina",
-        "Language_so": "somalščina",
-        "Language_sq": "albanščina",
-        "Language_sr": "srbščina",
-        "Language_ss": "svazijščina",
-        "Language_st": "sesoto",
-        "Language_su": "sundanščina",
-        "Language_sv": "švedščina",
-        "Language_sw": "svahili",
-        "Language_ta": "tamilščina",
-        "Language_te": "telugijščina",
-        "Language_tg": "tadžiščina",
-        "Language_th": "tajščina",
-        "Language_ti": "tigrajščina",
-        "Language_tk": "turkmenščina",
-        "Language_tl": "tagalogščina",
-        "Language_tn": "cvanščina",
-        "Language_to": "tongščina",
-        "Language_tr": "turščina",
-        "Language_ts": "tsonga",
-        "Language_tt": "tatarščina",
-        "Language_tw": "tvi",
-        "Language_ty": "tahitščina",
-        "Language_ug": "ujgurščina",
-        "Language_uk": "ukrajinščina",
-        "Language_ur": "urdujščina",
-        "Language_uz": "uzbeščina",
-        "Language_ve": "venda",
-        "Language_vi": "vietnamščina",
-        "Language_vo": "volapuk",
-        "Language_wa": "valonščina",
-        "Language_wo": "volofščina",
-        "Language_xh": "xhosa",
-        "Language_yi": "jidiš",
-        "Language_yo": "jorubščina",
-        "Language_za": "za",
-        "Language_zh": "kitajščina",
-        "Language_zu": "zulujščina",
-        "LanguageCode": "Šifra jezika",
-        "Resolutions": "Resolucije",
-        "VisitorSettings": "Nastavitve obiskovalcev",
-        "WidgetPlugins": "Seznam Vtičnikov",
-        "WidgetResolutions": "Resolucija zaslona"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/sq.json b/plugins/UserSettings/lang/sq.json
deleted file mode 100644
index 3920246e68..0000000000
--- a/plugins/UserSettings/lang/sq.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-    "UserSettings": {
-        "ColumnConfiguration": "Formësim",
-        "ColumnResolution": "Qartësi",
-        "Configurations": "Formësime",
-        "Language_af": "Afrikanisht",
-        "Language_am": "Amharike",
-        "Language_ar": "Arabisht",
-        "Language_as": "Asamezisht",
-        "Language_az": "Azerbajxhanisht",
-        "Language_be": "Bjellorusisht",
-        "Language_bg": "Bullgarisht",
-        "Language_bh": "Bihari",
-        "Language_bn": "Bengalisht",
-        "Language_br": "Breton",
-        "Language_bs": "Boshnjakisht",
-        "Language_ca": "Katalonisht",
-        "Language_cs": "Çekisht",
-        "Language_cy": "Uellsisht",
-        "Language_da": "Danisht",
-        "Language_de": "Gjermanisht",
-        "Language_el": "Greqisht",
-        "Language_en": "Anglisht",
-        "Language_eo": "Esperanto",
-        "Language_es": "Spanjisht",
-        "Language_et": "Estonisht",
-        "Language_eu": "Baskisht",
-        "Language_fa": "Persisht",
-        "Language_fi": "Finlandisht",
-        "Language_fo": "Faroisht",
-        "Language_fr": "Frengjisht",
-        "Language_fy": "Frizianisht",
-        "Language_ga": "Irlandisht",
-        "Language_gd": "Galisht",
-        "Language_gl": "Galicianisht",
-        "Language_gn": "Guarani",
-        "Language_gu": "Guxharati",
-        "Language_he": "Hebraisht",
-        "Language_hi": "Hindi",
-        "Language_hr": "Kroatisht",
-        "Language_hu": "Hungarisht",
-        "Language_hy": "Armen",
-        "Language_ia": "Interlingua",
-        "Language_id": "Indonezisht",
-        "Language_ie": "Gjuha nderkombtare",
-        "Language_is": "Islandisht",
-        "Language_it": "Italisht",
-        "Language_ja": "Japanisht",
-        "Language_jv": "Javanisht",
-        "Language_ka": "Gjeorgjisht",
-        "Language_km": "Kamboxhiane",
-        "Language_kn": "Kanada",
-        "Language_ko": "Koreançe",
-        "Language_ku": "Kurd",
-        "Language_ky": "Kyrgyz",
-        "Language_la": "Latinisht",
-        "Language_ln": "Lingala",
-        "Language_lo": "Laosisht",
-        "Language_lt": "Lituanisht",
-        "Language_lv": "Letonisht",
-        "Language_mk": "Maqedonisht",
-        "Language_ml": "Malajalam",
-        "Language_mn": "Mongolisht",
-        "Language_mr": "Marati",
-        "Language_ms": "Malajzisht",
-        "Language_mt": "Maltisht",
-        "Language_ne": "Nepalisht",
-        "Language_nl": "Holandisht",
-        "Language_nn": "Norvegjisht (Nynorsk)",
-        "Language_no": "Norvegjisht",
-        "Language_oc": "Oksitanisht",
-        "Language_or": "Orija",
-        "Language_pa": "Punxhabi",
-        "Language_pl": "Polonisht",
-        "Language_ps": "Pashto",
-        "Language_pt": "Portugeze",
-        "Language_ro": "Rumanisht",
-        "Language_ru": "Rusisht",
-        "Language_sa": "Sanskritisht",
-        "Language_sd": "Si'ndi",
-        "Language_si": "Sinhalezisht",
-        "Language_sk": "Sllovakisht",
-        "Language_sl": "Sllovenisht",
-        "Language_so": "Somalisht",
-        "Language_sq": "shqipe",
-        "Language_sr": "Serbisht",
-        "Language_st": "Sesotho",
-        "Language_su": "Sundanisht",
-        "Language_sv": "Suedisht",
-        "Language_sw": "Suahilisht",
-        "Language_ta": "Tamil",
-        "Language_te": "Telugu",
-        "Language_th": "Tajlandisht",
-        "Language_ti": "Tigrinja",
-        "Language_tk": "Turk",
-        "Language_tr": "Turqisht",
-        "Language_tw": "Twi",
-        "Language_ug": "Ujgur",
-        "Language_uk": "Ukrainisht",
-        "Language_ur": "Urdu",
-        "Language_uz": "Uzbekistanisht",
-        "Language_vi": "Vietnamisht",
-        "Language_xh": "Xhosa",
-        "Language_yi": "Jiden",
-        "Language_zh": "Kineze",
-        "Language_zu": "Zulu",
-        "LanguageCode": "Kod Gjuhe",
-        "PluginDescription": "Raporton Rregullime të ndryshme të Përdoruesit: Shfletues, Familje Shfletuesi, Sistem Operativ, Shtojca, Qartësi, Rregullime Globale.",
-        "PluginDetectionDoesNotWorkInIE": "Shënim: Zbulimi i shtojcave nuk funksionon nën Internet Explorer. Ky raport mund të kihet vetëm nën shfletuesa jo-IE.",
-        "Resolutions": "Qartësi",
-        "VisitorSettings": "Rregullimet për Vizitor",
-        "WidgetGlobalVisitors": "Formësime globale vizitorësh",
-        "WidgetGlobalVisitorsDocumentation": "Ky raport shfaq formësimet e përgjithshme më të rëndomta të përdorura nga vizitorët tuaj. Formësimi përmban të dhënat për sistemin operativ, llojin e shfletuesit dhe qartësinë e ekranit.",
-        "WidgetPlugins": "Listë e Shtojcave",
-        "WidgetPluginsDocumentation": "Ky raport tregon se cilat shtojca shfletuesi kanë të aktivizuara vizitorët tuaj. Ky informacion mund të jetë i vlefshëm për zgjedhjen e mënyrës më të përshtatshme për ofrimin e lëndës suaj.",
-        "WidgetResolutions": "Qartësi ekrani"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/sr.json b/plugins/UserSettings/lang/sr.json
deleted file mode 100644
index 289c2da551..0000000000
--- a/plugins/UserSettings/lang/sr.json
+++ /dev/null
@@ -1,204 +0,0 @@
-{
-    "UserSettings": {
-        "BrowserLanguage": "Jezik brauzera",
-        "BrowserWithNoPluginsEnabled": "%1$s sa isključenim dodacima",
-        "BrowserWithPluginsEnabled": "%1$s sa uključenim dodacima %2$s",
-        "ColumnConfiguration": "Podešavanja",
-        "ColumnResolution": "Rezolucija",
-        "Configurations": "Podešavanja",
-        "Language_aa": "Afar",
-        "Language_ab": "Abhazijski",
-        "Language_ae": "Avestan",
-        "Language_af": "Afrikans",
-        "Language_ak": "Akan",
-        "Language_am": "Amarik",
-        "Language_an": "Aragonesi",
-        "Language_ar": "Arapski",
-        "Language_as": "Asamesi",
-        "Language_av": "Avarski",
-        "Language_ay": "Ajmara",
-        "Language_az": "Azerbejdžanski",
-        "Language_ba": "Baškiri",
-        "Language_be": "Beloruski",
-        "Language_bg": "Bugarski",
-        "Language_bh": "Bihari",
-        "Language_bi": "Bislami",
-        "Language_bm": "Bambara",
-        "Language_bn": "Bengalski",
-        "Language_bo": "Tibetanski",
-        "Language_br": "Bretonski",
-        "Language_bs": "Bosanski",
-        "Language_ca": "Katalonski",
-        "Language_ce": "Čečenski",
-        "Language_ch": "Čamoro",
-        "Language_co": "Korzikanski",
-        "Language_cr": "Kri",
-        "Language_cs": "Češki",
-        "Language_cu": "Staroslovenski",
-        "Language_cv": "Čuvaši",
-        "Language_cy": "Velški",
-        "Language_da": "Danski",
-        "Language_de": "Nemački",
-        "Language_dv": "Divehi",
-        "Language_dz": "Džonga",
-        "Language_ee": "Ive",
-        "Language_el": "Grčki",
-        "Language_en": "Engleski",
-        "Language_eo": "Esperanto",
-        "Language_es": "Španski",
-        "Language_et": "Estonski",
-        "Language_eu": "Baskijski",
-        "Language_fa": "Persijski",
-        "Language_ff": "Fala",
-        "Language_fi": "Finski",
-        "Language_fj": "Fidži",
-        "Language_fo": "Farski",
-        "Language_fr": "Francuski",
-        "Language_fy": "Zapadni frizijski",
-        "Language_ga": "Irski",
-        "Language_gd": "Škotski keltski",
-        "Language_gl": "Galicijski",
-        "Language_gn": "Guarani",
-        "Language_gu": "Gujarati",
-        "Language_gv": "Manks",
-        "Language_ha": "Hauza",
-        "Language_he": "Hebrejski",
-        "Language_hi": "Hindi",
-        "Language_ho": "Hiri motu",
-        "Language_hr": "Hrvatski",
-        "Language_ht": "Haiti kreolski",
-        "Language_hu": "Mađarski",
-        "Language_hy": "Jermenski",
-        "Language_hz": "Herero",
-        "Language_ia": "Interlingva",
-        "Language_id": "Indonežanski",
-        "Language_ie": "Interlingve",
-        "Language_ig": "Igbo",
-        "Language_ii": "Sičuan ji",
-        "Language_ik": "Inupijaki",
-        "Language_io": "Ido",
-        "Language_is": "Islandski",
-        "Language_it": "Italijanski",
-        "Language_iu": "Inuktituti",
-        "Language_ja": "Japanski",
-        "Language_jv": "Javanski",
-        "Language_ka": "Gruzijski",
-        "Language_kg": "Kongo",
-        "Language_ki": "Kukuju",
-        "Language_kj": "Kvanjama",
-        "Language_kk": "Kazahstanski",
-        "Language_kl": "Grenlandski",
-        "Language_km": "Central kmerski",
-        "Language_kn": "Kanada",
-        "Language_ko": "Korejski",
-        "Language_kr": "Kanuri",
-        "Language_ks": "Kašmirski",
-        "Language_ku": "Kurdski",
-        "Language_kv": "Komi",
-        "Language_kw": "Korniš",
-        "Language_ky": "Kirgizijski",
-        "Language_la": "Latinski",
-        "Language_lb": "Luksemburški",
-        "Language_lg": "Ganda",
-        "Language_li": "Limburški",
-        "Language_ln": "Lingala",
-        "Language_lo": "Laoški",
-        "Language_lt": "Litvanski",
-        "Language_lu": "Luba-Katanga",
-        "Language_lv": "Letonski",
-        "Language_mg": "Malagasi",
-        "Language_mh": "Maršalski",
-        "Language_mi": "Maorski",
-        "Language_mk": "Makedonski",
-        "Language_ml": "Malajalam",
-        "Language_mn": "Mongolski",
-        "Language_mr": "Marati",
-        "Language_ms": "Maležanski",
-        "Language_mt": "Malteški",
-        "Language_my": "Burmanski",
-        "Language_na": "Nauru",
-        "Language_nb": "Bokma",
-        "Language_nd": "Severni ndebele",
-        "Language_ne": "Nepalski",
-        "Language_ng": "Ndonga",
-        "Language_nl": "Holandski",
-        "Language_nn": "Njorsk",
-        "Language_no": "Norveški",
-        "Language_nr": "Južni ndebele",
-        "Language_nv": "Navaho",
-        "Language_ny": "Čičeva",
-        "Language_oc": "Očitan",
-        "Language_oj": "Odžibva",
-        "Language_om": "Oroma",
-        "Language_or": "Orija",
-        "Language_os": "Osetijski",
-        "Language_pa": "Pundžabi",
-        "Language_pi": "Pali",
-        "Language_pl": "Poljski",
-        "Language_ps": "Pašto",
-        "Language_pt": "Portugalski",
-        "Language_qu": "Kečua",
-        "Language_rm": "Reto romans",
-        "Language_rn": "Rundi",
-        "Language_ro": "Rumunski",
-        "Language_ru": "Ruski",
-        "Language_rw": "Kinjarvanda",
-        "Language_sa": "Sanskrit",
-        "Language_sc": "Sardinijski",
-        "Language_sd": "Sindi",
-        "Language_se": "Severni Sami",
-        "Language_sg": "Sango",
-        "Language_si": "Sinala",
-        "Language_sk": "Slovački",
-        "Language_sl": "Slovenački",
-        "Language_sm": "Samoanski",
-        "Language_sn": "Šona",
-        "Language_so": "Somalijski",
-        "Language_sq": "Albanski",
-        "Language_sr": "Srpski",
-        "Language_ss": "Svati",
-        "Language_st": "Soto",
-        "Language_su": "Sudanski",
-        "Language_sv": "Švedski",
-        "Language_sw": "Svahili",
-        "Language_ta": "Tamilski",
-        "Language_te": "Telugu",
-        "Language_tg": "Tadžikistanski",
-        "Language_th": "Tajlandski",
-        "Language_ti": "Tigrinija",
-        "Language_tk": "Turkmenistanski",
-        "Language_tl": "Tagalog",
-        "Language_tn": "Cvana",
-        "Language_to": "Tonga",
-        "Language_tr": "Turski",
-        "Language_ts": "Conga",
-        "Language_tt": "Tatarski",
-        "Language_tw": "Tui",
-        "Language_ty": "Tahićanski",
-        "Language_ug": "Jigur",
-        "Language_uk": "Ukrajinski",
-        "Language_ur": "Urdu",
-        "Language_uz": "Uzbekistanski",
-        "Language_ve": "Venda",
-        "Language_vi": "Vijetnamski",
-        "Language_vo": "Volapik",
-        "Language_wa": "Valon",
-        "Language_wo": "Volof",
-        "Language_xh": "Ćoša",
-        "Language_yi": "Jidiš",
-        "Language_yo": "Joruba",
-        "Language_za": "Čueng",
-        "Language_zh": "Kineski",
-        "Language_zu": "Zulu",
-        "LanguageCode": "Kod jezika",
-        "PluginDescription": "Izveštaj o različitim parametrima vezanim za posetioce: brauzeri, operativni sistemi, dodaci, ekranske rezolucije, globalna podešavanja.",
-        "PluginDetectionDoesNotWorkInIE": "Pažnja: detekcija dodataka ne radi kod Internet Explorera. Ovaj izveštaj se odnosi samo na brauzere koji nisu Internet Exlorer",
-        "Resolutions": "Rezolucije",
-        "VisitorSettings": "Parametri posetilaca",
-        "WidgetGlobalVisitors": "Globalna podešavanja posetilaca",
-        "WidgetGlobalVisitorsDocumentation": "Ovaj izveštaj prikazuje najčešća podešavanja vaših posetilaca. Pod podešavanjem podrazumevamo kombinaciju operativnog sistema, tipa brauzera i ekranske rezolucije.",
-        "WidgetPlugins": "Lista dodataka",
-        "WidgetPluginsDocumentation": "Ovaj izveštaj prikazuje koje dodatke za brauzere vaši posetioci imaju uključene. Ova informacija može biti od značaja prilikom odabira pravog načina prikaza sadržaja na vašem sajtu.",
-        "WidgetResolutions": "Rezolucije ekrana"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/sv.json b/plugins/UserSettings/lang/sv.json
deleted file mode 100644
index 558b7c7dfd..0000000000
--- a/plugins/UserSettings/lang/sv.json
+++ /dev/null
@@ -1,204 +0,0 @@
-{
-    "UserSettings": {
-        "BrowserLanguage": "Webbläsarspråk",
-        "BrowserWithNoPluginsEnabled": "%1$s med inga plugins är aktiverad",
-        "BrowserWithPluginsEnabled": "%1$s med plugins %2$s är aktiverad",
-        "ColumnConfiguration": "Konfiguration",
-        "ColumnResolution": "Skärmupplösning",
-        "Configurations": "Konfiguration",
-        "Language_aa": "Afar",
-        "Language_ab": "Abchaziska",
-        "Language_ae": "Avestiska",
-        "Language_af": "Afrikaans",
-        "Language_ak": "Akan",
-        "Language_am": "Amhariska",
-        "Language_an": "Aragonesiska",
-        "Language_ar": "Arabiska",
-        "Language_as": "Assamesiska",
-        "Language_av": "Avariska",
-        "Language_ay": "Ayamara",
-        "Language_az": "Azerbajdzjanska",
-        "Language_ba": "Basjkiriska",
-        "Language_be": "Vitryska",
-        "Language_bg": "Bulgariska",
-        "Language_bh": "Bihari",
-        "Language_bi": "Bislama",
-        "Language_bm": "Bambara",
-        "Language_bn": "Bengali",
-        "Language_bo": "Tibetanska",
-        "Language_br": "Bretonska",
-        "Language_bs": "Bosniska",
-        "Language_ca": "Katalanska",
-        "Language_ce": "Tjetjenska",
-        "Language_ch": "Chamorro",
-        "Language_co": "Korsikanska",
-        "Language_cr": "Cree",
-        "Language_cs": "Tjeckiska",
-        "Language_cu": "Kyrkslaviska",
-        "Language_cv": "Tjuvasjiska",
-        "Language_cy": "Kymriska",
-        "Language_da": "Danska",
-        "Language_de": "Tyska",
-        "Language_dv": "Divehi",
-        "Language_dz": "Dzongkha",
-        "Language_ee": "Ewe",
-        "Language_el": "Grekiska",
-        "Language_en": "Engelska",
-        "Language_eo": "Esperanto",
-        "Language_es": "Spanska",
-        "Language_et": "Estniska",
-        "Language_eu": "Baskiska",
-        "Language_fa": "Persiska",
-        "Language_ff": "Fulah",
-        "Language_fi": "Finska",
-        "Language_fj": "Fijianska",
-        "Language_fo": "Färöiska",
-        "Language_fr": "Franska",
-        "Language_fy": "Frisiska",
-        "Language_ga": "Iriska",
-        "Language_gd": "Gaeliska",
-        "Language_gl": "Galiciska",
-        "Language_gn": "Guarani",
-        "Language_gu": "Gujarati",
-        "Language_gv": "Manx",
-        "Language_ha": "Hausa",
-        "Language_he": "Hebreiska",
-        "Language_hi": "Hindi",
-        "Language_ho": "Hiri Motu",
-        "Language_hr": "Kroatiska",
-        "Language_ht": "Haitisk kreol",
-        "Language_hu": "Ungerska",
-        "Language_hy": "Armeniska",
-        "Language_hz": "Herero",
-        "Language_ia": "Interlingua",
-        "Language_id": "Indonesiska",
-        "Language_ie": "Interlingue",
-        "Language_ig": "Igbo",
-        "Language_ii": "Sichuan Yi",
-        "Language_ik": "Iñupiaq",
-        "Language_io": "Ido",
-        "Language_is": "Isländska",
-        "Language_it": "Italienska",
-        "Language_iu": "Inuktitut",
-        "Language_ja": "Japanska",
-        "Language_jv": "Javanesiska",
-        "Language_ka": "Georgiska",
-        "Language_kg": "Kongolesiska",
-        "Language_ki": "Kukuyu",
-        "Language_kj": "Kuanyama",
-        "Language_kk": "Kazakiska",
-        "Language_kl": "Grönländska",
-        "Language_km": "Kambodjanska",
-        "Language_kn": "Kannada",
-        "Language_ko": "Koreanska",
-        "Language_kr": "Kanuri",
-        "Language_ks": "Kashmiri",
-        "Language_ku": "Kurdiska",
-        "Language_kv": "Komi",
-        "Language_kw": "Cornish",
-        "Language_ky": "Kirgiziska",
-        "Language_la": "Latin",
-        "Language_lb": "Luxemburgiska",
-        "Language_lg": "Ganda",
-        "Language_li": "Limburgiska",
-        "Language_ln": "Lingala",
-        "Language_lo": "Laotiska",
-        "Language_lt": "Litauiska",
-        "Language_lu": "Luba-Katanga",
-        "Language_lv": "Lettiska",
-        "Language_mg": "Madagaskiska",
-        "Language_mh": "Marshallese",
-        "Language_mi": "Maori",
-        "Language_mk": "Makedonska",
-        "Language_ml": "Malayalam",
-        "Language_mn": "Mongoliska",
-        "Language_mr": "Marathi",
-        "Language_ms": "Malajiska",
-        "Language_mt": "Maltesiska",
-        "Language_my": "Burmesiska",
-        "Language_na": "Nauriska",
-        "Language_nb": "Norskt bokmål",
-        "Language_nd": "North Ndebele",
-        "Language_ne": "Nepali",
-        "Language_ng": "Ndonga",
-        "Language_nl": "Nederländska",
-        "Language_nn": "Nynorska",
-        "Language_no": "Norska",
-        "Language_nr": "South Ndebele",
-        "Language_nv": "Navajo",
-        "Language_ny": "Chichewa",
-        "Language_oc": "Occitanska",
-        "Language_oj": "Ojibwa",
-        "Language_om": "Oromo",
-        "Language_or": "Oriya",
-        "Language_os": "Ossetian",
-        "Language_pa": "Punjabi",
-        "Language_pi": "Pali",
-        "Language_pl": "Polska",
-        "Language_ps": "Pashto",
-        "Language_pt": "Portugisiska",
-        "Language_qu": "Quechua",
-        "Language_rm": "Rumantsch",
-        "Language_rn": "Kirundi",
-        "Language_ro": "Rumänska",
-        "Language_ru": "Ryska",
-        "Language_rw": "Kinyarwanda",
-        "Language_sa": "Sanskrit",
-        "Language_sc": "Sardiska",
-        "Language_sd": "Sindhi",
-        "Language_se": "Nordsamiska",
-        "Language_sg": "Sangho",
-        "Language_si": "Singalesiska",
-        "Language_sk": "Slovakiska",
-        "Language_sl": "Slovenska",
-        "Language_sm": "Samoanska",
-        "Language_sn": "Shona",
-        "Language_so": "Somaliska",
-        "Language_sq": "Albanska",
-        "Language_sr": "Serbiska",
-        "Language_ss": "Siswati",
-        "Language_st": "Sesotho",
-        "Language_su": "Sundanesiska",
-        "Language_sv": "Svenska",
-        "Language_sw": "Swahili",
-        "Language_ta": "Tamil",
-        "Language_te": "Telugu",
-        "Language_tg": "Tadzjikiska",
-        "Language_th": "Thailändska",
-        "Language_ti": "Tigrinja",
-        "Language_tk": "Turkmenska",
-        "Language_tl": "Tagalog",
-        "Language_tn": "Setswana",
-        "Language_to": "Tonganska",
-        "Language_tr": "Turkiska",
-        "Language_ts": "Tsonga",
-        "Language_tt": "Tatariska",
-        "Language_tw": "Twi",
-        "Language_ty": "Tahitiska",
-        "Language_ug": "Uiguriska",
-        "Language_uk": "Ukrainska",
-        "Language_ur": "Urdu",
-        "Language_uz": "Uzbekiska",
-        "Language_ve": "Venda",
-        "Language_vi": "Vietnamesiska",
-        "Language_vo": "Volapük",
-        "Language_wa": "Vallonska",
-        "Language_wo": "Wolof",
-        "Language_xh": "Xhosa",
-        "Language_yi": "Jiddisch",
-        "Language_yo": "Yoruba",
-        "Language_za": "Zhuang",
-        "Language_zh": "Kinesiska",
-        "Language_zu": "Zulu",
-        "LanguageCode": "Språkkod",
-        "PluginDescription": "Rapporterar olika användarinställningar: Webbläsare, Webbläsarfamilj, operativsystem, Plugins, upplösning, Globala inställningar.",
-        "PluginDetectionDoesNotWorkInIE": "Notering: Plugins upptäckt fungerar inte i Internet Explorer. Denna rapport är endast baserad på icke-IE webbläsare.",
-        "Resolutions": "Skärmupplösning",
-        "VisitorSettings": "Besökarinställningar",
-        "WidgetGlobalVisitors": "Global besökarkonfiguration",
-        "WidgetGlobalVisitorsDocumentation": "Denna rapport visar de vanligaste övergripande konfigurationer som besökarna hade. En konfiguration är en kombination av ett operativsystem, en webbläsare och en skärmupplösning.",
-        "WidgetPlugins": "Lista över plugins",
-        "WidgetPluginsDocumentation": "Denna rapport visar vilka plugins i webbläsaren som besökarna hade aktiverat. Denna information kan vara viktig för att välja rätt sätt att leverera ditt innehåll.",
-        "WidgetResolutions": "Skärmupplösning"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/ta.json b/plugins/UserSettings/lang/ta.json
deleted file mode 100644
index 92e48896c8..0000000000
--- a/plugins/UserSettings/lang/ta.json
+++ /dev/null
@@ -1,188 +0,0 @@
-{
-    "UserSettings": {
-        "Language_aa": "அஃபார்",
-        "Language_ab": "அப்காஜியான்",
-        "Language_ae": "அவெஸ்தான்",
-        "Language_af": "ஆஃப்ரிகான்ஸ்",
-        "Language_ak": "அகான்",
-        "Language_am": "அம்ஹாரிக்",
-        "Language_an": "ஆர்கோனீஸ்",
-        "Language_ar": "அரபு",
-        "Language_as": "அஸ்ஸாமி",
-        "Language_av": "அவேரிக்",
-        "Language_ay": "அய்மரா",
-        "Language_az": "அசர்பாய்ஜானி",
-        "Language_ba": "பாஷ்கிர்",
-        "Language_be": "பைலோருஷ்ன்",
-        "Language_bg": "பல்கேரியன்",
-        "Language_bh": "பிஹாரி",
-        "Language_bi": "பிஸ்லாமா",
-        "Language_bm": "பம்பாரா",
-        "Language_bn": "வங்காளம்",
-        "Language_bo": "திபெத்து",
-        "Language_br": "பிரிடன்",
-        "Language_bs": "போஸ்னியன்",
-        "Language_ca": "காடலான்",
-        "Language_ce": "செசென்",
-        "Language_ch": "சாமோரோ",
-        "Language_co": "கார்சியன்",
-        "Language_cr": "க்ரீ",
-        "Language_cs": "செக்",
-        "Language_cu": "சர்ச் ஸ்லாவிக்",
-        "Language_cv": "சுவாஷ்",
-        "Language_cy": "வெல்ஷ்",
-        "Language_da": "டானிஷ்",
-        "Language_de": "ஜெர்மன்",
-        "Language_dv": "திவேஹி",
-        "Language_dz": "பூடானி",
-        "Language_ee": "ஈஓயே",
-        "Language_el": "கிரேக்கம்",
-        "Language_en": "ஆங்கிலம்",
-        "Language_eo": "எஸ்பரேன்டோ",
-        "Language_es": "ஸ்பேனிஷ்",
-        "Language_et": "எஸ்டோனியன்",
-        "Language_eu": "பஸ்க்",
-        "Language_fa": "பர்ஸியன்",
-        "Language_ff": "ஃபுலா",
-        "Language_fi": "பின்னிஷ்",
-        "Language_fj": "ஃபிஜி",
-        "Language_fo": "ஃபரிஸ்த்",
-        "Language_fr": "பிரெஞ்சு",
-        "Language_fy": "மேற்கத்திய பிரிஷிய",
-        "Language_ga": "ஐரிஷ்",
-        "Language_gd": "ஸ்காட்ஸ் கேலிக்",
-        "Language_gl": "காலிஸியன்",
-        "Language_gn": "குரானி",
-        "Language_gu": "குஜராத்தி",
-        "Language_gv": "மேங்க்ஸ்",
-        "Language_ha": "ஹௌஸா",
-        "Language_he": "ஹுப்ரு",
-        "Language_hi": "இந்தி",
-        "Language_ho": "ஹிரி மோட்டு",
-        "Language_hr": "கரோஷியன்",
-        "Language_ht": "ஹைத்தியன்",
-        "Language_hu": "ஹங்கேரியன்",
-        "Language_hy": "ஆர்மேனியன்",
-        "Language_hz": "ஹெரேரோ",
-        "Language_ia": "இன்டர்லிங்குவா",
-        "Language_id": "இந்தோனேஷியன்",
-        "Language_ie": "இன்டர்லிங்",
-        "Language_ig": "இக்போ",
-        "Language_ii": "சிசுவான் ஈ",
-        "Language_ik": "இனுபியாக்",
-        "Language_io": "இடோ",
-        "Language_is": "ஐஸ்லென்டிக்",
-        "Language_it": "இத்தாலியன்",
-        "Language_iu": "இனுகிடூட்",
-        "Language_ja": "ஜப்பானீஸ்",
-        "Language_jv": "ஜாவானீஸ்",
-        "Language_ka": "ஜியோர்ஜியன்",
-        "Language_kg": "காங்கோ",
-        "Language_ki": "கிகுயூ",
-        "Language_kj": "குவான்யாமா",
-        "Language_kk": "கசாக்",
-        "Language_kl": "கலாலிசூட்",
-        "Language_km": "கெமெர்",
-        "Language_kn": "கன்னடம்",
-        "Language_ko": "கொரியன்",
-        "Language_kr": "கனுரி",
-        "Language_ks": "காஷ்மிரி",
-        "Language_ku": "குர்திஷ்",
-        "Language_kv": "கோமி",
-        "Language_kw": "கார்னிஷ்",
-        "Language_ky": "கிர்கிஷ்",
-        "Language_la": "லத்தின்",
-        "Language_lb": "லக்க்ஷெம்பர்கிஷ்",
-        "Language_lg": "கான்டா",
-        "Language_li": "லிம்பர்கிஷ்",
-        "Language_ln": "லிங்காலா",
-        "Language_lo": "லோத்தியன்",
-        "Language_lt": "லிதுவேனியன்",
-        "Language_lu": "லுபா-கடாங்கா",
-        "Language_lv": "லேட்வியன்",
-        "Language_mg": "மலகாஸி",
-        "Language_mh": "மார்ஷெலிஷ்",
-        "Language_mi": "மௌரி",
-        "Language_mk": "மாஸிடோனியன்",
-        "Language_ml": "மலையாளம்",
-        "Language_mn": "மங்கோலியன்",
-        "Language_mr": "மராத்தி",
-        "Language_ms": "மலாய்",
-        "Language_mt": "மால்டிஸ்",
-        "Language_my": "பர்மிஸ்",
-        "Language_na": "நவ்ரூ",
-        "Language_nb": "நார்வே பொக்மால்",
-        "Language_nd": "வடக்கு தெபெலே",
-        "Language_ne": "நேபாளி",
-        "Language_ng": "தோங்கா",
-        "Language_nl": "டச்சு",
-        "Language_nn": "நார்வேஜியன் நியூநார்ஸ்க்",
-        "Language_no": "நார்வே",
-        "Language_nr": "தெற்கு தெபெலே",
-        "Language_nv": "நவாஜோ",
-        "Language_ny": "நயன்ஜா",
-        "Language_oc": "ஆகிடியன்",
-        "Language_oj": "ஓஜிபவா",
-        "Language_om": "ஒரோமோ",
-        "Language_or": "ஒரியா",
-        "Language_os": "ஒசெட்டிக்",
-        "Language_pa": "பஞ்சாபி",
-        "Language_pi": "பாலி",
-        "Language_pl": "போலிஷ்",
-        "Language_ps": "பாஷ்டோ",
-        "Language_pt": "போர்ச்சுக்கீஸ்",
-        "Language_qu": "கிவேசுவா",
-        "Language_rm": "ரைட்டோ-ரோமென்ஸ்",
-        "Language_rn": "ருண்டி",
-        "Language_ro": "ரோமேனியன்",
-        "Language_ru": "ரஷியன்",
-        "Language_rw": "கின்யாருவான்டா",
-        "Language_sa": "சமஸ்கிருதம்",
-        "Language_sc": "சாடினியன்",
-        "Language_sd": "சிந்தி",
-        "Language_se": "வடக்கு சாமி",
-        "Language_sg": "சாங்கோ",
-        "Language_si": "சிங்களம்",
-        "Language_sk": "ஸ்லோவாக்",
-        "Language_sl": "ஸ்லோவினேயின்",
-        "Language_sm": "ஸாமோவான்",
-        "Language_sn": "ஷோனா",
-        "Language_so": "சோமாலி",
-        "Language_sq": "அல்பெனியன்",
-        "Language_sr": "சர்பியன்",
-        "Language_ss": "ஸ்வாடீ",
-        "Language_st": "தெற்கு ஸோதோ",
-        "Language_su": "சுடானீஸ்",
-        "Language_sv": "ஷீவிடிஸ்",
-        "Language_sw": "சுவாஹிலி",
-        "Language_ta": "தமிழ்",
-        "Language_te": "தெலுங்கு",
-        "Language_tg": "தாஜிக்",
-        "Language_th": "தாய்",
-        "Language_ti": "டிக்ரின்யா",
-        "Language_tk": "டர்க்மென்",
-        "Language_tl": "டாகாலோக்",
-        "Language_tn": "ஸ்வானா",
-        "Language_to": "டோங்கா",
-        "Language_tr": "டர்கிஷ்",
-        "Language_ts": "ஸோங்கா",
-        "Language_tt": "டாடர்",
-        "Language_tw": "ட்வி",
-        "Language_ty": "டஹிதியான்",
-        "Language_ug": "யுகுர்",
-        "Language_uk": "உக்ரேனியன்",
-        "Language_ur": "உருது",
-        "Language_uz": "உஸ்பெக்",
-        "Language_ve": "வென்டா",
-        "Language_vi": "வியட்நாமிஸ்",
-        "Language_vo": "ஒலாபூக்",
-        "Language_wa": "ஒவாலூன்",
-        "Language_wo": "ஒலூஃப்",
-        "Language_xh": "ஹோஷா",
-        "Language_yi": "ஈத்திஷ",
-        "Language_yo": "யோருப்பா",
-        "Language_za": "ஜுவாங்",
-        "Language_zh": "சீனம்",
-        "Language_zu": "ஜூலூ"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/te.json b/plugins/UserSettings/lang/te.json
deleted file mode 100644
index 9a69fd70c9..0000000000
--- a/plugins/UserSettings/lang/te.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-    "UserSettings": {
-        "ColumnConfiguration": "స్వరూపణం",
-        "Configurations": "స్వరూపణలు",
-        "Language_aa": "అఫార్",
-        "Language_ab": "అబ్ఖాజియన్",
-        "Language_ae": "అవేస్టాన్",
-        "Language_af": "ఆఫ్రికాన్స్",
-        "Language_ak": "అకాన్",
-        "Language_am": "అమ్హారిక్",
-        "Language_an": "అరగోనిస్",
-        "Language_ar": "అరబిక్",
-        "Language_as": "అస్సామీస్",
-        "Language_av": "అవారిక్",
-        "Language_ay": "ఐమారా",
-        "Language_az": "అజర్బైజాని",
-        "Language_ba": "బష్కిర్",
-        "Language_be": "బెలరుశియన్",
-        "Language_bg": "బల్గేరియన్",
-        "Language_bh": "బిహారి",
-        "Language_bi": "బిస్లామా",
-        "Language_bm": "బంబారా",
-        "Language_bn": "బెంగాలి",
-        "Language_bo": "టిబెటన్",
-        "Language_br": "బ్రెటన్",
-        "Language_bs": "బాస్నియన్",
-        "Language_ca": "కెటలాన్",
-        "Language_ce": "చెచెన్",
-        "Language_ch": "చమర్రో",
-        "Language_co": "కార్సికన్",
-        "Language_cr": "క్రి",
-        "Language_cs": "చెక్",
-        "Language_cu": "చర్చ స్లావిక్",
-        "Language_cv": "చువాష్",
-        "Language_cy": "వెల్ష్",
-        "Language_da": "డేనిష్",
-        "Language_de": "ఙర్మన్",
-        "Language_dv": "దివేహి",
-        "Language_dz": "జొన్ఖా",
-        "Language_ee": "ఇవే",
-        "Language_el": "గ్రీక్",
-        "Language_en": "ఆంగ్లం",
-        "Language_eo": "ఎస్పరెన్టొ",
-        "Language_es": "స్పానిష్",
-        "Language_et": "ఈస్టొనియన్",
-        "Language_eu": "బాస్క్",
-        "Language_fa": "పర్షియన్",
-        "Language_ff": "ఫ్యుల",
-        "Language_fi": "ఫిన్నిష్",
-        "Language_fj": "ఫిజియన్",
-        "Language_fo": "ఫారొఈస్",
-        "Language_fr": "ఫ్రెంచ్",
-        "Language_fy": "పశ్చిమ ఫ్రిసియన్",
-        "Language_ga": "ఐరిష్",
-        "Language_gd": "స్కాటిష్ గేలిక్",
-        "Language_gl": "గెలిషియన్",
-        "Language_gn": "గురాని",
-        "Language_gu": "గుజరాతి",
-        "Language_gv": "మంకస్",
-        "Language_ha": "హౌసా",
-        "Language_he": "హీబ్రు",
-        "Language_hi": "హిందీ",
-        "Language_ho": "హిరి మోటు",
-        "Language_hr": "క్రొయెషియన్",
-        "Language_ht": "హైయేతియన్",
-        "Language_hu": "హన్గేరియన్",
-        "Language_hy": "ఆర్మేనియన్",
-        "Language_hz": "హిరేరో",
-        "Language_ia": "ఇంటర్లింగువా",
-        "Language_id": "ఇండోనిషియ",
-        "Language_ie": "ఇంటర్ లింగ్",
-        "Language_ig": "ఇగ్బో",
-        "Language_ii": "శిషువన్ ఈ",
-        "Language_ik": "ఇనూపైఏక్",
-        "Language_io": "ఈడౌ",
-        "Language_is": "ఐస్లాండిక్",
-        "Language_it": "ఇటాలియన్",
-        "Language_iu": "ఇనుక్టిటుట్",
-        "Language_ja": "జాపనీస్",
-        "Language_jv": "జావనీస్",
-        "Language_ka": "జార్జియన్",
-        "Language_kg": "కాంగో",
-        "Language_ki": "కికుయు",
-        "Language_kj": "క్వాన్యామ",
-        "Language_kk": "కాజాక్",
-        "Language_kl": "కలాల్లిసూట్",
-        "Language_km": "ఖమ్ర్",
-        "Language_kn": "కన్నడ",
-        "Language_ko": "కొరియన్",
-        "Language_kr": "కానురి",
-        "Language_ks": "కాశ్మీరి",
-        "Language_ku": "కర్డిష్",
-        "Language_kv": "కోమి",
-        "Language_kw": "కోర్నిష్",
-        "Language_ky": "కిర్గిజ్",
-        "Language_la": "లాటిన్",
-        "Language_lb": "లుక్సంబర్గిష్",
-        "Language_lg": "గాండా",
-        "Language_li": "లిమ్బర్గిష్",
-        "Language_ln": "లింగాల",
-        "Language_lo": "లాఓ",
-        "Language_lt": "లిథుయేనియన్",
-        "Language_lu": "లూబ-కటాంగ",
-        "Language_lv": "లాట్వియన్",
-        "Language_mg": "మాలాగసి",
-        "Language_mh": "మార్షలీస్",
-        "Language_mi": "మయోరి",
-        "Language_mk": "మసడోనియన్",
-        "Language_ml": "మలయాళం",
-        "Language_mn": "మంగోలియన్",
-        "Language_mr": "మరాటి",
-        "Language_ms": "మలేయ్",
-        "Language_mt": "మాల్టీస్",
-        "Language_my": "బర్మీస్",
-        "Language_na": "నౌరు",
-        "Language_nb": "నార్వీజియన్ బొక్మాల్",
-        "Language_nd": "ఉత్తర దెబెలె",
-        "Language_ne": "నేపాలి",
-        "Language_ng": "దోంగా",
-        "Language_nl": "డచ్",
-        "Language_nn": "నార్విజియాన్ న్యోర్స్క్",
-        "Language_no": "నార్విజియాన్",
-        "Language_nr": "దక్షిణ దెబెలె",
-        "Language_nv": "నవాహో",
-        "Language_ny": "న్యాన్జా",
-        "Language_oc": "ఆక్సిటాన్",
-        "Language_oj": "చేవా",
-        "Language_om": "ఒరోమో",
-        "Language_or": "ఒరియా",
-        "Language_os": "ఒసేటిక్",
-        "Language_pa": "పంజాబీ",
-        "Language_pi": "పాలీ",
-        "Language_pl": "పోలిష్",
-        "Language_ps": "పాష్టో",
-        "Language_pt": "పోర్చుగీస్",
-        "Language_qu": "కెషుయా",
-        "Language_rm": "ర్హెతో-రోమాన్స్",
-        "Language_rn": "రండి",
-        "Language_ro": "రోమానియన్",
-        "Language_ru": "రష్యన్",
-        "Language_rw": "కిన్యర్వాండా",
-        "Language_sa": "సంసృతం",
-        "Language_sc": "సార్డీనియన్",
-        "Language_sd": "సింధీ",
-        "Language_se": "ఉత్తర సామి",
-        "Language_sg": "సాంగో",
-        "Language_si": "సింహాల",
-        "Language_sk": "స్లోవాక్",
-        "Language_sl": "స్లోవేనియాన్",
-        "Language_sm": "సమోవన్",
-        "Language_sn": "షోన",
-        "Language_so": "సోమాలి",
-        "Language_sq": "అల్బేనియన్",
-        "Language_sr": "సెర్బియన్",
-        "Language_ss": "స్వాతి",
-        "Language_st": "దక్షిణ సోతో",
-        "Language_su": "సుడానీస్",
-        "Language_sv": "స్వీడిష్",
-        "Language_sw": "స్వాహిలి",
-        "Language_ta": "తమిళము",
-        "Language_te": "తెలుగు",
-        "Language_tg": "తాజిక్",
-        "Language_th": "థాయ్",
-        "Language_ti": "తిగ్రిన్యా",
-        "Language_tk": "తుర్కమెన్",
-        "Language_tl": "తగలోగ్",
-        "Language_tn": "సెటస్వానా",
-        "Language_to": "టోంగా",
-        "Language_tr": "టర్కిష్",
-        "Language_ts": "సోంగా",
-        "Language_tt": "టాటర్",
-        "Language_tw": "ట్వి",
-        "Language_ty": "తహితియన్",
-        "Language_ug": "ఉయ్ఘుర్",
-        "Language_uk": "యుక్రేనియాన్",
-        "Language_ur": "ఉర్దూ",
-        "Language_uz": "ఉజ్బెక్",
-        "Language_ve": "వెండా",
-        "Language_vi": "వియత్నామీస్",
-        "Language_vo": "వోలాపుక్",
-        "Language_wa": "వాలూన్",
-        "Language_wo": "వొలాఫ్",
-        "Language_xh": "షోసా",
-        "Language_yi": "యిడ్డిష్",
-        "Language_yo": "యోరుబా",
-        "Language_za": "జువాన్",
-        "Language_zh": "చైనీస్",
-        "Language_zu": "జూలూ",
-        "LanguageCode": "భాషా సంకేతం",
-        "VisitorSettings": "సందర్శకుల అమరికలు"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/th.json b/plugins/UserSettings/lang/th.json
deleted file mode 100644
index ee090e2165..0000000000
--- a/plugins/UserSettings/lang/th.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-    "UserSettings": {
-        "ColumnConfiguration": "การตั้งค่า",
-        "ColumnResolution": "ความละเอียด",
-        "Configurations": "การกำหนดค่า",
-        "Language_aa": "อะฟาร์",
-        "Language_ab": "อับคาซ",
-        "Language_ae": "อเวสตะ",
-        "Language_af": "แอฟริกานส์",
-        "Language_ak": "อาคัน",
-        "Language_am": "อัมฮารา",
-        "Language_an": "อารากอน",
-        "Language_ar": "อาหรับ",
-        "Language_as": "อัสสัม",
-        "Language_av": "อาวาร์",
-        "Language_ay": "ไอย์มารา",
-        "Language_az": "อาเซอร์ไบจาน",
-        "Language_ba": "บัชคีร์",
-        "Language_be": "เบลารุส",
-        "Language_bg": "บัลแกเรีย",
-        "Language_bh": "พิหาร",
-        "Language_bi": "บิสลามา",
-        "Language_bm": "บัมบารา",
-        "Language_bn": "เบงกาลี",
-        "Language_bo": "ทิเบต",
-        "Language_br": "เบรตัน",
-        "Language_bs": "บอสเนีย",
-        "Language_ca": "กาตาลัง",
-        "Language_ce": "เชเชน",
-        "Language_ch": "ชามอร์โร",
-        "Language_co": "คอร์ซิกา",
-        "Language_cr": "ครี",
-        "Language_cs": "เช็ก",
-        "Language_cu": "เชอร์ชสลาวิก",
-        "Language_cv": "ชูวัช",
-        "Language_cy": "เวลส์",
-        "Language_da": "เดนมาร์ก",
-        "Language_de": "เยอรมัน",
-        "Language_dv": "ธิเวหิ",
-        "Language_dz": "ซองคา",
-        "Language_ee": "เอเว",
-        "Language_el": "กรีก",
-        "Language_en": "อังกฤษ",
-        "Language_eo": "เอสเปอรันโต",
-        "Language_es": "สเปน",
-        "Language_et": "เอสโตเนีย",
-        "Language_eu": "บัสเก",
-        "Language_fa": "เปอร์เซีย",
-        "Language_ff": "ฟูลาฮ์",
-        "Language_fi": "ฟินแลนด์",
-        "Language_fj": "ฟิจิ",
-        "Language_fo": "แฟโร",
-        "Language_fr": "ฝรั่งเศส",
-        "Language_fy": "ฟริเซียนตะวันตก",
-        "Language_ga": "ไอริช",
-        "Language_gd": "สกอตส์กาลิก",
-        "Language_gl": "กาลิเซีย",
-        "Language_gn": "กวารานี",
-        "Language_gu": "คุชราต",
-        "Language_gv": "มานซ์",
-        "Language_ha": "เฮาชา",
-        "Language_he": "ฮิบรู",
-        "Language_hi": "ฮินดี",
-        "Language_ho": "ฮีรีโมตู",
-        "Language_hr": "โครเอเชีย",
-        "Language_ht": "เฮติ",
-        "Language_hu": "ฮังการี",
-        "Language_hy": "อาร์เมเนีย",
-        "Language_hz": "เฮเรโร",
-        "Language_ia": "อินเตอร์ลิงกัว",
-        "Language_id": "อินโดนีเชีย",
-        "Language_ie": "อินเตอร์ลิงกิว",
-        "Language_ig": "อิกโบ",
-        "Language_ii": "เสฉวนยิ",
-        "Language_ik": "อีนูเปียก",
-        "Language_io": "อีโด",
-        "Language_is": "ไอซ์แลนด์",
-        "Language_it": "อิตาลี",
-        "Language_iu": "อินุกติตุต",
-        "Language_ja": "ญี่ปุ่น",
-        "Language_jv": "ชวา",
-        "Language_ka": "จอร์เจีย",
-        "Language_kg": "คองโก",
-        "Language_ki": "กีกูยู",
-        "Language_kj": "กวนยามา",
-        "Language_kk": "คาซัค",
-        "Language_kl": "กรีนแลนด์",
-        "Language_km": "เขมร",
-        "Language_kn": "กันนาดา",
-        "Language_ko": "เกาหลี",
-        "Language_kr": "คานูรี",
-        "Language_ks": "กัศมีร์",
-        "Language_ku": "เคิร์ด",
-        "Language_kv": "โกมิ",
-        "Language_kw": "คอร์นิช",
-        "Language_ky": "คีร์กีซ",
-        "Language_la": "ละติน",
-        "Language_lb": "ลักเซมเบิร์ก",
-        "Language_lg": "ยูกันดา",
-        "Language_li": "ลิมเบิร์ก",
-        "Language_ln": "ลิงกาลา",
-        "Language_lo": "ลาว",
-        "Language_lt": "ลิทัวเนีย",
-        "Language_lu": "ลูบา-กาตองกา",
-        "Language_lv": "ลัตเวีย",
-        "Language_mg": "มาลากาซี",
-        "Language_mh": "มาร์แชลลิส",
-        "Language_mi": "เมารี",
-        "Language_mk": "มาซิโดเนีย",
-        "Language_ml": "มาลายาลัม",
-        "Language_mn": "มองโกเลีย",
-        "Language_mr": "มราฐี",
-        "Language_ms": "มาเลย์",
-        "Language_mt": "มอลตา",
-        "Language_my": "พม่า",
-        "Language_na": "นาอูรู",
-        "Language_nb": "นอร์เวย์บุคมอล",
-        "Language_nd": "เอ็นเดเบเลเหนือ",
-        "Language_ne": "เนปาล",
-        "Language_ng": "ดองกา",
-        "Language_nl": "ดัตช์",
-        "Language_nn": "นอร์เวย์นีนอสก์",
-        "Language_no": "นอร์เวย์",
-        "Language_nr": "เอ็นเดเบเลใต้",
-        "Language_nv": "นาวาโฮ",
-        "Language_ny": "เนียนจา",
-        "Language_oc": "อ็อกซิตัน",
-        "Language_oj": "โอจิบวา",
-        "Language_om": "โอโรโม",
-        "Language_or": "โอริยา",
-        "Language_os": "ออสเซเตีย",
-        "Language_pa": "ปัญจาบ",
-        "Language_pi": "บาลี",
-        "Language_pl": "โปแลนด์",
-        "Language_ps": "พาชตู",
-        "Language_pt": "โปรตุเกส",
-        "Language_qu": "ควิชัว",
-        "Language_rm": "เรโต-โรแมนซ์",
-        "Language_rn": "บุรุนดี",
-        "Language_ro": "โรมาเนีย",
-        "Language_ru": "รัสเซีย",
-        "Language_rw": "รวันดา",
-        "Language_sa": "สันสกฤต",
-        "Language_sc": "ซาร์เดญา",
-        "Language_sd": "สินธุ",
-        "Language_se": "ซามิเหนือ",
-        "Language_sg": "แซงโก",
-        "Language_si": "สิงหล",
-        "Language_sk": "สโลวัก",
-        "Language_sl": "สโลวีเนีย",
-        "Language_sm": "ซามัว",
-        "Language_sn": "โชนา",
-        "Language_so": "โซมาลี",
-        "Language_sq": "แอลเบเนีย",
-        "Language_sr": "เซอร์เบีย",
-        "Language_ss": "สวาติ",
-        "Language_st": "โซโทใต้",
-        "Language_su": "ซุนดา",
-        "Language_sv": "สวีเดน",
-        "Language_sw": "สวาฮีลี",
-        "Language_ta": "ทมิฬ",
-        "Language_te": "เตลูกู",
-        "Language_tg": "ทาจิก",
-        "Language_th": "ไทย",
-        "Language_ti": "ติกริญญา",
-        "Language_tk": "เติร์กเมนิสถาน",
-        "Language_tl": "ตากาล็อก",
-        "Language_tn": "บอตสวานา",
-        "Language_to": "ตองกา",
-        "Language_tr": "ตุรกี",
-        "Language_ts": "ซิิตซองกา",
-        "Language_tt": "ตาตาร์",
-        "Language_tw": "ทวิ",
-        "Language_ty": "ตาฮิตี",
-        "Language_ug": "อุยกัว",
-        "Language_uk": "ยูเครน",
-        "Language_ur": "อูรดู",
-        "Language_uz": "อุซเบก",
-        "Language_ve": "เวนดา",
-        "Language_vi": "เวียดนาม",
-        "Language_vo": "โวลาพึค",
-        "Language_wa": "วาโลนี",
-        "Language_wo": "โวลอฟ",
-        "Language_xh": "คะห์โอซา",
-        "Language_yi": "ยิว",
-        "Language_yo": "โยรูบา",
-        "Language_za": "จ้วง",
-        "Language_zh": "จีน",
-        "Language_zu": "ซูลู",
-        "LanguageCode": "รหัสภาษา",
-        "PluginDescription": "รายงานการตั้งค่าผู้ใช้ต่างๆ: เบราว์เซอร์, ตระกูลเบราว์เซอร์,ระบบปฏิบัติการ, ปลั๊กอิน, การแก้ไขและการตั้งค่าส่วนกลาง",
-        "PluginDetectionDoesNotWorkInIE": "หมายเหตุ: ตรวจสอบปลั๊กอินไม่ทำงานใน Internet Explorer รายงานนี้จะอิงตามเฉพาะเบราว์เซอร์ที่ไม่ใช่ IE",
-        "Resolutions": "ความละเอียด",
-        "VisitorSettings": "การตั้งค่าของผู้เข้าชม",
-        "WidgetGlobalVisitors": "การตั้งค่าผู้เข้าชมโดยรวม",
-        "WidgetPlugins": "รายการปลั้กอิน",
-        "WidgetResolutions": "ความละเอียดจอภาพ"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/tl.json b/plugins/UserSettings/lang/tl.json
deleted file mode 100644
index 19b42e9bf8..0000000000
--- a/plugins/UserSettings/lang/tl.json
+++ /dev/null
@@ -1,203 +0,0 @@
-{
-    "UserSettings": {
-        "BrowserLanguage": "wika ng browser",
-        "BrowserWithNoPluginsEnabled": "%1$s na may plugins na hindi pinapagana",
-        "BrowserWithPluginsEnabled": "%1$s na may mga plugin %2$s na naka-enable",
-        "ColumnConfiguration": "Configuration",
-        "ColumnResolution": "Resolusyon",
-        "Configurations": "Configurations",
-        "Language_aa": "Afar",
-        "Language_ab": "Abkhazian",
-        "Language_ae": "Avestan",
-        "Language_af": "Aprikaans",
-        "Language_ak": "Akan",
-        "Language_am": "Amharic",
-        "Language_an": "Aragonese",
-        "Language_ar": "Arabe",
-        "Language_as": "Assamese",
-        "Language_av": "Avaric",
-        "Language_ay": "Aymara",
-        "Language_az": "Azerbaijani",
-        "Language_ba": "Bashkir",
-        "Language_be": "Belarusian",
-        "Language_bg": "Bulgarian",
-        "Language_bh": "Bihari",
-        "Language_bi": "Bislama",
-        "Language_bm": "Bambara",
-        "Language_bn": "Bengali",
-        "Language_bo": "Tibet",
-        "Language_br": "Breton",
-        "Language_bs": "Bosnian",
-        "Language_ca": "Katalan",
-        "Language_ce": "Chechen",
-        "Language_ch": "Chamorro",
-        "Language_co": "Cosican",
-        "Language_cr": "Cree",
-        "Language_cs": "Tsek",
-        "Language_cu": "Iglesia ng Eslabo",
-        "Language_cv": "Tsubas",
-        "Language_cy": "Welsh",
-        "Language_da": "Danish",
-        "Language_de": "Aleman",
-        "Language_dv": "Divehi",
-        "Language_dz": "Dzongka",
-        "Language_ee": "Ewe",
-        "Language_el": "Griyego",
-        "Language_en": "Ingles",
-        "Language_eo": "Esperanto",
-        "Language_es": "Espanyol",
-        "Language_et": "taga-Estonya",
-        "Language_eu": "Basko",
-        "Language_fa": "Persyano",
-        "Language_ff": "Fulah",
-        "Language_fi": "Finnish",
-        "Language_fj": "Fijian",
-        "Language_fo": "Faroese",
-        "Language_fr": "Pranses",
-        "Language_fy": "Western Frisian",
-        "Language_ga": "Irlandes",
-        "Language_gd": "Scottish Gaelic",
-        "Language_gl": "Galician",
-        "Language_gn": "Guarani",
-        "Language_gu": "Gujarati",
-        "Language_gv": "Manx",
-        "Language_ha": "Hausa",
-        "Language_he": "Hebrew",
-        "Language_hi": "Hindi",
-        "Language_ho": "Hiri Motu",
-        "Language_hr": "Kroatyano",
-        "Language_ht": "Haitian Creole",
-        "Language_hu": "Hanggaryan",
-        "Language_hy": "Armenyo",
-        "Language_hz": "Herero",
-        "Language_ia": "Interlingua",
-        "Language_id": "Indonesiyo",
-        "Language_ie": "Interlingue",
-        "Language_ii": "Sichuan Yi",
-        "Language_ik": "Inupiaq",
-        "Language_io": "Ido",
-        "Language_is": "Icelandic",
-        "Language_it": "Italyano",
-        "Language_iu": "Inuktitut",
-        "Language_ja": "Nippongo",
-        "Language_jv": "Javanese",
-        "Language_ka": "taga-Georgia",
-        "Language_kg": "Kongo",
-        "Language_ki": "Kukuyu",
-        "Language_kj": "Kuanyama",
-        "Language_kk": "Kasak",
-        "Language_kl": "Greenlandic",
-        "Language_km": "Central Khmer",
-        "Language_kn": "Kannada",
-        "Language_ko": "Koreano",
-        "Language_kr": "Kanuri",
-        "Language_ks": "Kashmiri",
-        "Language_ku": "Kurdish",
-        "Language_kv": "Komi",
-        "Language_kw": "Cornish",
-        "Language_ky": "Kirgis",
-        "Language_la": "Latin",
-        "Language_lb": "Luxembourgish",
-        "Language_lg": "Ganda",
-        "Language_li": "Limburgish",
-        "Language_ln": "Lingala",
-        "Language_lo": "Lao",
-        "Language_lt": "Lithuanian",
-        "Language_lu": "Luba-Katanga",
-        "Language_lv": "Latvian",
-        "Language_mg": "Malagasi",
-        "Language_mh": "Marshallese",
-        "Language_mi": "Maori",
-        "Language_mk": "Masidoniyan",
-        "Language_ml": "Malayalam",
-        "Language_mn": "Monggolyan",
-        "Language_mr": "Marathi",
-        "Language_ms": "Malay",
-        "Language_mt": "Maltis",
-        "Language_my": "Burmese",
-        "Language_na": "Nauru",
-        "Language_nb": "Norwegian Bokmål",
-        "Language_nd": "North Ndebele",
-        "Language_ne": "Nepali",
-        "Language_ng": "Ndonga",
-        "Language_nl": "Olandes",
-        "Language_nn": "Norwegian Nynorsk",
-        "Language_no": "Norwegian",
-        "Language_nr": "South Ndebele",
-        "Language_nv": "Navajo",
-        "Language_ny": "Chichewa",
-        "Language_oc": "Occitan",
-        "Language_oj": "Ojibwa",
-        "Language_om": "Oroma",
-        "Language_or": "Oriya",
-        "Language_os": "Osit",
-        "Language_pa": "Panjabi",
-        "Language_pi": "Pali",
-        "Language_pl": "Polish",
-        "Language_ps": "Pashto",
-        "Language_pt": "Portuguese",
-        "Language_qu": "Quechua",
-        "Language_rm": "Raeto-Romance",
-        "Language_rn": "Rundi",
-        "Language_ro": "Romano",
-        "Language_ru": "Ruso",
-        "Language_rw": "Kinyarwanda",
-        "Language_sa": "Sanskrit",
-        "Language_sc": "Sardiniyan",
-        "Language_sd": "Sindhi",
-        "Language_se": "Northern Sami",
-        "Language_sg": "Sango",
-        "Language_si": "Sinhala",
-        "Language_sk": "Eslobako",
-        "Language_sl": "Eslobenyan",
-        "Language_sm": "Samoan",
-        "Language_sn": "Shona",
-        "Language_so": "Somali",
-        "Language_sq": "Albanes",
-        "Language_sr": "Serbyan",
-        "Language_ss": "Swati",
-        "Language_st": "Sotho",
-        "Language_su": "Sundanese",
-        "Language_sv": "Suweko",
-        "Language_sw": "Swahili",
-        "Language_ta": "Tamil",
-        "Language_te": "Telugu",
-        "Language_tg": "Tadyiko",
-        "Language_th": "Thai",
-        "Language_ti": "Tigrinya",
-        "Language_tk": "Turkmen",
-        "Language_tl": "Tagalog",
-        "Language_tn": "Tswana",
-        "Language_to": "Tonga",
-        "Language_tr": "Turko",
-        "Language_ts": "Tsonga",
-        "Language_tt": "Tartaro",
-        "Language_tw": "Twi",
-        "Language_ty": "Tahitian",
-        "Language_ug": "Uighur",
-        "Language_uk": "Ukranian",
-        "Language_ur": "Urdu",
-        "Language_uz": "Usbek",
-        "Language_ve": "Venda",
-        "Language_vi": "Vietnamese",
-        "Language_vo": "Volapuk",
-        "Language_wa": "Walloon",
-        "Language_wo": "Wolof",
-        "Language_xh": "Xhosa",
-        "Language_yi": "Yidish",
-        "Language_yo": "Yoruba",
-        "Language_za": "Chuang",
-        "Language_zh": "Tsino",
-        "Language_zu": "Zulu",
-        "LanguageCode": "wika ng code",
-        "PluginDescription": "Ulat para sa ibat-ibang mga Setting ng user: Browser Pamilya ng browser Operating System Plugins Resolution Pang-kalahatang settings.",
-        "PluginDetectionDoesNotWorkInIE": "Tandaan: Ang pagtingin ng Plugin ay hindi gumagana sa Internet Explorer. Ang ulat na ito ay batay lamang sa mga browser na hindi-IE.",
-        "Resolutions": "Mga Resolution",
-        "VisitorSettings": "Mga Setting ng bisita",
-        "WidgetGlobalVisitors": "Configuration ng bisita",
-        "WidgetGlobalVisitorsDocumentation": "Ang ulat na ito ay nagpapakita ng karaniwang pangkalahatang configuration na meron ang iyong bisita. Ang configuration ay binubuo ng operating system uri ng mga browser at screen resolution.",
-        "WidgetPlugins": "Browser Plugins",
-        "WidgetPluginsDocumentation": "Ang ulat na ito ay ipinapakita kung anong browser plugis ang gumagana sa iyong bisita. Ang impormasyon na ito may maaring mahalaga sa pagpili kung paanu ihahatid ang nilalaman nito.",
-        "WidgetResolutions": "Screen Resolution"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/tr.json b/plugins/UserSettings/lang/tr.json
deleted file mode 100644
index c675a5e022..0000000000
--- a/plugins/UserSettings/lang/tr.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-    "UserSettings": {
-        "ColumnConfiguration": "Konfigürasyon",
-        "ColumnResolution": "Çözünürlük",
-        "Configurations": "Konfigürasyonları",
-        "Language_aa": "Afar",
-        "Language_ab": "Abazca",
-        "Language_ae": "Avestçe",
-        "Language_af": "Afrikaan Dili",
-        "Language_ak": "Akan",
-        "Language_am": "Amharca",
-        "Language_an": "Aragonca",
-        "Language_ar": "Arapça",
-        "Language_as": "Assamca",
-        "Language_av": "Avar Dili",
-        "Language_ay": "Aymara",
-        "Language_az": "Azerice",
-        "Language_ba": "Başkırtça",
-        "Language_be": "Beyaz Rusça",
-        "Language_bg": "Bulgarca",
-        "Language_bh": "Bihari",
-        "Language_bi": "Bislama",
-        "Language_bm": "Bambara",
-        "Language_bn": "Bengalce",
-        "Language_bo": "Tibetçe",
-        "Language_br": "Bretonca",
-        "Language_bs": "Boşnakça",
-        "Language_ca": "Katalanca",
-        "Language_ce": "Çeçence",
-        "Language_ch": "Chamorro",
-        "Language_co": "Korsikaca",
-        "Language_cr": "Cree",
-        "Language_cs": "Çekçe",
-        "Language_cu": "Kilise Slavcası",
-        "Language_cv": "Çuvaşça",
-        "Language_cy": "Galce",
-        "Language_da": "Danca",
-        "Language_de": "Almanca",
-        "Language_dv": "Divehi",
-        "Language_dz": "Butan Dili",
-        "Language_ee": "Ewe",
-        "Language_el": "Yunanca",
-        "Language_en": "İngilizce",
-        "Language_eo": "Esperanto",
-        "Language_es": "İspanyolca",
-        "Language_et": "Estonya Dili",
-        "Language_eu": "Baskça",
-        "Language_fa": "Farsça",
-        "Language_ff": "Fulah",
-        "Language_fi": "Fince",
-        "Language_fj": "Fiji Dili",
-        "Language_fo": "Faroe Dili",
-        "Language_fr": "Fransızca",
-        "Language_fy": "Batı Frizcesi",
-        "Language_ga": "İrlanda Dili",
-        "Language_gd": "İskoç Gal Dili",
-        "Language_gl": "Galiçyaca",
-        "Language_gn": "Guarani",
-        "Language_gu": "Gujarati",
-        "Language_gv": "Manks",
-        "Language_ha": "Hausa",
-        "Language_he": "İbranice",
-        "Language_hi": "Hintçe",
-        "Language_ho": "Hiri Motu",
-        "Language_hr": "Hırvatça",
-        "Language_ht": "Haiti Dili",
-        "Language_hu": "Macarca",
-        "Language_hy": "Ermenice",
-        "Language_hz": "Herero",
-        "Language_ia": "Interlingua",
-        "Language_id": "Endonezce",
-        "Language_ie": "Interlingue",
-        "Language_ig": "İbo Dili",
-        "Language_ii": "Sichuan Yi",
-        "Language_ik": "Inupiak",
-        "Language_io": "Ido",
-        "Language_is": "İzlandaca",
-        "Language_it": "İtalyanca",
-        "Language_iu": "Inuktitut",
-        "Language_ja": "Japonca",
-        "Language_jv": "Cava Dili",
-        "Language_ka": "Gürcüce",
-        "Language_kg": "Kongo",
-        "Language_ki": "Kikuyu",
-        "Language_kj": "Kuanyama",
-        "Language_kk": "Kazakça",
-        "Language_kl": "Grönland Dili",
-        "Language_km": "Kamboçya Dili",
-        "Language_kn": "Kannada",
-        "Language_ko": "Korece",
-        "Language_kr": "Kanuri",
-        "Language_ks": "Keşmirce",
-        "Language_ku": "Kürtçe",
-        "Language_kv": "Komi",
-        "Language_kw": "Kernevekçe",
-        "Language_ky": "Kırgızca",
-        "Language_la": "Latince",
-        "Language_lb": "Lüksemburgca",
-        "Language_lg": "Ganda",
-        "Language_li": "Limburgca",
-        "Language_ln": "Lingala",
-        "Language_lo": "Laos Dili",
-        "Language_lt": "Litvanyaca",
-        "Language_lu": "Luba-Katanga",
-        "Language_lv": "Letonca",
-        "Language_mg": "Malagasi",
-        "Language_mh": "Marshall Adaları Dili",
-        "Language_mi": "Maori",
-        "Language_mk": "Makedonca",
-        "Language_ml": "Malayalam",
-        "Language_mn": "Moğolca",
-        "Language_mr": "Marathi",
-        "Language_ms": "Malay",
-        "Language_mt": "Malta Dili",
-        "Language_my": "Birmanya Dili",
-        "Language_na": "Nauru Dili",
-        "Language_nb": "Norveççe Bokmål",
-        "Language_nd": "Kuzey Ndebele",
-        "Language_ne": "Nepalce",
-        "Language_ng": "Ndonga",
-        "Language_nl": "Hollanda Dili",
-        "Language_nn": "Norveççe Nynorsk",
-        "Language_no": "Norveççe",
-        "Language_nr": "Güney Ndebele",
-        "Language_nv": "Navaho Dili",
-        "Language_ny": "Nyanja",
-        "Language_oc": "Oksitanca",
-        "Language_oj": "Ojibva Dili",
-        "Language_om": "Oromo",
-        "Language_or": "Oriya",
-        "Language_os": "Osetçe",
-        "Language_pa": "Pencap Dili",
-        "Language_pi": "Pali",
-        "Language_pl": "Lehçe",
-        "Language_ps": "Peştuca",
-        "Language_pt": "Portekizce",
-        "Language_qu": "Quechua",
-        "Language_rm": "Rhaeto-Roman Dili",
-        "Language_rn": "Kirundi",
-        "Language_ro": "Romence",
-        "Language_ru": "Rusça",
-        "Language_rw": "Kinyarwanda",
-        "Language_sa": "Sanskritçe",
-        "Language_sc": "Sardunya Dili",
-        "Language_sd": "Sindhi",
-        "Language_se": "Kuzey Sami",
-        "Language_sg": "Sangho",
-        "Language_si": "Seylanca",
-        "Language_sk": "Slovakça",
-        "Language_sl": "Slovence",
-        "Language_sm": "Samoa Dili",
-        "Language_sn": "Shona",
-        "Language_so": "Somali Dili",
-        "Language_sq": "Arnavutça",
-        "Language_sr": "Sırpça",
-        "Language_ss": "Siswati",
-        "Language_st": "Güney Sotho",
-        "Language_su": "Sunda Dili",
-        "Language_sv": "İsveççe",
-        "Language_sw": "Swahili",
-        "Language_ta": "Tamilce",
-        "Language_te": "Telugu",
-        "Language_tg": "Tacikçe",
-        "Language_th": "Tayca",
-        "Language_ti": "Tigrinya",
-        "Language_tk": "Türkmence",
-        "Language_tl": "Takalotça",
-        "Language_tn": "Setswana",
-        "Language_to": "Tonga",
-        "Language_tr": "Türkçe",
-        "Language_ts": "Tsonga",
-        "Language_tt": "Tatarca",
-        "Language_tw": "Twi",
-        "Language_ty": "Tahiti Dili",
-        "Language_ug": "Uygurca",
-        "Language_uk": "Ukraynaca",
-        "Language_ur": "Urduca",
-        "Language_uz": "Özbekçe",
-        "Language_ve": "Venda",
-        "Language_vi": "Vietnamca",
-        "Language_vo": "Volapük",
-        "Language_wa": "Valonca",
-        "Language_wo": "Volofca",
-        "Language_xh": "Xhosa",
-        "Language_yi": "Yidiş",
-        "Language_yo": "Yoruba",
-        "Language_za": "Zhuang",
-        "Language_zh": "Çince",
-        "Language_zu": "Zulu",
-        "LanguageCode": "Dil kodu",
-        "PluginDescription": "Çeşitli kullanıcı rapor ayalari: Tarayıcı, Tarayıcı Ailesi, İşletim Sistemi, Eklentiler, Çözünürlük, Genel Ayarlar.",
-        "PluginDetectionDoesNotWorkInIE": "Not: Hedeflenen eklenti Internet Explorer çalışmamaktadir. Bu not\/rapor sadece IE içindir.",
-        "Resolutions": "Çözünürlükler",
-        "VisitorSettings": "Ziyaretçi Ayarlari",
-        "WidgetGlobalVisitors": "Global ziyaretçi konfikasyonu",
-        "WidgetPlugins": "Eklenti Listesi",
-        "WidgetResolutions": "Ekran çözünürlükleri"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/uk.json b/plugins/UserSettings/lang/uk.json
deleted file mode 100644
index 10ae7b655e..0000000000
--- a/plugins/UserSettings/lang/uk.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-    "UserSettings": {
-        "ColumnConfiguration": "Конфігурація",
-        "ColumnResolution": "Роздільна здатність",
-        "Configurations": "Конфігурації",
-        "Language_aa": "афарська",
-        "Language_ab": "абхазька",
-        "Language_ae": "авестійська",
-        "Language_af": "африкаанс",
-        "Language_ak": "акан",
-        "Language_am": "амхарська",
-        "Language_an": "арагонська",
-        "Language_ar": "арабська",
-        "Language_as": "ассамська",
-        "Language_av": "аварська",
-        "Language_ay": "аймара",
-        "Language_az": "азербайджанська",
-        "Language_ba": "башкирська",
-        "Language_be": "білоруська",
-        "Language_bg": "болгарська",
-        "Language_bh": "біхарі",
-        "Language_bi": "біслама",
-        "Language_bm": "бамбара",
-        "Language_bn": "бенгальська",
-        "Language_bo": "тибетська",
-        "Language_br": "бретонська",
-        "Language_bs": "боснійська",
-        "Language_ca": "каталонська",
-        "Language_ce": "чеченська",
-        "Language_ch": "чаморро",
-        "Language_co": "корсиканська",
-        "Language_cr": "крі",
-        "Language_cs": "чеська",
-        "Language_cu": "церковнослов’янська",
-        "Language_cv": "чуваська",
-        "Language_cy": "валлійська",
-        "Language_da": "данська",
-        "Language_de": "німецька",
-        "Language_dv": "дівехі",
-        "Language_dz": "дзонг-ке",
-        "Language_ee": "еве",
-        "Language_el": "грецька",
-        "Language_en": "англійська",
-        "Language_eo": "есперанто",
-        "Language_es": "іспанська",
-        "Language_et": "естонська",
-        "Language_eu": "басків",
-        "Language_fa": "перська",
-        "Language_ff": "фула",
-        "Language_fi": "фінська",
-        "Language_fj": "фіджі",
-        "Language_fo": "фарерська",
-        "Language_fr": "французька",
-        "Language_fy": "фризька",
-        "Language_ga": "ірландська",
-        "Language_gd": "гаельська",
-        "Language_gl": "галісійська",
-        "Language_gn": "гуарані",
-        "Language_gu": "гуджараті",
-        "Language_gv": "менкська",
-        "Language_ha": "хауса",
-        "Language_he": "іврит",
-        "Language_hi": "гінді",
-        "Language_ho": "хірі-моту",
-        "Language_hr": "хорватська",
-        "Language_ht": "гаїтянська",
-        "Language_hu": "угорська",
-        "Language_hy": "вірменська",
-        "Language_hz": "гереро",
-        "Language_ia": "інтерлінгва",
-        "Language_id": "індонезійська",
-        "Language_ie": "інтерлінгве",
-        "Language_ig": "ігбо",
-        "Language_ii": "сичуань",
-        "Language_ik": "інупіак",
-        "Language_io": "ідо",
-        "Language_is": "ісландська",
-        "Language_it": "італійська",
-        "Language_iu": "інуктітут",
-        "Language_ja": "японська",
-        "Language_jv": "яванська",
-        "Language_ka": "грузинська",
-        "Language_kg": "конґолезька",
-        "Language_ki": "кікуйю",
-        "Language_kj": "кунама",
-        "Language_kk": "казахська",
-        "Language_kl": "калааллісут",
-        "Language_km": "кхмерська",
-        "Language_kn": "каннада",
-        "Language_ko": "корейська",
-        "Language_kr": "канурі",
-        "Language_ks": "кашмірська",
-        "Language_ku": "курдська",
-        "Language_kv": "комі",
-        "Language_kw": "корнійська",
-        "Language_ky": "киргизька",
-        "Language_la": "латинська",
-        "Language_lb": "люксембурзька",
-        "Language_lg": "ганда",
-        "Language_li": "лімбургійська",
-        "Language_ln": "лінгала",
-        "Language_lo": "лаоська",
-        "Language_lt": "литовська",
-        "Language_lu": "луба-катанга",
-        "Language_lv": "латвійська",
-        "Language_mg": "малагасійська",
-        "Language_mh": "маршалльська",
-        "Language_mi": "маорі",
-        "Language_mk": "македонська",
-        "Language_ml": "малайялам",
-        "Language_mn": "монгольська",
-        "Language_mr": "маратхі",
-        "Language_ms": "малайська",
-        "Language_mt": "мальтійська",
-        "Language_my": "бірманська",
-        "Language_na": "науру",
-        "Language_nb": "норвезька букмол",
-        "Language_nd": "ндебелє північна",
-        "Language_ne": "непальська",
-        "Language_ng": "ндонга",
-        "Language_nl": "голландська",
-        "Language_nn": "норвезька нюнорськ",
-        "Language_no": "норвезька",
-        "Language_nr": "ндебелє південна",
-        "Language_nv": "навахо",
-        "Language_ny": "ньянджа",
-        "Language_oc": "окитан",
-        "Language_oj": "оджібва",
-        "Language_om": "оромо",
-        "Language_or": "орія",
-        "Language_os": "осетинська",
-        "Language_pa": "панджабі",
-        "Language_pi": "палі",
-        "Language_pl": "польська",
-        "Language_ps": "пушту",
-        "Language_pt": "португальська",
-        "Language_qu": "кечуа",
-        "Language_rm": "ретороманська",
-        "Language_rn": "рунді",
-        "Language_ro": "румунська",
-        "Language_ru": "російська",
-        "Language_rw": "кіньяруанда",
-        "Language_sa": "санскрит",
-        "Language_sc": "сардинська",
-        "Language_sd": "сіндхі",
-        "Language_se": "саамська північна",
-        "Language_sg": "санго",
-        "Language_si": "сингальська",
-        "Language_sk": "словацька",
-        "Language_sl": "словенська",
-        "Language_sm": "самоанська",
-        "Language_sn": "шона",
-        "Language_so": "сомалі",
-        "Language_sq": "албанська",
-        "Language_sr": "сербська",
-        "Language_ss": "сісваті",
-        "Language_st": "сото південна",
-        "Language_su": "сунданська",
-        "Language_sv": "шведська",
-        "Language_sw": "суахілі",
-        "Language_ta": "тамільська",
-        "Language_te": "телугу",
-        "Language_tg": "таджицька",
-        "Language_th": "тайська",
-        "Language_ti": "тигріні",
-        "Language_tk": "туркменська",
-        "Language_tl": "тагальська",
-        "Language_tn": "тсвана",
-        "Language_to": "Тонга",
-        "Language_tr": "турецька",
-        "Language_ts": "тсонга",
-        "Language_tt": "татарська",
-        "Language_tw": "тві",
-        "Language_ty": "таїтянська",
-        "Language_ug": "уйгурська",
-        "Language_uk": "українська",
-        "Language_ur": "урду",
-        "Language_uz": "узбецька",
-        "Language_ve": "венда",
-        "Language_vi": "вʼєтнамська",
-        "Language_vo": "волап’юк",
-        "Language_wa": "валлонська",
-        "Language_wo": "волоф",
-        "Language_xh": "кхоса",
-        "Language_yi": "ідиш",
-        "Language_yo": "йоруба",
-        "Language_za": "чжуан",
-        "Language_zh": "китайська",
-        "Language_zu": "зулуська",
-        "LanguageCode": "Код мови",
-        "PluginDescription": "Повідомляє різні налаштуванян користовувача: веб-оглядач, родина веб-оглядача, операційна система, плагіни, роздільна здатність, глобальні налаштування.",
-        "PluginDetectionDoesNotWorkInIE": "Примітка: Визначення плагінів не працює в Internet Explorer. Цей звіт базується лише на не-IE веб-оглядачах.",
-        "Resolutions": "Роздільні здатності",
-        "VisitorSettings": "Налаштування відвідувача",
-        "WidgetGlobalVisitors": "Загальна конфігурація відвідувачів",
-        "WidgetPlugins": "Список плагінів",
-        "WidgetResolutions": "Роздільні здатності"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/vi.json b/plugins/UserSettings/lang/vi.json
deleted file mode 100644
index 07ba3d51f7..0000000000
--- a/plugins/UserSettings/lang/vi.json
+++ /dev/null
@@ -1,204 +0,0 @@
-{
-    "UserSettings": {
-        "BrowserLanguage": "Ngôn ngữ trình duyệt",
-        "BrowserWithNoPluginsEnabled": "%1$s không có plugin nào được kích hoạt",
-        "BrowserWithPluginsEnabled": "%1$s với plugin %2$s đã kích hoạt",
-        "ColumnConfiguration": "Cấu hình",
-        "ColumnResolution": "Độ phân giải",
-        "Configurations": "cấu hình",
-        "Language_aa": "Tiếng Afar",
-        "Language_ab": "Tiếng Abkhazia",
-        "Language_ae": "Tiếng Avestan",
-        "Language_af": "Tiếng Nam Phi",
-        "Language_ak": "Tiếng Akan",
-        "Language_am": "Tiếng Amharic",
-        "Language_an": "Tiếng Aragon",
-        "Language_ar": "Tiếng A-rập",
-        "Language_as": "Tiếng Assam",
-        "Language_av": "Tiếng Avaric",
-        "Language_ay": "Tiếng Aymara",
-        "Language_az": "Tiếng Ai-déc-bai-gian",
-        "Language_ba": "Tiếng Bashkir",
-        "Language_be": "Tiếng Bê-la-rút",
-        "Language_bg": "Tiếng Bun-ga-ri",
-        "Language_bh": "Tiếng Bihari",
-        "Language_bi": "Tiếng Bislama",
-        "Language_bm": "Tiếng Bambara",
-        "Language_bn": "Tiếng Bengali (Ấn Độ)",
-        "Language_bo": "Tiếng Tây Tạng",
-        "Language_br": "Tiếng Breton",
-        "Language_bs": "Tiếng Nam Tư",
-        "Language_ca": "Tiếng Ca-ta-lăng",
-        "Language_ce": "Tiếng Chechen",
-        "Language_ch": "Tiếng Chamorro",
-        "Language_co": "Tiếng Corse",
-        "Language_cr": "Tiếng Cree",
-        "Language_cs": "Tiếng Séc",
-        "Language_cu": "Tiếng Slavơ Nhà thờ",
-        "Language_cv": "Tiếng Chuvash",
-        "Language_cy": "Tiếng Xentơ",
-        "Language_da": "Tiếng Đan Mạch",
-        "Language_de": "Tiếng Đức",
-        "Language_dv": "Tiếng Divehi",
-        "Language_dz": "Tiếng Dzongkha",
-        "Language_ee": "Tiếng Ewe",
-        "Language_el": "Tiếng Hy Lạp",
-        "Language_en": "Tiếng Anh",
-        "Language_eo": "Tiếng Quốc Tế Ngữ",
-        "Language_es": "Tiếng Tây Ban Nha",
-        "Language_et": "Tiếng E-xtô-ni-a",
-        "Language_eu": "Tiếng Basque",
-        "Language_fa": "Tiếng Ba Tư",
-        "Language_ff": "Tiếng Fulah",
-        "Language_fi": "Tiếng Phần Lan",
-        "Language_fj": "Tiếng Fiji",
-        "Language_fo": "Tiếng Faore",
-        "Language_fr": "Tiếng Pháp",
-        "Language_fy": "Tiếng Frisian",
-        "Language_ga": "Tiếng Ai-len",
-        "Language_gd": "Tiếng Xentơ (Xcốt len)",
-        "Language_gl": "Tiếng Galician",
-        "Language_gn": "Tiếng Guarani",
-        "Language_gu": "Tiếng Gujarati",
-        "Language_gv": "Tiếng Manx",
-        "Language_ha": "Tiếng Hausa",
-        "Language_he": "Tiếng Hê-brơ",
-        "Language_hi": "Tiếng Hin-đi",
-        "Language_ho": "Tiếng Hiri Motu",
-        "Language_hr": "Tiếng Crô-a-ti-a",
-        "Language_ht": "Tiếng Haiti",
-        "Language_hu": "Tiếng Hung-ga-ri",
-        "Language_hy": "Tiếng Ác-mê-ni",
-        "Language_hz": "Tiếng Herero",
-        "Language_ia": "Tiếng Khoa Học Quốc Tế",
-        "Language_id": "Tiếng In-đô-nê-xia",
-        "Language_ie": "Tiếng Interlingue",
-        "Language_ig": "Tiếng Igbo",
-        "Language_ii": "Tiếng Di Tứ Xuyên",
-        "Language_ik": "Tiếng Inupiaq",
-        "Language_io": "Tiếng Ido",
-        "Language_is": "Tiếng Ai-xơ-len",
-        "Language_it": "Tiếng Ý",
-        "Language_iu": "Tiếng Inuktitut",
-        "Language_ja": "Tiếng Nhật",
-        "Language_jv": "Tiếng Gia-va",
-        "Language_ka": "Tiếng Georgian",
-        "Language_kg": "Tiếng Congo",
-        "Language_ki": "Tiếng Kikuyu",
-        "Language_kj": "Tiếng Kuanyama",
-        "Language_kk": "Tiếng Kazakh",
-        "Language_kl": "Tiếng Kalaallisut",
-        "Language_km": "Tiếng Campuchia",
-        "Language_kn": "Tiếng Kan-na-đa",
-        "Language_ko": "Tiếng Hàn Quốc",
-        "Language_kr": "Tiếng Kanuri",
-        "Language_ks": "Tiếng Kashmiri",
-        "Language_ku": "Tiếng Kurd (Iran)",
-        "Language_kv": "Tiếng Komi",
-        "Language_kw": "Tiếng Cornish",
-        "Language_ky": "Tiếng Kyrgyz",
-        "Language_la": "Tiếng La-tinh",
-        "Language_lb": "Tiếng Luxembourg",
-        "Language_lg": "Tiếng Ganda",
-        "Language_li": "Tiếng Limburg",
-        "Language_ln": "Tiếng Lingala",
-        "Language_lo": "Tiếng Lào",
-        "Language_lt": "Tiếng Lít-va",
-        "Language_lu": "Tiếng Luba-Katanga",
-        "Language_lv": "Tiếng Lát-vi-a",
-        "Language_mg": "Tiếng Malagasy",
-        "Language_mh": "Tiếng Marshall",
-        "Language_mi": "Tiếng Maori",
-        "Language_mk": "Tiếng Ma-xê-đô-ni-a",
-        "Language_ml": "Tiếng Malayalam",
-        "Language_mn": "Tiếng Mông Cổ",
-        "Language_mr": "Tiếng Marathi",
-        "Language_ms": "Tiếng Ma-lay-xi-a",
-        "Language_mt": "Tiếng Mantơ",
-        "Language_my": "Tiếng Miến Điện",
-        "Language_na": "Tiếng Nauru",
-        "Language_nb": "Tiếng Na Uy (Bokmål)",
-        "Language_nd": "Bắc Ndebele",
-        "Language_ne": "Tiếng Nê-pan",
-        "Language_ng": "Tiếng Ndonga",
-        "Language_nl": "Tiếng Hà Lan",
-        "Language_nn": "Tiếng Na Uy (Nynorsk)",
-        "Language_no": "Tiếng Na Uy",
-        "Language_nr": "Tiếng Ndebele Miền Nam",
-        "Language_nv": "Tiếng Navajo",
-        "Language_ny": "Tiếng Nyanja",
-        "Language_oc": "Tiếng Occitan",
-        "Language_oj": "Tiếng Ojibwa",
-        "Language_om": "Tiếng Oromo",
-        "Language_or": "Tiếng Ô-ri-a",
-        "Language_os": "Tiếng Ossetic",
-        "Language_pa": "Tiếng Punjabi",
-        "Language_pi": "Tiếng Pali",
-        "Language_pl": "Tiếng Ba Lan",
-        "Language_ps": "Tiếng Pa-tô",
-        "Language_pt": "Tiếng Bồ Đào Nha",
-        "Language_qu": "Tiếng Quechua",
-        "Language_rm": "Tiếng Rhaeto-Romance",
-        "Language_rn": "Tiếng Rundi",
-        "Language_ro": "Tiếng Ru-ma-ni",
-        "Language_ru": "Tiếng Nga",
-        "Language_rw": "Tiếng Kinyarwanda",
-        "Language_sa": "Tiếng Phạn",
-        "Language_sc": "Tiếng Sardinia",
-        "Language_sd": "Tiếng Sin-hi",
-        "Language_se": "Bắc Sami",
-        "Language_sg": "Tiếng Sango",
-        "Language_si": "Tiếng Sinhala",
-        "Language_sk": "Tiếng Xlô-vác",
-        "Language_sl": "Tiếng Xlô-ven",
-        "Language_sm": "Tiếng Samoa",
-        "Language_sn": "Tiếng Shona",
-        "Language_so": "Tiếng Xô-ma-li",
-        "Language_sq": "Tiếng An-ba-ni",
-        "Language_sr": "Tiếng Séc-bi",
-        "Language_ss": "Tiếng Swati",
-        "Language_st": "Tiếng Sesotho",
-        "Language_su": "Tiếng Xu đăng",
-        "Language_sv": "Tiếng Thụy Điển",
-        "Language_sw": "Tiếng Bantu (Đông Phi)",
-        "Language_ta": "Tiếng Tamil",
-        "Language_te": "Tiếng Telugu",
-        "Language_tg": "Tiếng Tajik",
-        "Language_th": "Tiếng Thái",
-        "Language_ti": "Tiếng Tigrigya",
-        "Language_tk": "Tiếng Tuôc-men",
-        "Language_tl": "Tiếng Tagalog",
-        "Language_tn": "Tiếng Tswana",
-        "Language_to": "Tiếng Tonga",
-        "Language_tr": "Tiếng Thổ Nhĩ Kỳ",
-        "Language_ts": "Tiếng Tsonga",
-        "Language_tt": "Tiếng Tatar",
-        "Language_tw": "Tiếng Twi",
-        "Language_ty": "Tiếng Tahiti",
-        "Language_ug": "Tiếng Uighur",
-        "Language_uk": "Tiếng U-crai-na",
-        "Language_ur": "Tiếng Uđu",
-        "Language_uz": "Tiếng U-dơ-bếch",
-        "Language_ve": "Tiếng Venda",
-        "Language_vi": "Tiếng Việt",
-        "Language_vo": "Tiếng Volapük",
-        "Language_wa": "Tiếng Walloon",
-        "Language_wo": "Tiếng Wolof",
-        "Language_xh": "Tiếng Bantu",
-        "Language_yi": "Tiếng Y-đit",
-        "Language_yo": "Tiếng Yoruba",
-        "Language_za": "Tiếng Zhuang",
-        "Language_zh": "Tiếng Trung Quốc",
-        "Language_zu": "Tiếng Zulu",
-        "LanguageCode": "Mã ngôn ngữ",
-        "PluginDescription": "Cài đặt báo cáo người dùng khác nhau: trình duyệt, họ trình duyệt, Hệ điều hành, Plugin, Độ phân giải, Cài đặt tổng quát.",
-        "PluginDetectionDoesNotWorkInIE": "Chú ý: Các Plugin phát hiện không làm việc trên Internet Explorer. Báo cáo này chỉ dựa trên trình duyệt không phải IE.",
-        "Resolutions": "Độ phân giải",
-        "VisitorSettings": "Thiết lập khách truy cập",
-        "WidgetGlobalVisitors": "Cấu hình khách truy cập",
-        "WidgetGlobalVisitorsDocumentation": "Báo cáo này cho thấy các cấu hình tổng thể phổ biến nhất mà khách truy cập của bạn đã có. Một cấu hình là sự kết hợp của một hệ điều hành, một loại trình duyệt và độ phân giải màn hình.",
-        "WidgetPlugins": "Các Plugin trình duyệt",
-        "WidgetPluginsDocumentation": "Báo cáo này cho thấy các plugin trình duyệt mà khách truy cập của bạn đã kích hoạt. Thông tin này có thể là quan trọng cho việc lựa chọn cách đúng để cung cấp nội dung của bạn.",
-        "WidgetResolutions": "Độ phân giải màn hình"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/zh-cn.json b/plugins/UserSettings/lang/zh-cn.json
deleted file mode 100644
index d176b16886..0000000000
--- a/plugins/UserSettings/lang/zh-cn.json
+++ /dev/null
@@ -1,204 +0,0 @@
-{
-    "UserSettings": {
-        "BrowserLanguage": "浏览器语言",
-        "BrowserWithNoPluginsEnabled": "%1$s 没有启用插件",
-        "BrowserWithPluginsEnabled": "%1$s 启用插件%2$s",
-        "ColumnConfiguration": "客户端配置",
-        "ColumnResolution": "分辨率",
-        "Configurations": "客户端配置",
-        "Language_aa": "阿法文",
-        "Language_ab": "阿布哈西亚文",
-        "Language_ae": "阿维斯塔文",
-        "Language_af": "南非荷兰文",
-        "Language_ak": "阿肯文",
-        "Language_am": "阿姆哈拉文",
-        "Language_an": "阿拉贡文",
-        "Language_ar": "阿拉伯文",
-        "Language_as": "阿萨姆文",
-        "Language_av": "阿瓦尔文",
-        "Language_ay": "艾马拉文",
-        "Language_az": "阿塞拜疆文",
-        "Language_ba": "巴什客尔文",
-        "Language_be": "白俄罗斯文",
-        "Language_bg": "保加利亚文",
-        "Language_bh": "比哈尔文",
-        "Language_bi": "比斯拉马文",
-        "Language_bm": "班巴拉文",
-        "Language_bn": "孟加拉文",
-        "Language_bo": "藏文",
-        "Language_br": "布里多尼文",
-        "Language_bs": "波斯尼亚文",
-        "Language_ca": "加泰罗尼亚文",
-        "Language_ce": "车臣文",
-        "Language_ch": "查莫罗文",
-        "Language_co": "科西嘉文",
-        "Language_cr": "克里族文",
-        "Language_cs": "捷克文",
-        "Language_cu": "宗教斯拉夫文",
-        "Language_cv": "楚瓦什文",
-        "Language_cy": "威尔士文",
-        "Language_da": "丹麦文",
-        "Language_de": "德文",
-        "Language_dv": "迪维希文",
-        "Language_dz": "不丹文",
-        "Language_ee": "埃维文",
-        "Language_el": "希腊文",
-        "Language_en": "英文",
-        "Language_eo": "世界文",
-        "Language_es": "西班牙文",
-        "Language_et": "爱沙尼亚文",
-        "Language_eu": "巴斯克文",
-        "Language_fa": "波斯文",
-        "Language_ff": "夫拉文",
-        "Language_fi": "芬兰文",
-        "Language_fj": "斐济文",
-        "Language_fo": "法罗文",
-        "Language_fr": "法文",
-        "Language_fy": "弗里斯兰文",
-        "Language_ga": "爱尔兰文",
-        "Language_gd": "苏格兰盖尔文",
-        "Language_gl": "加利西亚文",
-        "Language_gn": "瓜拉尼文",
-        "Language_gu": "古加拉提文",
-        "Language_gv": "马恩岛文",
-        "Language_ha": "豪撒文",
-        "Language_he": "希伯来文",
-        "Language_hi": "印地文",
-        "Language_ho": "希里莫图文",
-        "Language_hr": "克罗地亚文",
-        "Language_ht": "海地文",
-        "Language_hu": "匈牙利文",
-        "Language_hy": "亚美尼亚文",
-        "Language_hz": "赫雷罗文",
-        "Language_ia": "国际语",
-        "Language_id": "印度尼西亚文",
-        "Language_ie": "国际语E",
-        "Language_ig": "伊格博文",
-        "Language_ii": "四川话",
-        "Language_ik": "依奴皮维克文",
-        "Language_io": "伊多文",
-        "Language_is": "冰岛文",
-        "Language_it": "意大利文",
-        "Language_iu": "伊努伊特文",
-        "Language_ja": "日文",
-        "Language_jv": "爪哇文",
-        "Language_ka": "格鲁吉亚文",
-        "Language_kg": "刚果文",
-        "Language_ki": "吉库尤文",
-        "Language_kj": "宽亚玛文",
-        "Language_kk": "哈萨克文",
-        "Language_kl": "格陵兰文",
-        "Language_km": "柬埔寨文",
-        "Language_kn": "坎纳达文",
-        "Language_ko": "韩文",
-        "Language_kr": "卡努里文",
-        "Language_ks": "克什米尔文",
-        "Language_ku": "库尔德文",
-        "Language_kv": "科米文",
-        "Language_kw": "凯尔特文",
-        "Language_ky": "吉尔吉斯文",
-        "Language_la": "拉丁文",
-        "Language_lb": "卢森堡文",
-        "Language_lg": "卢干达文",
-        "Language_li": "淋布尔吉文",
-        "Language_ln": "林加拉文",
-        "Language_lo": "老挝文",
-        "Language_lt": "立陶宛文",
-        "Language_lu": "鲁巴加丹加文",
-        "Language_lv": "拉脱维亚文",
-        "Language_mg": "马尔加什文",
-        "Language_mh": "马绍尔文",
-        "Language_mi": "毛利文",
-        "Language_mk": "马其顿文",
-        "Language_ml": "马来亚拉姆文",
-        "Language_mn": "蒙古文",
-        "Language_mr": "马拉地文",
-        "Language_ms": "马来文",
-        "Language_mt": "马耳他文",
-        "Language_my": "缅甸文",
-        "Language_na": "瑙鲁文",
-        "Language_nb": "挪威博克马尔文",
-        "Language_nd": "北恩德贝勒文",
-        "Language_ne": "尼泊尔文",
-        "Language_ng": "恩东加文",
-        "Language_nl": "荷兰文",
-        "Language_nn": "挪威尼诺斯克文",
-        "Language_no": "挪威文",
-        "Language_nr": "南部恩德贝勒文",
-        "Language_nv": "纳瓦霍文",
-        "Language_ny": "尼扬贾文；齐切瓦文；切瓦文",
-        "Language_oc": "奥克西唐语",
-        "Language_oj": "奥吉布瓦文",
-        "Language_om": "奥洛莫文",
-        "Language_or": "欧里亚文",
-        "Language_os": "奥塞梯文",
-        "Language_pa": "旁遮普文",
-        "Language_pi": "巴利文",
-        "Language_pl": "波兰文",
-        "Language_ps": "普什图文",
-        "Language_pt": "葡萄牙文",
-        "Language_qu": "盖丘亚文",
-        "Language_rm": "列托－罗曼文",
-        "Language_rn": "基隆迪文",
-        "Language_ro": "罗马尼亚文",
-        "Language_ru": "俄文",
-        "Language_rw": "卢旺达文",
-        "Language_sa": "梵文",
-        "Language_sc": "萨丁文",
-        "Language_sd": "信德文",
-        "Language_se": "北萨米文",
-        "Language_sg": "桑戈文",
-        "Language_si": "僧伽罗文",
-        "Language_sk": "斯洛伐克文",
-        "Language_sl": "斯洛文尼亚文",
-        "Language_sm": "萨摩亚文",
-        "Language_sn": "绍纳文",
-        "Language_so": "索马里文",
-        "Language_sq": "阿尔巴尼亚文",
-        "Language_sr": "塞尔维亚文",
-        "Language_ss": "斯瓦特文",
-        "Language_st": "塞索托文",
-        "Language_su": "巽他语",
-        "Language_sv": "瑞典文",
-        "Language_sw": "斯瓦希里文",
-        "Language_ta": "泰米尔文",
-        "Language_te": "泰卢固文",
-        "Language_tg": "塔吉克文",
-        "Language_th": "泰文",
-        "Language_ti": "提格里尼亚文",
-        "Language_tk": "土库曼文",
-        "Language_tl": "塔加洛语",
-        "Language_tn": "塞茨瓦纳文",
-        "Language_to": "汤加文",
-        "Language_tr": "土耳其文",
-        "Language_ts": "宗加文",
-        "Language_tt": "塔塔尔文",
-        "Language_tw": "特威文",
-        "Language_ty": "塔西提文",
-        "Language_ug": "维吾尔文",
-        "Language_uk": "乌克兰文",
-        "Language_ur": "乌尔都文",
-        "Language_uz": "乌兹别克文",
-        "Language_ve": "文达文",
-        "Language_vi": "越南文",
-        "Language_vo": "沃拉普克文",
-        "Language_wa": "瓦隆文",
-        "Language_wo": "沃洛夫文",
-        "Language_xh": "科萨文",
-        "Language_yi": "依地文",
-        "Language_yo": "约鲁巴文",
-        "Language_za": "壮语",
-        "Language_zh": "中文",
-        "Language_zu": "祖鲁文",
-        "LanguageCode": "语言代码",
-        "PluginDescription": "用户环境报表: 浏览器、浏览器种类、操作系统、插件、分辨率、全局参数。",
-        "PluginDetectionDoesNotWorkInIE": "注意: 插件检查无法在 Internet Explorer 上运行。这个报表仅提供非 IE 浏览器。",
-        "Resolutions": "分辨率",
-        "VisitorSettings": "访客设置",
-        "WidgetGlobalVisitors": "访客设置",
-        "WidgetGlobalVisitorsDocumentation": "本报表显示您的访客最常用的系统配置。系统配置是操作系统、浏览器类型及显示器分辨率的组合。",
-        "WidgetPlugins": "浏览器插件清单",
-        "WidgetPluginsDocumentation": "本报表显示访客使用的浏览器插件，这可能对如何发布您的内容很重要。",
-        "WidgetResolutions": "画面分辨率"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/lang/zh-tw.json b/plugins/UserSettings/lang/zh-tw.json
deleted file mode 100644
index 6b9019f671..0000000000
--- a/plugins/UserSettings/lang/zh-tw.json
+++ /dev/null
@@ -1,201 +0,0 @@
-{
-    "UserSettings": {
-        "BrowserLanguage": "瀏覽器語系",
-        "ColumnConfiguration": "客戶端配置",
-        "ColumnResolution": "解析度",
-        "Configurations": "客戶端配置",
-        "Language_aa": "阿法文",
-        "Language_ab": "阿布哈西亚文",
-        "Language_ae": "阿维斯塔文",
-        "Language_af": "南非荷兰文",
-        "Language_ak": "阿肯文",
-        "Language_am": "阿姆哈拉文",
-        "Language_an": "阿拉贡文",
-        "Language_ar": "阿拉伯文",
-        "Language_as": "阿萨姆文",
-        "Language_av": "阿瓦尔文",
-        "Language_ay": "艾马拉文",
-        "Language_az": "阿塞拜疆文",
-        "Language_ba": "巴什客尔文",
-        "Language_be": "白俄罗斯文",
-        "Language_bg": "保加利亚文",
-        "Language_bh": "比哈尔文",
-        "Language_bi": "比斯拉马文",
-        "Language_bm": "班巴拉文",
-        "Language_bn": "孟加拉文",
-        "Language_bo": "藏文",
-        "Language_br": "布里多尼文",
-        "Language_bs": "波斯尼亚文",
-        "Language_ca": "加泰罗尼亚文",
-        "Language_ce": "车臣文",
-        "Language_ch": "查莫罗文",
-        "Language_co": "科西嘉文",
-        "Language_cr": "克里族文",
-        "Language_cs": "捷克文",
-        "Language_cu": "宗教斯拉夫文",
-        "Language_cv": "楚瓦什文",
-        "Language_cy": "威尔士文",
-        "Language_da": "丹麦文",
-        "Language_de": "德文",
-        "Language_dv": "迪维希文",
-        "Language_dz": "不丹文",
-        "Language_ee": "埃维文",
-        "Language_el": "希腊文",
-        "Language_en": "英文",
-        "Language_eo": "世界文",
-        "Language_es": "西班牙文",
-        "Language_et": "爱沙尼亚文",
-        "Language_eu": "巴斯克文",
-        "Language_fa": "波斯文",
-        "Language_ff": "夫拉文",
-        "Language_fi": "芬兰文",
-        "Language_fj": "斐济文",
-        "Language_fo": "法罗文",
-        "Language_fr": "法文",
-        "Language_fy": "弗里斯兰文",
-        "Language_ga": "爱尔兰文",
-        "Language_gd": "苏格兰盖尔文",
-        "Language_gl": "加利西亚文",
-        "Language_gn": "瓜拉尼文",
-        "Language_gu": "古加拉提文",
-        "Language_gv": "马恩岛文",
-        "Language_ha": "豪撒文",
-        "Language_he": "希伯来文",
-        "Language_hi": "印地文",
-        "Language_ho": "希里莫图文",
-        "Language_hr": "克罗地亚文",
-        "Language_ht": "海地文",
-        "Language_hu": "匈牙利文",
-        "Language_hy": "亚美尼亚文",
-        "Language_hz": "赫雷罗文",
-        "Language_ia": "国际语",
-        "Language_id": "印度尼西亚文",
-        "Language_ie": "国际语E",
-        "Language_ig": "伊格博文",
-        "Language_ii": "四川话",
-        "Language_ik": "依奴皮维克文",
-        "Language_io": "伊多文",
-        "Language_is": "冰岛文",
-        "Language_it": "意大利文",
-        "Language_iu": "伊努伊特文",
-        "Language_ja": "日文",
-        "Language_jv": "爪哇文",
-        "Language_ka": "格鲁吉亚文",
-        "Language_kg": "刚果文",
-        "Language_ki": "吉库尤文",
-        "Language_kj": "宽亚玛文",
-        "Language_kk": "哈萨克文",
-        "Language_kl": "格陵兰文",
-        "Language_km": "柬埔寨文",
-        "Language_kn": "坎纳达文",
-        "Language_ko": "韩文",
-        "Language_kr": "卡努里文",
-        "Language_ks": "克什米尔文",
-        "Language_ku": "库尔德文",
-        "Language_kv": "科米文",
-        "Language_kw": "凯尔特文",
-        "Language_ky": "吉尔吉斯文",
-        "Language_la": "拉丁文",
-        "Language_lb": "卢森堡文",
-        "Language_lg": "卢干达文",
-        "Language_li": "淋布尔吉文",
-        "Language_ln": "林加拉文",
-        "Language_lo": "老挝文",
-        "Language_lt": "立陶宛文",
-        "Language_lu": "鲁巴加丹加文",
-        "Language_lv": "拉脱维亚文",
-        "Language_mg": "马尔加什文",
-        "Language_mh": "马绍尔文",
-        "Language_mi": "毛利文",
-        "Language_mk": "马其顿文",
-        "Language_ml": "马来亚拉姆文",
-        "Language_mn": "蒙古文",
-        "Language_mr": "马拉地文",
-        "Language_ms": "马来文",
-        "Language_mt": "马耳他文",
-        "Language_my": "缅甸文",
-        "Language_na": "瑙鲁文",
-        "Language_nb": "挪威博克马尔文",
-        "Language_nd": "北恩德贝勒文",
-        "Language_ne": "尼泊尔文",
-        "Language_ng": "恩东加文",
-        "Language_nl": "荷兰文",
-        "Language_nn": "挪威尼诺斯克文",
-        "Language_no": "挪威文",
-        "Language_nr": "南部恩德贝勒文",
-        "Language_nv": "纳瓦霍文",
-        "Language_ny": "尼扬贾文；齐切瓦文；切瓦文",
-        "Language_oc": "奥克西唐语",
-        "Language_oj": "奥吉布瓦文",
-        "Language_om": "奥洛莫文",
-        "Language_or": "欧里亚文",
-        "Language_os": "奥塞梯文",
-        "Language_pa": "旁遮普文",
-        "Language_pi": "巴利文",
-        "Language_pl": "波兰文",
-        "Language_ps": "普什图文",
-        "Language_pt": "葡萄牙文",
-        "Language_qu": "盖丘亚文",
-        "Language_rm": "列托－罗曼文",
-        "Language_rn": "基隆迪文",
-        "Language_ro": "罗马尼亚文",
-        "Language_ru": "俄文",
-        "Language_rw": "卢旺达文",
-        "Language_sa": "梵文",
-        "Language_sc": "萨丁文",
-        "Language_sd": "信德文",
-        "Language_se": "北萨米文",
-        "Language_sg": "桑戈文",
-        "Language_si": "僧伽罗文",
-        "Language_sk": "斯洛伐克文",
-        "Language_sl": "斯洛文尼亚文",
-        "Language_sm": "萨摩亚文",
-        "Language_sn": "绍纳文",
-        "Language_so": "索马里文",
-        "Language_sq": "阿尔巴尼亚文",
-        "Language_sr": "塞尔维亚文",
-        "Language_ss": "斯瓦特文",
-        "Language_st": "塞索托文",
-        "Language_su": "巽他语",
-        "Language_sv": "瑞典文",
-        "Language_sw": "斯瓦希里文",
-        "Language_ta": "泰米尔文",
-        "Language_te": "泰卢固文",
-        "Language_tg": "塔吉克文",
-        "Language_th": "泰文",
-        "Language_ti": "提格里尼亚文",
-        "Language_tk": "土库曼文",
-        "Language_tl": "塔加洛语",
-        "Language_tn": "塞茨瓦纳文",
-        "Language_to": "汤加文",
-        "Language_tr": "土耳其文",
-        "Language_ts": "宗加文",
-        "Language_tt": "塔塔尔文",
-        "Language_tw": "特威文",
-        "Language_ty": "塔西提文",
-        "Language_ug": "维吾尔文",
-        "Language_uk": "乌克兰文",
-        "Language_ur": "乌尔都文",
-        "Language_uz": "乌兹别克文",
-        "Language_ve": "文达文",
-        "Language_vi": "越南文",
-        "Language_vo": "沃拉普克文",
-        "Language_wa": "瓦隆文",
-        "Language_wo": "沃洛夫文",
-        "Language_xh": "科萨文",
-        "Language_yi": "依地文",
-        "Language_yo": "约鲁巴文",
-        "Language_za": "壮语",
-        "Language_zh": "中文",
-        "Language_zu": "祖鲁文",
-        "LanguageCode": "語系代碼",
-        "PluginDescription": "各個用戶設定報表：瀏覽器、瀏覽器家族、作業系統、外掛、解析度、全域設定。",
-        "PluginDetectionDoesNotWorkInIE": "注意：外掛偵測無法在 Internet Explorer 上運作。這個報告僅提供非 IE 瀏覽器。",
-        "Resolutions": "解析度",
-        "VisitorSettings": "造訪者設定值",
-        "WidgetGlobalVisitors": "全域訪客配置",
-        "WidgetGlobalVisitorsDocumentation": "此報表列出貴站訪客最常見的設定配置。設定配置包含作業系統、瀏覽器、螢幕解析度等資訊。",
-        "WidgetPlugins": "瀏覽器外掛清單",
-        "WidgetResolutions": "畫面解析度"
-    }
-}
\ No newline at end of file
diff --git a/plugins/UserSettings/templates/index.twig b/plugins/UserSettings/templates/index.twig
index abf96de9e1..eadf2f09f2 100644
--- a/plugins/UserSettings/templates/index.twig
+++ b/plugins/UserSettings/templates/index.twig
@@ -1,16 +1,18 @@
 <div id='leftcolumn'>
+    {% if dataTablePlugin|default is not empty %}
     <h2 piwik-enriched-headline>{{ 'General_Plugins'|translate }}</h2>
     {{ dataTablePlugin|raw }}
-
-    <h2 piwik-enriched-headline>{{ 'UserSettings_BrowserLanguage'|translate }}</h2>
-    {{ dataTableBrowserLanguage|raw }}
+    {% endif %}
 </div>
 
 <div id='rightcolumn'>
-
-    <h2 piwik-enriched-headline>{{ 'UserSettings_Resolutions'|translate }}</h2>
+    {% if dataTableResolution|default is not empty %}
+    <h2 piwik-enriched-headline>{{ 'Resolution_Resolutions'|translate }}</h2>
     {{ dataTableResolution|raw }}
+    {% endif %}
 
-    <h2 piwik-enriched-headline>{{ 'UserSettings_Configurations'|translate }}</h2>
+    {% if dataTableConfiguration|default is not empty %}
+    <h2 piwik-enriched-headline>{{ 'Resolution_Configurations'|translate }}</h2>
     {{ dataTableConfiguration|raw }}
+    {% endif %}
 </div>
diff --git a/plugins/UserSettings/tests/Fixtures/LanguageFixture.php b/plugins/UserSettings/tests/Fixtures/LanguageFixture.php
deleted file mode 100644
index dd3089a365..0000000000
--- a/plugins/UserSettings/tests/Fixtures/LanguageFixture.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link    http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-
-namespace Piwik\Plugins\UserSettings\tests\Fixtures;
-
-
-use Piwik\Tests\Framework\Fixture;
-use Piwik\Date;
-use Piwik\Common;
-
-class LanguageFixture extends Fixture
-{
-    public $dateTime = '2014-09-04 00:00:00';
-    public $idSite = 1;
-
-    public function setUp()
-    {
-        $this->setUpWebsite();
-        $this->trackVisits();
-    }
-
-    public function tearDown()
-    {
-
-    }
-
-    private function setUpWebsite()
-    {
-        if (!self::siteCreated($this->idSite)) {
-            $idSite = self::createWebsite($this->dateTime);
-            $this->assertSame($this->idSite, $idSite);
-        }
-    }
-
-    private function getBrowserLangs() {
-        return array(
-            'fr-be', 'ar_QA', 'fr-ch', 'pl', 'pl', 'th_TH', 'zh_SG', 'eu_ES',
-            'sr_CS', 'el,fi', 'fr,en-us,en;q=', 'fr-be', 'en,en-us,en;q=',
-            'de,en-us,en;q=', 'cs_CZ', 'pl,en-us,en;q=',
-            'kpe_LR', 'en,en-us,en;q=',
-        );
-    }
-
-    private function trackVisits() {
-
-        $tracker = self::getTracker(
-            $this->idSite,
-            $this->dateTime,
-            $defaultInit = false
-        );
-        $tracker->setTokenAuth(self::getTokenAuth());
-
-        $hour = 1;
-        foreach ($this->getBrowserLangs() as $browserLang) {
-
-            $tracker->setForceVisitDateTime(
-                Date::factory($this->dateTime)->addHour($hour++)->getDatetime()
-            );
-
-            $tracker->setBrowserLanguage($browserLang);
-
-            self::checkResponse($tracker->doTrackPageView("Viewing homepage"));
-        }
-
-    }
-
-} 
\ No newline at end of file
diff --git a/plugins/UserSettings/tests/System/GetLanguageSystemTest.php b/plugins/UserSettings/tests/System/GetLanguageSystemTest.php
deleted file mode 100644
index 3c409c1112..0000000000
--- a/plugins/UserSettings/tests/System/GetLanguageSystemTest.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link    http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\Plugins\UserSettings\tests\System;
-
-
-use Piwik\Plugins\UserSettings\tests\Fixtures\LanguageFixture;
-use Piwik\Tests\Framework\TestCase\SystemTestCase;
-
-/**
- * Class GetLanguageSystemTest
- * @package Piwik\Plugins\UserSettings\tests
- * @group GetLanguageSystemTest
- * @group Plugins
- * @group UserSettings
- */
-class GetLanguageSystemTest extends SystemTestCase {
-
-    public static $fixture = null;
-
-    public static function getOutputPrefix()
-    {
-        return '';
-    }
-
-    /**
-     * @param $api
-     * @param $params
-     * @dataProvider    getApiForTesting
-     * @group           GetLanguageSystemTest
-     */
-    public function testApi($api, $params)
-    {
-        $this->runApiTests($api, $params);
-    }
-
-    /**
-     * @return array
-     */
-    public function getApiForTesting()
-    {
-        $apiToCall = array(
-            "UserSettings.getLanguage",
-            "UserSettings.getLanguageCode"
-        );
-
-        $apiToTest = array();
-
-        $apiToTest[] = array(
-                            $apiToCall,
-                            array(
-                                'idSite'  => self::$fixture->idSite,
-                                'date'    => self::$fixture->dateTime,
-                                'periods' => array('day')
-                            )
-                       );
-
-        return $apiToTest;
-    }
-
-
-    public static function getPathToTestDirectory()
-    {
-        return dirname(__FILE__);
-    }
-
-}
-
-GetLanguageSystemTest::$fixture = new LanguageFixture();
\ No newline at end of file
diff --git a/plugins/UsersManager/API.php b/plugins/UsersManager/API.php
index 1e651eef13..23ee2206d9 100644
--- a/plugins/UsersManager/API.php
+++ b/plugins/UsersManager/API.php
@@ -12,6 +12,7 @@ use Exception;
 use Piwik\Access;
 use Piwik\Common;
 use Piwik\Config;
+use Piwik\Container\StaticContainer;
 use Piwik\Date;
 use Piwik\Option;
 use Piwik\Piwik;
@@ -32,6 +33,8 @@ use Piwik\Tracker\Cache;
  */
 class API extends \Piwik\Plugin\API
 {
+    const OPTION_NAME_PREFERENCE_SEPARATOR = '_';
+
     /**
      * @var Model
      */
@@ -52,7 +55,7 @@ class API extends \Piwik\Plugin\API
      * Example of how you would overwrite the UsersManager_API with your own class:
      * Call the following in your plugin __construct() for example:
      *
-     * Registry::set('UsersManager_API', \Piwik\Plugins\MyCustomUsersManager\API::getInstance());
+     * StaticContainer::getContainer()->set('UsersManager_API', \Piwik\Plugins\MyCustomUsersManager\API::getInstance());
      *
      * @throws Exception
      * @return \Piwik\Plugins\UsersManager\API
@@ -60,7 +63,7 @@ class API extends \Piwik\Plugin\API
     public static function getInstance()
     {
         try {
-            $instance = \Piwik\Registry::get('UsersManager_API');
+            $instance = StaticContainer::get('UsersManager_API');
             if (!($instance instanceof API)) {
                 // Exception is caught below and corrected
                 throw new Exception('UsersManager_API must inherit API');
@@ -69,7 +72,7 @@ class API extends \Piwik\Plugin\API
             
         } catch (Exception $e) {
             self::$instance = new self;
-            \Piwik\Registry::set('UsersManager_API', self::$instance);
+            StaticContainer::getContainer()->set('UsersManager_API', self::$instance);
         }
 
         return self::$instance;
@@ -107,9 +110,37 @@ class API extends \Piwik\Plugin\API
         return $this->getDefaultUserPreference($preferenceName, $userLogin);
     }
 
+    /**
+     * Returns an array of Preferences
+     * @param $preferenceNames array of preference names
+     * @return array
+     * @ignore
+     */
+    public function getAllUsersPreferences(array $preferenceNames)
+    {
+        Piwik::checkUserHasSuperUserAccess();
+
+        $userPreferences = array();
+        foreach($preferenceNames as $preferenceName) {
+            $optionNameMatchAllUsers = $this->getPreferenceId('%', $preferenceName);
+            $preferences = Option::getLike($optionNameMatchAllUsers);
+
+            foreach($preferences as $optionName => $optionValue) {
+                $lastUnderscore = strrpos($optionName, self::OPTION_NAME_PREFERENCE_SEPARATOR);
+                $userName = substr($optionName, 0, $lastUnderscore);
+                $preference = substr($optionName, $lastUnderscore + 1);
+                $userPreferences[$userName][$preference] = $optionValue;
+            }
+        }
+        return $userPreferences;
+    }
+
     private function getPreferenceId($login, $preference)
     {
-        return $login . '_' . $preference;
+        if(false !== strpos($preference, self::OPTION_NAME_PREFERENCE_SEPARATOR)) {
+            throw new Exception("Preference name cannot contain underscores.");
+        }
+        return $login . self::OPTION_NAME_PREFERENCE_SEPARATOR . $preference;
     }
 
     private function getDefaultUserPreference($preferenceName, $login)
diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php
index 65f55b9a01..defb1e4522 100644
--- a/plugins/UsersManager/Controller.php
+++ b/plugins/UsersManager/Controller.php
@@ -11,8 +11,10 @@ namespace Piwik\Plugins\UsersManager;
 use Exception;
 use Piwik\API\ResponseBuilder;
 use Piwik\Common;
+use Piwik\Container\StaticContainer;
 use Piwik\Metrics\Formatter;
 use Piwik\Piwik;
+use Piwik\Plugin\ControllerAdmin;
 use Piwik\Plugins\LanguagesManager\API as APILanguagesManager;
 use Piwik\Plugins\LanguagesManager\LanguagesManager;
 use Piwik\Plugins\Login\SessionInitializer;
@@ -21,14 +23,24 @@ use Piwik\Plugins\UsersManager\API as APIUsersManager;
 use Piwik\SettingsPiwik;
 use Piwik\Site;
 use Piwik\Tracker\IgnoreCookie;
+use Piwik\Translation\Translator;
 use Piwik\Url;
 use Piwik\View;
 
-/**
- *
- */
-class Controller extends \Piwik\Plugin\ControllerAdmin
+class Controller extends ControllerAdmin
 {
+    /**
+     * @var Translator
+     */
+    private $translator;
+
+    public function __construct(Translator $translator)
+    {
+        $this->translator = $translator;
+
+        parent::__construct();
+    }
+
     static function orderByName($a, $b)
     {
         return strcmp($a['name'], $b['name']);
@@ -53,7 +65,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
 
         if ($idSiteSelected === 'all') {
             $usersAccessByWebsite = array();
-            $defaultReportSiteName = Piwik::translate('UsersManager_ApplyToAllWebsites');
+            $defaultReportSiteName = $this->translator->translate('UsersManager_ApplyToAllWebsites');
         } else {
             $usersAccessByWebsite = APIUsersManager::getInstance()->getUsersAccessFromSite($idSiteSelected);
             $defaultReportSiteName = Site::getNameFor($idSiteSelected);
@@ -158,15 +170,15 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
     protected function getDefaultDates()
     {
         $dates = array(
-            'today'      => Piwik::translate('General_Today'),
-            'yesterday'  => Piwik::translate('General_Yesterday'),
-            'previous7'  => Piwik::translate('General_PreviousDays', 7),
-            'previous30' => Piwik::translate('General_PreviousDays', 30),
-            'last7'      => Piwik::translate('General_LastDays', 7),
-            'last30'     => Piwik::translate('General_LastDays', 30),
-            'week'       => Piwik::translate('General_CurrentWeek'),
-            'month'      => Piwik::translate('General_CurrentMonth'),
-            'year'       => Piwik::translate('General_CurrentYear'),
+            'today'      => $this->translator->translate('General_Today'),
+            'yesterday'  => $this->translator->translate('General_Yesterday'),
+            'previous7'  => $this->translator->translate('General_PreviousDays', 7),
+            'previous30' => $this->translator->translate('General_PreviousDays', 30),
+            'last7'      => $this->translator->translate('General_LastDays', 7),
+            'last30'     => $this->translator->translate('General_LastDays', 30),
+            'week'       => $this->translator->translate('General_CurrentWeek'),
+            'month'      => $this->translator->translate('General_CurrentMonth'),
+            'year'       => $this->translator->translate('General_CurrentYear'),
         );
 
         $mappingDatesToPeriods = array(
@@ -243,13 +255,29 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
         $view->languages = APILanguagesManager::getInstance()->getAvailableLanguageNames();
         $view->currentLanguageCode = LanguagesManager::getLanguageCodeForCurrentUser();
         $view->ignoreCookieSet = IgnoreCookie::isIgnoreCookieFound();
-        $this->initViewAnonymousUserSettings($view);
         $view->piwikHost = Url::getCurrentHost();
         $this->setBasicVariablesView($view);
 
         return $view->render();
     }
 
+    /**
+     * The "Anonymous Settings" admin UI screen view
+     */
+    public function anonymousSettings()
+    {
+        Piwik::checkUserHasSuperUserAccess();
+
+        $view = new View('@UsersManager/anonymousSettings');
+
+        $view->availableDefaultDates = $this->getDefaultDates();
+
+        $this->initViewAnonymousUserSettings($view);
+        $this->setBasicVariablesView($view);
+
+        return $view->render();
+    }
+
     public function setIgnoreCookie()
     {
         Piwik::checkUserHasSomeViewAccess();
@@ -378,7 +406,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
             || !empty($passwordBis)
         ) {
             if ($password != $passwordBis) {
-                throw new Exception(Piwik::translate('Login_PasswordsDoNotMatch'));
+                throw new Exception($this->translator->translate('Login_PasswordsDoNotMatch'));
             }
             $newPassword = $password;
         }
@@ -398,7 +426,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
         // logs the user in with the new password
         if ($newPassword !== false) {
             $sessionInitializer = new SessionInitializer();
-            $auth = \Piwik\Registry::get('auth');
+            $auth = StaticContainer::get('Piwik\Auth');
             $auth->setLogin($userLogin);
             $auth->setPassword($password);
             $sessionInitializer->initSession($auth, $rememberMe = false);
diff --git a/plugins/UsersManager/Menu.php b/plugins/UsersManager/Menu.php
index cf36392603..9f3175a3ef 100644
--- a/plugins/UsersManager/Menu.php
+++ b/plugins/UsersManager/Menu.php
@@ -18,14 +18,17 @@ class Menu extends \Piwik\Plugin\Menu
     {
         if (Piwik::isUserHasSomeAdminAccess()) {
             $menu->addManageItem('UsersManager_MenuUsers', $this->urlForAction('index'), $order = 2);
-            $menu->addManageItem('UsersManager_MenuUserSettings', $this->urlForAction('userSettings'), $order = 3);
+        }
+
+        if (Piwik::hasUserSuperUserAccess() && API::getInstance()->getSitesAccessFromUser('anonymous')) {
+            $menu->addSettingsItem('UsersManager_AnonymousUser', $this->urlForAction('anonymousSettings'), $order = 20);
         }
     }
 
     public function configureUserMenu(MenuUser $menu)
     {
         if (!Piwik::isUserIsAnonymous()) {
-            $menu->addItem('', 'General_Settings', $this->urlForAction('userSettings'), 0);
+            $menu->addItem('UsersManager_MenuPersonal', 'General_Settings', $this->urlForAction('userSettings'), 0);
         }
     }
 }
diff --git a/plugins/UsersManager/UserPreferences.php b/plugins/UsersManager/UserPreferences.php
index 430d2b8b65..86b61b97fe 100644
--- a/plugins/UsersManager/UserPreferences.php
+++ b/plugins/UsersManager/UserPreferences.php
@@ -39,6 +39,7 @@ class UserPreferences
 
         return false;
     }
+
     /**
      * Returns default site ID that Piwik should load.
      *
@@ -91,27 +92,36 @@ class UserPreferences
     /**
      * Returns default period type for Piwik reports.
      *
+     * @param $defaultDate string the default date string from which the default period will be guessed
      * @return string `'day'`, `'week'`, `'month'`, `'year'` or `'range'`
      * @api
      */
-    public function getDefaultPeriod()
+    public function getDefaultPeriod($defaultDate)
     {
-        $userSettingsDate = APIUsersManager::getInstance()->getUserPreference(Piwik::getCurrentUserLogin(), APIUsersManager::PREFERENCE_DEFAULT_REPORT_DATE);
+        if (empty($defaultDate)) {
+            $defaultDate = APIUsersManager::getInstance()->getUserPreference(Piwik::getCurrentUserLogin(), APIUsersManager::PREFERENCE_DEFAULT_REPORT_DATE);
+        }
 
-        if ($userSettingsDate === false) {
-            return Config::getInstance()->General['default_period'];
+        if (empty($defaultDate)) {
+            return $this->getSystemDefaultPeriod();
         }
 
-        if (in_array($userSettingsDate, array('today', 'yesterday'))) {
+        if (in_array($defaultDate, array('today', 'yesterday'))) {
             return 'day';
         }
 
-        if (strpos($userSettingsDate, 'last') === 0
-            || strpos($userSettingsDate, 'previous') === 0
+        if (strpos($defaultDate, 'last') === 0
+            || strpos($defaultDate, 'previous') === 0
         ) {
             return 'range';
         }
 
-        return $userSettingsDate;
+        return $defaultDate;
     }
+
+    private function getSystemDefaultPeriod()
+    {
+        return Config::getInstance()->General['default_period'];
+    }
+
 }
\ No newline at end of file
diff --git a/plugins/UsersManager/UsersManager.php b/plugins/UsersManager/UsersManager.php
index ef9c4a35d2..8bfd20c2fc 100644
--- a/plugins/UsersManager/UsersManager.php
+++ b/plugins/UsersManager/UsersManager.php
@@ -67,15 +67,13 @@ class UsersManager extends \Piwik\Plugin
         $attributes['admin_token_auth'] = $tokens;
     }
 
-    public function getCronArchiveTokenAuth(&$token)
+    public function getCronArchiveTokenAuth(&$tokens)
     {
         $model      = new Model();
         $superUsers = $model->getUsersHavingSuperUserAccess();
 
-        if (!empty($superUsers)) {
-            $superUser = array_shift($superUsers);
-
-            $token = $superUser['token_auth'];
+        foreach($superUsers as $superUser) {
+            $tokens[] = $superUser['token_auth'];
         }
     }
 
diff --git a/plugins/UsersManager/javascripts/usersManager.js b/plugins/UsersManager/javascripts/usersManager.js
index 51be3f8063..0b7f4e431e 100644
--- a/plugins/UsersManager/javascripts/usersManager.js
+++ b/plugins/UsersManager/javascripts/usersManager.js
@@ -263,7 +263,7 @@ $(document).ready(function () {
         }
     );
 
-    $('.addrow').click(function () {
+    $('.admin .user .addrow').click(function () {
         piwikHelper.hideAjaxError();
         $(this).toggle();
 
diff --git a/plugins/UsersManager/lang/ar.json b/plugins/UsersManager/lang/ar.json
index c48ac04fe5..dbf2d4f923 100644
--- a/plugins/UsersManager/lang/ar.json
+++ b/plugins/UsersManager/lang/ar.json
@@ -27,7 +27,6 @@
         "MenuAnonymousUserSettings": "إعدادات المستخدمين المجهولين",
         "MenuUsers": "المستخدمون",
         "MenuUserSettings": "إعدادات المستخدم",
-        "PluginDescription": "إدارة المستخدمين في Piwik: أضف مستخدماً جديداً أو حرر مستخدم موجود، عدل الصلاحيات لمستخدم ما. كافة الصلاحيات متوفرة أيضاً من خلال API واجهة استخدام التطبيقات.",
         "PrivAdmin": "إشراف",
         "PrivNone": "بدون وصول",
         "PrivView": "مشاهدة",
diff --git a/plugins/UsersManager/lang/be.json b/plugins/UsersManager/lang/be.json
index df0c50e852..46ff5f96ff 100644
--- a/plugins/UsersManager/lang/be.json
+++ b/plugins/UsersManager/lang/be.json
@@ -28,7 +28,6 @@
         "MenuAnonymousUserSettings": "Ананімныя карыстацкія наладкі",
         "MenuUsers": "Карыстачы",
         "MenuUserSettings": "Наладкі карыстальніка",
-        "PluginDescription": "Кіраванне карыстальнікамі ў Piwik: даданне новых карыстальнікаў, рэдагаванне ужо існуючых, абнаўленне правоў дазволу. Усе дзеянні, таксама даступныя праз API.",
         "PrivAdmin": "Адмін",
         "PrivNone": "Няма доступу",
         "PrivView": "Прагляд",
diff --git a/plugins/UsersManager/lang/bg.json b/plugins/UsersManager/lang/bg.json
index ca5ffae0d3..f5973bcfeb 100644
--- a/plugins/UsersManager/lang/bg.json
+++ b/plugins/UsersManager/lang/bg.json
@@ -39,7 +39,6 @@
         "MenuUserSettings": "Потребителски настройки",
         "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Бележка: Не можете да променяте настройките в тази секция, защото нямате никакви сайтове с разрешен достъп за анонимни потребители.",
         "NoUsersExist": "Не са налични потребители, все още.",
-        "PluginDescription": "Управлението на потребители в Piwik: добавяне на нов потребител, редактиране на съществуващ, актуализиране на разрешения. Всички действия са достъпни чрез API.",
         "PrivAdmin": "Админ",
         "PrivNone": "Без права",
         "PrivView": "Преглед",
diff --git a/plugins/UsersManager/lang/ca.json b/plugins/UsersManager/lang/ca.json
index 38c23b42a7..8ed17dd8c4 100644
--- a/plugins/UsersManager/lang/ca.json
+++ b/plugins/UsersManager/lang/ca.json
@@ -31,7 +31,6 @@
         "MenuUsers": "Usuaris",
         "MenuUserSettings": "Preferències d'usuari",
         "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Nota: No podeu canviar la configuració en aquest secció, perquè no teniu cap lloc web que pot ser visitat per usuaris anònims.",
-        "PluginDescription": "Gestió dels usuaris a Piwik: Afegiu un nou Usuari, Editeu-n'hi un d'existent o actualitzeu els permisos. Totes aquestes accions també estan disponibles a traves de l'API.",
         "PrivAdmin": "Administració",
         "PrivNone": "Sense accés",
         "PrivView": "Vista",
diff --git a/plugins/UsersManager/lang/cs.json b/plugins/UsersManager/lang/cs.json
index 338cf6d7e2..1fcb208143 100644
--- a/plugins/UsersManager/lang/cs.json
+++ b/plugins/UsersManager/lang/cs.json
@@ -3,6 +3,7 @@
         "AddUser": "Přidat nového uživatele",
         "Alias": "Alias",
         "AllWebsites": "Všechny weby",
+        "AnonymousUser": "Anonymní uživatel",
         "AnonymousUserHasViewAccess": "Poznámka: %1$s uživatel má právo k přístupu k %2$s",
         "AnonymousUserHasViewAccess2": "Vaše analytická hlášení a informace o návštěvnících je veřejně dostupná.",
         "ApplyToAllWebsites": "Použít na všechny weby",
@@ -39,11 +40,13 @@
         "MainDescription": "Nastavení, kteří uživatelé mají přístup k Piwik statistikám na vaších stránkách. Můžete také nastavit oprávnění ke všem stránkám najednou.",
         "ManageAccess": "Správa přístupu",
         "MenuAnonymousUserSettings": "Nastavení anonymního uživatele",
+        "MenuPersonal": "Osobní",
         "MenuUsers": "Uživatelé",
         "MenuUserSettings": "Nastavení uživatele",
         "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Poznámka: Nemůžete měnit nastavení v této sekci, protože žádná z vašich stránek nemůže být zobrazena anonymním uživatelem.",
         "NoUsersExist": "Zatím nejsou žádní uživatelé.",
-        "PluginDescription": "Správa uživatelů v Piwiku: přidat nového uživatele, upravit existujícícho, aktualizace oprávnění. Všechny akce jsou k dizpozici přes API",
+        "PersonalSettings": "Osobní nastavení",
+        "PluginDescription": "Správa uživatelů vám umožňuje přidávat nové uživatele, upravovat existující a přiřazovat práva ke správě nebo zobrazení webových stránek.",
         "PrivAdmin": "Administrátor",
         "PrivNone": "Žádné oprávnění",
         "PrivView": "Zobrazení",
diff --git a/plugins/UsersManager/lang/da.json b/plugins/UsersManager/lang/da.json
index 3d89a17b2f..0ddf0561a8 100644
--- a/plugins/UsersManager/lang/da.json
+++ b/plugins/UsersManager/lang/da.json
@@ -3,6 +3,7 @@
         "AddUser": "Opret ny bruger",
         "Alias": "Alias",
         "AllWebsites": "Alle hjemmesider",
+        "AnonymousUser": "Anonym bruger",
         "AnonymousUserHasViewAccess": "Bemærk: %1$s bruger har %2$s adgang til hjemmesiden.",
         "AnonymousUserHasViewAccess2": "Analyserapporter og besøgendes oplysninger er offentligt tilgængelige.",
         "ApplyToAllWebsites": "Tilføj til alle hjemmesider",
@@ -43,7 +44,7 @@
         "MenuUserSettings": "Bruger indstillinger",
         "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Bemærk: Indstillingerne kan ikke ændres i denne del, fordi der ikke er en hjemmeside, der kan tilgås af den anonyme bruger.",
         "NoUsersExist": "Der er endnu ingen brugere.",
-        "PluginDescription": "Brugere styring i Piwik: tilføje en ny bruger, redigere en eksisterende, opdatere tilladelserne. Alle handlinger er også tilgængelige via API.",
+        "PersonalSettings": "Personlige indstillinger",
         "PrivAdmin": "Administration",
         "PrivNone": "Ingen adgang",
         "PrivView": "Vis",
diff --git a/plugins/UsersManager/lang/de.json b/plugins/UsersManager/lang/de.json
index fe5f94e87b..23342e479a 100644
--- a/plugins/UsersManager/lang/de.json
+++ b/plugins/UsersManager/lang/de.json
@@ -3,6 +3,7 @@
         "AddUser": "Einen neuen Benutzer hinzufügen",
         "Alias": "Alias",
         "AllWebsites": "Alle Webseiten",
+        "AnonymousUser": "Anonymer Nutzer",
         "AnonymousUserHasViewAccess": "Hinweis: Der Benutzer %1$s hat %2$s Zugriff auf diese Webseite.",
         "AnonymousUserHasViewAccess2": "Ihre Analytiks-Berichte und Besucherinformationen sind öffentlich einsehbar.",
         "ApplyToAllWebsites": "Für alle Webseiten anwenden",
@@ -39,11 +40,13 @@
         "MainDescription": "Hier kann Zugriff auf bestimmte Webseiten innerhalb von Piwik erteilt werden. Es ist auch möglich, Zugriff für alle Webseiten auf einmal zu erlauben.",
         "ManageAccess": "Zugriffsverwaltung",
         "MenuAnonymousUserSettings": "Gast-Besucher (\"anonymous\") Einstellungen",
+        "MenuPersonal": "Persönlich",
         "MenuUsers": "Benutzer",
         "MenuUserSettings": "Benutzereinstellungen",
         "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Hinweis: Sie können die Einstellungen in diesem Bereich nicht ändern, weil Sie keine Webseite eingerichtet haben, die vom anonymen Benutzer angezeigt werden kann.",
         "NoUsersExist": "Bisher keine Benutzer vorhanden.",
-        "PluginDescription": "Benutzerverwaltung in Piwik: Einen neuen Benutzer hinzufügen, einen existierenden Benutzer bearbeiten, Berechtigungen ändern. Alle Aktionen sind auch über die API möglich.",
+        "PersonalSettings": "Persönliche Einstellungen",
+        "PluginDescription": "Benutzermanagement lässt Sie neue Benutzer hinzufügen, bestehende ändern und die Rechte für die Ansicht oder die Administration von Webseiten definieren.",
         "PrivAdmin": "Administrator",
         "PrivNone": "Kein Zugriff",
         "PrivView": "Ansicht",
diff --git a/plugins/UsersManager/lang/el.json b/plugins/UsersManager/lang/el.json
index 3533237707..f0f06742e8 100644
--- a/plugins/UsersManager/lang/el.json
+++ b/plugins/UsersManager/lang/el.json
@@ -3,6 +3,7 @@
         "AddUser": "Προσθήκη νέου χρήστη",
         "Alias": "Ψευδώνυμο",
         "AllWebsites": "Όλες οι ιστοσελίδες",
+        "AnonymousUser": "Ανώνυμος χρήστης",
         "AnonymousUserHasViewAccess": "Σημείωση: ο %1$s χρήστης έχει %2$s πρόσβαση στον ιστοτόπο.",
         "AnonymousUserHasViewAccess2": "Οι αναφορές στατιστικών σας και οι πληροφορίες για τους επισκέπτες είναι δημόσια προσπελάσιμες.",
         "ApplyToAllWebsites": "Εφαρμογή σε όλες τις ιστοσελίδες",
@@ -39,11 +40,13 @@
         "MainDescription": "Ρυθμίστε ποιοι χρήστες θα έχουν πρόσβαση σε ποιες ιστοσελίδες. Μπορείτε επίσης να ρυθμίσετε τα δικαιώματα για όλες τις ιστοσελίδες με μία κίνηση.",
         "ManageAccess": "Διαχείριση πρόσβασης",
         "MenuAnonymousUserSettings": "Ρυθμίσεις ανώνυμου χρήστη",
+        "MenuPersonal": "Προσωπικό",
         "MenuUsers": "Χρήστες",
         "MenuUserSettings": "Ρυθμίσεις χρήστη",
         "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Σημείωση: Δεν μπορείτε να αλλάξετε τις ρυθμίσεις σε αυτό τον τομέα γιατί δεν έχετε κάποια ιστοσελίδα που μπορείτε να έχετε πρόσβαση ως ανώνυμος χρήστης.",
         "NoUsersExist": "Δεν υπάρχουν ακόμη χρήστες.",
-        "PluginDescription": "Διαχείριση Χρηστών στο Piwik: προσθήκη ενός νέου Χρήστη, επεξεργασία ενός υπάρχοντος χρήστη, αναβαθμίστε τα δικαιώματα. Όλες οι δραστηριότητες είναι επίσης διαθέσιμες μέσω του API.",
+        "PersonalSettings": "Προσωπικές ρυθμίσεις",
+        "PluginDescription": "Η Διαχείριση Χρηστών επιτρέπει την προσθήκη νέων χρηστών, την επεξεργασία υπάρχοντων και τον ορισμό αδειών πρόσβασης για ανάγνωση ή διαχείριση των ιστοτόπων.",
         "PrivAdmin": "Διαχείριση",
         "PrivNone": "Χωρίς πρόσβαση",
         "PrivView": "Προβολή",
@@ -60,7 +63,7 @@
         "UsersManagementMainDescription": "Δημιουργήστε νέους χρήστες ή ενημερώστε τους υπάρχοντες. Μπορείτε επίσης να αλλάξετε τα δικαιώματά τους (παραπάνω).",
         "WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Όταν οι χρήστες δεν έχουν συνδεθεί και επισκέπτονται το Piwik, θα έχουν πρόσβαση",
         "YourUsernameCannotBeChanged": "Το όνομα χρήστη δεν μπορεί να αλλαχτεί.",
-        "YourVisitsAreIgnoredOnDomain": "%sΟι επισκέψεις σας παραβλέπονται από το Piwik στο %s %s (το Piwik παραβλέπει το cookie που βρέθηκα στον φυλλομετρητή σας).",
+        "YourVisitsAreIgnoredOnDomain": "%sΟι επισκέψεις σας παραβλέπονται από το Piwik στο %s %s (το Piwik παραβλέπει το cookie που βρέθηκε στον φυλλομετρητή σας).",
         "YourVisitsAreNotIgnored": "%sΟι επισκέψεις δεν αγνοούνται από το Piwik%s (δεν βρέθηκε cookie αγνόησης του Piwik στον φυλλομετρητή σας)."
     }
 }
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/en.json b/plugins/UsersManager/lang/en.json
index bec74d4162..f8cba76188 100644
--- a/plugins/UsersManager/lang/en.json
+++ b/plugins/UsersManager/lang/en.json
@@ -3,6 +3,7 @@
         "AddUser": "Add a new user",
         "Alias": "Alias",
         "AllWebsites": "All websites",
+        "AnonymousUser": "Anonymous user",
         "AnonymousUserHasViewAccess": "Note: the %1$s user has %2$s access to this website.",
         "AnonymousUserHasViewAccess2": "Your analytics reports and your visitors information are publicly viewable.",
         "ApplyToAllWebsites": "Apply to all websites",
@@ -41,9 +42,11 @@
         "MenuAnonymousUserSettings": "Anonymous user settings",
         "MenuUsers": "Users",
         "MenuUserSettings": "User settings",
+        "MenuPersonal": "Personal",
+        "PersonalSettings": "Personal settings",
         "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Note: You cannot change the settings in this section, because you do not have any website that can be accessed by the anonymous user.",
         "NoUsersExist": "There are no users yet.",
-        "PluginDescription": "Users Management in Piwik: add a new User, edit an existing one, update the permissions. All the actions are also available through the API.",
+        "PluginDescription": "Users Management lets you add new users, edit existing users and assign them permissions to view or administrate websites. ",
         "PrivAdmin": "Admin",
         "PrivNone": "No access",
         "PrivView": "View",
diff --git a/plugins/UsersManager/lang/es.json b/plugins/UsersManager/lang/es.json
index 2a839df0d1..1ad4d84276 100644
--- a/plugins/UsersManager/lang/es.json
+++ b/plugins/UsersManager/lang/es.json
@@ -43,7 +43,6 @@
         "MenuUserSettings": "Configuración de usuario",
         "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Nota: No puede modificar la configuración en esta sección, debido a que no posee ningún sitio de internet que pueda ser contactado por un usuario anónimo.",
         "NoUsersExist": "Todavía no hay usuarios.",
-        "PluginDescription": "Administración de Usuarios en Piwik: agregar nuevo Usuario, editar uno existente, actualizar permisos. Todas las acciones están también disponibles en la API.",
         "PrivAdmin": "Admin",
         "PrivNone": "Sin acceso",
         "PrivView": "Ver",
diff --git a/plugins/UsersManager/lang/fa.json b/plugins/UsersManager/lang/fa.json
index 6761bde40e..97d3bc09bb 100644
--- a/plugins/UsersManager/lang/fa.json
+++ b/plugins/UsersManager/lang/fa.json
@@ -35,7 +35,6 @@
         "MenuUserSettings": "تنضیمات کاربران",
         "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "توجه: شما نمی توانید تنظیمات این بخش را تغییر دهید , زیرا شما هیچ وبسایتی ندارید که بتوان با کاربر ناشناخته به آن دسترسی داشت .",
         "NoUsersExist": "هنوز کاربری وجود ندارد",
-        "PluginDescription": "مدیریت کاربران در Piwik: اضافه کردن یک کاربر جدید، یک موجود را ویرایش کنید، به روز رسانی مجوز. همه اقدامات نیز در دسترس هستند از طریق API.",
         "PrivAdmin": "مدیر",
         "PrivNone": "عدم دسترسی",
         "PrivView": "نمایش",
diff --git a/plugins/UsersManager/lang/fi.json b/plugins/UsersManager/lang/fi.json
index 606e4f6563..a40f04854a 100644
--- a/plugins/UsersManager/lang/fi.json
+++ b/plugins/UsersManager/lang/fi.json
@@ -43,7 +43,6 @@
         "MenuUserSettings": "Käyttäjäasetukset",
         "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Huom. et voi vaihtaa tämän osion asetuksia, koska sinulla ei ole yhtäkään sivustoa, jonka tietoja anonyymit käyttäjät pääsevät katsomaan.",
         "NoUsersExist": "Yhtään käyttäjää ei ole vielä olemassa.",
-        "PluginDescription": "Käyttäjien hallinta Piwikissä: lisää uusi käyttäjä, muokkaa käyttäjiä, päivitä oikeuksia. Kaikkia toimintoja voi käyttää myös API:sta.",
         "PrivAdmin": "Hallinnointioikeus",
         "PrivNone": "Ei käyttöoikeutta",
         "PrivView": "Katsomisoikeus",
diff --git a/plugins/UsersManager/lang/fr.json b/plugins/UsersManager/lang/fr.json
index 857c777a74..30e5e9ba00 100644
--- a/plugins/UsersManager/lang/fr.json
+++ b/plugins/UsersManager/lang/fr.json
@@ -3,6 +3,7 @@
         "AddUser": "Ajouter un nouvel utilisateur",
         "Alias": "Alias",
         "AllWebsites": "Tous les sites Internet",
+        "AnonymousUser": "Utilisateur anonyme",
         "AnonymousUserHasViewAccess": "Note : l'utilisateur %1$s a un accès en %2$s à ce site web.",
         "AnonymousUserHasViewAccess2": "Vos rapports d'analyse et les informations de vos visiteurs sont visibles publiquement.",
         "ApplyToAllWebsites": "Appliquer à tous les sites",
@@ -39,11 +40,12 @@
         "MainDescription": "Décidez quels utilisateurs ont accès à quels sites. Vous pouvez aussi changer les permissions de tous les sites d'un seul coup.",
         "ManageAccess": "Gestion des accès utilisateurs",
         "MenuAnonymousUserSettings": "Paramètres utilisateurs anonymes",
+        "MenuPersonal": "Personnel",
         "MenuUsers": "Utilisateurs",
         "MenuUserSettings": "Paramètres utilisateurs",
         "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Note : Vous ne pouvez pas modifier les paramètres dans cette section, ce parce que vous n'avez aucun site web accessible par des utilisateurs anonymes.",
         "NoUsersExist": "Il n'y a pas encore d'utilisateurs.",
-        "PluginDescription": "Gestion des utilisateurs dans Piwik: ajouter un nouvel utilisateur, en éditer, mettre à jour les permissions. Toutes les actions sont aussi disponibles au travers de l'API.",
+        "PersonalSettings": "Paramètres Personnels",
         "PrivAdmin": "Administration",
         "PrivNone": "Pas d'accès",
         "PrivView": "Consultation",
diff --git a/plugins/UsersManager/lang/hu.json b/plugins/UsersManager/lang/hu.json
index 3c5a736378..0d5e19acf7 100644
--- a/plugins/UsersManager/lang/hu.json
+++ b/plugins/UsersManager/lang/hu.json
@@ -27,7 +27,6 @@
         "MenuAnonymousUserSettings": "Névtelen felhasználók beállításai",
         "MenuUsers": "Felhasználók",
         "MenuUserSettings": "Felhasználói beállítások",
-        "PluginDescription": "A Piwik felhasználóinak kezelése: új felhasználó felvétele, meglévő felhasználók adatainak szerkesztése, jogosultságok megváltoztatása. Az összes funkció elérhető az API-n keresztül is.",
         "PrivAdmin": "Adminisztráció",
         "PrivNone": "Nincs hozzáférés",
         "PrivView": "Megtekintés",
diff --git a/plugins/UsersManager/lang/id.json b/plugins/UsersManager/lang/id.json
index f4e5e76a2b..9f65524a42 100644
--- a/plugins/UsersManager/lang/id.json
+++ b/plugins/UsersManager/lang/id.json
@@ -34,7 +34,6 @@
         "MenuUsers": "Pengguna",
         "MenuUserSettings": "Pengaturan pengguna",
         "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Catatan: Anda tidak dapat mengubah pengaturan ini, sebab Anda tidak memiliki situs apaun yang dapat diakses oleh pengguna Anonim.",
-        "PluginDescription": "Pengatur Pengguna di Piwik: menmbah Pengguna, menyunting yang telah ada, memperbarui perizinan. Seluruh tindakan juga tersedia melalui API.",
         "PrivAdmin": "Pengelola",
         "PrivNone": "Tak ada akses",
         "PrivView": "Tampilan",
diff --git a/plugins/UsersManager/lang/it.json b/plugins/UsersManager/lang/it.json
index 0b3c8fb66e..227b284faf 100644
--- a/plugins/UsersManager/lang/it.json
+++ b/plugins/UsersManager/lang/it.json
@@ -3,7 +3,8 @@
         "AddUser": "Aggiungi un nuovo utente",
         "Alias": "Alias",
         "AllWebsites": "Tutti i siti",
-        "AnonymousUserHasViewAccess": "Nota: l'utente %1$s ha %2$s accesso a questo sito.",
+        "AnonymousUser": "Utente anonimo",
+        "AnonymousUserHasViewAccess": "Nota: l'utente %1$s ha un accesso %2$s a questo sito.",
         "AnonymousUserHasViewAccess2": "I tuoi report statistici e le informazioni sui tuoi visitatori sono visibili pubblicamente.",
         "ApplyToAllWebsites": "Applica a tutti i siti",
         "ChangeAllConfirm": "Sei sicuro di voler cambiare i permessi di '%s' in tutti i siti?",
@@ -39,11 +40,13 @@
         "MainDescription": "Decidi quali utenti possono accedere alle statistiche Piwik dei siti web. Puoi anche impostare i permessi di tutti i siti in una volta sola.",
         "ManageAccess": "Amministra l'accesso",
         "MenuAnonymousUserSettings": "Impostazioni utente anonimo",
+        "MenuPersonal": "Personale",
         "MenuUsers": "Utenti",
         "MenuUserSettings": "Impostazioni utente",
         "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Nota: Non puoi cambiare le impostazioni in questa sezione perché nessun sito è accessibile dagli utenti anonimi.",
         "NoUsersExist": "Non ci sono ancora utenti.",
-        "PluginDescription": "Gestione degli utenti in Piwik: agginta nuovi utenti, modifica di esistenti, aggiornamento dei permessi. Tutte le azioni sono anche disponibili tramite API.",
+        "PersonalSettings": "Impostazioni personali",
+        "PluginDescription": "La Gestione Utenti ti permette di aggiungere nuovi utenti, modificare quelli esistenti e assegnare loro i permessi per vedere o amministrare i siti web.",
         "PrivAdmin": "Amministra Piwik",
         "PrivNone": "Nessun privilegio",
         "PrivView": "Visualizza statistiche",
diff --git a/plugins/UsersManager/lang/ja.json b/plugins/UsersManager/lang/ja.json
index 45d6aefd84..cf2d82c586 100644
--- a/plugins/UsersManager/lang/ja.json
+++ b/plugins/UsersManager/lang/ja.json
@@ -43,7 +43,6 @@
         "MenuUserSettings": "ユーザーの設定",
         "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "注) 匿名ユーザーがアクセスできるウェブサイトをお持ちでないため、このセクションでは設定の変更ができません。",
         "NoUsersExist": "まだユーザーがいません。",
-        "PluginDescription": "Piwik でのユーザー管理は、新規ユーザーの追加、既存ユーザーの編集、パーミッションの更新を行うことができます。 また、すべての動作は API を通じて利用することができます。",
         "PrivAdmin": "管理",
         "PrivNone": "権限なし",
         "PrivView": "表示",
diff --git a/plugins/UsersManager/lang/ka.json b/plugins/UsersManager/lang/ka.json
index 1de10f69d4..f31a9bea20 100644
--- a/plugins/UsersManager/lang/ka.json
+++ b/plugins/UsersManager/lang/ka.json
@@ -27,7 +27,6 @@
         "MenuAnonymousUserSettings": "ანონიმური მომხმარებლის პარამეტრები",
         "MenuUsers": "მომხმარებლები",
         "MenuUserSettings": "მომხმარებლის პარამეტრები",
-        "PluginDescription": "Piwik მომხმარებელთა მენეჯმენტი: ახალი მომხმარებლის დამატება, არსებულთა რედაქტირება, უფლებების განახლება. ყველა ამ ქმედების განხორციელება ასევე შესაძლებელია API ფუნქციების გამოყენებით.",
         "PrivAdmin": "ადმინისტრატორი",
         "PrivNone": "წვდომის გარეშე",
         "PrivView": "დათვალიერება",
diff --git a/plugins/UsersManager/lang/ko.json b/plugins/UsersManager/lang/ko.json
index e684f33539..a74087d4b6 100644
--- a/plugins/UsersManager/lang/ko.json
+++ b/plugins/UsersManager/lang/ko.json
@@ -32,7 +32,6 @@
         "MenuUsers": "사용자",
         "MenuUserSettings": "사용자 설정",
         "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "참고: 익명 사용자가 접근할 수있는 웹사이트가 없기 때문에 당신은 이 섹션의 설정을 변경할 수 없습니다.",
-        "PluginDescription": "Piwik에서 사용자 관리, 새 사용자 추가, 기존 사용자 편집 권한을 업데이트할 수 있습니다. 또한 모든 동작은 API를 통해 사용할 수 있습니다.",
         "PrivAdmin": "관리자",
         "PrivNone": "접근할 수 없음",
         "PrivView": "보기",
diff --git a/plugins/UsersManager/lang/lt.json b/plugins/UsersManager/lang/lt.json
index e0e63df6c8..6a869a00ec 100644
--- a/plugins/UsersManager/lang/lt.json
+++ b/plugins/UsersManager/lang/lt.json
@@ -25,7 +25,6 @@
         "MenuAnonymousUserSettings": "Anonimo nustatymai",
         "MenuUsers": "Naudotojai",
         "MenuUserSettings": "Naudotojo nustatymai",
-        "PluginDescription": "Piwik naudotojų administravimas: pridėkite naudotoją, redaguokite esamą, atnaujinkite leidimus. Visi veiksmai taip pat pasiekiami per API sąsają.",
         "PrivAdmin": "Administruoti",
         "PrivNone": "Neleidžiama",
         "PrivView": "Matyti",
diff --git a/plugins/UsersManager/lang/lv.json b/plugins/UsersManager/lang/lv.json
index 22378a36bd..05b563013b 100644
--- a/plugins/UsersManager/lang/lv.json
+++ b/plugins/UsersManager/lang/lv.json
@@ -29,7 +29,6 @@
         "MenuAnonymousUserSettings": "Anonīmu lietotāju iestatījumi",
         "MenuUsers": "Lietotāji",
         "MenuUserSettings": "Lietotāju iestatījumi",
-        "PluginDescription": "Piwik lietotāju pārvaldīšana: pievienojiet jaunu lietotāju, labojiet jau esošu, izmainiet pieejas atļaujas. Visas šīs darbības ir pieejamas arī caur API.",
         "PrivAdmin": "Administrēt",
         "PrivNone": "Nav pieejas",
         "PrivView": "Skatīt",
diff --git a/plugins/UsersManager/lang/nb.json b/plugins/UsersManager/lang/nb.json
index 646f600d35..065c72723f 100644
--- a/plugins/UsersManager/lang/nb.json
+++ b/plugins/UsersManager/lang/nb.json
@@ -3,6 +3,7 @@
         "AddUser": "Legg til ny bruker",
         "Alias": "Alias",
         "AllWebsites": "Alle nettsteder",
+        "AnonymousUser": "Anonym bruker",
         "ApplyToAllWebsites": "Legg til alle nettsteder",
         "ChangeAllConfirm": "Er du sikker på at du vil endre '%s' rettigheter på alle nettstedene?",
         "ClickHereToDeleteTheCookie": "Klikk her for å slette informasjonskapselen og la Piwik spore dine besøk.",
@@ -12,6 +13,7 @@
         "ExceptionAccessValues": "Tilgangsparameteret må minst ha en av de følgende verdier: [ %s ]",
         "ExceptionAdminAnonymous": "Du kan ikke gi administrator-tilgang til 'anonymous'-brukeren.",
         "ExceptionDeleteDoesNotExist": "Bruker '%s' eksisterer ikke og kan derfor ikke bli slettet.",
+        "ExceptionDeleteOnlyUserWithSuperUserAccess": "Sletting av brukeren '%s\" er ikke mulig.",
         "ExceptionEditAnonymous": "Den anonyme brukeren kan ikke bli redigert eller slettet. Den blir brukt av Piwik for å definere en bruker som ikke har blitt logget inn ennå. Du kan for eksempel gjøre statistikken din offentlig ved å gi 'view'-tilgang til 'anonymous'-brukeren.",
         "ExceptionEmailExists": "Bruker med e-post '%s' eksisterer allerede.",
         "ExceptionInvalidEmail": "Epost-adressen er ikke i gyldig format.",
@@ -25,9 +27,11 @@
         "MainDescription": "Bestem hvilke brukere som har tilgang til Piwik på dine nettsteder. Du kan også sette rettighetene på alle dine nettsteder på en gang.",
         "ManageAccess": "Administrer tilgang",
         "MenuAnonymousUserSettings": "Innstillinger for anonym bruker",
+        "MenuPersonal": "Personlig",
         "MenuUsers": "Brukere",
         "MenuUserSettings": "Brukerinnstillinger",
-        "PluginDescription": "Brukeradministrasjon i Piwik: Legg til en ny bruker, endre en eksisterende bruker, oppdatere rettighetene. Alle handlingene er også tilgjengelig gjennom API-et.",
+        "NoUsersExist": "Det er ingen brukere enda.",
+        "PersonalSettings": "Personlige innstillinger",
         "PrivAdmin": "Admin",
         "PrivNone": "Ingen tilgang",
         "PrivView": "Vis",
diff --git a/plugins/UsersManager/lang/nl.json b/plugins/UsersManager/lang/nl.json
index 27f731f986..31a9ba4551 100644
--- a/plugins/UsersManager/lang/nl.json
+++ b/plugins/UsersManager/lang/nl.json
@@ -3,6 +3,7 @@
         "AddUser": "Voeg gebruiker toe",
         "Alias": "Alias",
         "AllWebsites": "Alle websites",
+        "AnonymousUser": "Anonieme gebruiker",
         "ApplyToAllWebsites": "Pas toe op elke website",
         "ChangeAllConfirm": "Weet u zeker dat u de rechten van '%s' voor alle websites wilt wijzigen?",
         "ChangePasswordConfirm": "Als het wachtwoord wordt gewijzigd, zal ook de gebruikers token_auth wijzigen. Wilt u echt doorgaan?",
@@ -30,15 +31,17 @@
         "MainDescription": "Stel in welke gebruikers toegang hebben tot de Piwik rapporten van deze website. U kan de toegangsrechten voor alle websites tegelijk bepalen door deze optie te kiezen in de dropdown.",
         "ManageAccess": "Toegangsbeheer",
         "MenuAnonymousUserSettings": "Anonieme gebruikers instellingen",
+        "MenuPersonal": "Persoonlijk",
         "MenuUsers": "Gebruikers",
         "MenuUserSettings": "Gebruikers instellingen",
         "NoUsersExist": "Er zijn nog geen gebruikers.",
-        "PluginDescription": "Gebruikers beheer in Piwik: voeg een nieuwe gebruiker toe, pas een bestaande aan, pas de permissies aan. Alle acties zijn ook beschikbaar via de API",
+        "PersonalSettings": "Persoonlijke instellingen",
         "PrivAdmin": "Admin",
         "PrivNone": "Geen toegang",
         "PrivView": "Kijken",
         "ReportDateToLoadByDefault": "Standaard rapport datum bij laden pagina.",
         "ReportToLoadByDefault": "Standaard rapport bij laden pagina.",
+        "SuperUserAccessManagement": "Beheer Super Gebruiker toegang",
         "TheLoginScreen": "Het login scherm",
         "ThereAreCurrentlyNRegisteredUsers": "Er zijn nu %s geregistreerde gebruikes.",
         "TypeYourPasswordAgain": "Voer uw nieuwe wachtwoord nogmaals in.",
diff --git a/plugins/UsersManager/lang/nn.json b/plugins/UsersManager/lang/nn.json
index 0a47d8c57c..956aeaaaea 100644
--- a/plugins/UsersManager/lang/nn.json
+++ b/plugins/UsersManager/lang/nn.json
@@ -24,7 +24,6 @@
         "MenuAnonymousUserSettings": "Innstillingar for anonyme brukarar",
         "MenuUsers": "Brukarar",
         "MenuUserSettings": "Brukarinnstillingar",
-        "PluginDescription": "Piwiks brukarhehandling: Opprett ein ny brukar, endre ein eksisterande brukar eller oppdater tilgangar. Desse handlingane kan også nyttast gjennom APIet.",
         "PrivAdmin": "Administrator",
         "PrivNone": "Inga tilgang",
         "PrivView": "Les",
diff --git a/plugins/UsersManager/lang/pl.json b/plugins/UsersManager/lang/pl.json
index 23487ca7e7..b60c6ecc83 100644
--- a/plugins/UsersManager/lang/pl.json
+++ b/plugins/UsersManager/lang/pl.json
@@ -32,12 +32,13 @@
         "MenuUserSettings": "Konfiguracja użytkownika",
         "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Uwaga: Nie możesz zmienić konfiguracji tej sekcji ponieważ nie posiadasz żadnych stron, do których osoba anonimowa miałąby dostęp.",
         "NoUsersExist": "Nie ma jeszcze żadnych użytkowników.",
-        "PluginDescription": "Administracja użytkownikami w Piwik: dodanie nowego użytkownika, edycja istniejącego, aktualizacja uprawnień. Wszystkie działania są również dostępne poprzez interfejs API.",
         "PrivAdmin": "Admin",
         "PrivNone": "Brak dostępu",
         "PrivView": "Widok",
         "ReportDateToLoadByDefault": "Data raportu jako domyślna do wczytania, dotyczy",
         "ReportToLoadByDefault": "Raport jako domyślny do wczytania",
+        "SuperUserAccessManagement": "Zarządzaj dostępem Super Użytkowników",
+        "SuperUserAccessManagementMainDescription": "Super Użytkownicy mają najwyższe uprawnienia w systemie. Mogą zarządzać wszystkimi zadaniami jak: dodawanie strony do monitoringu, użytkowników, aktywowaći deaktywować wtyczki, zmieniać uprawnienia innym użytkownikom, a także instalować nowe wtyczki z Marketu.",
         "TheLoginScreen": "Ekran logowania",
         "ThereAreCurrentlyNRegisteredUsers": "Obecnie znajduje się %s zarejestrowanych użytkowników.",
         "TypeYourPasswordAgain": "Wpisz nowe hasło ponownie.",
diff --git a/plugins/UsersManager/lang/pt-br.json b/plugins/UsersManager/lang/pt-br.json
index 8e7e8121fb..37e8fcc235 100644
--- a/plugins/UsersManager/lang/pt-br.json
+++ b/plugins/UsersManager/lang/pt-br.json
@@ -37,7 +37,6 @@
         "MenuUserSettings": "Configurações de usuário",
         "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Nota: Você não pode alterar as configurações nesta seção, porque você não tem nenhum site que pode ser acessado pelo usuário anônimo.",
         "NoUsersExist": "Não há usúarios ainda.",
-        "PluginDescription": "Gerenciamento de Usuários no Piwik: adicionar novo usuário, editar um existente, atualizar permissões. Todas as ações também estão disponíveis na API.",
         "PrivAdmin": "Administrador",
         "PrivNone": "Sem acesso",
         "PrivView": "Ver",
diff --git a/plugins/UsersManager/lang/pt.json b/plugins/UsersManager/lang/pt.json
index 91f26886ee..f4173f4116 100644
--- a/plugins/UsersManager/lang/pt.json
+++ b/plugins/UsersManager/lang/pt.json
@@ -29,7 +29,6 @@
         "MenuAnonymousUserSettings": "Definições de utilizadores anónimos",
         "MenuUsers": "Utilizadores",
         "MenuUserSettings": "Definições de utilizadores",
-        "PluginDescription": "Gestor de Utilizadores no Piwik: adicionar um novo Utilizador, editar um existente, actualizar as permissões. Todas estas acções também estão disponívels pelo API.",
         "PrivAdmin": "Admin",
         "PrivNone": "Sem acesso",
         "PrivView": "Ver",
diff --git a/plugins/UsersManager/lang/ro.json b/plugins/UsersManager/lang/ro.json
index b076fe841d..9c01402606 100644
--- a/plugins/UsersManager/lang/ro.json
+++ b/plugins/UsersManager/lang/ro.json
@@ -43,7 +43,6 @@
         "MenuUserSettings": "Setări utilizator",
         "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Notă: Nu puteți schimba setările din această secțiune, pentru că nu aveți nici un site web care poate fi accesat de către un utilizator anonim.",
         "NoUsersExist": "Nu există încă utilizatori.",
-        "PluginDescription": "Managementul utilizatorilor în Piwik: adăuga un nou utilizator, editaza o înregistrare existentă, actualizați permisiunile. Toate acțiunile sunt, de asemenea, disponibile prin intermediul API.",
         "PrivAdmin": "Admin",
         "PrivNone": "Fără acces",
         "PrivView": "Vezi",
diff --git a/plugins/UsersManager/lang/ru.json b/plugins/UsersManager/lang/ru.json
index 0a48364148..eab670fbdc 100644
--- a/plugins/UsersManager/lang/ru.json
+++ b/plugins/UsersManager/lang/ru.json
@@ -3,12 +3,17 @@
         "AddUser": "Добавить нового пользователя",
         "Alias": "Псевдоним",
         "AllWebsites": "Все сайты",
+        "AnonymousUser": "Анонимный пользователь",
+        "AnonymousUserHasViewAccess": "Примечание: пользователь %1$s имеет %2$s доступ к этому сайту.",
         "AnonymousUserHasViewAccess2": "Отчеты и данные о посетителях общедоступны.",
         "ApplyToAllWebsites": "Применить ко всем сайтам",
         "ChangeAllConfirm": "Вы действительно желаете изменить права '%s' на все сайты?",
         "ChangePasswordConfirm": "Смена пароля также изменит пользовательский token_auth. Вы действительно хотите продолжить?",
         "ClickHereToDeleteTheCookie": "Нажмите здесь, чтобы удалить cookie игнорирования, и разрешить системе Веб-аналитики отслеживать ваши посещения",
         "ClickHereToSetTheCookieOnDomain": "Нажмите здесь, чтобы установить cookie игнорирования Веб-аналитики, после установки которого система вас будет игнорировать при посещении %s",
+        "ConfirmGrantSuperUserAccess": "Вы действительно хотите пользователя «%s» повысить до суперпользователя? Внимание: пользователь будет иметь доступ ко всем веб-сайтам и сможет выполнять административные задачи.",
+        "ConfirmProhibitMySuperUserAccess": "%s, вы действительно хотите удалить у себя права суперпользователя? Вы потеряете все разрешения и доступ ко всем сайтам и будете разлогинены из Piwik.",
+        "ConfirmProhibitOtherUsersSuperUserAccess": "Вы действительно хотите понизить суперпользователя «%s» до обычного пользователя? Он потеряет все права и доступ ко всем сайтам. Убедитесь в том, что не забыли добавить разрешения для необходимых ему веб-сайтов, если это необходимо.",
         "DeleteConfirm": "Вы уверены, что хотите удалить пользователя %s?",
         "Email": "Email",
         "EmailYourAdministrator": "%1$sНапишите вашему администратору об этой проблеме%2$s.",
@@ -23,23 +28,32 @@
         "ExceptionInvalidPassword": "Длина пароля должна быть от %1$s до %2$s символов.",
         "ExceptionLoginExists": "Логин '%s' уже существует.",
         "ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth ожидает MD5-хэшированный пароль (строка в 32 символа). Пожалуйста, вызовите функцию md5() к паролю перед вызовом этого метода.",
+        "ExceptionRemoveSuperUserAccessOnlySuperUser": "Удаление прав суперпользователя у пользователя «%s» не представляется возможным.",
+        "ExceptionSuperUserAccess": "Этот пользователь уже имеет статус суперпользователя и разрешение на изменение всех веб-сайты в Piwik. Вы можете удалить права суперпользователя у этого пользователя, и попробовать снова.",
         "ExceptionUserDoesNotExist": "Пользователь '%s' не существует.",
+        "ExceptionYouMustGrantSuperUserAccessFirst": "Должен быть по крайней мере один суперпользователь. Пожалуйста, сделайте сначала другого суперпользователя.",
         "ExcludeVisitsViaCookie": "Cookie исключения из статистики",
         "ForAnonymousUsersReportDateToLoadByDefault": "Отчет для анонимных пользователей отображается за",
         "IfYouWouldLikeToChangeThePasswordTypeANewOne": "Если вы хотите сменить пароль, введите новый. Иначе оставьте поле пустым.",
         "InjectedHostCannotChangePwd": "В данный момент вы находитесь в Piwik с неизвестного хоста (%1$s). Вы не можете изменить пароль, пока эта проблема не будет решена.",
+        "LastSeen": "Последнее посещение",
         "MainDescription": "Укажите, какие пользователи имеют доступ к Piwik на вашем сайте. Также Вы можете задать права доступа на все сайты.",
         "ManageAccess": "Управление правами доступа",
         "MenuAnonymousUserSettings": "Настройки анонимности",
+        "MenuPersonal": "Персональное",
         "MenuUsers": "Пользователи",
         "MenuUserSettings": "Мои настройки",
         "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Подсказка: Вы не можете сменить эти настройки, потому что у вас нет ни одного веб-сайта, к которому бы имел доступ анонимный пользователь.",
-        "PluginDescription": "Управление пользователями в Piwik: добавляйте новых, редактируйте существующих, устанавливайте для них разрешения. Все эти действия также доступны через API.",
+        "NoUsersExist": "Пока нет пользователей.",
+        "PersonalSettings": "Персональные настройки",
         "PrivAdmin": "Админ",
         "PrivNone": "Нет доступа",
         "PrivView": "Просмотр",
         "ReportDateToLoadByDefault": "Отчет по умолчанию за",
         "ReportToLoadByDefault": "Показывать при входе",
+        "SuperUserAccessManagement": "Управление суперпользователями",
+        "SuperUserAccessManagementGrantMore": "Вы можете предоставить права суперпользователя другим пользователям Piwik здесь. Пожалуйста, используйте эту функцию с осторожностью.",
+        "SuperUserAccessManagementMainDescription": "Суперпользователи имеют самые высокие разрешения. Они могут выполнять все административные задачи, такие как добавление новых сайтов для мониторинга, добавление пользователей, изменение прав доступа пользователей, активации и деактивации плагинов и даже установки новых плагинов из Marketplace.",
         "TheLoginScreen": "Страница входа",
         "ThereAreCurrentlyNRegisteredUsers": "Сейчас насчитывается %s зарегистрированных пользователей.",
         "TypeYourPasswordAgain": "Введите ваш новый пароль снова.",
diff --git a/plugins/UsersManager/lang/sq.json b/plugins/UsersManager/lang/sq.json
index 0ceceeffd5..a161f5fb1a 100644
--- a/plugins/UsersManager/lang/sq.json
+++ b/plugins/UsersManager/lang/sq.json
@@ -29,7 +29,6 @@
         "MenuAnonymousUserSettings": "Rregullime përdoruesi anonim",
         "MenuUsers": "Përdorues",
         "MenuUserSettings": "Rregullime përdoruesi",
-        "PluginDescription": "Administrimi i Përdoruesve në Piwik: shtoni një Përdorues të ri, përpunoni një ekzistues, përditësoni lejet për ta. Krejt veprimet mundet të kryhen edhe përmes API-t.",
         "PrivAdmin": "Admin",
         "PrivNone": "Pa hyrje",
         "PrivView": "Parje",
diff --git a/plugins/UsersManager/lang/sr.json b/plugins/UsersManager/lang/sr.json
index 4e2b584c11..08e0c0a78e 100644
--- a/plugins/UsersManager/lang/sr.json
+++ b/plugins/UsersManager/lang/sr.json
@@ -43,7 +43,6 @@
         "MenuUserSettings": "Tekući korisnik",
         "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Ne možete menjati podešavanja u ovoj sekciji zato što nemate nijedan sajt kojem se može pristupiti kao anonimni korisnik.",
         "NoUsersExist": "Još uvek nema korisnika.",
-        "PluginDescription": "Rad sa korisnicima Piwik-a: dodavanje novih korisnika, izmena postojećih, rad na privilegijama. Sve akcije su dostupne i preko API-ja.",
         "PrivAdmin": "Administracija",
         "PrivNone": "Nema pristup",
         "PrivView": "Prikaz",
diff --git a/plugins/UsersManager/lang/sv.json b/plugins/UsersManager/lang/sv.json
index be08c693f2..b1511ecbf0 100644
--- a/plugins/UsersManager/lang/sv.json
+++ b/plugins/UsersManager/lang/sv.json
@@ -43,7 +43,6 @@
         "MenuUserSettings": "Användarinställningar",
         "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Notera: Eftersom att inga webbplaster tillåter anonym åtkomst till analysdata, så kan inga ändringar göras i den här sektionen.",
         "NoUsersExist": "Det finns inga användare än.",
-        "PluginDescription": "Hantering av användare i Piwik: lägg till en ny användare, ändra en befintlig, uppdatera behörigheterna. Alla åtgärder finns också tillgängliga via API.",
         "PrivAdmin": "Administratör",
         "PrivNone": "Inga rättigheter",
         "PrivView": "Visa",
diff --git a/plugins/UsersManager/lang/th.json b/plugins/UsersManager/lang/th.json
index 6a1f995401..1df57f7f60 100644
--- a/plugins/UsersManager/lang/th.json
+++ b/plugins/UsersManager/lang/th.json
@@ -27,7 +27,6 @@
         "MenuAnonymousUserSettings": "การตั้งค่าผู้ใช้ที่ไม่ระบุชื่อ",
         "MenuUsers": "ผู้ใช้",
         "MenuUserSettings": "ตั้งค่าผู้ใช้",
-        "PluginDescription": "การจัดการผู้ใช้ใน Piwik: เพิ่มผู้ใช้ใหม่ แก้ไขข้อหนึ่งที่มีอยู่ อัพเดตสิทธิ์การเข้าใช้งาน ยังสามารถใช้งานผ่าน API ดำเนินการทั้งหมดได้",
         "PrivAdmin": "จัดการ",
         "PrivNone": "ไม่เข้าใช้งาน",
         "PrivView": "เข้าชม",
diff --git a/plugins/UsersManager/lang/tl.json b/plugins/UsersManager/lang/tl.json
index 3f0809ba05..c137ea1b1b 100644
--- a/plugins/UsersManager/lang/tl.json
+++ b/plugins/UsersManager/lang/tl.json
@@ -42,7 +42,6 @@
         "MenuUserSettings": "Mga setting ng user",
         "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Tandaan: Hindi mo maaring baguhin ang mga setting sa seksyo na ito dahil wala kang anumang website na maaaring ma-access sa pamamagitan ng anonymous user",
         "NoUsersExist": "Walang pang mga gumagamit.",
-        "PluginDescription": "Pamamahala ng user sa Piwik: magdagdag ng bagong User mag-edit ng user kung meron na i-update ang permiso. Ang lahat ng ginawa na may kinalaman sa Piwik ay makikita sa pamamagitan ng API",
         "PrivAdmin": "Admin",
         "PrivNone": "Walang access",
         "PrivView": "Tingnan",
diff --git a/plugins/UsersManager/lang/tr.json b/plugins/UsersManager/lang/tr.json
index ad8c0fc2fe..3342bbbde7 100644
--- a/plugins/UsersManager/lang/tr.json
+++ b/plugins/UsersManager/lang/tr.json
@@ -19,7 +19,6 @@
         "MenuAnonymousUserSettings": "İsimsiz kullanıcı ayarlari",
         "MenuUsers": "Kullanıcılar",
         "MenuUserSettings": "Kullanıcı ayarlari",
-        "PluginDescription": "Piwik Kullanıcılar Yönetimi: yeni kullanıcı ekle, izinlerini güncelleştirmek, varolan bir düzenleme. Tüm eylemler API üzerinden de mevcuttur.",
         "PrivAdmin": "Yönetici",
         "PrivNone": "Erişim Yok",
         "PrivView": "Göster",
diff --git a/plugins/UsersManager/lang/uk.json b/plugins/UsersManager/lang/uk.json
index c3621a6fb7..52b3b72acd 100644
--- a/plugins/UsersManager/lang/uk.json
+++ b/plugins/UsersManager/lang/uk.json
@@ -27,7 +27,6 @@
         "MenuAnonymousUserSettings": "Налаштування анонімного користувача",
         "MenuUsers": "Користувачі",
         "MenuUserSettings": "Налаштування користувача",
-        "PluginDescription": "Керування користувачами в Piwik: додати нового користувача, відредагувати існуючого, змінити налаштування прав доступу. Всі дії також доступні через API.",
         "PrivAdmin": "Адміністрування",
         "PrivNone": "Без доступу",
         "PrivView": "Перегляд",
diff --git a/plugins/UsersManager/lang/vi.json b/plugins/UsersManager/lang/vi.json
index e67487a588..8170967580 100644
--- a/plugins/UsersManager/lang/vi.json
+++ b/plugins/UsersManager/lang/vi.json
@@ -34,7 +34,6 @@
         "MenuUsers": "Các người dùng",
         "MenuUserSettings": "Thiết lập người dùng",
         "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Lưu ý: Bạn không thể thay đổi các thiết lập trong phần này, bởi vì bạn không có bất kỳ trang web nào có thể truy cập bởi người dùng ẩn danh.",
-        "PluginDescription": "Quản trị người dùng trong Piwik: thêm một người dùng mới, chỉnh sửa một người dùng hiện tại, cập nhật các quyền. Tất cả các hành động cũng được cho phép thông qua các API.",
         "PrivAdmin": "Quản trị viên",
         "PrivNone": "Không có truy cập",
         "PrivView": "Xem",
diff --git a/plugins/UsersManager/lang/zh-cn.json b/plugins/UsersManager/lang/zh-cn.json
index c8d9bda0d0..0904521df5 100644
--- a/plugins/UsersManager/lang/zh-cn.json
+++ b/plugins/UsersManager/lang/zh-cn.json
@@ -34,7 +34,6 @@
         "MenuUsers": "用户管理",
         "MenuUserSettings": "用户参数",
         "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "说明: 不能在这里修改设置，因为没有任何公开的网站。",
-        "PluginDescription": "Piwik 用户管理: 添加用户、修改用户或修改权限，所有操作也可以通过API进行。",
         "PrivAdmin": "管理员权限",
         "PrivNone": "无查看权限",
         "PrivView": "有查看权限",
diff --git a/plugins/UsersManager/lang/zh-tw.json b/plugins/UsersManager/lang/zh-tw.json
index 201b7ba1f3..d3a31e4d3b 100644
--- a/plugins/UsersManager/lang/zh-tw.json
+++ b/plugins/UsersManager/lang/zh-tw.json
@@ -27,7 +27,6 @@
         "MenuAnonymousUserSettings": "匿名用戶設定",
         "MenuUsers": "使用者",
         "MenuUserSettings": "使用者設定",
-        "PluginDescription": "Piwik 使用者管理：新增一個新使用者、編輯已存在的使用者或更新權限。所有動作也可以透過 API 進行。",
         "PrivAdmin": "管理員",
         "PrivNone": "無存取權限",
         "PrivView": "檢視",
diff --git a/plugins/UsersManager/templates/anonymousSettings.twig b/plugins/UsersManager/templates/anonymousSettings.twig
new file mode 100644
index 0000000000..0b55961291
--- /dev/null
+++ b/plugins/UsersManager/templates/anonymousSettings.twig
@@ -0,0 +1,56 @@
+{% extends 'admin.twig' %}
+
+{% block content %}
+{% if isSuperUser %}
+    <h2 piwik-enriched-headline>{{ 'UsersManager_MenuAnonymousUserSettings'|translate }}</h2>
+    {% if anonymousSites|length == 0 %}
+        <h3 class='form-description'><strong>{{ 'UsersManager_NoteNoAnonymousUserAccessSettingsWontBeUsed2'|translate }}</strong></h3>
+        <br/>
+    {% else %}
+        <br/>
+        {{ ajax.errorDiv('ajaxErrorAnonymousUserSettings') }}
+        {{ ajax.loadingDiv('ajaxLoadingAnonymousUserSettings') }}
+        <table id='anonymousUserSettingsTable' class="adminTable" style='width:850px;'>
+            <tr>
+                <td style="width:400px;">{{ 'UsersManager_WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess'|translate }}</td>
+                <td>
+                    <fieldset>
+                        <input id="anonymousDefaultReport-login" type="radio" value="Login"
+                               name="anonymousDefaultReport"{% if anonymousDefaultReport==loginModule %} checked="checked"{% endif %} />
+                        <label for="anonymousDefaultReport-login">{{ 'UsersManager_TheLoginScreen'|translate }}</label><br/>
+                        <input id="anonymousDefaultReport-multisites" {% if anonymousSites is empty %}disabled="disabled" {% endif %}type="radio" value="MultiSites"
+                               name="anonymousDefaultReport"{% if anonymousDefaultReport=='MultiSites' %} checked="checked"{% endif %} />
+                        <label for="anonymousDefaultReport-multisites">{{ 'General_AllWebsitesDashboard'|translate }}</label><br/>
+
+                        <input id="anonymousDefaultReport-specific" {% if anonymousSites is empty %}disabled="disabled" {% endif %}type="radio" value="1"
+                               name="anonymousDefaultReport"{% if anonymousDefaultReport>0 %} checked="checked"{% endif %} />
+                        <label for="anonymousDefaultReport-specific">{{ 'General_DashboardForASpecificWebsite'|translate }}</label>
+                        {% if anonymousSites is not empty %}
+                            <select id="anonymousDefaultReportWebsite">
+                                {% for info in anonymousSites %}
+                                    <option value="{{ info.idsite }}" {% if anonymousDefaultReport==info.idsite %} selected="selected"{% endif %}>{{ info.name|raw }}</option>
+                                {% endfor %}
+                            </select>
+                        {% endif %}
+                    </fieldset>
+                </td>
+            </tr>
+            <tr>
+                <td>{{ 'UsersManager_ForAnonymousUsersReportDateToLoadByDefault'|translate }}</td>
+                <td>
+                    <fieldset>
+                        {% for value,description in availableDefaultDates %}
+                            <input id="anonymousDefaultDate-{{ loop.index }}" type="radio" {% if anonymousDefaultDate==value %}checked="checked" {% endif %}value="{{ value }}"
+                                   name="anonymousDefaultDate"/>
+                            <label for="anonymousDefaultDate-{{ loop.index }}">{{ description }}</label>
+                            <br/>
+                        {% endfor %}
+                    </fieldset>
+                </td>
+            </tr>
+
+        </table>
+        <input type="submit" value="{{ 'General_Save'|translate }}" id="anonymousUserSettingsSubmit" class="submit"/>
+    {% endif %}
+{% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/plugins/UsersManager/templates/index.twig b/plugins/UsersManager/templates/index.twig
index f102bce7e1..2a29c9f851 100644
--- a/plugins/UsersManager/templates/index.twig
+++ b/plugins/UsersManager/templates/index.twig
@@ -110,7 +110,7 @@
     {% import 'ajaxMacros.twig' as ajax %}
     {{ ajax.errorDiv('ajaxErrorUsersManagement') }}
     {{ ajax.loadingDiv('ajaxLoadingUsersManagement') }}
-    <div class="entityContainer" style="margin-bottom:50px;">
+    <div class="user entityContainer" style="margin-bottom:50px;">
         <table class="entityTable dataTable" id="users">
             <thead>
             <tr>
diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig
index 74f26ab4b5..769a682a43 100644
--- a/plugins/UsersManager/templates/userSettings.twig
+++ b/plugins/UsersManager/templates/userSettings.twig
@@ -1,9 +1,8 @@
-{% extends 'admin.twig' %}
+{% extends 'user.twig' %}
 
 {% block content %}
-<h2 piwik-enriched-headline>{{ 'UsersManager_MenuUserSettings'|translate }}</h2>
+<h2 piwik-enriched-headline>{{ 'UsersManager_PersonalSettings'|translate }}</h2>
 
-<br/>
 <div class="ui-confirm" id="confirmPasswordChange">
     <h2>{{ 'UsersManager_ChangePasswordConfirm'|translate }}</h2>
     <input role="yes" type="button" value="{{ 'General_Yes'|translate }}"/>
@@ -121,56 +120,4 @@
 </a></span>
 
 <br/><br/>
-{% if isSuperUser %}
-    <h2>{{ 'UsersManager_MenuAnonymousUserSettings'|translate }}</h2>
-    {% if anonymousSites|length == 0 %}
-        <h3 class='form-description'><strong>{{ 'UsersManager_NoteNoAnonymousUserAccessSettingsWontBeUsed2'|translate }}</strong></h3>
-        <br/>
-    {% else %}
-        <br/>
-        {{ ajax.errorDiv('ajaxErrorAnonymousUserSettings') }}
-        {{ ajax.loadingDiv('ajaxLoadingAnonymousUserSettings') }}
-        <table id='anonymousUserSettingsTable' class="adminTable" style='width:850px;'>
-            <tr>
-                <td style="width:400px;">{{ 'UsersManager_WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess'|translate }}</td>
-                <td>
-                    <fieldset>
-                        <input id="anonymousDefaultReport-login" type="radio" value="Login"
-                               name="anonymousDefaultReport"{% if anonymousDefaultReport==loginModule %} checked="checked"{% endif %} />
-                        <label for="anonymousDefaultReport-login">{{ 'UsersManager_TheLoginScreen'|translate }}</label><br/>
-                        <input id="anonymousDefaultReport-multisites" {% if anonymousSites is empty %}disabled="disabled" {% endif %}type="radio" value="MultiSites"
-                               name="anonymousDefaultReport"{% if anonymousDefaultReport=='MultiSites' %} checked="checked"{% endif %} />
-                        <label for="anonymousDefaultReport-multisites">{{ 'General_AllWebsitesDashboard'|translate }}</label><br/>
-
-                        <input id="anonymousDefaultReport-specific" {% if anonymousSites is empty %}disabled="disabled" {% endif %}type="radio" value="1"
-                               name="anonymousDefaultReport"{% if anonymousDefaultReport>0 %} checked="checked"{% endif %} />
-                        <label for="anonymousDefaultReport-specific">{{ 'General_DashboardForASpecificWebsite'|translate }}</label>
-                        {% if anonymousSites is not empty %}
-                            <select id="anonymousDefaultReportWebsite">
-                                {% for info in anonymousSites %}
-                                    <option value="{{ info.idsite }}" {% if anonymousDefaultReport==info.idsite %} selected="selected"{% endif %}>{{ info.name|raw }}</option>
-                                {% endfor %}
-                            </select>
-                        {% endif %}
-                    </fieldset>
-                </td>
-            </tr>
-            <tr>
-                <td>{{ 'UsersManager_ForAnonymousUsersReportDateToLoadByDefault'|translate }}</td>
-                <td>
-                    <fieldset>
-                        {% for value,description in availableDefaultDates %}
-                            <input id="anonymousDefaultDate-{{ loop.index }}" type="radio" {% if anonymousDefaultDate==value %}checked="checked" {% endif %}value="{{ value }}"
-                                   name="anonymousDefaultDate"/>
-                            <label for="anonymousDefaultDate-{{ loop.index }}">{{ description }}</label>
-                            <br/>
-                        {% endfor %}
-                    </fieldset>
-                </td>
-            </tr>
-
-        </table>
-        <input type="submit" value="{{ 'General_Save'|translate }}" id="anonymousUserSettingsSubmit" class="submit"/>
-    {% endif %}
-{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/plugins/UsersManager/tests/Integration/APITest.php b/plugins/UsersManager/tests/Integration/APITest.php
index 1cf2cf71bb..5bd81f75c6 100644
--- a/plugins/UsersManager/tests/Integration/APITest.php
+++ b/plugins/UsersManager/tests/Integration/APITest.php
@@ -69,4 +69,70 @@ class APITest extends IntegrationTestCase
         $this->assertFalse($eventTriggered, 'UsersManager.removeSiteAccess event was triggered but should not');
     }
 
+    public function test_getAllUsersPreferences_isEmpty_whenNoPreference()
+    {
+        $preferences = $this->api->getAllUsersPreferences(array('preferenceName'));
+        $this->assertEmpty($preferences);
+    }
+
+    public function test_getAllUsersPreferences_isEmpty_whenNoPreferenceAndMultipleRequested()
+    {
+        $preferences = $this->api->getAllUsersPreferences(array('preferenceName', 'otherOne'));
+        $this->assertEmpty($preferences);
+    }
+
+    public function test_getAllUsersPreferences_shouldGetMultiplePreferences()
+    {
+        $user2 = 'userLogin2';
+        $user3 = 'userLogin3';
+        $this->api->addUser($user2, 'password', 'userlogin2@password.de');
+        $this->api->setUserPreference($user2, 'myPreferenceName', 'valueForUser2');
+        $this->api->setUserPreference($user2, 'RandomNOTREQUESTED', 'RandomNOTREQUESTED');
+
+        $this->api->addUser($user3, 'password', 'userlogin3@password.de');
+        $this->api->setUserPreference($user3, 'myPreferenceName', 'valueForUser3');
+        $this->api->setUserPreference($user3, 'otherPreferenceHere', 'otherPreferenceVALUE');
+        $this->api->setUserPreference($user3, 'RandomNOTREQUESTED', 'RandomNOTREQUESTED');
+
+        $expected = array(
+            $user2 => array(
+                'myPreferenceName' => 'valueForUser2'
+            ),
+            $user3 => array(
+                'myPreferenceName' => 'valueForUser3',
+                'otherPreferenceHere' => 'otherPreferenceVALUE',
+            ),
+        );
+        $result = $this->api->getAllUsersPreferences(array('myPreferenceName', 'otherPreferenceHere', 'randomDoesNotExist'));
+
+        $this->assertSame($expected, $result);
+    }
+
+    public function test_getAllUsersPreferences_whenLoginContainsUnderscore()
+    {
+        $user2 = 'user_Login2';
+        $this->api->addUser($user2, 'password', 'userlogin2@password.de');
+        $this->api->setUserPreference($user2, 'myPreferenceName', 'valueForUser2');
+        $this->api->setUserPreference($user2, 'RandomNOTREQUESTED', 'RandomNOTREQUESTED');
+
+        $expected = array(
+            $user2 => array(
+                'myPreferenceName' => 'valueForUser2'
+            ),
+        );
+        $result = $this->api->getAllUsersPreferences(array('myPreferenceName', 'otherPreferenceHere', 'randomDoesNotExist'));
+
+        $this->assertSame($expected, $result);
+    }
+
+    /**
+     * @expectedException \Exception
+     */
+    public function test_setUserPreference_throws_whenPreferenceNameContainsUnderscore()
+    {
+        $user2 = 'userLogin2';
+        $this->api->addUser($user2, 'password', 'userlogin2@password.de');
+        $this->api->setUserPreference($user2, 'ohOH_myPreferenceName', 'valueForUser2');
+    }
+
 }
diff --git a/plugins/UsersManager/tests/Integration/UsersManagerTest.php b/plugins/UsersManager/tests/Integration/UsersManagerTest.php
index 74f7fe3369..1fbad4dead 100644
--- a/plugins/UsersManager/tests/Integration/UsersManagerTest.php
+++ b/plugins/UsersManager/tests/Integration/UsersManagerTest.php
@@ -122,7 +122,7 @@ class UsersManagerTest extends IntegrationTestCase
     public function getAddUserInvalidLoginData()
     {
         return array(
-            array(12, "password", "email@email.com", "alias"), // wrong login / integer => exception
+            array(9, "password", "email@email.com", "alias"), // wrong login / integer => exception
             array("gegag'ggea'", "password", "email@email.com", "alias"), // wrong login / too short => exception
             array("gegag11gge&", "password", "email@email.com", "alias"), // wrong login / too long => exception
             array("geg'ag11gge@", "password", "email@email.com", "alias"), // wrong login / bad characters => exception
diff --git a/plugins/VisitFrequency/API.php b/plugins/VisitFrequency/API.php
index 97a98f27f8..a6f9971480 100644
--- a/plugins/VisitFrequency/API.php
+++ b/plugins/VisitFrequency/API.php
@@ -13,7 +13,7 @@ use Piwik\Archive;
 use Piwik\DataTable;
 use Piwik\Piwik;
 use Piwik\Plugins\VisitsSummary\API as APIVisitsSummary;
-use Piwik\SegmentExpression;
+use Piwik\Segment\SegmentExpression;
 
 /**
  * VisitFrequency API lets you access a list of metrics related to Returning Visitors.
diff --git a/plugins/VisitFrequency/Controller.php b/plugins/VisitFrequency/Controller.php
index ee1d3620a9..e1279206fd 100644
--- a/plugins/VisitFrequency/Controller.php
+++ b/plugins/VisitFrequency/Controller.php
@@ -11,18 +11,31 @@ namespace Piwik\Plugins\VisitFrequency;
 use Piwik\API\Request;
 use Piwik\Common;
 use Piwik\Piwik;
+use Piwik\Translation\Translator;
 use Piwik\View;
 
-/**
- *
- */
 class Controller extends \Piwik\Plugin\Controller
 {
-    function index()
+    /**
+     * @var Translator
+     */
+    private $translator;
+
+    public function __construct(Translator $translator)
+    {
+        $this->translator = $translator;
+
+        parent::__construct();
+    }
+
+    public function index()
     {
         $view = new View('@VisitFrequency/index');
+        $this->setGeneralVariablesView($view);
+
         $view->graphEvolutionVisitFrequency = $this->getEvolutionGraph(array(), array('nb_visits_returning'));
         $this->setSparklinesAndNumbers($view);
+
         return $view->render();
     }
 
@@ -42,9 +55,9 @@ class Controller extends \Piwik\Plugin\Controller
             }
         }
 
-        $documentation = Piwik::translate('VisitFrequency_ReturningVisitsDocumentation') . '<br />'
-            . Piwik::translate('General_BrokenDownReportDocumentation') . '<br />'
-            . Piwik::translate('VisitFrequency_ReturningVisitDocumentation');
+        $documentation = $this->translator->translate('VisitFrequency_ReturningVisitsDocumentation') . '<br />'
+            . $this->translator->translate('General_BrokenDownReportDocumentation') . '<br />'
+            . $this->translator->translate('VisitFrequency_ReturningVisitDocumentation');
 
         // Note: if you edit this array, maybe edit the code below as well
         $selectableColumns = array(
diff --git a/plugins/VisitFrequency/lang/ar.json b/plugins/VisitFrequency/lang/ar.json
index 205ce9a158..b7d3503d08 100644
--- a/plugins/VisitFrequency/lang/ar.json
+++ b/plugins/VisitFrequency/lang/ar.json
@@ -5,7 +5,6 @@
         "ColumnAvgActionsPerReturningVisit": "متوسط السلوكيات لكل زيارة عائدة",
         "ColumnBounceRateForReturningVisits": "معدل الارتداد للزوار العائدين",
         "ColumnReturningVisits": "الزيارات العائدة",
-        "PluginDescription": "تقارير حول إحصائيات متعددة عن الزوار العائدين في مقابل الزوار الجدد.",
         "ReturnActions": "%s سلوك بواسطة الزيارات المتكررة",
         "ReturnAverageVisitDuration": "%s متوسط طول الزيارة للزائر المتكرر",
         "ReturnAvgActions": "%s سلوك لكل زيارة متكررة",
diff --git a/plugins/VisitFrequency/lang/be.json b/plugins/VisitFrequency/lang/be.json
index cbd30b71b7..a3bff9797a 100644
--- a/plugins/VisitFrequency/lang/be.json
+++ b/plugins/VisitFrequency/lang/be.json
@@ -5,7 +5,6 @@
         "ColumnAvgActionsPerReturningVisit": "Сяр. колькасць дзеянняў за паўторнае наведванне",
         "ColumnBounceRateForReturningVisits": "Паказчык адмоў для паўторных наведванняў",
         "ColumnReturningVisits": "Паўторныя наведванні",
-        "PluginDescription": "Справаздачы статыстычных дадзеных аб наведвальніках, якія вяртаюцца на вэб-сайт, у параўнанні з наведвальнікамі якія трапілі на вэб-сайт у першы раз.",
         "ReturnActions": "%s дзеянняў за паўторныя наведванні",
         "ReturnAverageVisitDuration": "%s сярэдняя працягласць наведванняў для вяртаючыхся наведвальнікаў",
         "ReturnAvgActions": "%s дзеянняў за паўторнае наведванне",
diff --git a/plugins/VisitFrequency/lang/bg.json b/plugins/VisitFrequency/lang/bg.json
index ffbaac15da..d7a31df672 100644
--- a/plugins/VisitFrequency/lang/bg.json
+++ b/plugins/VisitFrequency/lang/bg.json
@@ -10,7 +10,6 @@
         "ColumnReturningVisits": "Върнали се посетители",
         "ColumnSumVisitLengthReturning": "Време прекарано по време на повторните посещения (в секунди)",
         "ColumnUniqueReturningVisitors": "Уникални повторни посетители",
-        "PluginDescription": "Статистики на Завърналите се посетители срещу уникалните посетители.",
         "ReturnActions": "%s действия от върнали се посетители",
         "ReturnAverageVisitDuration": "%s средна продължителност на посещенията от върналите се посетители",
         "ReturnAvgActions": "%s дейности на върналите се посетители",
diff --git a/plugins/VisitFrequency/lang/ca.json b/plugins/VisitFrequency/lang/ca.json
index de3513ee6e..ce826bca32 100644
--- a/plugins/VisitFrequency/lang/ca.json
+++ b/plugins/VisitFrequency/lang/ca.json
@@ -10,7 +10,6 @@
         "ColumnReturningVisits": "Visitants que retornen (antics)",
         "ColumnSumVisitLengthReturning": "Temps total dels visitants que retornen (en segons)",
         "ColumnUniqueReturningVisitors": "Visitants únics que retornen",
-        "PluginDescription": "Mostra informació sobre els visitants que retornen comparat amb els visitants per primera vegada.",
         "ReturnActions": "Els visitants que han tornat han fet %s accions",
         "ReturnAverageVisitDuration": "%s duració mitja de la vistia dels usuaris que retornen.",
         "ReturnAvgActions": "%s accions per visitant que retorna",
diff --git a/plugins/VisitFrequency/lang/cs.json b/plugins/VisitFrequency/lang/cs.json
index cad61af2ac..e864f8a7c4 100644
--- a/plugins/VisitFrequency/lang/cs.json
+++ b/plugins/VisitFrequency/lang/cs.json
@@ -7,10 +7,11 @@
         "ColumnBounceRateForReturningVisits": "Frekvence odchodů pro opakované návštěvy",
         "ColumnMaxActionsInReturningVisit": "Maximum akcí v jedné vracející se návštěvě",
         "ColumnNbReturningVisitsConverted": "Počet zkonvertovaných vracejících se návštěv",
+        "ColumnReturningUsers": "Vracející se uživatelé",
         "ColumnReturningVisits": "Opětovných návštěv",
         "ColumnSumVisitLengthReturning": "Celkový čas strávený vracejícími se návštěvníky (v sekundách)",
         "ColumnUniqueReturningVisitors": "Unikátní vracející se návštěvníci",
-        "PluginDescription": "Hlásí různé statistiky o navracejících se versus nových návštěvnících",
+        "PluginDescription": "Hlásí měření prvního času pro nové a vracející se návštěvníky.",
         "ReturnActions": "%s akcí za opakovanou návštěvu",
         "ReturnAverageVisitDuration": "%s průměrná dělka návštěvy pro navracející se návštěvníky",
         "ReturnAvgActions": "%s akcí na navracejících se návštěvníka",
diff --git a/plugins/VisitFrequency/lang/da.json b/plugins/VisitFrequency/lang/da.json
index d398450f6b..dc6413323a 100644
--- a/plugins/VisitFrequency/lang/da.json
+++ b/plugins/VisitFrequency/lang/da.json
@@ -11,7 +11,6 @@
         "ColumnReturningVisits": "Tilbagevendende besøg",
         "ColumnSumVisitLengthReturning": "Samlet tidsforbrug for tilbagevendende besøgende (i sekunder)",
         "ColumnUniqueReturningVisitors": "Unikke tilbagevendende besøgende",
-        "PluginDescription": "Rapporter forskellige statistikker om tilbagevendende besøgende kontra førstegangs besøgende..",
         "ReturnActions": "%s handlinger af tilbagevendende besøg",
         "ReturnAverageVisitDuration": "%s gns. Besøgsvarighed for tilbagevendende besøgende",
         "ReturnAvgActions": "%s gns. handlinger pr. tilbagevendende besøg",
diff --git a/plugins/VisitFrequency/lang/de.json b/plugins/VisitFrequency/lang/de.json
index b778119c69..f321051420 100644
--- a/plugins/VisitFrequency/lang/de.json
+++ b/plugins/VisitFrequency/lang/de.json
@@ -11,7 +11,7 @@
         "ColumnReturningVisits": "Wiederkehrende Besuche",
         "ColumnSumVisitLengthReturning": "Gesamte Aufenthaltszeit bei wiederkehrenden Besuchen (in Sekunden)",
         "ColumnUniqueReturningVisitors": "Eindeutige wiederkehrende Besucher",
-        "PluginDescription": "Zeigt verschiedene Statistiken über erstmalige und wiederkehrende Besucher.",
+        "PluginDescription": "Liefert Metriken über erstmalige und wiederkehrende Besucher.",
         "ReturnActions": "%s Aktionen von wiederkehrenden Besuchen",
         "ReturnAverageVisitDuration": "%s durchschnittliche Aufenthaltszeit bei wiederkehrenden Besuchen",
         "ReturnAvgActions": "%s Aktionen pro wiederkehrendem Besuch",
diff --git a/plugins/VisitFrequency/lang/el.json b/plugins/VisitFrequency/lang/el.json
index bf5e4980ff..bdd9c7d8d1 100644
--- a/plugins/VisitFrequency/lang/el.json
+++ b/plugins/VisitFrequency/lang/el.json
@@ -9,9 +9,9 @@
         "ColumnNbReturningVisitsConverted": "Αριθμός μετατρεπόμενων επιστρεφόμενων επισκέψεων",
         "ColumnReturningUsers": "Επιστρέφοντες Χρήστες",
         "ColumnReturningVisits": "Επιστρεφόμενες επισκέψεις",
-        "ColumnSumVisitLengthReturning": "Συνολικός δαπανηθής χρόνος από επιστρεφόμενους επισκέπτες (σε δευτερόλεπτα)",
+        "ColumnSumVisitLengthReturning": "Συνολικός δαπανηθείς χρόνος από επιστρεφόμενους επισκέπτες (σε δευτερόλεπτα)",
         "ColumnUniqueReturningVisitors": "Μοναδικοί επιστρεφόμενοι επισκέπτες",
-        "PluginDescription": "Αναφέρει διάφορα στατιστικά για τον Επιστρεφόμενο Επισκέπτη αντί το Πρωτοεμφανιζόμενου επισκέπτη.",
+        "PluginDescription": "Αναφέρει μετρικές σχετικά με τους νέους επισκέπτες και αυτούς που ξαναέρχονται.",
         "ReturnActions": "%s δραστηριότητες από τις επιστρεφόμενες επισκέψεις",
         "ReturnAverageVisitDuration": "%s μέση διάρκεια επισκέψεων για επιστρεφόμενους Επισκέπτες",
         "ReturnAvgActions": "%s δραστηριότητες ανά επιστρεφόμενη επίσκεψη",
diff --git a/plugins/VisitFrequency/lang/en.json b/plugins/VisitFrequency/lang/en.json
index ac8a2c3cd1..d157e0a88c 100644
--- a/plugins/VisitFrequency/lang/en.json
+++ b/plugins/VisitFrequency/lang/en.json
@@ -11,7 +11,7 @@
         "ColumnSumVisitLengthReturning": "Total time spent by returning visitors (in seconds)",
         "ColumnUniqueReturningVisitors": "Unique returning visitors",
         "ColumnReturningUsers": "Returning Users",
-        "PluginDescription": "Reports various statistics about the Returning Visitor versus the First time visitor.",
+        "PluginDescription": "Reports metrics about your first time new visitors and returning visitors.",
         "ReturnActions": "%s actions by the returning visits",
         "ReturnAverageVisitDuration": "%s average visit duration for returning visitors",
         "ReturnAvgActions": "%s actions per returning visit",
diff --git a/plugins/VisitFrequency/lang/es.json b/plugins/VisitFrequency/lang/es.json
index 5cb10f5c45..0c83fbdb72 100644
--- a/plugins/VisitFrequency/lang/es.json
+++ b/plugins/VisitFrequency/lang/es.json
@@ -10,7 +10,6 @@
         "ColumnReturningVisits": "Visitante que ha vuelto",
         "ColumnSumVisitLengthReturning": "Tiempo total transcurrido por visitantes usuales (en segundos)",
         "ColumnUniqueReturningVisitors": "Visitantes únicos que regresan",
-        "PluginDescription": "Reporta varias estadísticas sobre los Visitante que ha vuelto versus los Visitantes Nuevos.",
         "ReturnActions": "%s acciones realizadas por los visitantes que han vuelto",
         "ReturnAverageVisitDuration": "%s duración promedio de la visita para los visitantes que han vuelto",
         "ReturnAvgActions": "%s acciones por visitante que ha vuelto",
diff --git a/plugins/VisitFrequency/lang/fa.json b/plugins/VisitFrequency/lang/fa.json
index 7f45989312..aa4cc67529 100644
--- a/plugins/VisitFrequency/lang/fa.json
+++ b/plugins/VisitFrequency/lang/fa.json
@@ -10,7 +10,6 @@
         "ColumnReturningVisits": "بازدید کننده بازگشتی",
         "ColumnSumVisitLengthReturning": "مجموع مدت زمان حضور توسط بازدید کنندگان باز می گردند (بر حسب ثانیه)",
         "ColumnUniqueReturningVisitors": "بازدید بازگشتی یکتا",
-        "PluginDescription": "گزارش آمار مختلف در مورد بازدید کنندگان بازگشتی در مقابل بازدید کننده بار اول است.",
         "ReturnActions": "%s فعالیت توسط بازدیدهای برگشتی",
         "ReturnAverageVisitDuration": "%s متوسط مدت بازدید بازدیدکنندگان برگشتی",
         "ReturnAvgActions": "%s فعالیت به ازای هر بازدید بازگشتی",
diff --git a/plugins/VisitFrequency/lang/fi.json b/plugins/VisitFrequency/lang/fi.json
index 3c60c422f7..b46c8115d6 100644
--- a/plugins/VisitFrequency/lang/fi.json
+++ b/plugins/VisitFrequency/lang/fi.json
@@ -10,7 +10,6 @@
         "ColumnReturningVisits": "Palaavat käynnit",
         "ColumnSumVisitLengthReturning": "Palaavien käyttäjien aika yhteensä (sekunteja)",
         "ColumnUniqueReturningVisitors": "Yksilölliset palaavat kävijät",
-        "PluginDescription": "Raportoi sekalaisia tietoja palaavista kävijöistä ja ensimmäistä kertaa käyvistä vierailijoista.",
         "ReturnActions": "%s toimintoa palaavilta käyttäjiltä",
         "ReturnAverageVisitDuration": "%s keskimääräinen käynnin pituus palaaville kävijöille",
         "ReturnAvgActions": "%s toimintoa \/ palaava käynti",
diff --git a/plugins/VisitFrequency/lang/fr.json b/plugins/VisitFrequency/lang/fr.json
index e65edecefc..f22ff040fc 100644
--- a/plugins/VisitFrequency/lang/fr.json
+++ b/plugins/VisitFrequency/lang/fr.json
@@ -11,7 +11,6 @@
         "ColumnReturningVisits": "Visites retour",
         "ColumnSumVisitLengthReturning": "Le temps total passé par les visiteurs de retour (en secondes)",
         "ColumnUniqueReturningVisitors": "Visiteurs uniques de retour",
-        "PluginDescription": "Effectue des rapports sur les visiteurs déjà venus vis-à-vis des nouveaux visiteurs.",
         "ReturnActions": "%s actions de visites de visiteurs connus",
         "ReturnAverageVisitDuration": "%s durée moyenne de la visite des visiteurs connus",
         "ReturnAvgActions": "%s actions par visiteur connu",
diff --git a/plugins/VisitFrequency/lang/hu.json b/plugins/VisitFrequency/lang/hu.json
index e52d9f1c97..745af72069 100644
--- a/plugins/VisitFrequency/lang/hu.json
+++ b/plugins/VisitFrequency/lang/hu.json
@@ -5,7 +5,6 @@
         "ColumnAvgActionsPerReturningVisit": "Akciók átlagos gyakorisága ismétlődő látogatások esetén",
         "ColumnBounceRateForReturningVisits": "Visszafordulások aránya ismétlődő látogatások esetén",
         "ColumnReturningVisits": "Ismétlődő látogatások",
-        "PluginDescription": "Különböző statisztikákat állít elő az új látogatók és a visszatérő látogatók viszonylatában.",
         "ReturnActions": "%s akció ismétlődő látogatások során",
         "ReturnAverageVisitDuration": "%s a látogatás átlagos időtartama a visszatérő látogatók esetén",
         "ReturnAvgActions": "%s akció ismétlődő látogatás során",
diff --git a/plugins/VisitFrequency/lang/id.json b/plugins/VisitFrequency/lang/id.json
index 85eef81784..4149ae29fc 100644
--- a/plugins/VisitFrequency/lang/id.json
+++ b/plugins/VisitFrequency/lang/id.json
@@ -10,7 +10,6 @@
         "ColumnReturningVisits": "Kunjungan Kembali",
         "ColumnSumVisitLengthReturning": "Jumlah waktu digunakan oleh pengunjung kembali (dalam detik)",
         "ColumnUniqueReturningVisitors": "Pengnjung kembali unik",
-        "PluginDescription": "Laporan statistik tentang Pengunjung Kembali dan Pengunjung Pertama kali kunjung.",
         "ReturnActions": "%s tindakan tiap kunjungan kembali",
         "ReturnAverageVisitDuration": "%s rerata waktu kunjungan pengunjung kembali",
         "ReturnAvgActions": "%s tindakan tiap kunjungan kembali",
diff --git a/plugins/VisitFrequency/lang/is.json b/plugins/VisitFrequency/lang/is.json
index d02b01fe90..df1821a460 100644
--- a/plugins/VisitFrequency/lang/is.json
+++ b/plugins/VisitFrequency/lang/is.json
@@ -5,7 +5,6 @@
         "ColumnAvgActionsPerReturningVisit": "Meðalfj. aðgerða fyrir endurkomur",
         "ColumnBounceRateForReturningVisits": "Skopphraði fyrir endurkomur",
         "ColumnReturningVisits": "Endurkomur",
-        "PluginDescription": "Skýrsla yfir ýmsa tölfræði um endurkomur versur nýja gesti.",
         "ReturnActions": "%s aðgerðir hjá endurkomum",
         "ReturnAverageVisitDuration": "%s meðalheimsóknartími fyrir endurkomur",
         "ReturnAvgActions": "%s aðgerðir á hverja endurkomu",
diff --git a/plugins/VisitFrequency/lang/it.json b/plugins/VisitFrequency/lang/it.json
index e8a5decf92..cf9509e84f 100644
--- a/plugins/VisitFrequency/lang/it.json
+++ b/plugins/VisitFrequency/lang/it.json
@@ -11,7 +11,7 @@
         "ColumnReturningVisits": "Visite ricorrenti",
         "ColumnSumVisitLengthReturning": "Tempo complessivo speso dai visitatori di ritorno (in secondi)",
         "ColumnUniqueReturningVisitors": "Visitatori unici di ritorno",
-        "PluginDescription": "Riporta varie statistiche riguardo i Visitatori che Ritornano controntati con i Nuovi Visitatori.",
+        "PluginDescription": "Restituisce le metriche riguardanti i nuovi visitatori e quelli di ritorno.",
         "ReturnActions": "%s pagine visualizzate dalle visite ricorrenti",
         "ReturnAverageVisitDuration": "%s durata visita per visitatori di ritorno",
         "ReturnAvgActions": "%s azioni per visita di ritorno",
diff --git a/plugins/VisitFrequency/lang/ja.json b/plugins/VisitFrequency/lang/ja.json
index 1fba776afd..806051fbf3 100644
--- a/plugins/VisitFrequency/lang/ja.json
+++ b/plugins/VisitFrequency/lang/ja.json
@@ -10,7 +10,6 @@
         "ColumnReturningVisits": "リピートビジット",
         "ColumnSumVisitLengthReturning": "リピーターの総滞在時間(秒単位)",
         "ColumnUniqueReturningVisitors": "ユニークリピートビジット",
-        "PluginDescription": "リピーターと新規ビジターの対比に関するさまざまな統計をリポートします。",
         "ReturnActions": "%s リピートビジットによるアクション数",
         "ReturnAverageVisitDuration": "%s リピートビジットの平均ビジット継続時間",
         "ReturnAvgActions": "%s リピートビジット単位のアクション数",
diff --git a/plugins/VisitFrequency/lang/ka.json b/plugins/VisitFrequency/lang/ka.json
index c3245e7e34..40026b989b 100644
--- a/plugins/VisitFrequency/lang/ka.json
+++ b/plugins/VisitFrequency/lang/ka.json
@@ -5,7 +5,6 @@
         "ColumnAvgActionsPerReturningVisit": "საშ. ქმედება დაბრუნებულ ვიზიტზე",
         "ColumnBounceRateForReturningVisits": "უსარგებლო შესვლები დაბრუნებული ვიზიტორებისთვის",
         "ColumnReturningVisits": "დაბრუნებული ვიზიტები",
-        "PluginDescription": "ამუშავებს სხვადასხვა სტატისტიკას დაბრუნებული ვიზიტორების და პირველად შემოსული ვიზიტორების შედარებით.",
         "ReturnActions": "%s ქმედება დაბრუნებული ვიზიტების მიხედვით",
         "ReturnAverageVisitDuration": "%s ვიზიტის საშუალო ხანგრძლივობა დაბრუნებული ვიზიტებისთვის",
         "ReturnAvgActions": "%s ქმედება დაბრუნებულ ვიზიტზე",
diff --git a/plugins/VisitFrequency/lang/ko.json b/plugins/VisitFrequency/lang/ko.json
index af189a94a8..4192687557 100644
--- a/plugins/VisitFrequency/lang/ko.json
+++ b/plugins/VisitFrequency/lang/ko.json
@@ -10,7 +10,6 @@
         "ColumnReturningVisits": "돌아온 방문 수",
         "ColumnSumVisitLengthReturning": "리피터의 총 머문 시간 (초)",
         "ColumnUniqueReturningVisitors": "고유한 돌아온 방문자",
-        "PluginDescription": "돌아온 방문자와 신규 방문자의 대비한 다양한 통계를 보고합니다.",
         "ReturnActions": "%s 돌아온 방문의 활동",
         "ReturnAverageVisitDuration": "%s 돌아온 방문자의 평균 방문 시간",
         "ReturnAvgActions": "%s 돌아온 방문당 활동",
diff --git a/plugins/VisitFrequency/lang/lt.json b/plugins/VisitFrequency/lang/lt.json
index 4a79713916..bebd734943 100644
--- a/plugins/VisitFrequency/lang/lt.json
+++ b/plugins/VisitFrequency/lang/lt.json
@@ -5,7 +5,6 @@
         "ColumnAvgActionsPerReturningVisit": "Vidutiniškai atlikta sugrįžtančio lankytojo veiksmų",
         "ColumnBounceRateForReturningVisits": "Šoklumo reitingas tarp sugrįžtančių",
         "ColumnReturningVisits": "Sugrįžtančių apsilankymai",
-        "PluginDescription": "Parodo įvairią statistiką apie sugrįžtančius bei pirmą kartą apsilankančius lankytojus.",
         "ReturnActions": "%s sugrįžtančių veiksmai",
         "ReturnAverageVisitDuration": "%s sugrįžtančio lankytojo apsilankymo trukmės vidurkis",
         "ReturnAvgActions": "%s veiksmų iš sugrįžtančio lankytojo",
diff --git a/plugins/VisitFrequency/lang/nb.json b/plugins/VisitFrequency/lang/nb.json
index 8296701c8f..ae1d3f3b11 100644
--- a/plugins/VisitFrequency/lang/nb.json
+++ b/plugins/VisitFrequency/lang/nb.json
@@ -5,7 +5,6 @@
         "ColumnAvgActionsPerReturningVisit": "Gj. handling per tilbakevendende besøk",
         "ColumnBounceRateForReturningVisits": "Sprettfrekvens for tilbakevendende besøk",
         "ColumnReturningVisits": "Tilbakevendende besøk",
-        "PluginDescription": "Rapporterer forskjellig statistikk om tilbakevendende besøkende sammenlignet med førstegangs besøkende.",
         "ReturnActions": "%s handlinger av de tilbakevendende besøk",
         "ReturnAverageVisitDuration": "%s gjennomsnittlig besøksvarighet for tilbakevendende besøk",
         "ReturnBounceRate": "%s tilbakevendende besøk har sprettet (forlatt siden etter en side).",
diff --git a/plugins/VisitFrequency/lang/nl.json b/plugins/VisitFrequency/lang/nl.json
index 2c16e9e3a9..f5ba82c28f 100644
--- a/plugins/VisitFrequency/lang/nl.json
+++ b/plugins/VisitFrequency/lang/nl.json
@@ -7,10 +7,10 @@
         "ColumnBounceRateForReturningVisits": "Bounce Rate voor terugkerende bezoeken",
         "ColumnMaxActionsInReturningVisit": "Hoogste aantal acties in een terugkeer bezoek",
         "ColumnNbReturningVisitsConverted": "Aantal conversies terugkerende bezoekers",
+        "ColumnReturningUsers": "Terugkerende Gebruikers",
         "ColumnReturningVisits": "Terugkerende bezoeken",
         "ColumnSumVisitLengthReturning": "Totale tijd besteed door de terugkerende bezoeker (in seconden)",
         "ColumnUniqueReturningVisitors": "Unieke terugkerende bezoekers",
-        "PluginDescription": "Toont diverse statistieken over terugkerende bezoekers versus eerste bezoekers.",
         "ReturnActions": "%s acties tijdens terugkerende bezoeken",
         "ReturnAverageVisitDuration": "%s gemiddelde duur bezoek voor terugkerende bezoekers",
         "ReturnAvgActions": "%s acties per terugkerend bezoek",
diff --git a/plugins/VisitFrequency/lang/pl.json b/plugins/VisitFrequency/lang/pl.json
index 140ad4f45f..5a84ab7b7c 100644
--- a/plugins/VisitFrequency/lang/pl.json
+++ b/plugins/VisitFrequency/lang/pl.json
@@ -4,8 +4,9 @@
         "ColumnAverageVisitDurationForReturningVisitors": "Średni czas odwiedzin dla powtórnych wizyt (w sekundach)",
         "ColumnAvgActionsPerReturningVisit": "Średnia ilość działań przypadająca na powtórne odwiedziny",
         "ColumnBounceRateForReturningVisits": "Współczynnik rezygnacji dla powtórnych odwiedzin",
+        "ColumnReturningUsers": "Powracający Użytkownicy",
         "ColumnReturningVisits": "Powtórne odwiedziny",
-        "PluginDescription": "Raportuje rozmaite statystyki o powracających odwiedzających w odniesieniu do tych którzy pojawiają się po raz pierwszy.",
+        "ColumnSumVisitLengthReturning": "Całkowity czas spędzony przez powracających użytkowników (w sekundach)",
         "ReturnActions": "%s działań przypadających na powtórne odwiedziny",
         "ReturnAverageVisitDuration": "%s średni czas trwania odwiedzin przy powtórnych odsłonach",
         "ReturnAvgActions": "%s działań przypadających na powtórne odwiedziny",
diff --git a/plugins/VisitFrequency/lang/pt-br.json b/plugins/VisitFrequency/lang/pt-br.json
index 818d9e9250..2f4680fb53 100644
--- a/plugins/VisitFrequency/lang/pt-br.json
+++ b/plugins/VisitFrequency/lang/pt-br.json
@@ -10,7 +10,6 @@
         "ColumnReturningVisits": "Visitantes de Retorno",
         "ColumnSumVisitLengthReturning": "O tempo total gasto por visitantes de retorno (em segundos)",
         "ColumnUniqueReturningVisitors": "Visitantes únicos que retornaram",
-        "PluginDescription": "Reportar diferentes estatísticas sobre os visitantes que retornam versus os visitantes pela primeira vez.",
         "ReturnActions": "%s ações por visitante de retorno",
         "ReturnAverageVisitDuration": "%s média da duração da visita para visitantes que retornam",
         "ReturnAvgActions": "%s ações por visita retornada",
diff --git a/plugins/VisitFrequency/lang/pt.json b/plugins/VisitFrequency/lang/pt.json
index d5a92434a3..1a5589bc8c 100644
--- a/plugins/VisitFrequency/lang/pt.json
+++ b/plugins/VisitFrequency/lang/pt.json
@@ -10,7 +10,6 @@
         "ColumnReturningVisits": "Visitas de Retorno",
         "ColumnSumVisitLengthReturning": "Tempo total passado por visitantes de retorno (em segundos)",
         "ColumnUniqueReturningVisitors": "Visitas de retorno únicas",
-        "PluginDescription": "Relata várias estatísticas sobre os Visitantes de Retorno contra os Visitantes",
         "ReturnActions": "%s ações pelos visitantes de retorno",
         "ReturnAverageVisitDuration": "%s duração média de visita por visitantes de retorno",
         "ReturnAvgActions": "%s ações por visita de retorno",
diff --git a/plugins/VisitFrequency/lang/ro.json b/plugins/VisitFrequency/lang/ro.json
index 083020c1e7..5083cc1f8e 100644
--- a/plugins/VisitFrequency/lang/ro.json
+++ b/plugins/VisitFrequency/lang/ro.json
@@ -10,7 +10,6 @@
         "ColumnReturningVisits": "Reintoarcere vizite",
         "ColumnSumVisitLengthReturning": "Timpul total petrecut de vizitatori reintorsi (în secunde",
         "ColumnUniqueReturningVisitors": "Vizitatori unici se reîntorc",
-        "PluginDescription": "Rapoarteaza diverse statistici despre reintoarcerea Vizitei față de vizitatorii pentru prima dată.",
         "ReturnActions": "%s actiuni ale vizitatorilor intorsi",
         "ReturnAverageVisitDuration": "%s Durata medie de vizita pentru retintoacerea vizitelor",
         "ReturnAvgActions": "%s acțiuni pe revenirea vizita",
diff --git a/plugins/VisitFrequency/lang/ru.json b/plugins/VisitFrequency/lang/ru.json
index 96b7f5fabe..9a6e453a9e 100644
--- a/plugins/VisitFrequency/lang/ru.json
+++ b/plugins/VisitFrequency/lang/ru.json
@@ -7,10 +7,10 @@
         "ColumnBounceRateForReturningVisits": "Для отскочивих среди повторных посетителей",
         "ColumnMaxActionsInReturningVisit": "Максимум действий за одно вернувшееся посещение",
         "ColumnNbReturningVisitsConverted": "Число конверсии вернувшихся посетителей",
+        "ColumnReturningUsers": "Вернувшиеся пользователи",
         "ColumnReturningVisits": "Повторные посещения",
         "ColumnSumVisitLengthReturning": "Общее время, проведенное вернувшимися посетителями (в секундах)",
         "ColumnUniqueReturningVisitors": "Уникальные вернувшиеся посетители",
-        "PluginDescription": "Предоставляет различную информацию о повторных посещениях, для сравнения ее с теми, кто пришел первый раз.",
         "ReturnActions": "%s действий за повторные посещения",
         "ReturnAverageVisitDuration": "%s средняя продолжительность посещения возвратившимся пользователями",
         "ReturnAvgActions": "%s действий за повторное посещение",
diff --git a/plugins/VisitFrequency/lang/sk.json b/plugins/VisitFrequency/lang/sk.json
index bdab2f77df..f021e634c6 100644
--- a/plugins/VisitFrequency/lang/sk.json
+++ b/plugins/VisitFrequency/lang/sk.json
@@ -5,7 +5,6 @@
         "ColumnAvgActionsPerReturningVisit": "Priemerný čas pre vracajúcich sa návštevníkov (v sekundách)",
         "ColumnBounceRateForReturningVisits": "Miera odskočení vracajúcich sa návštev",
         "ColumnReturningVisits": "Vracajúce sa návštevy",
-        "PluginDescription": "Rôzne štatistiky vracajúci sa návštevník versus návštevník ktorý navštívil stránku prvýkrát.",
         "ReturnActions": "počet akcií vracajúcich sa: %s",
         "ReturnAverageVisitDuration": "%s priemerná dĺžka návštevy u vracajúcich sa návštevníkov",
         "ReturnAvgActions": "%s akcie pre vracajúcej sa návšteve",
diff --git a/plugins/VisitFrequency/lang/sq.json b/plugins/VisitFrequency/lang/sq.json
index 363c7136f2..d3d4743961 100644
--- a/plugins/VisitFrequency/lang/sq.json
+++ b/plugins/VisitFrequency/lang/sq.json
@@ -10,7 +10,6 @@
         "ColumnReturningVisits": "Vizita Rikthim",
         "ColumnSumVisitLengthReturning": "Kohë e shpenzuar nga vizitorë të rikthyer (në sekonda) gjithsej",
         "ColumnUniqueReturningVisitors": "Vizitorë të rikthyer unikë",
-        "PluginDescription": "Raporton statistika të ndryshme rreth Vizitorë të Rikthyer kundrejt vizitorëve që vijnë për herë të Parë.",
         "ReturnActions": "%s veprime nga vizita rikthim",
         "ReturnAverageVisitDuration": "%s mesatare zgjatjeje vizite për vizitorë të rikthyer",
         "ReturnAvgActions": "%s veprime për vizitë të rikthyer",
diff --git a/plugins/VisitFrequency/lang/sr.json b/plugins/VisitFrequency/lang/sr.json
index 0e255dc435..cd6775da47 100644
--- a/plugins/VisitFrequency/lang/sr.json
+++ b/plugins/VisitFrequency/lang/sr.json
@@ -10,7 +10,6 @@
         "ColumnReturningVisits": "Posetioci koji se vraćaju",
         "ColumnSumVisitLengthReturning": "Ukupno vreme provedeno od strane ponovnih posetilaca (u sekundama)",
         "ColumnUniqueReturningVisitors": "Jedinstvenih ponovnih posetilaca",
-        "PluginDescription": "Statistika novih korisnika u odnosu na korisnike koji se vraćaju",
         "ReturnActions": "Broj akcija od strane ponovnih poseta: %s",
         "ReturnAverageVisitDuration": "Prosečno trajanje posete od strane ponovnih posetilaca: %s",
         "ReturnAvgActions": "Broj akcija po ponovnoj poseti: %s",
diff --git a/plugins/VisitFrequency/lang/sv.json b/plugins/VisitFrequency/lang/sv.json
index db87c6cc99..8656f02bf1 100644
--- a/plugins/VisitFrequency/lang/sv.json
+++ b/plugins/VisitFrequency/lang/sv.json
@@ -10,7 +10,6 @@
         "ColumnReturningVisits": "Återkommande besök",
         "ColumnSumVisitLengthReturning": "Total tid som återkommande besökare spenderade (i sekunder)",
         "ColumnUniqueReturningVisitors": "Unika återkommande besökare",
-        "PluginDescription": "Rapporterar olika statistik om Återkommande besökare jämfört med förstagångs-besökare.",
         "ReturnActions": "%s händelser av de återkommande besöken",
         "ReturnAverageVisitDuration": "%s genomsnittlig besökstid för återkommande besökare",
         "ReturnAvgActions": "%s händelser per återkommande besök",
diff --git a/plugins/VisitFrequency/lang/th.json b/plugins/VisitFrequency/lang/th.json
index 8acae77c8b..2073ede04c 100644
--- a/plugins/VisitFrequency/lang/th.json
+++ b/plugins/VisitFrequency/lang/th.json
@@ -5,7 +5,6 @@
         "ColumnAvgActionsPerReturningVisit": "เฉลี่ยการดำเนินการต่อกลับมาเข้าชม",
         "ColumnBounceRateForReturningVisits": "อัตราการเด้งของผู้เข้าชมที่กลับมา",
         "ColumnReturningVisits": "ผู้เข้าชมที่กลับมา",
-        "PluginDescription": "รายงานสถิติต่าง ๆ เกี่ยวกับผู้เข้าชมกลับมาเทียบกับผู้เข้าชมครั้งแรก",
         "ReturnActions": "%s ดำเนินการโดยการกลับมาเข้าชม",
         "ReturnAverageVisitDuration": "%s ค่าเฉลี่ยของเข้าเข้าชมระยะเวลาสำหรับการส่งกลับผู้เข้าชม",
         "ReturnAvgActions": "%s ดำเนินต่อกลับมาเข้าชม",
diff --git a/plugins/VisitFrequency/lang/tl.json b/plugins/VisitFrequency/lang/tl.json
index 0f5d810da6..111567881d 100644
--- a/plugins/VisitFrequency/lang/tl.json
+++ b/plugins/VisitFrequency/lang/tl.json
@@ -10,7 +10,6 @@
         "ColumnReturningVisits": "Mga bumabalik na pagbisita",
         "ColumnSumVisitLengthReturning": "Kabuuang oras na ginugol ng mga bumabalik na bisita (sa segundo)",
         "ColumnUniqueReturningVisitors": "Natatanging mga bumabalik na bisita",
-        "PluginDescription": "Ulat ayon sa iba't ibang mga istatistika tungkol sa mga nag balik na bisita kumpara sa unang bisita.",
         "ReturnActions": "Mga pagkilos %s ng mga bumabalik na mga bisita.",
         "ReturnAverageVisitDuration": "%s ang karaniwang tagal ng pagbisita para sa mga bumabalik na bisita",
         "ReturnAvgActions": "pagkilos %s bawat bumabalik na pagbisita",
diff --git a/plugins/VisitFrequency/lang/uk.json b/plugins/VisitFrequency/lang/uk.json
index af9ec92a5e..501946142a 100644
--- a/plugins/VisitFrequency/lang/uk.json
+++ b/plugins/VisitFrequency/lang/uk.json
@@ -5,7 +5,6 @@
         "ColumnAvgActionsPerReturningVisit": "Середня кількість дій для повторних відвідувань",
         "ColumnBounceRateForReturningVisits": "Показник відмов для повторних відвідувань",
         "ColumnReturningVisits": "Візити повторних відвідувань",
-        "PluginDescription": "Повідомляє різноманітну статистику про співвідношення відвідувачів що повертаються до відвідувачів що потрапили на сайті вперше",
         "ReturnActions": "%s переглядів сторінок повторними відвідувачами",
         "ReturnAverageVisitDuration": "%s середня тривалість візиту для повторного відвідувача",
         "ReturnAvgActions": "%s дій на повнорного відвідувача",
diff --git a/plugins/VisitFrequency/lang/vi.json b/plugins/VisitFrequency/lang/vi.json
index 98be8768d3..af35016631 100644
--- a/plugins/VisitFrequency/lang/vi.json
+++ b/plugins/VisitFrequency/lang/vi.json
@@ -10,7 +10,6 @@
         "ColumnReturningVisits": "Các lượt truy cập quay lại",
         "ColumnSumVisitLengthReturning": "Tổng số thời gian dành cho khách truy cập quay lại (tính bằng giây)",
         "ColumnUniqueReturningVisitors": "Các khách truy cập quay lại duy nhất (unique)",
-        "PluginDescription": "Báo cáo thống kê khác nhau về khách quay lại so với khách truy cập trong thời gian đầu.",
         "ReturnActions": "%s hành động của các lượt truy cập quay lại",
         "ReturnAverageVisitDuration": "thời gian truy cập trung bình %s cho các khách truy cập quay lại",
         "ReturnAvgActions": "%s Hành động của mỗi lượt truy cập quay lại",
diff --git a/plugins/VisitFrequency/lang/zh-cn.json b/plugins/VisitFrequency/lang/zh-cn.json
index e873750cbd..82fdc19713 100644
--- a/plugins/VisitFrequency/lang/zh-cn.json
+++ b/plugins/VisitFrequency/lang/zh-cn.json
@@ -10,7 +10,6 @@
         "ColumnReturningVisits": "老访客的访问次数",
         "ColumnSumVisitLengthReturning": "老访客总的停留时间 (秒)",
         "ColumnUniqueReturningVisitors": "独立重访客数",
-        "PluginDescription": "关于老访客与新访客的报表。",
         "ReturnActions": "%s 个老访客的活动次数",
         "ReturnAverageVisitDuration": "%s 老访客的平均停留时间",
         "ReturnAvgActions": "%s 个老访客的平均活动次数",
diff --git a/plugins/VisitFrequency/lang/zh-tw.json b/plugins/VisitFrequency/lang/zh-tw.json
index 280e2b01bf..6072a3a2b4 100644
--- a/plugins/VisitFrequency/lang/zh-tw.json
+++ b/plugins/VisitFrequency/lang/zh-tw.json
@@ -5,7 +5,6 @@
         "ColumnAvgActionsPerReturningVisit": "每個重返造訪的平均活動數",
         "ColumnBounceRateForReturningVisits": "回訪客的跳出率",
         "ColumnReturningVisits": "重返造訪",
-        "PluginDescription": "關於回訪者與一般訪客的報表。",
         "ReturnActions": "%s 個活動數由重返造訪所產生",
         "ReturnAverageVisitDuration": "%s 重返造訪的平均訪問時間",
         "ReturnAvgActions": "%s 個活動數每個重返造訪",
diff --git a/plugins/VisitFrequency/templates/_sparklines.twig b/plugins/VisitFrequency/templates/_sparklines.twig
index 2c2c0f81a2..97697272e8 100644
--- a/plugins/VisitFrequency/templates/_sparklines.twig
+++ b/plugins/VisitFrequency/templates/_sparklines.twig
@@ -1,22 +1,26 @@
-<div class="sparkline">
-    {{ sparkline(urlSparklineNbVisitsReturning) }}
-    {{ 'VisitFrequency_ReturnVisits'|translate("<strong>"~nbVisitsReturning~"</strong>")|raw }}
+<div id="leftcolumn">
+    <div class="sparkline">
+        {{ sparkline(urlSparklineNbVisitsReturning) }}
+        {{ 'VisitFrequency_ReturnVisits'|translate("<strong>"~nbVisitsReturning~"</strong>")|raw }}
+    </div>
+    <div class="sparkline">
+        {{ sparkline(urlSparklineNbActionsReturning) }}
+        {{ 'VisitFrequency_ReturnActions'|translate("<strong>"~nbActionsReturning~"</strong>")|raw }}
+    </div>
+    <div class="sparkline">
+        {{ sparkline(urlSparklineActionsPerVisitReturning) }}
+        {{ 'VisitFrequency_ReturnAvgActions'|translate("<strong>"~nbActionsPerVisitReturning~"</strong>")|raw }}
+    </div>
+</div><div id="rightcolumn">
+    <div class="sparkline">
+        {{ sparkline(urlSparklineAvgVisitDurationReturning) }}
+        {% set avgVisitDurationReturning=avgVisitDurationReturning|sumtime %}
+        {{ 'VisitFrequency_ReturnAverageVisitDuration'|translate("<strong>"~avgVisitDurationReturning~"</strong>")|raw }}
+    </div>
+    <div class="sparkline">
+        {{ sparkline(urlSparklineBounceRateReturning) }}
+        {{ 'VisitFrequency_ReturnBounceRate'|translate("<strong>"~bounceRateReturning~"</strong>")|raw }}
+    </div>
+    {% include "_sparklineFooter.twig" %}
 </div>
-<div class="sparkline">
-    {{ sparkline(urlSparklineNbActionsReturning) }}
-    {{ 'VisitFrequency_ReturnActions'|translate("<strong>"~nbActionsReturning~"</strong>")|raw }}
-</div>
-<div class="sparkline">
-    {{ sparkline(urlSparklineActionsPerVisitReturning) }}
-    {{ 'VisitFrequency_ReturnAvgActions'|translate("<strong>"~nbActionsPerVisitReturning~"</strong>")|raw }}
-</div>
-<div class="sparkline">
-    {{ sparkline(urlSparklineAvgVisitDurationReturning) }}
-    {% set avgVisitDurationReturning=avgVisitDurationReturning|sumtime %}
-    {{ 'VisitFrequency_ReturnAverageVisitDuration'|translate("<strong>"~avgVisitDurationReturning~"</strong>")|raw }}
-</div>
-<div class="sparkline">
-    {{ sparkline(urlSparklineBounceRateReturning) }}
-    {{ 'VisitFrequency_ReturnBounceRate'|translate("<strong>"~bounceRateReturning~"</strong>")|raw }}
-</div>
-{% include "_sparklineFooter.twig" %}
+<div style="clear:both"></div>
\ No newline at end of file
diff --git a/plugins/VisitTime/API.php b/plugins/VisitTime/API.php
index f27e5f812a..928e8c95f3 100644
--- a/plugins/VisitTime/API.php
+++ b/plugins/VisitTime/API.php
@@ -14,6 +14,7 @@ use Piwik\DataTable;
 use Piwik\Date;
 use Piwik\Metrics;
 use Piwik\Period;
+use Piwik\Period\Range;
 use Piwik\Piwik;
 use Piwik\Site;
 
@@ -31,6 +32,7 @@ class API extends \Piwik\Plugin\API
         Piwik::checkUserHasViewAccess($idSite);
         $archive = Archive::build($idSite, $period, $date, $segment);
         $dataTable = $archive->getDataTable($name);
+
         $dataTable->filter('Sort', array('label', 'asc', true));
         $dataTable->queueFilter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getTimeLabel'));
         $dataTable->queueFilter('ReplaceColumnNames');
@@ -39,15 +41,23 @@ class API extends \Piwik\Plugin\API
 
     public function getVisitInformationPerLocalTime($idSite, $period, $date, $segment = false)
     {
-        return $this->getDataTable(Archiver::LOCAL_TIME_RECORD_NAME, $idSite, $period, $date, $segment);
+        $table = $this->getDataTable(Archiver::LOCAL_TIME_RECORD_NAME, $idSite, $period, $date, $segment);
+        $table->filter('AddSegmentValue');
+
+        return $table;
     }
 
     public function getVisitInformationPerServerTime($idSite, $period, $date, $segment = false, $hideFutureHoursWhenToday = false)
     {
         $table = $this->getDataTable(Archiver::SERVER_TIME_RECORD_NAME, $idSite, $period, $date, $segment);
+
+        $timezone = Site::getTimezoneFor($idSite);
+        $table->filter('Piwik\Plugins\VisitTime\DataTable\Filter\AddSegmentByLabelInUTC', array($timezone, $period, $date));
+
         if ($hideFutureHoursWhenToday) {
             $table = $this->removeHoursInFuture($table, $idSite, $period, $date);
         }
+
         return $table;
     }
 
diff --git a/plugins/VisitTime/DataTable/Filter/AddSegmentByLabelInUTC.php b/plugins/VisitTime/DataTable/Filter/AddSegmentByLabelInUTC.php
new file mode 100644
index 0000000000..0808c8c68c
--- /dev/null
+++ b/plugins/VisitTime/DataTable/Filter/AddSegmentByLabelInUTC.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\VisitTime\DataTable\Filter;
+
+use Piwik\DataTable;
+use Piwik\Period;
+
+/**
+ * Adds a segment value to each row by interpreting the label value as hour in the website's timezone and
+ * converting the hour to UTC.
+ *
+ * **Basic usage example**
+ *
+ *     $dataTable->filter('AddSegmentByLabelInUTC', array($idSite = 'UTC+1', $period = 'day', $date = 'today');
+ */
+class AddSegmentByLabelInUTC extends DataTable\Filter\AddSegmentValue
+{
+    private $timezone;
+    private $date;
+
+    /**
+     * @param DataTable $table
+     * @param int    $timezone  The timezone of the current selected site / the timezone of the labels
+     * @param string $period    The requested period and date is needed to respect daylight saving etc.
+     * @param string $date
+     */
+    public function __construct($table, $timezone, $period, $date)
+    {
+        $this->timezone = $timezone;
+        $this->date = Period\Factory::build($period, $date)->getDateEnd();
+
+        $self = $this;
+
+        parent::__construct($table, function ($label) use ($self) {
+            $hour = str_pad($label, 2, 0, STR_PAD_LEFT);
+
+            return $self->convertHourToUtc($hour);
+        });
+    }
+
+    public function convertHourToUTC($hour)
+    {
+        $dateWithHour   = $this->date->setTime($hour . ':00:00');
+        $dateInTimezone = $dateWithHour->setTimezone($this->timezone);
+        $hourInUTC = $dateInTimezone->getHourUTC();
+
+        return $hourInUTC;
+    }
+}
\ No newline at end of file
diff --git a/plugins/VisitTime/Reports/GetByDayOfWeek.php b/plugins/VisitTime/Reports/GetByDayOfWeek.php
index c720166cf5..d695ba5a7e 100644
--- a/plugins/VisitTime/Reports/GetByDayOfWeek.php
+++ b/plugins/VisitTime/Reports/GetByDayOfWeek.php
@@ -39,6 +39,8 @@ class GetByDayOfWeek extends Base
         $view->config->show_footer_message = Piwik::translate('General_ReportGeneratedFrom', $this->getDateRangeForFooterMessage());
         $view->config->addTranslation('label', $this->dimension->getName());
 
+        $view->config->disable_row_evolution = true;
+
         if ($view->isViewDataTableId(Graph::ID)) {
             $view->config->max_graph_elements = false;
             $view->config->show_all_ticks     = true;
diff --git a/plugins/VisitTime/lang/ar.json b/plugins/VisitTime/lang/ar.json
index b301b4088e..f40b2666fd 100644
--- a/plugins/VisitTime/lang/ar.json
+++ b/plugins/VisitTime/lang/ar.json
@@ -4,7 +4,6 @@
         "ColumnServerTime": "توقيت الملقم",
         "LocalTime": "الزيارات حسب التوقيت المحلي",
         "NHour": "%s س",
-        "PluginDescription": "يعد تقارير حول الأوقات المحلية وعلى الملقم: توقيت المقلم قد يكون مفيداً في جدولة مواعيد الصيانة للموقع.",
         "ServerTime": "الزيارات حسب توقيت الملقم",
         "SubmenuTimes": "التوقيت",
         "WidgetLocalTime": "الزيارات حسب التوقيت المحلي",
diff --git a/plugins/VisitTime/lang/be.json b/plugins/VisitTime/lang/be.json
index ed40931888..9eaf161f2b 100644
--- a/plugins/VisitTime/lang/be.json
+++ b/plugins/VisitTime/lang/be.json
@@ -4,7 +4,6 @@
         "ColumnServerTime": "Серверны час",
         "LocalTime": "Наведванняў па мясцовым часе",
         "NHour": "%s ч.",
-        "PluginDescription": "Паказвае мясцовых і серверны час. Інфармацы абя серверным часе можа быць выкарыставана для планавання тэхнічнага абслугоўвання вэб-сайта.",
         "ServerTime": "Наведванняў па серверным часе",
         "SubmenuTimes": "Па часе",
         "WidgetLocalTime": "Наведванняў па мясцовым часе",
diff --git a/plugins/VisitTime/lang/bg.json b/plugins/VisitTime/lang/bg.json
index af350c84f1..31f10e4014 100644
--- a/plugins/VisitTime/lang/bg.json
+++ b/plugins/VisitTime/lang/bg.json
@@ -5,7 +5,6 @@
         "DayOfWeek": "Ден от седмицата",
         "LocalTime": "Посещения по локално време",
         "NHour": "%sч",
-        "PluginDescription": "Доклад за сървърно и местно време. Сървърното време, може да бъде полезно при предвиждане на спиране за поддръжка на сайта.",
         "ServerTime": "Посещения по сървърно време",
         "SubmenuTimes": "Време",
         "VisitsByDayOfWeek": "Посещения по ден от седмицата",
diff --git a/plugins/VisitTime/lang/ca.json b/plugins/VisitTime/lang/ca.json
index 37f35178f0..b7fc7d4f11 100644
--- a/plugins/VisitTime/lang/ca.json
+++ b/plugins/VisitTime/lang/ca.json
@@ -5,7 +5,6 @@
         "DayOfWeek": "Dia de la setmana",
         "LocalTime": "Visites segons l'hora local",
         "NHour": "%sh",
-        "PluginDescription": "Informe sobre l'hora local i la del servidor. L'hora del servidor pot ser útil per programar un manteniment al lloc web.",
         "ServerTime": "Visites segons l'hora del servidor",
         "SubmenuTimes": "Hores",
         "VisitsByDayOfWeek": "Visites per día de la setmana",
diff --git a/plugins/VisitTime/lang/cs.json b/plugins/VisitTime/lang/cs.json
index 3adca9d819..ab1e8150f7 100644
--- a/plugins/VisitTime/lang/cs.json
+++ b/plugins/VisitTime/lang/cs.json
@@ -5,7 +5,7 @@
         "DayOfWeek": "Dny v týdnu",
         "LocalTime": "Návštěvy podle lokálního času",
         "NHour": "%sh",
-        "PluginDescription": "Hlásí lokální a serverový čas. Informace o serverovém času je užitečná pro naplánování odstávky webu",
+        "PluginDescription": "Hlásí místní a serverový čas, kdy vaši návštěvníci zobrazují stránky nebo aplikaci.",
         "ServerTime": "Návštěvy podle serverového času",
         "SubmenuTimes": "Časy",
         "VisitsByDayOfWeek": "Návštěvy podle dnů v týdnu",
diff --git a/plugins/VisitTime/lang/da.json b/plugins/VisitTime/lang/da.json
index fa2987563e..3101f2eedf 100644
--- a/plugins/VisitTime/lang/da.json
+++ b/plugins/VisitTime/lang/da.json
@@ -5,7 +5,6 @@
         "DayOfWeek": "Dag i ugen",
         "LocalTime": "Besøg pr. lokaltid",
         "NHour": "%s",
-        "PluginDescription": "Rapporter lokal- og servertid. Servertiden kan være nyttigt ved planlægning af vedligeholdelse på hjemmesiden.",
         "ServerTime": "Besøg pr. servertid",
         "SubmenuTimes": "Tider",
         "VisitsByDayOfWeek": "Besøg efter ugedag",
diff --git a/plugins/VisitTime/lang/de.json b/plugins/VisitTime/lang/de.json
index 1ddd4bd171..7b55863988 100644
--- a/plugins/VisitTime/lang/de.json
+++ b/plugins/VisitTime/lang/de.json
@@ -5,7 +5,7 @@
         "DayOfWeek": "Wochentag",
         "LocalTime": "Besuche nach lokaler Zeit",
         "NHour": "%sh",
-        "PluginDescription": "Berichte über die lokale Zeit des Besuchers und Serverzeit. Diese Informationen können hilfreich sein, um Wartungszeiträume für die Webseite zu planen.",
+        "PluginDescription": "Liefert die lokale Zeit und die Serverzeit, an der Ihre Besucher Ihre Webseite oder App besucht hatten.",
         "ServerTime": "Besuche nach Server-Zeit",
         "SubmenuTimes": "Zeiten",
         "VisitsByDayOfWeek": "Besuche nach Wochentagen",
diff --git a/plugins/VisitTime/lang/el.json b/plugins/VisitTime/lang/el.json
index 426046844d..7a7b502c5f 100644
--- a/plugins/VisitTime/lang/el.json
+++ b/plugins/VisitTime/lang/el.json
@@ -5,7 +5,7 @@
         "DayOfWeek": "Ημέρα της εβδομάδας",
         "LocalTime": "Επισκέψεις ανά τοπική ώρα",
         "NHour": "%sω",
-        "PluginDescription": "Αναφέρει τον Τοπικό Χρόνο και το Χρόνο Διακομιστή. Η πληροφορία του Χρόνου Διακομιστή μπορεί να είναι χρήσιμος για τον προγραμματισμό συντήρησης της Ιστοσελίδας.",
+        "PluginDescription": "Αναφέρει την τοπική ώρα και την ώρα του διακομιστή όταν οι επισκέπτες βλέπουν την ιστοσελίδα ή την εφαρμογή σας.",
         "ServerTime": "Επισκέψεις ανά ώρα διακομιστή",
         "SubmenuTimes": "Χρόνοι",
         "VisitsByDayOfWeek": "Επισκέψεις ανά Ημέρα της Εβδομάδας",
diff --git a/plugins/VisitTime/lang/en.json b/plugins/VisitTime/lang/en.json
index c64403fd2b..df2f6b6734 100644
--- a/plugins/VisitTime/lang/en.json
+++ b/plugins/VisitTime/lang/en.json
@@ -5,7 +5,7 @@
         "DayOfWeek": "Day of the week",
         "LocalTime": "Visits per local time",
         "NHour": "%sh",
-        "PluginDescription": "Reports the Local and Server time. Server time information can be useful to schedule a maintenance on the Website.",
+        "PluginDescription": "Reports the local time and the server time when your visitors view your website or app. ",
         "ServerTime": "Visits per server time",
         "SubmenuTimes": "Times",
         "VisitsByDayOfWeek": "Visits by Day of Week",
diff --git a/plugins/VisitTime/lang/es.json b/plugins/VisitTime/lang/es.json
index 9bcae7741d..3703665ba6 100644
--- a/plugins/VisitTime/lang/es.json
+++ b/plugins/VisitTime/lang/es.json
@@ -5,7 +5,6 @@
         "DayOfWeek": "Día de la semana",
         "LocalTime": "Visitas por hora local",
         "NHour": "%sh",
-        "PluginDescription": "Reporta el tiempo Local y del Servidor. La información del tiempo del Servidor puede ser útil para programar un mantenimiento al sitio web.",
         "ServerTime": "Visitas por hora del servidor",
         "SubmenuTimes": "Tiempos",
         "VisitsByDayOfWeek": "Visitas por día de la semana",
diff --git a/plugins/VisitTime/lang/fa.json b/plugins/VisitTime/lang/fa.json
index 3b6a91986e..9a67443612 100644
--- a/plugins/VisitTime/lang/fa.json
+++ b/plugins/VisitTime/lang/fa.json
@@ -5,7 +5,6 @@
         "DayOfWeek": "روز از هفته",
         "LocalTime": "بازدید ها بر اساس زمان محلی",
         "NHour": "%sساعت",
-        "PluginDescription": "گزارش به وقت محلی و سرور است. اطلاعات سرور هم می تواند مفید باشد را به برنامه تعمیر و نگهداری بر روی وب سایت است.",
         "ServerTime": "بازدید ها بر اساس زمان سرور",
         "SubmenuTimes": "زمانها",
         "VisitsByDayOfWeek": "بازدیدها براساس روزهای هفته",
diff --git a/plugins/VisitTime/lang/fi.json b/plugins/VisitTime/lang/fi.json
index b176a4c472..70569fb1f3 100644
--- a/plugins/VisitTime/lang/fi.json
+++ b/plugins/VisitTime/lang/fi.json
@@ -5,7 +5,6 @@
         "DayOfWeek": "Viikonpäivä",
         "LocalTime": "Käyntejä (paikallinen aika)",
         "NHour": "%sh",
-        "PluginDescription": "Raportoi paikallisen ja palvelimen ajan. Palvelimen aikatietoa voi käyttää ylläpitokatkojen päättämiseen.",
         "ServerTime": "Käyntejä (palvelimen aika)",
         "SubmenuTimes": "Ajat",
         "VisitsByDayOfWeek": "Käynnit viikonpäivän mukaan",
diff --git a/plugins/VisitTime/lang/fr.json b/plugins/VisitTime/lang/fr.json
index 9d2455d80c..43ffa41e28 100644
--- a/plugins/VisitTime/lang/fr.json
+++ b/plugins/VisitTime/lang/fr.json
@@ -5,7 +5,6 @@
         "DayOfWeek": "Jour de la semaine",
         "LocalTime": "Visites par heure locale",
         "NHour": "%sh",
-        "PluginDescription": "Effectue des rapports sur la date locale et serveur. Les informations serveur peuvent être utiles pour planifier une maintenance sur un site web.",
         "ServerTime": "Visites par heure du serveur",
         "SubmenuTimes": "Horaires",
         "VisitsByDayOfWeek": "Visites par Jour de la Semaine",
diff --git a/plugins/VisitTime/lang/hu.json b/plugins/VisitTime/lang/hu.json
index 87d603bff4..a99e31b115 100644
--- a/plugins/VisitTime/lang/hu.json
+++ b/plugins/VisitTime/lang/hu.json
@@ -4,7 +4,6 @@
         "ColumnServerTime": "Szerveridő",
         "LocalTime": "Látogatások\/helyi idő",
         "NHour": "%s ó",
-        "PluginDescription": "Jelenti a helyi időt és a szerveridőt. A szerveridő segítségével ütemezhetőek a weboldallal kapcsolatos karbantartási feladatok.",
         "ServerTime": "Látogatások\/szerveridő",
         "SubmenuTimes": "Idő",
         "WidgetLocalTime": "Látogatások helyi idő szerint",
diff --git a/plugins/VisitTime/lang/id.json b/plugins/VisitTime/lang/id.json
index a32a5a5d6a..f06dcfb3e7 100644
--- a/plugins/VisitTime/lang/id.json
+++ b/plugins/VisitTime/lang/id.json
@@ -5,7 +5,6 @@
         "DayOfWeek": "Hari dalam Sepekan",
         "LocalTime": "Kunjungan tiap waktu lokal",
         "NHour": "%sj",
-        "PluginDescription": "Laporan waktu Lokal dan waktu Peladen. Informasi server waktu dapat berguna untuk menjadwalkan pemeliharaan pada Situs.",
         "ServerTime": "Kunjungan tiap waktu peladen",
         "SubmenuTimes": "Waktu",
         "VisitsByDayOfWeek": "Kunjungan berdasar Hari dalam Sepekan",
diff --git a/plugins/VisitTime/lang/is.json b/plugins/VisitTime/lang/is.json
index 675085c406..9bc819d0d7 100644
--- a/plugins/VisitTime/lang/is.json
+++ b/plugins/VisitTime/lang/is.json
@@ -4,7 +4,6 @@
         "ColumnServerTime": "Tímabelti þjóns",
         "LocalTime": "Heimsóknir miðað við staðartíma",
         "NHour": "%st",
-        "PluginDescription": "Sýnir Staðartíma og tímabelti þjónsins. Þetta getur verið nytsamt til að láta vita um viðhald vefsins.",
         "ServerTime": "Heimsóknir miðað við tíma vefþjóns",
         "SubmenuTimes": "Tímar",
         "WidgetLocalTime": "Heimsóknir skv. staðartíma",
diff --git a/plugins/VisitTime/lang/it.json b/plugins/VisitTime/lang/it.json
index f72a628e81..11d254f98a 100644
--- a/plugins/VisitTime/lang/it.json
+++ b/plugins/VisitTime/lang/it.json
@@ -5,7 +5,7 @@
         "DayOfWeek": "Giorno della settimana",
         "LocalTime": "Visite per ora locale",
         "NHour": "%sh",
-        "PluginDescription": "Mostra l'orario Locale e del Server. L'orario del server può essere utile per schedulare il mantenimento del sito.",
+        "PluginDescription": "Restituisce l'ora locale e del server di quando i visitatori hanno visto il tuo sito o l'app.",
         "ServerTime": "Visite per ora del server",
         "SubmenuTimes": "Visite per orario",
         "VisitsByDayOfWeek": "Visite per giorno della settimana",
diff --git a/plugins/VisitTime/lang/ja.json b/plugins/VisitTime/lang/ja.json
index a74dd52650..ef011622c5 100644
--- a/plugins/VisitTime/lang/ja.json
+++ b/plugins/VisitTime/lang/ja.json
@@ -5,7 +5,6 @@
         "DayOfWeek": "曜日",
         "LocalTime": "ローカルタイム単位のビジット",
         "NHour": "%s時",
-        "PluginDescription": "ローカルタイムとサーバータイムでリポートします。 サーバタイムの情報は、ウェブサイトのメンテナンスを予定するのに便利です。",
         "ServerTime": "サーバタイム単位のビジット",
         "SubmenuTimes": "時間",
         "VisitsByDayOfWeek": "曜日別訪問数",
diff --git a/plugins/VisitTime/lang/ka.json b/plugins/VisitTime/lang/ka.json
index a77802ce2c..a3abd1a0e7 100644
--- a/plugins/VisitTime/lang/ka.json
+++ b/plugins/VisitTime/lang/ka.json
@@ -4,7 +4,6 @@
         "ColumnServerTime": "სერვერის დრო",
         "LocalTime": "ვიზიტები ადგილობრივი დროით",
         "NHour": "%sსთ",
-        "PluginDescription": "გამოაქვს ადგილობრივი და სერვერის დრო. სერვერის დროის ინფორმაცია შეიძლება იყოს გამოსადეგი საიტის მოწესრიგების განრიგის შედგენისას.",
         "ServerTime": "ვიზიტები სერვერის დროით",
         "WidgetLocalTime": "ვიზიტები ადგილობრივი დროის მიხრდვით",
         "WidgetServerTime": "ვიზიტები სერვერის დროის მიხედვით"
diff --git a/plugins/VisitTime/lang/ko.json b/plugins/VisitTime/lang/ko.json
index d04bd7ef39..c83bd88aac 100644
--- a/plugins/VisitTime/lang/ko.json
+++ b/plugins/VisitTime/lang/ko.json
@@ -5,7 +5,6 @@
         "DayOfWeek": "요일",
         "LocalTime": "현지 시간 기준 방문 수",
         "NHour": "%s시",
-        "PluginDescription": "현지시간과 서버시간으로 보고합니다. 서버시간 정보는 웹사이트의 유지보수를 계획하는 데 유용합니다.",
         "ServerTime": "서버 시간 기준 방문 수",
         "SubmenuTimes": "방문시간",
         "VisitsByDayOfWeek": "요일별 방문수",
diff --git a/plugins/VisitTime/lang/lt.json b/plugins/VisitTime/lang/lt.json
index 2e01b242ce..26dbcbc1f9 100644
--- a/plugins/VisitTime/lang/lt.json
+++ b/plugins/VisitTime/lang/lt.json
@@ -4,7 +4,6 @@
         "ColumnServerTime": "Serverio laikas",
         "LocalTime": "Apsilankymai vietiniu laiku",
         "NHour": "%sh",
-        "PluginDescription": "Ataskaitos lokaliu ir serverio laiku.",
         "ServerTime": "Apsilankymai serverio laiku",
         "SubmenuTimes": "Laikai",
         "WidgetLocalTime": "Apsilankymai vietiniu laiku",
diff --git a/plugins/VisitTime/lang/nl.json b/plugins/VisitTime/lang/nl.json
index 71c37ade32..224498ce54 100644
--- a/plugins/VisitTime/lang/nl.json
+++ b/plugins/VisitTime/lang/nl.json
@@ -5,7 +5,6 @@
         "DayOfWeek": "Dag van de week",
         "LocalTime": "Uur van de dag (tijdzone bezoeker)",
         "NHour": "%s uur",
-        "PluginDescription": "Rapporteert de lokale en server tijd. Informatie over de Servertijd kan nuttig zijn om onderhoud aan de website in te plannen.",
         "ServerTime": "Uur van de dag (tijdzone server)",
         "SubmenuTimes": "Uur van de dag",
         "VisitsByDayOfWeek": "Bezoeken per dag van de week",
diff --git a/plugins/VisitTime/lang/pl.json b/plugins/VisitTime/lang/pl.json
index a9002fb558..03afb0a4c4 100644
--- a/plugins/VisitTime/lang/pl.json
+++ b/plugins/VisitTime/lang/pl.json
@@ -5,7 +5,6 @@
         "DayOfWeek": "Dzień tygodnia",
         "LocalTime": "Odwiedziny według lokalnego czasu",
         "NHour": "%sh",
-        "PluginDescription": "Raporty związane z czasem lokalnym i czasem serwera. Informacje uwzględniające czas serwera mogą być użyteczne do ustalenia czasu przerw technicznych serwisu.",
         "ServerTime": "Odwiedziny według czasu serwera",
         "SubmenuTimes": "Czas",
         "VisitsByDayOfWeek": "Odwiedziny w poszczególnych dniach tygodnia",
diff --git a/plugins/VisitTime/lang/pt-br.json b/plugins/VisitTime/lang/pt-br.json
index 9ca6c7630f..d5470eb117 100644
--- a/plugins/VisitTime/lang/pt-br.json
+++ b/plugins/VisitTime/lang/pt-br.json
@@ -5,7 +5,6 @@
         "DayOfWeek": "Dia da semana",
         "LocalTime": "Visitas pelo horário local",
         "NHour": "%sh",
-        "PluginDescription": "Relata a hora local e a hora do servidor. Informação de hora do servidor pode ser útil para relacionar a manutenção do website.",
         "ServerTime": "Visitas pelo horário do servidor",
         "SubmenuTimes": "Horários",
         "VisitsByDayOfWeek": "Visitas por dia da semana",
diff --git a/plugins/VisitTime/lang/pt.json b/plugins/VisitTime/lang/pt.json
index bc87b36564..eab254997d 100644
--- a/plugins/VisitTime/lang/pt.json
+++ b/plugins/VisitTime/lang/pt.json
@@ -4,7 +4,6 @@
         "ColumnServerTime": "Hora do servidor",
         "LocalTime": "Visitas por hora local",
         "NHour": "%sh",
-        "PluginDescription": "Relata a hora Local e do Servidor. Informação da hora do servidor pode ser útil para agendar uma manutenção do Website.",
         "ServerTime": "Vistas por hora do servidor",
         "SubmenuTimes": "Horas",
         "WidgetLocalTime": "Visitas pela hora local",
diff --git a/plugins/VisitTime/lang/ro.json b/plugins/VisitTime/lang/ro.json
index 26ce111d3a..d20d7335a3 100644
--- a/plugins/VisitTime/lang/ro.json
+++ b/plugins/VisitTime/lang/ro.json
@@ -5,7 +5,6 @@
         "DayOfWeek": "Zi a săptămânii",
         "LocalTime": "Vizite pe timpul local",
         "NHour": "%sh",
-        "PluginDescription": "Afişează ora locală şi cea a serverului. Timpul serverului poate fi folositor pentru a programa mentenanţa Websiteului.",
         "ServerTime": "Vizite pe timpul serverului",
         "SubmenuTimes": "Timp",
         "VisitsByDayOfWeek": "Vizite ordonate după ziua săptămânii",
diff --git a/plugins/VisitTime/lang/ru.json b/plugins/VisitTime/lang/ru.json
index 545f73a1df..15fa02ff9f 100644
--- a/plugins/VisitTime/lang/ru.json
+++ b/plugins/VisitTime/lang/ru.json
@@ -5,7 +5,6 @@
         "DayOfWeek": "День недели",
         "LocalTime": "Посещений по местному времени",
         "NHour": "%s ч.",
-        "PluginDescription": "Отчет о местном и серверном времени. Информация о серверном времени может быть полезна для создания расписания по технических работам на сайте.",
         "ServerTime": "Посещений по времени на сервере",
         "SubmenuTimes": "По времени",
         "VisitsByDayOfWeek": "Посещения по дням недели",
diff --git a/plugins/VisitTime/lang/sk.json b/plugins/VisitTime/lang/sk.json
index 031193d9ed..455776da34 100644
--- a/plugins/VisitTime/lang/sk.json
+++ b/plugins/VisitTime/lang/sk.json
@@ -4,7 +4,6 @@
         "ColumnServerTime": "Serverový čas",
         "LocalTime": "Návštevníci podľa lokálneho času",
         "NHour": "%sh",
-        "PluginDescription": "Report miestneho a serverového času. Serverový čas môže byť užitočný pre plánovanie údržby na internetových stránkach.",
         "ServerTime": "Návštevníci podľa serverového času",
         "SubmenuTimes": "Časy",
         "WidgetLocalTime": "Návštevníci podľa lokálneho času",
diff --git a/plugins/VisitTime/lang/sl.json b/plugins/VisitTime/lang/sl.json
index c13e9fad08..0f5e790b1e 100644
--- a/plugins/VisitTime/lang/sl.json
+++ b/plugins/VisitTime/lang/sl.json
@@ -2,9 +2,9 @@
     "VisitTime": {
         "ColumnLocalTime": "Lokalni čas",
         "ColumnServerTime": "Čas na strežniku",
-        "LocalTime": "Obiski na lokalni čas",
+        "LocalTime": "Obiski po lokalnem času",
         "NHour": "%sh",
-        "ServerTime": "Obiski na čas strežnika",
+        "ServerTime": "Obiski po času strežnika",
         "SubmenuTimes": "Časi",
         "WidgetLocalTime": "Obiski glede na lokalni čas",
         "WidgetServerTime": "Obiski glede na čas na strežniku"
diff --git a/plugins/VisitTime/lang/sq.json b/plugins/VisitTime/lang/sq.json
index 4bd117e600..7df7f28aa9 100644
--- a/plugins/VisitTime/lang/sq.json
+++ b/plugins/VisitTime/lang/sq.json
@@ -4,7 +4,6 @@
         "ColumnServerTime": "Kohë shërbyesi",
         "LocalTime": "Vizita sipas kohës vendore",
         "NHour": "%sh",
-        "PluginDescription": "Paraqet kohën Vendore dhe të Shërbyesit. Të dhëna mbi kohën e shërbyesit mund të jenë të dobishme për planifikimin e mirëmbajtjes në site-in web.",
         "ServerTime": "Vizita sipas kohës së shërbyesit",
         "SubmenuTimes": "Kohë",
         "WidgetLocalTime": "Vizita sipas kohës vendore",
diff --git a/plugins/VisitTime/lang/sr.json b/plugins/VisitTime/lang/sr.json
index bc1c58e4e1..22fbb20525 100644
--- a/plugins/VisitTime/lang/sr.json
+++ b/plugins/VisitTime/lang/sr.json
@@ -5,7 +5,6 @@
         "DayOfWeek": "Dan u nedelji",
         "LocalTime": "Broj poseta po lokalnom vremenu",
         "NHour": "%s",
-        "PluginDescription": "Lokalno i vreme na serveru. Znati vreme na serveru može biti korisno u slučaju zakazivanja održavanja sajta.",
         "ServerTime": "Broj poseta po serverskom vremenu",
         "SubmenuTimes": "Vreme",
         "VisitsByDayOfWeek": "Posete po danu u nedelji",
diff --git a/plugins/VisitTime/lang/sv.json b/plugins/VisitTime/lang/sv.json
index bb925fe41f..c7e751baa6 100644
--- a/plugins/VisitTime/lang/sv.json
+++ b/plugins/VisitTime/lang/sv.json
@@ -5,7 +5,6 @@
         "DayOfWeek": "Veckodag",
         "LocalTime": "Besök efter lokal tid",
         "NHour": "%sh",
-        "PluginDescription": "Rapporterar den lokala tiden och servertiden. Servertid kan vara användbart för att kunna schemalägga ett underhåll på webbplatsen.",
         "ServerTime": "Besök efter servertid",
         "SubmenuTimes": "Tider",
         "VisitsByDayOfWeek": "Besök efter veckodag",
diff --git a/plugins/VisitTime/lang/th.json b/plugins/VisitTime/lang/th.json
index 187602bb21..c4cd750b0a 100644
--- a/plugins/VisitTime/lang/th.json
+++ b/plugins/VisitTime/lang/th.json
@@ -5,7 +5,6 @@
         "DayOfWeek": "วันในสัปดาห์",
         "LocalTime": "จำนวนผู้ชมต่อเวลาท้องถิ่น",
         "NHour": "%s ชม.",
-        "PluginDescription": "รายงานเวลาในเครื่องและเซิร์ฟเวอร์ ซึ่งเวลาในเซิร์ฟเวอร์มีข้อมูลที่เป็นประโยชน์ในการกำหนดตารางการบำรุงรักษาบนเว็บไซต์",
         "ServerTime": "จำนวนผู้ชมต่อเวลาของเซิร์ฟเวอร์",
         "SubmenuTimes": "เวลา",
         "WidgetLocalTime": "จำนวนผู้ชมตามเวลาท้องถิ่น",
diff --git a/plugins/VisitTime/lang/tl.json b/plugins/VisitTime/lang/tl.json
index 3708b54fa1..76f7fd23ed 100644
--- a/plugins/VisitTime/lang/tl.json
+++ b/plugins/VisitTime/lang/tl.json
@@ -5,7 +5,6 @@
         "DayOfWeek": "Araw ng linggo",
         "LocalTime": "Mga pagbisita sa bawat lokal na oras",
         "NHour": "%sh",
-        "PluginDescription": "Ulat sa oras ng iyong local server. Ang impormasyon sa oras ng iyong server ay malaking tulong upang ma e-schedule ang maintenance ng website.",
         "ServerTime": "Mga pagbisita sa bawat oras mula sa server",
         "SubmenuTimes": "Times",
         "VisitsByDayOfWeek": "Mga pagbisita araw-araw",
diff --git a/plugins/VisitTime/lang/uk.json b/plugins/VisitTime/lang/uk.json
index 9df2babc60..c48532de5c 100644
--- a/plugins/VisitTime/lang/uk.json
+++ b/plugins/VisitTime/lang/uk.json
@@ -4,7 +4,6 @@
         "ColumnServerTime": "Серверний час",
         "LocalTime": "По-годинне відвідування для локального часу",
         "NHour": "%s год.",
-        "PluginDescription": "Повідомляє локальний та серверний час. Інформація про серверний час може бути корисна для складанян розкладу обслуговування веб-сайту.",
         "ServerTime": "По-годинне відвідування для серверного часу",
         "SubmenuTimes": "Разів",
         "WidgetLocalTime": "Відвідування по локальному часу",
diff --git a/plugins/VisitTime/lang/vi.json b/plugins/VisitTime/lang/vi.json
index 4c50a257d1..7f5a275f38 100644
--- a/plugins/VisitTime/lang/vi.json
+++ b/plugins/VisitTime/lang/vi.json
@@ -5,7 +5,6 @@
         "DayOfWeek": "Ngày trong tuần",
         "LocalTime": "Lượt truy cập mỗi giờ địa phương",
         "NHour": "%sh",
-        "PluginDescription": "Báo cáo thời gian Local và Server. Thông tin thời gian Server có thể có ích cho một lịch bảo trì trên trang web.",
         "ServerTime": "Các lượt truy cập theo mỗi thời gian máy chủ",
         "SubmenuTimes": "Số lần",
         "VisitsByDayOfWeek": "Các lượt truy cập theo ngày trong tuần",
diff --git a/plugins/VisitTime/lang/zh-cn.json b/plugins/VisitTime/lang/zh-cn.json
index 06d81f47f2..0fb176ae41 100644
--- a/plugins/VisitTime/lang/zh-cn.json
+++ b/plugins/VisitTime/lang/zh-cn.json
@@ -5,7 +5,6 @@
         "DayOfWeek": "星期几的",
         "LocalTime": "日报表",
         "NHour": "%s 点",
-        "PluginDescription": "当地时间及服务器时间报表。服务器时间能作为排定网站维护时间的參考。",
         "ServerTime": "依服务器时间记录的访问",
         "SubmenuTimes": "访问时间",
         "VisitsByDayOfWeek": "周报表",
diff --git a/plugins/VisitTime/lang/zh-tw.json b/plugins/VisitTime/lang/zh-tw.json
index 35bfac2511..9fdf46d5a7 100644
--- a/plugins/VisitTime/lang/zh-tw.json
+++ b/plugins/VisitTime/lang/zh-tw.json
@@ -4,7 +4,6 @@
         "ColumnServerTime": "伺服器時段",
         "LocalTime": "依訪客端時段記錄的造訪次數",
         "NHour": "%s 時",
-        "PluginDescription": "當地時段及伺服器時段報表。伺服器時段能作為排定網站維護時間的參考。",
         "ServerTime": "依伺服器時段記錄的造訪次數",
         "SubmenuTimes": "造訪時段",
         "WidgetLocalTime": "依訪客端時段記錄的造訪次數",
diff --git a/plugins/VisitTime/tests/Unit/AddSegmentByLabelInUTCTest.php b/plugins/VisitTime/tests/Unit/AddSegmentByLabelInUTCTest.php
new file mode 100644
index 0000000000..bf0c828321
--- /dev/null
+++ b/plugins/VisitTime/tests/Unit/AddSegmentByLabelInUTCTest.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\VisitTime\tests\Unit;
+
+use Piwik\DataTable\Row;
+use Piwik\DataTable;
+use Piwik\Tests\Framework\TestCase\UnitTestCase;
+
+/**
+ * @group VisitTime
+ * @group AddSegmentByLabelInUTCTest
+ * @group Plugins
+ */
+class AddSegmentByLabelInUTCTest extends UnitTestCase
+{
+    private $filter = 'Piwik\Plugins\VisitTime\DataTable\Filter\AddSegmentByLabelInUTC';
+
+    /**
+     * @var DataTable
+     */
+    private $table;
+
+    public function setUp()
+    {
+        $this->table = new DataTable();
+        $this->addRow(array('label' => '0'));
+        $this->addRow(array('label' => '1'));
+        $this->addRow(array('label' => '2'));
+        $this->addRow(array('label' => '12'));
+        $this->addRow(array('label' => '13'));
+        $this->addRow(array('label' => '14'));
+        $this->addRow(array('label' => '20'));
+    }
+
+    private function addRow($columns)
+    {
+        $this->table->addRow($this->buildRow($columns));
+    }
+
+    private function buildRow($columns)
+    {
+        return new Row(array(Row::COLUMNS => $columns));
+    }
+
+    public function test_filter_shouldNotChangeHoursIfTimezoneIsUTCAlready()
+    {
+        $this->table->filter($this->filter, array('UTC', 'day', 'today'));
+
+        $this->assertSegmentValues(array('0', '1', '2', '12', '13', '14', '20'));
+    }
+
+    public function test_filter_shouldConvertHoursFromTimezoneIntoUTC_Minus1()
+    {
+        $this->table->filter($this->filter, array('UTC-1', 'day', 'today'));
+        $this->assertSegmentValues(array('1', '2', '3', '13', '14', '15', '21'));
+    }
+
+    public function test_filter_shouldConvertHoursFromTimezoneIntoUTC_Plus1()
+    {
+        $this->table->filter($this->filter, array('UTC+1', 'day', 'today'));
+        $this->assertSegmentValuesInUTCplus1();
+    }
+
+    public function test_filter_shouldHandleRangePeriod_Plus1()
+    {
+        $this->table->filter($this->filter, array('UTC+1', 'range', '2015-02-02,2015-02-14'));
+        $this->assertSegmentValuesInUTCplus1();
+    }
+
+    public function test_filter_shouldHandleRangePeriodWithLast7_Plus1()
+    {
+        $this->table->filter($this->filter, array('UTC+1', 'range', 'last7'));
+        $this->assertSegmentValuesInUTCplus1();
+    }
+
+    public function test_filter_shouldHandleDayPeriodWithRange_Plus1()
+    {
+        $this->table->filter($this->filter, array('UTC+1', 'day', '2015-02-02,2015-02-14'));
+        $this->assertSegmentValuesInUTCplus1();
+    }
+
+    public function test_filter_shouldHandleWeekWithLast7_Plus1()
+    {
+        $this->table->filter($this->filter, array('UTC+1', 'day', 'last7'));
+        $this->assertSegmentValuesInUTCplus1();
+    }
+
+    public function test_filter_shouldIgnoreSummaryRow()
+    {
+        $row = $this->buildRow(array('label' => 'other'));
+        $this->table->addSummaryRow($row);
+        $this->table->filter($this->filter, array('UTC', 'day', 'today'));
+
+        $this->assertFalse($row->getMetadata('segmentValue'));
+    }
+
+    private function assertSegmentValuesInUTCplus1()
+    {
+        $this->assertSegmentValues(array('23', '0', '1', '11', '12', '13', '19'));
+    }
+
+    private function assertSegmentValues($expectedSegmentValues)
+    {
+        $segmentValues = $this->table->getRowsMetadata('segmentValue');
+        $this->assertSame($expectedSegmentValues, $segmentValues);
+    }
+
+}
diff --git a/plugins/VisitorGenerator b/plugins/VisitorGenerator
-Subproject 0ed78a595d4d12965cd66f85a7a09b91ec94b55
+Subproject 6a9cf2957920aa19b84ab10b348edbd80c58835
diff --git a/plugins/VisitorInterest/Controller.php b/plugins/VisitorInterest/Controller.php
index 54de697282..835af723fe 100644
--- a/plugins/VisitorInterest/Controller.php
+++ b/plugins/VisitorInterest/Controller.php
@@ -25,4 +25,4 @@ class Controller extends \Piwik\Plugin\Controller
         $view->dataTableNumberOfVisitsByDaysSinceLast = $this->renderReport(new GetNumberOfVisitsByDaysSinceLast());
         return $view->render();
     }
-}
+}
\ No newline at end of file
diff --git a/plugins/VisitorInterest/VisitorInterest.php b/plugins/VisitorInterest/VisitorInterest.php
index b1efd31d0f..11d5f717c4 100644
--- a/plugins/VisitorInterest/VisitorInterest.php
+++ b/plugins/VisitorInterest/VisitorInterest.php
@@ -30,22 +30,12 @@ class VisitorInterest extends \Piwik\Plugin
 
     function postLoad()
     {
-        Piwik::addAction('Template.headerVisitsFrequency', array('Piwik\Plugins\VisitorInterest\VisitorInterest', 'headerVisitsFrequency'));
         Piwik::addAction('Template.footerVisitsFrequency', array('Piwik\Plugins\VisitorInterest\VisitorInterest', 'footerVisitsFrequency'));
     }
 
-    public static function headerVisitsFrequency(&$out)
+   public static function footerVisitsFrequency(&$out)
     {
-        $out = '<div id="leftcolumn">';
-    }
-
-    public static function footerVisitsFrequency(&$out)
-    {
-        $out = '</div>
-			<div id="rightcolumn">
-			';
         $out .= FrontController::getInstance()->fetchDispatch('VisitorInterest', 'index');
-        $out .= '</div>';
     }
 
     public function extendVisitorDetails(&$visitor, $details)
diff --git a/plugins/VisitorInterest/lang/ar.json b/plugins/VisitorInterest/lang/ar.json
index 51305eba25..c005e1a6c3 100644
--- a/plugins/VisitorInterest/lang/ar.json
+++ b/plugins/VisitorInterest/lang/ar.json
@@ -7,7 +7,6 @@
         "Engagement": "التفاعل",
         "NPages": "%s صفحات",
         "OnePage": "صفحة واحدة",
-        "PluginDescription": "تقارير حول اهتمامات الزوار: عدد الصفحات المشاهدة، الوقت المستغرق على الموقع.",
         "PlusXMin": "%s دقيقة",
         "VisitsPerDuration": "الزيارات لزمن الزيارة",
         "VisitsPerNbOfPages": "الزيارات لعدد الصفحات",
diff --git a/plugins/VisitorInterest/lang/be.json b/plugins/VisitorInterest/lang/be.json
index 31ae0e79a9..2ff43ed121 100644
--- a/plugins/VisitorInterest/lang/be.json
+++ b/plugins/VisitorInterest/lang/be.json
@@ -7,7 +7,6 @@
         "Engagement": "Абавязацельства",
         "NPages": "%s старонак",
         "OnePage": "1 старонка",
-        "PluginDescription": "Справаздачы аб інтарэсах наведвальнікаў: колькасць прагледжаных старонак, час, праведзены на вэб-сайце.",
         "PlusXMin": "%s мін.",
         "VisitsPerDuration": "Наведванняў па даўжыні візіту",
         "VisitsPerNbOfPages": "Наведванняў па колькасці старонак",
diff --git a/plugins/VisitorInterest/lang/bg.json b/plugins/VisitorInterest/lang/bg.json
index db943e07bf..1a336a7b07 100644
--- a/plugins/VisitorInterest/lang/bg.json
+++ b/plugins/VisitorInterest/lang/bg.json
@@ -8,7 +8,6 @@
         "NPages": "%s страници",
         "OneMinute": "1 минута",
         "OnePage": "1 страница",
-        "PluginDescription": "Статистики за посетителите: разгледани страници, прекарано време в сайта.",
         "PlusXMin": "%s мин",
         "VisitNum": "Брой посещения",
         "VisitsByDaysSinceLast": "Посещения на ден от последното посещение",
diff --git a/plugins/VisitorInterest/lang/ca.json b/plugins/VisitorInterest/lang/ca.json
index 948ca355b1..6095e17b7a 100644
--- a/plugins/VisitorInterest/lang/ca.json
+++ b/plugins/VisitorInterest/lang/ca.json
@@ -8,7 +8,6 @@
         "NPages": "%s pàgines",
         "OneMinute": "1 minut",
         "OnePage": "1 pàgina",
-        "PluginDescription": "Informes sobre l'interes del Visitant: Nombre de pàgines vistes, temps de visita del lloc web.",
         "PlusXMin": "%s min",
         "VisitNum": "Nombre de visites",
         "VisitsByDaysSinceLast": "Visites per dia des de l'última visita",
diff --git a/plugins/VisitorInterest/lang/cs.json b/plugins/VisitorInterest/lang/cs.json
index 5d9e8419dd..ed4cb87637 100644
--- a/plugins/VisitorInterest/lang/cs.json
+++ b/plugins/VisitorInterest/lang/cs.json
@@ -8,7 +8,7 @@
         "NPages": "%s stránek",
         "OneMinute": "1 minuta",
         "OnePage": "1 stránka",
-        "PluginDescription": "Hlášení o zájmů návštěvníků: počet otevřených stránek, čas strávený na webu",
+        "PluginDescription": "Hlásí zájem vašich návštěvníků: počet zobrazených stránek, čas na stránkách, dny od poslední návštěvy aj.",
         "PlusXMin": "%s min.",
         "VisitNum": "Číslo návstěvníka",
         "VisitsByDaysSinceLast": "Návstěv po dnech od poslední návštěvy",
diff --git a/plugins/VisitorInterest/lang/da.json b/plugins/VisitorInterest/lang/da.json
index c54b09256c..7ea5084fe9 100644
--- a/plugins/VisitorInterest/lang/da.json
+++ b/plugins/VisitorInterest/lang/da.json
@@ -8,7 +8,6 @@
         "NPages": "%s sider",
         "OneMinute": "1 min.",
         "OnePage": "1 side",
-        "PluginDescription": " Rapporter om besøgendes interesser: antal besøgte sider, tidsforbrug på hjemmesiden.",
         "PlusXMin": "%s min.",
         "VisitNum": "Besøg nummer",
         "VisitsByDaysSinceLast": "Besøgende pr. dage siden sidste besøg.",
diff --git a/plugins/VisitorInterest/lang/de.json b/plugins/VisitorInterest/lang/de.json
index d8ca5a5a75..430da8ecac 100644
--- a/plugins/VisitorInterest/lang/de.json
+++ b/plugins/VisitorInterest/lang/de.json
@@ -8,7 +8,7 @@
         "NPages": "%s Seiten",
         "OneMinute": "1 min",
         "OnePage": "1 Seite",
-        "PluginDescription": "Berichte über Besucherinteressen: Anzahl der besuchten Seiten, Verweildauer auf der Webseite.",
+        "PluginDescription": "Berichte über die Interessen der Besucher: Anzahl besuchte Seiten, auf der Webseite verbrachte Zeit, Tage seit dem letzten Besuch, und mehr.",
         "PlusXMin": "%s min",
         "VisitNum": "Besuchsanzahl",
         "VisitsByDaysSinceLast": "Besuche pro Tage seit letztem Besuch",
diff --git a/plugins/VisitorInterest/lang/el.json b/plugins/VisitorInterest/lang/el.json
index 25dc059075..25d1ee6e85 100644
--- a/plugins/VisitorInterest/lang/el.json
+++ b/plugins/VisitorInterest/lang/el.json
@@ -8,7 +8,7 @@
         "NPages": "%s σελίδες",
         "OneMinute": "1 λεπτό",
         "OnePage": "1 σελίδα",
-        "PluginDescription": "Αναφέρει το Ενδιαφέρον Επισκέπτη: αριθμός προβληθέντων σελίδων, δαπανηθής χρόνος στην Ιστοσελίδα.",
+        "PluginDescription": "Αναφέρει τα ενδιαφέροντα των επισκεπτών: αριθμός σελίδων που επισκέφθηκαν, χρόνος που σπατάλησαν στον ιστοτόπο, ημέρες από την τελευταία επίσκεψη και άλλα πολλά.",
         "PlusXMin": "%s λεπτά",
         "VisitNum": "Αριθμός επίσκεψης",
         "VisitsByDaysSinceLast": "Επισκέψεις ανά ημέρες από την τελευταία επίσκεψη",
diff --git a/plugins/VisitorInterest/lang/en.json b/plugins/VisitorInterest/lang/en.json
index 484024062c..e61911c061 100644
--- a/plugins/VisitorInterest/lang/en.json
+++ b/plugins/VisitorInterest/lang/en.json
@@ -8,7 +8,7 @@
         "NPages": "%s pages",
         "OneMinute": "1 min",
         "OnePage": "1 page",
-        "PluginDescription": "Reports about the Visitor Interest: number of pages viewed, time spent on the Website.",
+        "PluginDescription": "Reports about visitors interest: number of pages viewed, time spent on the Website, days since last visit, and more.",
         "PlusXMin": "%s min",
         "VisitNum": "Visit number",
         "VisitsByDaysSinceLast": "Visits by days since last visit",
diff --git a/plugins/VisitorInterest/lang/es.json b/plugins/VisitorInterest/lang/es.json
index 61534bee4d..4496b1a6b8 100644
--- a/plugins/VisitorInterest/lang/es.json
+++ b/plugins/VisitorInterest/lang/es.json
@@ -8,7 +8,6 @@
         "NPages": "%s páginas",
         "OneMinute": "1 minuto",
         "OnePage": "1 página",
-        "PluginDescription": "Reportes sobre el Interés de los Visitantes: número de paginas vistas, tiempo que estuvieron en el sitio web.",
         "PlusXMin": "%s min",
         "VisitNum": "Número de visita",
         "VisitsByDaysSinceLast": "Visitas por días desde la última visita",
diff --git a/plugins/VisitorInterest/lang/fa.json b/plugins/VisitorInterest/lang/fa.json
index 4a86025edf..86e593b2ce 100644
--- a/plugins/VisitorInterest/lang/fa.json
+++ b/plugins/VisitorInterest/lang/fa.json
@@ -8,7 +8,6 @@
         "NPages": "%s صفحات",
         "OneMinute": "1 دقیقه",
         "OnePage": "1 صفحه",
-        "PluginDescription": "گزارش در مورد علاقه بازدید کنندگان: تعداد صفحات بازدید شده، مدت زمان صرف شده در وب سایت.",
         "PlusXMin": "%s کمینه",
         "VisitNum": "تعداد بازدید",
         "VisitsByDaysSinceLast": "مراجعه کننده در روز پس از آخرین بازدید",
diff --git a/plugins/VisitorInterest/lang/fi.json b/plugins/VisitorInterest/lang/fi.json
index ad9d241063..a942e0f767 100644
--- a/plugins/VisitorInterest/lang/fi.json
+++ b/plugins/VisitorInterest/lang/fi.json
@@ -8,7 +8,6 @@
         "NPages": "%s sivua",
         "OneMinute": "1min",
         "OnePage": "1 sivu",
-        "PluginDescription": "Raportit kävijöiden kiinnostuksista: ladattujen sivujen määrä, sivuilla käytetty aika.",
         "PlusXMin": "%s min",
         "VisitNum": "Käynnin numero",
         "VisitsByDaysSinceLast": "Käynnit lajiteltuna aikavälillä edelliseen käyntiin",
diff --git a/plugins/VisitorInterest/lang/fr.json b/plugins/VisitorInterest/lang/fr.json
index 47339eadab..72b02ad895 100644
--- a/plugins/VisitorInterest/lang/fr.json
+++ b/plugins/VisitorInterest/lang/fr.json
@@ -8,7 +8,6 @@
         "NPages": "%s pages",
         "OneMinute": "1 min",
         "OnePage": "1 page",
-        "PluginDescription": "Effectue des rapports à propos des intérêts des visiteurs: nombre de pages vues, temps passé sur le site.",
         "PlusXMin": "%s min",
         "VisitNum": "Numéro de la visite",
         "VisitsByDaysSinceLast": "Visites par jours depuis la dernière visite",
diff --git a/plugins/VisitorInterest/lang/hu.json b/plugins/VisitorInterest/lang/hu.json
index d421c70ac9..b676fdfc1c 100644
--- a/plugins/VisitorInterest/lang/hu.json
+++ b/plugins/VisitorInterest/lang/hu.json
@@ -7,7 +7,6 @@
         "Engagement": "Érdeklődés foka",
         "NPages": "%s oldal",
         "OnePage": "1 oldal",
-        "PluginDescription": "Jelentések a látogatók érdeklődési fokáról: megtekintett weblapok száma, a weboldalon töltött idő",
         "PlusXMin": "%s perc",
         "VisitsPerDuration": "Látogatások\/látogatás időtartama",
         "VisitsPerNbOfPages": "Látogatások\/weblapok száma",
diff --git a/plugins/VisitorInterest/lang/id.json b/plugins/VisitorInterest/lang/id.json
index fa8df7a5a4..f5bbbfe6c9 100644
--- a/plugins/VisitorInterest/lang/id.json
+++ b/plugins/VisitorInterest/lang/id.json
@@ -8,7 +8,6 @@
         "NPages": "%s halaman",
         "OneMinute": "1 menit",
         "OnePage": "1 halaman",
-        "PluginDescription": "Laporan mengenai Tingkat Kunjungan: jumlah halaman yang dilihat, waktu yang dihabiskan di Situs.",
         "PlusXMin": "%s menit",
         "VisitNum": "Jumlah kunjungan",
         "VisitsByDaysSinceLast": "Pengunjung berdasar hari sejak kunjungan terakhir",
diff --git a/plugins/VisitorInterest/lang/is.json b/plugins/VisitorInterest/lang/is.json
index 06137cd695..45643cabfc 100644
--- a/plugins/VisitorInterest/lang/is.json
+++ b/plugins/VisitorInterest/lang/is.json
@@ -7,7 +7,6 @@
         "Engagement": "Þáttaka",
         "NPages": "%s síður",
         "OnePage": "1 síða",
-        "PluginDescription": "Skýrslur um áhuga gestsins: fjöldi síðna sem eru skoðaðar, og tíma sem er eytt á vefnum.",
         "PlusXMin": "%s mín",
         "VisitsPerDuration": "Heimsóknir per lengd heimsóknar",
         "VisitsPerNbOfPages": "Heimsóknir per fjölda síðna",
diff --git a/plugins/VisitorInterest/lang/it.json b/plugins/VisitorInterest/lang/it.json
index 1cb2ab8f26..1439d20629 100644
--- a/plugins/VisitorInterest/lang/it.json
+++ b/plugins/VisitorInterest/lang/it.json
@@ -8,7 +8,7 @@
         "NPages": "%s pagine",
         "OneMinute": "1 min",
         "OnePage": "1 pagina",
-        "PluginDescription": "Report riguardo l'interesse dei visitatori: numero di pagine viste e tempo speso sul sito.",
+        "PluginDescription": "Riporta gli interessi dei visitatori: il numero delle pagine viste, il tempo passato sul sito, i giorni dall'ultima visita e altro.",
         "PlusXMin": "%s min",
         "VisitNum": "Numero visite",
         "VisitsByDaysSinceLast": "Visite per giorni dall'ultima visita",
diff --git a/plugins/VisitorInterest/lang/ja.json b/plugins/VisitorInterest/lang/ja.json
index 2959aa84fa..2e7ab8ae55 100644
--- a/plugins/VisitorInterest/lang/ja.json
+++ b/plugins/VisitorInterest/lang/ja.json
@@ -8,7 +8,6 @@
         "NPages": "%s ページ",
         "OneMinute": "1分",
         "OnePage": "1 ページ",
-        "PluginDescription": "ビジターの興味（表示したページ数、ウェブサイト滞在時間）についてリポートします。",
         "PlusXMin": "%s 分",
         "VisitNum": "訪問回数",
         "VisitsByDaysSinceLast": "最後の訪問からの日数別のビジット",
diff --git a/plugins/VisitorInterest/lang/ka.json b/plugins/VisitorInterest/lang/ka.json
index 28a06808bb..e32ba759dd 100644
--- a/plugins/VisitorInterest/lang/ka.json
+++ b/plugins/VisitorInterest/lang/ka.json
@@ -6,7 +6,6 @@
         "ColumnVisitDuration": "ვიზიტის ხანგრძლივობა",
         "NPages": "%s გვერდი",
         "OnePage": "1 გვერდი",
-        "PluginDescription": "აკეთებს ანგარიშს ვიზიტორების ინტერესების შესახებ: ნანახი გვერდების რაოდენობა, ვებ საიტზე გატარებული დრო.",
         "PlusXMin": "%s წთ",
         "VisitsPerDuration": "ვიზიტები ვიზიტის ხანგრძლივობის შესაბამისად",
         "VisitsPerNbOfPages": "ვიზიტები გვერდების რაოდენობის შესაბამისად",
diff --git a/plugins/VisitorInterest/lang/ko.json b/plugins/VisitorInterest/lang/ko.json
index 48c7b175de..0fdb56c145 100644
--- a/plugins/VisitorInterest/lang/ko.json
+++ b/plugins/VisitorInterest/lang/ko.json
@@ -8,7 +8,6 @@
         "NPages": "%s페이지",
         "OneMinute": "1분",
         "OnePage": "1페이지",
-        "PluginDescription": "방문자 관심 분야에 대한 보고서: 이 페이지뷰 수는 웹사이트에 보낸 시간입니다.",
         "PlusXMin": "%s분",
         "VisitNum": "방문 횟수",
         "VisitsByDaysSinceLast": "마지막 방문일로부터 방문",
diff --git a/plugins/VisitorInterest/lang/lt.json b/plugins/VisitorInterest/lang/lt.json
index a7f3f13bb7..9c271eeb1b 100644
--- a/plugins/VisitorInterest/lang/lt.json
+++ b/plugins/VisitorInterest/lang/lt.json
@@ -7,7 +7,6 @@
         "Engagement": "Įsipareigojimai",
         "NPages": "%s puslapiai",
         "OnePage": "1 puslapis",
-        "PluginDescription": "Parodo lankytojų susidomėjimą: aplankytus puslapius, svetainėje praleistą laiką.",
         "PlusXMin": "%s min",
         "VisitsPerDuration": "Apsilankymai pagal apsilankymų trukmę",
         "VisitsPerNbOfPages": "Apsilankymai pagal puslapių kiekį",
diff --git a/plugins/VisitorInterest/lang/nl.json b/plugins/VisitorInterest/lang/nl.json
index 8eac31acc5..73ea96345b 100644
--- a/plugins/VisitorInterest/lang/nl.json
+++ b/plugins/VisitorInterest/lang/nl.json
@@ -8,7 +8,6 @@
         "NPages": "%s pagina's",
         "OneMinute": "1 min",
         "OnePage": "1 pagina",
-        "PluginDescription": "Rapporten over de interesses van de bezoekers: aantal bekeken pagina's, tijdsduur op de website.",
         "PlusXMin": "%s min.",
         "VisitNum": "Aantal bezoeken",
         "VisitsByDaysSinceLast": "Herhalingsbezoek na bepaald aantal dagen",
diff --git a/plugins/VisitorInterest/lang/pl.json b/plugins/VisitorInterest/lang/pl.json
index 5fa8540e6b..d221ebeb20 100644
--- a/plugins/VisitorInterest/lang/pl.json
+++ b/plugins/VisitorInterest/lang/pl.json
@@ -8,7 +8,6 @@
         "NPages": "%s stron",
         "OneMinute": "1 min",
         "OnePage": "1 strona",
-        "PluginDescription": "Raporty o zainteresowaniach odwiedzających: ilość odwiedzonych stron, czas spędzony w serwisie.",
         "PlusXMin": "%s min",
         "VisitNum": "Liczba wizyt",
         "VisitsByDaysSinceLast": "Odwiedziny wg. dni od ostatnich odwiedzin",
diff --git a/plugins/VisitorInterest/lang/pt-br.json b/plugins/VisitorInterest/lang/pt-br.json
index 5add3317a9..911269dc87 100644
--- a/plugins/VisitorInterest/lang/pt-br.json
+++ b/plugins/VisitorInterest/lang/pt-br.json
@@ -8,7 +8,6 @@
         "NPages": "%s páginas",
         "OneMinute": "1 min",
         "OnePage": "1 página",
-        "PluginDescription": "Relatórios sobre o interesse do visitante: número de páginas visualizadas, tempo gasto no website.",
         "PlusXMin": "%s min",
         "VisitNum": "Visita número",
         "VisitsByDaysSinceLast": "Visitas por dia desde a última visita",
diff --git a/plugins/VisitorInterest/lang/pt.json b/plugins/VisitorInterest/lang/pt.json
index 57068acb1e..3c267b93c9 100644
--- a/plugins/VisitorInterest/lang/pt.json
+++ b/plugins/VisitorInterest/lang/pt.json
@@ -8,7 +8,6 @@
         "NPages": "%s páginas",
         "OneMinute": "1 minuto",
         "OnePage": "1 página",
-        "PluginDescription": "Relata os Interesses dos Visitantes: número de páginas vistas, tempo gasto no Website.",
         "PlusXMin": "%s min",
         "VisitNum": "Número de visitas",
         "VisitsByDaysSinceLast": "Visitas por dia desde a última visita",
diff --git a/plugins/VisitorInterest/lang/ro.json b/plugins/VisitorInterest/lang/ro.json
index ec0b15d9a6..86a0372821 100644
--- a/plugins/VisitorInterest/lang/ro.json
+++ b/plugins/VisitorInterest/lang/ro.json
@@ -8,7 +8,6 @@
         "NPages": "%s pagini",
         "OneMinute": "1 min",
         "OnePage": "1 pagina",
-        "PluginDescription": "Rapoarte cu privire la interesul vizitatorilor: numărul de pagini vizualizate, timpul petrecut pe site-ul web.",
         "PlusXMin": "%s min",
         "VisitNum": "Numărul de vizite",
         "VisitsByDaysSinceLast": "Vizite ordonate după zile de la ultima vizită",
diff --git a/plugins/VisitorInterest/lang/ru.json b/plugins/VisitorInterest/lang/ru.json
index 163a03e9c4..61a31da7b6 100644
--- a/plugins/VisitorInterest/lang/ru.json
+++ b/plugins/VisitorInterest/lang/ru.json
@@ -8,7 +8,6 @@
         "NPages": "%s страниц",
         "OneMinute": "1 мин.",
         "OnePage": "1 страница",
-        "PluginDescription": "Предоставляет информацию о интересах посетителей: количество просмотренных страниц, время, проведенное на сайте и др.",
         "PlusXMin": "%s мин",
         "VisitNum": "Число посещений",
         "VisitsByDaysSinceLast": "Посещения по дням с момента последнего визита",
diff --git a/plugins/VisitorInterest/lang/sk.json b/plugins/VisitorInterest/lang/sk.json
index a9c2c098c3..9404d2eea6 100644
--- a/plugins/VisitorInterest/lang/sk.json
+++ b/plugins/VisitorInterest/lang/sk.json
@@ -7,7 +7,6 @@
         "Engagement": "Záujem",
         "NPages": "%s stránok",
         "OnePage": "1 stránka",
-        "PluginDescription": "Správy o záujme návštevníkov: počet zobrazených stránok, čas strávený na týchto stránkach.",
         "PlusXMin": "%s min",
         "VisitsPerDuration": "Návštevy podľa dĺžky trvania návštevy",
         "VisitsPerNbOfPages": "Návštevy na počet stránok",
diff --git a/plugins/VisitorInterest/lang/sq.json b/plugins/VisitorInterest/lang/sq.json
index ad26016efc..36ad18029b 100644
--- a/plugins/VisitorInterest/lang/sq.json
+++ b/plugins/VisitorInterest/lang/sq.json
@@ -8,7 +8,6 @@
         "NPages": "%s faqe",
         "OneMinute": "1 min",
         "OnePage": "1 faqe",
-        "PluginDescription": "Raporton rreth Interesave të Vizitorit: numër faqesh të para, kohë e shpenzuar në site-in Web.",
         "PlusXMin": "%s min",
         "VisitNum": "Numër vizitash",
         "VisitsByDaysSinceLast": "Vizita sipas ditësh që pas vizitës së fundit",
diff --git a/plugins/VisitorInterest/lang/sr.json b/plugins/VisitorInterest/lang/sr.json
index f1b8a5c74a..b4e4ce3887 100644
--- a/plugins/VisitorInterest/lang/sr.json
+++ b/plugins/VisitorInterest/lang/sr.json
@@ -8,7 +8,6 @@
         "NPages": "%s stranica",
         "OneMinute": "1 min",
         "OnePage": "1 stranica",
-        "PluginDescription": "Izveštaji o tome šta posetioce zanima: broj posećenih stranica, vreme provedeno na sajtu.",
         "PlusXMin": "%s min",
         "VisitNum": "Broj poseta",
         "VisitsByDaysSinceLast": "Poseta po danima od poslednje posete",
diff --git a/plugins/VisitorInterest/lang/sv.json b/plugins/VisitorInterest/lang/sv.json
index f3441a7061..35822dd45c 100644
--- a/plugins/VisitorInterest/lang/sv.json
+++ b/plugins/VisitorInterest/lang/sv.json
@@ -8,7 +8,6 @@
         "NPages": "%s sidor",
         "OneMinute": "1 min",
         "OnePage": "1 sida",
-        "PluginDescription": "Rapporter om Besökarnas intressen: antalet sidvisningar och tid på webbplatsen.",
         "PlusXMin": "%s min",
         "VisitNum": "Besöksnummer",
         "VisitsByDaysSinceLast": "Besök efter dagar sedan senaste besöket",
diff --git a/plugins/VisitorInterest/lang/te.json b/plugins/VisitorInterest/lang/te.json
index 81569ad10c..a7db4f3ac0 100644
--- a/plugins/VisitorInterest/lang/te.json
+++ b/plugins/VisitorInterest/lang/te.json
@@ -7,7 +7,6 @@
         "NPages": "%s పుటలు",
         "OneMinute": "1 నిమి",
         "OnePage": "1 పుట",
-        "PluginDescription": "సందర్శకుల ఆసక్తి గురించిన నివేదికలు: చూసిన పుటల సంఖ్య, సైటులో గడిపిన సమయం.",
         "PlusXMin": "%s నిమి",
         "VisitsPerDuration": "నిడివి ప్రకారం సందర్శనలు",
         "VisitsPerNbOfPages": "పుటల సంఖ్య ప్రకారం సందర్శనలు",
diff --git a/plugins/VisitorInterest/lang/th.json b/plugins/VisitorInterest/lang/th.json
index 205c32f09a..20a759caee 100644
--- a/plugins/VisitorInterest/lang/th.json
+++ b/plugins/VisitorInterest/lang/th.json
@@ -8,7 +8,6 @@
         "NPages": "%s หน้า",
         "OneMinute": "1 นาที",
         "OnePage": "1 หน้า",
-        "PluginDescription": "รายงานเกี่ยวกับผู้เข้าชม: หมายเลขหน้าเข้าชม เวลาในการใช้บนเว็บไซต์",
         "PlusXMin": "%s นาที",
         "VisitsPerDuration": "เวลาเฉลี่ยของผู้เข้าชม",
         "VisitsPerNbOfPages": "หน้าเฉลี่ยของผู้เข้าชม",
diff --git a/plugins/VisitorInterest/lang/tl.json b/plugins/VisitorInterest/lang/tl.json
index e229bdd546..2bde759534 100644
--- a/plugins/VisitorInterest/lang/tl.json
+++ b/plugins/VisitorInterest/lang/tl.json
@@ -6,7 +6,6 @@
         "ColumnVisitDuration": "Tagal ng pagbisita",
         "Engagement": "Engagement",
         "NPages": "%s mga pahina",
-        "PluginDescription": "Mga Ulat tungkol sa Interes ng isang bisita: bilang ng mga pahina na natingnan",
         "PlusXMin": "%s min",
         "VisitNum": "numero ng pagbisita",
         "VisitsByDaysSinceLast": "Mga araw araw na pagbisita mula noong huling pagbisita.",
diff --git a/plugins/VisitorInterest/lang/uk.json b/plugins/VisitorInterest/lang/uk.json
index 966a40c581..344b525680 100644
--- a/plugins/VisitorInterest/lang/uk.json
+++ b/plugins/VisitorInterest/lang/uk.json
@@ -7,7 +7,6 @@
         "Engagement": "Заручення",
         "NPages": "%s сторінок",
         "OnePage": "одна сторінка",
-        "PluginDescription": "Повідомляє про зацікавлення відвідувачів: кількість переглянутих сторінок, час проведений на веб-сайті.",
         "PlusXMin": "%s хв",
         "VisitsPerDuration": "Відвідування за тривалістю",
         "VisitsPerNbOfPages": "Відвідування за кількістю сторінок",
diff --git a/plugins/VisitorInterest/lang/vi.json b/plugins/VisitorInterest/lang/vi.json
index 2927166e61..2b680a61e5 100644
--- a/plugins/VisitorInterest/lang/vi.json
+++ b/plugins/VisitorInterest/lang/vi.json
@@ -8,7 +8,6 @@
         "NPages": "%s trang",
         "OneMinute": "1 phút",
         "OnePage": "1 trang",
-        "PluginDescription": "Báo cáo về các mối quan tâm của khách: số trang đã xem, thời gian dành cho trang web.",
         "PlusXMin": "%s phút",
         "VisitNum": "Số truy cập",
         "VisitsByDaysSinceLast": "Các truy cập theo ngày kể từ lượt truy cập cuối cùng",
diff --git a/plugins/VisitorInterest/lang/zh-cn.json b/plugins/VisitorInterest/lang/zh-cn.json
index cc60940214..b158554fb8 100644
--- a/plugins/VisitorInterest/lang/zh-cn.json
+++ b/plugins/VisitorInterest/lang/zh-cn.json
@@ -8,7 +8,6 @@
         "NPages": "%s 页",
         "OneMinute": "1分钟",
         "OnePage": "1 页",
-        "PluginDescription": "关于访客兴趣的报表: 页面浏览次数、停留时间。",
         "PlusXMin": "%s 分",
         "VisitNum": "访问次数",
         "VisitsByDaysSinceLast": "基于距离上次访问天数的统计",
diff --git a/plugins/VisitorInterest/lang/zh-tw.json b/plugins/VisitorInterest/lang/zh-tw.json
index b5850e4d7c..798c49f8f1 100644
--- a/plugins/VisitorInterest/lang/zh-tw.json
+++ b/plugins/VisitorInterest/lang/zh-tw.json
@@ -7,7 +7,6 @@
         "Engagement": "忠誠度",
         "NPages": "%s 頁",
         "OnePage": "1 頁",
-        "PluginDescription": "關於訪客興趣的報表：頁面瀏覽次數、及花多少時間在網站裡。",
         "PlusXMin": "%s 分",
         "VisitsPerDuration": "各個造訪停留時間的造訪次數",
         "VisitsPerNbOfPages": "各個瀏覽頁面數的造訪次數",
diff --git a/plugins/VisitorInterest/templates/index.twig b/plugins/VisitorInterest/templates/index.twig
index 359d43608f..af98d8f1ff 100644
--- a/plugins/VisitorInterest/templates/index.twig
+++ b/plugins/VisitorInterest/templates/index.twig
@@ -1,11 +1,20 @@
-<h2 piwik-enriched-headline>{{ 'VisitorInterest_VisitsPerDuration'|translate }}</h2>
-{{ dataTableNumberOfVisitsPerVisitDuration|raw }}
-
-<h2 piwik-enriched-headline>{{ 'VisitorInterest_VisitsPerNbOfPages'|translate }}</h2>
-{{ dataTableNumberOfVisitsPerPage|raw }}
-
-<h2 piwik-enriched-headline>{{ 'VisitorInterest_visitsByVisitCount'|translate }}</h2>
-{{ dataTableNumberOfVisitsByVisitNum|raw }}
-
-<h2 piwik-enriched-headline>{{ 'VisitorInterest_VisitsByDaysSinceLast'|translate }}</h2>
-{{ dataTableNumberOfVisitsByDaysSinceLast|raw }}
+<br />
+<div id="leftcolumn">
+    <h2 piwik-enriched-headline>{{ 'VisitorInterest_VisitsPerDuration'|translate }}</h2>
+    {{ dataTableNumberOfVisitsPerVisitDuration|raw }}
+</div>
+<div id="rightcolumn">
+    <h2 piwik-enriched-headline>{{ 'VisitorInterest_VisitsPerNbOfPages'|translate }}</h2>
+    {{ dataTableNumberOfVisitsPerPage|raw }}
+</div>
+<div style="clear:both"></div>
+<br />
+<div id="leftcolumn">
+    <h2 piwik-enriched-headline>{{ 'VisitorInterest_visitsByVisitCount'|translate }}</h2>
+    {{ dataTableNumberOfVisitsByVisitNum|raw }}
+</div>
+<div id="rightcolumn">
+    <h2 piwik-enriched-headline>{{ 'VisitorInterest_VisitsByDaysSinceLast'|translate }}</h2>
+    {{ dataTableNumberOfVisitsByDaysSinceLast|raw }}
+</div>
+<div style="clear:both"></div>
\ No newline at end of file
diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php
index 84916cf057..825a5f5bba 100644
--- a/plugins/VisitsSummary/Controller.php
+++ b/plugins/VisitsSummary/Controller.php
@@ -15,6 +15,7 @@ use Piwik\DataTable\Row;
 use Piwik\Piwik;
 use Piwik\Plugins\Actions\API as APIActions;
 use Piwik\Site;
+use Piwik\Translation\Translator;
 use Piwik\View;
 
 /**
@@ -22,6 +23,18 @@ use Piwik\View;
  */
 class Controller extends \Piwik\Plugin\Controller
 {
+    /**
+     * @var Translator
+     */
+    private $translator;
+
+    public function __construct(Translator $translator)
+    {
+        $this->translator = $translator;
+
+        parent::__construct();
+    }
+
     public function index()
     {
         $view = new View('@VisitsSummary/index');
@@ -48,23 +61,23 @@ class Controller extends \Piwik\Plugin\Controller
             }
         }
 
-        $documentation = Piwik::translate('VisitsSummary_VisitsSummaryDocumentation') . '<br />'
-            . Piwik::translate('General_BrokenDownReportDocumentation') . '<br /><br />'
+        $documentation = $this->translator->translate('VisitsSummary_VisitsSummaryDocumentation') . '<br />'
+            . $this->translator->translate('General_BrokenDownReportDocumentation') . '<br /><br />'
 
-            . '<b>' . Piwik::translate('General_ColumnNbVisits') . ':</b> '
-            . Piwik::translate('General_ColumnNbVisitsDocumentation') . '<br />'
+            . '<b>' . $this->translator->translate('General_ColumnNbVisits') . ':</b> '
+            . $this->translator->translate('General_ColumnNbVisitsDocumentation') . '<br />'
 
-            . '<b>' . Piwik::translate('General_ColumnNbUniqVisitors') . ':</b> '
-            . Piwik::translate('General_ColumnNbUniqVisitorsDocumentation') . '<br />'
+            . '<b>' . $this->translator->translate('General_ColumnNbUniqVisitors') . ':</b> '
+            . $this->translator->translate('General_ColumnNbUniqVisitorsDocumentation') . '<br />'
 
-            . '<b>' . Piwik::translate('General_ColumnNbActions') . ':</b> '
-            . Piwik::translate('General_ColumnNbActionsDocumentation') . '<br />'
+            . '<b>' . $this->translator->translate('General_ColumnNbActions') . ':</b> '
+            . $this->translator->translate('General_ColumnNbActionsDocumentation') . '<br />'
 
-            . '<b>' . Piwik::translate('General_ColumnNbUsers') . ':</b> '
-            . Piwik::translate('General_ColumnNbUsersDocumentation') . ' (<a rel="noreferrer"  target="_blank" href="http://piwik.org/docs/user-id/">User ID</a>)<br />'
+            . '<b>' . $this->translator->translate('General_ColumnNbUsers') . ':</b> '
+            . $this->translator->translate('General_ColumnNbUsersDocumentation') . ' (<a rel="noreferrer"  target="_blank" href="http://piwik.org/docs/user-id/">User ID</a>)<br />'
 
-            . '<b>' . Piwik::translate('General_ColumnActionsPerVisit') . ':</b> '
-            . Piwik::translate('General_ColumnActionsPerVisitDocumentation');
+            . '<b>' . $this->translator->translate('General_ColumnActionsPerVisit') . ':</b> '
+            . $this->translator->translate('General_ColumnActionsPerVisitDocumentation');
 
         $selectableColumns = array(
             // columns from VisitsSummary.get
diff --git a/plugins/VisitsSummary/Reports/Get.php b/plugins/VisitsSummary/Reports/Get.php
index f2a087a517..55696873be 100644
--- a/plugins/VisitsSummary/Reports/Get.php
+++ b/plugins/VisitsSummary/Reports/Get.php
@@ -8,6 +8,7 @@
  */
 namespace Piwik\Plugins\VisitsSummary\Reports;
 
+use Piwik\DataTable\DataTableInterface;
 use Piwik\Piwik;
 use Piwik\Plugins\CoreHome\Columns\Metrics\ActionsPerVisit;
 use Piwik\Plugins\CoreHome\Columns\Metrics\AverageTimeOnSite;
@@ -15,6 +16,8 @@ use Piwik\Plugins\CoreHome\Columns\Metrics\BounceRate;
 
 class Get extends \Piwik\Plugin\Report
 {
+    private $usersColumn = 'nb_users';
+
     protected function init()
     {
         parent::init();
@@ -29,7 +32,7 @@ class Get extends \Piwik\Plugin\Report
         $this->metrics       = array(
             'nb_uniq_visitors',
             'nb_visits',
-            'nb_users',
+            $this->usersColumn,
             'nb_actions',
             'max_actions'
         );
@@ -43,7 +46,7 @@ class Get extends \Piwik\Plugin\Report
     {
         $metrics = parent::getMetrics();
 
-        $metrics['max_actions']      = Piwik::translate('General_ColumnMaxActions');
+        $metrics['max_actions'] = Piwik::translate('General_ColumnMaxActions');
 
         return $metrics;
     }
@@ -56,4 +59,25 @@ class Get extends \Piwik\Plugin\Report
 
         return $metrics;
     }
+
+    public function removeUsersFromProcessedReport(&$response)
+    {
+        if (!empty($response['metadata']['metrics'][$this->usersColumn])) {
+            unset($response['metadata']['metrics'][$this->usersColumn]);
+        }
+
+        if (!empty($response['metadata']['metricsDocumentation'][$this->usersColumn])) {
+            unset($response['metadata']['metricsDocumentation'][$this->usersColumn]);
+        }
+
+        if (!empty($response['columns'][$this->usersColumn])) {
+            unset($response['columns'][$this->usersColumn]);
+        }
+
+        if (!empty($response['reportData'])) {
+            $dataTable = $response['reportData'];
+            $dataTable->deleteColumn($this->usersColumn, true);
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/plugins/VisitsSummary/VisitsSummary.php b/plugins/VisitsSummary/VisitsSummary.php
index cc6782f216..f0e7215aac 100644
--- a/plugins/VisitsSummary/VisitsSummary.php
+++ b/plugins/VisitsSummary/VisitsSummary.php
@@ -7,6 +7,9 @@
  *
  */
 namespace Piwik\Plugins\VisitsSummary;
+use Piwik\DataTable;
+use Piwik\Plugins\CoreHome\Columns\UserId;
+use Piwik\Plugins\VisitsSummary\Reports\Get;
 
 /**
  * Note: This plugin does not hook on Daily and Period Archiving like other Plugins because it reports the
@@ -23,10 +26,45 @@ class VisitsSummary extends \Piwik\Plugin
     public function getListHooksRegistered()
     {
         return array(
-            'AssetManager.getStylesheetFiles' => 'getStylesheetFiles'
+            'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
+            'API.API.getProcessedReport.end' => 'enrichProcessedReportIfVisitsSummaryGet',
         );
     }
 
+    private function isRequestingVisitsSummaryGet($module, $method)
+    {
+        return ($module === 'VisitsSummary' && $method === 'get');
+    }
+
+    public function enrichProcessedReportIfVisitsSummaryGet(&$response, $infos)
+    {
+        if (empty($infos['parameters'][4]) || empty($response['reportData'])) {
+            return;
+        }
+
+        $params  = $infos['parameters'];
+        $idSites = array($params[0]);
+        $period  = $params[1];
+        $date    = $params[2];
+        $module  = $params[3];
+        $method  = $params[4];
+
+        if (!$this->isRequestingVisitsSummaryGet($module, $method)) {
+            return;
+        }
+
+        $userId = new UserId();
+
+        /** @var DataTable|DataTable\Map $dataTable */
+        $dataTable = $response['reportData'];
+
+        if (!$userId->hasDataTableUsers($dataTable) &&
+            !$userId->isUsedInAtLeastOneSite($idSites, $period, $date)) {
+            $report = new Get();
+            $report->removeUsersFromProcessedReport($response);
+        }
+    }
+
     public function getStylesheetFiles(&$stylesheets)
     {
         $stylesheets[] = "plugins/VisitsSummary/stylesheets/datatable.less";
diff --git a/plugins/VisitsSummary/lang/ar.json b/plugins/VisitsSummary/lang/ar.json
index 9a48d505a9..4abe5801f6 100644
--- a/plugins/VisitsSummary/lang/ar.json
+++ b/plugins/VisitsSummary/lang/ar.json
@@ -8,7 +8,6 @@
         "NbActionsPerVisit": "%s سلوك لكل زيارة",
         "NbUniqueVisitors": "%s زيارة فريدة",
         "NbVisitsBounced": "%s زيارات مرتدة (غادر الموقع بعد مشاهدة أول صفحة)",
-        "PluginDescription": "يعد تقاريراً حول أرقام التحليلات العامة الخاصة بالزيارات، الزيارات الفريدة، عدد السلوكيات، معدل الارتداد، وغيرها.",
         "VisitsSummary": "ملخص الزيارات",
         "WidgetLastVisits": "الرسم البياني لآخر الزيارات",
         "WidgetOverviewGraph": "نظرة عامة مع الرسم البياني",
diff --git a/plugins/VisitsSummary/lang/be.json b/plugins/VisitsSummary/lang/be.json
index afcb573235..6fdaeb15e9 100644
--- a/plugins/VisitsSummary/lang/be.json
+++ b/plugins/VisitsSummary/lang/be.json
@@ -8,7 +8,6 @@
         "NbActionsPerVisit": "%s дзеянняў за наведванне",
         "NbUniqueVisitors": "%s унікальных наведвальнікаў",
         "NbVisitsBounced": "%s наведвальнікаў сышло пасля наведвання адной старонкі",
-        "PluginDescription": "Справаздачы у агульных аналітычных лічбах: наведванні, унікальныя наведвальнікі, колькасць дзеянняў, узровень адмоў і г.д.",
         "VisitsSummary": "Наведванні сумарна",
         "VisitsSummaryDocumentation": "Гэта агляд зменаў наведванняў.",
         "WidgetLastVisits": "Графік апошніх наведванняў",
diff --git a/plugins/VisitsSummary/lang/bg.json b/plugins/VisitsSummary/lang/bg.json
index ac65d53805..c791e07295 100644
--- a/plugins/VisitsSummary/lang/bg.json
+++ b/plugins/VisitsSummary/lang/bg.json
@@ -17,7 +17,6 @@
         "NbUniquePageviewsDescription": "%s уникални преглеждания на страница",
         "NbUniqueVisitors": "%s уникални посетителя",
         "NbVisitsBounced": "%s посещения са отскочили (напуснали още след първата разгледана страница)",
-        "PluginDescription": "Доклад за генералния анализ по номера: посещения, уникални посещения, поредица от действия, Bounce Rate и други",
         "VisitsSummary": "Резюме на посещенията",
         "VisitsSummaryDocumentation": "Това е преглед на еволюцията на посещенията.",
         "WidgetLastVisits": "Последни посетители",
diff --git a/plugins/VisitsSummary/lang/ca.json b/plugins/VisitsSummary/lang/ca.json
index 6c486b9582..852d5046a7 100644
--- a/plugins/VisitsSummary/lang/ca.json
+++ b/plugins/VisitsSummary/lang/ca.json
@@ -16,7 +16,6 @@
         "NbUniquePageviewsDescription": "%s visualitzacions de pàgina úniques",
         "NbUniqueVisitors": "%s visitants únics",
         "NbVisitsBounced": "%s visites han rebotat (abandonat el lloc després de veure una pàgina)",
-        "PluginDescription": "Informa de les principals analítiques: visitants, visitants únics, nombre d'accions, rati de rebots,etc.",
         "VisitsSummary": "Resum de les visites",
         "VisitsSummaryDocumentation": "Aquesta és una visió general de l'evolució visita.",
         "WidgetLastVisits": "Gràfic de les darreres visites",
diff --git a/plugins/VisitsSummary/lang/cs.json b/plugins/VisitsSummary/lang/cs.json
index 59b99666d1..54a409e23d 100644
--- a/plugins/VisitsSummary/lang/cs.json
+++ b/plugins/VisitsSummary/lang/cs.json
@@ -17,7 +17,7 @@
         "NbUniquePageviewsDescription": "%s unikátních zobrazení",
         "NbUniqueVisitors": "%s unikátních návštěvníků",
         "NbVisitsBounced": "%s návštěvníků odešlo (opustilo web po jedné stránce)",
-        "PluginDescription": "Hlásí základní analytická čísla: návštěv, unikátních návštěvníků, počet akcí, poměr návratů",
+        "PluginDescription": "Hlásí základní analytická měření: počet návštěv a unikátních návštěvníků, počet akcí, frekvenci odrazu atd.",
         "VisitsSummary": "Shrnutí návštěv",
         "VisitsSummaryDocumentation": "Toto je přehled vývoje návštěv.",
         "WidgetLastVisits": "Graf posledních návštěv",
diff --git a/plugins/VisitsSummary/lang/da.json b/plugins/VisitsSummary/lang/da.json
index 7344a499be..08c5a3d537 100644
--- a/plugins/VisitsSummary/lang/da.json
+++ b/plugins/VisitsSummary/lang/da.json
@@ -17,7 +17,6 @@
         "NbUniquePageviewsDescription": "%s unikke sidevisninger",
         "NbUniqueVisitors": "%s unikke besøgende",
         "NbVisitsBounced": "%s har forladt hjemmesiden efter én sidevisning",
-        "PluginDescription": "Generelle analyserapporter: besøg, unikke besøgende, antal handlinger, afvisningsprocent osv..",
         "VisitsSummary": "Besøg resumé",
         "VisitsSummaryDocumentation": "Oversigt over besøgsudviklingen.",
         "WidgetLastVisits": "Seneste besøg",
diff --git a/plugins/VisitsSummary/lang/de.json b/plugins/VisitsSummary/lang/de.json
index e830cb2f8f..292df1db50 100644
--- a/plugins/VisitsSummary/lang/de.json
+++ b/plugins/VisitsSummary/lang/de.json
@@ -17,7 +17,7 @@
         "NbUniquePageviewsDescription": "%s einmalige Seitenansichten",
         "NbUniqueVisitors": "%s eindeutige Besucher",
         "NbVisitsBounced": "%s Besucher sind abgesprungen (haben die Webseite nach einer Seite verlassen)",
-        "PluginDescription": "Berichte über allgemeine Informationen: Besuche, eindeutige Besucher, Anzahl der Aktionen, Absprungrate etc.",
+        "PluginDescription": "Berichte mit generellen analytischen Metriken: Besuche, eindeutige Besucher, Anzahl Aktionen, Absprungsrate, usw.",
         "VisitsSummary": "Besucherüberblick",
         "VisitsSummaryDocumentation": "Dies ist eine Übersicht über die Entwicklung der Besuche.",
         "WidgetLastVisits": "Graph der letzten Besuche",
diff --git a/plugins/VisitsSummary/lang/el.json b/plugins/VisitsSummary/lang/el.json
index de928ef731..2b89d35c99 100644
--- a/plugins/VisitsSummary/lang/el.json
+++ b/plugins/VisitsSummary/lang/el.json
@@ -17,7 +17,7 @@
         "NbUniquePageviewsDescription": "%s μοναδικές προβολές σελίδων",
         "NbUniqueVisitors": "%s μοναδικοί επισκέπτες",
         "NbVisitsBounced": "%s των επισκεπτών απομακρύνθηκαν (έφυγαν από την πρώτη σελίδα)",
-        "PluginDescription": "Αναφέρει τους γενικούς αριθμούς στατιστικών: επισκέψεις, μοναδικοί επισκέπτες, αριθμος δραστηριοτήτων, Βαθμός Αναπήδησης, κλπ.",
+        "PluginDescription": "Αναφέρει γενικές μετρικές αναλυτικών: επισκέψεις, μοναδικοί επισκέπτες, αριθμός ενεργειών, ρυθμός αναπήδησης, κτλ.",
         "VisitsSummary": "Περίληψη επισκέψεων",
         "VisitsSummaryDocumentation": "Αυτή είναι μια επισκόπηση της εξέλιξης των επισκέψεων.",
         "WidgetLastVisits": "Διάγραμμα τελευταίων επισκέψεων",
diff --git a/plugins/VisitsSummary/lang/en.json b/plugins/VisitsSummary/lang/en.json
index ba47dc4c57..e4a46bc5ae 100644
--- a/plugins/VisitsSummary/lang/en.json
+++ b/plugins/VisitsSummary/lang/en.json
@@ -17,7 +17,7 @@
         "NbUniquePageviewsDescription": "%s unique pageviews",
         "NbUniqueVisitors": "%s unique visitors",
         "NbVisitsBounced": "%s visits have bounced (left the website after one page)",
-        "PluginDescription": "Reports the general Analytics numbers: visits, unique visitors, number of actions, Bounce Rate, etc.",
+        "PluginDescription": "Reports general analytics metrics: visits, unique visitors, number of actions, bounce rate, etc.",
         "VisitsSummary": "Visits Summary",
         "VisitsSummaryDocumentation": "This is an overview of the visit evolution.",
         "WidgetLastVisits": "Visits Over Time",
diff --git a/plugins/VisitsSummary/lang/es.json b/plugins/VisitsSummary/lang/es.json
index e2c61b55fa..7fc6394547 100644
--- a/plugins/VisitsSummary/lang/es.json
+++ b/plugins/VisitsSummary/lang/es.json
@@ -17,7 +17,6 @@
         "NbUniquePageviewsDescription": "%s vista de páginas únicas",
         "NbUniqueVisitors": "%s visitas únicas",
         "NbVisitsBounced": "%s de visitas que han vuelto (abandonaron el sitio después de una página)",
-        "PluginDescription": "Reporta los Números Generales del Análisis: visita, visitantes únicos, número de acciones, porcentaje de abandono, etc.",
         "VisitsSummary": "Resumen de visitas",
         "VisitsSummaryDocumentation": "Esta es una visión holística de la evolución de las visitas.",
         "WidgetLastVisits": "Gráfica de las últimas visitas",
diff --git a/plugins/VisitsSummary/lang/fa.json b/plugins/VisitsSummary/lang/fa.json
index 9c6d65d284..566e5d47ec 100644
--- a/plugins/VisitsSummary/lang/fa.json
+++ b/plugins/VisitsSummary/lang/fa.json
@@ -17,7 +17,6 @@
         "NbUniquePageviewsDescription": "نمایش صفحات منفرد %s",
         "NbUniqueVisitors": "%s بازدیدکنندگان منحصربفرد",
         "NbVisitsBounced": "%sبازدید پس زده شده (بعدازبازدید یک صفحه از وبسایت خارج شده است)",
-        "PluginDescription": "به گزارش تجزیه و تحلیل عمومی: بار مشاهده شده است، بازدید کنندگان منحصر به فرد، تعدادی از اقدامات، نرخ گزاف گویی، و غیره",
         "VisitsSummary": "خلاصه بازدیدها",
         "VisitsSummaryDocumentation": "این مروری بر تکامل بازدید است.",
         "WidgetLastVisits": "نمودار آخرین بازدید ها",
diff --git a/plugins/VisitsSummary/lang/fi.json b/plugins/VisitsSummary/lang/fi.json
index f28b098f62..4df0a1d5db 100644
--- a/plugins/VisitsSummary/lang/fi.json
+++ b/plugins/VisitsSummary/lang/fi.json
@@ -17,7 +17,6 @@
         "NbUniquePageviewsDescription": "%s yksilöllistä sivunavausta",
         "NbUniqueVisitors": "%s uniikia kävijää",
         "NbVisitsBounced": "%s lyhyttä käyntiä (vain yksi ladattu sivu)",
-        "PluginDescription": "Yleiset analyysit: käynnit, uniikit kävijät, toimintojen määrä, lähtevien määrä jne.",
         "VisitsSummary": "Yhteenveto käynneistä",
         "VisitsSummaryDocumentation": "Tämä on käyntien muutoksen yleiskatsaus",
         "WidgetLastVisits": "Edelliset käynnit",
diff --git a/plugins/VisitsSummary/lang/fr.json b/plugins/VisitsSummary/lang/fr.json
index e79d35e528..a21bc59d30 100644
--- a/plugins/VisitsSummary/lang/fr.json
+++ b/plugins/VisitsSummary/lang/fr.json
@@ -17,7 +17,6 @@
         "NbUniquePageviewsDescription": "%s pages vues uniques",
         "NbUniqueVisitors": "%s visiteurs uniques",
         "NbVisitsBounced": "%s visiteurs ont survolé (quitté le site après une page)",
-        "PluginDescription": "Effectue des rapports sur les valeurs générales des statistiques: visites, visiteurs uniques, nombre d'actions, taux de rebond, etc.",
         "VisitsSummary": "Récapitulatif des visites",
         "VisitsSummaryDocumentation": "Ceci est un aperçu de l'évolution de la visite.",
         "WidgetLastVisits": "Graphique des dernières visites",
diff --git a/plugins/VisitsSummary/lang/he.json b/plugins/VisitsSummary/lang/he.json
index b2c514a6a2..24ab52db93 100644
--- a/plugins/VisitsSummary/lang/he.json
+++ b/plugins/VisitsSummary/lang/he.json
@@ -17,7 +17,6 @@
         "NbUniquePageviewsDescription": "%s ביקורי עמודים ייחודיים",
         "NbUniqueVisitors": "%s מבקרים יחודיים",
         "NbVisitsBounced": "%s ביקורים ננטשו (עזבו את האתר אחרי עמוד אחד)",
-        "PluginDescription": "מדווח על ניתוח המספרים הכללי: ביקורים, מבקרים יחודיים, מספר פעולות, שיעור נטישה וכו'",
         "VisitsSummary": "תקציר ביקורים",
         "VisitsSummaryDocumentation": "זו סקירה של התפתחות הביקור.",
         "WidgetLastVisits": "גרף ביקורים אחרונים",
diff --git a/plugins/VisitsSummary/lang/hu.json b/plugins/VisitsSummary/lang/hu.json
index 645376f58e..8c4f411275 100644
--- a/plugins/VisitsSummary/lang/hu.json
+++ b/plugins/VisitsSummary/lang/hu.json
@@ -8,7 +8,6 @@
         "NbActionsPerVisit": "%s akció látogatásonként",
         "NbUniqueVisitors": "%s egyedi látogatás",
         "NbVisitsBounced": "%s látogatás csak egy weblap megtekintésével",
-        "PluginDescription": "Jelentések webanalitikai alapadatokról: látogatások, egyedi látogatások, akciók gyakorisága, visszafordulások aránya, stb.",
         "VisitsSummary": "Látogatások összesítése",
         "VisitsSummaryDocumentation": "Ez egy összefoglaló nézet a látogatások folyamatáról.",
         "WidgetLastVisits": "Utolsó látogatások grafikonja",
diff --git a/plugins/VisitsSummary/lang/id.json b/plugins/VisitsSummary/lang/id.json
index c62a6968ad..b53f98aad6 100644
--- a/plugins/VisitsSummary/lang/id.json
+++ b/plugins/VisitsSummary/lang/id.json
@@ -17,7 +17,6 @@
         "NbUniquePageviewsDescription": "%s tampilan halaman unik",
         "NbUniqueVisitors": "%s pengunjung unik",
         "NbVisitsBounced": "%s kunjungan dengan pentalan (meninggalkan situs setelah mengunjungi satu halaman)",
-        "PluginDescription": "Laporan Analisis angka umum: kunjungan, pengunjung unik, jumlah tindakan, Tingkat Pentalan, dsb.",
         "VisitsSummary": "Rangkuman Kunjungan",
         "VisitsSummaryDocumentation": "Ini merupakan iktisar perkembangan kunjungan.",
         "WidgetLastVisits": "Grafik kunjungan terakhir",
diff --git a/plugins/VisitsSummary/lang/is.json b/plugins/VisitsSummary/lang/is.json
index bccdcc3366..f0067a90aa 100644
--- a/plugins/VisitsSummary/lang/is.json
+++ b/plugins/VisitsSummary/lang/is.json
@@ -8,7 +8,6 @@
         "NbActionsPerVisit": "%s aðgerðir á heimsókn",
         "NbUniqueVisitors": "%s einstakir gestir",
         "NbVisitsBounced": "%s heimsóknir hafa skoppað (yfirgefið vefinn eftir eina síðu)",
-        "PluginDescription": "Gefur skýrslu um almennar greiningartölur: heimsóknir, einstakir gestir, fjöldi aðgerða, skopptíðni, o.s.frv.",
         "VisitsSummary": "Samantekt heimsókna",
         "WidgetLastVisits": "Línurit yfir síðustu heimsóknir",
         "WidgetOverviewGraph": "Yfirlit með línuriti",
diff --git a/plugins/VisitsSummary/lang/it.json b/plugins/VisitsSummary/lang/it.json
index cfa5330959..c38b4c1f1b 100644
--- a/plugins/VisitsSummary/lang/it.json
+++ b/plugins/VisitsSummary/lang/it.json
@@ -17,7 +17,7 @@
         "NbUniquePageviewsDescription": "%s visualizzazioni pagina uniche",
         "NbUniqueVisitors": "%s visitatori unici",
         "NbVisitsBounced": "Il %s dei visitatori hanno visto 1 sola pagina",
-        "PluginDescription": "Riporta i dati generali di Web Analytics: visite, visite uniche, numero di azioni, percentuale dei rimbalzi, ecc.",
+        "PluginDescription": "Riporta le comuni metriche delle statistiche: visite, visitatori unici, numero di azioni, percentuale rimbalzi, ecc.",
         "VisitsSummary": "Sommario delle visite",
         "VisitsSummaryDocumentation": "Questa è una panoramica dell'evoluzione delle visite.",
         "WidgetLastVisits": "Grafico ultime visite",
diff --git a/plugins/VisitsSummary/lang/ja.json b/plugins/VisitsSummary/lang/ja.json
index bd589ceab9..8491d049fb 100644
--- a/plugins/VisitsSummary/lang/ja.json
+++ b/plugins/VisitsSummary/lang/ja.json
@@ -17,7 +17,6 @@
         "NbUniquePageviewsDescription": "%s ユニークページビュー数",
         "NbUniqueVisitors": "%s ユニークビジター数",
         "NbVisitsBounced": "%s 直帰率（1ページを表示後にウェブサイトを離れた）",
-        "PluginDescription": "全体的な解析数（ビジット、ユニークビジター数、アクション数、バウンス率等）をリポートします。",
         "VisitsSummary": "ビジットの概要",
         "VisitsSummaryDocumentation": "ビジット推移の概観です",
         "WidgetLastVisits": "最終ビジットのグラフ",
diff --git a/plugins/VisitsSummary/lang/ka.json b/plugins/VisitsSummary/lang/ka.json
index 9f2b7fb26b..2052d8c760 100644
--- a/plugins/VisitsSummary/lang/ka.json
+++ b/plugins/VisitsSummary/lang/ka.json
@@ -8,7 +8,6 @@
         "NbActionsPerVisit": "%s ქმედება ვიზიტზე",
         "NbUniqueVisitors": "%s უნიკალური ვიზიტორი",
         "NbVisitsBounced": "%s უსარგებლო ვიზიტი (დატოვა ვებ საიტი ერთ გვერდის ნახვის შემდეგ)",
-        "PluginDescription": "აკეთებს ანგარიშს ანალიზატორის ძირითად მაჩვენებლებზე: ვიზიტები, უნიკალური ვიზიტები, ქმედებების რაოდენობა, უსარგებლო შესვლის მაჩვენებელი და სხვ.",
         "VisitsSummary": "ვიზიტების მოკლე ანგარიში",
         "WidgetLastVisits": "ბოლო ვიზიტების გრაფიკი",
         "WidgetOverviewGraph": "მიმოხილვა გრაფიკით",
diff --git a/plugins/VisitsSummary/lang/ko.json b/plugins/VisitsSummary/lang/ko.json
index e59ff48e15..c7b22f205b 100644
--- a/plugins/VisitsSummary/lang/ko.json
+++ b/plugins/VisitsSummary/lang/ko.json
@@ -16,7 +16,6 @@
         "NbUniquePageviewsDescription": "%s 고유 페이지뷰",
         "NbUniqueVisitors": "%s 고유 방문자",
         "NbVisitsBounced": "%s 반송률 (첫 페이지에서 이탈)",
-        "PluginDescription": "전반적인 분석수 (방문수, 고유 방문자수, 활동수, 반송비율 등)를 보고합니다.",
         "VisitsSummary": "방문 개요",
         "VisitsSummaryDocumentation": "방문 추이 개요입니다.",
         "WidgetLastVisits": "최근 방문 그래프",
diff --git a/plugins/VisitsSummary/lang/lt.json b/plugins/VisitsSummary/lang/lt.json
index 8ee1593f2d..15460e9e0c 100644
--- a/plugins/VisitsSummary/lang/lt.json
+++ b/plugins/VisitsSummary/lang/lt.json
@@ -8,7 +8,6 @@
         "NbActionsPerVisit": "%s veiksmų per apsilankymą",
         "NbUniqueVisitors": "%s unikalūs lankytojai",
         "NbVisitsBounced": "%s atsitiktiniai apsilankymai (paliko svetainę po pirmojo puslapio)",
-        "PluginDescription": "Parodo pagrindinius analizatoriaus duomenis: apsilankymus, unikalius lankytojus, veiksmų kiekį, šoklumo koeficientą ir t.t.",
         "VisitsSummary": "Apsilankymų suvestinė",
         "WidgetLastVisits": "Paskutinių apsilankymų diagrama",
         "WidgetOverviewGraph": "Peržiūra su diagrama",
diff --git a/plugins/VisitsSummary/lang/nb.json b/plugins/VisitsSummary/lang/nb.json
index 8aadedae9d..cf59b2a729 100644
--- a/plugins/VisitsSummary/lang/nb.json
+++ b/plugins/VisitsSummary/lang/nb.json
@@ -15,7 +15,6 @@
         "NbUniquePageviewsDescription": "%s unike sidevisninger",
         "NbUniqueVisitors": "%s unike besøkende",
         "NbVisitsBounced": "%s besøk har sprettet (forlatt nettstedet etter en side)",
-        "PluginDescription": "Rapporterer generell statistikk: Besøk, unike besøkende, antall handlinger, sprettfrekvens, osv.",
         "VisitsSummary": "Besøksammendrag",
         "WidgetLastVisits": "Graf over siste besøk",
         "WidgetOverviewGraph": "Oversikt med grafikk",
diff --git a/plugins/VisitsSummary/lang/nl.json b/plugins/VisitsSummary/lang/nl.json
index d56b51c0b2..ff716d5c5d 100644
--- a/plugins/VisitsSummary/lang/nl.json
+++ b/plugins/VisitsSummary/lang/nl.json
@@ -17,7 +17,6 @@
         "NbUniquePageviewsDescription": "%s unieke paginaweergaves",
         "NbUniqueVisitors": "%s unieke bezoekers",
         "NbVisitsBounced": "%s bezoekers hebben de website verlaten na één pagina",
-        "PluginDescription": "Toont de algemene analyses: bezoeken, unieke bezoekers, aantal acties, bouncerate enz.",
         "VisitsSummary": "Bezoekers samenvatting",
         "VisitsSummaryDocumentation": "Dit is een trendlijn die de ontwikkeling weergeeft.",
         "WidgetLastVisits": "Recente bezoeken",
diff --git a/plugins/VisitsSummary/lang/pl.json b/plugins/VisitsSummary/lang/pl.json
index 13fe2ddd9a..f28c75dd39 100644
--- a/plugins/VisitsSummary/lang/pl.json
+++ b/plugins/VisitsSummary/lang/pl.json
@@ -17,7 +17,6 @@
         "NbUniquePageviewsDescription": "%s unikalnych wejść",
         "NbUniqueVisitors": "%s jednorazowych gości",
         "NbVisitsBounced": "%s odwiedzin powróciło (opuszczając serwis po jednej stronie)",
-        "PluginDescription": "Ogólne raporty liczbowe odnośnie: odwiedzin, jednorazowych odwiedzin, zakres ich działań, współczynnik rezygnacji, etc.",
         "VisitsSummary": "Podsumowanie odwiedzin",
         "WidgetLastVisits": "Wykres z ostatnich odwiedzin",
         "WidgetOverviewGraph": "Podgląd z wykresem",
diff --git a/plugins/VisitsSummary/lang/pt-br.json b/plugins/VisitsSummary/lang/pt-br.json
index 5b0d2d1840..f2cbfe8143 100644
--- a/plugins/VisitsSummary/lang/pt-br.json
+++ b/plugins/VisitsSummary/lang/pt-br.json
@@ -17,7 +17,6 @@
         "NbUniquePageviewsDescription": "%s exibições de página únicas",
         "NbUniqueVisitors": "%s visitantes únicos",
         "NbVisitsBounced": "%s visitantes saíram (deixaram o website após uma página)",
-        "PluginDescription": "Relata os números gerais Analytics: visitas, visitantes únicos, número de ações, taxas, etc.",
         "VisitsSummary": "Resumo dos Visitantes",
         "VisitsSummaryDocumentation": "Esta é uma visão geral da evolução da visita.",
         "WidgetLastVisits": "Gráfico dos últimos visitantes",
diff --git a/plugins/VisitsSummary/lang/pt.json b/plugins/VisitsSummary/lang/pt.json
index 6b89bf931f..07cba81f59 100644
--- a/plugins/VisitsSummary/lang/pt.json
+++ b/plugins/VisitsSummary/lang/pt.json
@@ -14,7 +14,6 @@
         "NbUniquePageviewsDescription": "%s visualização única de páginas",
         "NbUniqueVisitors": "%s visitantes únicos",
         "NbVisitsBounced": "%s visitas ressaltaram (saíram do website depois de uma página)",
-        "PluginDescription": "Relata os números gerais das Analíticas: visitas, visitantes únicos, número de acções, Taxa de Ressalto, etc.",
         "VisitsSummary": "Resumo das Visitas",
         "VisitsSummaryDocumentation": "Isto é uma visualização global da evolução das visitas.",
         "WidgetLastVisits": "Gráfico das últimas visitas",
diff --git a/plugins/VisitsSummary/lang/ro.json b/plugins/VisitsSummary/lang/ro.json
index 49fc89c845..88fab63849 100644
--- a/plugins/VisitsSummary/lang/ro.json
+++ b/plugins/VisitsSummary/lang/ro.json
@@ -17,7 +17,6 @@
         "NbUniquePageviewsDescription": "%s vizualizări unice de pagină",
         "NbUniqueVisitors": "%s vizitatori unici",
         "NbVisitsBounced": "%s vizite care au sarit(a părăsit site-ul după o singură pagină)",
-        "PluginDescription": "Raportează general Analytics numerele: vizite, vizitatori unici, numărul de acțiuni, Bounce Rate, etc",
         "VisitsSummary": "Rezumatul vizitelor",
         "VisitsSummaryDocumentation": "Acesta este un rezumat a evoluţiei vizitelor.",
         "WidgetLastVisits": "Grafic ultima vizita",
diff --git a/plugins/VisitsSummary/lang/ru.json b/plugins/VisitsSummary/lang/ru.json
index 174dacd5a8..b9b98ac842 100644
--- a/plugins/VisitsSummary/lang/ru.json
+++ b/plugins/VisitsSummary/lang/ru.json
@@ -17,7 +17,6 @@
         "NbUniquePageviewsDescription": "%s уникальных просмотров страниц",
         "NbUniqueVisitors": "%s уникальных посетителей",
         "NbVisitsBounced": "%s отказов (ушли после посещения одной страницы)",
-        "PluginDescription": "Показывает общую аналитику: посещения, уникальные посетители, поличество действий, доля отказов и т. д.",
         "VisitsSummary": "Посещения",
         "VisitsSummaryDocumentation": "Это обзор динамики посещений.",
         "WidgetLastVisits": "График последних посещений",
diff --git a/plugins/VisitsSummary/lang/sk.json b/plugins/VisitsSummary/lang/sk.json
index 6d024b1c7a..9818950b24 100644
--- a/plugins/VisitsSummary/lang/sk.json
+++ b/plugins/VisitsSummary/lang/sk.json
@@ -8,7 +8,6 @@
         "NbActionsPerVisit": "%s akcia za návštevu",
         "NbUniqueVisitors": "Počet unikátnych návštevníkov: %s",
         "NbVisitsBounced": "%s návštev odskočilo (odišli po zobrazení jednej stránky)",
-        "PluginDescription": "Všeobecný analytický report: návštevy, jedinečné návštevy, počet akcií, Bounce Rate, atď",
         "VisitsSummary": "Všetky návštevy",
         "WidgetLastVisits": "Graf posledných návštev",
         "WidgetOverviewGraph": "Prehľad s grafom",
diff --git a/plugins/VisitsSummary/lang/sl.json b/plugins/VisitsSummary/lang/sl.json
index 76b3533dfb..5f59209d60 100644
--- a/plugins/VisitsSummary/lang/sl.json
+++ b/plugins/VisitsSummary/lang/sl.json
@@ -17,7 +17,6 @@
         "NbUniquePageviewsDescription": "%s unikatnih ogledov",
         "NbUniqueVisitors": "%s unikatnih obiskovalcev",
         "NbVisitsBounced": "%s ogledov je bilo odbojev (so zapustili stran po ogledu ene strani)",
-        "PluginDescription": "Prikaže splošne statistike glede obiska na spletni strani: obiske, unikatne obiske, število akcij, odbojno stopnjo, itd.",
         "VisitsSummary": "Povzetek obiskov",
         "VisitsSummaryDocumentation": "To je pregled obiskov v zadnjem času.",
         "WidgetLastVisits": "Graf zadnjih obiskov",
diff --git a/plugins/VisitsSummary/lang/sq.json b/plugins/VisitsSummary/lang/sq.json
index a12e71dcf0..07fd34be65 100644
--- a/plugins/VisitsSummary/lang/sq.json
+++ b/plugins/VisitsSummary/lang/sq.json
@@ -14,7 +14,6 @@
         "NbUniquePageviewsDescription": "%s parje unike faqesh",
         "NbUniqueVisitors": "%s vizitorë unikë",
         "NbVisitsBounced": "%s vizita të kthyera mbrapsht (e lanë \"site\"-in web pas një faqeje)",
-        "PluginDescription": "Raporton numrat e përgjithshëm të Analizës: vizita, vizitorë unikë, numër veprimesh, Shkallë Kthimesh, etj.",
         "VisitsSummary": "Përmbledhje Vizitash",
         "VisitsSummaryDocumentation": "Kjo është një përmbledhje e evolucionit të vizitave",
         "WidgetLastVisits": "Grafik për vizitat e fundit",
diff --git a/plugins/VisitsSummary/lang/sr.json b/plugins/VisitsSummary/lang/sr.json
index a360bcc45f..b1e0ba5084 100644
--- a/plugins/VisitsSummary/lang/sr.json
+++ b/plugins/VisitsSummary/lang/sr.json
@@ -17,7 +17,6 @@
         "NbUniquePageviewsDescription": "%s jedinstvenih prikaza stranica",
         "NbUniqueVisitors": "Broj jedinstvenih posetilaca: %s",
         "NbVisitsBounced": "%s posetilaca je otišlo posle samo jedne stranice",
-        "PluginDescription": "Opšte analitičke brojke: posete, jedinstveni posetioci, broj akcija, stopa odbijanja itd.",
         "VisitsSummary": "Sumarno",
         "VisitsSummaryDocumentation": "Ovo je pregled razvoja poseta",
         "WidgetLastVisits": "Grafikon najskorijih poseta",
diff --git a/plugins/VisitsSummary/lang/sv.json b/plugins/VisitsSummary/lang/sv.json
index 9477d57bf4..816ed64bb5 100644
--- a/plugins/VisitsSummary/lang/sv.json
+++ b/plugins/VisitsSummary/lang/sv.json
@@ -17,7 +17,6 @@
         "NbUniquePageviewsDescription": "%s unika sidvisningar",
         "NbUniqueVisitors": "%s unika besökare",
         "NbVisitsBounced": "%s besökare som har studsat (lämnat sidan efter en sidvisning)",
-        "PluginDescription": "Rapporterar allmänna analyssiffror: besök, unika besökare, antal händelser, avvisningsfrekvens, etc.",
         "VisitsSummary": "Besökssummering",
         "VisitsSummaryDocumentation": "Detta är en översikt av besöksutvecklingen.",
         "WidgetLastVisits": "Besöksgraf",
diff --git a/plugins/VisitsSummary/lang/th.json b/plugins/VisitsSummary/lang/th.json
index a2304901a0..e5e89bed68 100644
--- a/plugins/VisitsSummary/lang/th.json
+++ b/plugins/VisitsSummary/lang/th.json
@@ -14,7 +14,6 @@
         "NbUniquePageviewsDescription": "%s จำนวนหน้าที่มีการเปิดที่ไม่ซ้ำกัน",
         "NbUniqueVisitors": "%s ผู้เข้าชมที่ไม่ซ้ำ",
         "NbVisitsBounced": "%s ของผู้เข้าชมที่เด้ง (คือการออกจากเว็บไซต์หลังจากเปิดเพียงหน้าเดียว)",
-        "PluginDescription": "รายงานตัวเลขการวิเคราะห์ทั่วไป: เข้าชม ผู้เข้าชมที่ไม่ซ้ำกัน หมายเลขของการดำเนินการ อัตราการตอบกลับ ฯลฯ",
         "VisitsSummary": "สรุปการเข้าชม",
         "VisitsSummaryDocumentation": "ภาพรวมของผู้เข้าชม",
         "WidgetLastVisits": "กราฟของผู้เข้าชมล่าสุด",
diff --git a/plugins/VisitsSummary/lang/tl.json b/plugins/VisitsSummary/lang/tl.json
index cd9e4ab19d..ea4925b0d9 100644
--- a/plugins/VisitsSummary/lang/tl.json
+++ b/plugins/VisitsSummary/lang/tl.json
@@ -17,7 +17,6 @@
         "NbUniquePageviewsDescription": "%s natatanging mga pageview",
         "NbUniqueVisitors": "mga natatanging bisita %s",
         "NbVisitsBounced": "%s na pagbisita ay bumalik (umalis sa website pagkatapos ng isang pahina)",
-        "PluginDescription": "Mga bilang na may Ulat ng pangkalahatang ng Analytics: pagbisita mga natatanging bisita bilang ng mga aksyon rate ng biglaang pag-alis atbp.",
         "VisitsSummary": "Buod ng mga Pagbisita",
         "VisitsSummaryDocumentation": "Ito ay isang pangkalahatang-ideya sa ebolusyon ng pagbisita",
         "WidgetLastVisits": "Mga pagbisita sa paglipas ng panahon",
diff --git a/plugins/VisitsSummary/lang/tr.json b/plugins/VisitsSummary/lang/tr.json
index c3dee117bc..6917add789 100644
--- a/plugins/VisitsSummary/lang/tr.json
+++ b/plugins/VisitsSummary/lang/tr.json
@@ -7,7 +7,6 @@
         "NbKeywordsDescription": "%s tekil anahtar kelimeler",
         "NbUniqueVisitors": "%s tekil ziyaretçiler",
         "NbVisitsBounced": "%s ziyaret sıçrama yaşadı (ziyaretçi 1 sayfaya baktıktan sonra siteyi terketti )",
-        "PluginDescription": "Genel analiz sonuçlarını rapor eder: ziyaretler,tekil ziyaretçiler,etkinlik sayıları,sıçrama oranı vb.",
         "VisitsSummary": "Özeri gör",
         "VisitsSummaryDocumentation": "Ziyaretler için genel bakış niteliğindedir.",
         "WidgetLastVisits": "Son ziyaret grafiği",
diff --git a/plugins/VisitsSummary/lang/uk.json b/plugins/VisitsSummary/lang/uk.json
index 03da47811a..cb9c8cbb35 100644
--- a/plugins/VisitsSummary/lang/uk.json
+++ b/plugins/VisitsSummary/lang/uk.json
@@ -8,7 +8,6 @@
         "NbActionsPerVisit": "%s дій на відвідування",
         "NbUniqueVisitors": "%s унікальних відвідувачів",
         "NbVisitsBounced": "%s візитів з відмовами (залишили сайт після прегляду однієї сторінки)",
-        "PluginDescription": "Показує загальні показники аналізу: відвідування, унікальних відвідувачів, кількість дій, показник відмов, тощо...",
         "VisitsSummary": "Узагальнено відвідування",
         "WidgetLastVisits": "Графік останніх відвідувань",
         "WidgetOverviewGraph": "Огляд з графіком",
diff --git a/plugins/VisitsSummary/lang/vi.json b/plugins/VisitsSummary/lang/vi.json
index bdf8ee302a..f78ae7409d 100644
--- a/plugins/VisitsSummary/lang/vi.json
+++ b/plugins/VisitsSummary/lang/vi.json
@@ -17,7 +17,6 @@
         "NbUniquePageviewsDescription": "%s lượt xem trang duy nhất",
         "NbUniqueVisitors": "%s khách truy cập duy nhất",
         "NbVisitsBounced": "%s lượt truy cập đã bị thải hồi (rời khỏi trang web sau mỗi lượt truy cập trang)",
-        "PluginDescription": "Báo cáo các con số của các phân tích chung: thăm, khách truy cập duy nhất, số lượng các hành động, Tỷ lệ thoát, vv.",
         "VisitsSummary": "Lịch sử các lượt truy cập",
         "VisitsSummaryDocumentation": "Đây là một tổng quan của sự mở rộng truy cập.",
         "WidgetLastVisits": "Các lượt truy cập theo thời gian",
diff --git a/plugins/VisitsSummary/lang/zh-cn.json b/plugins/VisitsSummary/lang/zh-cn.json
index 316ccba8c4..613352c9fb 100644
--- a/plugins/VisitsSummary/lang/zh-cn.json
+++ b/plugins/VisitsSummary/lang/zh-cn.json
@@ -17,7 +17,6 @@
         "NbUniquePageviewsDescription": "%s 次唯一浏览",
         "NbUniqueVisitors": "%s 个独立访客数",
         "NbVisitsBounced": "%s 的跳出率 (查看一个页面后就离开)",
-        "PluginDescription": "显示常见的分析数据: 访问次数、访客人数、活动次数、跳出率等。",
         "VisitsSummary": "访客总表",
         "VisitsSummaryDocumentation": "这是访客趋势总表。",
         "WidgetLastVisits": "访客趋势图",
diff --git a/plugins/VisitsSummary/lang/zh-tw.json b/plugins/VisitsSummary/lang/zh-tw.json
index e051869939..3d772fb0ac 100644
--- a/plugins/VisitsSummary/lang/zh-tw.json
+++ b/plugins/VisitsSummary/lang/zh-tw.json
@@ -8,7 +8,6 @@
         "NbActionsPerVisit": "%s 每個訪客的活動數",
         "NbUniqueVisitors": "不重複訪客 %s 位",
         "NbVisitsBounced": "跳出率 %s（僅瀏覽一頁便離站）",
-        "PluginDescription": "一般分析項目報告：造訪次數、絕對不重複訪客、活動數、跳出率等等。",
         "VisitsSummary": "訪客總覽",
         "WidgetLastVisits": "最近造訪圖表",
         "WidgetOverviewGraph": "圖表總覽",
diff --git a/plugins/VisitsSummary/templates/_sparklines.twig b/plugins/VisitsSummary/templates/_sparklines.twig
index 92bc44b6a0..a61a31d230 100644
--- a/plugins/VisitsSummary/templates/_sparklines.twig
+++ b/plugins/VisitsSummary/templates/_sparklines.twig
@@ -69,6 +69,8 @@
             {{ sparkline(urlSparklineMaxActions)|raw }}
             {{ 'VisitsSummary_MaxNbActions'|translate("<strong>"~maxActions~"</strong>")|raw }}
     </div>
+    
+    {{ postEvent('Template.VisitsSummaryOverviewSparklines') }}
 </div>
 <div style="clear:both;"></div>
 
diff --git a/plugins/VisitsSummary/templates/index.twig b/plugins/VisitsSummary/templates/index.twig
index 2f4199f02e..d90e1bbd9c 100644
--- a/plugins/VisitsSummary/templates/index.twig
+++ b/plugins/VisitsSummary/templates/index.twig
@@ -7,10 +7,3 @@
 
 <h2 class="visitsSummaryReportTitle">{{ 'General_Report'|translate }}</h2>
 {% include "@VisitsSummary/_sparklines.twig" %}
-{#
-Time page generation
-	<p style='color:lightgrey; size:0.8em;'>
-	{{ 'VisitsSummary_GenerateTime'|translate(totalTimeGeneration,totalNumberOfQueries) }}
-	{% if totalNumberOfQueries != 0 %}, {{ 'VisitsSummary_GenerateQueries'|translate(totalNumberOfQueries) }}{% endif %}
-	</p>
-#}
diff --git a/plugins/VisitsSummary/tests/Integration/VisitsSummaryTest.php b/plugins/VisitsSummary/tests/Integration/VisitsSummaryTest.php
new file mode 100644
index 0000000000..dc71cc4848
--- /dev/null
+++ b/plugins/VisitsSummary/tests/Integration/VisitsSummaryTest.php
@@ -0,0 +1,182 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\VisitsSummary\tests\Integration;
+
+use Piwik\Access;
+use Piwik\API\Request;
+use Piwik\DataAccess\ArchiveTableCreator;
+use Piwik\Db;
+use Piwik\Plugins\Live\API;
+use Piwik\Plugins\VisitsSummary\VisitsSummary;
+use Piwik\Tests\Framework\Fixture;
+use Piwik\Tests\Framework\Mock\FakeAccess;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+
+/**
+ * @group VisitsSummary
+ * @group VisitsSummaryTest
+ * @group Plugins
+ */
+class VisitsSummaryTest extends IntegrationTestCase
+{
+    /**
+     * @var VisitsSummary
+     */
+    private $plugin;
+
+    protected $date = '2014-04-04';
+    private $column = 'nb_users';
+
+    public function setUp()
+    {
+        parent::setUp();
+        $this->plugin = new VisitsSummary();
+
+        $this->setSuperUser();
+
+        Fixture::createSuperUser();
+        Fixture::createWebsite('2014-01-01 00:00:00');
+    }
+
+    public function tearDown()
+    {
+        // clean up your test here if needed
+        $tables = ArchiveTableCreator::getTablesArchivesInstalled();
+        if (!empty($tables)) {
+            Db::dropTables($tables);
+        }
+        parent::tearDown();
+    }
+
+    public function test_enrichProcessedReportIfVisitsSummaryGet_shouldNotRemoveUsers_IfSomeWereTracked()
+    {
+        $this->trackPageviewsWithUsers();
+
+        $response = $this->requestProcessedGetReport();
+
+        $this->assertUsersNotRemovedFromProcessedReport($response, $expectedUsers = null, $minExpectedUsers = 1);
+    }
+
+    public function test_enrichProcessedReportIfVisitsSummaryGet_shouldNotRemoveUsers_IfNoneWereTrackedThatDay_ButThatMonth()
+    {
+        $this->date = '2014-04-04';
+        $this->trackPageviewsWithUsers();
+
+        $this->date = '2014-04-05';
+        $this->trackPageviewsWithoutUsers();
+
+        $response = $this->requestProcessedGetReport();
+
+        $this->assertUsersNotRemovedFromProcessedReport($response, $expectedUsers = 0);
+    }
+
+    public function test_isUsedInAtLeastOneSite_shouldRemoveUsers_IfNoneWereTracked()
+    {
+        $this->trackPageviewsWithoutUsers();
+
+        $response = $this->requestProcessedGetReport();
+
+        $this->assertUsersRemovedFromProcessedReport($response);
+    }
+
+    private function assertUsersNotRemovedFromProcessedReport($response, $exactNumUsers = null, $minNumUsers = 0)
+    {
+        $table = $response['reportData'];
+
+        if ($exactNumUsers !== null) {
+            $this->assertSame(array($exactNumUsers), $table->getColumn($this->column));
+        }
+
+        if ($minNumUsers != 0) {
+            $users = $table->getColumn($this->column);
+            $user = array_shift($users);
+            $this->assertGreaterThanOrEqual($minNumUsers, $user);
+        }
+
+        $numVisits = $table->getColumn('nb_visits');
+        $numVisits = array_shift($numVisits);
+        $this->assertGreaterThanOrEqual(2, $numVisits);
+
+        $this->assertNotEmpty($response['metadata']['metrics'][$this->column]);
+        $this->assertNotEmpty($response['metadata']['metricsDocumentation'][$this->column]);
+        $this->assertNotEmpty($response['columns'][$this->column]);
+    }
+
+    private function assertUsersRemovedFromProcessedReport($response)
+    {
+        $table = $response['reportData'];
+        $this->assertEquals(array(false), $table->getColumn($this->column));
+        
+        $numVisits = $table->getColumn('nb_visits');
+        $numVisits = array_shift($numVisits);
+        $this->assertGreaterThanOrEqual(2, $numVisits);
+
+        $this->assertArrayNotHasKey($this->column, $response['metadata']['metrics']);
+        $this->assertArrayNotHasKey($this->column, $response['metadata']['metricsDocumentation']);
+        $this->assertArrayNotHasKey($this->column, $response['columns']);
+    }
+
+    private function requestProcessedGetReport()
+    {
+        return Request::processRequest('API.getProcessedReport', array(
+            'idSite' => 1,
+            'period' => 'day',
+            'date'   => $this->date,
+            'apiModule' => 'VisitsSummary',
+            'apiAction' => 'get'
+        ));
+    }
+
+    private function trackPageviewsWithUsers()
+    {
+        $this->trackPageviewsWithDifferentUsers(array('user1', false, 'user3'));
+    }
+
+    private function trackPageviewsWithoutUsers()
+    {
+        $this->trackPageviewsWithDifferentUsers(array(false, false, false));
+    }
+
+    private function trackPageviewsWithDifferentUsers($userIds)
+    {
+        foreach ($userIds as $index => $userId) {
+            $tracker = $this->getTracker($index);
+            $tracker->setForceNewVisit();
+            $this->trackPageview($tracker, $userId, '/index/' . $index . '.html');
+        }
+    }
+
+    private function trackPageview(\PiwikTracker $tracker, $userId, $url)
+    {
+        $tracker->setUrl('http://www.example.org' . $url);
+        $tracker->setUserId($userId);
+        $tracker->doTrackPageView($url);
+    }
+
+    private function getTracker($hoursOffset = 0)
+    {
+        $hour = 10;
+        if ($hoursOffset) {
+            $hour += $hoursOffset;
+        }
+
+        $date = sprintf('%s %d:20:01', $this->date, $hour);
+
+        $tracker = Fixture::getTracker(1, $date, true, true);
+        $tracker->setTokenAuth(Fixture::getTokenAuth());
+        return $tracker;
+    }
+
+    private function setSuperUser()
+    {
+        $pseudoMockAccess = new FakeAccess();
+        $pseudoMockAccess::setSuperUserAccess(true);
+        Access::setSingletonInstance($pseudoMockAccess);
+    }
+}
diff --git a/plugins/VisitsSummary/tests/Unit/Reports/GetTest.php b/plugins/VisitsSummary/tests/Unit/Reports/GetTest.php
new file mode 100644
index 0000000000..df185a971e
--- /dev/null
+++ b/plugins/VisitsSummary/tests/Unit/Reports/GetTest.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\VisitsSummary\tests\Unit\Reports;
+
+use Piwik\DataTable;
+use Piwik\Plugins\VisitsSummary\Reports\Get;
+use Piwik\Tests\Framework\TestCase\UnitTestCase;
+
+/**
+ * @group VisitsSummary
+ * @group Reports
+ * @group GetTest
+ * @group Plugins
+ */
+class GetTest extends UnitTestCase
+{
+    /**
+     * @var Get
+     */
+    private $get;
+
+    private $column = 'nb_users';
+
+    public function setUp()
+    {
+        parent::setUp();
+        $this->get = new Get();
+    }
+
+    public function test_removeUsersFromProcessedReport_shouldNotDoAnything_IfNothingRelatedToUsersIsGiven()
+    {
+        $response = array();
+        $this->get->removeUsersFromProcessedReport($response);
+        $this->assertSame(array(), $response);
+
+        $response = array($this->column => '10', 'test' => 'whatever', 'columns' => array($this->column));
+        $this->get->removeUsersFromProcessedReport($response);
+        $this->assertSame(array($this->column => '10', 'test' => 'whatever', 'columns' => array($this->column)), $response);
+    }
+
+    public function test_removeUsersFromProcessedReport_shouldRemoveMetrics_IfUserIsGiven()
+    {
+        $response = array('metadata' => array('metrics' => array('nb_visits' => 'Visits', $this->column => 'Users')));
+        $this->get->removeUsersFromProcessedReport($response);
+        $this->assertSame(array('metadata' => array('metrics' => array('nb_visits' => 'Visits'))), $response);
+    }
+
+    public function test_removeUsersFromProcessedReport_shouldRemoveMetricsDocumentation_IfUserIsGiven()
+    {
+        $response = array('metadata' => array('metricsDocumentation' => array('nb_visits' => 'Visits', $this->column => 'Users')));
+        $this->get->removeUsersFromProcessedReport($response);
+        $this->assertSame(array('metadata' => array('metricsDocumentation' => array('nb_visits' => 'Visits'))), $response);
+    }
+
+    public function test_removeUsersFromProcessedReport_shouldRemoveColumn_IfUserIsGiven()
+    {
+        $response = array('columns' => array('nb_visits' => 'Visits', $this->column => 'Users'));
+        $this->get->removeUsersFromProcessedReport($response);
+        $this->assertSame(array('columns' => array('nb_visits' => 'Visits')), $response);
+    }
+
+    public function test_removeUsersFromProcessedReport_shouldRemoveUsersColumnFromDataTable_IfUserIsGiven()
+    {
+        $table = $this->getDataTableWithUsers();
+        $this->assertSame(array(20), $table->getColumn($this->column)); // verify column present
+
+        $response = array('reportData' => $table);
+        $this->get->removeUsersFromProcessedReport($response);
+
+        $this->assertSame(array(false), $table->getColumn($this->column));
+        $this->assertSame(array(10), $table->getColumn('nb_visits'));
+    }
+
+    public function test_removeUsersFromProcessedReport_shouldRemoveUsersColumnFromDataTableMap_IfUserIsGiven()
+    {
+        $table = new DataTable\Map();
+        $table->addTable($this->getDataTableWithUsers(), 'label');
+        $this->assertSame(array(20), $table->getColumn($this->column)); // verify column present
+
+        $response = array('reportData' => $table);
+        $this->get->removeUsersFromProcessedReport($response);
+
+        $this->assertSame(array(false), $table->getColumn($this->column));
+        $this->assertSame(array(10), $table->getColumn('nb_visits'));
+    }
+
+    private function getDataTableWithUsers()
+    {
+        $table = new DataTable();
+        $table->addRowFromSimpleArray(array('nb_visits' => 10, $this->column => 20));
+
+        return $table;
+    }
+}
diff --git a/plugins/Widgetize/Controller.php b/plugins/Widgetize/Controller.php
index 5b1d31b586..5dd61a66c7 100644
--- a/plugins/Widgetize/Controller.php
+++ b/plugins/Widgetize/Controller.php
@@ -30,7 +30,7 @@ class Controller extends \Piwik\Plugin\Controller
     public function testJsInclude1()
     {
         $view = new View('@Widgetize/testJsInclude1');
-        $view->url1 = '?module=Widgetize&action=js&moduleToWidgetize=UserSettings&actionToWidgetize=getBrowser&idSite=1&period=day&date=yesterday';
+        $view->url1 = '?module=Widgetize&action=js&moduleToWidgetize=DevicesDetection&actionToWidgetize=getBrowsers&idSite=1&period=day&date=yesterday';
         $view->url2 = '?module=Widgetize&action=js&moduleToWidgetize=API&actionToWidgetize=index&method=ExamplePlugin.getGoldenRatio&format=original';
         return $view->render();
     }
@@ -38,7 +38,7 @@ class Controller extends \Piwik\Plugin\Controller
     public function testJsInclude2()
     {
         $view = new View('@Widgetize/testJsInclude2');
-        $view->url1 = '?module=Widgetize&action=js&moduleToWidgetize=UserSettings&actionToWidgetize=getBrowser&idSite=1&period=day&date=yesterday';
+        $view->url1 = '?module=Widgetize&action=js&moduleToWidgetize=DevicesDetection&actionToWidgetize=getBrowsers&idSite=1&period=day&date=yesterday';
         $view->url2 = '?module=Widgetize&action=js&moduleToWidgetize=UserCountry&actionToWidgetize=getCountry&idSite=1&period=day&date=yesterday&viewDataTable=cloud&show_footer=0';
         $view->url3 = '?module=Widgetize&action=js&moduleToWidgetize=Referrers&actionToWidgetize=getKeywords&idSite=1&period=day&date=yesterday&viewDataTable=table&show_footer=0';
         return $view->render();
diff --git a/plugins/Widgetize/lang/ar.json b/plugins/Widgetize/lang/ar.json
index eaa8b19196..9d5ce207d9 100644
--- a/plugins/Widgetize/lang/ar.json
+++ b/plugins/Widgetize/lang/ar.json
@@ -1,6 +1,5 @@
 {
     "Widgetize": {
-        "OpenInNewWindow": "فتح في نافذة جديدة",
-        "PluginDescription": "الإضافات تجعل من السهل جداً تصدير أي لوحة إعدادات في Piwik إلى مدونتك، موقعك أو صفحتك الخاصة على iGoogle أو Netvibes."
+        "OpenInNewWindow": "فتح في نافذة جديدة"
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/be.json b/plugins/Widgetize/lang/be.json
index 125375cf9e..fc02c941dc 100644
--- a/plugins/Widgetize/lang/be.json
+++ b/plugins/Widgetize/lang/be.json
@@ -1,6 +1,5 @@
 {
     "Widgetize": {
-        "OpenInNewWindow": "Адкрыць у новым акне",
-        "PluginDescription": "Плагін дазваляе лёгка экспартаваць любы віджэт Piwik у блог, вэб-сайт або на iGoogle і Netvibes!"
+        "OpenInNewWindow": "Адкрыць у новым акне"
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/bg.json b/plugins/Widgetize/lang/bg.json
index beb4407f0d..c65244a032 100644
--- a/plugins/Widgetize/lang/bg.json
+++ b/plugins/Widgetize/lang/bg.json
@@ -1,7 +1,6 @@
 {
     "Widgetize": {
         "OpenInNewWindow": "Отвори в нов прозорец",
-        "PluginDescription": "Тази добавка позволява по много лесен начин всяка Piwik джаджа да бъде добавена във вашия блог, уебсайт или в Igoogle и Netvibes!",
         "TopLinkTooltip": "Запазете Piwik докладите като джаджи и вградете таблото във вашето приложение като iframe."
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/ca.json b/plugins/Widgetize/lang/ca.json
index 4d0e1b4d9d..64d7d17971 100644
--- a/plugins/Widgetize/lang/ca.json
+++ b/plugins/Widgetize/lang/ca.json
@@ -1,7 +1,6 @@
 {
     "Widgetize": {
         "OpenInNewWindow": "Obrir en una nova finestra",
-        "PluginDescription": "Aquesta extensió permet exportar qualsevol Giny de Piwik al vostre bloc, lloc web, Igoogle i Netvibes!",
         "TopLinkTooltip": "Exporteu informes i ginys de Piwik i incrusteu el Tauler de Control a la vostra aplicació com un iframe."
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/cs.json b/plugins/Widgetize/lang/cs.json
index 1772412508..1a46ffe204 100644
--- a/plugins/Widgetize/lang/cs.json
+++ b/plugins/Widgetize/lang/cs.json
@@ -1,7 +1,7 @@
 {
     "Widgetize": {
         "OpenInNewWindow": "Otevřít nové okno",
-        "PluginDescription": "Tento zásuvný modul zjednodušuje export widgetů Piwiku na váš blog, web nebo Igoogle a Netvibes!",
+        "PluginDescription": "Zobrazte jakékoliv hlášení z Piwiku na vašich stránkách pomocí jednoduchého vkládacího HTML tagu.",
         "TopLinkTooltip": "Exportujte své Piwik hlášení jako widgety a použijte eje e vaší aplikaci jako iframe."
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/da.json b/plugins/Widgetize/lang/da.json
index e77aa588d5..7e8063407c 100644
--- a/plugins/Widgetize/lang/da.json
+++ b/plugins/Widgetize/lang/da.json
@@ -1,7 +1,6 @@
 {
     "Widgetize": {
         "OpenInNewWindow": "Åben i et nyt vindue",
-        "PluginDescription": "Programudvidelsen gør det nemt at eksportere Piwik moduler til din blog, hjemmeside eller på iGoogle og Netvibes!",
         "TopLinkTooltip": "Eksporter Piwik rapporter som moduler og indlejre dit kontrolpanel i din applikation som en iframe."
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/de.json b/plugins/Widgetize/lang/de.json
index 1b370d02a7..f8b703debd 100644
--- a/plugins/Widgetize/lang/de.json
+++ b/plugins/Widgetize/lang/de.json
@@ -1,7 +1,7 @@
 {
     "Widgetize": {
         "OpenInNewWindow": "In neuem Fenster öffnen",
-        "PluginDescription": "Dieses Plugin macht es sehr einfach, Piwik-Widgets für einen Blog, eine Webseite oder IGoogle und Netvibes zu exportieren.",
+        "PluginDescription": "Zeigt sämtliche Piwik Berichte in Ihrer Webseite oder App mit einem einfachen Embed HTML tag an.",
         "TopLinkTooltip": "Exportieren Sie Berichte als Widgets und binden Sie das Dashboard in Ihrer Applikation als iframe ein."
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/el.json b/plugins/Widgetize/lang/el.json
index 09f4312813..fc46c75ddc 100644
--- a/plugins/Widgetize/lang/el.json
+++ b/plugins/Widgetize/lang/el.json
@@ -1,7 +1,7 @@
 {
     "Widgetize": {
         "OpenInNewWindow": "Άνοιγμα σε νέο παράθυρο",
-        "PluginDescription": "Το πρόσθετο κάνει πολύ εύκολη την εξαγωγή οποιασδήποτε Μικροεφαρμογής Piwik στο Ιστολόγιό σας, την Ιστοσελίδα σας ή το Igoogle και το Netvibes!",
+        "PluginDescription": "Εμφάνιση οποιασδήποτε αναφοράς του Piwik στον ιστοτόπο ή την εφαρμογή σας με μια απλή σήμανση ενσωμάτωσης σε HTML.",
         "TopLinkTooltip": "Εξαγωγή Αναφορών Piwik ως Μικροεφαρμογές και ενσωμάτωσή του Κεντρικού Πίνακα στην εφαρμογή σας ως πλαίσιο."
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/en.json b/plugins/Widgetize/lang/en.json
index 0664ea46ef..042c2981df 100644
--- a/plugins/Widgetize/lang/en.json
+++ b/plugins/Widgetize/lang/en.json
@@ -1,7 +1,7 @@
 {
     "Widgetize": {
         "OpenInNewWindow": "Open in a new window",
-        "PluginDescription": "The plugin makes it very easy to export any Piwik Widget in your Blog, Website or on Igoogle and Netvibes!",
+        "PluginDescription": "Display any Piwik report in your website or app with a simple Embed HTML tag.",
         "TopLinkTooltip": "Export Piwik Reports as Widgets and embed the Dashboard in your app as an iframe."
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/es.json b/plugins/Widgetize/lang/es.json
index 0b8fff1752..e443856888 100644
--- a/plugins/Widgetize/lang/es.json
+++ b/plugins/Widgetize/lang/es.json
@@ -1,7 +1,6 @@
 {
     "Widgetize": {
         "OpenInNewWindow": "Abrir en una nueva ventana",
-        "PluginDescription": "Este plugin hace muy fácil exportar cualquier Widget de Piwik a tu blog, sitio web o a iGoogle y Netvibes!",
         "TopLinkTooltip": "Exportar los informes de Piwik como una aplicación (widget) e incrustar el panel en su aplicación como un elemento iframe."
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/fa.json b/plugins/Widgetize/lang/fa.json
index 17910821f7..84f41f949d 100644
--- a/plugins/Widgetize/lang/fa.json
+++ b/plugins/Widgetize/lang/fa.json
@@ -1,6 +1,5 @@
 {
     "Widgetize": {
-        "OpenInNewWindow": "باز کردن در یک پنجره جدید",
-        "PluginDescription": "این پلاگین باعث می شود آن را بسیار آسان برای صادرات هر گونه عناصر Piwik در وبلاگ، وب سایت خود و یا در iGoogle و کام!"
+        "OpenInNewWindow": "باز کردن در یک پنجره جدید"
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/fi.json b/plugins/Widgetize/lang/fi.json
index 2bb8e891a1..5192a12763 100644
--- a/plugins/Widgetize/lang/fi.json
+++ b/plugins/Widgetize/lang/fi.json
@@ -1,7 +1,6 @@
 {
     "Widgetize": {
         "OpenInNewWindow": "Avaa uudessa ikkunassa",
-        "PluginDescription": "Tällä lisäosalla voit helposti näyttää minkä tahansa Piwikin raportin blogissa, verkkosivulla, iGooglessa tai Netvibesissä!",
         "TopLinkTooltip": "Vie Piwikin raportteja vimpaimiksi ja lisää työpöytä ohjelmaan iframena."
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/fr.json b/plugins/Widgetize/lang/fr.json
index 8f663beab4..a0da4cabaf 100644
--- a/plugins/Widgetize/lang/fr.json
+++ b/plugins/Widgetize/lang/fr.json
@@ -1,7 +1,6 @@
 {
     "Widgetize": {
         "OpenInNewWindow": "Ouvrir dans une nouvelle fenêtre",
-        "PluginDescription": "Le plugin rend simple l'export de n'importe quel Widget Piwik dans votre blog, site web ou sur Igoogle et Netvibes!",
         "TopLinkTooltip": "Exporter les rapports Piwik en tant que gadget et incorporer le tableau de bord dans votre application en tant qu'iframe."
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/he.json b/plugins/Widgetize/lang/he.json
index ca709b7bf8..ce7de454a8 100644
--- a/plugins/Widgetize/lang/he.json
+++ b/plugins/Widgetize/lang/he.json
@@ -1,7 +1,6 @@
 {
     "Widgetize": {
         "OpenInNewWindow": "פתיחה בחלון חדש",
-        "PluginDescription": "התוסף מקל מאוד על ייצוא יישומונים של Piwik מבלוג, אתר או בIgoogle וNetvibes!",
         "TopLinkTooltip": "ייצוא דוחות Piwik כוידג׳טים והטמעת לוח הבקרה באפליקציה שלך כ-iframe."
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/hu.json b/plugins/Widgetize/lang/hu.json
index 62ff22e99c..a27adea0f2 100644
--- a/plugins/Widgetize/lang/hu.json
+++ b/plugins/Widgetize/lang/hu.json
@@ -1,6 +1,5 @@
 {
     "Widgetize": {
-        "OpenInNewWindow": "Megnyitás új ablakban",
-        "PluginDescription": "A kiegészítő egyszerűvé teszi bármelyik Piwik modul megjelenítését más blogon, weboldalon vagy akár az iGoogle és a Netvibes nyitólapokon!"
+        "OpenInNewWindow": "Megnyitás új ablakban"
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/id.json b/plugins/Widgetize/lang/id.json
index 121cb04f0e..8ba61be05e 100644
--- a/plugins/Widgetize/lang/id.json
+++ b/plugins/Widgetize/lang/id.json
@@ -1,7 +1,6 @@
 {
     "Widgetize": {
         "OpenInNewWindow": "Buka di jendela baru",
-        "PluginDescription": "Pengaya ini mempermudah mengekspor Gawit Piwik dalam Blog, Situs, atau dalam Igoogle dan Netvibes Anda!",
         "TopLinkTooltip": "Ekspor Laporan Piwik sebagai gawit dan sematkan dalam Penel Kendali di aplikasi Anda sebagai binkai pendam."
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/it.json b/plugins/Widgetize/lang/it.json
index 0a378712a2..9e97181435 100644
--- a/plugins/Widgetize/lang/it.json
+++ b/plugins/Widgetize/lang/it.json
@@ -1,7 +1,7 @@
 {
     "Widgetize": {
         "OpenInNewWindow": "Apri in una nuova finestra",
-        "PluginDescription": "Il plugin rende molto facile esportare qualsiasi Widget Piwik nel tuo Blog, Sito Web o su IGoogle e Netvibes!",
+        "PluginDescription": "Mostra ogni report di Piwik nel tuo sito o nell'app con un semplice tag HTML.",
         "TopLinkTooltip": "Esporta i Reports di Piwik come Widgets e includi la Dashboard nella tua app come iFrame."
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/ja.json b/plugins/Widgetize/lang/ja.json
index 12ee32bbe3..c291583d76 100644
--- a/plugins/Widgetize/lang/ja.json
+++ b/plugins/Widgetize/lang/ja.json
@@ -1,7 +1,6 @@
 {
     "Widgetize": {
         "OpenInNewWindow": "新しいウィンドウで開く",
-        "PluginDescription": "あなたのブログ、ウェブサイト、Igoogle、Netvibes 等に、任意の Piwik ウィジェットをとても簡単にエクスポートできるようにします。",
         "TopLinkTooltip": "Piwik レポートをウィジェットとしてエクスポートし、ダッシュボードを iframe としてご利用のアプリケーションに埋め込んでください。"
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/ka.json b/plugins/Widgetize/lang/ka.json
index b319d15f6f..aa859c84b6 100644
--- a/plugins/Widgetize/lang/ka.json
+++ b/plugins/Widgetize/lang/ka.json
@@ -1,6 +1,5 @@
 {
     "Widgetize": {
-        "OpenInNewWindow": "ახალ ფანჯარაში გახსნა",
-        "PluginDescription": "ამ პლაგინით ძალიან ადვილად შეგიძლიათ გააკეთოთ ნებისმიერი Piwik ვიჯეტის ექსპორტი თქვენს ბლოგზე, ვებ საიტზე ან Igoogle–ზე და Netvibes–ზე!"
+        "OpenInNewWindow": "ახალ ფანჯარაში გახსნა"
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/ko.json b/plugins/Widgetize/lang/ko.json
index b10097e768..b9414e2b35 100644
--- a/plugins/Widgetize/lang/ko.json
+++ b/plugins/Widgetize/lang/ko.json
@@ -1,7 +1,6 @@
 {
     "Widgetize": {
         "OpenInNewWindow": "새 창에서 열기",
-        "PluginDescription": "당신의 블로그, 웹사이트, Igoogle, Netvibes 등 모든 Piwik 위젯을 매우 쉽게 내보낼 수 있습니다.",
         "TopLinkTooltip": "Piwik 보고서를 위젯으로 내보내고 당신의 애플리케이션 대시보드에 IFRAME으로 삽입할 수 있습니다."
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/lt.json b/plugins/Widgetize/lang/lt.json
index 9a24a9a0fe..81d529bb24 100644
--- a/plugins/Widgetize/lang/lt.json
+++ b/plugins/Widgetize/lang/lt.json
@@ -1,6 +1,5 @@
 {
     "Widgetize": {
-        "OpenInNewWindow": "Atidaryti naujame lange",
-        "PluginDescription": "Šis papildinys leidžia itin paprastai eksportuoti bet kurį Piwik valdiklį į Jūsų interneto dienoraštį, svetainę ar į Igoogle bei Netvibes!"
+        "OpenInNewWindow": "Atidaryti naujame lange"
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/nl.json b/plugins/Widgetize/lang/nl.json
index 5dfae62bf5..09a8aa58e2 100644
--- a/plugins/Widgetize/lang/nl.json
+++ b/plugins/Widgetize/lang/nl.json
@@ -1,6 +1,5 @@
 {
     "Widgetize": {
-        "OpenInNewWindow": "Open in een nieuw venster",
-        "PluginDescription": "Deze plugin maakt het zeer gemakkelijk om Piwik widgets te exporteren naar uw blog, website of op iGoogle en Netvibes."
+        "OpenInNewWindow": "Open in een nieuw venster"
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/pl.json b/plugins/Widgetize/lang/pl.json
index d19dbc1204..9dab74a92b 100644
--- a/plugins/Widgetize/lang/pl.json
+++ b/plugins/Widgetize/lang/pl.json
@@ -1,6 +1,5 @@
 {
     "Widgetize": {
-        "OpenInNewWindow": "Otwórz w nowym oknie",
-        "PluginDescription": "Wtyczka sprawia, że możemy w prosty sposób umieścić widżet z Piwik na swoim blogu, zwykłej stronie, czy na iGoogle lub Netvibes!"
+        "OpenInNewWindow": "Otwórz w nowym oknie"
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/pt-br.json b/plugins/Widgetize/lang/pt-br.json
index 15dd12e1a6..7262c22bf0 100644
--- a/plugins/Widgetize/lang/pt-br.json
+++ b/plugins/Widgetize/lang/pt-br.json
@@ -1,7 +1,6 @@
 {
     "Widgetize": {
         "OpenInNewWindow": "Abre uma nova janela",
-        "PluginDescription": "O plugin faz ficar muito fácil exportar qualquer widget Piwik para seu blog, website ou em Igoogle e Netvibes!",
         "TopLinkTooltip": "Exportar relatórios Piwik como widgets do Dashboard e incorporar em seu aplicativo como um iframe."
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/pt.json b/plugins/Widgetize/lang/pt.json
index 9280e85eca..41a120454f 100644
--- a/plugins/Widgetize/lang/pt.json
+++ b/plugins/Widgetize/lang/pt.json
@@ -1,6 +1,5 @@
 {
     "Widgetize": {
-        "OpenInNewWindow": "Abrir em nova janela",
-        "PluginDescription": "Este plugin torna muito fácil exportar qualquer Widget Piwik para o seu Blog, Website ou no Igoogle e Netvibes!"
+        "OpenInNewWindow": "Abrir em nova janela"
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/ro.json b/plugins/Widgetize/lang/ro.json
index 9089cc8798..bc2114277b 100644
--- a/plugins/Widgetize/lang/ro.json
+++ b/plugins/Widgetize/lang/ro.json
@@ -1,7 +1,6 @@
 {
     "Widgetize": {
         "OpenInNewWindow": "Deschide intr-o fereastra noua",
-        "PluginDescription": "Plugin-ul face foarte ușor orice exportul din Piwik Widget în blog-ul dvs., site-ul tau pe iGoogle și Netvibes!",
         "TopLinkTooltip": "Exporta Rapoarte Piwik ca Widgets și încorporeaza tabloul de bord în aplicația ca un iframe."
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/ru.json b/plugins/Widgetize/lang/ru.json
index 89d53ad41c..1d694abafe 100644
--- a/plugins/Widgetize/lang/ru.json
+++ b/plugins/Widgetize/lang/ru.json
@@ -1,7 +1,6 @@
 {
     "Widgetize": {
         "OpenInNewWindow": "Открыть в новом окне",
-        "PluginDescription": "Этот плагин позволяет легко экспортировать любой виджет Веб-аналитики на ваш блог, сайт, iGoogle и Netvibes!",
         "TopLinkTooltip": "Экспортируйте аналитику Piwik в виде виджетов и установите их на своем сайте или веб-сервисе как iframe."
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/sk.json b/plugins/Widgetize/lang/sk.json
index 37d3331a0f..a79668d6f6 100644
--- a/plugins/Widgetize/lang/sk.json
+++ b/plugins/Widgetize/lang/sk.json
@@ -1,6 +1,5 @@
 {
     "Widgetize": {
-        "OpenInNewWindow": "Otvoriť v novom okne",
-        "PluginDescription": "Je veľmi jednoduché vložiť widget na svoj blog, web alebo na stránku iGoogle a Netvibes!"
+        "OpenInNewWindow": "Otvoriť v novom okne"
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/sq.json b/plugins/Widgetize/lang/sq.json
index 10630cf59b..56dbe3cf9c 100644
--- a/plugins/Widgetize/lang/sq.json
+++ b/plugins/Widgetize/lang/sq.json
@@ -1,6 +1,5 @@
 {
     "Widgetize": {
-        "OpenInNewWindow": "Hape në dritare të re",
-        "PluginDescription": "Shtojca e bën shumë të lehtë të eksportohet çfarëdo Widget-i Piwik-u te Blogu juaj, site-i juaj web ose te Igoogle apo Netvibes!"
+        "OpenInNewWindow": "Hape në dritare të re"
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/sr.json b/plugins/Widgetize/lang/sr.json
index 9fdff0d26c..0863c2b5de 100644
--- a/plugins/Widgetize/lang/sr.json
+++ b/plugins/Widgetize/lang/sr.json
@@ -1,7 +1,6 @@
 {
     "Widgetize": {
         "OpenInNewWindow": "Otvori u novom prozoru",
-        "PluginDescription": "Ovaj dodatak vam omogućuje da na veoma jednostavan način prikažete bilo koji od Piwik vidžeta na svom blogu, sajtu, Igoogle ili Netvibes!",
         "TopLinkTooltip": "Prikaži Piwik izveštaje kao vidžete i ugradi konzolu u svoju aplikaciju kao iframe."
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/sv.json b/plugins/Widgetize/lang/sv.json
index 087f5dbf43..7186a034fe 100644
--- a/plugins/Widgetize/lang/sv.json
+++ b/plugins/Widgetize/lang/sv.json
@@ -1,7 +1,6 @@
 {
     "Widgetize": {
         "OpenInNewWindow": "Öppna i ett nytt fönster",
-        "PluginDescription": "Pluginen gör det väldigt enkelt att exportera Piwik widget i din blogg, hemsida eller på iGoogle och Netvibes!",
         "TopLinkTooltip": "Exportera rapporter från Piwik som Widgets och bädda in instrumentpanelen i din app som en iframe."
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/th.json b/plugins/Widgetize/lang/th.json
index 863a858903..748d377a76 100644
--- a/plugins/Widgetize/lang/th.json
+++ b/plugins/Widgetize/lang/th.json
@@ -1,6 +1,5 @@
 {
     "Widgetize": {
-        "OpenInNewWindow": "เปิดในหน้าต่างใหม่",
-        "PluginDescription": "ปลั๊กอินการสามารถทำโดยให้ง่ายต่อการส่งออก Widget ซึ่ง Piwik ใดๆ ก็ตามใน Blog ของคุณ เว็บไซต์หรือบน Igoogle และ Netvibes มาก"
+        "OpenInNewWindow": "เปิดในหน้าต่างใหม่"
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/tl.json b/plugins/Widgetize/lang/tl.json
index cfd5e8e25a..9a17334775 100644
--- a/plugins/Widgetize/lang/tl.json
+++ b/plugins/Widgetize/lang/tl.json
@@ -1,7 +1,6 @@
 {
     "Widgetize": {
         "OpenInNewWindow": "Bukas sa isang bagong window",
-        "PluginDescription": "Ang plugin ay pinapadali ang pag-export ng kahit na anong Piwik widget sa iyong Blog Websit o sa Igoogle at Netvibes!",
         "TopLinkTooltip": "i-export ang ulat ng Piwik bilang isang Widget at ilagay sa Dashboard ng iyong app bilang iframe."
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/tr.json b/plugins/Widgetize/lang/tr.json
index cdc7d81157..3c15469b30 100644
--- a/plugins/Widgetize/lang/tr.json
+++ b/plugins/Widgetize/lang/tr.json
@@ -1,6 +1,5 @@
 {
     "Widgetize": {
-        "OpenInNewWindow": "Yeni pencerede aç",
-        "PluginDescription": "Eklenti, istediğiniz Piwik Widget'ı blogunuzda, sitenizde ya da igoogle ve Netvibes'da kullanmanızı sağlar."
+        "OpenInNewWindow": "Yeni pencerede aç"
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/uk.json b/plugins/Widgetize/lang/uk.json
index d2e06933c2..2678eca3f8 100644
--- a/plugins/Widgetize/lang/uk.json
+++ b/plugins/Widgetize/lang/uk.json
@@ -1,6 +1,5 @@
 {
     "Widgetize": {
-        "OpenInNewWindow": "Відкрити нове вікно",
-        "PluginDescription": "Цей плагін дозволяє дуже легко експортувати будь-який віджет Piwik до свого блогу, веб-сайту або іGoogle чи Netvibes!"
+        "OpenInNewWindow": "Відкрити нове вікно"
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/vi.json b/plugins/Widgetize/lang/vi.json
index aeb820b11f..81bf4d5714 100644
--- a/plugins/Widgetize/lang/vi.json
+++ b/plugins/Widgetize/lang/vi.json
@@ -1,7 +1,6 @@
 {
     "Widgetize": {
         "OpenInNewWindow": "Mở trong một cửa sổ mới",
-        "PluginDescription": "Các plugin giúp nó dễ dàng xuất bất kỳ Widget Piwik nào vào Blog, Website của bạn hoặc trên iGoogle và Netvibes!",
         "TopLinkTooltip": "Xuất các báo cáo Piwik như các Widget và nhúng Bảng điều khiển trong ứng dụng của bạn như một iframe."
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/zh-cn.json b/plugins/Widgetize/lang/zh-cn.json
index 73db0a68c4..ca918a450b 100644
--- a/plugins/Widgetize/lang/zh-cn.json
+++ b/plugins/Widgetize/lang/zh-cn.json
@@ -1,7 +1,6 @@
 {
     "Widgetize": {
         "OpenInNewWindow": "打开一个新窗口",
-        "PluginDescription": "这个插件让您轻松导出任何 Piwik 模块到博客、网站或 iGoogle 及 Netvibes!",
         "TopLinkTooltip": "小工具形式导出 Piwik 报表，将面板以 iframe 形式嵌入您的应用程序中。"
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/lang/zh-tw.json b/plugins/Widgetize/lang/zh-tw.json
index a598459ba7..8b6fca9111 100644
--- a/plugins/Widgetize/lang/zh-tw.json
+++ b/plugins/Widgetize/lang/zh-tw.json
@@ -1,6 +1,5 @@
 {
     "Widgetize": {
-        "PluginDescription": "這個外掛讓你輕鬆輸出任何 Piwik 模組至你的網誌、網站或 iGoogle 及 Netvibes!",
         "TopLinkTooltip": "將 Piwik 報表匯出為組件，並於你的 APP 中以 iframe 嵌入展示板。"
     }
 }
\ No newline at end of file
diff --git a/plugins/Widgetize/stylesheets/widgetize.less b/plugins/Widgetize/stylesheets/widgetize.less
index 47b49ba39a..dafad78d90 100644
--- a/plugins/Widgetize/stylesheets/widgetize.less
+++ b/plugins/Widgetize/stylesheets/widgetize.less
@@ -1,7 +1,10 @@
 .widgetize {
     width: 100%;
-    padding: 15px 15px 0 15px;
     font-size: 13px;
+
+  .top_controls {
+    padding-bottom: 16px;
+  }
 }
 
 .widgetize p {
diff --git a/plugins/Widgetize/templates/index.twig b/plugins/Widgetize/templates/index.twig
index 4763473a62..f5cbbcb10f 100644
--- a/plugins/Widgetize/templates/index.twig
+++ b/plugins/Widgetize/templates/index.twig
@@ -1,12 +1,8 @@
-{% extends 'dashboard.twig' %}
+{% extends 'user.twig' %}
 
 {% block content %}
 
-<div class="pageWrap">
-    <div class="top_controls">
-        {% include "@CoreHome/_siteSelectHeader.twig" %}
-        {% include "@CoreHome/_periodSelect.twig" %}
-    </div>
+<div>
 
     <script type="text/javascript">
     $(function () {
@@ -30,31 +26,40 @@
     });
 </script>
 
+<h2 piwik-enriched-headline>{{ 'General_Widgets'|translate }}</h2>
+
+{% include "@CoreHome/_siteSelectHeader.twig" %}
+
 <div class="widgetize">
     <p>With Piwik, you can export your Web Analytics reports on your blog, website, or intranet dashboard... in one click.
 
+    <h2>Authentication</h2>
     <p>
-        <strong>&rsaquo; Widget authentication:</strong> If you want your widgets to be viewable by everybody, you first have to set the 'view' permissions
+        If you want your widgets to be viewable by everybody, you first have to set the 'view' permissions
         to the anonymous user in the <a href='index.php?module=UsersManager' rel='noreferrer' target='_blank'>Users Management section</a>.
         <br/>Alternatively, if you are publishing widgets on a password protected or private page,
         you don't necessarily have to allow 'anonymous' to view your reports. In this case, you can add the secret token_auth parameter (found in the
         <a href='{{ linkTo({'module':'API','action':'listAllAPI'}) }}' rel='noreferrer' target='_blank'>API page</a>) in the widget URL.
     </p>
 
-    <p><strong>&rsaquo; Widgetize the full dashboard:</strong> You can also display the full Piwik dashboard in your application or website in an IFRAME
+    <h2>Widgetize dashboards</h2>
+    <p>You can also display the full Piwik dashboard in your application or website in an IFRAME
         (<a href='' rel='noreferrer' target='_blank' id='linkDashboardUrl'>see example</a>).
         The date parameter can be set to a specific calendar date, "today", or "yesterday". The period parameter can be set to "day", "week", "month", or
         "year".
         The language parameter can be set to the language code of a translation, such as language=fr.
         For example, for idSite=1 and date=yesterday, you can write: <span id='exportFullDashboard'></span>
-    </p>
-
-    <p>
-        <strong>&rsaquo; Widgetize the all websites dashboard in an IFRAME</strong> (<a href='' rel='noreferrer' target='_blank' id='linkAllWebsitesDashboardUrl'>see example</a>)
+        <br />
+        You can also widgetize the all websites dashboard in an IFRAME (<a href='' rel='noreferrer' target='_blank' id='linkAllWebsitesDashboardUrl'>see example</a>)
         <span id='exportAllWebsitesDashboard'></span>
     </p>
 
-    <p><strong>&rsaquo; Select a report, and copy paste in your page the embed code below the widget:</strong>
+    <h2>Widgetize reports</h2>
+    <p>Select a report, and copy paste in your page the embed code below the widget:
+
+    <div class="top_controls">
+        {% include "@CoreHome/_periodSelect.twig" %}
+    </div>
 
     <div id="widgetPreview"></div>
 
diff --git a/plugins/ZenMode/angularjs/zen-mode/zen-mode.less b/plugins/ZenMode/angularjs/zen-mode/zen-mode.less
index fd13a06f48..7ed7a2ce7f 100644
--- a/plugins/ZenMode/angularjs/zen-mode/zen-mode.less
+++ b/plugins/ZenMode/angularjs/zen-mode/zen-mode.less
@@ -72,7 +72,7 @@
   .Menu--dashboard > .Menu-tabList > li:hover ul {
     display: none;
     z-index: 150;
-    background-color: #FFF;
+    background-color: @theme-color-background-base;
     width: auto;
     border: 1px solid #D9D9D9;
     padding-top: 0px;
diff --git a/plugins/ZenMode/lang/nb.json b/plugins/ZenMode/lang/nb.json
new file mode 100644
index 0000000000..3e29faeaee
--- /dev/null
+++ b/plugins/ZenMode/lang/nb.json
@@ -0,0 +1,5 @@
+{
+    "ZenMode": {
+        "SearchForAnything": "Søk etter noe"
+    }
+}
\ No newline at end of file
diff --git a/plugins/ZenMode/lang/ru.json b/plugins/ZenMode/lang/ru.json
index e941f5c672..176bba72b3 100644
--- a/plugins/ZenMode/lang/ru.json
+++ b/plugins/ZenMode/lang/ru.json
@@ -1,5 +1,9 @@
 {
     "ZenMode": {
-        "Activated": "Режим Дзен активирован"
+        "Activated": "Активирован Дзен режим",
+        "HowToSearch": "Для поиска элементов меню, отчетов и веб-сайтов используйте окно поиска в правом верхнем углу или нажмите \"alt+f\"",
+        "HowToToggleZenMode": "Чтобы выйти или войти в Дзен режим нажмите на стрелку в правом верхнем углу или нажмите \"alt+z\".",
+        "QuickAccessTitle": "Поиск по пунктам меню, отчетам и сайтам",
+        "SearchForAnything": "Поиск везде"
     }
 }
\ No newline at end of file
diff --git a/plugins/ZenMode/plugin.json b/plugins/ZenMode/plugin.json
index af1e145d38..938ed12b29 100644
--- a/plugins/ZenMode/plugin.json
+++ b/plugins/ZenMode/plugin.json
@@ -1,6 +1,6 @@
 {
  "name": "ZenMode",
  "version": "0.1",
- "description": "Switch to the Piwik Zen Mode",
+ "description": "Stay Zen with Piwik. Zen mode keeps things simple. It is available via the icon in the top right of the screen.",
  "theme": false
 }
\ No newline at end of file
diff --git a/tests/LocalTracker.php b/tests/LocalTracker.php
index e0867a746d..6e251e6d21 100755
--- a/tests/LocalTracker.php
+++ b/tests/LocalTracker.php
@@ -5,9 +5,6 @@ use Piwik\Tracker;
 use Piwik\Tracker\Cache;
 
 $GLOBALS['PIWIK_TRACKER_DEBUG'] = false;
-if (!defined('PIWIK_ENABLE_TRACKING')) {
-    define('PIWIK_ENABLE_TRACKING', true);
-}
 
 require_once PIWIK_INCLUDE_PATH . '/core/Tracker.php';
 require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Db.php';
@@ -24,6 +21,10 @@ class Piwik_LocalTracker extends PiwikTracker
 {
     protected function sendRequest($url, $method = 'GET', $data = null, $force = false)
     {
+        if ($this->DEBUG_APPEND_URL) {
+            $url .= $this->DEBUG_APPEND_URL;
+        }
+
         // if doing a bulk request, store the url
         if ($this->doBulkRequests && !$force) {
             $this->storedTrackingActions[] = $url;
@@ -43,7 +44,7 @@ class Piwik_LocalTracker extends PiwikTracker
         }
 
         // unset cached values
-        Cache::$trackerCache = null;
+        Cache::$cache = null;
 
         // save some values
         $plugins = Config::getInstance()->Plugins['Plugins'];
@@ -52,7 +53,7 @@ class Piwik_LocalTracker extends PiwikTracker
         \Piwik\Plugin\Manager::getInstance()->unloadPlugins();
 
         // modify config
-        $GLOBALS['PIWIK_TRACKER_MODE'] = true;
+        \Piwik\SettingsServer::setIsTrackerApiRequest();
         $GLOBALS['PIWIK_TRACKER_LOCAL_TRACKING'] = true;
         Tracker::$initTrackerMode = false;
         Tracker::setTestEnvironment($testEnvironmentArgs, $method);
@@ -73,7 +74,16 @@ class Piwik_LocalTracker extends PiwikTracker
         ob_start();
 
         $localTracker = new Tracker();
-        $localTracker->main($requests);
+        $request = new Tracker\RequestSet();
+        $request->setRequests($requests);
+
+        $handler = Tracker\Handler\Factory::make();
+
+        $response = $localTracker->main($handler, $request);
+
+        if (!is_null($response)) {
+            echo $response;
+        }
 
         $output = ob_get_contents();
 
@@ -85,7 +95,7 @@ class Piwik_LocalTracker extends PiwikTracker
         $_SERVER['HTTP_USER_AGENT'] = $oldUserAgent;
         $_COOKIE = $oldCookie;
         $GLOBALS['PIWIK_TRACKER_LOCAL_TRACKING'] = false;
-        $GLOBALS['PIWIK_TRACKER_MODE'] = false;
+        \Piwik\SettingsServer::setIsNotTrackerApiRequest();
         unset($_GET['bots']);
 
         // reload plugins
diff --git a/tests/PHPUnit/BenchmarkTestCase.php b/tests/PHPUnit/BenchmarkTestCase.php
deleted file mode 100755
index a067a3286a..0000000000
--- a/tests/PHPUnit/BenchmarkTestCase.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-/**
- * Base class for benchmarks.
- *
- * @deprecated since 2.10.0 use Piwik\Tests\Framework\TestCase\BenchmarkTestCase instead
- */
-abstract class BenchmarkTestCase extends \Piwik\Tests\Framework\TestCase\BenchmarkTestCase
-{
-}
diff --git a/tests/PHPUnit/ConsoleCommandTestCase.php b/tests/PHPUnit/ConsoleCommandTestCase.php
deleted file mode 100644
index 138e6e77eb..0000000000
--- a/tests/PHPUnit/ConsoleCommandTestCase.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-namespace Piwik\Tests;
-
-/**
- * @deprecated since 2.10.0 use \Piwik\Tests\Framework\TestCase\ConsoleCommandTestCase instead
- */
-class ConsoleCommandTestCase extends Framework\TestCase\ConsoleCommandTestCase
-{
-}
\ No newline at end of file
diff --git a/tests/PHPUnit/DatabaseTestCase.php b/tests/PHPUnit/DatabaseTestCase.php
deleted file mode 100755
index 70a06ca303..0000000000
--- a/tests/PHPUnit/DatabaseTestCase.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-/**
- * @deprecated since 2.8.0 use \Piwik\Tests\Framework\TestCase\IntegrationTestCase instead
- */
-class DatabaseTestCase extends \Piwik\Tests\Framework\TestCase\IntegrationTestCase
-{
-
-    public static function setUpBeforeClass()
-    {
-        \Piwik\Log::debug('\DatabaseTestCase is deprecated since 2.8.0 extend \Piwik\Tests\Framework\TestCase\IntegrationTestCase instead');
-
-        parent::setUpBeforeClass();
-    }
-}
diff --git a/tests/PHPUnit/FakeAccess.php b/tests/PHPUnit/FakeAccess.php
deleted file mode 100644
index 66f58c795b..0000000000
--- a/tests/PHPUnit/FakeAccess.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-use \Piwik\Tests\Framework\Mock\FakeAccess as MockFakeAccess;
-
-/**
- * FakeAccess for UnitTests
- *
- * @deprecated since 2.10.0 use \Piwik\Tests\Framework\Mock\FakeAccess instead
- */
-class FakeAccess extends MockFakeAccess
-{
-}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixture.php b/tests/PHPUnit/Fixture.php
deleted file mode 100644
index 4d15574808..0000000000
--- a/tests/PHPUnit/Fixture.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-namespace Piwik\Tests;
-use Piwik\Log;
-
-/**
- * @deprecated since 2.8.0 use \Piwik\Tests\Framework\Fixture instead
- */
-class Fixture extends Framework\Fixture
-{
-
-    /** Adds data to Piwik. Creates sites, tracks visits, imports log files, etc. */
-    public function setUp()
-    {
-        Log::warning('Piwik\Tests\Fixture is deprecated, use \Piwik\Tests\Framework\Fixture instead');
-
-        parent::setUp();
-    }
-}
-
-/**
- * @deprecated since 2.8.0 use \Piwik\Tests\Framework\OverrideLogin instead
- */
-class OverrideLogin extends Framework\OverrideLogin
-{
-}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
index e72708a11d..c7e65c7499 100644
--- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
+++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
@@ -27,6 +27,12 @@ class ManySitesImportedLogs extends Fixture
     public $segments = null; // should be array mapping segment name => segment definition
 
     public $addSegments = false;
+    public $includeIisWithCustom = false;
+    public $includeNetscaler = false;
+    public $includeCloudfront = false;
+    public $includeCloudfrontRtmp = false;
+    public $includeNginxJson = false;
+    public $includeApiCustomVarMapping = false;
 
     public static function createAccessInstance()
     {
@@ -87,15 +93,15 @@ class ManySitesImportedLogs extends Fixture
                                             'autoArchive'     => false,
                                             'enabledAllUsers' => true),
 
-//            'segmentPreArchived' => array('definition'=> self::SEGMENT_PRE_ARCHIVED,
-//                                                  'idSite'          => 1,
-//                                                  'autoArchive'     => true,
-//                                                  'enabledAllUsers' => true),
-//
-//            'segmentPreArchivedWithUrlEncoding' => array('definition'=> self::SEGMENT_PRE_ARCHIVED_CONTAINS_ENCODED,
-//                                                  'idSite'          => 1,
-//                                                  'autoArchive'     => true,
-//                                                  'enabledAllUsers' => true)
+            'segmentPreArchived' => array('definition'=> self::SEGMENT_PRE_ARCHIVED,
+                                                  'idSite'          => 1,
+                                                  'autoArchive'     => true,
+                                                  'enabledAllUsers' => true),
+
+            'segmentPreArchivedWithUrlEncoding' => array('definition'=> self::SEGMENT_PRE_ARCHIVED_CONTAINS_ENCODED,
+                                                  'idSite'          => 1,
+                                                  'autoArchive'     => true,
+                                                  'enabledAllUsers' => true)
 
             // fails randomly and I really could not find why.
 //            'segmentOnlySuperuser' => array('definition'      => 'actions>1;customVariablePageName1=='.urlencode('HTTP-code'),
@@ -111,6 +117,30 @@ class ManySitesImportedLogs extends Fixture
         $this->logVisitsWithAllEnabled();
         $this->replayLogFile();
         $this->logCustomFormat();
+
+        if ($this->includeIisWithCustom) {
+            $this->logIisWithCustomFormat();
+        }
+
+        if ($this->includeNetscaler) {
+            $this->logNetscaler();
+        }
+
+        if ($this->includeCloudfront) {
+            $this->logCloudfront();
+        }
+
+        if ($this->includeCloudfrontRtmp) {
+            $this->logCloudfrontRtmp();
+        }
+
+        if ($this->includeNginxJson) {
+            $this->logNginxJsonLog();
+        }
+
+        if ($this->includeApiCustomVarMapping) {
+            $this->logIisWithCustomFormat($mapToCustom = true);
+        }
     }
 
     private function setupSegments()
@@ -229,4 +259,69 @@ class ManySitesImportedLogs extends Fixture
 
         self::executeLogImporter($logFile, $opts);
     }
+
+    private function logIisWithCustomFormat($mapToCustom = false)
+    {
+        $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_custom_iis.log';
+
+        $opts = array('--idsite'           => $this->idSite,
+                      '--token-auth'       => self::getTokenAuth(),
+                      '--w3c-map-field'    => array('date-local=date', 'time-local=time', 'cs(Host)=cs-host', 'TimeTakenMS=time-taken'),
+                      '--enable-http-errors'        => false,
+                      '--enable-http-redirects'     => false);
+
+        if ($mapToCustom) {
+            $opts['--regex-group-to-visit-cvar'] = 'userid=User Name';
+            $opts['--regex-group-to-page-cvar'] = array(
+                'generation_time_milli=Generation Time',
+                'win32_status=Windows Status Code'
+            );
+            $opts['--ignore-groups'] = 'userid';
+            $opts['--w3c-field-regex'] = 'sc-win32-status=(?P<win32_status>\S+)';
+            $opts['--w3c-time-taken-milli'] = false;
+        }
+
+        self::executeLogImporter($logFile, $opts);
+    }
+
+    private function logNetscaler()
+    {
+        $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_netscaler.log';
+
+        $opts = array('--idsite'                    => $this->idSite,
+                      '--token-auth'                => self::getTokenAuth(),
+                      '--w3c-map-field'             => array(),
+                      '--enable-http-redirects'     => false);
+
+        return self::executeLogImporter($logFile, $opts);
+    }
+
+    private function logCloudfront()
+    {
+        $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_cloudfront.log';
+
+        $opts = array('--idsite'                    => $this->idSite,
+                      '--token-auth'                => self::getTokenAuth());
+
+        return self::executeLogImporter($logFile, $opts);
+    }
+
+    private function logCloudfrontRtmp()
+    {
+        $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_cloudfront_rtmp.log';
+
+        $opts = array('--idsite'                    => $this->idSite,
+                      '--token-auth'                => self::getTokenAuth());
+
+        return self::executeLogImporter($logFile, $opts);
+    }
+
+    private function logNginxJsonLog()
+    {
+        $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_nginx_json.log';
+
+        $opts = array('--token-auth' => self::getTokenAuth());
+
+        return self::executeLogImporter($logFile, $opts);
+    }
 }
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php b/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php
index 3c73972a7a..5c3dcc553e 100644
--- a/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php
+++ b/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php
@@ -25,6 +25,7 @@ class SomeVisitsCustomVariablesCampaignsNotHeuristics extends Fixture
 
     public function setUp()
     {
+        $this->setPiwikEnvironmentOverrides();
         $this->setUpWebsitesAndGoals();
         $this->trackVisits();
     }
@@ -33,6 +34,14 @@ class SomeVisitsCustomVariablesCampaignsNotHeuristics extends Fixture
     {
     }
 
+    private function setPiwikEnvironmentOverrides()
+    {
+        $configOverride = $this->getTestEnvironment()->configOverride;
+        $configOverride['Tracker']['create_new_visit_when_website_referrer_changes'] = 1;
+        $this->getTestEnvironment()->configOverride = $configOverride;
+        $this->getTestEnvironment()->save();
+    }
+
     private function setUpWebsitesAndGoals()
     {
         if (!self::siteCreated($idSite = 1)) {
@@ -85,6 +94,11 @@ class SomeVisitsCustomVariablesCampaignsNotHeuristics extends Fixture
         $t3->setUrl('http://example.org/index.htm#pk_campaign=CREDITED TO GOAL PLEASE');
         self::checkResponse($t3->doTrackGoal($idGoal, 42));
 
+        // another action soon after last but with different campaign (should result in new visit)
+        $t3->setForceVisitDateTime(Date::factory($dateTime)->addHour(1.4)->getDatetime());
+        $t3->setUrl('http://example.org/index.html#pk_campaign=CREDITED TO ANOTHER GOAL');
+        self::checkResponse($t3->doTrackGoal($idGoal, 24));
+
         // visitor #4, test for blank referrer campaign keyword
         $t4 = self::getTracker($idSite, $dateTime);
         $t4->setForceVisitDateTime(Date::factory($dateTime)->addHour(3)->getDatetime());
@@ -125,6 +139,44 @@ class SomeVisitsCustomVariablesCampaignsNotHeuristics extends Fixture
         $t4->setUrlReferrer($adwords);
         $t4->setUrl('http://example.org/index.html');
         self::checkResponse($t4->doTrackPageView('Bonjour le monde'));
+
+        // test one action w/ no campaign & then one action w/ a campaign (should result in 2 visits)
+        $t4->setForceVisitDateTime(Date::factory($dateTime)->addHour(10)->getDatetime());
+        $t4->setUrlReferrer('');
+        $t4->setUrl('http://example.org/index.html');
+        self::checkResponse($t4->doTrackPageView('Hallo welt'));
+
+        $t4->setForceVisitDateTime(Date::factory($dateTime)->addHour(10.1)->getDatetime());
+        $t4->setUrl('http://example.org/index.html?utm_campaign=GA Campaign&piwik_kwd=Piwik kwd');
+        self::checkResponse($t4->doTrackPageView('¡hola mundo'));
+
+        // right after last action, visit w/ referrer website (should result in another visit)
+        $t4->setForceVisitDateTime(Date::factory($dateTime)->addHour(10.2)->getDatetime());
+        $t4->setUrlReferrer('http://myreferrerwebsite.com');
+        $t4->setUrl('http://example.org/index.html');
+        self::checkResponse($t4->doTrackPageView('Dia duit ar domhan'));
+
+        // test one action w/ no referrer website & then one action w/ referrer website (should result in 2 visits)
+        $t4->setForceVisitDateTime(Date::factory($dateTime)->addHour(11)->getDatetime());
+        $t4->setUrlReferrer('');
+        $t4->setUrl('http://example.org/index.html');
+        self::checkResponse($t4->doTrackPageView('привет мир'));
+
+        $t4->setForceVisitDateTime(Date::factory($dateTime)->addHour(11.1)->getDatetime());
+        $t4->setUrlReferrer('http://myotherreferrerwebsite.com');
+        $t4->setUrl('http://example.org/index.html');
+        self::checkResponse($t4->doTrackPageView('hallå världen'));
+
+        $t4->setForceVisitDateTime(Date::factory($dateTime)->addHour(11.2)->getDatetime()); // same referrer in next action, should result in just another action
+        $t4->setUrlReferrer('http://myotherreferrerwebsite.com');
+        $t4->setUrl('http://example.org/index.html');
+        self::checkResponse($t4->doTrackPageView('halló heimur'));
+
+        // same visitor as last w/ action soon after last action but w/ new referrer website (should result in another visit)
+        $t4->setForceVisitDateTime(Date::factory($dateTime)->addHour(11.3)->getDatetime());
+        $t4->setUrlReferrer('http://mutantregistration.com');
+        $t4->setUrl('http://example.org/index.html');
+        self::checkResponse($t4->doTrackPageView('העלא וועלט'));
     }
 
     // see updateDomainHash() in piwik.js
diff --git a/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php b/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php
index 0281ac532e..154dc70c2b 100644
--- a/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php
+++ b/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php
@@ -77,7 +77,7 @@ class TwoSitesTwoVisitorsDifferentDays extends Fixture
             $startDate = null, $excludedUserAgents = null, $keepURLFragments = 1); // KEEP_URL_FRAGMENT_YES Yes for idSite 2
     }
 
-    private function trackVisits()
+    public function trackVisits()
     {
         $dateTime = $this->dateTime;
         $idSite = $this->idSite1;
diff --git a/tests/PHPUnit/Fixtures/TwoSitesVisitsInPast.php b/tests/PHPUnit/Fixtures/TwoSitesVisitsInPast.php
index 5e508f9d0b..3ec434d552 100644
--- a/tests/PHPUnit/Fixtures/TwoSitesVisitsInPast.php
+++ b/tests/PHPUnit/Fixtures/TwoSitesVisitsInPast.php
@@ -15,10 +15,10 @@ use Piwik\Tests\Framework\Fixture;
  */
 class TwoSitesVisitsInPast extends Fixture
 {
-    public $dateTimeFirstDateWebsite1 = '2010-03-06 01:22:33';
-    public $dateTimeDateInPastWebsite1 = '2010-01-06 01:22:33';
-    public $dateTimeFirstDateWebsite2 = '2010-01-03 20:22:33';
-    public $dateTimeDateInPastWebsite2 = '2009-10-30 01:22:33';
+    public $dateTimeCreationWebsite1 = '2010-03-06 01:22:33';
+    public $dateTimeInPastWebsite1 = '2010-01-06 01:22:33';
+    public $dateTimeCreationWebsite2 = '2010-01-03 20:22:33';
+    public $dateTimeInPastWebsite2 = '2009-10-30 01:22:33';
     public $idSite = 1;
     public $idSite2 = 2;
 
@@ -36,11 +36,11 @@ class TwoSitesVisitsInPast extends Fixture
     public function setUpWebsitesAndGoals()
     {
         if (!self::siteCreated($idSite = 1)) {
-            self::createWebsite($this->dateTimeFirstDateWebsite1);
+            self::createWebsite($this->dateTimeCreationWebsite1);
         }
 
         if (!self::siteCreated($idSite = 2)) {
-            self::createWebsite($this->dateTimeFirstDateWebsite2);
+            self::createWebsite($this->dateTimeCreationWebsite2);
         }
     }
 
@@ -50,7 +50,7 @@ class TwoSitesVisitsInPast extends Fixture
          * Track Visits normal date for the 2 websites
          */
         // WEBSITE 1
-        $t = self::getTracker($this->idSite, $this->dateTimeFirstDateWebsite1, $defaultInit = true);
+        $t = self::getTracker($this->idSite, $this->dateTimeCreationWebsite1, $defaultInit = true);
         $t->setUrl('http://example.org/category/Page1');
         self::checkResponse($t->doTrackPageView('Hello'));
         $t->setUrl('http://example.org/category/Page2');
@@ -65,7 +65,7 @@ class TwoSitesVisitsInPast extends Fixture
         self::checkResponse($t->doTrackPageView('Hello'));
 
         // WEBSITE 2
-        $t = self::getTracker($this->idSite2, $this->dateTimeFirstDateWebsite2, $defaultInit = true);
+        $t = self::getTracker($this->idSite2, $this->dateTimeCreationWebsite2, $defaultInit = true);
         $t->setIp('156.15.13.12');
         $t->setUrl('http://example.org/category/Page1');
         self::checkResponse($t->doTrackPageView('Hello'));
@@ -84,7 +84,7 @@ class TwoSitesVisitsInPast extends Fixture
          * Track visits in the past (before website creation date) for the 2 websites
          */
         // WEBSITE1
-        $t = self::getTracker($this->idSite, $this->dateTimeDateInPastWebsite1, $defaultInit = true);
+        $t = self::getTracker($this->idSite, $this->dateTimeInPastWebsite1, $defaultInit = true);
         $t->setIp('156.5.55.2');
         $t->setUrl('http://example.org/category/Page1');
         self::checkResponse($t->doTrackPageView('Hello'));
@@ -96,7 +96,7 @@ class TwoSitesVisitsInPast extends Fixture
         self::checkResponse($t->doTrackPageView('Blabla'));
 
         // WEBSITE2
-        $t = self::getTracker($this->idSite2, $this->dateTimeDateInPastWebsite2, $defaultInit = true);
+        $t = self::getTracker($this->idSite2, $this->dateTimeInPastWebsite2, $defaultInit = true);
         $t->setIp('156.52.3.22');
         $t->setUrl('http://example.org/category/Page1');
         self::checkResponse($t->doTrackPageView('Hello'));
@@ -106,7 +106,7 @@ class TwoSitesVisitsInPast extends Fixture
         self::checkResponse($t->doTrackPageView('Hello'));
         $t->setUrl('http://example.org/category/Pageyy');
         self::checkResponse($t->doTrackPageView('Blabla'));
-        $t->setForceVisitDateTime(Date::factory($this->dateTimeDateInPastWebsite2)->addHour(0.1)->getDatetime());
+        $t->setForceVisitDateTime(Date::factory($this->dateTimeInPastWebsite2)->addHour(0.1)->getDatetime());
         $t->setUrl('http://example.org/category/Pageyy');
         self::checkResponse($t->doTrackPageView('Blabla'));
     }
diff --git a/tests/PHPUnit/Fixtures/UITestFixture.php b/tests/PHPUnit/Fixtures/UITestFixture.php
index 5eb6cf2610..cb45ba3b27 100644
--- a/tests/PHPUnit/Fixtures/UITestFixture.php
+++ b/tests/PHPUnit/Fixtures/UITestFixture.php
@@ -54,6 +54,10 @@ class UITestFixture extends SqlDump
         DbHelper::createAnonymousUser();
         UsersManagerAPI::getInstance()->setSuperUserAccess('superUserLogin', true);
         SitesManagerAPI::getInstance()->updateSite(1, null, null, true);
+
+        // create non super user
+        UsersManagerAPI::getInstance()->addUser('oliverqueen', 'smartypants', 'oli@queenindustries.com');
+        UsersManagerAPI::getInstance()->setUserAccess('oliverqueen', 'view', array(1));
     }
 
     public function performSetUp($setupEnvironmentOnly = false)
diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php
index 693b76e280..d5f9aa397c 100644
--- a/tests/PHPUnit/Framework/Fixture.php
+++ b/tests/PHPUnit/Framework/Fixture.php
@@ -8,8 +8,8 @@
 namespace Piwik\Tests\Framework;
 
 use Piwik\Access;
-use Piwik\Cache\StaticCache;
-use Piwik\CacheFile;
+use Piwik\Cache\Backend\File;
+use Piwik\Cache as PiwikCache;
 use Piwik\Common;
 use Piwik\Config;
 use Piwik\DataAccess\ArchiveTableCreator;
@@ -18,6 +18,7 @@ use Piwik\Date;
 use Piwik\Db;
 use Piwik\DbHelper;
 use Piwik\EventDispatcher;
+use Piwik\Ini\IniReader;
 use Piwik\Log;
 use Piwik\Option;
 use Piwik\Piwik;
@@ -33,7 +34,6 @@ use Piwik\Plugins\SitesManager\API as APISitesManager;
 use Piwik\Plugins\UserCountry\LocationProvider;
 use Piwik\Plugins\UsersManager\API as APIUsersManager;
 use Piwik\Plugins\UsersManager\UsersManager;
-use Piwik\Registry;
 use Piwik\ReportRenderer;
 use Piwik\SettingsPiwik;
 use Piwik\SettingsServer;
@@ -189,10 +189,6 @@ class Fixture extends \PHPUnit_Framework_Assert
 
         include "DataFiles/SearchEngines.php";
         include "DataFiles/Socials.php";
-        include "DataFiles/Languages.php";
-        include "DataFiles/Countries.php";
-        include "DataFiles/Currencies.php";
-        include "DataFiles/LanguageToCountry.php";
         include "DataFiles/Providers.php";
 
         if (!$this->isFixtureSetUp()) {
@@ -217,14 +213,13 @@ class Fixture extends \PHPUnit_Framework_Assert
 
         // Make sure translations are loaded to check messages in English
         if ($this->loadTranslations) {
-            Translate::reloadLanguage('en');
+            Translate::loadAllTranslations();
             APILanguageManager::getInstance()->setLanguageForUser('superUserLogin', 'en');
         }
 
         FakeAccess::$superUserLogin = 'superUserLogin';
 
-        SettingsPiwik::$cachedKnownSegmentsToArchive = null;
-        CacheFile::$invalidateOpCacheBeforeRead = true;
+        File::$invalidateOpCacheBeforeRead = true;
 
         if ($this->configureComponents) {
             IPAnonymizer::deactivate();
@@ -244,7 +239,7 @@ class Fixture extends \PHPUnit_Framework_Assert
         $this->getTestEnvironment()->executeSetupTestEnvHook();
         Piwik_TestingEnvironment::addSendMailHook();
 
-        StaticCache::clearAll();
+        PiwikCache::getTransientCache()->flushAll();
 
         if ($this->overwriteExisting
             || !$this->isFixtureSetUp()
@@ -296,6 +291,8 @@ class Fixture extends \PHPUnit_Framework_Assert
         }
 
         $this->clearInMemoryCaches();
+
+        Log::unsetInstance();
     }
 
     public function clearInMemoryCaches()
@@ -304,14 +301,15 @@ class Fixture extends \PHPUnit_Framework_Assert
         Option::clearCache();
         Site::clearCache();
         Cache::deleteTrackerCache();
+        PiwikCache::getTransientCache()->flushAll();
+        PiwikCache::getEagerCache()->flushAll();
         Config::getInstance()->clear();
         ArchiveTableCreator::clear();
         \Piwik\Plugins\ScheduledReports\API::$cache = array();
-        Registry::unsetInstance();
         EventDispatcher::getInstance()->clearAllObservers();
 
         $_GET = $_REQUEST = array();
-        Translate::unloadEnglishTranslation();
+        Translate::reset();
 
         Config::unsetInstance();
 
@@ -758,12 +756,18 @@ class Fixture extends \PHPUnit_Framework_Assert
             . '--url="' . self::getRootUrl() . 'tests/PHPUnit/proxy/" ' # proxy so that piwik uses test config files
         ;
 
-        foreach ($options as $name => $value) {
-            $cmd .= $name;
-            if ($value !== false) {
-                $cmd .= '="' . $value . '"';
+        foreach ($options as $name => $values) {
+            if (!is_array($values)) {
+                $values = array($values);
+            }
+
+            foreach ($values as $value) {
+                $cmd .= $name;
+                if ($value !== false) {
+                    $cmd .= '="' . $value . '"';
+                }
+                $cmd .= ' ';
             }
-            $cmd .= ' ';
         }
 
         $cmd .= '"' . $logFile . '" 2>&1';
@@ -817,7 +821,8 @@ class Fixture extends \PHPUnit_Framework_Assert
 
         $this->log("Dropping database '$dbName'...");
 
-        $config = _parse_ini_file(PIWIK_INCLUDE_PATH . '/config/config.ini.php', true);
+        $iniReader = new IniReader();
+        $config = $iniReader->readFile(PIWIK_INCLUDE_PATH . '/config/config.ini.php');
         $originalDbName = $config['database']['dbname'];
         if ($dbName == $originalDbName
             && $dbName != 'piwik_tests'
@@ -825,7 +830,11 @@ class Fixture extends \PHPUnit_Framework_Assert
             throw new \Exception("Trying to drop original database '$originalDbName'. Something's wrong w/ the tests.");
         }
 
-        DbHelper::dropDatabase($dbName);
+        try {
+            DbHelper::dropDatabase($dbName);
+        } catch (Exception $e) {
+            printf("Dropping database %s failed: %s\n", $dbName, $e->getMessage());
+        }
     }
 
     public function log($message)
diff --git a/tests/PHPUnit/Framework/Mock/Tracker.php b/tests/PHPUnit/Framework/Mock/Tracker.php
new file mode 100644
index 0000000000..64a22b5ee2
--- /dev/null
+++ b/tests/PHPUnit/Framework/Mock/Tracker.php
@@ -0,0 +1,35 @@
+<?php
+/**
+* Piwik - free/libre analytics platform
+*
+* @link http://piwik.org
+* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+*/
+
+namespace Piwik\Tests\Framework\Mock;
+
+class Tracker extends \Piwik\Tracker
+{
+    private $isDebugEnabled = false;
+    private $shouldRecord   = true;
+
+    public function enableDebugMode()
+    {
+        $this->isDebugEnabled = true;
+    }
+
+    public function isDebugModeEnabled()
+    {
+        return $this->isDebugEnabled;
+    }
+
+    public function disableShouldRecordStatistics()
+    {
+        $this->shouldRecord = false;
+    }
+
+    public function shouldRecordStatistics()
+    {
+        return $this->shouldRecord;
+    }
+}
diff --git a/tests/PHPUnit/Framework/Mock/Tracker/Db.php b/tests/PHPUnit/Framework/Mock/Tracker/Db.php
new file mode 100644
index 0000000000..5e0baab51e
--- /dev/null
+++ b/tests/PHPUnit/Framework/Mock/Tracker/Db.php
@@ -0,0 +1,53 @@
+<?php
+/**
+* Piwik - free/libre analytics platform
+*
+* @link http://piwik.org
+* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+*/
+
+namespace Piwik\Tests\Framework\Mock\Tracker;
+
+use Piwik\Tracker\Db\Pdo\Mysql;
+
+class Db extends Mysql
+{
+    public $commitTransactionId = false;
+    public $rollbackTransactionId = false;
+    public $beganTransaction = false;
+    public $connectCalled = false;
+
+    public function __construct($dbInfo, $driverName = 'mysql')
+    {
+        $this->dsn = 'testdrivername';
+        $this->username = 'testuser';
+        $this->password = 'testpassword';
+        $this->charset = 'testcharset';
+    }
+
+    public function connect()
+    {
+        $this->connectCalled = true;
+    }
+
+    /**
+     * Start Transaction
+     * @return string TransactionID
+     */
+    public function beginTransaction()
+    {
+        $this->beganTransaction = true;
+        return 'my4929transactionid';
+    }
+
+    public function commit($xid)
+    {
+        $this->commitTransactionId = $xid;
+    }
+
+    public function rollBack($xid)
+    {
+        $this->rollbackTransactionId = $xid;
+    }
+
+}
diff --git a/tests/PHPUnit/Framework/Mock/Tracker/Handler.php b/tests/PHPUnit/Framework/Mock/Tracker/Handler.php
new file mode 100644
index 0000000000..b1f241deef
--- /dev/null
+++ b/tests/PHPUnit/Framework/Mock/Tracker/Handler.php
@@ -0,0 +1,70 @@
+<?php
+/**
+* Piwik - free/libre analytics platform
+*
+* @link http://piwik.org
+* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+*/
+
+namespace Piwik\Tests\Framework\Mock\Tracker;
+
+use Exception;
+use Piwik\Tracker;
+use Piwik\Tracker\RequestSet as TrackerRequestSet;
+
+class Handler extends \Piwik\Tracker\Handler
+{
+    public $isInit = false;
+    public $isInitTrackingRequests = false;
+    public $isOnStartTrackRequests = false;
+    public $isProcessed = false;
+    public $isOnAllRequestsTracked = false;
+    public $isOnException = false;
+    public $isFinished = false;
+    public $output = 'My Rendered Content';
+
+    private $doTriggerExceptionInProcess = false;
+
+    public function init(Tracker $tracker, TrackerRequestSet $TrackerRequestSet)
+    {
+        $this->isInit = true;
+    }
+
+    public function enableTriggerExceptionInProcess()
+    {
+        $this->doTriggerExceptionInProcess = true;
+    }
+
+    public function onStartTrackRequests(Tracker $tracker, TrackerRequestSet $TrackerRequestSet)
+    {
+        $this->isOnStartTrackRequests = true;
+    }
+
+    public function process(Tracker $tracker, TrackerRequestSet $TrackerRequestSet)
+    {
+        if ($this->doTriggerExceptionInProcess) {
+            throw new Exception('My Exception During Process');
+        }
+
+        $this->isProcessed = true;
+    }
+
+    public function onAllRequestsTracked(Tracker $tracker, TrackerRequestSet $TrackerRequestSet)
+    {
+        $this->isOnAllRequestsTracked = true;
+    }
+
+    public function onException(Tracker $tracker, TrackerRequestSet $TrackerRequestSet, Exception $e)
+    {
+        $this->isOnException = true;
+        $this->output = $e->getMessage();
+    }
+
+    public function finish(Tracker $tracker, TrackerRequestSet $TrackerRequestSet)
+    {
+        $this->isFinished = true;
+
+        return $this->output;
+    }
+
+}
diff --git a/tests/PHPUnit/Framework/Mock/Tracker/RequestSet.php b/tests/PHPUnit/Framework/Mock/Tracker/RequestSet.php
new file mode 100644
index 0000000000..bbaf933572
--- /dev/null
+++ b/tests/PHPUnit/Framework/Mock/Tracker/RequestSet.php
@@ -0,0 +1,32 @@
+<?php
+/**
+* Piwik - free/libre analytics platform
+*
+* @link http://piwik.org
+* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+*/
+
+namespace Piwik\Tests\Framework\Mock\Tracker;
+
+use Exception;
+use Piwik\Tracker;
+
+class RequestSet extends \Piwik\Tracker\RequestSet
+{
+    private $throwExceptionOnInit = false;
+
+    public function enableThrowExceptionOnInit()
+    {
+        $this->throwExceptionOnInit = true;
+    }
+
+    public function initRequestsAndTokenAuth()
+    {
+        if ($this->throwExceptionOnInit) {
+            throw new Exception('Init requests and token auth exception', 493);
+        }
+
+        parent::initRequestsAndTokenAuth();
+    }
+
+}
diff --git a/tests/PHPUnit/Framework/Mock/Tracker/Response.php b/tests/PHPUnit/Framework/Mock/Tracker/Response.php
new file mode 100644
index 0000000000..076d37c9f0
--- /dev/null
+++ b/tests/PHPUnit/Framework/Mock/Tracker/Response.php
@@ -0,0 +1,51 @@
+<?php
+/**
+* Piwik - free/libre analytics platform
+*
+* @link http://piwik.org
+* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+*/
+
+namespace Piwik\Tests\Framework\Mock\Tracker;
+
+use Exception;
+use Piwik\Tracker;
+
+class Response extends \Piwik\Tracker\Response
+{
+    public $statusCode = 200;
+    public $exception;
+    public $isInit = false;
+    public $isExceptionOutput = false;
+    public $isResponseOutput = false;
+    public $isSend = false;
+
+    private $output = 'My Dummy Content';
+
+    public function init(Tracker $tracker)
+    {
+        $this->isInit = true;
+    }
+
+    public function getOutput()
+    {
+        $this->isSend = true;
+
+        return $this->output;
+    }
+
+    public function outputException(Tracker $tracker, Exception $e, $statusCode)
+    {
+        $this->isExceptionOutput = true;
+        $this->statusCode = $statusCode;
+        $this->exception = $e;
+
+        $this->output = $e->getMessage();
+    }
+
+    public function outputResponse(Tracker $tracker)
+    {
+        $this->isResponseOutput = true;
+    }
+
+}
diff --git a/tests/PHPUnit/Framework/Mock/Tracker/ScheduledTasksRunner.php b/tests/PHPUnit/Framework/Mock/Tracker/ScheduledTasksRunner.php
new file mode 100644
index 0000000000..2f3d0fbb38
--- /dev/null
+++ b/tests/PHPUnit/Framework/Mock/Tracker/ScheduledTasksRunner.php
@@ -0,0 +1,28 @@
+<?php
+/**
+* Piwik - free/libre analytics platform
+*
+* @link http://piwik.org
+* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+*/
+
+namespace Piwik\Tests\Framework\Mock\Tracker;
+
+use Piwik\Tracker;
+
+class ScheduledTasksRunner extends Tracker\ScheduledTasksRunner
+{
+    public $shouldRun = true;
+    public $ranScheduledTasks = false;
+
+    public function shouldRun(Tracker $tracker)
+    {
+        return $this->shouldRun;
+    }
+
+    public function runScheduledTasks()
+    {
+        $this->ranScheduledTasks = true;
+    }
+
+}
diff --git a/tests/PHPUnit/Framework/TestCase/IntegrationTestCase.php b/tests/PHPUnit/Framework/TestCase/IntegrationTestCase.php
index becfac3a18..bbd76f453f 100644
--- a/tests/PHPUnit/Framework/TestCase/IntegrationTestCase.php
+++ b/tests/PHPUnit/Framework/TestCase/IntegrationTestCase.php
@@ -8,10 +8,10 @@
 
 namespace Piwik\Tests\Framework\TestCase;
 
-use Piwik\Cache\StaticCache;
 use Piwik\Config;
 use Piwik\Db;
 use Piwik\Tests\Framework\Fixture;
+use Piwik\Cache as PiwikCache;
 
 /**
  * Tests extending IntegrationTestCase are much slower to run: the setUp will
@@ -56,6 +56,7 @@ abstract class IntegrationTestCase extends SystemTestCase
     {
         static::configureFixture(static::$fixture);
         parent::setUpBeforeClass();
+        static::beforeTableDataCached();
 
         self::$tableData = self::getDbTablesWithData();
     }
@@ -78,7 +79,8 @@ abstract class IntegrationTestCase extends SystemTestCase
             self::restoreDbTables(self::$tableData);
         }
 
-        StaticCache::clearAll();
+        PiwikCache::getEagerCache()->flushAll();
+        PiwikCache::getTransientCache()->flushAll();
     }
 
     /**
@@ -86,9 +88,7 @@ abstract class IntegrationTestCase extends SystemTestCase
      */
     public function tearDown()
     {
-        StaticCache::clearAll();
-
-        self::$fixture->clearInMemoryCaches();
+        static::$fixture->clearInMemoryCaches();
 
         parent::tearDown();
     }
@@ -99,6 +99,11 @@ abstract class IntegrationTestCase extends SystemTestCase
         $fixture->createSuperUser     = false;
         $fixture->configureComponents = false;
     }
+
+    protected static function beforeTableDataCached()
+    {
+        // empty
+    }
 }
 
 IntegrationTestCase::$fixture = new Fixture();
\ No newline at end of file
diff --git a/tests/PHPUnit/Framework/TestCase/SystemTestCase.php b/tests/PHPUnit/Framework/TestCase/SystemTestCase.php
index 8b85f255aa..fdec9cb09b 100755
--- a/tests/PHPUnit/Framework/TestCase/SystemTestCase.php
+++ b/tests/PHPUnit/Framework/TestCase/SystemTestCase.php
@@ -12,7 +12,7 @@ use Exception;
 use Piwik\ArchiveProcessor\Rules;
 use Piwik\Common;
 use Piwik\Config;
-use Piwik\DataAccess\ArchiveTableCreator;
+use Piwik\Container\StaticContainer;
 use Piwik\Db;
 use Piwik\DbHelper;
 use Piwik\ReportRenderer;
@@ -24,6 +24,7 @@ use Piwik\Translate;
 use Piwik\Log;
 use PHPUnit_Framework_TestCase;
 use Piwik\Tests\Framework\Fixture;
+use Piwik\Translation\Translator;
 
 require_once PIWIK_INCLUDE_PATH . '/libs/PiwikTracker/PiwikTracker.php';
 
@@ -46,6 +47,9 @@ abstract class SystemTestCase extends PHPUnit_Framework_TestCase
     protected $missingExpectedFiles = array();
     protected $comparisonFailures = array();
 
+    /**
+     * @var Fixture
+     */
     public static $fixture;
 
     public static function setUpBeforeClass()
@@ -395,7 +399,7 @@ abstract class SystemTestCase extends PHPUnit_Framework_TestCase
      * Assert that the response of an API method call is the same as the contents in an
      * expected file.
      *
-     * @param string $api ie, `"UserSettings.getBrowser"`
+     * @param string $api ie, `"DevicesDetection.getBrowsers"`
      * @param array $queryParams Query parameters to send to the API.
      */
     public function assertApiResponseEqualsExpected($apiMethod, $queryParams)
@@ -489,8 +493,9 @@ abstract class SystemTestCase extends PHPUnit_Framework_TestCase
     {
         if ($this->lastLanguage != $langId) {
             $_GET['language'] = $langId;
-            Translate::reset();
-            Translate::reloadLanguage($langId);
+            /** @var Translator $translator */
+            $translator = StaticContainer::get('Piwik\Translation\Translator');
+            $translator->setCurrentLanguage($langId);
         }
 
         $this->lastLanguage = $langId;
@@ -528,6 +533,11 @@ abstract class SystemTestCase extends PHPUnit_Framework_TestCase
      */
     protected static function restoreDbTables($tables)
     {
+        $db = Db::fetchOne("SELECT DATABASE()");
+        if (empty($db)) {
+            Db::exec("USE " . Config::getInstance()->database_tests['dbname']);
+        }
+
         DbHelper::truncateAllTables();
 
         // insert data
@@ -602,3 +612,5 @@ abstract class SystemTestCase extends PHPUnit_Framework_TestCase
     }
 
 }
+
+SystemTestCase::$fixture = new \Piwik\Tests\Framework\Fixture();
diff --git a/tests/PHPUnit/Framework/TestCase/UnitTestCase.php b/tests/PHPUnit/Framework/TestCase/UnitTestCase.php
index e12bec330f..f08eaa1953 100755
--- a/tests/PHPUnit/Framework/TestCase/UnitTestCase.php
+++ b/tests/PHPUnit/Framework/TestCase/UnitTestCase.php
@@ -7,6 +7,7 @@
  */
 
 namespace Piwik\Tests\Framework\TestCase;
+use Piwik\EventDispatcher;
 use Piwik\Tests\Framework\Mock\File;
 
 
@@ -21,6 +22,7 @@ abstract class UnitTestCase extends \PHPUnit_Framework_TestCase
     {
         parent::setUp();
         File::reset();
+        EventDispatcher::getInstance()->clearAllObservers();
     }
 
     public function tearDown()
diff --git a/tests/PHPUnit/Framework/TestRequest/Collection.php b/tests/PHPUnit/Framework/TestRequest/Collection.php
index e05ef7d5cd..219a68f83a 100644
--- a/tests/PHPUnit/Framework/TestRequest/Collection.php
+++ b/tests/PHPUnit/Framework/TestRequest/Collection.php
@@ -12,6 +12,7 @@ use Piwik\API\DocumentationGenerator;
 use Piwik\API\Proxy;
 use Piwik\API\Request;
 use Piwik\Tests\Framework\TestCase\SystemTestCase;
+use Piwik\Url;
 use Piwik\UrlHelper;
 use \Exception;
 
@@ -151,6 +152,9 @@ class Collection
         if (empty($requestUrls)
             || $approximateCountApiToCall > $countUrls
         ) {
+            $requestUrls = array_map(function ($params) {
+                return is_string($params) ? $params : Url::getQueryStringFromParameters($params);
+            }, $requestUrls);
             throw new Exception("Only generated $countUrls API calls to test but was expecting more for this test.\n" .
                     "Want to test APIs: " . implode(", ", $this->apiToCall) . ")\n" .
                     "But only generated these URLs: \n" . implode("\n", $requestUrls) . ")\n"
diff --git a/tests/PHPUnit/Framework/TestRequest/Response.php b/tests/PHPUnit/Framework/TestRequest/Response.php
index 3d0b1622d4..676c859b81 100644
--- a/tests/PHPUnit/Framework/TestRequest/Response.php
+++ b/tests/PHPUnit/Framework/TestRequest/Response.php
@@ -161,6 +161,7 @@ class Response
             'goalTimePretty',
             'serverTimePretty',
             'visitServerHour',
+            'timestamp',
             'date',
             'prettyDate',
             'serverDateTimePrettyFirstAction'
diff --git a/tests/PHPUnit/Integration/ArchiveTest.php b/tests/PHPUnit/Integration/ArchiveTest.php
new file mode 100644
index 0000000000..b22a835f34
--- /dev/null
+++ b/tests/PHPUnit/Integration/ArchiveTest.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+namespace Piwik\Tests\Integration;
+
+use Piwik\Archive;
+use Piwik\ArchiveProcessor\Rules;
+use Piwik\Common;
+use Piwik\Config;
+use Piwik\DataAccess\ArchiveTableCreator;
+use Piwik\Date;
+use Piwik\Db;
+use Piwik\Piwik;
+use Piwik\Tests\Fixtures\OneVisitorTwoVisits;
+use Piwik\Tests\Framework\Fixture;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+
+/**
+ * @group Core
+ */
+class ArchiveTest extends IntegrationTestCase
+{
+    /**
+     * @var OneVisitorTwoVisits
+     */
+    public static $fixture;
+
+    public function tearDown()
+    {
+        parent::tearDown();
+
+        unset($_GET['trigger']);
+    }
+
+    protected static function configureFixture($fixture)
+    {
+        $fixture->createSuperUser = true;
+    }
+
+    protected static function beforeTableDataCached()
+    {
+        $date = Date::factory('2010-03-01');
+
+        $archiveTableCreator = new ArchiveTableCreator();
+        $archiveTableCreator->getBlobTable($date);
+        $archiveTableCreator->getNumericTable($date);
+    }
+
+    public function getForceOptionsForForceArchivingOnBrowserRequest()
+    {
+        return array(
+            array(1),
+            array(null)
+        );
+    }
+
+    /**
+     * @dataProvider getForceOptionsForForceArchivingOnBrowserRequest
+     */
+    public function test_ArchivingIsLaunchedForRanges_WhenForceOnBrowserRequest_IsTruthy($optionValue)
+    {
+        $this->archiveDataForIndividualDays();
+
+        Config::getInstance()->General['archiving_range_force_on_browser_request'] = $optionValue;
+        Rules::setBrowserTriggerArchiving(false);
+
+        $data = $this->initiateArchivingForRange();
+
+        $this->assertNotEmpty($data);
+        $this->assertArchiveTablesAreNotEmpty('2010_03');
+    }
+
+    public function test_ArchivingIsNotLaunchedForRanges_WhenForceOnBrowserRequest_IsFalse()
+    {
+        $this->archiveDataForIndividualDays();
+
+        Config::getInstance()->General['archiving_range_force_on_browser_request'] = 0;
+        Rules::setBrowserTriggerArchiving(false);
+
+        $data = $this->initiateArchivingForRange();
+
+        $this->assertEmpty($data);
+        $this->assertArchiveTablesAreEmpty('2010_03');
+    }
+
+    public function test_ArchiveIsLaunched_WhenForceOnBrowserRequest_IsFalse_AndArchivePhpTriggered()
+    {
+        $this->archiveDataForIndividualDays();
+
+        Config::getInstance()->General['archiving_range_force_on_browser_request'] = 0;
+        $_GET['trigger'] = 'archivephp';
+        Rules::setBrowserTriggerArchiving(false);
+
+        $data = $this->initiateArchivingForRange();
+
+        $this->assertNotEmpty($data);
+        $this->assertArchiveTablesAreNotEmpty('2010_03');
+    }
+
+    private function assertArchiveTablesAreNotEmpty($tableMonth)
+    {
+        $this->assertNotEquals(0, $this->getRangeArchiveTableCount('archive_numeric', $tableMonth));
+    }
+
+    private function assertArchiveTablesAreEmpty($tableMonth)
+    {
+        $this->assertEquals(0, $this->getRangeArchiveTableCount('archive_numeric', $tableMonth));
+        $this->assertEquals(0, $this->getRangeArchiveTableCount('archive_blob', $tableMonth));
+    }
+
+    private function getRangeArchiveTableCount($tableType, $tableMonth)
+    {
+        $table = Common::prefixTable($tableType . '_' . $tableMonth);
+        return Db::fetchOne("SELECT COUNT(*) FROM $table WHERE period = " . Piwik::$idPeriods['range']);
+    }
+
+    private function initiateArchivingForRange()
+    {
+        $archive = Archive::build(self::$fixture->idSite, 'range', '2010-03-04,2010-03-07');
+        return $archive->getNumeric('nb_visits');
+    }
+
+    private function archiveDataForIndividualDays()
+    {
+        $archive = Archive::build(self::$fixture->idSite, 'day', '2010-03-04,2010-03-07');
+        return $archive->getNumeric('nb_visits');
+    }
+}
+
+ArchiveTest::$fixture = new OneVisitorTwoVisits();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/CacheIdTest.php b/tests/PHPUnit/Integration/CacheIdTest.php
new file mode 100644
index 0000000000..b549bc9668
--- /dev/null
+++ b/tests/PHPUnit/Integration/CacheIdTest.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Integration;
+
+use Piwik\CacheId;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+use Piwik\Translate;
+
+/**
+ * @group Cache
+ * @group CacheId
+ */
+class CacheIdTest extends IntegrationTestCase
+{
+    public function setUp()
+    {
+        Translate::loadAllTranslations();
+    }
+
+    public function tearDown()
+    {
+        Translate::reset();
+    }
+
+    public function test_languageAware_shouldAppendTheLoadedLanguage()
+    {
+        $result = CacheId::languageAware('myrandomkey');
+
+        $this->assertEquals('myrandomkey-en', $result);
+    }
+
+    public function test_pluginAware_shouldAppendLoadedPluginsAndLanguage()
+    {
+        $result = CacheId::pluginAware('myrandomkey');
+
+        $parts = explode('-', $result);
+
+        $this->assertCount(3, $parts);
+        $this->assertEquals('myrandomkey', $parts[0]);
+        $this->assertEquals(32, strlen($parts[1]), $parts[1] . ' is not a MD5 hash');
+        $this->assertEquals('en', $parts[2]);
+    }
+}
diff --git a/tests/PHPUnit/Integration/CacheTest.php b/tests/PHPUnit/Integration/CacheTest.php
new file mode 100644
index 0000000000..894a6e4695
--- /dev/null
+++ b/tests/PHPUnit/Integration/CacheTest.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Integration;
+
+use Piwik\Cache;
+use Piwik\Container\StaticContainer;
+use Piwik\Piwik;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+use Piwik\Translate;
+
+/**
+ * @group Cache
+ */
+class CacheTest extends IntegrationTestCase
+{
+    public function setUp()
+    {
+    }
+
+    public function tearDown()
+    {
+    }
+
+    public function test_getLazyCache_shouldCreateAnInstanceOfLazy()
+    {
+        $cache = Cache::getLazyCache();
+
+        $this->assertTrue($cache instanceof Cache\Lazy);
+    }
+
+    public function test_getLazyCache_shouldAlwaysReturnTheSameInstance()
+    {
+        $cache1 = Cache::getLazyCache();
+        $cache2 = Cache::getLazyCache();
+
+        $this->assertSame($cache1, $cache2);
+    }
+
+    public function test_getEagerCache_shouldCreateAnInstanceOfEager()
+    {
+        $cache = Cache::getEagerCache();
+
+        $this->assertTrue($cache instanceof Cache\Eager);
+    }
+
+    public function test_getEagerCache_shouldAlwaysReturnTheSameInstance()
+    {
+        $cache1 = Cache::getEagerCache();
+        $cache2 = Cache::getEagerCache();
+
+        $this->assertSame($cache1, $cache2);
+    }
+
+    public function test_getEagerCache_shouldPersistOnceEventWasTriggered()
+    {
+        StaticContainer::clearContainer();
+        $storageId = 'eagercache-test-ui';
+        $cache = Cache::getEagerCache();
+        $cache->save('test', 'mycontent'); // make sure something was changed, otherwise it won't save anything
+
+        /** @var \Piwik\Cache\Backend $backend */
+        $backend = StaticContainer::get('Piwik\Cache\Backend');
+        $this->assertFalse($backend->doContains($storageId));
+
+        Piwik::postEvent('Request.dispatch.end'); // should trigger save
+
+        $this->assertTrue($backend->doContains($storageId));
+    }
+
+    public function test_getTransientCache_shouldCreateAnInstanceOfTransient()
+    {
+        $cache = Cache::getTransientCache();
+
+        $this->assertTrue($cache instanceof Cache\Transient);
+    }
+
+    public function test_getTransientCache_shouldAlwaysReturnTheSameInstance()
+    {
+        $cache1 = Cache::getTransientCache();
+        $cache2 = Cache::getTransientCache();
+
+        $this->assertSame($cache1, $cache2);
+    }
+
+    public function test_flushAll_shouldActuallyFlushAllCaches()
+    {
+        $cache1 = Cache::getTransientCache();
+        $cache2 = Cache::getLazyCache();
+        $cache3 = Cache::getEagerCache();
+
+        $cache1->save('test1', 'content');
+        $cache2->save('test2', 'content');
+        $cache3->save('test3', 'content');
+
+        $this->assertTrue($cache1->contains('test1'));
+        $this->assertTrue($cache2->contains('test2'));
+        $this->assertTrue($cache3->contains('test3'));
+
+        Cache::flushAll();
+
+        $this->assertFalse($cache1->contains('test1'));
+        $this->assertFalse($cache2->contains('test2'));
+        $this->assertFalse($cache3->contains('test3'));
+    }
+
+}
diff --git a/tests/PHPUnit/Integration/CronArchive/SharedSiteIdsTest.php b/tests/PHPUnit/Integration/CronArchive/SharedSiteIdsTest.php
index 6e3959ceda..8ad12f8b8b 100644
--- a/tests/PHPUnit/Integration/CronArchive/SharedSiteIdsTest.php
+++ b/tests/PHPUnit/Integration/CronArchive/SharedSiteIdsTest.php
@@ -26,11 +26,20 @@ class SharedSiteIdsTest extends IntegrationTestCase
     {
         parent::setUp();
 
+        if (! SharedSiteIds::isSupported()) {
+            $this->markTestSkipped('Not supported on this platform');
+            return;
+        }
+
         $this->sharedSiteIds = new SharedSiteIds(array(1,2,5,9));
     }
 
     public function tearDown()
     {
+        if (! SharedSiteIds::isSupported()) {
+            return;
+        }
+
         $siteIdsToCleanup = new SharedSiteIds(array());
         $siteIdsToCleanup->setSiteIdsToArchive(array());
 
diff --git a/tests/PHPUnit/Integration/CronArchiveTest.php b/tests/PHPUnit/Integration/CronArchiveTest.php
new file mode 100644
index 0000000000..a85f227802
--- /dev/null
+++ b/tests/PHPUnit/Integration/CronArchiveTest.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Integration;
+
+use Piwik\CronArchive;
+use Piwik\DataAccess\ArchiveInvalidator;
+use Piwik\Date;
+use Piwik\Db;
+use Piwik\Plugins\CoreAdminHome\tests\Framework\Mock\API;
+use Piwik\Tests\Framework\Fixture;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+
+class TestCronArchive extends CronArchive
+{
+
+    protected function checkPiwikUrlIsValid()
+    {
+
+    }
+
+    protected function initPiwikHost($piwikUrl = false)
+    {
+
+    }
+}
+
+/**
+ * @group Archiver
+ * @group CronArchive
+ */
+class CronArchiveTest extends IntegrationTestCase
+{
+    public function setUp()
+    {
+        parent::setUp();
+
+        Fixture::createWebsite('2014-12-12 00:01:02');
+        Fixture::createWebsite('2014-12-12 00:01:02');
+    }
+
+    public function test_getColumnNamesFromTable()
+    {
+        $ar = new ArchiveInvalidator();
+        $ar->rememberToInvalidateArchivedReportsLater(1, Date::factory('2014-04-05'));
+        $ar->rememberToInvalidateArchivedReportsLater(2, Date::factory('2014-04-05'));
+        $ar->rememberToInvalidateArchivedReportsLater(2, Date::factory('2014-04-06'));
+
+        $api = API::getInstance();
+
+        ob_start();
+        $cronarchive = new TestCronArchive(Fixture::getRootUrl() . 'tests/PHPUnit/proxy/index.php');
+        $cronarchive->setApiToInvalidateArchivedReport($api);
+        $cronarchive->init();
+        ob_end_clean();
+
+        $expectedInvalidations = array(
+            array(array(1,2), '2014-04-05'),
+            array(array(2), '2014-04-06')
+        );
+
+        $this->assertEquals($expectedInvalidations, $api->getInvalidatedReports());
+    }
+}
diff --git a/tests/PHPUnit/Integration/DataAccess/ActionsTest.php b/tests/PHPUnit/Integration/DataAccess/ActionsTest.php
new file mode 100644
index 0000000000..77ce6b08f1
--- /dev/null
+++ b/tests/PHPUnit/Integration/DataAccess/ActionsTest.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+namespace Piwik\Tests\Integration\DataAccess;
+
+use Piwik\Common;
+use Piwik\DataAccess\Actions;
+use Piwik\Db;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+
+/**
+ * @group Core
+ */
+class ActionsTest extends IntegrationTestCase
+{
+    /**
+     * @var Actions
+     */
+    private $actionsAccess;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->insertTestActions();
+
+        $this->actionsAccess = new Actions();
+    }
+
+    public function test_delete_DeletesSpecifiedActions()
+    {
+        $this->actionsAccess->delete(array(2,3,4,5));
+
+        $expectedActions = array(
+            array('name' => 'action1')
+        );
+        $actualActions = Db::fetchAll("SELECT name FROM ".Common::prefixTable('log_action'));
+        $this->assertEquals($expectedActions, $actualActions);
+    }
+
+    public function test_delete_ConvertsIdActionsToInt()
+    {
+        $this->actionsAccess->delete(array("2", "0, 1"));
+
+        $expectedActions = array(
+            array('name' => 'action1'),
+            array('name' => 'action3')
+        );
+        $actualActions = Db::fetchAll("SELECT name FROM ".Common::prefixTable('log_action'));
+        $this->assertEquals($expectedActions, $actualActions);
+    }
+
+    private function insertTestActions()
+    {
+        Db::query("INSERT INTO " . Common::prefixTable('log_action') . " (name, type, hash)
+                        VALUES ('action1', 1, CRC32('action1')),
+                               ('action2', 1, CRC32('action2')),
+                               ('action3', 1, CRC32('action3'))");
+    }
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php b/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php
new file mode 100644
index 0000000000..fbf2c0b7a9
--- /dev/null
+++ b/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php
@@ -0,0 +1,181 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Integration\DataAccess;
+
+use Piwik\Date;
+use Piwik\Option;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+use Piwik\DataAccess\ArchiveInvalidator;
+
+/**
+ * @group Archiver
+ * @group ArchiveInvalidator
+ * @group DataAccess
+ */
+class ArchiveInvalidatorTest extends IntegrationTestCase
+{
+    /**
+     * @var ArchiveInvalidator
+     */
+    private $invalidator;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->invalidator = new ArchiveInvalidator();
+    }
+
+    public function test_rememberToInvalidateArchivedReportsLater_shouldCreateAnEntryInCaseThereIsNoneYet()
+    {
+        $key = 'report_to_invalidate_2_2014-04-05';
+        $this->assertFalse(Option::get($key));
+
+        $this->rememberReport(2, '2014-04-05');
+
+        $this->assertSame('1', Option::get($key));
+    }
+
+    public function test_rememberToInvalidateArchivedReportsLater_shouldNotCreateEntryTwice()
+    {
+        $this->rememberReport(2, '2014-04-05');
+        $this->rememberReport(2, '2014-04-05');
+        $this->rememberReport(2, '2014-04-05');
+
+        $this->assertCount(1, Option::getLike('report_to_invalidate%'));
+    }
+
+    public function test_getRememberedArchivedReportsThatShouldBeInvalidated_shouldNotReturnEntriesInCaseNoneAreRemembered()
+    {
+        $reports = $this->invalidator->getRememberedArchivedReportsThatShouldBeInvalidated();
+
+        $this->assertSame(array(), $reports);
+    }
+
+    public function test_getRememberedArchivedReportsThatShouldBeInvalidated_shouldGroupEntriesByDate()
+    {
+        $this->rememberReportsForManySitesAndDates();
+
+        $reports = $this->invalidator->getRememberedArchivedReportsThatShouldBeInvalidated();
+
+        $this->assertSame($this->getRememberedReportsByDate(), $reports);
+    }
+
+    public function test_forgetRememberedArchivedReportsToInvalidateForSite_shouldNotDeleteAnythingInCaseNoReportForThatSite()
+    {
+        $this->rememberReportsForManySitesAndDates();
+
+        $this->invalidator->forgetRememberedArchivedReportsToInvalidateForSite(10);
+        $reports = $this->invalidator->getRememberedArchivedReportsThatShouldBeInvalidated();
+
+        $this->assertSame($this->getRememberedReportsByDate(), $reports);
+    }
+
+    public function test_forgetRememberedArchivedReportsToInvalidateForSite_shouldOnlyDeleteReportsBelongingToThatSite()
+    {
+        $this->rememberReportsForManySitesAndDates();
+
+        $this->invalidator->forgetRememberedArchivedReportsToInvalidateForSite(7);
+        $reports = $this->invalidator->getRememberedArchivedReportsThatShouldBeInvalidated();
+
+        $expected = array(
+            '2014-04-05' => array(1, 2, 4),
+            '2014-05-05' => array(2, 5),
+            '2014-04-06' => array(3)
+        );
+        $this->assertSame($expected, $reports);
+    }
+
+    public function test_forgetRememberedArchivedReportsToInvalidate_shouldNotForgetAnythingIfThereIsNoMatch()
+    {
+        $this->rememberReportsForManySitesAndDates();
+
+        // site does not match
+        $this->invalidator->forgetRememberedArchivedReportsToInvalidate(10, Date::factory('2014-04-05'));
+        $reports = $this->invalidator->getRememberedArchivedReportsThatShouldBeInvalidated();
+        $this->assertSame($this->getRememberedReportsByDate(), $reports);
+
+        // date does not match
+        $this->invalidator->forgetRememberedArchivedReportsToInvalidate(7, Date::factory('2012-04-05'));
+        $reports = $this->invalidator->getRememberedArchivedReportsThatShouldBeInvalidated();
+        $this->assertSame($this->getRememberedReportsByDate(), $reports);
+    }
+
+    public function test_forgetRememberedArchivedReportsToInvalidate_shouldOnlyDeleteReportBelongingToThatSiteAndDate()
+    {
+        $this->rememberReportsForManySitesAndDates();
+
+        $this->invalidator->forgetRememberedArchivedReportsToInvalidate(2, Date::factory('2014-04-05'));
+        $reports = $this->invalidator->getRememberedArchivedReportsThatShouldBeInvalidated();
+
+        $expected = array(
+            '2014-04-05' => array(1, 4, 7),
+            '2014-05-05' => array(2, 5),
+            '2014-04-06' => array(3),
+            '2014-04-08' => array(7),
+            '2014-05-08' => array(7),
+        );
+        $this->assertSame($expected, $reports);
+
+        unset($expected['2014-05-08']);
+
+        $this->invalidator->forgetRememberedArchivedReportsToInvalidate(7, Date::factory('2014-05-08'));
+        $reports = $this->invalidator->getRememberedArchivedReportsThatShouldBeInvalidated();
+        $this->assertSame($expected, $reports);
+    }
+
+    public function test_markArchivesAsInvalidated_shouldForgetInvalidatedSitesAndDates()
+    {
+        $this->rememberReportsForManySitesAndDates();
+
+        $idSites = array(2, 10, 7, 5);
+        $dates   = '2014-04-05,2014-04-08,2010-10-10';
+        $this->invalidator->markArchivesAsInvalidated($idSites, $dates, false);
+        $reports = $this->invalidator->getRememberedArchivedReportsThatShouldBeInvalidated();
+
+        $expected = array(
+            '2014-04-05' => array(1, 4),
+            '2014-05-05' => array(2, 5),
+            '2014-04-06' => array(3),
+            '2014-05-08' => array(7),
+        );
+        $this->assertSame($expected, $reports);
+    }
+
+    private function rememberReport($idSite, $date)
+    {
+        $date = Date::factory($date);
+        $this->invalidator->rememberToInvalidateArchivedReportsLater($idSite, $date);
+    }
+
+    private function getRememberedReportsByDate()
+    {
+        return array(
+            '2014-04-05' => array(1, 2, 4, 7),
+            '2014-05-05' => array(2, 5),
+            '2014-04-06' => array(3),
+            '2014-04-08' => array(7),
+            '2014-05-08' => array(7),
+        );
+    }
+
+    private function rememberReportsForManySitesAndDates()
+    {
+        $this->rememberReport(2, '2014-04-05');
+        $this->rememberReport(2, '2014-04-05'); // should appear only once for this site and date
+        $this->rememberReport(3, '2014-04-06');
+        $this->rememberReport(1, '2014-04-05');
+        $this->rememberReport(2, '2014-05-05');
+        $this->rememberReport(5, '2014-05-05');
+        $this->rememberReport(4, '2014-04-05');
+        $this->rememberReport(7, '2014-04-05');
+        $this->rememberReport(7, '2014-05-08');
+        $this->rememberReport(7, '2014-04-08');
+    }
+}
diff --git a/tests/PHPUnit/Integration/DataAccess/TableMetadataTest.php b/tests/PHPUnit/Integration/DataAccess/TableMetadataTest.php
new file mode 100644
index 0000000000..47c911bc2b
--- /dev/null
+++ b/tests/PHPUnit/Integration/DataAccess/TableMetadataTest.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+namespace Piwik\Tests\Integration\DataAccess;
+
+use Piwik\Common;
+use Piwik\DataAccess\TableMetadata;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+
+/**
+ * @group Core
+ */
+class TableMetadataTest extends IntegrationTestCase
+{
+    /**
+     * @var TableMetadata
+     */
+    private $tableMetadataAccess;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->tableMetadataAccess = new TableMetadata();
+    }
+
+    public function test_getColumns_CorrectlyReturnsListOfColumnNames()
+    {
+        $expectedColumns = array('option_name', 'option_value', 'autoload');
+        $columns = $this->tableMetadataAccess->getColumns(Common::prefixTable('option'));
+        $this->assertEquals($expectedColumns, $columns);
+    }
+
+    /**
+     * @dataProvider getTablesWithIdActionColumnsToTest
+     */
+    public function test_getIdActionColumnNames_CorrectlyReturnsColumnsWithIdActionName($table, $expectedColumns)
+    {
+        $columns = $this->tableMetadataAccess->getIdActionColumnNames(Common::prefixTable($table));
+        $this->assertEquals($expectedColumns, $columns);
+    }
+
+    public function getTablesWithIdActionColumnsToTest()
+    {
+        return array(
+            array('log_conversion', array('idaction_url')),
+            array('log_conversion_item', array('idaction_sku', 'idaction_name', 'idaction_category', 'idaction_category2',
+                                               'idaction_category3', 'idaction_category4', 'idaction_category5'))
+        );
+    }
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/DependencyTest.php b/tests/PHPUnit/Integration/DependencyTest.php
new file mode 100644
index 0000000000..0f0de5562c
--- /dev/null
+++ b/tests/PHPUnit/Integration/DependencyTest.php
@@ -0,0 +1,290 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Integration;
+
+use Piwik\Plugin\Dependency;
+use Piwik\Plugin\Manager as PluginManager;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+use Piwik\Version;
+
+/**
+ * @group Core
+ */
+class DependencyTest extends IntegrationTestCase
+{
+    /**
+     * @var Dependency
+     */
+    private $dependency;
+
+    public function setUp()
+    {
+        parent::setUp();
+        $this->dependency = new Dependency();
+    }
+
+    public function test_getMissingDependencies_shouldReturnEmptyArray_IfNoInputGiven()
+    {
+        $this->assertMissingDependency(null, array());
+        $this->assertMissingDependency(array(), array());
+    }
+
+    public function test_getMissingDependencies_EmptyVersion_ShouldBeIgnored()
+    {
+        $this->assertMissingDependency(array('php' => ''), array());
+    }
+
+    public function test_getMissingDependencies_multipleConditions()
+    {
+        $this->assertMissingDependency(array('php' => '<5.2', 'piwik' => '<2.0'), array(
+            $this->missingPhp('<5.2'),
+            $this->missingPiwik('<2.0')
+        ));
+
+        $this->assertMissingDependency(array('php' => '<5.2', 'piwik' => '<9.0'), array(
+            $this->missingPhp('<5.2')
+        ));
+
+        $this->assertMissingDependency(array('php' => '<9.2', 'piwik' => '<2.0'), array(
+            $this->missingPiwik('<2.0')
+        ));
+
+        $this->assertMissingDependency(array('php' => '<9.2', 'piwik' => '<9.0'), array());
+    }
+
+    public function test_getMissingDependencies_multipleConditions_differentConditions()
+    {
+        $this->assertMissingDependency(array('php' => '<5.2', 'piwik' => '>2.0'), array(
+            $this->missingPhp('<5.2')
+        ));
+
+        $this->assertMissingDependency(array('php' => '>=5.3', 'piwik' => '<2.0'), array(
+            $this->missingPiwik('<2.0')
+        ));
+
+        $this->assertMissingDependency(array('php' => '!=' . PHP_VERSION, 'piwik' => '<>' . Version::VERSION), array(
+            $this->missingPhp('!=' . PHP_VERSION),
+            $this->missingPiwik('<>' . Version::VERSION)
+        ));
+    }
+
+    public function test_getMissingVersion_AND_Condition()
+    {
+        $this->assertMissingDependency(array('php' => '<2.0,>=9.0', 'piwik' => '<2.0'), array(
+            $this->missingPhp('<2.0,>=9.0', '<2.0, >=9.0'),
+            $this->missingPiwik('<2.0')
+        ));
+    }
+
+    public function test_getMissingDependencies_detectsPHPVersion()
+    {
+        $this->assertMissingDependency(array('php' => '>=2.1'), array());
+        $this->assertMissingDependency(array('php' => '>=' . PHP_VERSION), array());
+        $this->assertMissingDependency(array('php' => '>' . PHP_VERSION), array(
+            $this->missingPhp('>' . PHP_VERSION)
+        ));
+        $this->assertMissingDependency(array('php' => '>=9.2'), array(
+            $this->missingPhp('>=9.2')
+        ));
+    }
+
+    public function test_getMissingDependencies_detectsPiwikVersion()
+    {
+        $this->assertMissingDependency(array('piwik' => '>=2.1'), array());
+        $this->assertMissingDependency(array('piwik' => '>=' . Version::VERSION), array());
+        $this->assertMissingDependency(array('piwik' => '>' . Version::VERSION), array(
+            $this->missingPiwik('>' . Version::VERSION)
+        ));
+        $this->assertMissingDependency(array('piwik' => '>=9.2'), array(
+            $this->missingPiwik('>=9.2')
+        ));
+    }
+
+    public function test_getMissingDependencies_detectUnknownDependencyName()
+    {
+        $this->assertMissingDependency(array('unkNowN' => '>99.99'), array(
+            $this->buildMissingDependecy('unkNowN', '', '>99.99')
+        ));
+        $this->assertMissingDependency(array('unkNowN' => '>=0.01'), array(
+            $this->buildMissingDependecy('unkNowN', '', '>=0.01')
+        ));
+    }
+
+    public function test_getMissingDependencies_detectsPluginVersion()
+    {
+        PluginManager::getInstance()->loadAllPluginsAndGetTheirInfo();
+
+        $this->assertMissingDependency(array('Annotations' => '>=2.1'), array());
+        $this->assertMissingDependency(array('Annotations' => '>=' . Version::VERSION), array());
+        $this->assertMissingDependency(array('Annotations' => '>' . Version::VERSION), array(
+            $this->buildMissingDependecy('Annotations', Version::VERSION, '>' . Version::VERSION)
+        ));
+        $this->assertMissingDependency(array('Annotations' => '>=9.2'), array(
+            $this->buildMissingDependecy('Annotations', Version::VERSION, '>=9.2')
+        ));
+    }
+
+    public function test_getMissingDependencies_setPiwikVersion()
+    {
+        $this->assertMissingDependency(array('piwik' => '>=9.2'), array($this->missingPiwik('>=9.2')));
+
+        $this->dependency->setPiwikVersion('9.2');
+
+        $this->assertMissingDependency(array('piwik' => '>=9.2'), array());
+    }
+
+    public function test_getMissingVersion_EmptyCurrentAndRequiredVersion_ShouldBeIgnored()
+    {
+        $this->assertMissingVersion(null, null, array());
+        $this->assertMissingVersion('', '', array());
+    }
+
+    public function test_getMissingVersion_EmptyCurrentVersion_ShouldBeDeclaredAsMissing()
+    {
+        $this->assertMissingVersion('', '5.5', array('>=5.5'));
+    }
+
+    public function test_getMissingVersion_EmptyRequiredVersion_ShouldBeIgnored()
+    {
+        $this->assertMissingVersion('5.5', '', array());
+    }
+
+    public function test_getMissingVersion_shouldIgnoreAnyWhitespace()
+    {
+        $this->assertMissingVersion('5.5 ', '5.5', array());
+        $this->assertMissingVersion(' 5.5 ', '5.5', array());
+        $this->assertMissingVersion('5.5', ' 5.5', array());
+        $this->assertMissingVersion('5.5', ' 5.5 ', array());
+    }
+
+    public function test_getMissingVersion_NoComparisonDefined_ShouldUseGreatherThanOrEqualByDefault()
+    {
+        $this->assertMissingVersion('5.4', '5.2', array());
+        $this->assertMissingVersion('5.4', '5.4', array());
+        $this->assertMissingVersion('5.4', '9.2', array('>=9.2'));
+    }
+
+    public function test_getMissingVersion_GreatherThanOrEqual()
+    {
+        $this->assertMissingVersion('5.4', '>=5.2', array());
+        $this->assertMissingVersion('5.4', '>=5.4', array());
+        $this->assertMissingVersion('5.4', '>=9.2', array('>=9.2'));
+    }
+
+    public function test_getMissingVersion_GreatherThan()
+    {
+        $this->assertMissingVersion('5.4', '>5.2', array());
+        $this->assertMissingVersion('5.4', '>5.4', array('>5.4'));
+        $this->assertMissingVersion('5.4', '>9.2', array('>9.2'));
+    }
+
+    public function test_getMissingVersion_LowerThanOrEqual()
+    {
+        $this->assertMissingVersion('5.4', '<=5.2', array('<=5.2'));
+        $this->assertMissingVersion('5.4', '<=5.4', array());
+        $this->assertMissingVersion('5.4', '<=9.2', array());
+    }
+
+    public function test_getMissingVersion_lowerThan()
+    {
+        $this->assertMissingVersion('5.4', '<5.2', array('<5.2'));
+        $this->assertMissingVersion('5.4', '<5.4', array('<5.4'));
+        $this->assertMissingVersion('5.4', '<9.2', array());
+    }
+
+    public function test_getMissingVersion_notEqual()
+    {
+        $this->assertMissingVersion('5.4', '<>5.2', array());
+        $this->assertMissingVersion('5.4', '<>5.4', array('<>5.4'));
+        $this->assertMissingVersion('5.4', '<>9.2', array());
+    }
+
+    public function test_getMissingVersion_notEqualUsingBang()
+    {
+        $this->assertMissingVersion('5.4', '!=5.2', array());
+        $this->assertMissingVersion('5.4', '!=5.4', array('!=5.4'));
+        $this->assertMissingVersion('5.4', '!=9.2', array());
+    }
+
+    public function test_getMissingVersion_exact()
+    {
+        $this->assertMissingVersion('5.4', '==5.2', array('==5.2'));
+        $this->assertMissingVersion('5.4', '==5.4', array());
+        $this->assertMissingVersion('5.4', '==9.2', array('==9.2'));
+    }
+
+    public function test_getMissingVersion_AND_Condition_returnsOnlyNonMatchingVersions()
+    {
+        $this->assertMissingVersion('5.4', '<5.2,>9.0', array('<5.2', '>9.0'));
+        $this->assertMissingVersion('5.4', '>5.2,<9.0', array());
+        $this->assertMissingVersion('5.4', '>5.2,<9.0,<2.0', array('<2.0'));
+        $this->assertMissingVersion('5.4', '>5.2,<9.0,<2.0,>=9.0', array('<2.0', '>=9.0'));
+        $this->assertMissingVersion('5.4', '<2.0,>=9.0', array('<2.0', '>=9.0'));
+    }
+
+    public function test_getMissingVersion_AND_Condition_shouldIgnoreAnyWhitespace()
+    {
+        $this->assertMissingVersion('5.2', '5.5 , 5.4,   5.3', array('>=5.5', '>=5.4', '>=5.3'));
+        $this->assertMissingVersion('5.5', '5.5 , 5.4,   5.3', array());
+        $this->assertMissingVersion(' 5.2 ', '5.5 , 5.4,   5.3', array('>=5.5', '>=5.4', '>=5.3'));
+        $this->assertMissingVersion(' 5.2 ', '>5.5 , <5.4,   ==5.3', array('>5.5', '==5.3'));
+        $this->assertMissingVersion(' 5.2 ', '>5.5 , !=5.4,   ==5.3', array('>5.5', '==5.3'));
+    }
+
+    public function test_getMissingVersion()
+    {
+        $this->assertMissingVersion('5.2', '<5.2,>9.0', array('<5.2', '>9.0'));
+        $this->assertMissingVersion('5.2', '<=5.2,>9.0', array('>9.0'));
+        $this->assertMissingVersion('5.1', '<5.2,>9.0', array('>9.0'));
+        $this->assertMissingVersion('9.1', '<5.2,>9.0', array('<5.2'));
+        $this->assertMissingVersion('5.2', '>=5.2,<=9.0', array());
+        $this->assertMissingVersion('9.0', '>=5.2,<=9.0', array());
+        $this->assertMissingVersion('6.4', '>=5.2,<=9.0', array());
+    }
+
+    private function missingPiwik($requiredVersion, $causedBy = null)
+    {
+        return $this->buildMissingDependecy('piwik', Version::VERSION, $requiredVersion, $causedBy);
+    }
+
+    private function missingPhp($requiredVersion, $causedBy = null)
+    {
+        return $this->buildMissingDependecy('php', PHP_VERSION, $requiredVersion, $causedBy);
+    }
+
+    private function buildMissingDependecy($name, $currentVersion, $requiredVersion, $causedBy = null)
+    {
+        if (is_null($causedBy)) {
+            $causedBy = $requiredVersion;
+        }
+
+        return array(
+            'requirement'     => $name,
+            'actualVersion'   => $currentVersion,
+            'requiredVersion' => $requiredVersion,
+            'causedBy'        => $causedBy
+        );
+    }
+
+    private function assertMissingDependency($requires, $expectedMissing)
+    {
+        $missing = $this->dependency->getMissingDependencies($requires);
+
+        $this->assertEquals($expectedMissing, $missing);
+    }
+
+    private function assertMissingVersion($currentVersion, $requiredVersion, $expectedMissing)
+    {
+        $missing = $this->dependency->getMissingVersions($currentVersion, $requiredVersion);
+
+        $this->assertEquals($expectedMissing, $missing);
+    }
+
+}
+
diff --git a/tests/PHPUnit/Integration/FilesystemTest.php b/tests/PHPUnit/Integration/FilesystemTest.php
index f3879927e5..0a17edacb8 100644
--- a/tests/PHPUnit/Integration/FilesystemTest.php
+++ b/tests/PHPUnit/Integration/FilesystemTest.php
@@ -8,6 +8,7 @@
 
 namespace Piwik\Tests\Integration;
 
+use Piwik\Container\StaticContainer;
 use Piwik\Filesystem;
 
 /**
@@ -30,4 +31,18 @@ class FilesystemTest extends \PHPUnit_Framework_TestCase
         $this->assertNull($size);
     }
 
+    public function test_removeFile_shouldRemoveFile()
+    {
+        $tmpFile = StaticContainer::get('path.tmp') . '/filesystem-test-file';
+        touch($tmpFile);
+
+        Filesystem::remove($tmpFile);
+
+        $this->assertFileNotExists($tmpFile);
+    }
+
+    public function test_removeNonExistingFile_shouldNotThrowException()
+    {
+        Filesystem::remove('foo');
+    }
 }
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/HttpTest.php b/tests/PHPUnit/Integration/HttpTest.php
index a5d62b3060..3e7f38577c 100644
--- a/tests/PHPUnit/Integration/HttpTest.php
+++ b/tests/PHPUnit/Integration/HttpTest.php
@@ -60,6 +60,10 @@ class HttpTest extends \PHPUnit_Framework_TestCase
      */
     public function testCustomByteRange($method)
     {
+        if ($method == 'fopen') {
+            return; // not supported w/ this method
+        }
+
         $result = Http::sendHttpRequestBy(
             $method,
             Fixture::getRootUrl() . '/piwik.js',
@@ -74,12 +78,10 @@ class HttpTest extends \PHPUnit_Framework_TestCase
             $getExtendedInfo = true
         );
 
-        if ($method != 'fopen') {
-            $this->assertEquals(206, $result['status']);
-            $this->assertTrue(isset($result['headers']['Content-Range']));
-            $this->assertEquals('bytes 10-20/', substr($result['headers']['Content-Range'], 0, 12));
-            $this->assertTrue( in_array($result['headers']['Content-Type'], array('application/x-javascript', 'application/javascript')));
-        }
+        $this->assertEquals(206, $result['status']);
+        $this->assertTrue(isset($result['headers']['Content-Range']));
+        $this->assertEquals('bytes 10-20/', substr($result['headers']['Content-Range'], 0, 12));
+        $this->assertTrue(in_array($result['headers']['Content-Type'], array('application/x-javascript', 'application/javascript')));
     }
 
     /**
@@ -111,6 +113,6 @@ class HttpTest extends \PHPUnit_Framework_TestCase
 
         $this->assertTrue(isset($result['headers']['Content-Length']), "Content-Length header not set!");
         $this->assertTrue(is_numeric($result['headers']['Content-Length']), "Content-Length header not numeric!");
-        $this->assertEquals('application/zip', $result['headers']['Content-Type']);
+        $this->assertTrue(in_array($result['headers']['Content-Type'], array('application/zip', 'application/x-zip-compressed')));
     }
 }
diff --git a/tests/PHPUnit/Integration/JsProxyTest.php b/tests/PHPUnit/Integration/JsProxyTest.php
index e968fec50e..e2a68cf4c3 100644
--- a/tests/PHPUnit/Integration/JsProxyTest.php
+++ b/tests/PHPUnit/Integration/JsProxyTest.php
@@ -9,6 +9,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Tests\Framework\Fixture;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 
 /**
  * @group Core
@@ -48,6 +49,9 @@ class JsProxyTest extends \PHPUnit_Framework_TestCase
 
     public function testPiwikPhp()
     {
+        if(IntegrationTestCase::isMysqli()) {
+            $this->markTestSkipped('Sometimes fails with 500 error');
+        }
         $curlHandle = curl_init();
         $url = $this->getStaticSrvUrl() . '/js/?idsite=1';
         curl_setopt($curlHandle, CURLOPT_URL, $url);
diff --git a/tests/PHPUnit/Integration/LogTest.php b/tests/PHPUnit/Integration/LogTest.php
deleted file mode 100644
index e3950fea65..0000000000
--- a/tests/PHPUnit/Integration/LogTest.php
+++ /dev/null
@@ -1,286 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-namespace Piwik\Tests\Integration;
-
-use Exception;
-use Piwik\Common;
-use Piwik\Config;
-use Piwik\Container\StaticContainer;
-use Piwik\Db;
-use Piwik\Error;
-use Piwik\ExceptionHandler;
-use Piwik\Log;
-use Piwik\Plugins\TestPlugin\TestLoggingUtility;
-use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
-
-require_once PIWIK_INCLUDE_PATH . '/tests/resources/TestPluginLogClass.php';
-
-/**
- * @group Core
- * @group Core_LogTest
- */
-class LogTest extends IntegrationTestCase
-{
-    const TESTMESSAGE = 'test%smessage';
-    const STRING_MESSAGE_FORMAT = '[%tag%] %message%';
-    const STRING_MESSAGE_FORMAT_SPRINTF = "[%s] %s";
-
-    public static $expectedExceptionOutput = array(
-        'screen' => 'dummy error message<br />
- <br />
- --&gt; To temporarily debug this error further, set const PIWIK_PRINT_ERROR_BACKTRACE=true; in index.php',
-        'file' => '[Piwik\Tests\Integration\LogTest] LogTest.php(162): dummy error message
-  dummy backtrace',
-        'database' => '[Piwik\Tests\Integration\LogTest] LogTest.php(162): dummy error message
-dummy backtrace'
-    );
-
-    public static $expectedErrorOutput = array(
-        'screen' => '<div style=\'word-wrap: break-word; border: 3px solid red; padding:4px; width:70%; background-color:#FFFF96;\'>
-        <strong>There is an error. Please report the message (Piwik 2.0)
-        and full backtrace in the <a href=\'?module=Proxy&action=redirect&url=http://forum.piwik.org\' target=\'_blank\'>Piwik forums</a> (please do a Search first as it might have been reported already!).<br /><br/>
-        Unknown error (102):</strong> <em>dummy error string</em> in <strong>dummyerrorfile.php</strong> on line <strong>145</strong>
-<br /><br />Backtrace --&gt;<div style="font-family:Courier;font-size:10pt"><br />
-dummy backtrace</div><br />
- </pre></div><br />',
-        'file' => '[Piwik\Tests\Integration\LogTest] dummyerrorfile.php(145): Unknown error (102) - dummy error string
-  dummy backtrace',
-        'database' => '[Piwik\Tests\Integration\LogTest] dummyerrorfile.php(145): Unknown error (102) - dummy error string
-dummy backtrace'
-    );
-
-    private $screenOutput;
-
-    public static function setUpBeforeClass()
-    {
-        parent::setUpBeforeClass();
-
-        Error::setErrorHandler();
-        ExceptionHandler::setUp();
-    }
-
-    public static function tearDownAfterClass()
-    {
-        restore_error_handler();
-        restore_exception_handler();
-
-        parent::tearDownAfterClass();
-    }
-
-    public function setUp()
-    {
-        parent::setUp();
-
-        Config::getInstance()->log['string_message_format'] = self::STRING_MESSAGE_FORMAT;
-        Config::getInstance()->log['logger_file_path'] = self::getLogFileLocation();
-        Config::getInstance()->log['log_level'] = Log::INFO;
-        @unlink(self::getLogFileLocation());
-        Log::unsetInstance();
-        Error::$debugBacktraceForTests = ExceptionHandler::$debugBacktraceForTests = "dummy backtrace";
-    }
-
-    public function tearDown()
-    {
-        parent::tearDown();
-
-        Log::unsetInstance();
-        @unlink(self::getLogFileLocation());
-        Error::$debugBacktraceForTests = ExceptionHandler::$debugBacktraceForTests = null;
-    }
-
-    /**
-     * Data provider for every test.
-     */
-    public function getBackendsToTest()
-    {
-        return array(array('screen'),
-                     array('file'),
-                     array('database'));
-    }
-
-    /**
-     * @dataProvider getBackendsToTest
-     */
-    public function testLoggingWorksWhenMessageIsString($backend)
-    {
-        Config::getInstance()->log['log_writers'] = array($backend);
-
-        ob_start();
-        Log::warning(self::TESTMESSAGE);
-        $this->screenOutput = ob_get_contents();
-        ob_end_clean();
-
-        $this->checkBackend($backend, self::TESTMESSAGE, $formatMessage = true, $tag = __CLASS__);
-    }
-
-    /**
-     * @dataProvider getBackendsToTest
-     */
-    public function testLoggingWorksWhenMessageIsSprintfString($backend)
-    {
-        Config::getInstance()->log['log_writers'] = array($backend);
-
-        ob_start();
-        Log::warning(self::TESTMESSAGE, " subst ");
-        $this->screenOutput = ob_get_contents();
-        ob_end_clean();
-
-        $this->checkBackend($backend, sprintf(self::TESTMESSAGE, " subst "), $formatMessage = true, $tag = __CLASS__);
-    }
-
-    /**
-     * @dataProvider getBackendsToTest
-     */
-    public function testLoggingWorksWhenMessageIsError($backend)
-    {
-        Config::getInstance()->log['log_writers'] = array($backend);
-
-        ob_start();
-        $error = new Error(102, "dummy error string", "dummyerrorfile.php", 145, "dummy backtrace");
-        Log::error($error);
-        $this->screenOutput = ob_get_contents();
-        ob_end_clean();
-
-        $this->checkBackend($backend, self::$expectedErrorOutput[$backend], $formatMessage = false, $tag = __CLASS__);
-        $this->checkBackend('screen', self::$expectedErrorOutput['screen']); // errors should always written to the screen
-    }
-
-    /**
-     * @dataProvider getBackendsToTest
-     */
-    public function testLoggingWorksWhenMessageIsException($backend)
-    {
-        Config::getInstance()->log['log_writers'] = array($backend);
-
-        ob_start();
-        $exception = new Exception("dummy error message");
-        Log::error($exception);
-        $this->screenOutput = ob_get_contents();
-        ob_end_clean();
-
-        $this->checkBackend($backend, self::$expectedExceptionOutput[$backend], $formatMessage = false, $tag = __CLASS__);
-        $this->checkBackend('screen', self::$expectedExceptionOutput['screen']); // errors should always written to the screen
-    }
-
-    /**
-     * @dataProvider getBackendsToTest
-     */
-    public function testLoggingCorrectlyIdentifiesPlugin($backend)
-    {
-        Config::getInstance()->log['log_writers'] = array($backend);
-
-        ob_start();
-        TestLoggingUtility::doLog(self::TESTMESSAGE);
-        $this->screenOutput = ob_get_contents();
-        ob_end_clean();
-
-        $this->checkBackend($backend, self::TESTMESSAGE, $formatMessage = true, $tag = 'TestPlugin');
-    }
-
-    /**
-     * @dataProvider getBackendsToTest
-     */
-    public function testLogMessagesIgnoredWhenNotWithinLevel($backend)
-    {
-        Config::getInstance()->log['log_writers'] = array($backend);
-        Config::getInstance()->log['log_level'] = 'ERROR';
-
-        ob_start();
-        Log::info(self::TESTMESSAGE);
-        $this->screenOutput = ob_get_contents();
-        ob_end_clean();
-
-        $this->checkNoMessagesLogged($backend);
-    }
-
-    /**
-     * @dataProvider getBackendsToTest
-     */
-    public function testLogMessagesAreTrimmed($backend)
-    {
-        Config::getInstance()->log['log_writers'] = array($backend);
-
-        ob_start();
-        TestLoggingUtility::doLog(" \n   ".self::TESTMESSAGE."\n\n\n   \n");
-        $this->screenOutput = ob_get_contents();
-        ob_end_clean();
-
-        $this->checkBackend($backend, self::TESTMESSAGE, $formatMessage = true, $tag = 'TestPlugin');
-    }
-
-    private function checkBackend($backend, $expectedMessage, $formatMessage = false, $tag = false)
-    {
-        if ($formatMessage) {
-            $expectedMessage = sprintf(self::STRING_MESSAGE_FORMAT_SPRINTF, $tag, $expectedMessage);
-        }
-
-        // remove version number from message
-        $expectedMessage = str_replace("(Piwik 2.0)", "", $expectedMessage);
-        $this->screenOutput = str_replace("(Piwik ". \Piwik\Version::VERSION.")", "", $this->screenOutput);
-
-        if ($backend == 'screen') {
-            if ($formatMessage
-                && !Common::isPhpCliMode()) {
-                $expectedMessage = '<pre>' . $expectedMessage . '</pre>';
-            }
-
-            $this->screenOutput = $this->removePathsFromBacktrace($this->screenOutput);
-
-            $this->assertEquals($expectedMessage . "\n", $this->screenOutput, "unexpected output: ".$this->screenOutput);
-        } else if ($backend == 'file') {
-            $this->assertTrue(file_exists(self::getLogFileLocation()));
-
-            $fileContents = file_get_contents(self::getLogFileLocation());
-            $fileContents = $this->removePathsFromBacktrace($fileContents);
-
-            $this->assertEquals($expectedMessage . "\n", $fileContents);
-        } else if ($backend == 'database') {
-            $count = Db::fetchOne("SELECT COUNT(*) FROM " . Common::prefixTable('logger_message'));
-            $this->assertEquals(1, $count);
-
-            $message = Db::fetchOne("SELECT message FROM " . Common::prefixTable('logger_message') . " LIMIT 1");
-            $message = $this->removePathsFromBacktrace($message);
-            $this->assertEquals($expectedMessage, $message);
-
-            $tagInDb = Db::fetchOne("SELECT tag FROM " . Common::prefixTable('logger_message') . " LIMIT 1");
-            if ($tag === false) {
-                $this->assertEmpty($tagInDb);
-            } else {
-                $this->assertEquals($tag, $tagInDb);
-            }
-        }
-    }
-
-    private function checkNoMessagesLogged($backend)
-    {
-        if ($backend == 'screen') {
-            $this->assertEmpty($this->screenOutput, "Output not empty: ".$this->screenOutput);
-        } else if ($backend == 'file') {
-            $this->assertFalse(file_exists(self::getLogFileLocation()));
-        } else if ($backend == 'database') {
-            $this->assertEquals(0, Db::fetchOne("SELECT COUNT(*) FROM " . Common::prefixTable('logger_message')));
-        }
-    }
-
-    private function removePathsFromBacktrace($content)
-    {
-        return preg_replace_callback("/(?:\/[^\s(<>]+)*\//", function ($matches) {
-            if ($matches[0] == '/') {
-                return '/';
-            } else {
-                return '';
-            }
-        }, $content);
-    }
-
-    public static function getLogFileLocation()
-    {
-        return StaticContainer::getContainer()->get('path.tmp') . '/logs/piwik.test.log';
-    }
-}
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/OptionTest.php b/tests/PHPUnit/Integration/OptionTest.php
index 616202f05f..f50444c04c 100644
--- a/tests/PHPUnit/Integration/OptionTest.php
+++ b/tests/PHPUnit/Integration/OptionTest.php
@@ -15,7 +15,6 @@ use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 
 /**
  * @group Core
- * @group Core_OptionTest
  */
 class OptionTest extends IntegrationTestCase
 {
diff --git a/tests/PHPUnit/Integration/PiwikTest.php b/tests/PHPUnit/Integration/PiwikTest.php
index 6043736e04..6839b66df3 100644
--- a/tests/PHPUnit/Integration/PiwikTest.php
+++ b/tests/PHPUnit/Integration/PiwikTest.php
@@ -86,7 +86,6 @@ class PiwikTest extends IntegrationTestCase
             '',
             '   ',
             'a',
-            'aa',
             'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
             'alpha/beta',
             'alpha:beta',
@@ -117,6 +116,7 @@ class PiwikTest extends IntegrationTestCase
     public function getValidLoginStringData()
     {
         $valid = array(
+            'aa',
             'aaa',
             'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
             'shoot_puck@the-goal.com',
diff --git a/tests/PHPUnit/Integration/Plugin/ManagerTest.php b/tests/PHPUnit/Integration/Plugin/ManagerTest.php
new file mode 100644
index 0000000000..e05c259cda
--- /dev/null
+++ b/tests/PHPUnit/Integration/Plugin/ManagerTest.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Integration\Plugin;
+
+use Piwik\Db;
+use Piwik\Plugin;
+use Piwik\Settings\Storage;
+use Piwik\Cache as PiwikCache;
+use Piwik\Tests\Integration\Settings\IntegrationTestCase;
+
+/**
+ * @group Plugin
+ * @group PluginManager
+ */
+class ManagerTest extends IntegrationTestCase
+{
+    private $trackerCacheId = 'PluginsTracker';
+
+    /**
+     * @var Plugin\Manager
+     */
+    private $manager;
+
+    public function setUp()
+    {
+        parent::setUp();
+        $this->manager = Plugin\Manager::getInstance();
+    }
+
+    public function test_loadTrackerPlugins_shouldDetectTrackerPlugins()
+    {
+        $this->assertGreaterThan(50, count($this->manager->getLoadedPlugins())); // make sure all plugins are loaded
+
+        $pluginsToLoad = $this->manager->loadTrackerPlugins();
+
+        $this->assertOnlyTrackerPluginsAreLoaded($pluginsToLoad);
+    }
+
+    public function test_loadTrackerPlugins_shouldCacheListOfPlugins()
+    {
+        $cache = $this->getCacheForTrackerPlugins();
+        $this->assertFalse($cache->contains($this->trackerCacheId));
+
+        $pluginsToLoad = $this->manager->loadTrackerPlugins();
+
+        $this->assertTrue($cache->contains($this->trackerCacheId));
+        $this->assertEquals($pluginsToLoad, $cache->fetch($this->trackerCacheId));
+    }
+
+    public function test_loadTrackerPlugins_shouldBeAbleToLoadPluginsCorrectWhenItIsCached()
+    {
+        $pluginsToLoad = array('CoreHome', 'UserLanguage', 'Login', 'CoreAdminHome');
+        $this->getCacheForTrackerPlugins()->save($this->trackerCacheId, $pluginsToLoad);
+
+        $pluginsToLoad = $this->manager->loadTrackerPlugins();
+
+        $this->assertCount(4, $this->manager->getLoadedPlugins());
+        $this->assertEquals($pluginsToLoad, array_keys($this->manager->getLoadedPlugins()));
+    }
+
+    public function test_loadTrackerPlugins_shouldUnloadAllPlugins_IfThereAreNoneToLoad()
+    {
+        $pluginsToLoad = array();
+        $this->getCacheForTrackerPlugins()->save($this->trackerCacheId, $pluginsToLoad);
+
+        $pluginsToLoad = $this->manager->loadTrackerPlugins();
+
+        $this->assertEquals(array(), $pluginsToLoad);
+        $this->assertEquals(array(), $this->manager->getLoadedPlugins());
+    }
+
+    private function getCacheForTrackerPlugins()
+    {
+        return PiwikCache::getEagerCache();
+    }
+
+    private function assertOnlyTrackerPluginsAreLoaded($expectedPluginNamesLoaded)
+    {
+        // should currently load between 10 and 25 plugins
+        $this->assertLessThan(25, count($this->manager->getLoadedPlugins()));
+        $this->assertGreaterThan(10, count($this->manager->getLoadedPlugins()));
+
+        // we need to make sure it actually only loaded the correct ones
+        $this->assertEquals($expectedPluginNamesLoaded, array_keys($this->manager->getLoadedPlugins()));
+    }
+}
diff --git a/tests/PHPUnit/Integration/Plugin/SettingsTest.php b/tests/PHPUnit/Integration/Plugin/SettingsTest.php
index f8802674a4..f086b2b384 100644
--- a/tests/PHPUnit/Integration/Plugin/SettingsTest.php
+++ b/tests/PHPUnit/Integration/Plugin/SettingsTest.php
@@ -11,6 +11,7 @@ namespace Piwik\Tests\Integration\Plugin;
 use Piwik\Db;
 use Piwik\Plugin\Settings as PluginSettings;
 use Piwik\Settings\Storage;
+use Piwik\SettingsServer;
 use Piwik\Tests\Integration\Settings\CorePluginTestSettings;
 use Piwik\Tests\Integration\Settings\IntegrationTestCase;
 use Piwik\Tracker\Cache;
@@ -112,13 +113,13 @@ class SettingsTest extends IntegrationTestCase
     {
         $this->setSuperUser();
 
-        $GLOBALS['PIWIK_TRACKER_MODE'] = true;
+        SettingsServer::setIsTrackerApiRequest();
 
         $settings = $this->createSettingsInstance();
         $setting = $this->buildUserSetting('myname', 'mytitle', 'myRandomName');
         $settings->addSetting($setting);
 
-        unset($GLOBALS['PIWIK_TRACKER_MODE']);
+        SettingsServer::setIsNotTrackerApiRequest();
 
         $storage = $setting->getStorage();
         $this->assertTrue($storage instanceof SettingsStorage);
diff --git a/tests/PHPUnit/Integration/ReleaseCheckListTest.php b/tests/PHPUnit/Integration/ReleaseCheckListTest.php
index 2c4ab2a00d..189a560c85 100644
--- a/tests/PHPUnit/Integration/ReleaseCheckListTest.php
+++ b/tests/PHPUnit/Integration/ReleaseCheckListTest.php
@@ -11,7 +11,9 @@ namespace Piwik\Tests\Integration;
 use Exception;
 use Piwik\Config;
 use Piwik\Filesystem;
+use Piwik\Ini\IniReader;
 use Piwik\Plugin\Manager;
+use Piwik\Tracker;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 
@@ -25,7 +27,8 @@ class ReleaseCheckListTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->globalConfig = _parse_ini_file(PIWIK_PATH_TEST_TO_ROOT . '/config/global.ini.php', true);
+        $iniReader = new IniReader();
+        $this->globalConfig = $iniReader->readFile(PIWIK_PATH_TEST_TO_ROOT . '/config/global.ini.php');
 
         parent::setUp();
     }
@@ -77,8 +80,7 @@ class ReleaseCheckListTest extends \PHPUnit_Framework_TestCase
         $this->_checkEqual(array('Tracker' => 'record_statistics'), '1');
         $this->_checkEqual(array('Tracker' => 'visit_standard_length'), '1800');
         $this->_checkEqual(array('Tracker' => 'trust_visitors_cookies'), '0');
-        // logging messages are disabled
-        $this->_checkEqual(array('log' => 'log_level'), 'ERROR');
+        $this->_checkEqual(array('log' => 'log_level'), 'WARN');
         $this->_checkEqual(array('log' => 'log_writers'), array('screen'));
         $this->_checkEqual(array('log' => 'logger_api_call'), null);
 
@@ -142,6 +144,9 @@ class ReleaseCheckListTest extends \PHPUnit_Framework_TestCase
     {
         $this->assertTrue(!isset($GLOBALS['PIWIK_TRACKER_DEBUG']));
         $this->assertEquals(0, $this->globalConfig['Tracker']['debug']);
+
+        $tracker = new Tracker();
+        $this->assertFalse($tracker->isDebugModeEnabled());
     }
 
     /**
@@ -153,6 +158,11 @@ class ReleaseCheckListTest extends \PHPUnit_Framework_TestCase
         $files = Filesystem::globr(PIWIK_INCLUDE_PATH, '*.php');
 
         foreach($files as $file) {
+            // skip files in these folders
+            if (strpos($file, '/libs/') !== false) {
+                continue;
+            }
+
             $handle = fopen($file, "r");
             $expectedStart = "<?php";
 
@@ -247,7 +257,7 @@ class ReleaseCheckListTest extends \PHPUnit_Framework_TestCase
                 strpos($file, '/tests/') !== false ||
                 strpos($file, '/lang/') !== false ||
                 strpos($file, 'yuicompressor') !== false ||
-                strpos($file, '/libs/bower_components') !== false ||
+                strpos($file, '/libs/') !== false ||
                 (strpos($file, '/vendor') !== false && strpos($file, '/vendor/piwik') === false) ||
                 strpos($file, '/tmp/') !== false
             ) {
@@ -255,7 +265,7 @@ class ReleaseCheckListTest extends \PHPUnit_Framework_TestCase
             }
 
             // skip files with these file extensions
-            if (preg_match('/\.(bmp|fdf|gif|deb|deflate|exe|gz|ico|jar|jpg|p12|pdf|png|rar|swf|vsd|z|zip|ttf|so|dat|eps|phar|pyc|gzip)$/', $file)) {
+            if (preg_match('/\.(bmp|fdf|gif|deb|deflate|exe|gz|ico|jar|jpg|p12|pdf|png|rar|swf|vsd|z|zip|ttf|so|dat|eps|phar|pyc|gzip|eot|woff|svg)$/', $file)) {
                 continue;
             }
 
@@ -308,6 +318,11 @@ class ReleaseCheckListTest extends \PHPUnit_Framework_TestCase
     {
         $errors = array();
         foreach ($files as $file) {
+            // skip files in these folders
+            if (strpos($file, '/libs/') !== false) {
+                continue;
+            }
+
             $function = "imagecreatefrom" . $format;
             if (!function_exists($function)) {
                 throw new \Exception("Unexpected error: $function function does not exist!");
diff --git a/tests/PHPUnit/Integration/ReportTest.php b/tests/PHPUnit/Integration/ReportTest.php
index 1e141db383..21e8a52542 100644
--- a/tests/PHPUnit/Integration/ReportTest.php
+++ b/tests/PHPUnit/Integration/ReportTest.php
@@ -116,7 +116,6 @@ class ReportTest extends IntegrationTestCase
     {
         WidgetsList::getInstance()->_reset();
         MenuReporting::getInstance()->unsetInstance();
-        Translate::unloadEnglishTranslation();
         unset($_GET['idSite']);
         parent::tearDown();
     }
@@ -157,14 +156,16 @@ class ReportTest extends IntegrationTestCase
 
     public function test_getWidgetTitle_shouldReturnTranslatedTitleIfSet()
     {
-        $this->loadEnglishTranslation();
+        Translate::loadAllTranslations();
         $this->assertEquals('Page Titles Following a Site Search', $this->advancedReport->getWidgetTitle());
+        Translate::reset();
     }
 
     public function test_getCategory_shouldReturnTranslatedCategory()
     {
-        $this->loadEnglishTranslation();
+        Translate::loadAllTranslations();
         $this->assertEquals('Goals', $this->advancedReport->getCategory());
+        Translate::reset();
     }
 
     public function test_configureWidget_shouldNotAddAWidgetIfNoWidgetTitleIsSet()
@@ -539,9 +540,4 @@ class ReportTest extends IntegrationTestCase
     {
         PluginManager::getInstance()->unloadPlugins();
     }
-
-    private function loadEnglishTranslation()
-    {
-        Translate::reloadLanguage('en');
-    }
 }
diff --git a/tests/PHPUnit/Integration/SegmentTest.php b/tests/PHPUnit/Integration/SegmentTest.php
index 889f4a8e04..91be56af12 100644
--- a/tests/PHPUnit/Integration/SegmentTest.php
+++ b/tests/PHPUnit/Integration/SegmentTest.php
@@ -36,11 +36,11 @@ class SegmentTest extends IntegrationTestCase
         parent::tearDown();
     }
 
-    protected function _filterWhitsSpaces($valueToFilter)
+    static public function removeExtraWhiteSpaces($valueToFilter)
     {
         if (is_array($valueToFilter)) {
             foreach ($valueToFilter as $key => $value) {
-                $valueToFilter[$key] = $this->_filterWhitsSpaces($value);
+                $valueToFilter[$key] = self::removeExtraWhiteSpaces($value);
             }
             return $valueToFilter;
         } else {
@@ -117,16 +117,16 @@ class SegmentTest extends IntegrationTestCase
         $segment = new Segment($segment, $idSites = array());
         $sql = $segment->getSelectQuery($select, $from, false);
 
-        $this->assertEquals($this->_filterWhitsSpaces($expected), $this->_filterWhitsSpaces($sql));
+        $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($sql));
 
         // calling twice should give same results
         $sql = $segment->getSelectQuery($select, array($from));
-        $this->assertEquals($this->_filterWhitsSpaces($expected), $this->_filterWhitsSpaces($sql));
+        $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($sql));
 
         $this->assertEquals(32, strlen($segment->getHash()));
     }
 
-    public function testGetSelectQueryNoJoin()
+    public function test_getSelectQuery_whenNoJoin()
     {
         $select = '*';
         $from = 'log_visit';
@@ -150,10 +150,10 @@ class SegmentTest extends IntegrationTestCase
                     ( log_visit.custom_var_k1 = ? AND log_visit.visitor_returning = ? )",
             "bind" => array(1, 'Test', 0));
 
-        $this->assertEquals($this->_filterWhitsSpaces($expected), $this->_filterWhitsSpaces($query));
+        $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($query));
     }
 
-    public function testGetSelectQueryJoinVisitOnAction()
+    public function test_getSelectQuery_whenJoinVisitOnAction()
     {
         $select = '*';
         $from = 'log_link_visit_action';
@@ -178,10 +178,10 @@ class SegmentTest extends IntegrationTestCase
                     ( log_link_visit_action.custom_var_k1 = ? AND log_visit.visitor_returning = ? )",
             "bind" => array(1, 'Test', 0));
 
-        $this->assertEquals($this->_filterWhitsSpaces($expected), $this->_filterWhitsSpaces($query));
+        $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($query));
     }
 
-    public function testGetSelectQueryJoinActionOnVisit()
+    public function test_getSelectQuery_whenJoinActionOnVisit()
     {
         $select = 'sum(log_visit.visit_total_actions) as nb_actions, max(log_visit.visit_total_actions) as max_actions, sum(log_visit.visit_total_time) as sum_visit_length';
         $from = 'log_visit';
@@ -210,13 +210,14 @@ class SegmentTest extends IntegrationTestCase
                     AND
                     ( log_link_visit_action.custom_var_k1 = ? AND log_visit.visitor_returning = ? )
                 GROUP BY log_visit.idvisit
+                ORDER BY NULL
                     ) AS log_inner",
             "bind" => array(1, 'Test', 0));
 
-        $this->assertEquals($this->_filterWhitsSpaces($expected), $this->_filterWhitsSpaces($query));
+        $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($query));
     }
 
-    public function testGetSelectQueryJoinConversionOnAction()
+    public function test_getSelectQuery_whenJoinConversionOnAction()
     {
         $select = '*';
         $from = 'log_link_visit_action';
@@ -241,10 +242,10 @@ class SegmentTest extends IntegrationTestCase
                     ( log_link_visit_action.custom_var_k1 = ? AND log_conversion.idgoal = ? AND log_link_visit_action.custom_var_k2 = ? )",
             "bind" => array(1, 'Test', 1, 'Test2'));
 
-        $this->assertEquals($this->_filterWhitsSpaces($expected), $this->_filterWhitsSpaces($query));
+        $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($query));
     }
 
-    public function testGetSelectQueryJoinActionOnConversion()
+    public function test_getSelectQuery_whenJoinActionOnConversion()
     {
         $select = '*';
         $from = 'log_conversion';
@@ -269,10 +270,10 @@ class SegmentTest extends IntegrationTestCase
                     ( ( log_conversion.idgoal IS NULL OR log_conversion.idgoal <> ? ) AND log_link_visit_action.custom_var_k1 = ? AND log_conversion.idgoal = ? )",
             "bind" => array(1, 2, 'Test', 1));
 
-        $this->assertEquals($this->_filterWhitsSpaces($expected), $this->_filterWhitsSpaces($query));
+        $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($query));
     }
 
-    public function testGetSelectQueryJoinConversionOnVisit()
+    public function test_getSelectQuery_whenJoinConversionOnVisit()
     {
         $select = 'log_visit.*';
         $from = 'log_visit';
@@ -300,13 +301,14 @@ class SegmentTest extends IntegrationTestCase
                     AND
                     ( log_conversion.idgoal = ? )
                 GROUP BY log_visit.idvisit
+                ORDER BY NULL
                     ) AS log_inner",
             "bind" => array(1, 1));
 
-        $this->assertEquals($this->_filterWhitsSpaces($expected), $this->_filterWhitsSpaces($query));
+        $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($query));
     }
 
-    public function testGetSelectQueryConversionOnly()
+    public function test_getSelectQuery_whenJoinConversionOnly()
     {
         $select = 'log_conversion.*';
         $from = 'log_conversion';
@@ -330,10 +332,10 @@ class SegmentTest extends IntegrationTestCase
                     ( log_conversion.idgoal = ? )",
             "bind" => array(1, 1));
 
-        $this->assertEquals($this->_filterWhitsSpaces($expected), $this->_filterWhitsSpaces($query));
+        $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($query));
     }
 
-    public function testGetSelectQueryJoinVisitOnConversion()
+    public function test_getSelectQuery_whenJoinVisitOnConversion()
     {
         $select = '*';
         $from = 'log_conversion';
@@ -358,14 +360,14 @@ class SegmentTest extends IntegrationTestCase
                     ( (log_conversion.idgoal = ? OR HOUR(log_visit.visit_last_action_time) = ? ))",
             "bind" => array(1, 1, 12));
 
-        $this->assertEquals($this->_filterWhitsSpaces($expected), $this->_filterWhitsSpaces($query));
+        $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($query));
     }
 
     /**
      * visit is joined on action, then conversion is joined
      * make sure that conversion is joined on action not visit
      */
-    public function testGetSelectQueryJoinVisitAndConversionOnAction()
+    public function test_getSelectQuery_whenJoinVisitAndConversionOnAction()
     {
         $select = '*';
         $from = 'log_link_visit_action';
@@ -389,21 +391,21 @@ class SegmentTest extends IntegrationTestCase
                      HOUR(log_visit.visit_last_action_time) = ? AND log_conversion.idgoal = ? ",
             "bind" => array(12, 1));
 
-        $this->assertEquals($this->_filterWhitsSpaces($expected), $this->_filterWhitsSpaces($query));
+        $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($query));
     }
 
     /**
      * join conversion on visit, then actions
      * make sure actions are joined before conversions
      */
-    public function testGetSelectQueryJoinConversionAndActionOnVisit()
+    public function test_getSelectQuery_whenJoinConversionAndActionOnVisit_andPageUrlSet()
     {
         $select = 'log_visit.*';
         $from = 'log_visit';
         $where = false;
         $bind = array();
 
-        $segment = 'visitConvertedGoalId==1;visitServerHour==12;customVariablePageName1==Test';
+        $segment = 'visitConvertedGoalId==1;visitServerHour==12;customVariablePageName1==Test;pageUrl!=';
         $segment = new Segment($segment, $idSites = array());
 
         $query = $segment->getSelectQuery($select, $from, $where, $bind);
@@ -422,15 +424,21 @@ class SegmentTest extends IntegrationTestCase
                     LEFT JOIN " . Common::prefixTable('log_conversion') . " AS log_conversion ON log_conversion.idlink_va = log_link_visit_action.idlink_va AND log_conversion.idsite = log_link_visit_action.idsite
                 WHERE
                      log_conversion.idgoal = ? AND HOUR(log_visit.visit_last_action_time) = ? AND log_link_visit_action.custom_var_k1 = ?
+                      AND (
+                            log_link_visit_action.idaction_url IS NOT NULL
+                            AND (log_link_visit_action.idaction_url <> ''
+                                OR log_link_visit_action.idaction_url = 0)
+                            )
                 GROUP BY log_visit.idvisit
+                ORDER BY NULL
                     ) AS log_inner",
             "bind" => array(1, 12, 'Test'));
 
-        $this->assertEquals($this->_filterWhitsSpaces($expected), $this->_filterWhitsSpaces($query));
+        $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($query));
     }
 
     /**
-     * Dataprovider for testBogusSegmentThrowsException
+     * Dataprovider for test_bogusSegment_shouldThrowException
      */
     public function getBogusSegments()
     {
@@ -444,7 +452,7 @@ class SegmentTest extends IntegrationTestCase
     /**
      * @dataProvider getBogusSegments
      */
-    public function testBogusSegmentThrowsException($segment)
+    public function test_bogusSegment_shouldThrowException($segment)
     {
         try {
             new Segment($segment, $idSites = array());
@@ -453,4 +461,45 @@ class SegmentTest extends IntegrationTestCase
         }
         $this->fail('Expected exception not raised');
     }
+
+
+    public function test_getSelectQuery_whenLimit_innerQueryShouldHaveLimitAndNoGroupBy()
+    {
+        $select = 'sum(log_visit.visit_total_time) as sum_visit_length';
+        $from = 'log_visit';
+        $where = 'log_visit.idvisit = ?';
+        $bind = array(1);
+
+        $segment = 'customVariablePageName1==Test';
+        $segment = new Segment($segment, $idSites = array());
+
+        $orderBy = false;
+        $groupBy = false;
+        $limit = 33;
+
+        $query = $segment->getSelectQuery($select, $from, $where, $bind, $orderBy, $groupBy, $limit);
+
+        $expected = array(
+            "sql"  => "
+                SELECT
+                    sum(log_inner.visit_total_time) as sum_visit_length
+                FROM
+                    (
+                SELECT
+                    log_visit.visit_total_time
+                FROM
+                    " . Common::prefixTable('log_visit') . " AS log_visit
+                    LEFT JOIN " . Common::prefixTable('log_link_visit_action') . " AS log_link_visit_action ON log_link_visit_action.idvisit = log_visit.idvisit
+                WHERE
+                    ( log_visit.idvisit = ? )
+                    AND
+                    ( log_link_visit_action.custom_var_k1 = ? )
+                ORDER BY NULL
+                LIMIT 33
+                    ) AS log_inner
+                LIMIT 33",
+            "bind" => array(1, 'Test'));
+
+        $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($query));
+    }
 }
diff --git a/tests/PHPUnit/Integration/ServeStaticFileTest.php b/tests/PHPUnit/Integration/ServeStaticFileTest.php
index 31700eebef..8eabd6a499 100644
--- a/tests/PHPUnit/Integration/ServeStaticFileTest.php
+++ b/tests/PHPUnit/Integration/ServeStaticFileTest.php
@@ -276,7 +276,7 @@ class ServeStaticFileTest extends \PHPUnit_Framework_TestCase
 
         // Tests deflate compression has been used
         $deflateFileLocation = $this->getCompressedFileLocation() . ".deflate";
-        $this->assertTrue(file_exists($deflateFileLocation));
+        $this->assertFileExists($deflateFileLocation);
 
         // Tests gzdeflate has been used for IE compatibility
         $this->assertEquals(gzinflate(file_get_contents($deflateFileLocation)), file_get_contents(TEST_FILE_LOCATION));
@@ -310,7 +310,7 @@ class ServeStaticFileTest extends \PHPUnit_Framework_TestCase
 
         // Tests gzip compression has been used
         $gzipFileLocation = $this->getCompressedFileLocation() . ".gz";
-        $this->assertTrue(file_exists($gzipFileLocation));
+        $this->assertFileExists($gzipFileLocation);
 
         $this->removeCompressedFiles();
     }
@@ -446,8 +446,8 @@ class ServeStaticFileTest extends \PHPUnit_Framework_TestCase
         clearstatcache();
 
         // check the correct compressed file is created
-        $this->assertTrue(file_exists($this->getCompressedFileLocation() . '.' . PARTIAL_BYTE_START . '.' . PARTIAL_BYTE_END . ".deflate"));
-        $this->assertFalse(file_exists($this->getCompressedFileLocation() . ".gz"));
+        $this->assertFileExists($this->getCompressedFileLocation() . '.' . PARTIAL_BYTE_START . '.' . PARTIAL_BYTE_END . ".deflate");
+        $this->assertFileNotExists($this->getCompressedFileLocation() . ".gz");
 
         // check $partialResponse
         $expectedPartialContents = substr(file_get_contents(TEST_FILE_LOCATION), PARTIAL_BYTE_START,
@@ -475,8 +475,8 @@ class ServeStaticFileTest extends \PHPUnit_Framework_TestCase
         clearstatcache();
 
         // check the correct compressed file is created
-        $this->assertTrue(file_exists($this->getCompressedFileLocation() . ".deflate"));
-        $this->assertFalse(file_exists($this->getCompressedFileLocation() . ".gz"));
+        $this->assertFileExists($this->getCompressedFileLocation() . ".deflate");
+        $this->assertFileNotExists($this->getCompressedFileLocation() . ".gz");
 
         // check $fullResponse
         $this->assertEquals(file_get_contents(TEST_FILE_LOCATION), $fullResponse);
diff --git a/tests/PHPUnit/Integration/Settings/Storage/FactoryTest.php b/tests/PHPUnit/Integration/Settings/Storage/FactoryTest.php
index 0c63124dfe..9c2de66667 100644
--- a/tests/PHPUnit/Integration/Settings/Storage/FactoryTest.php
+++ b/tests/PHPUnit/Integration/Settings/Storage/FactoryTest.php
@@ -10,6 +10,7 @@ namespace Piwik\Tests\Integration\Settings\Storage;
 
 use Piwik\Settings\Storage;
 use Piwik\Settings\Storage\Factory;
+use Piwik\SettingsServer;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 use Piwik\Tracker\SettingsStorage;
 
@@ -51,11 +52,11 @@ class FactoryTest extends IntegrationTestCase
 
     private function makeTrackerInstance()
     {
-        $GLOBALS['PIWIK_TRACKER_MODE'] = true;
+        SettingsServer::setIsTrackerApiRequest();
 
         $storage = Factory::make('PluginName');
 
-        unset($GLOBALS['PIWIK_TRACKER_MODE']);
+        SettingsServer::setIsNotTrackerApiRequest();
 
         return $storage;
     }
diff --git a/tests/PHPUnit/Integration/Tracker/ActionTest.php b/tests/PHPUnit/Integration/Tracker/ActionTest.php
index 1ca87f9678..a00ea4c9b3 100644
--- a/tests/PHPUnit/Integration/Tracker/ActionTest.php
+++ b/tests/PHPUnit/Integration/Tracker/ActionTest.php
@@ -40,7 +40,14 @@ class ActionTest extends IntegrationTestCase
 
         PluginManager::getInstance()->loadPlugins(array('SitesManager'));
 
-        Translate::loadEnglishTranslation();
+        Translate::loadAllTranslations();
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
+
+        Translate::reset();
     }
 
     protected function setUpRootAccess()
diff --git a/tests/PHPUnit/Integration/Tracker/Handler/FactoryTest.php b/tests/PHPUnit/Integration/Tracker/Handler/FactoryTest.php
new file mode 100644
index 0000000000..fd77913bfa
--- /dev/null
+++ b/tests/PHPUnit/Integration/Tracker/Handler/FactoryTest.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Integration\Tracker\Handler;
+
+use Piwik\EventDispatcher;
+use Piwik\Piwik;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+use Piwik\Tracker;
+use Piwik\Tracker\Handler;
+use Piwik\Tracker\Handler\Factory;
+
+/**
+ * @group Tracker
+ * @group Handler
+ * @group Factory
+ * @group FactoryTest
+ */
+class FactoryTest extends IntegrationTestCase
+{
+
+    public function tearDown()
+    {
+        EventDispatcher::getInstance()->clearObservers('Tracker.initRequestSet');
+        parent::tearDown();
+    }
+
+    public function test_make_shouldCreateDefaultInstance()
+    {
+        $handler = Factory::make();
+        $this->assertInstanceOf('Piwik\\Tracker\\Handler', $handler);
+    }
+
+    public function test_make_shouldTriggerEventOnce()
+    {
+        $called = 0;
+        $self   = $this;
+        Piwik::addAction('Tracker.newHandler', function ($handler) use (&$called, $self) {
+            $called++;
+            $self->assertNull($handler);
+        });
+
+        Factory::make();
+        $this->assertSame(1, $called);
+    }
+
+    public function test_make_shouldPreferManuallyCreatedHandlerInstanceInEventOverDefaultHandler()
+    {
+        $handlerToUse = new Handler();
+        Piwik::addAction('Tracker.newHandler', function (&$handler) use ($handlerToUse) {
+            $handler = $handlerToUse;
+        });
+
+        $handler = Factory::make();
+        $this->assertSame($handlerToUse, $handler);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage The Handler object set in the plugin
+     */
+    public function test_make_shouldTriggerExceptionInCaseWrongInstanceCreatedInHandler()
+    {
+        Piwik::addAction('Tracker.newHandler', function (&$handler) {
+            $handler = new Tracker();
+        });
+
+        Factory::make();
+    }
+}
diff --git a/tests/PHPUnit/Integration/Tracker/HandlerTest.php b/tests/PHPUnit/Integration/Tracker/HandlerTest.php
new file mode 100644
index 0000000000..812c341336
--- /dev/null
+++ b/tests/PHPUnit/Integration/Tracker/HandlerTest.php
@@ -0,0 +1,246 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Integration\Tracker;
+
+use Piwik\Exception\InvalidRequestParameterException;
+use Piwik\Exception\UnexpectedWebsiteFoundException;
+use Piwik\Tests\Framework\Fixture;
+use Piwik\Tests\Framework\Mock\Tracker\Response;
+use Piwik\Tests\Framework\Mock\Tracker\ScheduledTasksRunner;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+use Piwik\Tracker;
+use Piwik\Tracker\Handler;
+use Piwik\Tests\Framework\Mock\Tracker\RequestSet;
+use Exception;
+
+/**
+ * @group HandlerTest
+ * @group Handler
+ * @group Tracker
+ */
+class HandlerTest extends IntegrationTestCase
+{
+    /**
+     * @var Handler
+     */
+    private $handler;
+
+    /**
+     * @var Response
+     */
+    private $response;
+
+    /**
+     * @var Tracker
+     */
+    private $tracker;
+
+    /**
+     * @var RequestSet
+     */
+    private $requestSet;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        Fixture::createWebsite('2014-01-01 00:00:00');
+        Tracker\Cache::deleteTrackerCache();
+
+        $this->response = new Response();
+        $this->handler  = new Handler();
+        $this->handler->setResponse($this->response);
+        $this->tracker  = new Tracker();
+        $this->requestSet = new RequestSet();
+    }
+
+    public function test_init_ShouldInitiateResponseInstance()
+    {
+        $this->handler->init($this->tracker, $this->requestSet);
+
+        $this->assertTrue($this->response->isInit);
+        $this->assertFalse($this->response->isResponseOutput);
+        $this->assertFalse($this->response->isSend);
+    }
+
+    public function test_finish_ShouldOutputAndSendResponse()
+    {
+        $response = $this->handler->finish($this->tracker, $this->requestSet);
+
+        $this->assertEquals('My Dummy Content', $response);
+        $this->assertFalse($this->response->isInit);
+        $this->assertFalse($this->response->isExceptionOutput);
+        $this->assertTrue($this->response->isResponseOutput);
+        $this->assertTrue($this->response->isSend);
+    }
+
+    public function test_finish_ShouldRedirectIfThereIsAValidUrl()
+    {
+        $_GET['redirecturl'] = 'http://localhost/test?foo=bar';
+
+        $this->requestSet->setRequests(array(array('idsite' => '1')));
+
+        try {
+            $this->handler->finish($this->tracker, $this->requestSet);
+            $this->fail('An expected exception was not thrown');
+        } catch (Exception $e) {
+            $this->assertContains('Piwik would redirect you to this URL: ' . $_GET['redirecturl'], $e->getMessage());
+            unset($_GET['redirecturl']);
+        }
+    }
+
+    public function test_finish_ShouldRedirectIfThereIsAValidBelongingToTheSite()
+    {
+        $_GET['redirecturl'] = 'http://piwik.net/';
+
+        $this->requestSet->setRequests(array(array('idsite' => '1')));
+
+        try {
+            $this->handler->finish($this->tracker, $this->requestSet);
+            $this->fail('An expected exception was not thrown');
+        } catch (Exception $e) {
+            $this->assertContains('Piwik would redirect you to this URL: http://piwik.net/', $e->getMessage());
+            unset($_GET['redirecturl']);
+        }
+    }
+
+    public function test_finish_ShouldNotRedirectIfThereIsAUrlThatDoesNotBelongToAnySite()
+    {
+        $_GET['redirecturl'] = 'http://random.piwik.org/test?foo=bar';
+
+        $this->requestSet->setRequests(array(array('idsite' => '1')));
+        $this->handler->finish($this->tracker, $this->requestSet);
+        unset($_GET['redirecturl']);
+
+        $this->assertTrue(true);
+    }
+
+    public function test_finish_ShouldNotRedirectIfUrlIsValidButNoRequests()
+    {
+        $_GET['redirecturl'] = 'http://localhost/test';
+
+        $this->requestSet->setRequests(array());
+        $this->handler->finish($this->tracker, $this->requestSet);
+        unset($_GET['redirecturl']);
+
+        $this->assertTrue(true);
+    }
+
+    public function test_finish_ShoulAlsoReturnAPossibleRenderedException()
+    {
+        $this->executeOnException($this->buildException());
+        $response = $this->handler->finish($this->tracker, $this->requestSet);
+
+        $this->assertEquals('MyMessage', $response);
+    }
+
+    public function test_onException_ShouldOutputResponse()
+    {
+        $this->executeOnException($this->buildException());
+
+        $this->assertFalse($this->response->isInit);
+        $this->assertFalse($this->response->isResponseOutput);
+        $this->assertTrue($this->response->isExceptionOutput);
+        $this->assertFalse($this->response->isSend);
+    }
+
+    public function test_onException_ShouldPassExceptionToResponse()
+    {
+        $exception = $this->buildException();
+
+        $this->executeOnException($exception);
+
+        $this->assertSame($exception, $this->response->exception);
+        $this->assertSame(500, $this->response->statusCode);
+    }
+
+    public function test_onException_ShouldSendStatusCode400IfUnexpectedWebsite()
+    {
+        $this->executeOnException(new UnexpectedWebsiteFoundException('test'));
+        $this->assertSame(400, $this->response->statusCode);
+    }
+
+    public function test_onException_ShouldSendStatusCode400IfInvalidRequestParameterException()
+    {
+        $this->executeOnException(new InvalidRequestParameterException('test'));
+        $this->assertSame(400, $this->response->statusCode);
+    }
+
+    public function test_onException_ShouldStilRedirectIfThereIsAnExceptionAndAValidRedirectUrl()
+    {
+        $_GET['redirecturl'] = 'http://localhost/test?foo=bar';
+
+        $this->requestSet->setRequests(array(array('idsite' => '1')));
+
+        try {
+            $this->handler->onException($this->tracker, $this->requestSet, $this->buildException());
+            $this->fail('An expected exception was not thrown');
+        } catch (Exception $e) {
+            $this->assertContains('Piwik would redirect you to this URL: ' . $_GET['redirecturl'], $e->getMessage());
+            unset($_GET['redirecturl']);
+        }
+    }
+
+    public function test_onException_ShouldNotRethrowExceptionToExitTrackerImmediately()
+    {
+        $exception = $this->buildException();
+
+        $this->handler->onException($this->tracker, $this->requestSet, $exception);
+        $this->assertTrue(true);
+    }
+
+    public function test_onAllRequestsTracked_ShouldTriggerScheduledTasksIfEnabled()
+    {
+        $runner = new ScheduledTasksRunner();
+        $runner->shouldRun = true;
+
+        $this->handler->setScheduledTasksRunner($runner);
+        $this->handler->onAllRequestsTracked($this->tracker, $this->requestSet);
+
+        $this->assertTrue($runner->ranScheduledTasks);
+    }
+
+    public function test_onAllRequestsTracked_ShouldNotTriggerScheduledTasksIfDisabled()
+    {
+        $runner = new ScheduledTasksRunner();
+        $runner->shouldRun = false;
+
+        $this->handler->setScheduledTasksRunner($runner);
+        $this->handler->onAllRequestsTracked($this->tracker, $this->requestSet);
+
+        $this->assertFalse($runner->ranScheduledTasks);
+    }
+
+    public function test_process_ShouldTrackAllSetRequests()
+    {
+        $this->assertSame(0, $this->tracker->getCountOfLoggedRequests());
+
+        $this->requestSet->setRequests(array(
+            array('idsite' => 1, 'url' => 'http://localhost/foo?bar'),
+            array('idsite' => 1, 'url' => 'http://localhost'),
+        ));
+
+        $this->handler->process($this->tracker, $this->requestSet);
+
+        $this->assertSame(2, $this->tracker->getCountOfLoggedRequests());
+    }
+
+    private function buildException()
+    {
+        return new \Exception('MyMessage', 292);
+    }
+
+    private function executeOnException(Exception $exception)
+    {
+        try {
+            $this->handler->onException($this->tracker, $this->requestSet, $exception);
+        } catch (Exception $e) {
+        }
+    }
+}
diff --git a/tests/PHPUnit/Integration/Tracker/ModelTest.php b/tests/PHPUnit/Integration/Tracker/ModelTest.php
new file mode 100644
index 0000000000..def08a3316
--- /dev/null
+++ b/tests/PHPUnit/Integration/Tracker/ModelTest.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+namespace Piwik\Tests\Integration\Tracker;
+
+use Piwik\Common;
+use Piwik\Db;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+use Piwik\Tracker\Model;
+
+/**
+ * @group ModelTest
+ * @group Tracker
+ */
+class ModelTest extends IntegrationTestCase
+{
+    const TEST_ACTION_NAME = 'action_name';
+    const TEST_ACTION_TYPE = 1;
+    const TEST_ACTION_URL_PREFIX = 1;
+
+    /**
+     * @var Model
+     */
+    private $model;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->model = new Model();
+    }
+
+    public function test_createNewIdAction_CreatesNewAction_WhenNoActionWithSameNameAndType()
+    {
+        $newIdAction = $this->model->createNewIdAction(self::TEST_ACTION_NAME, self::TEST_ACTION_TYPE, self::TEST_ACTION_URL_PREFIX);
+
+        $this->assertLogActionTableContainsTestAction($newIdAction);
+    }
+
+    public function test_createNewIdAction_DoesNotCreateDuplicateActions_AndReturnsExistingIdAction_IfActionAlreadyExists()
+    {
+        $this->insertSingleDuplicateAction();
+
+        $newIdAction = $this->model->createNewIdAction(self::TEST_ACTION_NAME, self::TEST_ACTION_TYPE, self::TEST_ACTION_URL_PREFIX);
+
+        $this->assertEquals(5, $newIdAction);
+        $this->assertLogActionTableContainsTestAction(5);
+    }
+
+    public function test_getIdsAction_CorrectlyReturnsRequestedActionIds()
+    {
+        $this->insertManyActions();
+
+        $result = $this->model->getIdsAction(array(
+            array('name' => 'action1', 'type' => 1),
+            array('name' => 'ACTION1', 'type' => 1),
+            array('name' => 'action1', 'type' => 2),
+            array('name' => 'action2', 'type' => 2)
+        ));
+
+        $expectedResult = array(
+            array(
+                'idaction' => '3',
+                'type' => '1',
+                'name' => 'ACTION1'
+            ),
+            array(
+                'idaction' => '2',
+                'type' => '1',
+                'name' => 'action1'
+            ),
+            array(
+                'idaction' => '5',
+                'type' => '2',
+                'name' => 'action2'
+            ),
+            array(
+                'idaction' => '4',
+                'type' => '2',
+                'name' => 'action1'
+            )
+        );
+        $this->assertEquals($expectedResult, $result);
+    }
+
+    public function test_getIdsAction_CorrectlyReturnsLowestIdActions_IfDuplicateIdActionsExistInDb()
+    {
+        $this->insertManyActionsWithDuplicates();
+
+        $result = $this->model->getIdsAction(array(
+            array('name' => 'action1', 'type' => 1),
+            array('name' => 'action2', 'type' => 2)
+        ));
+
+        $expectedResult = array(
+            array(
+                'idaction' => '1',
+                'type' => '1',
+                'name' => 'action1'
+            ),
+            array(
+                'idaction' => '4',
+                'type' => '2',
+                'name' => 'action2'
+            )
+        );
+        $this->assertEquals($expectedResult, $result);
+    }
+
+    private function assertLogActionTableContainsTestAction($idaction)
+    {
+        $expectedRows = array(
+            array(
+                'idaction' => $idaction,
+                'name' => self::TEST_ACTION_NAME,
+                'type' => self::TEST_ACTION_TYPE,
+                'url_prefix' => self::TEST_ACTION_URL_PREFIX
+            )
+        );
+        $this->assertEquals($expectedRows, Db::fetchAll("SELECT idaction, name, type, url_prefix FROM " . Common::prefixTable('log_action')));
+    }
+
+    private function insertSingleDuplicateAction()
+    {
+        $logActionTable = Common::prefixTable('log_action');
+        Db::query("INSERT INTO $logActionTable (idaction, name, type, url_prefix, hash) VALUES (?, ?, ?, ?, CRC32(?))",
+            array(5, self::TEST_ACTION_NAME, self::TEST_ACTION_TYPE, self::TEST_ACTION_URL_PREFIX,
+                  self::TEST_ACTION_NAME));
+    }
+
+    private function insertManyActions()
+    {
+        $logActionTable = Common::prefixTable('log_action');
+        Db::query(
+            "INSERT INTO $logActionTable (idaction, name, type, hash)
+                  VALUES (1, 'action0', 1, CRC32('action0')),
+                         (2, 'action1', 1, CRC32('action1')),
+                         (3, 'ACTION1', 1, CRC32('ACTION1')),
+                         (4, 'action1', 2, CRC32('action1')),
+                         (5, 'action2', 2, CRC32('action2')),
+                         (6, 'action2', 3, CRC32('action2'))"
+        );
+    }
+
+    private function insertManyActionsWithDuplicates()
+    {
+        $logActionTable = Common::prefixTable('log_action');
+        Db::query(
+            "INSERT INTO $logActionTable (idaction, name, type, hash)
+                  VALUES (1, 'action1', 1, CRC32('action1')),
+                         (2, 'action1', 2, CRC32('action1')),
+                         (3, 'action1', 3, CRC32('action1')),
+                         (6, 'action2', 2, CRC32('action2')),
+                         (5, 'action2', 2, CRC32('action2')),
+                         (4, 'action2', 2, CRC32('action2'))"
+        );
+    }
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/Tracker/RequestSetTest.php b/tests/PHPUnit/Integration/Tracker/RequestSetTest.php
new file mode 100644
index 0000000000..a551149fa0
--- /dev/null
+++ b/tests/PHPUnit/Integration/Tracker/RequestSetTest.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Integration\Tracker;
+
+use Piwik\EventDispatcher;
+use Piwik\Piwik;
+use Piwik\Tests\Framework\Fixture;
+use Piwik\Tracker\RequestSet;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+
+class TestRequestSet extends RequestSet {
+
+    private $redirectUrl = '';
+
+    public function setRedirectUrl($url)
+    {
+        $this->redirectUrl = $url;
+    }
+
+    public function getRedirectUrl()
+    {
+        return $this->redirectUrl;
+    }
+}
+/**
+ * @group RequestSetTest
+ * @group RequestSet
+ * @group Tracker
+ */
+class RequestSetTest extends IntegrationTestCase
+{
+    /**
+     * @var TestRequestSet
+     */
+    private $requestSet;
+    private $get;
+    private $post;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        Fixture::createWebsite('2014-01-01 00:00:00');
+        Fixture::createWebsite('2014-01-01 00:00:00', 0, false, 'http://www.example.com');
+
+        $this->requestSet = $this->buildNewRequestSetThatIsNotInitializedYet();
+        $this->requestSet->setRequests(array(array('idsite' => 1), array('idsite' => 2)));
+
+        $this->get  = $_GET;
+        $this->post = $_POST;
+
+        $_GET  = array();
+        $_POST = array();
+    }
+
+    public function tearDown()
+    {
+        $_GET  = $this->get;
+        $_POST = $this->post;
+
+        EventDispatcher::getInstance()->clearObservers('Tracker.initRequestSet');
+        parent::tearDown();
+    }
+
+    public function test_shouldPerformRedirectToUrl_shouldNotRedirect_IfNoUrlIsSet()
+    {
+        $this->assertFalse($this->requestSet->shouldPerformRedirectToUrl());
+    }
+
+    public function test_shouldPerformRedirectToUrl_shouldNotRedirect_IfUrlIsSetButNoRequests()
+    {
+        $this->requestSet->setRedirectUrl('http://localhost');
+        $this->assertEquals('http://localhost', $this->requestSet->getRedirectUrl());
+
+        $this->requestSet->setRequests(array());
+
+        $this->assertFalse($this->requestSet->shouldPerformRedirectToUrl());
+    }
+
+    public function test_shouldPerformRedirectToUrl_shouldNotRedirect_IfUrlHasNoHostOrIsNotUrl()
+    {
+        $this->requestSet->setRedirectUrl('abc');
+
+        $this->assertFalse($this->requestSet->shouldPerformRedirectToUrl());
+    }
+
+    public function test_shouldPerformRedirectToUrl_shouldNotRedirect_IfUrlIsNotWhitelistedInAnySiteId()
+    {
+        $this->requestSet->setRedirectUrl('http://example.org');
+
+        $this->assertFalse($this->requestSet->shouldPerformRedirectToUrl());
+    }
+
+    public function test_shouldPerformRedirectToUrl_shouldRedirect_IfUrlIsGivenAndWhitelistedInAnySiteId()
+    {
+        $this->requestSet->setRedirectUrl('http://www.example.com');
+
+        $this->assertEquals('http://www.example.com', $this->requestSet->shouldPerformRedirectToUrl());
+    }
+
+    public function test_shouldPerformRedirectToUrl_shouldRedirect_IfBaseDomainIsGivenAndWhitelistedInAnySiteId()
+    {
+        $this->requestSet->setRedirectUrl('http://example.com');
+
+        $this->assertEquals('http://example.com', $this->requestSet->shouldPerformRedirectToUrl());
+    }
+
+    public function test_initRequestsAndTokenAuth_shouldTriggerEventToInitRequestsButOnlyOnce()
+    {
+        $requestSet = $this->buildNewRequestSetThatIsNotInitializedYet();
+
+        $called = 0;
+        $passedRequest = null;
+        Piwik::addAction('Tracker.initRequestSet', function ($param) use (&$called, &$passedRequest) {
+            $called++;
+            $passedRequest = $param;
+        });
+
+        $requestSet->initRequestsAndTokenAuth();
+        $this->assertSame(1, $called);
+        $this->assertSame($requestSet, $passedRequest);
+
+        $requestSet->initRequestsAndTokenAuth(); // should not be called again
+        $this->assertSame(1, $called);
+    }
+
+    public function test_initRequestsAndTokednAuth_shouldInitializeRequestsWithEmptyArray()
+    {
+        $requestSet = $this->buildNewRequestSetThatIsNotInitializedYet();
+        $requestSet->initRequestsAndTokenAuth();
+        $this->assertEquals(array(), $requestSet->getRequests());
+    }
+
+    public function test_initRequestsAndTokednAuth_shouldInitializeFromGetAndPostIfEventDoesNotHandleRequests()
+    {
+        $_GET  = array('idsite' => 1);
+        $_POST = array('c_i' => 'click');
+
+        Piwik::addAction('Tracker.initRequestSet', function (RequestSet $requestSet) {
+            $requestSet->setRequests(array(array('idsite' => '2'), array('idsite' => '3')));
+        });
+
+        $requestSet = $this->buildNewRequestSetThatIsNotInitializedYet();
+
+        $requestSet->initRequestsAndTokenAuth();
+
+        $requests = $requestSet->getRequests();
+        $this->assertCount(2, $requests);
+        $this->assertEquals(array('idsite' => '2'), $requests[0]->getParams());
+        $this->assertEquals(array('idsite' => '3'), $requests[1]->getParams());
+    }
+
+    public function test_initRequestsAndTokednAuth_shouldIgnoreGetAndPostIfInitializedByEvent()
+    {
+        $_GET  = array('idsite' => '1');
+        $_POST = array('c_i' => 'click');
+
+        $requestSet = $this->buildNewRequestSetThatIsNotInitializedYet();
+        $requestSet->initRequestsAndTokenAuth();
+        $requests = $requestSet->getRequests();
+        $this->assertCount(1, $requests);
+        $this->assertEquals(array('idsite' => 1, 'c_i' => 'click'), $requests[0]->getParams());
+    }
+
+    private function buildNewRequestSetThatIsNotInitializedYet()
+    {
+        return new TestRequestSet();
+    }
+}
diff --git a/tests/PHPUnit/Integration/Tracker/RequestTest.php b/tests/PHPUnit/Integration/Tracker/RequestTest.php
new file mode 100644
index 0000000000..fe4ba830ca
--- /dev/null
+++ b/tests/PHPUnit/Integration/Tracker/RequestTest.php
@@ -0,0 +1,393 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Integration\Tracker;
+
+use Piwik\EventDispatcher;
+use Piwik\Piwik;
+use Piwik\Plugins\CustomVariables\CustomVariables;
+use Piwik\Plugins\UsersManager\API;
+use Piwik\Plugins\UsersManager\Model;
+use Piwik\Plugins\UsersManager\UsersManager;
+use Piwik\Tests\Framework\Fixture;
+use Piwik\Tracker\Cache;
+use Piwik\Tracker\Request;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+use Piwik\Tracker\TrackerConfig;
+
+class TestRequest extends Request {
+
+    public function setIsAuthenticated()
+    {
+        $this->isAuthenticated = true;
+    }
+
+}
+
+/**
+ * @group RequestTest
+ * @group Request
+ * @group Tracker
+ */
+class RequestTest extends IntegrationTestCase
+{
+    /**
+     * @var TestRequest
+     */
+    private $request;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        Fixture::createWebsite('2014-01-01 00:00:00');
+        Fixture::createWebsite('2014-01-01 00:00:00');
+        Cache::deleteTrackerCache();
+
+        $this->request = $this->buildRequest(array('idsite' => '1'));
+    }
+
+    public function tearDown()
+    {
+        EventDispatcher::getInstance()->clearObservers('Request.initAuthenticationObject');
+        parent::tearDown();
+    }
+
+    public function test_getCustomVariablesInVisitScope_ShouldReturnNoCustomVars_IfNoWerePassedInParams()
+    {
+        $this->assertEquals(array(), $this->request->getCustomVariablesInVisitScope());
+    }
+
+    public function test_getCustomVariablesInVisitScope_ShouldReturnNoCustomVars_IfPassedParamIsNotAnArray()
+    {
+        $this->assertCustomVariablesInVisitScope(array(), '{"mykey":"myval"}');
+    }
+
+    public function test_getCustomVariablesInVisitScope_ShouldReturnCustomVars_IfTheyAreValid()
+    {
+        $customVars = $this->buildCustomVars(array('mykey' => 'myval', 'test' => 'value'));
+        $expected   = $this->buildExpectedCustomVars(array('mykey' => 'myval', 'test' => 'value'));
+
+        $this->assertCustomVariablesInVisitScope($expected, $customVars);
+    }
+
+    public function test_getCustomVariablesInVisitScope_ShouldIgnoreIndexesLowerThan1()
+    {
+        $customVars = array(
+            array('mykey', 'myval'),
+            array('test', 'value'),
+        );
+        $expected   = $this->buildExpectedCustomVars(array('test' => 'value'));
+
+        $this->assertCustomVariablesInVisitScope($expected, json_encode($customVars));
+    }
+
+    public function test_getCustomVariablesInVisitScope_ShouldTruncateValuesIfTheyAreTooLong()
+    {
+        $maxLen = CustomVariables::getMaxLengthCustomVariables();
+
+        $customVars = $this->buildCustomVars(array(
+            'mykey' => 'myval',
+            'test'  => str_pad('test', $maxLen + 5, 't'),
+        ));
+        $expected = $this->buildExpectedCustomVars(array(
+            'mykey' => 'myval',
+            'test'  => str_pad('test', $maxLen, 't'),
+        ));
+
+        $this->assertCustomVariablesInVisitScope($expected, $customVars);
+    }
+
+    public function test_getCustomVariablesInVisitScope_ShouldIgnoreVarsThatDoNotHaveKeyAndValue()
+    {
+        $customVars = array(
+            1 => array('mykey', 'myval'),
+            2 => array('test'),
+        );
+        $expected = $this->buildExpectedCustomVars(array('mykey' => 'myval'));
+
+        $this->assertCustomVariablesInVisitScope($expected, json_encode($customVars));
+    }
+
+    public function test_getCustomVariablesInVisitScope_ShouldSetDefaultValueToEmptyStringAndHandleOtherTypes()
+    {
+        $input = array(
+            'myfloat'  => 5.55,
+            'myint'    => 53,
+            'mystring' => '',
+        );
+        $customVars = $this->buildCustomVars($input);
+        $expected   = $this->buildExpectedCustomVars($input);
+
+        $this->assertCustomVariablesInVisitScope($expected, $customVars);
+    }
+
+    public function test_getCustomVariablesInPageScope_ShouldReturnNoCustomVars_IfNoWerePassedInParams()
+    {
+        $this->assertEquals(array(), $this->request->getCustomVariablesInPageScope());
+    }
+
+    public function test_getCustomVariablesInPageScope_ShouldReturnNoCustomVars_IfPassedParamIsNotAnArray()
+    {
+        $this->assertCustomVariablesInPageScope(array(), '{"mykey":"myval"}');
+    }
+
+    public function test_getCustomVariablesInPageScope_ShouldReturnCustomVars_IfTheyAreValid()
+    {
+        $customVars = $this->buildCustomVars(array('mykey' => 'myval', 'test' => 'value'));
+        $expected   = $this->buildExpectedCustomVars(array('mykey' => 'myval', 'test' => 'value'));
+
+        $this->assertCustomVariablesInPageScope($expected, $customVars);
+    }
+
+    public function test_getCustomVariablesInPageScope_ShouldIgnoreIndexesLowerThan1()
+    {
+        $customVars = array(
+            array('mykey', 'myval'),
+            array('test', 'value'),
+        );
+        $expected   = $this->buildExpectedCustomVars(array('test' => 'value'));
+
+        $this->assertCustomVariablesInPageScope($expected, json_encode($customVars));
+    }
+
+    public function test_getCustomVariablesInPageScope_ShouldTruncateValuesIfTheyAreTooLong()
+    {
+        $maxLen = CustomVariables::getMaxLengthCustomVariables();
+
+        $customVars = $this->buildCustomVars(array(
+            'mykey' => 'myval',
+            'test'  => str_pad('test', $maxLen + 5, 't'),
+        ));
+        $expected = $this->buildExpectedCustomVars(array(
+            'mykey' => 'myval',
+            'test'  => str_pad('test', $maxLen, 't'),
+        ));
+
+        $this->assertCustomVariablesInPageScope($expected, $customVars);
+    }
+
+    public function test_getCustomVariablesInPageScope_ShouldIgnoreVarsThatDoNotHaveKeyAndValue()
+    {
+        $customVars = array(
+            1 => array('mykey', 'myval'),
+            2 => array('test'),
+        );
+        $expected = $this->buildExpectedCustomVars(array('mykey' => 'myval'));
+
+        $this->assertCustomVariablesInPageScope($expected, json_encode($customVars));
+    }
+
+    public function test_getCustomVariablesInPageScope_ShouldSetDefaultValueToEmptyStringAndHandleOtherTypes()
+    {
+        $input = array(
+            'myfloat'  => 5.55,
+            'myint'    => 53,
+            'mystring' => '',
+        );
+        $customVars = $this->buildCustomVars($input);
+        $expected   = $this->buildExpectedCustomVars($input);
+
+        $this->assertCustomVariablesInPageScope($expected, $customVars);
+    }
+
+    public function test_isAuthenticated_ShouldBeNotAuthenticatedInTestsByDefault()
+    {
+        $this->assertFalse($this->request->isAuthenticated());
+    }
+
+    public function test_isAuthenticated_ShouldBeAuthenticatedIfCheckIsDisabledInConfig()
+    {
+        $oldConfig = TrackerConfig::getConfigValue('tracking_requests_require_authentication');
+        TrackerConfig::setConfigValue('tracking_requests_require_authentication', 0);
+
+        $this->assertTrue($this->request->isAuthenticated());
+
+        TrackerConfig::setConfigValue('tracking_requests_require_authentication', $oldConfig);
+    }
+
+    public function test_isAuthenticated_ShouldReadTheIsAuthenticatedPropertyAndIgnoreACheck()
+    {
+        $this->assertFalse($this->request->isAuthenticated());
+        $this->request->setIsAuthenticated();
+        $this->assertTrue($this->request->isAuthenticated());
+    }
+
+    public function test_isAuthenticated_ShouldWorkIfTokenIsCorrect()
+    {
+        $token = $this->createAdminUserForSite(2);
+
+        $request = $this->buildRequestWithToken(array('idsite' => '1'), $token);
+        $this->assertFalse($request->isAuthenticated());
+
+        $request = $this->buildRequestWithToken(array('idsite' => '2'), $token);
+        $this->assertTrue($request->isAuthenticated());
+    }
+
+    public function test_isAuthenticated_ShouldAlwaysWorkForSuperUser()
+    {
+        Fixture::createSuperUser(false);
+        $token = Fixture::getTokenAuth();
+
+        $request = $this->buildRequestWithToken(array('idsite' => '1'), $token);
+        $this->assertTrue($request->isAuthenticated());
+
+        $request = $this->buildRequestWithToken(array('idsite' => '2'), $token);
+        $this->assertTrue($request->isAuthenticated());
+    }
+
+    public function test_authenticateSuperUserOrAdmin_ShouldFailIfTokenIsEmpty()
+    {
+        $isAuthenticated = Request::authenticateSuperUserOrAdmin('', 2);
+        $this->assertFalse($isAuthenticated);
+
+        $isAuthenticated = Request::authenticateSuperUserOrAdmin(null, 2);
+        $this->assertFalse($isAuthenticated);
+    }
+
+    public function test_authenticateSuperUserOrAdmin_ShouldPostAuthInitEvent_IfTokenIsGiven()
+    {
+        $called = 0;
+        Piwik::addAction('Request.initAuthenticationObject', function () use (&$called) {
+            $called++;
+        });
+
+        Request::authenticateSuperUserOrAdmin('', 2);
+        $this->assertSame(0, $called);
+
+        Request::authenticateSuperUserOrAdmin('atoken', 2);
+        $this->assertSame(1, $called);
+
+        Request::authenticateSuperUserOrAdmin('anothertoken', 2);
+        $this->assertSame(2, $called);
+
+        Request::authenticateSuperUserOrAdmin(null, 2);
+        $this->assertSame(2, $called);
+    }
+
+    public function test_authenticateSuperUserOrAdmin_ShouldNotBeAllowedToAccessSitesHavingInvalidId()
+    {
+        $token = $this->createAdminUserForSite(2);
+
+        $isAuthenticated = Request::authenticateSuperUserOrAdmin($token, -2);
+        $this->assertFalse($isAuthenticated);
+
+        $isAuthenticated = Request::authenticateSuperUserOrAdmin($token, 0);
+        $this->assertFalse($isAuthenticated);
+    }
+
+    public function test_authenticateSuperUserOrAdmin_ShouldWorkIfTokenIsCorrect()
+    {
+        $token = $this->createAdminUserForSite(2);
+
+        $isAuthenticated = Request::authenticateSuperUserOrAdmin($token, 1);
+        $this->assertFalse($isAuthenticated);
+
+        $isAuthenticated = Request::authenticateSuperUserOrAdmin($token, 2);
+        $this->assertTrue($isAuthenticated);
+    }
+
+    public function test_authenticateSuperUserOrAdmin_ShouldAlwaysWorkForSuperUser()
+    {
+        Fixture::createSuperUser(false);
+        $token = Fixture::getTokenAuth();
+
+        $isAuthenticated = Request::authenticateSuperUserOrAdmin($token, 1);
+        $this->assertTrue($isAuthenticated);
+
+        $isAuthenticated = Request::authenticateSuperUserOrAdmin($token, 2);
+        $this->assertTrue($isAuthenticated);
+    }
+
+    private function createAdminUserForSite($idSite)
+    {
+        $login = 'myadmin';
+        $passwordHash = UsersManager::getPasswordHash('password');
+
+        $token = API::getInstance()->getTokenAuth($login, $passwordHash);
+
+        $user = new Model();
+        $user->addUser($login, $passwordHash, 'admin@piwik', 'alias', $token, '2014-01-01 00:00:00');
+        $user->addUserAccess($login, 'admin', array($idSite));
+
+        return $token;
+    }
+
+    public function test_internalBuildExpectedCustomVars()
+    {
+        $this->assertEquals(array(), $this->buildExpectedCustomVars(array()));
+
+        $this->assertEquals(array('custom_var_k1' => 'key', 'custom_var_v1' => 'val'),
+                            $this->buildExpectedCustomVars(array('key' => 'val')));
+
+        $this->assertEquals(array(
+            'custom_var_k1' => 'key', 'custom_var_v1' => 'val',
+            'custom_var_k2' => 'key2', 'custom_var_v2' => 'val2',
+        ), $this->buildExpectedCustomVars(array('key' => 'val', 'key2' => 'val2')));
+    }
+
+    public function test_internalBuildCustomVars()
+    {
+        $this->assertEquals('[]', $this->buildCustomVars(array()));
+
+        $this->assertEquals('{"1":["key","val"]}',
+                            $this->buildCustomVars(array('key' => 'val')));
+
+        $this->assertEquals('{"1":["key","val"],"2":["key2","val2"]}',
+                            $this->buildCustomVars(array('key' => 'val', 'key2' => 'val2')));
+    }
+
+    private function assertCustomVariablesInVisitScope($expectedCvars, $cvarsJsonEncoded)
+    {
+        $request = $this->buildRequest(array('_cvar' => $cvarsJsonEncoded));
+        $this->assertEquals($expectedCvars, $request->getCustomVariablesInVisitScope());
+    }
+
+    private function assertCustomVariablesInPageScope($expectedCvars, $cvarsJsonEncoded)
+    {
+        $request = $this->buildRequest(array('cvar' => $cvarsJsonEncoded));
+        $this->assertEquals($expectedCvars, $request->getCustomVariablesInPageScope());
+    }
+
+    private function buildExpectedCustomVars($customVars)
+    {
+        $vars  = array();
+        $index = 1;
+
+        foreach ($customVars as $key => $value) {
+            $vars['custom_var_k' . $index] = $key;
+            $vars['custom_var_v' . $index] = $value;
+            $index++;
+        }
+
+        return $vars;
+    }
+
+    private function buildCustomVars($customVars)
+    {
+        $vars  = array();
+        $index = 1;
+
+        foreach ($customVars as $key => $value) {
+            $vars[$index] = array($key, $value);
+            $index++;
+        }
+
+        return json_encode($vars);
+    }
+
+    private function buildRequest($params)
+    {
+        return new TestRequest($params);
+    }
+
+    private function buildRequestWithToken($params, $token)
+    {
+        return new TestRequest($params, $token);
+    }
+}
diff --git a/tests/PHPUnit/Integration/Tracker/SettingsStorageTest.php b/tests/PHPUnit/Integration/Tracker/SettingsStorageTest.php
index 1bda1105e6..dd17e67314 100644
--- a/tests/PHPUnit/Integration/Tracker/SettingsStorageTest.php
+++ b/tests/PHPUnit/Integration/Tracker/SettingsStorageTest.php
@@ -8,10 +8,8 @@
 
 namespace Piwik\Tests\Integration\Tracker;
 
-use Piwik\Option;
+use Piwik\Cache as PiwikCache;
 use Piwik\Settings\Storage;
-use Piwik\Settings\Setting;
-use Piwik\Tests\Integration\Settings\IntegrationTestCase;
 use Piwik\Tests\Integration\Settings\StorageTest;
 use Piwik\Tracker\Cache;
 use Piwik\Tracker\SettingsStorage;
@@ -44,11 +42,16 @@ class SettingsStorageTest extends StorageTest
     {
         $this->setSettingValueInCache('my0815RandomName');
 
-        $this->assertArrayHasKey('settingsStorage', Cache::getCacheGeneral());
+        $this->assertTrue($this->hasCache());
 
         SettingsStorage::clearCache();
 
-        $this->assertArrayNotHasKey('settingsStorage', Cache::getCacheGeneral());
+        $this->assertFalse($this->hasCache());
+    }
+
+    private function hasCache()
+    {
+        return $this->getCache()->contains($this->storage->getOptionKey());
     }
 
     public function test_storageShouldNotCastAnyCachedValue()
@@ -63,10 +66,12 @@ class SettingsStorageTest extends StorageTest
         $this->storage->setValue($this->setting, 5);
         $this->storage->save();
 
+        $this->assertFalse($this->hasCache());
         $this->assertNotFalse($this->getValueFromOptionTable()); // make sure saved in db
 
         $storage = $this->buildStorage();
         $this->assertEquals(5, $storage->getValue($this->setting));
+        $this->assertTrue($this->hasCache());
     }
 
     public function test_storageCreateACacheEntryIfNoCacheExistsYet()
@@ -76,53 +81,28 @@ class SettingsStorageTest extends StorageTest
 
         $this->setSettingValueAndMakeSureCacheGetsCreated('myVal');
 
-        $cache = Cache::getCacheGeneral();
+        $cache = $this->getCache()->fetch($this->storage->getOptionKey());
 
         $this->assertEquals(array(
-            $this->storage->getOptionKey() => array(
-                $this->setting->getKey() => 'myVal'
-            )
-        ), $cache['settingsStorage']);
+            $this->setting->getKey() => 'myVal'
+        ), $cache);
     }
 
-    public function test_shouldAddACacheEntryToAnotherCacheEntryAndNotOverwriteAll()
+    protected function buildStorage()
     {
-        $dummyCacheEntry = array(
-            'Plugin_PluginNameOther_Settings' => array(
-                'anything' => 'anyval',
-                'any' => 'other'
-            )
-        );
-        Cache::setCacheGeneral(array(
-            'settingsStorage' => $dummyCacheEntry
-        ));
-
-        Option::set($this->storage->getOptionKey(), serialize(array('mykey' => 'myVal')));
-
-        $this->buildStorage()->getValue($this->setting); // force adding new cache entry
-
-        $cache = Cache::getCacheGeneral();
-
-        $dummyCacheEntry[$this->storage->getOptionKey()] = array(
-            'mykey' => 'myVal'
-        );
-
-        $this->assertEquals($dummyCacheEntry, $cache['settingsStorage']);
+        return new SettingsStorage('PluginName');
     }
 
-    protected function buildStorage()
+    private function getCache()
     {
-        return new SettingsStorage('PluginName');
+        return PiwikCache::getEagerCache();
     }
 
     private function setSettingValueInCache($value)
     {
-        Cache::setCacheGeneral(array(
-            'settingsStorage' => array(
-                $this->storage->getOptionKey() => array(
-                    $this->setting->getKey() => $value
-                )
-            )
+        $cache = $this->getCache();
+        $cache->save($this->storage->getOptionKey(), array(
+            $this->setting->getKey() => $value
         ));
     }
 
diff --git a/tests/PHPUnit/Integration/Tracker/SettingsTest.php b/tests/PHPUnit/Integration/Tracker/SettingsTest.php
new file mode 100644
index 0000000000..fc008467a4
--- /dev/null
+++ b/tests/PHPUnit/Integration/Tracker/SettingsTest.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Integration\Tracker;
+
+use Piwik\Tests\Framework\Fixture;
+use Piwik\Tracker\Cache;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\Settings;
+
+/**
+ * @group SettingsTest
+ * @group TrackerVisitSettingsTest
+ * @group Tracker
+ */
+class SettingsTest extends IntegrationTestCase
+{
+    /**
+     * @var string
+     */
+    protected $ip = '123.30.30.30';
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        Fixture::createWebsite('2014-01-01 00:00:00');
+        Fixture::createWebsite('2014-01-01 00:00:00');
+        Cache::deleteTrackerCache();
+
+        $_SERVER['HTTP_USER_AGENT'] = '';
+    }
+
+    public function test_getConfigId_isSame()
+    {
+        $settings1 = $this->makeSettings(array('idsite' => 1));
+        $settings2 = $this->makeSettings(array('idsite' => 1));
+
+        $this->assertEquals($settings1->getConfigId(), $settings2->getConfigId());
+    }
+
+
+    public function test_getConfigId_isSame_whenConfiguredUserHasSameFingerprintAcrossWebsites()
+    {
+        $isSameFingerprintAcrossWebsites = true;
+
+        $settingsSite1 = $this->makeSettings(array('idsite' => 1), $isSameFingerprintAcrossWebsites);
+        $settingsSite2 = $this->makeSettings(array('idsite' => 2), $isSameFingerprintAcrossWebsites);
+
+        $this->assertEquals($settingsSite1->getConfigId(), $settingsSite2->getConfigId());
+    }
+
+    public function test_getConfigId_isDifferent_whenConfiguredUserHasDifferentFingerprintAcrossWebsites()
+    {
+        $isSameFingerprintAcrossWebsites = false;
+
+        $settingsSite1 = $this->makeSettings(array('idsite' => 1), $isSameFingerprintAcrossWebsites);
+        $settingsSite2 = $this->makeSettings(array('idsite' => 2), $isSameFingerprintAcrossWebsites);
+
+        $this->assertNotSame($settingsSite1->getConfigId(), $settingsSite2->getConfigId());
+    }
+
+    public function test_getConfigId_isSame_whenBrowserSamebutDifferentUserAgent()
+    {
+        $settingsFirefox = $this->makeSettings(array('ua' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10; rv:33.0) Gecko/20100101 Firefox/33.0'));
+        $settingsSlightlyDifferentUserAgent = $this->makeSettings(array('ua' => 'Mozilla/5.0 (Macintosh; Extra; string; here; Hello; world; Intel Mac OS X 10_10; rv:33.0) Gecko/20100101 Firefox/33.0'));
+
+        $this->assertSame($settingsSlightlyDifferentUserAgent->getConfigId(), $settingsFirefox->getConfigId());
+    }
+
+    public function test_getConfigId_isDifferent_whenBrowserChanges()
+    {
+        $settingsFirefox = $this->makeSettings(array('ua' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10; rv:33.0) Gecko/20100101 Firefox/33.0'));
+        $settingsChrome = $this->makeSettings(array('ua' => 'Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19 '));
+
+        $this->assertNotSame($settingsChrome->getConfigId(), $settingsFirefox->getConfigId());
+    }
+
+    public function test_getConfigId_isDifferent_whenOSChanges()
+    {
+        $settingsFirefoxMac = $this->makeSettings(array('ua' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10; rv:33.0) Gecko/20100101 Firefox/33.0'));
+        $settingsFirefoxLinux = $this->makeSettings(array('ua' => 'Mozilla/5.0 (Linux; rv:33.0) Gecko/20100101 Firefox/33.0'));
+
+        $this->assertNotSame($settingsFirefoxLinux->getConfigId(), $settingsFirefoxMac->getConfigId());
+    }
+
+    public function test_getConfigId_isDifferent_whenPluginChanges()
+    {
+        $params = array(
+            'pdf' => 1,
+            'cookie' => 1,
+            'fla' => 0,
+            'idsite' => 1,
+        );
+        $settingsWithoutFlash = $this->makeSettings($params);
+
+        // activate flash
+        $params['fla'] = 1;
+        $settingsWithFlash = $this->makeSettings($params);
+
+        $this->assertNotSame($settingsWithoutFlash->getConfigId(), $settingsWithFlash->getConfigId());
+    }
+
+    public function test_getConfigId_isDifferent_whenIPIsAnonimised()
+    {
+        $settingsIpIsNotAnon = $this->makeSettings(array(), true, '125.1.55.55');
+        $settingsIpIsAnon = $this->makeSettings(array(), true, '125.1.0.0');
+
+        $this->assertNotSame($settingsIpIsNotAnon->getConfigId(), $settingsIpIsAnon->getConfigId());
+    }
+
+    public function test_getConfigId_isSame_whenIPIsAnonimisedAndBothSame()
+    {
+        $settingsIpIsAnon = $this->makeSettings(array(), true, '125.2.0.0');
+        $settingsIpIsAnonBis = $this->makeSettings(array(), true, '125.2.0.0');
+
+        $this->assertSame($settingsIpIsAnonBis->getConfigId(), $settingsIpIsAnon->getConfigId());
+    }
+
+    /**
+     * @param $params array
+     * @param $isSameFingerprintAcrossWebsites
+     * @param $ip
+     * @return Settings
+     */
+    protected function makeSettings($params, $isSameFingerprintAcrossWebsites = false, $ip = null)
+    {
+        if(is_null($ip)) {
+            $ip = $this->ip;
+        }
+        $requestSite1 = $this->makeRequest($params);
+        $settingsSite1 = new Settings($requestSite1, $ip, $isSameFingerprintAcrossWebsites);
+        return $settingsSite1;
+    }
+
+    /**
+     * @param $extraParams array
+     * @return array
+     */
+    private function makeRequest($extraParams)
+    {
+        // default
+        $params = array(
+            'pdf' => 1,
+            'cookie' => 1,
+            'fla' => 0,
+            'idsite' => 1,
+        );
+        $params = array_merge($params, $extraParams);
+        $request = new Request($params);
+        return $request;
+    }
+}
diff --git a/tests/PHPUnit/Integration/Tracker/Visit/FactoryTest.php b/tests/PHPUnit/Integration/Tracker/Visit/FactoryTest.php
new file mode 100644
index 0000000000..2cefabc23b
--- /dev/null
+++ b/tests/PHPUnit/Integration/Tracker/Visit/FactoryTest.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Integration\Tracker\Visit;
+
+use Piwik\EventDispatcher;
+use Piwik\Piwik;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+use Piwik\Tracker;
+use Piwik\Tracker\Visit;
+use Piwik\Tracker\Visit\Factory;
+
+/**
+ * @group Tracker
+ * @group Handler
+ * @group Visit
+ * @group Factory
+ * @group FactoryTest
+ */
+class FactoryTest extends IntegrationTestCase
+{
+
+    public function tearDown()
+    {
+        EventDispatcher::getInstance()->clearObservers('Tracker.makeNewVisitObject');
+        parent::tearDown();
+    }
+
+    public function test_make_shouldCreateDefaultInstance()
+    {
+        $visit = Factory::make();
+        $this->assertInstanceOf('Piwik\\Tracker\\Visit', $visit);
+    }
+
+    public function test_make_shouldTriggerEventOnce()
+    {
+        $called = 0;
+        $self   = $this;
+        Piwik::addAction('Tracker.makeNewVisitObject', function ($visit) use (&$called, $self) {
+            $called++;
+            $self->assertNull($visit);
+        });
+
+        Factory::make();
+        $this->assertSame(1, $called);
+    }
+
+    public function test_make_shouldPreferManuallyCreatedHandlerInstanceInEventOverDefaultHandler()
+    {
+        $visitToUse = new Visit();
+        Piwik::addAction('Tracker.makeNewVisitObject', function (&$visit) use ($visitToUse) {
+            $visit = $visitToUse;
+        });
+
+        $visit = Factory::make();
+        $this->assertSame($visitToUse, $visit);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage The Visit object set in the plugin
+     */
+    public function test_make_shouldTriggerExceptionInCaseWrongInstanceCreatedInHandler()
+    {
+        Piwik::addAction('Tracker.makeNewVisitObject', function (&$visit) {
+            $visit = new Tracker();
+        });
+
+        Factory::make();
+    }
+}
diff --git a/tests/PHPUnit/Integration/Tracker/VisitTest.php b/tests/PHPUnit/Integration/Tracker/VisitTest.php
index 3a516d1c53..bbbb972cc3 100644
--- a/tests/PHPUnit/Integration/Tracker/VisitTest.php
+++ b/tests/PHPUnit/Integration/Tracker/VisitTest.php
@@ -9,13 +9,21 @@
 namespace Piwik\Tests\Integration\Tracker;
 
 use Piwik\Access;
+use Piwik\Cache;
+use Piwik\CacheId;
+use Piwik\DataAccess\ArchiveInvalidator;
+use Piwik\Date;
 use Piwik\Network\IPUtils;
 use Piwik\Plugin\Manager;
 use Piwik\Plugins\SitesManager\API;
+use Piwik\Tests\Framework\Fixture;
 use Piwik\Tests\Framework\Mock\FakeAccess;
+use Piwik\Tracker\ActionPageview;
 use Piwik\Tracker\Request;
+use Piwik\Tracker\Visit;
 use Piwik\Tracker\VisitExcluded;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+use Piwik\Tracker\Visitor;
 
 /**
  * @group Core
@@ -31,7 +39,8 @@ class VisitTest extends IntegrationTestCase
         FakeAccess::$superUser = true;
         Access::setSingletonInstance($pseudoMockAccess);
 
-        Manager::getInstance()->loadPlugins(array('SitesManager'));
+        Manager::getInstance()->loadTrackerPlugins();
+        Manager::getInstance()->loadPlugin('SitesManager');
     }
 
     /**
@@ -151,8 +160,13 @@ class VisitTest extends IntegrationTestCase
             'http://semalt.com' => true,
             'http://semalt.com/random/sub/page' => true,
             'http://semalt.com/out/of/here?mate' => true,
+            'http://buttons-for-website.com/out/of/here?mate' => true,
+            'https://buttons-for-website.com' => true,
+            'https://make-money-online.7makemoneyonline.com' => true,
+            'https://7makemoneyonline.com' => true,
             'http://valid.domain/' => false,
             'http://valid.domain/page' => false,
+            'https://valid.domain/page' => false,
         );
         API::getInstance()->setSiteSpecificUserAgentExcludeEnabled(true);
 
@@ -181,6 +195,10 @@ class VisitTest extends IntegrationTestCase
             '66.249.85.36' => true,
             '66.249.91.150' => true,
             '64.233.172.1' => true,
+            '64.233.172.200' => true,
+            '66.249.88.216' => true,
+            '66.249.83.204' => true,
+            '64.233.172.6' => true,
 
             // ddos bot
             '1.202.218.8' => true,
@@ -188,6 +206,9 @@ class VisitTest extends IntegrationTestCase
             // Not bots
             '66.248.91.150' => false,
             '66.250.91.150' => false,
+            // almost google range but not google
+            '66.249.2.1' => false,
+            '66.249.60.1' => false,
         );
 
         $idsite = API::getInstance()->addSite("name", "http://piwik.net/");
@@ -249,6 +270,187 @@ class VisitTest extends IntegrationTestCase
             $this->assertSame($isBot, $excluded->public_isNonHumanBot(), $userAgent);
         }
     }
+
+    public function test_isVisitNew_ReturnsFalse_IfLastActionTimestampIsWithinVisitTimeLength_AndNoDimensionForcesVisit_AndVisitorKnown()
+    {
+        $this->setDimensionsWithOnNewVisit(array(false, false, false));
+
+        /** @var Visit $visit */
+        list($visit, $visitor, $action) = $this->makeVisitorAndAction(
+            $lastActionTime = '2012-01-02 08:08:34', $thisActionTime = '2012-01-02 08:12:45', $isVisitorKnown = true);
+
+        $result = $visit->isVisitNew($visitor, $action);
+
+        $this->assertFalse($result);
+    }
+
+    public function test_isVisitNew_ReturnsTrue_IfLastActionTimestampWasYesterday()
+    {
+        $this->setDimensionsWithOnNewVisit(array(false, false, false));
+
+        // test same day
+        /** @var Visit $visit */
+        list($visit, $visitor, $action) = $this->makeVisitorAndAction(
+            $lastActionTime = '2012-01-01 23:59:58', $thisActionTime = '2012-01-01 23:59:59', $isVisitorKnown = true);
+        $result = $visit->isVisitNew($visitor, $action);
+        $this->assertFalse($result);
+
+        // test different day
+        list($visit, $visitor, $action) = $this->makeVisitorAndAction(
+        $lastActionTime = '2012-01-01 23:59:58', $thisActionTime = '2012-01-02 00:00:01', $isVisitorKnown = true);
+        $result = $visit->isVisitNew($visitor, $action);
+        $this->assertTrue($result);
+    }
+
+    public function test_markArchivedReportsAsInvalidIfArchiveAlreadyFinished_ShouldRemember_IfRequestWasDoneLongAgo()
+    {
+        $currentActionTime = '2012-01-02 08:12:45';
+        $idsite = API::getInstance()->addSite('name', 'http://piwik.net/');
+
+        $expectedRemembered = array('2012-01-02' => array($idsite));
+
+        $this->assertRememberedArchivedReportsThatShouldBeInvalidated($idsite, $currentActionTime, $expectedRemembered);
+    }
+
+    public function test_markArchivedReportsAsInvalidIfArchiveAlreadyFinished_ShouldNotRemember_IfRequestWasDoneJustAtStartOfTheDay()
+    {
+        $currentActionTime = Date::today()->getDatetime();
+        $idsite = API::getInstance()->addSite('name', 'http://piwik.net/');
+
+        $expectedRemembered = array();
+
+        $this->assertRememberedArchivedReportsThatShouldBeInvalidated($idsite, $currentActionTime, $expectedRemembered);
+    }
+
+    public function test_markArchivedReportsAsInvalidIfArchiveAlreadyFinished_ShouldRemember_IfRequestWasDoneAt11PMTheDayBefore()
+    {
+        $currentActionTime = Date::today()->subHour(1)->getDatetime();
+        $idsite = API::getInstance()->addSite('name', 'http://piwik.net/');
+
+        $expectedRemembered = array(
+            substr($currentActionTime, 0, 10) => array($idsite)
+        );
+
+        $this->assertRememberedArchivedReportsThatShouldBeInvalidated($idsite, $currentActionTime, $expectedRemembered);
+    }
+
+    public function test_markArchivedReportsAsInvalidIfArchiveAlreadyFinished_shouldConsiderWebsitesTimezone()
+    {
+        $timezone1 = 'UTC+4';
+        $timezone2 = 'UTC+6';
+
+        $currentActionTime1 = Date::today()->setTimezone($timezone1)->getDatetime();
+        $currentActionTime2 = Date::today()->setTimezone($timezone2)->getDatetime();
+        $idsite = API::getInstance()->addSite('name', 'http://piwik.net/', $ecommerce = null,
+            $siteSearch = null,
+            $searchKeywordParameters = null,
+            $searchCategoryParameters = null,
+            $excludedIps = null,
+            $excludedQueryParameters = null,
+            $timezone = 'UTC+5');
+
+        $expectedRemembered = array(
+            substr($currentActionTime1, 0, 10) => array($idsite)
+        );
+
+        // if website timezone was von considered both would be today (expected = array())
+        $this->assertRememberedArchivedReportsThatShouldBeInvalidated($idsite, $currentActionTime1, array());
+        $this->assertRememberedArchivedReportsThatShouldBeInvalidated($idsite, $currentActionTime2, $expectedRemembered);
+    }
+
+    private function assertRememberedArchivedReportsThatShouldBeInvalidated($idsite, $requestDate, $expectedRemeberedArchivedReports)
+    {
+        /** @var Visit $visit */
+        list($visit) = $this->prepareVisitWithRequest(array(
+            'idsite' => $idsite,
+            'rec' => 1,
+            'cip' => '156.146.156.146',
+            'token_auth' => Fixture::getTokenAuth()
+        ), $requestDate);
+
+        $visit->handle();
+
+        $archive = new ArchiveInvalidator();
+        $remembered = $archive->getRememberedArchivedReportsThatShouldBeInvalidated();
+
+        $this->assertSame($expectedRemeberedArchivedReports, $remembered);
+    }
+
+    private function prepareVisitWithRequest($requestParams, $requestDate)
+    {
+        $request = new Request($requestParams);
+        $request->setCurrentTimestamp(Date::factory($requestDate)->getTimestamp());
+
+        $visit = new Visit();
+        $visit->setRequest($request);
+
+        $visit->handle();
+
+        return array($visit, $request);
+    }
+
+    public function test_isVisitNew_ReturnsTrue_IfLastActionTimestampIsNotWithinVisitTimeLength_AndNoDimensionForcesVisit_AndVisitorNotKnown()
+    {
+        $this->setDimensionsWithOnNewVisit(array(false, false, false));
+
+        /** @var Visit $visit */
+        list($visit, $visitor, $action) = $this->makeVisitorAndAction($lastActionTime = '2012-01-02 08:08:34', $thisActionTime = '2012-01-02 09:12:45');
+
+        $result = $visit->isVisitNew($visitor, $action);
+
+        $this->assertTrue($result);
+    }
+
+    public function test_isVisitNew_ReturnsTrue_IfLastActionTimestampIsWithinVisitTimeLength_AndDimensionForcesVisit()
+    {
+        $this->setDimensionsWithOnNewVisit(array(false, false, true));
+
+        /** @var Visit $visit */
+        list($visit, $visitor, $action) = $this->makeVisitorAndAction($lastActionTime = '2012-01-02 08:08:34', $thisActionTime = '2012-01-02 08:12:45');
+
+        $result = $visit->isVisitNew($visitor, $action);
+
+        $this->assertTrue($result);
+    }
+
+    public function test_isVisitNew_ReturnsTrue_IfDimensionForcesVisit_AndVisitorKnown()
+    {
+        $this->setDimensionsWithOnNewVisit(array(false, false, true));
+
+        /** @var Visit $visit */
+        list($visit, $visitor, $action) = $this->makeVisitorAndAction($lastActionTime = '2012-01-02 08:08:34', $thisActionTime = '2012-01-02 08:12:45');
+
+        $result = $visit->isVisitNew($visitor, $action);
+
+        $this->assertTrue($result);
+    }
+
+    private function makeVisitorAndAction($lastActionTimestamp, $currentActionTime, $isVisitorKnown = false)
+    {
+        $idsite = API::getInstance()->addSite("name", "http://piwik.net/");
+
+        list($visit, $request) = $this->prepareVisitWithRequest(array('idsite' => $idsite), $currentActionTime);
+
+        $visitor = new Visitor($request, 'configid', array('visit_last_action_time' => Date::factory($lastActionTimestamp)->getTimestamp()));
+        $visitor->setIsVisitorKnown($isVisitorKnown);
+
+        $action = new ActionPageview($request);
+
+        return array($visit, $visitor, $action);
+    }
+
+    private function setDimensionsWithOnNewVisit($dimensionOnNewVisitResults)
+    {
+        $dimensions = array();
+        foreach ($dimensionOnNewVisitResults as $onNewVisitResult) {
+            $dim = $this->getMock('Piwik\\Plugin\\Dimension', array('shouldForceNewVisit', 'getColumnName'));
+            $dim->expects($this->any())->method('shouldForceNewVisit')->will($this->returnValue($onNewVisitResult));
+            $dimensions[] = $dim;
+        }
+
+        $cache = Cache::getTransientCache();
+        $cache->save(CacheId::pluginAware('VisitDimensions'), $dimensions);
+    }
 }
 
 class VisitExcluded_public extends VisitExcluded
diff --git a/tests/PHPUnit/Integration/TrackerTest.php b/tests/PHPUnit/Integration/TrackerTest.php
index bc4c99090c..9f261074ea 100644
--- a/tests/PHPUnit/Integration/TrackerTest.php
+++ b/tests/PHPUnit/Integration/TrackerTest.php
@@ -9,184 +9,371 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Common;
-use Piwik\Db;
+use Piwik\Config;
+use Piwik\EventDispatcher;
+use Piwik\Piwik;
+use Piwik\Plugin;
+use Piwik\SettingsServer;
 use Piwik\Tests\Framework\Fixture;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 use Piwik\Tracker;
+use Piwik\Tracker\RequestSet;
+use Piwik\Tracker\Request;
+use Piwik\Translate;
+
+class TestTracker extends Tracker
+{
+    public function __construct()
+    {
+        $this->isInstalled = true;
+    }
+
+    public function setIsNotInstalled()
+    {
+        $this->isInstalled = false;
+    }
+
+    public function disconnectDatabase()
+    {
+        parent::disconnectDatabase();
+    }
+}
 
 /**
- * @group Core
+ * @group TrackerTest
+ * @group Tracker
  */
 class TrackerTest extends IntegrationTestCase
 {
+    /**
+     * @var TestTracker
+     */
+    private $tracker;
+
+    /**
+     * @var Request
+     */
+    private $request;
+
     public function setUp()
     {
         parent::setUp();
-        Fixture::createWebsite('2014-02-04');
+
+        Fixture::createWebsite('2014-01-01 00:00:00');
+
+        $this->tracker = new TestTracker();
+        $this->request = $this->buildRequest(array('idsite' => 1));
     }
 
-    protected static function configureFixture($fixture)
+    public function tearDown()
     {
-        $fixture->createSuperUser = true;
+        $this->restoreConfigFile();
+        if($this->tracker) {
+            $this->tracker->disconnectDatabase();
+        }
+        EventDispatcher::getInstance()->clearObservers('Tracker.makeNewVisitObject');
+        if (array_key_exists('PIWIK_TRACKER_DEBUG', $GLOBALS)) {
+            unset($GLOBALS['PIWIK_TRACKER_DEBUG']);
+        }
+        parent::tearDown();
     }
 
-    /**
-     * Test the Bulk tracking API as documented in: http://developer.piwik.org/api-reference/tracking-api#bulk-tracking
-     *
-     * With invalid token_auth the request would still work
-     */
-    public function test_trackingApiWithBulkRequests_viaCurl_withWrongTokenAuth()
+    public function test_isInstalled_shouldReturnTrue_AsPiwikIsInstalled()
     {
-        $token_auth = '33dc3f2536d3025974cccb4b4d2d98f4';
-        $this->issueBulkTrackingRequest($token_auth, $expectTrackingToSucceed = true);
+        $this->assertTrue($this->tracker->isInstalled());
     }
 
-    public function test_trackingApiWithBulkRequests_viaCurl_withCorrectTokenAuth()
+    public function test_shouldRecordStatistics_shouldReturnTrue_IfEnabled_WhichItIsByDefault()
     {
-        $token_auth = Fixture::getTokenAuth();
-        \Piwik\Filesystem::deleteAllCacheOnUpdate();
-        $this->issueBulkTrackingRequest($token_auth, $expectTrackingToSucceed = true);
+        $this->assertTrue($this->tracker->shouldRecordStatistics());
     }
 
-    public function test_trackingEcommerceOrder_WithHtmlEscapedText_InsertsCorrectLogs()
+    public function test_shouldRecordStatistics_shouldReturnFalse_IfEnabledButNotInstalled()
     {
-        // item sku, item name, item category, item price, item quantity
-        // NOTE: used to test with '&#x1D306;' character, however, mysql on travis fails with this when
-        //       inserting this character decoded.
-        $ecItems = array(array('&quot;scarysku', 'superscarymovie&quot;', 'scary &amp; movies', 12.99, 1),
-                         array('&gt; scary', 'but &lt; &quot;super', 'scary&quot;', 14, 15),
-                         array("&#x27;Foo &#xA9;", " bar ", " baz &#x2603; qux", 16, 17));
+        $this->tracker->setIsNotInstalled();
+        $this->assertFalse($this->tracker->shouldRecordStatistics());
+    }
 
-        $urlToTest = $this->getEcommerceItemsUrl($ecItems);
+    public function test_shouldRecordStatistics_shouldReturnFalse_IfDisabledButInstalled()
+    {
+        $oldConfig = Tracker\TrackerConfig::getConfigValue('record_statistics');
+        Tracker\TrackerConfig::setConfigValue('record_statistics', 0);
 
-        $response = $this->sendTrackingRequestByCurl($urlToTest);
-        Fixture::checkResponse($response);
+        $this->assertFalse($this->tracker->shouldRecordStatistics());
+
+        Tracker\TrackerConfig::setConfigValue('record_statistics', $oldConfig); // reset
+    }
+
+    public function test_loadTrackerEnvironment_shouldSetGlobalsDebugVar_WhichShouldBeDisabledByDefault()
+    {
+        $this->assertTrue(!array_key_exists('PIWIK_TRACKER_DEBUG', $GLOBALS));
+
+        Tracker::loadTrackerEnvironment();
 
-        $this->assertEquals(1, $this->getCountOfConversions());
+        $this->assertFalse($GLOBALS['PIWIK_TRACKER_DEBUG']);
+    }
+
+    public function test_loadTrackerEnvironment_shouldSetGlobalsDebugVar()
+    {
+        $this->assertTrue(!array_key_exists('PIWIK_TRACKER_DEBUG', $GLOBALS));
 
-        $conversionItems = $this->getConversionItems();
-        $this->assertEquals(3, count($conversionItems));
+        $oldConfig = Tracker\TrackerConfig::getConfigValue('debug');
+        Tracker\TrackerConfig::setConfigValue('debug', 1);
 
-        $this->assertActionEquals('"scarysku', $conversionItems[0]['idaction_sku']);
-        $this->assertActionEquals('superscarymovie"', $conversionItems[0]['idaction_name']);
-        $this->assertActionEquals('scary & movies', $conversionItems[0]['idaction_category']);
+        Tracker::loadTrackerEnvironment();
+        $this->assertTrue($this->tracker->isDebugModeEnabled());
 
-        $this->assertActionEquals('> scary', $conversionItems[1]['idaction_sku']);
-        $this->assertActionEquals('but < "super', $conversionItems[1]['idaction_name']);
-        $this->assertActionEquals('scary"', $conversionItems[1]['idaction_category']);
+        Tracker\TrackerConfig::setConfigValue('debug', $oldConfig); // reset
 
-        $this->assertActionEquals('\'Foo ©', $conversionItems[2]['idaction_sku']);
-        $this->assertActionEquals('bar', $conversionItems[2]['idaction_name']);
-        $this->assertActionEquals('baz ☃ qux', $conversionItems[2]['idaction_category']);
+        $this->assertTrue($GLOBALS['PIWIK_TRACKER_DEBUG']);
     }
 
-    public function test_trackingEcommerceOrder_WithAmpersandAndQuotes_InsertsCorrectLogs()
+    public function test_loadTrackerEnvironment_shouldEnableTrackerMode()
     {
-        // item sku, item name, item category, item price, item quantity
-        $ecItems = array(array("\"scarysku&", "superscarymovie'", 'scary <> movies', 12.99, 1));
+        $this->assertTrue(!array_key_exists('PIWIK_TRACKER_DEBUG', $GLOBALS));
 
-        $urlToTest = $this->getEcommerceItemsUrl($ecItems);
+        $this->assertFalse(SettingsServer::isTrackerApiRequest());
 
-        $response = $this->sendTrackingRequestByCurl($urlToTest);
-        Fixture::checkResponse($response);
+        Tracker::loadTrackerEnvironment();
+
+        $this->assertTrue(SettingsServer::isTrackerApiRequest());
+    }
+
+    public function test_loadTrackerEnvironment_shouldNotThrow_whenConfigNotFound()
+    {
+        $this->assertTrue(!array_key_exists('PIWIK_TRACKER_DEBUG', $GLOBALS));
 
-        $this->assertEquals(1, $this->getCountOfConversions());
+        $this->assertFalse(SettingsServer::isTrackerApiRequest());
 
-        $conversionItems = $this->getConversionItems();
-        $this->assertEquals(1, count($conversionItems));
+        $this->assertTrue(Config::getInstance()->existsLocalConfig());
 
-        $this->assertActionEquals('"scarysku&', $conversionItems[0]['idaction_sku']);
-        $this->assertActionEquals('superscarymovie\'', $conversionItems[0]['idaction_name']);
-        $this->assertActionEquals('scary <> movies', $conversionItems[0]['idaction_category']);
+        $this->removeConfigFile();
+        Config::getInstance()->clear();
+
+        $this->assertFalse(Config::getInstance()->existsLocalConfig());
+
+        Tracker::loadTrackerEnvironment();
+
+        $this->assertTrue(SettingsServer::isTrackerApiRequest());
     }
 
-    public function test_trackingEcommerceOrder_DoesNotFail_WhenEmptyEcommerceItemsParamUsed()
+    protected function restoreConfigFile()
     {
-        // item sku, item name, item category, item price, item quantity
-        $urlToTest = $this->getEcommerceItemsUrl("");
+        $backupConfig = $this->getLocalConfigPathMoved();
+        $localConfig = $this->getLocalConfigPath();
+        @shell_exec("mv $backupConfig $localConfig 2> /dev/null");
+    }
 
-        $response = $this->sendTrackingRequestByCurl($urlToTest);
-        Fixture::checkResponse($response);
+    public function test_isDatabaseConnected_shouldReturnFalse_IfNotConnected()
+    {
+        $this->tracker->disconnectDatabase();
+
+        $this->assertFalse($this->tracker->isDatabaseConnected());
+    }
+
+    public function test_getDatabase_shouldReturnDbInstance()
+    {
+        $db = $this->tracker->getDatabase();
+
+        $this->assertInstanceOf('Piwik\\Tracker\\Db', $db);
+    }
+
+    public function test_isDatabaseConnected_shouldReturnTrue_WhenDbIsConnected()
+    {
+        $db = $this->tracker->getDatabase(); // make sure connected
+        $this->assertNotEmpty($db);
 
-        $this->assertEquals(1, $this->getCountOfConversions());
-        $this->assertEquals(0, count($this->getConversionItems()));
+        $this->assertTrue($this->tracker->isDatabaseConnected());
     }
 
-    public function test_trackingEcommerceOrder_DoesNotFail_WhenNonArrayUsedWithEcommerceItemsParam()
+    public function test_disconnectDatabase_shouldDisconnectDb()
     {
-        // item sku, item name, item category, item price, item quantity
-        $urlToTest = $this->getEcommerceItemsUrl("45");
+        $this->tracker->getDatabase(); // make sure connected
+        $this->assertTrue($this->tracker->isDatabaseConnected());
+
+        $this->tracker->disconnectDatabase();
+
+        $this->assertFalse($this->tracker->isDatabaseConnected());
+    }
+
+    public function test_trackRequest_shouldNotTrackAnything_IfRequestIsEmpty()
+    {
+        $called = false;
+        Piwik::addAction('Tracker.makeNewVisitObject', function () use (&$called) {
+            $called = true;
+        });
+
+        $this->tracker->trackRequest(new Request(array()));
+
+        $this->assertFalse($called);
+    }
+
+    public function test_trackRequest_shouldTrack_IfRequestIsNotEmpty()
+    {
+        $called = false;
+        Piwik::addAction('Tracker.makeNewVisitObject', function () use (&$called) {
+            $called = true;
+        });
+
+        $this->tracker->trackRequest($this->request);
+
+        $this->assertTrue($called);
+    }
+
+    public function test_trackRequest_shouldIncreaseLoggedRequestsCounter()
+    {
+        $this->tracker->trackRequest($this->request);
+        $this->assertSame(1, $this->tracker->getCountOfLoggedRequests());
+
+        $this->tracker->trackRequest($this->request);
+        $this->assertSame(2, $this->tracker->getCountOfLoggedRequests());
+    }
+
+    public function test_trackRequest_shouldIncreaseLoggedRequestsCounter_EvenIfRequestIsEmpty()
+    {
+        $request = $this->buildRequest(array());
+        $this->assertTrue($request->isEmptyRequest());
+
+        $this->tracker->trackRequest($request);
+        $this->assertSame(1, $this->tracker->getCountOfLoggedRequests());
+
+        $this->tracker->trackRequest($request);
+        $this->assertSame(2, $this->tracker->getCountOfLoggedRequests());
+    }
+
+    public function test_trackRequest_shouldActuallyTrack()
+    {
+        $request = $this->buildRequest(array('idsite' => 1, 'url' => 'http://www.example.com', 'action_name' => 'test', 'rec' => 1));
+        $this->tracker->trackRequest($request);
+
+        $this->assertActionEquals('test', 1);
+        $this->assertActionEquals('example.com', 2);
+    }
+
+    public function test_main_shouldReturnEmptyPiwikResponse_IfNoRequestsAreGiven()
+    {
+        $requestSet = $this->getEmptyRequestSet();
+        $requestSet->setRequests(array());
+
+        $response = $this->tracker->main($this->getDefaultHandler(), $requestSet);
+
+        $expected = "<a href='/'>Piwik</a> is a free/libre web <a href='http://piwik.org'>analytics</a> that lets you keep control of your data.";
+        $this->assertEquals($expected, $response);
+    }
+
+    public function test_main_shouldReturnApiResponse_IfRequestsAreGiven()
+    {
+        $response = $this->tracker->main($this->getDefaultHandler(), $this->getRequestSetWithRequests());
 
-        $response = $this->sendTrackingRequestByCurl($urlToTest);
         Fixture::checkResponse($response);
+    }
+
+    public function test_main_shouldReturnNotReturnAnyApiResponse_IfImageIsDisabled()
+    {
+        $_GET['send_image'] = '0';
+
+        $response = $this->tracker->main($this->getDefaultHandler(), $this->getRequestSetWithRequests());
+
+        unset($_GET['send_image']);
 
-        $this->assertEquals(0, $this->getCountOfConversions());
-        $this->assertEquals(0, count($this->getConversionItems()));
+        $this->assertEquals('', $response);
     }
 
-    protected function issueBulkTrackingRequest($token_auth, $expectTrackingToSucceed)
+    public function test_main_shouldActuallyTrackNumberOfTrackedRequests()
     {
-        $piwikHost = Fixture::getRootUrl() . 'tests/PHPUnit/proxy/piwik.php';
+        $this->assertSame(0, $this->tracker->getCountOfLoggedRequests());
 
-        $command = 'curl -s -X POST -d \'{"requests":["?idsite=1&url=http://example.org&action_name=Test bulk log Pageview&rec=1","?idsite=1&url=http://example.net/test.htm&action_name=Another bulk page view&rec=1"],"token_auth":"' . $token_auth . '"}\' ' . $piwikHost;
+        $this->tracker->main($this->getDefaultHandler(), $this->getRequestSetWithRequests());
 
-        exec($command, $output, $result);
-        if ($result !== 0) {
-            throw new \Exception("tracking bulk failed: " . implode("\n", $output) . "\n\ncommand used: $command");
-        }
-        $output = implode("", $output);
-        $this->assertStringStartsWith('{"status":', $output);
-
-        if($expectTrackingToSucceed) {
-            $this->assertNotContains('error', $output);
-            $this->assertContains('success', $output);
-        } else {
-            $this->assertContains('error', $output);
-            $this->assertNotContains('success', $output);
-        }
+        $this->assertSame(2, $this->tracker->getCountOfLoggedRequests());
     }
 
-    private function sendTrackingRequestByCurl($url)
+    public function test_main_shouldNotTrackAnythingButStillReturnApiResponse_IfNotInstalledOrShouldNotRecordStats()
     {
-        if (!function_exists('curl_init')) {
-            $this->markTestSkipped('Curl is not installed');
-        }
+        $this->tracker->setIsNotInstalled();
+        $response = $this->tracker->main($this->getDefaultHandler(), $this->getRequestSetWithRequests());
+
+        Fixture::checkResponse($response);
+        $this->assertSame(0, $this->tracker->getCountOfLoggedRequests());
+    }
 
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, Fixture::getRootUrl() . 'tests/PHPUnit/proxy/piwik.php' . $url);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_HEADER, true);
-        curl_setopt($ch, CURLOPT_TIMEOUT, 10);
+    public function test_main_shouldReadValuesFromGETandPOSTifNoRequestSet()
+    {
+        $_GET  = array('idsite' => '1');
+        $_POST = array('url' => 'http://localhost/post');
 
-        $response = curl_exec($ch);
-        $headerSize = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
-        $response = substr($response, $headerSize);
+        $requestSet = $this->getEmptyRequestSet();
+        $response   = $this->tracker->main($this->getDefaultHandler(), $requestSet);
 
-        curl_close($ch);
+        $_GET  = array();
+        $_POST = array();
 
-        return $response;
+        Fixture::checkResponse($response);
+        $this->assertSame(1, $this->tracker->getCountOfLoggedRequests());
+
+        $identifiedRequests = $requestSet->getRequests();
+        $this->assertCount(1, $identifiedRequests);
+        $this->assertEquals(array('idsite' => '1', 'url' => 'http://localhost/post'),
+                            $identifiedRequests[0]->getParams());
+    }
+
+    private function getDefaultHandler()
+    {
+        return new Tracker\Handler();
+    }
+
+    private function getEmptyRequestSet()
+    {
+        return new RequestSet();
+    }
+
+    private function getRequestSetWithRequests()
+    {
+        $requestSet = $this->getEmptyRequestSet();
+        $requestSet->setRequests(array(
+            $this->buildRequest(array('idsite' => '1', 'url' => 'http://localhost')),
+            $this->buildRequest(array('idsite' => '1', 'url' => 'http://localhost/test'))
+        ));
+
+        return $requestSet;
     }
 
     private function assertActionEquals($expected, $idaction)
     {
-        $actionName = Db::fetchOne("SELECT name FROM " . Common::prefixTable('log_action') . " WHERE idaction = ?", array($idaction));
+        $actionName = Tracker::getDatabase()->fetchOne("SELECT name FROM " . Common::prefixTable('log_action') . " WHERE idaction = ?", array($idaction));
         $this->assertEquals($expected, $actionName);
     }
 
-    private function getCountOfConversions()
+    private function buildRequest($params)
+    {
+        return new Request($params);
+    }
+
+    /**
+     * @return string
+     */
+    protected function getLocalConfigPath()
     {
-        return Db::fetchOne("SELECT COUNT(*) FROM " . Common::prefixTable('log_conversion'));
+        return PIWIK_USER_PATH . "/config/config.ini.php ";
     }
 
-    private function getConversionItems()
+    /**
+     * @return string
+     */
+    protected function getLocalConfigPathMoved()
     {
-        return Db::fetchAll("SELECT * FROM " . Common::prefixTable('log_conversion_item'));
+        return PIWIK_USER_PATH . "/config/tmp-config.ini.php";
     }
 
-    private function getEcommerceItemsUrl($ecItems, $doJsonEncode = true)
+    /**
+     * @return array
+     */
+    protected function removeConfigFile()
     {
-        $ecItemsStr = $doJsonEncode ? json_encode($ecItems) : $ecItems;
-        return "?idsite=1&idgoal=0&rec=1&url=" . urlencode('http://quellehorreur.com/movies') . "&ec_items="
-        . urlencode($ecItemsStr) . '&ec_id=myspecial-id-1234&revenue=16.99&ec_st=12.99&ec_tx=0&ec_sh=3';
+        $localConfig = $this->getLocalConfigPath();
+        $backupConfig = $this->getLocalConfigPathMoved();
+        shell_exec("mv $localConfig $backupConfig");
+        return array($localConfig, $backupConfig);
     }
+
 }
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/UpdaterTest.php b/tests/PHPUnit/Integration/UpdaterTest.php
index c15d6b0a88..c62210bde6 100644
--- a/tests/PHPUnit/Integration/UpdaterTest.php
+++ b/tests/PHPUnit/Integration/UpdaterTest.php
@@ -14,7 +14,6 @@ use Piwik\Tests\Framework\Fixture;
 
 /**
  * @group Core
- * @group Core_UpdaterTest
  */
 class UpdaterTest extends IntegrationTestCase
 {
diff --git a/tests/PHPUnit/Integration/WidgetsListTest.php b/tests/PHPUnit/Integration/WidgetsListTest.php
index baa3395058..340bb9abed 100644
--- a/tests/PHPUnit/Integration/WidgetsListTest.php
+++ b/tests/PHPUnit/Integration/WidgetsListTest.php
@@ -19,7 +19,7 @@ use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 /**
  * @group Core
  */
-class Core_WidgetsListTest extends IntegrationTestCase
+class WidgetsListTest extends IntegrationTestCase
 {
     public function testGet()
     {
@@ -41,11 +41,11 @@ class Core_WidgetsListTest extends IntegrationTestCase
             'VisitsSummary_VisitsSummary'  => 6,
             'Live!'                        => 4,
             'General_Visitors'             => 12,
-            'UserSettings_VisitorSettings' => 5,
+            'General_VisitorSettings'      => 5,
             'General_Actions'              => 10,
             'Events_Events'                => 3,
             'Actions_SubmenuSitesearch'    => 5,
-            'Referrers_Referrers'            => 7,
+            'Referrers_Referrers'          => 7,
             'Goals_Goals'                  => 1,
             'SEO'                          => 2,
             'Example Widgets'              => 4,
@@ -164,7 +164,7 @@ class Core_WidgetsListTest extends IntegrationTestCase
         FakeAccess::$superUser = true;
         Access::setSingletonInstance($pseudoMockAccess);
 
-        Translate::loadEnglishTranslation();
+        Translate::loadAllTranslations();
 
         Fixture::createWebsite('2009-01-04 00:11:42', true);
 
@@ -175,5 +175,7 @@ class Core_WidgetsListTest extends IntegrationTestCase
 
         $this->assertTrue(WidgetsList::isDefined('Actions', 'getPageUrls'));
         $this->assertFalse(WidgetsList::isDefined('Actions', 'inValiD'));
+
+        Translate::reset();
     }
 }
diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php
deleted file mode 100644
index 47c2f16bff..0000000000
--- a/tests/PHPUnit/IntegrationTestCase.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-/**
- * @deprecated since 2.8.0 extend \Piwik\Tests\Framework\TestCase\SystemTestCase instead
- */
-class IntegrationTestCase extends \Piwik\Tests\Framework\TestCase\SystemTestCase
-{
-    public static function setUpBeforeClass()
-    {
-        \Piwik\Log::debug('\IntegrationTestCase is deprecated since 2.8.0 extend \Piwik\Tests\Framework\TestCase\SystemTestCase instead');
-
-        parent::setUpBeforeClass();
-    }
-}
-
-IntegrationTestCase::$fixture = new \Piwik\Tests\Framework\Fixture();
diff --git a/tests/PHPUnit/System/ArchiveCronTest.php b/tests/PHPUnit/System/ArchiveCronTest.php
index c0a834b5d7..1f162b10df 100644
--- a/tests/PHPUnit/System/ArchiveCronTest.php
+++ b/tests/PHPUnit/System/ArchiveCronTest.php
@@ -25,31 +25,29 @@ use Exception;
  */
 class ArchiveCronTest extends SystemTestCase
 {
+    /**
+     * @var ManySitesImportedLogs
+     */
     public static $fixture = null; // initialized below class definition
 
     public function getApiForTesting()
     {
         $results = array();
 
-        // First, API calls for Segmented reports
-        // Disabling these tests as they randomly fail... This could actually be a bug.
-        // FIXME - I have failed finding the cause for these test to randomly fail
-        // eg.
-//        foreach (self::$fixture->getDefaultSegments() as $segmentName => $info) {
-//            $results[] = array('VisitsSummary.get', array('idSite'     => 'all',
-//                                                          'date'       => '2012-08-09',
-//                                                          'periods'    => array('day', 'week', 'month', 'year'),
-//                                                          'segment'    => $info['definition'],
-//                                                          'testSuffix' => '_' . $segmentName));
-//
-//
-//        }
+        foreach (self::$fixture->getDefaultSegments() as $segmentName => $info) {
+            $results[] = array('VisitsSummary.get', array('idSite'     => 'all',
+                                                          'date'       => '2012-08-09',
+                                                          'periods'    => array('day', 'week', 'month', 'year'),
+                                                          'segment'    => $info['definition'],
+                                                          'testSuffix' => '_' . $segmentName));
+
+
+        }
 
         // API Call Without segments
-        // TODO uncomment week and year period
         $results[] = array('VisitsSummary.get', array('idSite'  => 'all',
                                                       'date'    => '2012-08-09',
-                                                      'periods' => array('day', 'month', /* 'year',  'week' */)));
+                                                      'periods' => array('day', 'month', 'year',  'week')));
 
         $results[] = array('VisitsSummary.get', array('idSite'     => 'all',
                                                       'date'       => '2012-08-09',
@@ -61,16 +59,17 @@ class ArchiveCronTest extends SystemTestCase
                           ManySitesImportedLogs::SEGMENT_PRE_ARCHIVED_CONTAINS_ENCODED
         );
         foreach($segments as $segment) {
-            // TODO debugging travis
-            continue;
-
             // Test with a pre-processed segment
             $results[] = array(array('VisitsSummary.get', 'Live.getLastVisitsDetails', 'VisitFrequency.get'),
                                array('idSite'     => '1',
                                      'date'       => '2012-08-09',
                                      'periods'    => array('day', 'year'),
                                      'segment'    => $segment,
-                                     'testSuffix' => '_preArchivedSegment'));
+                                     'testSuffix' => '_preArchivedSegment',
+                                     'otherRequestParameters' => array(
+                                        'hideColumns' => 'latitude,longitude'
+                                     ))
+            );
         }
 
         return $results;
diff --git a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php
index fa8de721a3..f22408348d 100644
--- a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php
+++ b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php
@@ -89,6 +89,26 @@ class BackwardsCompatibility1XTest extends SystemTestCase
         $idSite = 1;
         $dateTime = '2012-03-06 11:22:33';
 
+        $defaultOptions = array(
+            'idSite' => $idSite,
+            'date'   => $dateTime,
+            'disableArchiving' => true,
+            'otherRequestParameters' => array(
+                'hideColumns' => 'nb_users',
+            )
+        );
+
+        $reportsToCompareSeparately = array(
+
+            // the label column is not the first column here
+            'MultiSites.getAll',
+
+            // those reports generate a different segment as a different raw value was stored that time
+            'DevicesDetection.getOsVersions',
+            'UserSettings.getOS',
+            'UserSettings.getBrowserType'
+        );
+
         $apiNotToCall = array(
             // in the SQL dump, a referrer is named referer.com, but now in OneVisitorTwoVisits it is referrer.com
             'Referrers',
@@ -104,17 +124,17 @@ class BackwardsCompatibility1XTest extends SystemTestCase
 
              // the Action.getPageTitles test fails for unknown reason, so skipping it
              // eg. https://travis-ci.org/piwik/piwik/jobs/24449365
-            'Action.getPageTitles'
+            'Action.getPageTitles',
         );
 
+        $apiNotToCall = array_merge($apiNotToCall, $reportsToCompareSeparately);
+
+        $allReportsOptions = $defaultOptions;
+        $allReportsOptions['compareAgainst'] = 'OneVisitorTwoVisits';
+        $allReportsOptions['apiNotToCall']   = $apiNotToCall;
+
         return array(
-            array('all', array('idSite' => $idSite, 'date' => $dateTime,
-                               'compareAgainst' => 'OneVisitorTwoVisits',
-                               'disableArchiving' => true,
-                               'apiNotToCall' => $apiNotToCall,
-                               'otherRequestParameters' => array(
-                                   'hideColumns' => 'nb_users',
-                               ))),
+            array('all', $allReportsOptions),
 
             array('VisitFrequency.get', array('idSite' => $idSite, 'date' => '2012-03-03', 'setDateLastN' => true,
                                               'disableArchiving' => true, 'testSuffix' => '_multipleDates')),
@@ -127,7 +147,8 @@ class BackwardsCompatibility1XTest extends SystemTestCase
                                               'periods' => array('range'), 'disableArchiving' => true)),
 
             array('VisitFrequency.get', array('idSite' => $idSite, 'date' => '2012-03-03,2012-12-12', 'periods' => array('month'),
-                                              'testSuffix' => '_multipleOldNew', 'disableArchiving' => true))
+                                              'testSuffix' => '_multipleOldNew', 'disableArchiving' => true)),
+            array($reportsToCompareSeparately, $defaultOptions),
         );
     }
 }
diff --git a/tests/PHPUnit/System/BlobReportLimitingTest.php b/tests/PHPUnit/System/BlobReportLimitingTest.php
index b539e111b8..f40305d1ad 100755
--- a/tests/PHPUnit/System/BlobReportLimitingTest.php
+++ b/tests/PHPUnit/System/BlobReportLimitingTest.php
@@ -37,7 +37,7 @@ class BlobReportLimitingTest extends SystemTestCase
             'CustomVariables.getCustomVariables',
             'Referrers.getReferrerType', 'Referrers.getKeywords', 'Referrers.getSearchEngines',
             'Referrers.getWebsites', 'Referrers.getAll', /* TODO 'Referrers.getCampaigns', */
-            'UserSettings.getResolution', 'UserSettings.getConfiguration', 'DevicesDetection.getOsVersions',
+            'Resolution.getResolution', 'Resolution.getConfiguration', 'DevicesDetection.getOsVersions',
             'DevicesDetection.getBrowserVersions',
             'UserCountry.getRegion', 'UserCountry.getCity',
         );
diff --git a/tests/PHPUnit/System/CliMultiTest.php b/tests/PHPUnit/System/CliMultiTest.php
index 8797eeec7e..1537cd9dec 100644
--- a/tests/PHPUnit/System/CliMultiTest.php
+++ b/tests/PHPUnit/System/CliMultiTest.php
@@ -12,13 +12,10 @@ use Piwik\Tests\Framework\TestCase\SystemTestCase;
 use Piwik\Tests\Framework\Fixture;
 
 /**
- * Class Core_CliMultiTest
- *
  * @group Core
- * @group Core_CliMultiTest
  * @group CliMulti
  */
-class Core_CliMultiTest extends SystemTestCase
+class CliMultiTest extends SystemTestCase
 {
     /**
      * @var \Piwik\CliMulti
diff --git a/tests/PHPUnit/System/CustomEventsTest.php b/tests/PHPUnit/System/CustomEventsTest.php
index a655750164..3669d5aa20 100644
--- a/tests/PHPUnit/System/CustomEventsTest.php
+++ b/tests/PHPUnit/System/CustomEventsTest.php
@@ -112,6 +112,16 @@ class CustomEventsTest extends SystemTestCase
                                                 'apiAction'    => $apiAction,
                                                 'testSuffix'   => '_' . $api . '_lastN')
             );
+            $result[] = array(
+                'API.getProcessedReport', array('idSite'       => $idSite1,
+                                                'date'         => $dateTime,
+                                                'periods'      => $dayPeriod,
+                                                'setDateLastN' => true,
+                                                'apiModule'    => $apiModule,
+                                                'apiAction'    => $apiAction,
+                                                'otherRequestParameters' => array('flat' => '1'),
+                                                'testSuffix'   => '_' . $api . '_flat')
+            );
         }
 
         // Test secondary dimensions
diff --git a/tests/PHPUnit/System/DuplicateActionsTest.php b/tests/PHPUnit/System/DuplicateActionsTest.php
new file mode 100644
index 0000000000..7d16329fa0
--- /dev/null
+++ b/tests/PHPUnit/System/DuplicateActionsTest.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+namespace Piwik\Tests\System;
+
+use Piwik\Common;
+use Piwik\Db;
+use Piwik\Tests\Fixtures\OneVisitorTwoVisits;
+use Piwik\Tests\Framework\TestCase\SystemTestCase;
+
+/**
+ * The tracker inserts actions in separate SQL queries which can cause
+ * duplicate actions to be in the DB (actions w/ the same name, hash + type, but
+ * different idaction). The tracker will delete duplicate actions, but
+ * if for some reason the tracker fails before the DELETE occurs, there can be
+ * stray duplicate actions. This test is there to ensure reports are not affected
+ * by duplicate action entries.
+ *
+ * @group Core
+ * @group DuplicateActionsTest
+ */
+class DuplicateActionsTest extends SystemTestCase
+{
+    /**
+     * @var OneVisitorTwoVisits
+     */
+    public static $fixture = null; // initialized below class
+
+    public static function setUpBeforeClass()
+    {
+        parent::setUpBeforeClass();
+
+        // add duplicates for every action
+        $table = Common::prefixTable('log_action');
+        foreach (Db::fetchAll("SELECT * FROM $table") as $row) {
+            $insertSql = "INSERT INTO $table (name, type, hash, url_prefix)
+                               VALUES (?, ?, CRC32(?), ?)";
+
+            Db::query($insertSql, array($row['name'], $row['type'], $row['name'], $row['url_prefix']));
+        }
+    }
+
+    /**
+     * @dataProvider getApiForTesting
+     */
+    public function test_PiwikApiWorks_WhenDuplicateActionsExistInDb($api, $params)
+    {
+        $this->runApiTests($api, $params);
+    }
+
+    public function getApiForTesting()
+    {
+        $idSite = self::$fixture->idSite;
+        $dateTime = self::$fixture->dateTime;
+
+        $api = array('VisitsSummary', 'Actions', 'Contents', 'Events');
+        return array(
+            array($api, array('idSite' => $idSite,
+                              'periods' => 'day',
+                              'date' => $dateTime,
+                              'compareAgainst' => 'OneVisitorTwoVisits',
+                              'otherRequestParameters' => array(
+                                  'hideColumns' => 'nb_users',
+                              )
+            ))
+        );
+    }
+}
+
+DuplicateActionsTest::$fixture = new OneVisitorTwoVisits();
+DuplicateActionsTest::$fixture->excludeMozilla = true;
\ No newline at end of file
diff --git a/tests/PHPUnit/System/ImportLogsTest.php b/tests/PHPUnit/System/ImportLogsTest.php
index 44c6b7b0b9..fff22849ae 100755
--- a/tests/PHPUnit/System/ImportLogsTest.php
+++ b/tests/PHPUnit/System/ImportLogsTest.php
@@ -20,6 +20,7 @@ use Piwik\Tests\Fixtures\ManySitesImportedLogs;
  */
 class ImportLogsTest extends SystemTestCase
 {
+    /** @var ManySitesImportedLogs */
     public static $fixture = null; // initialized below class definition
 
     /**
@@ -37,6 +38,11 @@ class ImportLogsTest extends SystemTestCase
                                'date'    => '2012-08-09',
                                'periods' => 'month')),
 
+            array('Referrers.getNumberOfDistinctWebsites', array('idSite'  => self::$fixture->idSite,
+                                                                 'date'    => '2012-08-09',
+                                                                 'setDateLastN' => true,
+                                                                 'periods' => 'day')),
+
             array('MultiSites.getAll', array('idSite'   => self::$fixture->idSite,
                                              'date'     => '2012-08-09',
                                              'periods'  => array('month'),
@@ -102,4 +108,10 @@ class ImportLogsTest extends SystemTestCase
     }
 }
 
-ImportLogsTest::$fixture = new ManySitesImportedLogs();
\ No newline at end of file
+ImportLogsTest::$fixture = new ManySitesImportedLogs();
+ImportLogsTest::$fixture->includeIisWithCustom = true;
+ImportLogsTest::$fixture->includeNetscaler = true;
+ImportLogsTest::$fixture->includeCloudfront = true;
+ImportLogsTest::$fixture->includeCloudfrontRtmp = true;
+ImportLogsTest::$fixture->includeNginxJson = true;
+ImportLogsTest::$fixture->includeApiCustomVarMapping = true;
\ No newline at end of file
diff --git a/tests/PHPUnit/System/MultipleSitesArchivingTest.php b/tests/PHPUnit/System/MultipleSitesArchivingTest.php
index b62feb8263..83ace8c9d4 100644
--- a/tests/PHPUnit/System/MultipleSitesArchivingTest.php
+++ b/tests/PHPUnit/System/MultipleSitesArchivingTest.php
@@ -34,6 +34,7 @@ class MultipleSitesArchivingTest extends SystemTestCase
         });
 
         Config::getInstance()->General['enable_processing_unique_visitors_multiple_sites'] = 1;
+        Config::getInstance()->Tracker['enable_fingerprinting_across_websites'] = 1;
     }
 
     public function getApiForTesting()
diff --git a/tests/PHPUnit/System/OneVisitorLongUrlsTruncatedTest.php b/tests/PHPUnit/System/OneVisitorLongUrlsTruncatedTest.php
index d6f2742da5..f0f64bf021 100644
--- a/tests/PHPUnit/System/OneVisitorLongUrlsTruncatedTest.php
+++ b/tests/PHPUnit/System/OneVisitorLongUrlsTruncatedTest.php
@@ -35,7 +35,7 @@ class OneVisitorLongUrlsTruncatedTest extends SystemTestCase
             'Actions.getPageUrls',
 
             // Specifically testing getPlugin filter_truncate works
-            'UserSettings.getPlugin');
+            'DevicePlugins.getPlugin');
 
         return array(
             array($apiToCall, array('idSite'                 => self::$fixture->idSite,
diff --git a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php
index 33678169ed..c283980c47 100755
--- a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php
+++ b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php
@@ -43,11 +43,12 @@ class OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest extends SystemTestCa
 
         $apiToCall = array('Actions.getPageUrls',
                            'VisitsSummary.get',
-                           'UserSettings.getResolution',
+                           'Resolution.getResolution',
                            'VisitFrequency.get',
                            'VisitTime.getVisitInformationPerServerTime');
 
         // 2 segments: ALL and another way of expressing ALL but triggering the Segment code path
+        // 2 segments: ALL and another way of expressing ALL but triggering the Segment code path
         $segments = array(
             false,
             'countryCode!=aa',
@@ -109,14 +110,14 @@ class OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest extends SystemTestCa
         $tests = array(
             // TODO Implement fix, then remove the +3 below
             'archive_blob_2010_12'    => ( ($expectedActionsBlobs+3) /*Actions*/
-                                            + 4 /* UserSettings */
+                                            + 2 /* Resolution */
                                             + 2 /* VisitTime */) * 3,
 
             /**
              *  In Each "Period=range" Archive, we expect following non zero numeric entries:
              *                 5 metrics + 1 flag  // VisitsSummary
              *               + 2 metrics + 1 flag // Actions
-             *               + 1 flag // UserSettings
+             *               + 1 flag // Resolution
              *               + 1 flag // VisitTime
              *               = 11
              *
@@ -182,4 +183,4 @@ class OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest extends SystemTestCa
 
 }
 
-OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest::$fixture = new VisitsOverSeveralDays();
\ No newline at end of file
+OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest::$fixture = new VisitsOverSeveralDays();
diff --git a/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php b/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php
index 287e6799f1..8ca8259846 100755
--- a/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php
+++ b/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php
@@ -29,7 +29,7 @@ use Exception;
 class OneVisitorTwoVisitsTest extends SystemTestCase
 {
     /**
-     * @var Test_Piwik_Fixture_OneVisitorTwoVisits
+     * @var OneVisitorTwoVisits
      */
     public static $fixture = null; // initialized below class
 
diff --git a/tests/PHPUnit/System/OneVisitorTwoVisitsWithCookieSupportTest.php b/tests/PHPUnit/System/OneVisitorTwoVisitsWithCookieSupportTest.php
index 1122a59c90..fdd32288a8 100755
--- a/tests/PHPUnit/System/OneVisitorTwoVisitsWithCookieSupportTest.php
+++ b/tests/PHPUnit/System/OneVisitorTwoVisitsWithCookieSupportTest.php
@@ -34,7 +34,7 @@ class OneVisitorTwoVisitsWithCookieSupportTest extends SystemTestCase
     {
         $apiToCall = array(
             'VisitTime', 'VisitsSummary', 'VisitorInterest', 'VisitFrequency', 'UserSettings', 'DevicesDetection',
-            'UserCountry', 'Referrers', 'Provider', 'Goals', 'CustomVariables', 'CoreAdminHome',
+            'UserCountry', 'Referrers', 'Provider', 'Goals', 'CustomVariables', 'CoreAdminHome', 'DevicePlugins',
             'Actions', 'Live.getLastVisitsDetails');
 
         return array(
diff --git a/tests/PHPUnit/System/PivotByQueryParamTest.php b/tests/PHPUnit/System/PivotByQueryParamTest.php
index e07ab83280..099f82fcf6 100644
--- a/tests/PHPUnit/System/PivotByQueryParamTest.php
+++ b/tests/PHPUnit/System/PivotByQueryParamTest.php
@@ -125,7 +125,7 @@ class PivotByQueryParamTest extends SystemTestCase
 
         $this->markTestSkipped("Not working right now.");
 
-        $this->assertApiResponseEqualsExpected("UserSettings.getBrowser", array( // should have logo metadata in output
+        $this->assertApiResponseEqualsExpected("DevicesDetection.getBrowsers", array( // should have logo metadata in output
             'idSite' => self::$fixture->idSite,
             'date' => Date::factory(self::$fixture->dateTime)->toString(),
             'period' => 'week',
diff --git a/tests/PHPUnit/System/PrivacyManagerTest.php b/tests/PHPUnit/System/PrivacyManagerTest.php
index 18b197a410..0d99d0816d 100644
--- a/tests/PHPUnit/System/PrivacyManagerTest.php
+++ b/tests/PHPUnit/System/PrivacyManagerTest.php
@@ -374,7 +374,7 @@ class PrivacyManagerTest extends SystemTestCase
 
         // perform checks
         $this->checkLogDataPurged();
-        $this->_checkReportsAndMetricsPurged($janBlobsRemaining = 5, $janNumericRemaining = 68); // 5 blobs for 5 days
+        $this->_checkReportsAndMetricsPurged($janBlobsRemaining = 5, $janNumericRemaining = 69); // 5 blobs for 5 days
     }
 
     /**
@@ -574,7 +574,7 @@ class PrivacyManagerTest extends SystemTestCase
 
         // perform checks
         $this->checkLogDataPurged();
-        $this->_checkReportsAndMetricsPurged($janBlobsRemaining = 6, $janNumericRemaining = 70); // 1 segmented blob + 5 day blobs
+        $this->_checkReportsAndMetricsPurged($janBlobsRemaining = 6, $janNumericRemaining = 71); // 1 segmented blob + 5 day blobs
     }
 
     // --- utility functions follow ---
@@ -720,15 +720,15 @@ class PrivacyManagerTest extends SystemTestCase
 
         // one metric for jan & one for feb
         Db::query(sprintf($sql, Common::prefixTable($archiveTables['numeric'][0])),
-            array(self::GARBAGE_FIELD, $janDate1, $janDate1, $janDate1, 1, 100));
+            array(self::GARBAGE_FIELD, $janDate1, $janDate1, 1, $janDate1, 100));
         Db::query(sprintf($sql, Common::prefixTable($archiveTables['numeric'][1])),
-            array(self::GARBAGE_FIELD, $febDate1, $febDate1, $febDate1, 1, 200));
+            array(self::GARBAGE_FIELD, $febDate1, $febDate1, 1, $febDate1, 200));
 
         // add garbage reports
         Db::query(sprintf($sql, Common::prefixTable($archiveTables['blob'][0])),
-            array(self::GARBAGE_FIELD, $janDate1, $janDate1, $janDate1, 10, 'blobval'));
+            array(self::GARBAGE_FIELD, $janDate1, $janDate1, 10, $janDate1, 'blobval'));
         Db::query(sprintf($sql, Common::prefixTable($archiveTables['blob'][1])),
-            array(self::GARBAGE_FIELD, $febDate1, $febDate1, $febDate1, 20, 'blobval'));
+            array(self::GARBAGE_FIELD, $febDate1, $febDate1, 20, $febDate1, 'blobval'));
     }
 
     protected function _checkNoDataChanges()
diff --git a/tests/PHPUnit/System/TrackerResponseTest.php b/tests/PHPUnit/System/TrackerResponseTest.php
new file mode 100755
index 0000000000..7bd0f7aef7
--- /dev/null
+++ b/tests/PHPUnit/System/TrackerResponseTest.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+namespace Piwik\Tests\System;
+
+use Piwik\Tests\Framework\Fixture;
+use Piwik\Tests\Framework\TestCase\SystemTestCase;
+
+/**
+ * @group TrackerTest
+ * @group Plugins
+ */
+class TrackerResponseTest extends SystemTestCase
+{
+    public static $fixture = null;
+
+    /**
+     * @var \PiwikTracker
+     */
+    private $tracker;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $idSite = 1;
+        $dateTime = '2014-01-01 00:00:01';
+
+        if (!Fixture::siteCreated($idSite)) {
+            Fixture::createWebsite($dateTime);
+        }
+
+        $this->tracker = Fixture::getTracker($idSite, $dateTime, $defaultInit = true);
+    }
+
+    public function test_response_ShouldContainAnImage()
+    {
+        $response = $this->tracker->doTrackPageView('Test');
+
+        Fixture::checkResponse($response);
+        $this->assertNotEmpty($response);
+    }
+
+    public function test_response_ShouldBeEmpty_IfImageIsDisabled()
+    {
+        $this->tracker->disableSendImageResponse();
+
+        $response = $this->tracker->doTrackPageView('Test');
+
+        $this->assertSame('', $response);
+    }
+
+    public function test_response_ShouldSend200ResponseCode_IfImageIsEnabled()
+    {
+        $url = $this->tracker->getUrlTrackPageView('Test');
+
+        $this->assertResponseCode(200, $url);
+    }
+
+    public function test_response_ShouldSend204ResponseCode_IfImageIsDisabled()
+    {
+        $url = $this->tracker->getUrlTrackPageView('Test');
+        $url .= '&send_image=0';
+
+        $this->assertResponseCode(204, $url);
+    }
+
+    public function test_response_ShouldSend400ResponseCode_IfSiteIdIsInvalid()
+    {
+        $url = $this->tracker->getUrlTrackPageView('Test');
+        $url .= '&idsite=100';
+
+        $this->assertResponseCode(400, $url);
+    }
+
+    public function test_response_ShouldSend400ResponseCode_IfSiteIdIsZero()
+    {
+        $url = $this->tracker->getUrlTrackPageView('Test');
+        $url .= '&idsite=0';
+
+        $this->assertResponseCode(400, $url);
+    }
+
+    public function test_response_ShouldSend400ResponseCode_IfInvalidRequestParameterIsGiven()
+    {
+        $url = $this->tracker->getUrlTrackPageView('Test');
+        $url .= '&cid=' . str_pad('1', 16, '1');
+
+        $this->assertResponseCode(200, $url);
+        $this->assertResponseCode(400, $url . '1'); // has to be 16 char, but is 17 now
+    }
+
+    public function test_response_ShouldReturnPiwikMessage_InCaseOfEmptyRequest()
+    {
+        $url = Fixture::getTrackerUrl();
+        $response = file_get_contents($url);
+
+        $expected = "<a href='/'>Piwik</a> is a free/libre web <a href='http://piwik.org'>analytics</a> that lets you keep control of your data.";
+        $this->assertEquals($expected, $response);
+    }
+
+}
diff --git a/tests/PHPUnit/System/TrackerTest.php b/tests/PHPUnit/System/TrackerTest.php
index 84f5db3aac..65b16f6fea 100755..100644
--- a/tests/PHPUnit/System/TrackerTest.php
+++ b/tests/PHPUnit/System/TrackerTest.php
@@ -2,96 +2,192 @@
 /**
  * Piwik - free/libre analytics platform
  *
- * @link    http://piwik.org
+ * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
 namespace Piwik\Tests\System;
 
+use Piwik\Common;
+use Piwik\Db;
 use Piwik\Tests\Framework\Fixture;
-use Piwik\Tests\Framework\TestCase\SystemTestCase;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+use Piwik\Tracker;
 
 /**
- * @group TrackerTest
- * @group Plugins
+ * @group Core
+ * @group Tracker
  */
-class TrackerTest extends SystemTestCase
+class TrackerTest extends IntegrationTestCase
 {
-    public static $fixture = null;
+    public function setUp()
+    {
+        parent::setUp();
+        Fixture::createWebsite('2014-02-04');
+    }
+
+    protected static function configureFixture($fixture)
+    {
+        $fixture->createSuperUser = true;
+    }
 
     /**
-     * @var \PiwikTracker
+     * Test the Bulk tracking API as documented in: http://developer.piwik.org/api-reference/tracking-api#bulk-tracking
+     *
+     * With invalid token_auth the request would still work
      */
-    private $tracker;
+    public function test_trackingApiWithBulkRequests_viaCurl_withWrongTokenAuth()
+    {
+        $token_auth = '33dc3f2536d3025974cccb4b4d2d98f4';
+        $this->issueBulkTrackingRequest($token_auth, $expectTrackingToSucceed = true);
+    }
 
-    public function setUp()
+    public function test_trackingApiWithBulkRequests_viaCurl_withCorrectTokenAuth()
     {
-        parent::setUp();
+        $token_auth = Fixture::getTokenAuth();
+        \Piwik\Filesystem::deleteAllCacheOnUpdate();
+        $this->issueBulkTrackingRequest($token_auth, $expectTrackingToSucceed = true);
+    }
 
-        $idSite = 1;
-        $dateTime = '2014-01-01 00:00:01';
+    public function test_trackingEcommerceOrder_WithHtmlEscapedText_InsertsCorrectLogs()
+    {
+        // item sku, item name, item category, item price, item quantity
+        // NOTE: used to test with '&#x1D306;' character, however, mysql on travis fails with this when
+        //       inserting this character decoded.
+        $ecItems = array(array('&quot;scarysku', 'superscarymovie&quot;', 'scary &amp; movies', 12.99, 1),
+                         array('&gt; scary', 'but &lt; &quot;super', 'scary&quot;', 14, 15),
+                         array("&#x27;Foo &#xA9;", " bar ", " baz &#x2603; qux", 16, 17));
 
-        if (!Fixture::siteCreated($idSite)) {
-            Fixture::createWebsite($dateTime);
-        }
+        $urlToTest = $this->getEcommerceItemsUrl($ecItems);
+
+        $response = $this->sendTrackingRequestByCurl($urlToTest);
+        Fixture::checkResponse($response);
+
+        $this->assertEquals(1, $this->getCountOfConversions());
+
+        $conversionItems = $this->getConversionItems();
+        $this->assertEquals(3, count($conversionItems));
+
+        $this->assertActionEquals('"scarysku', $conversionItems[0]['idaction_sku']);
+        $this->assertActionEquals('superscarymovie"', $conversionItems[0]['idaction_name']);
+        $this->assertActionEquals('scary & movies', $conversionItems[0]['idaction_category']);
 
-        $this->tracker = Fixture::getTracker($idSite, $dateTime, $defaultInit = true);
+        $this->assertActionEquals('> scary', $conversionItems[1]['idaction_sku']);
+        $this->assertActionEquals('but < "super', $conversionItems[1]['idaction_name']);
+        $this->assertActionEquals('scary"', $conversionItems[1]['idaction_category']);
+
+        $this->assertActionEquals('\'Foo ©', $conversionItems[2]['idaction_sku']);
+        $this->assertActionEquals('bar', $conversionItems[2]['idaction_name']);
+        $this->assertActionEquals('baz ☃ qux', $conversionItems[2]['idaction_category']);
     }
 
-    public function test_response_ShouldContainAnImage()
+    public function test_trackingEcommerceOrder_WithAmpersandAndQuotes_InsertsCorrectLogs()
     {
-        $response = $this->tracker->doTrackPageView('Test');
+        // item sku, item name, item category, item price, item quantity
+        $ecItems = array(array("\"scarysku&", "superscarymovie'", 'scary <> movies', 12.99, 1));
+
+        $urlToTest = $this->getEcommerceItemsUrl($ecItems);
 
+        $response = $this->sendTrackingRequestByCurl($urlToTest);
         Fixture::checkResponse($response);
-        $this->assertNotEmpty($response);
+
+        $this->assertEquals(1, $this->getCountOfConversions());
+
+        $conversionItems = $this->getConversionItems();
+        $this->assertEquals(1, count($conversionItems));
+
+        $this->assertActionEquals('"scarysku&', $conversionItems[0]['idaction_sku']);
+        $this->assertActionEquals('superscarymovie\'', $conversionItems[0]['idaction_name']);
+        $this->assertActionEquals('scary <> movies', $conversionItems[0]['idaction_category']);
     }
 
-    public function test_response_ShouldBeEmpty_IfImageIsDisabled()
+    public function test_trackingEcommerceOrder_DoesNotFail_WhenEmptyEcommerceItemsParamUsed()
     {
-        $this->tracker->disableSendImageResponse();
+        // item sku, item name, item category, item price, item quantity
+        $urlToTest = $this->getEcommerceItemsUrl("");
 
-        $response = $this->tracker->doTrackPageView('Test');
+        $response = $this->sendTrackingRequestByCurl($urlToTest);
+        Fixture::checkResponse($response);
 
-        $this->assertSame('', $response);
+        $this->assertEquals(1, $this->getCountOfConversions());
+        $this->assertEquals(0, count($this->getConversionItems()));
     }
 
-    public function test_response_ShouldSend200ResponseCode_IfImageIsEnabled()
+    public function test_trackingEcommerceOrder_DoesNotFail_WhenNonArrayUsedWithEcommerceItemsParam()
     {
-        $url = $this->tracker->getUrlTrackPageView('Test');
+        // item sku, item name, item category, item price, item quantity
+        $urlToTest = $this->getEcommerceItemsUrl("45");
+
+        $response = $this->sendTrackingRequestByCurl($urlToTest);
+        Fixture::checkResponse($response);
 
-        $this->assertResponseCode(200, $url);
+        $this->assertEquals(0, $this->getCountOfConversions());
+        $this->assertEquals(0, count($this->getConversionItems()));
     }
 
-    public function test_response_ShouldSend204ResponseCode_IfImageIsDisabled()
+    protected function issueBulkTrackingRequest($token_auth, $expectTrackingToSucceed)
     {
-        $url = $this->tracker->getUrlTrackPageView('Test');
-        $url .= '&send_image=0';
+        $piwikHost = Fixture::getRootUrl() . 'tests/PHPUnit/proxy/piwik.php';
 
-        $this->assertResponseCode(204, $url);
+        $command = 'curl -s -X POST -d \'{"requests":["?idsite=1&url=http://example.org&action_name=Test bulk log Pageview&rec=1","?idsite=1&url=http://example.net/test.htm&action_name=Another bulk page view&rec=1"],"token_auth":"' . $token_auth . '"}\' ' . $piwikHost;
+
+        exec($command, $output, $result);
+        if ($result !== 0) {
+            throw new \Exception("tracking bulk failed: " . implode("\n", $output) . "\n\ncommand used: $command");
+        }
+        $output = implode("", $output);
+        $this->assertStringStartsWith('{"status":', $output);
+
+        if($expectTrackingToSucceed) {
+            $this->assertNotContains('error', $output);
+            $this->assertContains('success', $output);
+        } else {
+            $this->assertContains('error', $output);
+            $this->assertNotContains('success', $output);
+        }
     }
 
-    public function test_response_ShouldSend400ResponseCode_IfSiteIdIsInvalid()
+    private function sendTrackingRequestByCurl($url)
     {
-        $url = $this->tracker->getUrlTrackPageView('Test');
-        $url .= '&idsite=100';
+        if (!function_exists('curl_init')) {
+            $this->markTestSkipped('Curl is not installed');
+        }
+
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, Fixture::getRootUrl() . 'tests/PHPUnit/proxy/piwik.php' . $url);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_HEADER, true);
+        curl_setopt($ch, CURLOPT_TIMEOUT, 10);
+
+        $response = curl_exec($ch);
+        $headerSize = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
+        $response = substr($response, $headerSize);
+
+        curl_close($ch);
 
-        $this->assertResponseCode(400, $url);
+        return $response;
     }
 
-    public function test_response_ShouldSend400ResponseCode_IfSiteIdIsZero()
+    private function assertActionEquals($expected, $idaction)
     {
-        $url = $this->tracker->getUrlTrackPageView('Test');
-        $url .= '&idsite=0';
-
-        $this->assertResponseCode(400, $url);
+        $actionName = Db::fetchOne("SELECT name FROM " . Common::prefixTable('log_action') . " WHERE idaction = ?", array($idaction));
+        $this->assertEquals($expected, $actionName);
     }
 
-    public function test_response_ShouldSend400ResponseCode_IfInvalidRequestParameterIsGiven()
+    private function getCountOfConversions()
     {
-        $url = $this->tracker->getUrlTrackPageView('Test');
-        $url .= '&cid=' . str_pad('1', 16, '1');
+        return Db::fetchOne("SELECT COUNT(*) FROM " . Common::prefixTable('log_conversion'));
+    }
 
-        $this->assertResponseCode(200, $url);
-        $this->assertResponseCode(400, $url . '1'); // has to be 16 char, but is 17 now
+    private function getConversionItems()
+    {
+        return Db::fetchAll("SELECT * FROM " . Common::prefixTable('log_conversion_item'));
     }
 
-}
+    private function getEcommerceItemsUrl($ecItems, $doJsonEncode = true)
+    {
+        $ecItemsStr = $doJsonEncode ? json_encode($ecItems) : $ecItems;
+        return "?idsite=1&idgoal=0&rec=1&url=" . urlencode('http://quellehorreur.com/movies') . "&ec_items="
+        . urlencode($ecItemsStr) . '&ec_id=myspecial-id-1234&revenue=16.99&ec_st=12.99&ec_tx=0&ec_sh=3';
+    }
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php
index ae4c167010..5e4c04a7d8 100755
--- a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php
+++ b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php
@@ -26,6 +26,9 @@ class TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest extends SystemTes
      */
     public function testApi($api, $params)
     {
+        if (self::isPhpVersion53() && self::isTravisCI()) {
+            $this->markTestSkipped("Skipping this test as it often fails on travis)");
+        }
         $this->runApiTests($api, $params);
     }
 
diff --git a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php
index 88727c30a2..56dc98e9a0 100755
--- a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php
+++ b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php
@@ -8,6 +8,9 @@
 namespace Piwik\Tests\System;
 
 use Piwik\Archive;
+use Piwik\Cache;
+use Piwik\DataAccess\ArchiveInvalidator;
+use Piwik\Option;
 use Piwik\Plugins\Goals\Archiver;
 use Piwik\Segment;
 use Piwik\Tests\Framework\TestCase\SystemTestCase;
@@ -25,6 +28,9 @@ require_once PIWIK_INCLUDE_PATH . '/plugins/Goals/Goals.php';
  */
 class TwoVisitorsTwoWebsitesDifferentDaysConversionsTest extends SystemTestCase
 {
+    /**
+     * @var TwoSitesTwoVisitorsDifferentDays
+     */
     public static $fixture = null; // initialized below class definition
 
     /**
@@ -32,6 +38,8 @@ class TwoVisitorsTwoWebsitesDifferentDaysConversionsTest extends SystemTestCase
      */
     public function testApi($api, $params)
     {
+        $this->markTestSkippedOnPhp53();
+
         $this->runApiTests($api, $params);
     }
 
@@ -118,6 +126,8 @@ class TwoVisitorsTwoWebsitesDifferentDaysConversionsTest extends SystemTestCase
     //       plugins is non-trivial, so not done now.
     public function test_Archive_getNumeric_ReturnsMetricsFromDifferentPlugins_WhenThoseMetricsAreRequested()
     {
+        $this->markTestSkippedOnPhp53();
+
         // Tests that getting a visits summary metric (nb_visits) & a Goal's metric (Goal_revenue)
         // at the same time works.
         $dateTimeRange = '2010-01-03,2010-01-06';
@@ -128,17 +138,94 @@ class TwoVisitorsTwoWebsitesDifferentDaysConversionsTest extends SystemTestCase
         $result = $archive->getNumeric($columns);
         $this->assertEquals(
             array(
-                'nb_visits' => 4,
+                'nb_visits' => 5,
                 'Goal_nb_conversions' => 6
             ),
             $result
         );
     }
 
+    // TODO: this test should be in an integration test for Piwik\Archive. setup code for getting metrics from different
+    //       plugins is non-trivial, so not done now.
+    public function test_Archive_getNumeric_shouldInvalidateRememberedReportsOncePerRequestIfNeeded()
+    {
+        $this->markTestSkippedOnPhp53();
+
+        // Tests that getting a visits summary metric (nb_visits) & a Goal's metric (Goal_revenue)
+        // at the same time works.
+        $dateTimeRange = '2010-01-03,2010-01-06';
+        $columns = array('nb_visits', 'Goal_nb_conversions', 'nb_actions');
+        $idSite1 = self::$fixture->idSite1;
+
+        $archive = Archive::build($idSite1, 'range', $dateTimeRange);
+        $result = $archive->getNumeric($columns);
+        $this->assertEquals(
+            array(
+                'nb_visits' => 5,
+                'Goal_nb_conversions' => 6,
+                'nb_actions' => 13
+            ),
+            $result
+        );
+
+        $cache = Cache::getTransientCache();
+        $this->assertEquals(array(self::$fixture->idSite1, self::$fixture->idSite2),
+                            $cache->fetch('Archive.SiteIdsOfRememberedReportsInvalidated'));
+
+        $invalidator = new ArchiveInvalidator();
+
+        self::$fixture->trackVisits();
+
+        // trackVisits should remember to invalidate archived reports
+        $this->assertNotEmpty($invalidator->getRememberedArchivedReportsThatShouldBeInvalidated());
+
+        // although there were new tracked visists it doesn'T change as the report invalidation is cached and was
+        // already invalidated in previous Archive::get();
+        $archive = Archive::build($idSite1, 'range', $dateTimeRange);
+        $result = $archive->getNumeric($columns);
+        $this->assertEquals(
+            array(
+                'nb_visits' => 5,
+                'Goal_nb_conversions' => 6,
+                'nb_actions' => 13 // actions should remain the same as nothing was reports are still marked as already processed
+            ),
+            $result
+        );
+
+        // make sure the caching in archive::get() worked and they are still to be invalidated
+        $this->assertCount(10, $invalidator->getRememberedArchivedReportsThatShouldBeInvalidated());
+
+        // now we force to actually invalidate archived reports again and then archive will be rebuilt for requsted siteId = 1
+        $cache->delete('Archive.SiteIdsOfRememberedReportsInvalidated');
+
+        $archive = Archive::build($idSite1, 'range', $dateTimeRange);
+        $result = $archive->getNumeric($columns);
+
+        // archive::get() should have invalidated siteId 1 and siteId 2 should be still to be done
+        $expectedArchiveReportsLeft = array('2010-01-04' => array(2));
+        $this->assertEquals($expectedArchiveReportsLeft, $invalidator->getRememberedArchivedReportsThatShouldBeInvalidated());
+
+        $this->assertEquals(
+            array(
+                'nb_visits' => 6,
+                'Goal_nb_conversions' => 7,
+                'nb_actions' => 26 // now actions should be increased as the reports were invalidated
+            ),
+            $result
+        );
+    }
+
     public static function getOutputPrefix()
     {
         return 'TwoVisitors_twoWebsites_differentDays_Conversions';
     }
+
+    private function markTestSkippedOnPhp53()
+    {
+        if (self::isPhpVersion53() && self::isTravisCI()) {
+            $this->markTestSkipped("Skipping this test as it often fails on travis)");
+        }
+    }
 }
 
 TwoVisitorsTwoWebsitesDifferentDaysConversionsTest::$fixture = new TwoSitesTwoVisitorsDifferentDays();
diff --git a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php
index c9fd4f04c5..872f725ad6 100755
--- a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php
+++ b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php
@@ -37,6 +37,9 @@ class TwoVisitorsTwoWebsitesDifferentDaysTest extends SystemTestCase
      */
     public function testApi($api, $params)
     {
+        if(self::isTravisCI() && self::isPhpVersion53()) {
+            $this->markTestSkipped('This test fails on travis eg. https://travis-ci.org/piwik/piwik/jobs/46944264');
+        }
         $this->runApiTests($api, $params);
     }
 
diff --git a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php
index a6ba72de3d..4f159e8399 100755
--- a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php
+++ b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php
@@ -8,6 +8,8 @@
 namespace Piwik\Tests\System;
 
 use Piwik\Common;
+use Piwik\DataAccess\ArchiveInvalidator;
+use Piwik\DataAccess\InvalidatedReports;
 use Piwik\Db;
 use Piwik\Tests\Framework\TestCase\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
@@ -81,23 +83,25 @@ class TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest extends SystemTest
             //  + 3 done flag )
             //  * 2 segments
             // + 1 Done flag per Plugin, for each "Last N" date
-            'archive_numeric_2010_01' => 142,
+            'archive_numeric_2010_01' => 138,
 
             // 2) CHECK 'week' archive stored in December (week starts the month before)
             // We expect 2 segments * (1 custom variable name + 2 ref metrics + 5 subtable for the values of the name + 5 referrers blob)
             'archive_blob_2009_12'    => 28,
             // 7 metrics,
             // 2 Referrer metrics (Referrers_distinctSearchEngines/Referrers_distinctKeywords),
-            // 3 done flag (referrers, CustomVar, VisitsSummary),
+            // 6 done flag (referrers, CustomVar, VisitsSummary), 3 for period = 1 and 3 for period = 2
             // X * 2 segments
-            'archive_numeric_2009_12' => (6 + 2 + 3) * 2,
+            'archive_numeric_2009_12' => (6 + 2 + 3 + 3) * 2,
         );
         foreach ($tests as $table => $expectedRows) {
             $sql = "SELECT count(*) FROM " . Common::prefixTable($table);
             $countBlobs = Db::get()->fetchOne($sql);
 
             if($expectedRows != $countBlobs) {
-                var_export(Db::get()->fetchAll("SELECT * FROM " . Common::prefixTable($table) . " ORDER BY name, idarchive ASC"));
+                $output = Db::get()->fetchAll("SELECT * FROM " . Common::prefixTable($table) . " ORDER BY name, idarchive ASC");
+                var_export('This is debug output from ' . __CLASS__ . ' in case of an error: ');
+                var_export($output);
             }
             $this->assertEquals($expectedRows, $countBlobs, "$table: %s");
         }
diff --git a/tests/PHPUnit/System/VisitsInPastInvalidateOldReportsTest.php b/tests/PHPUnit/System/VisitsInPastInvalidateOldReportsTest.php
index 15149f0ec5..b951995368 100644
--- a/tests/PHPUnit/System/VisitsInPastInvalidateOldReportsTest.php
+++ b/tests/PHPUnit/System/VisitsInPastInvalidateOldReportsTest.php
@@ -22,6 +22,9 @@ use Exception;
  */
 class VisitsInPastInvalidateOldReportsTest extends SystemTestCase
 {
+    /**
+     * @var TwoSitesVisitsInPast
+     */
     public static $fixture = null; // initialized below class definition
 
     /**
@@ -39,8 +42,8 @@ class VisitsInPastInvalidateOldReportsTest extends SystemTestCase
     {
         $idSite = self::$fixture->idSite;
         $idSite2 = self::$fixture->idSite2;
-        $dateTimeDateInPastWebsite1 = self::$fixture->dateTimeDateInPastWebsite1;
-        $dateTimeDateInPastWebsite2 = self::$fixture->dateTimeDateInPastWebsite2;
+        $dateTimeDateInPastWebsite1 = self::$fixture->dateTimeInPastWebsite1;
+        $dateTimeDateInPastWebsite2 = self::$fixture->dateTimeInPastWebsite2;
 
         // We test a typical Numeric and a Recursive blob reports
         $apiToCall = array('VisitsSummary.get', 'Actions.getPageUrls');
@@ -121,8 +124,8 @@ class VisitsInPastInvalidateOldReportsTest extends SystemTestCase
     {
         $idSite = self::$fixture->idSite;
         $idSite2 = self::$fixture->idSite2;
-        $dateTimeDateInPastWebsite1 = self::$fixture->dateTimeDateInPastWebsite1;
-        $dateTimeDateInPastWebsite2 = self::$fixture->dateTimeDateInPastWebsite2;
+        $dateTimeDateInPastWebsite1 = self::$fixture->dateTimeInPastWebsite1;
+        $dateTimeDateInPastWebsite2 = self::$fixture->dateTimeInPastWebsite2;
 
         $apiToCall = array('VisitsSummary.get', 'Actions.getPageUrls');
 
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt b/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt
new file mode 100644
index 0000000000..527f8f1b8a
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt
@@ -0,0 +1,66 @@
+
+-------------------------------------------------------
+Using this 'archive.php' script is no longer recommended.
+Please use '/path/to/php /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console core:archive --url=http://localhost/tests/PHPUnit/proxy/index.php' instead.
+To get help use '/path/to/php /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console core:archive --help'
+See also: http://piwik.org/docs/setup-auto-archiving/
+
+If you cannot use the console because it requires CLI
+try 'php archive.php --url=http://your.piwik/path'
+-------------------------------------------------------
+
+
+INFO CoreConsole[2015-03-02 06:14:01] ---------------------------
+INFO CoreConsole[2015-03-02 06:14:01] INIT
+INFO CoreConsole[2015-03-02 06:14:01] Piwik is installed at: http://localhost/tests/PHPUnit/proxy/index.php
+INFO CoreConsole[2015-03-02 06:14:01] Running Piwik 2.11.2-b1 as Super User
+INFO CoreConsole[2015-03-02 06:14:01] ---------------------------
+INFO CoreConsole[2015-03-02 06:14:01] NOTES
+INFO CoreConsole[2015-03-02 06:14:01] - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Piwik UI > Settings > General Settings.
+INFO CoreConsole[2015-03-02 06:14:01]   See the doc at: http://piwik.org/docs/setup-auto-archiving/
+INFO CoreConsole[2015-03-02 06:14:01] - Reports for today will be processed at most every 150 seconds. You can change this value in Piwik UI > Settings > General Settings.
+INFO CoreConsole[2015-03-02 06:14:01] - Reports for the current week/month/year will be refreshed at most every 3600 seconds.
+INFO CoreConsole[2015-03-02 06:14:01] Will invalidate archived reports for 2012-08-09 for following siteIds: 1
+INFO CoreConsole[2015-03-02 06:14:02] Will invalidate archived reports for 2012-08-10 for following siteIds: 1
+INFO CoreConsole[2015-03-02 06:14:02] Will invalidate archived reports for 2012-08-11 for following siteIds: 1
+INFO CoreConsole[2015-03-02 06:14:02] Will invalidate archived reports for 2012-08-15 for following siteIds: 1,2
+INFO CoreConsole[2015-03-02 06:14:02] Will invalidate archived reports for 2012-09-30 for following siteIds: 1
+INFO CoreConsole[2015-03-02 06:14:02] Will invalidate archived reports for 2014-03-12 for following siteIds: 1
+INFO CoreConsole[2015-03-02 06:14:02] Will invalidate archived reports for 2014-03-13 for following siteIds: 1
+INFO CoreConsole[2015-03-02 06:14:02] - Will process 0 websites with new visits since 7 days 0 hours
+INFO CoreConsole[2015-03-02 06:14:02] - Will process 2 other websites because some old data reports have been invalidated (eg. using the Log Import script) , IDs: 1, 2
+INFO CoreConsole[2015-03-02 06:14:02] ---------------------------
+INFO CoreConsole[2015-03-02 06:14:02] START
+INFO CoreConsole[2015-03-02 06:14:02] Starting Piwik reports archiving...
+INFO CoreConsole[2015-03-02 06:14:04] Will pre-process the following 3 Segments for this website (id = 1): browserCode==IE, visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50, visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
+INFO CoreConsole[2015-03-02 06:14:06] Archived website id = 1, period = day, 0 visits in last last52 days, 0 visits today, Time elapsed: 3.952s
+INFO CoreConsole[2015-03-02 06:14:06] Will pre-process the following 3 Segments for this website (id = 1): browserCode==IE, visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50, visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
+INFO CoreConsole[2015-03-02 06:14:34] Archived website id = 1, period = week, 40 visits in last last260 weeks, 0 visits this week, Time elapsed: 28.076s
+INFO CoreConsole[2015-03-02 06:14:34] Will pre-process the following 3 Segments for this website (id = 1): browserCode==IE, visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50, visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
+INFO CoreConsole[2015-03-02 06:14:50] Archived website id = 1, period = month, 40 visits in last last52 months, 0 visits this month, Time elapsed: 16.259s
+INFO CoreConsole[2015-03-02 06:14:50] Will pre-process the following 3 Segments for this website (id = 1): browserCode==IE, visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50, visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
+INFO CoreConsole[2015-03-02 06:14:54] Archived website id = 1, period = year, 40 visits in last last7 years, 0 visits this year, Time elapsed: 4.034s
+INFO CoreConsole[2015-03-02 06:14:54] Archived website id = 1, 16 API requests, Time elapsed: 52.330s [1/2 done]
+INFO CoreConsole[2015-03-02 06:14:56] Archived website id = 2, period = day, 0 visits in last last52 days, 0 visits today, Time elapsed: 1.674s
+INFO CoreConsole[2015-03-02 06:15:08] Archived website id = 2, period = week, 1 visits in last last260 weeks, 0 visits this week, Time elapsed: 12.328s
+INFO CoreConsole[2015-03-02 06:15:14] Archived website id = 2, period = month, 1 visits in last last52 months, 0 visits this month, Time elapsed: 5.494s
+INFO CoreConsole[2015-03-02 06:15:15] Archived website id = 2, period = year, 1 visits in last last7 years, 0 visits this year, Time elapsed: 1.276s
+INFO CoreConsole[2015-03-02 06:15:15] Archived website id = 2, 4 API requests, Time elapsed: 20.778s [2/2 done]
+INFO CoreConsole[2015-03-02 06:15:15] Done archiving!
+INFO CoreConsole[2015-03-02 06:15:15] ---------------------------
+INFO CoreConsole[2015-03-02 06:15:15] SUMMARY
+INFO CoreConsole[2015-03-02 06:15:15] Total visits for today across archived websites: 0
+INFO CoreConsole[2015-03-02 06:15:15] Archived today's reports for 2 websites
+INFO CoreConsole[2015-03-02 06:15:15] Archived week/month/year for 2 websites
+INFO CoreConsole[2015-03-02 06:15:15] Skipped 0 websites: no new visit since the last script execution
+INFO CoreConsole[2015-03-02 06:15:15] Skipped 0 websites day archiving: existing daily reports are less than 150 seconds old
+INFO CoreConsole[2015-03-02 06:15:15] Skipped 0 websites week/month/year archiving: existing periods reports are less than 3600 seconds old
+INFO CoreConsole[2015-03-02 06:15:15] Total API requests: 20
+INFO CoreConsole[2015-03-02 06:15:15] done: 2/2 100%, 0 vtoday, 2 wtoday, 2 wperiods, 20 req, 73234 ms, no error
+INFO CoreConsole[2015-03-02 06:15:15] Time elapsed: 73.235s
+INFO CoreConsole[2015-03-02 06:15:15] ---------------------------
+INFO CoreConsole[2015-03-02 06:15:15] SCHEDULED TASKS
+INFO CoreConsole[2015-03-02 06:15:15] Starting Scheduled tasks...
+INFO CoreConsole[2015-03-02 06:15:15]  No task to run
+INFO CoreConsole[2015-03-02 06:15:15] done
+INFO CoreConsole[2015-03-02 06:15:15] ---------------------------
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml
index 1c7f2179e5..b83a03206f 100644
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
-	<result idSite="1" />
+	<result idSite="1">
+		<nb_uniq_visitors>25</nb_uniq_visitors>
+		<nb_users>0</nb_users>
+		<nb_visits>25</nb_visits>
+		<nb_actions>28</nb_actions>
+		<nb_visits_converted>23</nb_visits_converted>
+		<bounce_count>23</bounce_count>
+		<sum_visit_length>305</sum_visit_length>
+		<max_actions>3</max_actions>
+		<bounce_rate>92%</bounce_rate>
+		<nb_actions_per_visit>1.1</nb_actions_per_visit>
+		<avg_time_on_site>12</avg_time_on_site>
+	</result>
 	<result idSite="2" />
 </results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml
index 6140bf8214..bec5ae96cd 100644
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml
@@ -5,15 +5,6 @@
 		<idVisit>9</idVisit>
 		<visitIp>0.0.0.0</visitIp>
 		
-		<visitorType>new</visitorType>
-		<visitorTypeIcon />
-		<visitConverted>1</visitConverted>
-		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
-		<visitEcommerceStatus>none</visitEcommerceStatus>
-		<visitEcommerceStatusIcon />
-		<searches>0</searches>
-		<events>0</events>
-		<actions>1</actions>
 		<actionDetails>
 			<row>
 				<type>goal</type>
@@ -24,6 +15,7 @@
 				
 				<url>http://piwik.net/docs/manage-users/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -32,41 +24,38 @@
 				<pageIdAction>9</pageIdAction>
 				
 				<pageId>9</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
-		<customVariables>
-		</customVariables>
 		<goalConversions>1</goalConversions>
 		<siteCurrency>USD</siteCurrency>
 		<siteCurrencySymbol>$</siteCurrencySymbol>
 		
-		<visitLocalTime>21:00:42</visitLocalTime>
-		<visitLocalHour>21</visitLocalHour>
 		
 		
 		
-		
-		<visitDuration>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<continent>Unknown</continent>
-		<continentCode>unk</continentCode>
-		<country>Unknown</country>
-		<countryCode>xx</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Unknown</location>
-		<latitude />
-		<longitude />
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>1</actions>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -75,16 +64,37 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Mac OS</operatingSystem>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Mac 10.8</operatingSystem>
+		<operatingSystemName>Mac</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
 		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
-		<browserFamily>webkit</browserFamily>
+		<operatingSystemVersion>10.8</operatingSystemVersion>
+		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
-		<browserName>Chrome 19.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browser>Chrome 19.0</browser>
+		<browserName>Chrome</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>19.0</browserVersion>
-		<deviceType>Desktop</deviceType>
+		<events>0</events>
+		<continent>Unknown</continent>
+		<continentCode>unk</continentCode>
+		<country>Unknown</country>
+		<countryCode>xx</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Unknown</location>
+		<visitLocalTime>21:00:42</visitLocalTime>
+		<visitLocalHour>21</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
@@ -99,15 +109,6 @@
 		<idVisit>8</idVisit>
 		<visitIp>0.0.0.0</visitIp>
 		
-		<visitorType>new</visitorType>
-		<visitorTypeIcon />
-		<visitConverted>1</visitConverted>
-		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
-		<visitEcommerceStatus>none</visitEcommerceStatus>
-		<visitEcommerceStatusIcon />
-		<searches>0</searches>
-		<events>0</events>
-		<actions>1</actions>
 		<actionDetails>
 			<row>
 				<type>goal</type>
@@ -118,6 +119,7 @@
 				
 				<url>http://piwik.net/docs/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -126,41 +128,38 @@
 				<pageIdAction>8</pageIdAction>
 				
 				<pageId>8</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
-		<customVariables>
-		</customVariables>
 		<goalConversions>1</goalConversions>
 		<siteCurrency>USD</siteCurrency>
 		<siteCurrencySymbol>$</siteCurrencySymbol>
 		
-		<visitLocalTime>20:56:45</visitLocalTime>
-		<visitLocalHour>20</visitLocalHour>
 		
 		
 		
-		
-		<visitDuration>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<continent>Unknown</continent>
-		<continentCode>unk</continentCode>
-		<country>Unknown</country>
-		<countryCode>xx</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Unknown</location>
-		<latitude />
-		<longitude />
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>1</actions>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -169,16 +168,37 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Linux</operatingSystem>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>GNU/Linux</operatingSystem>
+		<operatingSystemName>GNU/Linux</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
 		<operatingSystemCode>LIN</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
+		<operatingSystemVersion />
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<browserName>Firefox 6.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browser>Firefox 6.0</browser>
+		<browserName>Firefox</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>6.0</browserVersion>
-		<deviceType>Desktop</deviceType>
+		<events>0</events>
+		<continent>Unknown</continent>
+		<continentCode>unk</continentCode>
+		<country>Unknown</country>
+		<countryCode>xx</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Unknown</location>
+		<visitLocalTime>20:56:45</visitLocalTime>
+		<visitLocalHour>20</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
@@ -193,15 +213,6 @@
 		<idVisit>7</idVisit>
 		<visitIp>72.44.32.10</visitIp>
 		
-		<visitorType>new</visitorType>
-		<visitorTypeIcon />
-		<visitConverted>1</visitConverted>
-		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
-		<visitEcommerceStatus>none</visitEcommerceStatus>
-		<visitEcommerceStatusIcon />
-		<searches>0</searches>
-		<events>0</events>
-		<actions>1</actions>
 		<actionDetails>
 			<row>
 				<type>goal</type>
@@ -212,6 +223,7 @@
 				
 				<url>http://piwik.net/translations/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -220,41 +232,38 @@
 				<pageIdAction>7</pageIdAction>
 				
 				<pageId>7</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
-		<customVariables>
-		</customVariables>
 		<goalConversions>1</goalConversions>
 		<siteCurrency>USD</siteCurrency>
 		<siteCurrencySymbol>$</siteCurrencySymbol>
 		
-		<visitLocalTime>13:49:48</visitLocalTime>
-		<visitLocalHour>13</visitLocalHour>
-		
 		
 		
 		
-		<visitDuration>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<continent>North America</continent>
-		<continentCode>amn</continentCode>
-		<country>United States</country>
-		<countryCode>us</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
-		<region>Virginia</region>
-		<regionCode>VA</regionCode>
-		<city>Ashburn</city>
-		<location>Ashburn, Virginia, United States</location>
-		<latitude>39.043999</latitude>
-		<longitude>-77.487999</longitude>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>1</actions>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -263,16 +272,37 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Linux</operatingSystem>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>GNU/Linux</operatingSystem>
+		<operatingSystemName>GNU/Linux</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
 		<operatingSystemCode>LIN</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
-		<browserFamily>webkit</browserFamily>
+		<operatingSystemVersion />
+		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
-		<browserName>Chrome 19.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browser>Chrome 19.0</browser>
+		<browserName>Chrome</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>19.0</browserVersion>
-		<deviceType>Desktop</deviceType>
+		<events>0</events>
+		<continent>North America</continent>
+		<continentCode>amn</continentCode>
+		<country>United States</country>
+		<countryCode>us</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
+		<region>Virginia</region>
+		<regionCode>VA</regionCode>
+		<city>Ashburn</city>
+		<location>Ashburn, Virginia, United States</location>
+		<visitLocalTime>13:49:48</visitLocalTime>
+		<visitLocalHour>13</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
@@ -287,15 +317,6 @@
 		<idVisit>6</idVisit>
 		<visitIp>72.44.32.10</visitIp>
 		
-		<visitorType>new</visitorType>
-		<visitorTypeIcon />
-		<visitConverted>1</visitConverted>
-		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
-		<visitEcommerceStatus>none</visitEcommerceStatus>
-		<visitEcommerceStatusIcon />
-		<searches>0</searches>
-		<events>0</events>
-		<actions>1</actions>
 		<actionDetails>
 			<row>
 				<type>goal</type>
@@ -306,6 +327,7 @@
 				
 				<url>http://piwik.net/download/counter/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -314,41 +336,38 @@
 				<pageIdAction>6</pageIdAction>
 				
 				<pageId>6</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
-		<customVariables>
-		</customVariables>
 		<goalConversions>1</goalConversions>
 		<siteCurrency>USD</siteCurrency>
 		<siteCurrencySymbol>$</siteCurrencySymbol>
 		
-		<visitLocalTime>13:48:20</visitLocalTime>
-		<visitLocalHour>13</visitLocalHour>
-		
 		
 		
 		
-		<visitDuration>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<continent>North America</continent>
-		<continentCode>amn</continentCode>
-		<country>United States</country>
-		<countryCode>us</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
-		<region>Virginia</region>
-		<regionCode>VA</regionCode>
-		<city>Ashburn</city>
-		<location>Ashburn, Virginia, United States</location>
-		<latitude>39.043999</latitude>
-		<longitude>-77.487999</longitude>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>1</actions>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -357,16 +376,37 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Linux</operatingSystem>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>GNU/Linux</operatingSystem>
+		<operatingSystemName>GNU/Linux</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
 		<operatingSystemCode>LIN</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
-		<browserFamily>webkit</browserFamily>
+		<operatingSystemVersion />
+		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
-		<browserName>Epiphany 2.30</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
+		<browser>Epiphany 2.30</browser>
+		<browserName>Epiphany</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon>
 		<browserCode>EP</browserCode>
 		<browserVersion>2.30</browserVersion>
-		<deviceType>Desktop</deviceType>
+		<events>0</events>
+		<continent>North America</continent>
+		<continentCode>amn</continentCode>
+		<country>United States</country>
+		<countryCode>us</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
+		<region>Virginia</region>
+		<regionCode>VA</regionCode>
+		<city>Ashburn</city>
+		<location>Ashburn, Virginia, United States</location>
+		<visitLocalTime>13:48:20</visitLocalTime>
+		<visitLocalHour>13</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
@@ -381,15 +421,6 @@
 		<idVisit>5</idVisit>
 		<visitIp>72.44.32.10</visitIp>
 		
-		<visitorType>new</visitorType>
-		<visitorTypeIcon />
-		<visitConverted>1</visitConverted>
-		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
-		<visitEcommerceStatus>none</visitEcommerceStatus>
-		<visitEcommerceStatusIcon />
-		<searches>0</searches>
-		<events>0</events>
-		<actions>1</actions>
 		<actionDetails>
 			<row>
 				<type>goal</type>
@@ -400,6 +431,7 @@
 				
 				<url>http://piwik.net/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -408,41 +440,38 @@
 				<pageIdAction>5</pageIdAction>
 				
 				<pageId>5</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
-		<customVariables>
-		</customVariables>
 		<goalConversions>1</goalConversions>
 		<siteCurrency>USD</siteCurrency>
 		<siteCurrencySymbol>$</siteCurrencySymbol>
 		
-		<visitLocalTime>13:48:07</visitLocalTime>
-		<visitLocalHour>13</visitLocalHour>
 		
 		
 		
-		
-		<visitDuration>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<continent>North America</continent>
-		<continentCode>amn</continentCode>
-		<country>United States</country>
-		<countryCode>us</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
-		<region>Virginia</region>
-		<regionCode>VA</regionCode>
-		<city>Ashburn</city>
-		<location>Ashburn, Virginia, United States</location>
-		<latitude>39.043999</latitude>
-		<longitude>-77.487999</longitude>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>1</actions>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -451,16 +480,37 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
+		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemCode>WI7</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
-		<browserFamily>ie</browserFamily>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>7</operatingSystemVersion>
+		<browserFamily>Trident</browserFamily>
 		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
-		<browserName>Internet Explorer 9.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+		<browser>Internet Explorer 9.0</browser>
+		<browserName>Internet Explorer</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>9.0</browserVersion>
-		<deviceType>Desktop</deviceType>
+		<events>0</events>
+		<continent>North America</continent>
+		<continentCode>amn</continentCode>
+		<country>United States</country>
+		<countryCode>us</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
+		<region>Virginia</region>
+		<regionCode>VA</regionCode>
+		<city>Ashburn</city>
+		<location>Ashburn, Virginia, United States</location>
+		<visitLocalTime>13:48:07</visitLocalTime>
+		<visitLocalHour>13</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
@@ -475,15 +525,6 @@
 		<idVisit>4</idVisit>
 		<visitIp>175.41.192.40</visitIp>
 		
-		<visitorType>new</visitorType>
-		<visitorTypeIcon />
-		<visitConverted>1</visitConverted>
-		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
-		<visitEcommerceStatus>none</visitEcommerceStatus>
-		<visitEcommerceStatusIcon />
-		<searches>0</searches>
-		<events>0</events>
-		<actions>1</actions>
 		<actionDetails>
 			<row>
 				<type>goal</type>
@@ -494,6 +535,7 @@
 				
 				<url>http://piwik.net/docs/manage-websites/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -502,41 +544,38 @@
 				<pageIdAction>4</pageIdAction>
 				
 				<pageId>4</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
-		<customVariables>
-		</customVariables>
 		<goalConversions>1</goalConversions>
 		<siteCurrency>USD</siteCurrency>
 		<siteCurrencySymbol>$</siteCurrencySymbol>
 		
-		<visitLocalTime>08:12:03</visitLocalTime>
-		<visitLocalHour>8</visitLocalHour>
-		
 		
 		
 		
-		<visitDuration>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<continent>Asia</continent>
-		<continentCode>asi</continentCode>
-		<country>Japan</country>
-		<countryCode>jp</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Japan</location>
-		<latitude>36</latitude>
-		<longitude>138</longitude>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>1</actions>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -545,16 +584,37 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Linux</operatingSystem>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>GNU/Linux</operatingSystem>
+		<operatingSystemName>GNU/Linux</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
 		<operatingSystemCode>LIN</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
+		<operatingSystemVersion />
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<browserName>Firefox 6.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browser>Firefox 6.0</browser>
+		<browserName>Firefox</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>6.0</browserVersion>
-		<deviceType>Desktop</deviceType>
+		<events>0</events>
+		<continent>Asia</continent>
+		<continentCode>asi</continentCode>
+		<country>Japan</country>
+		<countryCode>jp</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Japan</location>
+		<visitLocalTime>08:12:03</visitLocalTime>
+		<visitLocalHour>8</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
@@ -569,15 +629,6 @@
 		<idVisit>3</idVisit>
 		<visitIp>175.41.192.40</visitIp>
 		
-		<visitorType>new</visitorType>
-		<visitorTypeIcon />
-		<visitConverted>1</visitConverted>
-		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
-		<visitEcommerceStatus>none</visitEcommerceStatus>
-		<visitEcommerceStatusIcon />
-		<searches>0</searches>
-		<events>0</events>
-		<actions>1</actions>
 		<actionDetails>
 			<row>
 				<type>goal</type>
@@ -588,6 +639,7 @@
 				
 				<url>http://piwik.net/blog/category/community/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -596,41 +648,38 @@
 				<pageIdAction>3</pageIdAction>
 				
 				<pageId>3</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
-		<customVariables>
-		</customVariables>
 		<goalConversions>1</goalConversions>
 		<siteCurrency>USD</siteCurrency>
 		<siteCurrencySymbol>$</siteCurrencySymbol>
 		
-		<visitLocalTime>08:11:56</visitLocalTime>
-		<visitLocalHour>8</visitLocalHour>
-		
 		
 		
 		
-		<visitDuration>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<continent>Asia</continent>
-		<continentCode>asi</continentCode>
-		<country>Japan</country>
-		<countryCode>jp</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Japan</location>
-		<latitude>36</latitude>
-		<longitude>138</longitude>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>1</actions>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -639,16 +688,37 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Linux</operatingSystem>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>GNU/Linux</operatingSystem>
+		<operatingSystemName>GNU/Linux</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
 		<operatingSystemCode>LIN</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
-		<browserFamily>webkit</browserFamily>
+		<operatingSystemVersion />
+		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
-		<browserName>Epiphany 2.30</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
+		<browser>Epiphany 2.30</browser>
+		<browserName>Epiphany</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon>
 		<browserCode>EP</browserCode>
 		<browserVersion>2.30</browserVersion>
-		<deviceType>Desktop</deviceType>
+		<events>0</events>
+		<continent>Asia</continent>
+		<continentCode>asi</continentCode>
+		<country>Japan</country>
+		<countryCode>jp</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Japan</location>
+		<visitLocalTime>08:11:56</visitLocalTime>
+		<visitLocalHour>8</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
@@ -663,15 +733,6 @@
 		<idVisit>2</idVisit>
 		<visitIp>175.41.192.40</visitIp>
 		
-		<visitorType>new</visitorType>
-		<visitorTypeIcon />
-		<visitConverted>1</visitConverted>
-		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
-		<visitEcommerceStatus>none</visitEcommerceStatus>
-		<visitEcommerceStatusIcon />
-		<searches>0</searches>
-		<events>0</events>
-		<actions>1</actions>
 		<actionDetails>
 			<row>
 				<type>goal</type>
@@ -682,6 +743,7 @@
 				
 				<url>http://piwik.net/faq/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -690,41 +752,38 @@
 				<pageIdAction>2</pageIdAction>
 				
 				<pageId>2</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
-		<customVariables>
-		</customVariables>
 		<goalConversions>1</goalConversions>
 		<siteCurrency>USD</siteCurrency>
 		<siteCurrencySymbol>$</siteCurrencySymbol>
 		
-		<visitLocalTime>08:11:30</visitLocalTime>
-		<visitLocalHour>8</visitLocalHour>
 		
 		
 		
-		
-		<visitDuration>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<continent>Asia</continent>
-		<continentCode>asi</continentCode>
-		<country>Japan</country>
-		<countryCode>jp</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Japan</location>
-		<latitude>36</latitude>
-		<longitude>138</longitude>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>1</actions>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -733,16 +792,37 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Android</operatingSystem>
+		<deviceType>Smartphone</deviceType>
+		<operatingSystem>Android 2.3</operatingSystem>
+		<operatingSystemName>Android</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon>
 		<operatingSystemCode>AND</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon>
-		<browserFamily>unknown</browserFamily>
-		<browserFamilyDescription>Unknown</browserFamilyDescription>
-		<browserName>Android Browser </browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon>
+		<operatingSystemVersion>2.3</operatingSystemVersion>
+		<browserFamily>WebKit</browserFamily>
+		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browser>Android Browser</browser>
+		<browserName>Android Browser</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon>
 		<browserCode>AN</browserCode>
 		<browserVersion />
-		<deviceType>Smartphone</deviceType>
+		<events>0</events>
+		<continent>Asia</continent>
+		<continentCode>asi</continentCode>
+		<country>Japan</country>
+		<countryCode>jp</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Japan</location>
+		<visitLocalTime>08:11:30</visitLocalTime>
+		<visitLocalHour>8</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
@@ -757,15 +837,6 @@
 		<idVisit>1</idVisit>
 		<visitIp>175.41.192.40</visitIp>
 		
-		<visitorType>new</visitorType>
-		<visitorTypeIcon />
-		<visitConverted>1</visitConverted>
-		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
-		<visitEcommerceStatus>none</visitEcommerceStatus>
-		<visitEcommerceStatusIcon />
-		<searches>0</searches>
-		<events>0</events>
-		<actions>1</actions>
 		<actionDetails>
 			<row>
 				<type>goal</type>
@@ -776,6 +847,7 @@
 				
 				<url>http://piwik.net/blog/category/meta/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -784,41 +856,38 @@
 				<pageIdAction>1</pageIdAction>
 				
 				<pageId>1</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
-		<customVariables>
-		</customVariables>
 		<goalConversions>1</goalConversions>
 		<siteCurrency>USD</siteCurrency>
 		<siteCurrencySymbol>$</siteCurrencySymbol>
 		
-		<visitLocalTime>08:10:38</visitLocalTime>
-		<visitLocalHour>8</visitLocalHour>
-		
 		
 		
 		
-		<visitDuration>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<continent>Asia</continent>
-		<continentCode>asi</continentCode>
-		<country>Japan</country>
-		<countryCode>jp</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Japan</location>
-		<latitude>36</latitude>
-		<longitude>138</longitude>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>1</actions>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -827,16 +896,37 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Mac OS</operatingSystem>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Mac 10.6</operatingSystem>
+		<operatingSystemName>Mac</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
 		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
-		<browserFamily>unknown</browserFamily>
-		<browserFamilyDescription>Unknown</browserFamilyDescription>
-		<browserName>RockMelt 0.9</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<operatingSystemVersion>10.6</operatingSystemVersion>
+		<browserFamily>WebKit</browserFamily>
+		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browser>RockMelt 0.9</browser>
+		<browserName>RockMelt</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
 		<browserCode>RM</browserCode>
 		<browserVersion>0.9</browserVersion>
-		<deviceType>Desktop</deviceType>
+		<events>0</events>
+		<continent>Asia</continent>
+		<continentCode>asi</continentCode>
+		<country>Japan</country>
+		<countryCode>jp</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Japan</location>
+		<visitLocalTime>08:10:38</visitLocalTime>
+		<visitLocalHour>8</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml
index 896b4d503f..2bf4f9fe39 100644
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml
@@ -5,17 +5,27 @@
 		<idVisit>41</idVisit>
 		<visitIp>175.41.192.40</visitIp>
 		
-		<visitorType>new</visitorType>
-		<visitorTypeIcon />
-		<visitConverted>1</visitConverted>
-		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
-		<visitEcommerceStatus>none</visitEcommerceStatus>
-		<visitEcommerceStatusIcon />
-		<searches>0</searches>
-		<events>0</events>
-		<actions>10</actions>
 		<actionDetails>
 			<row>
+				<type>action</type>
+				<url>http://piwik.net/blog/category/meta/</url>
+				<pageTitle />
+				<pageIdAction>1</pageIdAction>
+				
+				<pageId>48</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
+				<generationTime>0.12s</generationTime>
+				<timeSpent>0</timeSpent>
+				<timeSpentPretty>0s</timeSpentPretty>
+				<icon />
+				
+			</row>
+			<row>
 				<type>goal</type>
 				<goalName>all</goalName>
 				<goalId>1</goalId>
@@ -24,18 +34,7 @@
 				
 				<url>http://piwik.net/blog/category/meta/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://piwik.net/blog/category/meta/</url>
-				<pageTitle />
-				<pageIdAction>1</pageIdAction>
 				
-				<pageId>56</pageId>
-				<generationTime>0.02s</generationTime>
-				<timeSpent>52</timeSpent>
-				<timeSpentPretty>52s</timeSpentPretty>
-				<icon />
 			</row>
 			<row>
 				<type>action</type>
@@ -44,10 +43,17 @@
 				<pageIdAction>1</pageIdAction>
 				
 				<pageId>52</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
 				<generationTime>0.12s</generationTime>
 				<timeSpent>0</timeSpent>
 				<timeSpentPretty>0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -55,11 +61,18 @@
 				<pageTitle />
 				<pageIdAction>1</pageIdAction>
 				
-				<pageId>48</pageId>
-				<generationTime>0.12s</generationTime>
-				<timeSpent>0</timeSpent>
-				<timeSpentPretty>0s</timeSpentPretty>
+				<pageId>56</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
+				<generationTime>0.02s</generationTime>
+				<timeSpent>52</timeSpent>
+				<timeSpentPretty>52s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -67,11 +80,18 @@
 				<pageTitle />
 				<pageIdAction>2</pageIdAction>
 				
-				<pageId>57</pageId>
-				<generationTime>0.24s</generationTime>
-				<timeSpent>26</timeSpent>
-				<timeSpentPretty>26s</timeSpentPretty>
+				<pageId>49</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
+				<generationTime>0.23s</generationTime>
+				<timeSpent>50</timeSpent>
+				<timeSpentPretty>50s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -79,11 +99,18 @@
 				<pageTitle />
 				<pageIdAction>2</pageIdAction>
 				
-				<pageId>49</pageId>
-				<generationTime>0.23s</generationTime>
-				<timeSpent>52</timeSpent>
-				<timeSpentPretty>52s</timeSpentPretty>
+				<pageId>53</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
+				<generationTime>0.29s</generationTime>
+				<timeSpent>49</timeSpent>
+				<timeSpentPretty>49s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -91,11 +118,18 @@
 				<pageTitle />
 				<pageIdAction>2</pageIdAction>
 				
-				<pageId>53</pageId>
-				<generationTime>0.29s</generationTime>
-				<timeSpent>52</timeSpent>
-				<timeSpentPretty>52s</timeSpentPretty>
+				<pageId>57</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
+				<generationTime>0.24s</generationTime>
+				<timeSpent>26</timeSpent>
+				<timeSpentPretty>26s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -103,11 +137,18 @@
 				<pageTitle />
 				<pageIdAction>3</pageIdAction>
 				
-				<pageId>54</pageId>
-				<generationTime>0.62s</generationTime>
-				<timeSpent>7</timeSpent>
-				<timeSpentPretty>7s</timeSpentPretty>
+				<pageId>50</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
+				<generationTime>1.32s</generationTime>
+				<timeSpent>26</timeSpent>
+				<timeSpentPretty>26s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -115,11 +156,18 @@
 				<pageTitle />
 				<pageIdAction>3</pageIdAction>
 				
-				<pageId>50</pageId>
-				<generationTime>1.32s</generationTime>
-				<timeSpent>26</timeSpent>
-				<timeSpentPretty>26s</timeSpentPretty>
+				<pageId>54</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
+				<generationTime>0.62s</generationTime>
+				<timeSpent>7</timeSpent>
+				<timeSpentPretty>7s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -127,9 +175,18 @@
 				<pageTitle />
 				<pageIdAction>4</pageIdAction>
 				
-				<pageId>55</pageId>
-				<generationTime>0.34s</generationTime>
+				<pageId>51</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
+				<generationTime>0.54s</generationTime>
+				<timeSpent>8</timeSpent>
+				<timeSpentPretty>8s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -137,45 +194,40 @@
 				<pageTitle />
 				<pageIdAction>4</pageIdAction>
 				
-				<pageId>51</pageId>
-				<generationTime>0.54s</generationTime>
-				<timeSpent>7</timeSpent>
-				<timeSpentPretty>7s</timeSpentPretty>
+				<pageId>55</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
+				<generationTime>0.34s</generationTime>
 				<icon />
+				
 			</row>
 		</actionDetails>
-		<customVariables>
-		</customVariables>
 		<goalConversions>1</goalConversions>
 		<siteCurrency>USD</siteCurrency>
 		<siteCurrencySymbol>$</siteCurrencySymbol>
 		
-		<visitLocalTime>08:10:38</visitLocalTime>
-		<visitLocalHour>8</visitLocalHour>
 		
 		
 		
-		
-		<visitDuration>54</visitDuration>
-		<visitDurationPretty>54s</visitDurationPretty>
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<continent>Asia</continent>
-		<continentCode>asi</continentCode>
-		<country>Japan</country>
-		<countryCode>jp</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Japan</location>
-		<latitude>36</latitude>
-		<longitude>138</longitude>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<visitDuration>54</visitDuration>
+		<visitDurationPretty>54s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>10</actions>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -184,16 +236,37 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
+		<deviceType>Unknown</deviceType>
 		<operatingSystem>Unknown</operatingSystem>
+		<operatingSystemName>Unknown</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
 		<operatingSystemCode>UNK</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
-		<browserFamily>unknown</browserFamily>
+		<operatingSystemVersion>UNK</operatingSystemVersion>
+		<browserFamily />
 		<browserFamilyDescription>Unknown</browserFamilyDescription>
+		<browser>Unknown</browser>
 		<browserName>Unknown</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
 		<browserCode>UNK</browserCode>
-		<browserVersion>UNK</browserVersion>
-		<deviceType>Desktop</deviceType>
+		<browserVersion />
+		<events>0</events>
+		<continent>Asia</continent>
+		<continentCode>asi</continentCode>
+		<country>Japan</country>
+		<countryCode>jp</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Japan</location>
+		<visitLocalTime>08:10:38</visitLocalTime>
+		<visitLocalHour>8</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
@@ -208,15 +281,6 @@
 		<idVisit>26</idVisit>
 		<visitIp>0.0.0.0</visitIp>
 		
-		<visitorType>new</visitorType>
-		<visitorTypeIcon />
-		<visitConverted>1</visitConverted>
-		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
-		<visitEcommerceStatus>none</visitEcommerceStatus>
-		<visitEcommerceStatusIcon />
-		<searches>0</searches>
-		<events>0</events>
-		<actions>1</actions>
 		<actionDetails>
 			<row>
 				<type>goal</type>
@@ -227,6 +291,7 @@
 				
 				<url>http://example.org/index.htm</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -250,44 +315,31 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
-		<customVariables>
-			<row>
-				<customVariableName5>VisitorType</customVariableName5>
-				<customVariableValue5>NewLoggedOut</customVariableValue5>
-			</row>
-		</customVariables>
 		<goalConversions>1</goalConversions>
 		<siteCurrency>USD</siteCurrency>
 		<siteCurrencySymbol>$</siteCurrencySymbol>
 		
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		
 		
 		
 		
-		<visitDuration>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<continent>Unknown</continent>
-		<continentCode>unk</continentCode>
-		<country>Unknown</country>
-		<countryCode>xx</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Unknown</location>
-		<latitude />
-		<longitude />
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>1</actions>
 		<referrerType>website</referrerType>
 		<referrerTypeName>Websites</referrerTypeName>
 		<referrerName>piwik.org</referrerName>
@@ -296,25 +348,50 @@
 		<referrerUrl>http://piwik.org/contribute%</referrerUrl>
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
+		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
-		<browserFamily>ie</browserFamily>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
+		<browserFamily>Trident</browserFamily>
 		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
-		<browserName>Internet Explorer 6.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+		<browser>Internet Explorer 6.0</browser>
+		<browserName>Internet Explorer</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>6.0</browserVersion>
-		<deviceType>Desktop</deviceType>
+		<events>0</events>
+		<continent>Unknown</continent>
+		<continentCode>unk</continentCode>
+		<country>Unknown</country>
+		<countryCode>xx</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Unknown</location>
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName5>VisitorType</customVariableName5>
+				<customVariableValue5>NewLoggedOut</customVariableValue5>
+			</row>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
@@ -329,15 +406,6 @@
 		<idVisit>25</idVisit>
 		<visitIp>175.41.192.41</visitIp>
 		
-		<visitorType>new</visitorType>
-		<visitorTypeIcon />
-		<visitConverted>1</visitConverted>
-		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
-		<visitEcommerceStatus>none</visitEcommerceStatus>
-		<visitEcommerceStatusIcon />
-		<searches>0</searches>
-		<events>0</events>
-		<actions>1</actions>
 		<actionDetails>
 			<row>
 				<type>goal</type>
@@ -348,6 +416,7 @@
 				
 				<url>http://piwik.net/blog/category/meta/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -356,45 +425,38 @@
 				<pageIdAction>1</pageIdAction>
 				
 				<pageId>28</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
-		<customVariables>
-			<row>
-				<customVariableName1>Not-Bot</customVariableName1>
-				<customVariableValue1>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</customVariableValue1>
-			</row>
-		</customVariables>
 		<goalConversions>1</goalConversions>
 		<siteCurrency>USD</siteCurrency>
 		<siteCurrencySymbol>$</siteCurrencySymbol>
 		
-		<visitLocalTime>20:15:41</visitLocalTime>
-		<visitLocalHour>20</visitLocalHour>
-		
 		
 		
 		
-		<visitDuration>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<continent>Asia</continent>
-		<continentCode>asi</continentCode>
-		<country>Japan</country>
-		<countryCode>jp</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Japan</location>
-		<latitude>36</latitude>
-		<longitude>138</longitude>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>1</actions>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -403,16 +465,41 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Mac OS</operatingSystem>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Mac 10.6</operatingSystem>
+		<operatingSystemName>Mac</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
 		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
-		<browserFamily>unknown</browserFamily>
-		<browserFamilyDescription>Unknown</browserFamilyDescription>
-		<browserName>RockMelt 0.9</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<operatingSystemVersion>10.6</operatingSystemVersion>
+		<browserFamily>WebKit</browserFamily>
+		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browser>RockMelt 0.9</browser>
+		<browserName>RockMelt</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
 		<browserCode>RM</browserCode>
 		<browserVersion>0.9</browserVersion>
-		<deviceType>Desktop</deviceType>
+		<events>0</events>
+		<continent>Asia</continent>
+		<continentCode>asi</continentCode>
+		<country>Japan</country>
+		<countryCode>jp</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Japan</location>
+		<visitLocalTime>20:15:41</visitLocalTime>
+		<visitLocalHour>20</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Not-Bot</customVariableName1>
+				<customVariableValue1>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
@@ -427,15 +514,6 @@
 		<idVisit>24</idVisit>
 		<visitIp>175.41.192.43</visitIp>
 		
-		<visitorType>new</visitorType>
-		<visitorTypeIcon />
-		<visitConverted>1</visitConverted>
-		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
-		<visitEcommerceStatus>none</visitEcommerceStatus>
-		<visitEcommerceStatusIcon />
-		<searches>0</searches>
-		<events>0</events>
-		<actions>2</actions>
 		<actionDetails>
 			<row>
 				<type>action</type>
@@ -451,8 +529,9 @@
 					</row>
 				</customVariables>
 				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
+				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -463,6 +542,7 @@
 				
 				<url>http://piwik.net/moved-permanently</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -478,44 +558,31 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
-		<customVariables>
-			<row>
-				<customVariableName1>Not-Bot</customVariableName1>
-				<customVariableValue1>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</customVariableValue1>
-			</row>
-		</customVariables>
 		<goalConversions>1</goalConversions>
 		<siteCurrency>USD</siteCurrency>
 		<siteCurrencySymbol>$</siteCurrencySymbol>
 		
-		<visitLocalTime>19:12:40</visitLocalTime>
-		<visitLocalHour>19</visitLocalHour>
-		
 		
 		
 		
-		<visitDuration>182</visitDuration>
-		<visitDurationPretty>3 min 2s</visitDurationPretty>
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<continent>Asia</continent>
-		<continentCode>asi</continentCode>
-		<country>Japan</country>
-		<countryCode>jp</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Japan</location>
-		<latitude>36</latitude>
-		<longitude>138</longitude>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<visitDuration>182</visitDuration>
+		<visitDurationPretty>3 min 2s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>2</actions>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -524,16 +591,41 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Mac OS</operatingSystem>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Mac 10.6</operatingSystem>
+		<operatingSystemName>Mac</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
 		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
-		<browserFamily>unknown</browserFamily>
-		<browserFamilyDescription>Unknown</browserFamilyDescription>
-		<browserName>RockMelt 0.9</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<operatingSystemVersion>10.6</operatingSystemVersion>
+		<browserFamily>WebKit</browserFamily>
+		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browser>RockMelt 0.9</browser>
+		<browserName>RockMelt</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
 		<browserCode>RM</browserCode>
 		<browserVersion>0.9</browserVersion>
-		<deviceType>Desktop</deviceType>
+		<events>0</events>
+		<continent>Asia</continent>
+		<continentCode>asi</continentCode>
+		<country>Japan</country>
+		<countryCode>jp</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Japan</location>
+		<visitLocalTime>19:12:40</visitLocalTime>
+		<visitLocalHour>19</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Not-Bot</customVariableName1>
+				<customVariableValue1>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
@@ -548,15 +640,6 @@
 		<idVisit>23</idVisit>
 		<visitIp>175.41.192.42</visitIp>
 		
-		<visitorType>new</visitorType>
-		<visitorTypeIcon />
-		<visitConverted>0</visitConverted>
-		<visitConvertedIcon />
-		<visitEcommerceStatus>none</visitEcommerceStatus>
-		<visitEcommerceStatusIcon />
-		<searches>0</searches>
-		<events>0</events>
-		<actions>3</actions>
 		<actionDetails>
 			<row>
 				<type>download</type>
@@ -565,9 +648,16 @@
 				<pageIdAction>21</pageIdAction>
 				
 				<pageId>23</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
 				<timeSpent>61</timeSpent>
-				<timeSpentPretty>1 min 1s</timeSpentPretty>
+				<timeSpentPretty>1 min 1s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/download.png</icon>
+				
 			</row>
 			<row>
 				<type>download</type>
@@ -576,9 +666,16 @@
 				<pageIdAction>22</pageIdAction>
 				
 				<pageId>24</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
 				<timeSpent>61</timeSpent>
-				<timeSpentPretty>1 min 1s</timeSpentPretty>
+				<timeSpentPretty>1 min 1s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/download.png</icon>
+				
 			</row>
 			<row>
 				<type>download</type>
@@ -587,45 +684,38 @@
 				<pageIdAction>23</pageIdAction>
 				
 				<pageId>25</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
 				<icon>plugins/Morpheus/images/download.png</icon>
+				
 			</row>
 		</actionDetails>
-		<customVariables>
-			<row>
-				<customVariableName1>Not-Bot</customVariableName1>
-				<customVariableValue1>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</customVariableValue1>
-			</row>
-		</customVariables>
 		<goalConversions>0</goalConversions>
 		<siteCurrency>USD</siteCurrency>
 		<siteCurrencySymbol>$</siteCurrencySymbol>
 		
-		<visitLocalTime>18:10:38</visitLocalTime>
-		<visitLocalHour>18</visitLocalHour>
 		
 		
 		
-		
-		<visitDuration>123</visitDuration>
-		<visitDurationPretty>2 min 3s</visitDurationPretty>
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>0</visitConverted>
+		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<continent>Asia</continent>
-		<continentCode>asi</continentCode>
-		<country>Japan</country>
-		<countryCode>jp</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Japan</location>
-		<latitude>36</latitude>
-		<longitude>138</longitude>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<visitDuration>123</visitDuration>
+		<visitDurationPretty>2 min 3s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>3</actions>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -634,16 +724,41 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Mac OS</operatingSystem>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Mac 10.6</operatingSystem>
+		<operatingSystemName>Mac</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
 		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
-		<browserFamily>unknown</browserFamily>
-		<browserFamilyDescription>Unknown</browserFamilyDescription>
-		<browserName>RockMelt 0.9</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<operatingSystemVersion>10.6</operatingSystemVersion>
+		<browserFamily>WebKit</browserFamily>
+		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browser>RockMelt 0.9</browser>
+		<browserName>RockMelt</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
 		<browserCode>RM</browserCode>
 		<browserVersion>0.9</browserVersion>
-		<deviceType>Desktop</deviceType>
+		<events>0</events>
+		<continent>Asia</continent>
+		<continentCode>asi</continentCode>
+		<country>Japan</country>
+		<countryCode>jp</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Japan</location>
+		<visitLocalTime>18:10:38</visitLocalTime>
+		<visitLocalHour>18</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Not-Bot</customVariableName1>
+				<customVariableValue1>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
@@ -658,15 +773,6 @@
 		<idVisit>22</idVisit>
 		<visitIp>72.44.32.11</visitIp>
 		
-		<visitorType>new</visitorType>
-		<visitorTypeIcon />
-		<visitConverted>1</visitConverted>
-		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
-		<visitEcommerceStatus>none</visitEcommerceStatus>
-		<visitEcommerceStatusIcon />
-		<searches>0</searches>
-		<events>0</events>
-		<actions>1</actions>
 		<actionDetails>
 			<row>
 				<type>goal</type>
@@ -677,6 +783,7 @@
 				
 				<url>http://piwik.net/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -685,45 +792,38 @@
 				<pageIdAction>5</pageIdAction>
 				
 				<pageId>22</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
-		<customVariables>
-			<row>
-				<customVariableName1>Bot</customVariableName1>
-				<customVariableValue1>Googlebot/2.1 (+http://www.googlebot.com/bot.html)</customVariableValue1>
-			</row>
-		</customVariables>
 		<goalConversions>1</goalConversions>
 		<siteCurrency>USD</siteCurrency>
 		<siteCurrencySymbol>$</siteCurrencySymbol>
 		
-		<visitLocalTime>17:48:08</visitLocalTime>
-		<visitLocalHour>17</visitLocalHour>
-		
 		
 		
 		
-		<visitDuration>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<continent>North America</continent>
-		<continentCode>amn</continentCode>
-		<country>United States</country>
-		<countryCode>us</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
-		<region>Virginia</region>
-		<regionCode>VA</regionCode>
-		<city>Ashburn</city>
-		<location>Ashburn, Virginia, United States</location>
-		<latitude>39.043999</latitude>
-		<longitude>-77.487999</longitude>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>1</actions>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -732,16 +832,41 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
+		<deviceType>Unknown</deviceType>
 		<operatingSystem>Bot</operatingSystem>
+		<operatingSystemName>Bot</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
 		<operatingSystemCode>BOT</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
-		<browserFamily>unknown</browserFamily>
+		<operatingSystemVersion>UNK</operatingSystemVersion>
+		<browserFamily />
 		<browserFamilyDescription>Unknown</browserFamilyDescription>
+		<browser>Unknown</browser>
 		<browserName>Unknown</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
 		<browserCode>UNK</browserCode>
-		<browserVersion>UNK</browserVersion>
-		<deviceType>Desktop</deviceType>
+		<browserVersion />
+		<events>0</events>
+		<continent>North America</continent>
+		<continentCode>amn</continentCode>
+		<country>United States</country>
+		<countryCode>us</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
+		<region>Virginia</region>
+		<regionCode>VA</regionCode>
+		<city>Ashburn</city>
+		<location>Ashburn, Virginia, United States</location>
+		<visitLocalTime>17:48:08</visitLocalTime>
+		<visitLocalHour>17</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Bot</customVariableName1>
+				<customVariableValue1>Googlebot/2.1 (+http://www.googlebot.com/bot.html)</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
@@ -756,15 +881,6 @@
 		<idVisit>21</idVisit>
 		<visitIp>72.44.32.11</visitIp>
 		
-		<visitorType>new</visitorType>
-		<visitorTypeIcon />
-		<visitConverted>1</visitConverted>
-		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
-		<visitEcommerceStatus>none</visitEcommerceStatus>
-		<visitEcommerceStatusIcon />
-		<searches>0</searches>
-		<events>0</events>
-		<actions>1</actions>
 		<actionDetails>
 			<row>
 				<type>goal</type>
@@ -775,6 +891,7 @@
 				
 				<url>http://piwik.net/to-an-error</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -790,44 +907,31 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
-		<customVariables>
-			<row>
-				<customVariableName1>Not-Bot</customVariableName1>
-				<customVariableValue1>Mozilla/5.0 (compatible; MSIE 10.6; Windows NT 6.1; Trident/5.0; InfoPath.2; SLCC1; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; .NET CLR 2.0.50727) 3gpp-gba UNTRUSTED/1.0</customVariableValue1>
-			</row>
-		</customVariables>
 		<goalConversions>1</goalConversions>
 		<siteCurrency>USD</siteCurrency>
 		<siteCurrencySymbol>$</siteCurrencySymbol>
 		
-		<visitLocalTime>17:48:07</visitLocalTime>
-		<visitLocalHour>17</visitLocalHour>
-		
 		
 		
 		
-		<visitDuration>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<continent>North America</continent>
-		<continentCode>amn</continentCode>
-		<country>United States</country>
-		<countryCode>us</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
-		<region>Virginia</region>
-		<regionCode>VA</regionCode>
-		<city>Ashburn</city>
-		<location>Ashburn, Virginia, United States</location>
-		<latitude>39.043999</latitude>
-		<longitude>-77.487999</longitude>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>1</actions>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -836,16 +940,41 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
+		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemCode>WI7</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
-		<browserFamily>ie</browserFamily>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>7</operatingSystemVersion>
+		<browserFamily>Trident</browserFamily>
 		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
-		<browserName>Internet Explorer 9.0</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+		<browser>Internet Explorer 9.0</browser>
+		<browserName>Internet Explorer</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>9.0</browserVersion>
-		<deviceType>Desktop</deviceType>
+		<events>0</events>
+		<continent>North America</continent>
+		<continentCode>amn</continentCode>
+		<country>United States</country>
+		<countryCode>us</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
+		<region>Virginia</region>
+		<regionCode>VA</regionCode>
+		<city>Ashburn</city>
+		<location>Ashburn, Virginia, United States</location>
+		<visitLocalTime>17:48:07</visitLocalTime>
+		<visitLocalHour>17</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Not-Bot</customVariableName1>
+				<customVariableValue1>Mozilla/5.0 (compatible; MSIE 10.6; Windows NT 6.1; Trident/5.0; InfoPath.2; SLCC1; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; .NET CLR 2.0.50727) 3gpp-gba UNTRUSTED/1.0</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
@@ -860,15 +989,6 @@
 		<idVisit>18</idVisit>
 		<visitIp>1.2.3.4</visitIp>
 		
-		<visitorType>new</visitorType>
-		<visitorTypeIcon />
-		<visitConverted>0</visitConverted>
-		<visitConvertedIcon />
-		<visitEcommerceStatus>none</visitEcommerceStatus>
-		<visitEcommerceStatusIcon />
-		<searches>0</searches>
-		<events>0</events>
-		<actions>1</actions>
 		<actionDetails>
 			<row>
 				<type>download</type>
@@ -877,45 +997,38 @@
 				<pageIdAction>16</pageIdAction>
 				
 				<pageId>18</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
 				<icon>plugins/Morpheus/images/download.png</icon>
+				
 			</row>
 		</actionDetails>
-		<customVariables>
-			<row>
-				<customVariableName1>Not-Bot</customVariableName1>
-				<customVariableValue1>Apache-HttpClient/4.2.1 (java 1.5)</customVariableValue1>
-			</row>
-		</customVariables>
 		<goalConversions>0</goalConversions>
 		<siteCurrency>USD</siteCurrency>
 		<siteCurrencySymbol>$</siteCurrencySymbol>
 		
-		<visitLocalTime>17:46:03</visitLocalTime>
-		<visitLocalHour>17</visitLocalHour>
-		
 		
 		
 		
-		<visitDuration>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>0</visitConverted>
+		<visitConvertedIcon />
 		<visitCount>1</visitCount>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<continent>Oceania</continent>
-		<continentCode>oce</continentCode>
-		<country>Australia</country>
-		<countryCode>au</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/au.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Australia</location>
-		<latitude>-27</latitude>
-		<longitude>133</longitude>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>1</actions>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -924,16 +1037,41 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
+		<deviceType>Unknown</deviceType>
 		<operatingSystem>Unknown</operatingSystem>
+		<operatingSystemName>Unknown</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
 		<operatingSystemCode>UNK</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
-		<browserFamily>unknown</browserFamily>
+		<operatingSystemVersion>UNK</operatingSystemVersion>
+		<browserFamily />
 		<browserFamilyDescription>Unknown</browserFamilyDescription>
+		<browser>Unknown</browser>
 		<browserName>Unknown</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
 		<browserCode>UNK</browserCode>
-		<browserVersion>UNK</browserVersion>
-		<deviceType>Desktop</deviceType>
+		<browserVersion />
+		<events>0</events>
+		<continent>Oceania</continent>
+		<continentCode>oce</continentCode>
+		<country>Australia</country>
+		<countryCode>au</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/au.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Australia</location>
+		<visitLocalTime>17:46:03</visitLocalTime>
+		<visitLocalHour>17</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Not-Bot</customVariableName1>
+				<customVariableValue1>Apache-HttpClient/4.2.1 (java 1.5)</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
@@ -948,15 +1086,6 @@
 		<idVisit>20</idVisit>
 		<visitIp>175.41.192.41</visitIp>
 		
-		<visitorType>new</visitorType>
-		<visitorTypeIcon />
-		<visitConverted>1</visitConverted>
-		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
-		<visitEcommerceStatus>none</visitEcommerceStatus>
-		<visitEcommerceStatusIcon />
-		<searches>0</searches>
-		<events>0</events>
-		<actions>1</actions>
 		<actionDetails>
 			<row>
 				<type>goal</type>
@@ -967,6 +1096,7 @@
 				
 				<url>http://piwik.net/this/is/not/the/page/i/am/looking/for/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -982,44 +1112,31 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
-		<customVariables>
-			<row>
-				<customVariableName1>Not-Bot</customVariableName1>
-				<customVariableValue1>Mozilla/5.0 (Linux; U; Android 2.3.5; en-us; HTC Vision Build/GRI40) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1</customVariableValue1>
-			</row>
-		</customVariables>
 		<goalConversions>1</goalConversions>
 		<siteCurrency>USD</siteCurrency>
 		<siteCurrencySymbol>$</siteCurrencySymbol>
 		
-		<visitLocalTime>16:11:30</visitLocalTime>
-		<visitLocalHour>16</visitLocalHour>
 		
 		
 		
-		
-		<visitDuration>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<continent>Asia</continent>
-		<continentCode>asi</continentCode>
-		<country>Japan</country>
-		<countryCode>jp</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Japan</location>
-		<latitude>36</latitude>
-		<longitude>138</longitude>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>1</actions>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -1028,16 +1145,41 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Android</operatingSystem>
+		<deviceType>Smartphone</deviceType>
+		<operatingSystem>Android 2.3</operatingSystem>
+		<operatingSystemName>Android</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon>
 		<operatingSystemCode>AND</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon>
-		<browserFamily>unknown</browserFamily>
-		<browserFamilyDescription>Unknown</browserFamilyDescription>
-		<browserName>Android Browser </browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon>
+		<operatingSystemVersion>2.3</operatingSystemVersion>
+		<browserFamily>WebKit</browserFamily>
+		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browser>Android Browser</browser>
+		<browserName>Android Browser</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon>
 		<browserCode>AN</browserCode>
 		<browserVersion />
-		<deviceType>Smartphone</deviceType>
+		<events>0</events>
+		<continent>Asia</continent>
+		<continentCode>asi</continentCode>
+		<country>Japan</country>
+		<countryCode>jp</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Japan</location>
+		<visitLocalTime>16:11:30</visitLocalTime>
+		<visitLocalHour>16</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Not-Bot</customVariableName1>
+				<customVariableValue1>Mozilla/5.0 (Linux; U; Android 2.3.5; en-us; HTC Vision Build/GRI40) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
@@ -1052,15 +1194,6 @@
 		<idVisit>19</idVisit>
 		<visitIp>175.41.192.41</visitIp>
 		
-		<visitorType>new</visitorType>
-		<visitorTypeIcon />
-		<visitConverted>1</visitConverted>
-		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
-		<visitEcommerceStatus>none</visitEcommerceStatus>
-		<visitEcommerceStatusIcon />
-		<searches>0</searches>
-		<events>0</events>
-		<actions>1</actions>
 		<actionDetails>
 			<row>
 				<type>goal</type>
@@ -1071,6 +1204,7 @@
 				
 				<url>http://piwik.net/blog/category/meta/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -1079,45 +1213,38 @@
 				<pageIdAction>1</pageIdAction>
 				
 				<pageId>19</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
-		<customVariables>
-			<row>
-				<customVariableName1>Not-Bot</customVariableName1>
-				<customVariableValue1>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</customVariableValue1>
-			</row>
-		</customVariables>
 		<goalConversions>1</goalConversions>
 		<siteCurrency>USD</siteCurrency>
 		<siteCurrencySymbol>$</siteCurrencySymbol>
 		
-		<visitLocalTime>16:10:38</visitLocalTime>
-		<visitLocalHour>16</visitLocalHour>
 		
 		
 		
-		
-		<visitDuration>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<continent>Asia</continent>
-		<continentCode>asi</continentCode>
-		<country>Japan</country>
-		<countryCode>jp</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Japan</location>
-		<latitude>36</latitude>
-		<longitude>138</longitude>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>1</actions>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -1126,16 +1253,41 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<operatingSystem>Mac OS</operatingSystem>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Mac 10.6</operatingSystem>
+		<operatingSystemName>Mac</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
 		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
-		<browserFamily>unknown</browserFamily>
-		<browserFamilyDescription>Unknown</browserFamilyDescription>
-		<browserName>RockMelt 0.9</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<operatingSystemVersion>10.6</operatingSystemVersion>
+		<browserFamily>WebKit</browserFamily>
+		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+		<browser>RockMelt 0.9</browser>
+		<browserName>RockMelt</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
 		<browserCode>RM</browserCode>
 		<browserVersion>0.9</browserVersion>
-		<deviceType>Desktop</deviceType>
+		<events>0</events>
+		<continent>Asia</continent>
+		<continentCode>asi</continentCode>
+		<country>Japan</country>
+		<countryCode>jp</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Japan</location>
+		<visitLocalTime>16:10:38</visitLocalTime>
+		<visitLocalHour>16</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Not-Bot</customVariableName1>
+				<customVariableValue1>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitFrequency.get_day.xml
new file mode 100644
index 0000000000..c415099916
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitFrequency.get_day.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<nb_uniq_visitors_returning>0</nb_uniq_visitors_returning>
+	<nb_users_returning>0</nb_users_returning>
+	<nb_visits_returning>0</nb_visits_returning>
+	<nb_actions_returning>0</nb_actions_returning>
+	<nb_visits_converted_returning>0</nb_visits_converted_returning>
+	<bounce_count_returning>0</bounce_count_returning>
+	<sum_visit_length_returning>0</sum_visit_length_returning>
+	<max_actions_returning>0</max_actions_returning>
+	<bounce_rate_returning>0%</bounce_rate_returning>
+	<nb_actions_per_visit_returning>0</nb_actions_per_visit_returning>
+	<avg_time_on_site_returning>0</avg_time_on_site_returning>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitFrequency.get_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitFrequency.get_year.xml
new file mode 100644
index 0000000000..dafefc726a
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitFrequency.get_year.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<nb_visits_returning>0</nb_visits_returning>
+	<nb_actions_returning>0</nb_actions_returning>
+	<nb_visits_converted_returning>0</nb_visits_converted_returning>
+	<bounce_count_returning>0</bounce_count_returning>
+	<sum_visit_length_returning>0</sum_visit_length_returning>
+	<max_actions_returning>0</max_actions_returning>
+	<bounce_rate_returning>0%</bounce_rate_returning>
+	<nb_actions_per_visit_returning>0</nb_actions_per_visit_returning>
+	<avg_time_on_site_returning>0</avg_time_on_site_returning>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_day.xml
index 7a7644b476..23449c8af5 100644
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_day.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>9</nb_uniq_visitors>
+	<nb_users>0</nb_users>
 	<nb_visits>9</nb_visits>
 	<nb_actions>9</nb_actions>
 	<nb_visits_converted>9</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_day.xml
new file mode 100644
index 0000000000..32434a44f6
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_day.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result idSite="1">
+		<nb_uniq_visitors>9</nb_uniq_visitors>
+		<nb_users>0</nb_users>
+		<nb_visits>9</nb_visits>
+		<nb_actions>9</nb_actions>
+		<nb_visits_converted>9</nb_visits_converted>
+		<bounce_count>9</bounce_count>
+		<sum_visit_length>0</sum_visit_length>
+		<max_actions>1</max_actions>
+		<bounce_rate>100%</bounce_rate>
+		<nb_actions_per_visit>1</nb_actions_per_visit>
+		<avg_time_on_site>0</avg_time_on_site>
+	</result>
+	<result idSite="2" />
+</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml
new file mode 100644
index 0000000000..0f88508621
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result idSite="1">
+		<nb_uniq_visitors>26</nb_uniq_visitors>
+		<nb_users>0</nb_users>
+		<nb_visits>26</nb_visits>
+		<nb_actions>29</nb_actions>
+		<nb_visits_converted>24</nb_visits_converted>
+		<bounce_count>24</bounce_count>
+		<sum_visit_length>305</sum_visit_length>
+		<max_actions>3</max_actions>
+		<bounce_rate>92%</bounce_rate>
+		<nb_actions_per_visit>1.1</nb_actions_per_visit>
+		<avg_time_on_site>12</avg_time_on_site>
+	</result>
+	<result idSite="2" />
+</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_week.xml
new file mode 100644
index 0000000000..b83a03206f
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_week.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result idSite="1">
+		<nb_uniq_visitors>25</nb_uniq_visitors>
+		<nb_users>0</nb_users>
+		<nb_visits>25</nb_visits>
+		<nb_actions>28</nb_actions>
+		<nb_visits_converted>23</nb_visits_converted>
+		<bounce_count>23</bounce_count>
+		<sum_visit_length>305</sum_visit_length>
+		<max_actions>3</max_actions>
+		<bounce_rate>92%</bounce_rate>
+		<nb_actions_per_visit>1.1</nb_actions_per_visit>
+		<avg_time_on_site>12</avg_time_on_site>
+	</result>
+	<result idSite="2" />
+</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_year.xml
new file mode 100644
index 0000000000..c89ec107ec
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_year.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result idSite="1">
+		<nb_visits>27</nb_visits>
+		<nb_actions>39</nb_actions>
+		<nb_visits_converted>25</nb_visits_converted>
+		<bounce_count>24</bounce_count>
+		<sum_visit_length>359</sum_visit_length>
+		<max_actions>10</max_actions>
+		<bounce_rate>89%</bounce_rate>
+		<nb_actions_per_visit>1.4</nb_actions_per_visit>
+		<avg_time_on_site>13</avg_time_on_site>
+	</result>
+	<result idSite="2" />
+</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_day.xml
new file mode 100644
index 0000000000..32434a44f6
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_day.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result idSite="1">
+		<nb_uniq_visitors>9</nb_uniq_visitors>
+		<nb_users>0</nb_users>
+		<nb_visits>9</nb_visits>
+		<nb_actions>9</nb_actions>
+		<nb_visits_converted>9</nb_visits_converted>
+		<bounce_count>9</bounce_count>
+		<sum_visit_length>0</sum_visit_length>
+		<max_actions>1</max_actions>
+		<bounce_rate>100%</bounce_rate>
+		<nb_actions_per_visit>1</nb_actions_per_visit>
+		<avg_time_on_site>0</avg_time_on_site>
+	</result>
+	<result idSite="2" />
+</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml
new file mode 100644
index 0000000000..0f88508621
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result idSite="1">
+		<nb_uniq_visitors>26</nb_uniq_visitors>
+		<nb_users>0</nb_users>
+		<nb_visits>26</nb_visits>
+		<nb_actions>29</nb_actions>
+		<nb_visits_converted>24</nb_visits_converted>
+		<bounce_count>24</bounce_count>
+		<sum_visit_length>305</sum_visit_length>
+		<max_actions>3</max_actions>
+		<bounce_rate>92%</bounce_rate>
+		<nb_actions_per_visit>1.1</nb_actions_per_visit>
+		<avg_time_on_site>12</avg_time_on_site>
+	</result>
+	<result idSite="2" />
+</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_week.xml
new file mode 100644
index 0000000000..b83a03206f
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_week.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result idSite="1">
+		<nb_uniq_visitors>25</nb_uniq_visitors>
+		<nb_users>0</nb_users>
+		<nb_visits>25</nb_visits>
+		<nb_actions>28</nb_actions>
+		<nb_visits_converted>23</nb_visits_converted>
+		<bounce_count>23</bounce_count>
+		<sum_visit_length>305</sum_visit_length>
+		<max_actions>3</max_actions>
+		<bounce_rate>92%</bounce_rate>
+		<nb_actions_per_visit>1.1</nb_actions_per_visit>
+		<avg_time_on_site>12</avg_time_on_site>
+	</result>
+	<result idSite="2" />
+</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_year.xml
new file mode 100644
index 0000000000..c89ec107ec
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_year.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result idSite="1">
+		<nb_visits>27</nb_visits>
+		<nb_actions>39</nb_actions>
+		<nb_visits_converted>25</nb_visits_converted>
+		<bounce_count>24</bounce_count>
+		<sum_visit_length>359</sum_visit_length>
+		<max_actions>10</max_actions>
+		<bounce_rate>89%</bounce_rate>
+		<nb_actions_per_visit>1.4</nb_actions_per_visit>
+		<avg_time_on_site>13</avg_time_on_site>
+	</result>
+	<result idSite="2" />
+</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldAppear__Actions.getPageUrls_month.xml
index 823b29f7a5..9d4036502d 100644
--- a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldAppear__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldAppear__Actions.getPageUrls_month.xml
@@ -75,6 +75,7 @@
 			<bounce_rate>0%</bounce_rate>
 			<exit_rate>0%</exit_rate>
 			<url>http://example.org/Contact</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2FContact</segment>
 		</row>
 		<row>
 			<label>/Home</label>
@@ -86,6 +87,7 @@
 			<bounce_rate>0%</bounce_rate>
 			<exit_rate>0%</exit_rate>
 			<url>http://example.org/Home</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2FHome</segment>
 		</row>
 		<row>
 			<label>Contact</label>
diff --git a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__Actions.getPageUrls_month.xml
index d4056f1f70..3330a1f532 100644
--- a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__Actions.getPageUrls_month.xml
@@ -64,6 +64,7 @@
 			<bounce_rate>0%</bounce_rate>
 			<exit_rate>0%</exit_rate>
 			<url>http://example.org/Contact</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2FContact</segment>
 		</row>
 		<row>
 			<label>/Home</label>
@@ -75,6 +76,7 @@
 			<bounce_rate>0%</bounce_rate>
 			<exit_rate>0%</exit_rate>
 			<url>http://example.org/Home</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2FHome</segment>
 		</row>
 		<row>
 			<label>Contact</label>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
index 8e3799fa9e..e9f7b16d67 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
@@ -56,27 +56,17 @@
 		<referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
 		<browser>Safari</browser>
 		<browserName>Safari</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon>
 		<browserCode>SF</browserCode>
 		<browserVersion />
 		<events>0</events>
@@ -94,6 +84,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -202,27 +204,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -240,6 +232,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -325,27 +329,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -363,6 +357,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -462,27 +468,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -500,6 +496,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -585,27 +593,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -623,6 +621,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -739,27 +749,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -777,6 +777,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -862,27 +874,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -900,6 +902,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -999,27 +1013,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -1037,6 +1041,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -1122,27 +1138,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -1160,6 +1166,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -1276,27 +1294,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -1314,6 +1322,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>awesomeisp.com</provider>
 		<providerName>Awesomeisp</providerName>
 		<providerUrl>http://www.awesomeisp.com/</providerUrl>
@@ -1399,27 +1419,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -1437,6 +1447,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>awesomeisp.com</provider>
 		<providerName>Awesomeisp</providerName>
 		<providerUrl>http://www.awesomeisp.com/</providerUrl>
@@ -1536,27 +1558,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -1574,6 +1586,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -1673,27 +1697,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Unknown</deviceType>
 		<operatingSystem>Unknown</operatingSystem>
+		<operatingSystemName>Unknown</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
 		<operatingSystemCode>UNK</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+		<operatingSystemVersion>UNK</operatingSystemVersion>
 		<browserFamily />
 		<browserFamilyDescription>Unknown</browserFamilyDescription>
 		<browser>Unknown</browser>
 		<browserName>Unknown</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion />
 		<events>1</events>
@@ -1711,6 +1725,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -1788,27 +1814,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -1826,6 +1842,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -1911,27 +1939,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Unknown</deviceType>
 		<operatingSystem>Unknown</operatingSystem>
+		<operatingSystemName>Unknown</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
 		<operatingSystemCode>UNK</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+		<operatingSystemVersion>UNK</operatingSystemVersion>
 		<browserFamily />
 		<browserFamilyDescription>Unknown</browserFamilyDescription>
 		<browser>Unknown</browser>
 		<browserName>Unknown</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion />
 		<events>0</events>
@@ -1949,6 +1967,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -2065,27 +2095,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -2103,6 +2123,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>comcast.net</provider>
 		<providerName>Comcast</providerName>
 		<providerUrl>http://www.comcast.net/</providerUrl>
@@ -2219,27 +2251,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Unknown</deviceType>
 		<operatingSystem>Unknown</operatingSystem>
+		<operatingSystemName>Unknown</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
 		<operatingSystemCode>UNK</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+		<operatingSystemVersion>UNK</operatingSystemVersion>
 		<browserFamily />
 		<browserFamilyDescription>Unknown</browserFamilyDescription>
 		<browser>Unknown</browser>
 		<browserName>Unknown</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion />
 		<events>1</events>
@@ -2257,6 +2279,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -2334,27 +2368,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -2372,6 +2396,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>comcast.net</provider>
 		<providerName>Comcast</providerName>
 		<providerUrl>http://www.comcast.net/</providerUrl>
@@ -2457,27 +2493,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Unknown</deviceType>
 		<operatingSystem>Unknown</operatingSystem>
+		<operatingSystemName>Unknown</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
 		<operatingSystemCode>UNK</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+		<operatingSystemVersion>UNK</operatingSystemVersion>
 		<browserFamily />
 		<browserFamilyDescription>Unknown</browserFamilyDescription>
 		<browser>Unknown</browser>
 		<browserName>Unknown</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion />
 		<events>0</events>
@@ -2495,6 +2521,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -2594,27 +2632,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -2632,6 +2660,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -2731,27 +2771,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -2769,6 +2799,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -2868,27 +2910,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Unknown</deviceType>
 		<operatingSystem>Unknown</operatingSystem>
+		<operatingSystemName>Unknown</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
 		<operatingSystemCode>UNK</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+		<operatingSystemVersion>UNK</operatingSystemVersion>
 		<browserFamily />
 		<browserFamilyDescription>Unknown</browserFamilyDescription>
 		<browser>Unknown</browser>
 		<browserName>Unknown</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion />
 		<events>1</events>
@@ -2906,6 +2938,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -2997,27 +3041,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -3035,6 +3069,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -3120,27 +3166,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -3158,6 +3194,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -3243,27 +3291,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -3281,6 +3319,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -3366,27 +3416,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Unknown</deviceType>
 		<operatingSystem>Unknown</operatingSystem>
+		<operatingSystemName>Unknown</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
 		<operatingSystemCode>UNK</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+		<operatingSystemVersion>UNK</operatingSystemVersion>
 		<browserFamily />
 		<browserFamilyDescription>Unknown</browserFamilyDescription>
 		<browser>Unknown</browser>
 		<browserName>Unknown</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion />
 		<events>0</events>
@@ -3404,6 +3444,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -3489,27 +3541,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -3527,6 +3569,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -3643,27 +3697,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -3681,6 +3725,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -3797,27 +3853,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -3835,6 +3881,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -3951,27 +4009,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Unknown</deviceType>
 		<operatingSystem>Unknown</operatingSystem>
+		<operatingSystemName>Unknown</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
 		<operatingSystemCode>UNK</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+		<operatingSystemVersion>UNK</operatingSystemVersion>
 		<browserFamily />
 		<browserFamilyDescription>Unknown</browserFamilyDescription>
 		<browser>Unknown</browser>
 		<browserName>Unknown</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion />
 		<events>1</events>
@@ -3989,6 +4037,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -4097,27 +4157,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -4135,6 +4185,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -4220,27 +4282,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -4258,6 +4310,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -4343,27 +4407,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -4381,6 +4435,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -4466,27 +4532,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -4504,6 +4560,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -4589,27 +4657,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -4627,6 +4685,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml
index 1e74517256..f32d4c4dc1 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
-	<row>WXP</row>
+	<row>WIN</row>
 	<row>UNK</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml
new file mode 100644
index 0000000000..0abf9e4246
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>XP</row>
+	<row>UNK</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml
new file mode 100644
index 0000000000..5d07770e4e
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<nb_visits>28</nb_visits>
+	<nb_actions>48</nb_actions>
+	<nb_visits_converted>28</nb_visits_converted>
+	<bounce_count>15</bounce_count>
+	<sum_visit_length>16393</sum_visit_length>
+	<max_actions>3</max_actions>
+	<bounce_rate>54%</bounce_rate>
+	<nb_actions_per_visit>1.7</nb_actions_per_visit>
+	<avg_time_on_site>585</avg_time_on_site>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml
new file mode 100644
index 0000000000..5b6feb65e3
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>Windows XP</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>2</nb_visits>
+		<nb_actions>8</nb_actions>
+		<max_actions>7</max_actions>
+		<sum_visit_length>1621</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>2</nb_visits_converted>
+		<segment>operatingSystemCode==WXP;operatingSystemVersion==XP</segment>
+		<logo>plugins/DevicesDetection/images/os/WIN.gif</logo>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__MultiSites.getAll_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__MultiSites.getAll_day.xml
new file mode 100644
index 0000000000..01a5e25002
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__MultiSites.getAll_day.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<nb_visits>2</nb_visits>
+		<nb_actions>8</nb_actions>
+		<nb_pageviews>4</nb_pageviews>
+		<revenue>43</revenue>
+		<label>new name</label>
+		<visits_evolution>100%</visits_evolution>
+		<actions_evolution>100%</actions_evolution>
+		<pageviews_evolution>100%</pageviews_evolution>
+		<revenue_evolution>100%</revenue_evolution>
+		<group />
+		<main_url>http://site.com</main_url>
+		<idsite>1</idsite>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserSettings.getBrowserType_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserSettings.getBrowserType_day.xml
new file mode 100644
index 0000000000..9893e79025
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserSettings.getBrowserType_day.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>Gecko (Firefox)</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>2</nb_visits>
+		<nb_actions>8</nb_actions>
+		<max_actions>7</max_actions>
+		<sum_visit_length>1621</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>2</nb_visits_converted>
+		<segment>browserEngine==gecko</segment>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserSettings.getOS_day.xml
new file mode 100644
index 0000000000..5b6feb65e3
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserSettings.getOS_day.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>Windows XP</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>2</nb_visits>
+		<nb_actions>8</nb_actions>
+		<max_actions>7</max_actions>
+		<sum_visit_length>1621</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>2</nb_visits_converted>
+		<segment>operatingSystemCode==WXP;operatingSystemVersion==XP</segment>
+		<logo>plugins/DevicesDetection/images/os/WIN.gif</logo>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml
new file mode 100644
index 0000000000..ee9ccea1e0
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<website>Piwik test</website>
+	<prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
+	<metadata>
+		<category>Events</category>
+		<name>Event Actions</name>
+		<module>Events</module>
+		<action>getAction</action>
+		<dimension>Event Action</dimension>
+		<metrics>
+			<nb_events>Total events</nb_events>
+			<sum_event_value>Total value</sum_event_value>
+			<min_event_value>Minimum value</min_event_value>
+			<max_event_value>Maximum value</max_event_value>
+			<nb_events_with_value>Events with a value</nb_events_with_value>
+		</metrics>
+		<metricsDocumentation>
+			<nb_events>Total number of events</nb_events>
+			<sum_event_value>The sum of event values</sum_event_value>
+			<min_event_value>The minimum value for this event</min_event_value>
+			<max_event_value>The maximum value for this event</max_event_value>
+			<nb_events_with_value>Number of events where an Event value was set</nb_events_with_value>
+			<avg_event_value>The average of all values for this event</avg_event_value>
+		</metricsDocumentation>
+		<processedMetrics>
+			<avg_event_value>The average of all values for this event</avg_event_value>
+		</processedMetrics>
+		<actionToLoadSubTables>getNameFromActionId</actionToLoadSubTables>
+		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=Events&amp;apiAction=getAction&amp;period=range&amp;date=2010-01-03,2010-01-09</imageGraphUrl>
+		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=Events&amp;apiAction=getAction&amp;period=day&amp;date=2010-01-03,2010-01-09</imageGraphEvolutionUrl>
+		<uniqueId>Events_getAction</uniqueId>
+	</metadata>
+	<columns>
+		<label>Event Action</label>
+		<nb_events>Total events</nb_events>
+		<sum_event_value>Total value</sum_event_value>
+		<min_event_value>Minimum value</min_event_value>
+		<max_event_value>Maximum value</max_event_value>
+		<nb_events_with_value>Events with a value</nb_events_with_value>
+		<avg_event_value>The average of all values for this event</avg_event_value>
+	</columns>
+	<reportData>
+		<result prettyDate="Sunday 3 January 2010">
+			<row>
+				<label>playTrailer - Ponyo (崖の上のポニョ)</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>playTrailer - Princess Mononoke (もののけ姫)</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>playTrailer - Spirited Away (千と千尋の神隠し)</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Search - Search query here</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>play25% - La fiancée de l&amp;#039;eau</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>play25% - Spirited Away (千と千尋の神隠し)</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>play50% - La fiancée de l&amp;#039;eau</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>play50% - Spirited Away (千と千尋の神隠し)</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>play75% - La fiancée de l&amp;#039;eau</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>play75% - Spirited Away (千と千尋の神隠し)</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>playEnd - La fiancée de l&amp;#039;eau</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>playEnd - Spirited Away (千と千尋の神隠し)</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>rating - La fiancée de l&amp;#039;eau</label>
+				<nb_events>4</nb_events>
+				<nb_events_with_value>4</nb_events_with_value>
+				<sum_event_value>38</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>10</max_event_value>
+				<avg_event_value>9.5</avg_event_value>
+			</row>
+			<row>
+				<label>rating - Spirited Away (千と千尋の神隠し)</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>2</nb_events_with_value>
+				<sum_event_value>19.32</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>9.66</max_event_value>
+				<avg_event_value>9.66</avg_event_value>
+			</row>
+			<row>
+				<label>clickBuyNow - Spirited Away (千と千尋の神隠し)</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;--- - event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>2</nb_events_with_value>
+				<sum_event_value>19.32</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>9.66</max_event_value>
+				<avg_event_value>9.66</avg_event_value>
+			</row>
+			<row>
+				<label>play - La fiancée de l&amp;#039;eau</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>playStart - Spirited Away (千と千尋の神隠し)</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Purchase</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+		</result>
+		<result prettyDate="Monday 4 January 2010" />
+		<result prettyDate="Tuesday 5 January 2010" />
+		<result prettyDate="Wednesday 6 January 2010" />
+		<result prettyDate="Thursday 7 January 2010" />
+		<result prettyDate="Friday 8 January 2010" />
+		<result prettyDate="Saturday 9 January 2010" />
+	</reportData>
+	<reportMetadata>
+		<result prettyDate="Sunday 3 January 2010">
+			<row>
+				<segment>eventAction==Purchase</segment>
+			</row>
+		</result>
+		<result prettyDate="Monday 4 January 2010" />
+		<result prettyDate="Tuesday 5 January 2010" />
+		<result prettyDate="Wednesday 6 January 2010" />
+		<result prettyDate="Thursday 7 January 2010" />
+		<result prettyDate="Friday 8 January 2010" />
+		<result prettyDate="Saturday 9 January 2010" />
+	</reportMetadata>
+	<reportTotal>
+		<nb_visits>38</nb_visits>
+		<nb_uniq_visitors>38</nb_uniq_visitors>
+	</reportTotal>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml
index 18509953c4..cad39c5a0f 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml
@@ -161,38 +161,52 @@
 	<reportMetadata>
 		<result prettyDate="Sunday 3 January 2010">
 			<row>
+				<segment>eventAction==playTrailer</segment>
 				
 			</row>
 			<row>
+				<segment>eventAction==Search</segment>
 				
 			</row>
 			<row>
+				<segment>eventAction==play25%25</segment>
 				
 			</row>
 			<row>
+				<segment>eventAction==play50%25</segment>
 				
 			</row>
 			<row>
+				<segment>eventAction==play75%25</segment>
 				
 			</row>
 			<row>
+				<segment>eventAction==playEnd</segment>
 				
 			</row>
 			<row>
+				<segment>eventAction==rating</segment>
 				
 			</row>
 			<row>
+				<segment>eventAction==clickBuyNow</segment>
 				
 			</row>
 			<row>
+				<segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 				
 			</row>
 			<row>
+				<segment>eventAction==play</segment>
 				
 			</row>
 			<row>
+				<segment>eventAction==playStart</segment>
 				
 			</row>
+			<row>
+				<segment>eventAction==Purchase</segment>
+			</row>
 		</result>
 		<result prettyDate="Monday 4 January 2010" />
 		<result prettyDate="Tuesday 5 January 2010" />
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml
new file mode 100644
index 0000000000..822bb62f42
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<website>Piwik test</website>
+	<prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
+	<metadata>
+		<category>Events</category>
+		<name>Event Categories</name>
+		<module>Events</module>
+		<action>getCategory</action>
+		<dimension>Event Category</dimension>
+		<metrics>
+			<nb_events>Total events</nb_events>
+			<sum_event_value>Total value</sum_event_value>
+			<min_event_value>Minimum value</min_event_value>
+			<max_event_value>Maximum value</max_event_value>
+			<nb_events_with_value>Events with a value</nb_events_with_value>
+		</metrics>
+		<metricsDocumentation>
+			<nb_events>Total number of events</nb_events>
+			<sum_event_value>The sum of event values</sum_event_value>
+			<min_event_value>The minimum value for this event</min_event_value>
+			<max_event_value>The maximum value for this event</max_event_value>
+			<nb_events_with_value>Number of events where an Event value was set</nb_events_with_value>
+			<avg_event_value>The average of all values for this event</avg_event_value>
+		</metricsDocumentation>
+		<processedMetrics>
+			<avg_event_value>The average of all values for this event</avg_event_value>
+		</processedMetrics>
+		<actionToLoadSubTables>getActionFromCategoryId</actionToLoadSubTables>
+		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=Events&amp;apiAction=getCategory&amp;period=range&amp;date=2010-01-03,2010-01-09</imageGraphUrl>
+		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=Events&amp;apiAction=getCategory&amp;period=day&amp;date=2010-01-03,2010-01-09</imageGraphEvolutionUrl>
+		<uniqueId>Events_getCategory</uniqueId>
+	</metadata>
+	<columns>
+		<label>Event Category</label>
+		<nb_events>Total events</nb_events>
+		<sum_event_value>Total value</sum_event_value>
+		<min_event_value>Minimum value</min_event_value>
+		<max_event_value>Maximum value</max_event_value>
+		<nb_events_with_value>Events with a value</nb_events_with_value>
+		<avg_event_value>The average of all values for this event</avg_event_value>
+	</columns>
+	<reportData>
+		<result prettyDate="Sunday 3 January 2010">
+			<row>
+				<label>Movie - playTrailer</label>
+				<nb_events>6</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Movie - Search</label>
+				<nb_events>6</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Movie - clickBuyNow</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Movie - play25%</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Movie - play50%</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Movie - play75%</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Movie - playEnd</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Movie - playStart</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Movie - Purchase</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Movie - rating</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>2</nb_events_with_value>
+				<sum_event_value>19.32</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>9.66</max_event_value>
+				<avg_event_value>9.66</avg_event_value>
+			</row>
+			<row>
+				<label>Music - play</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Music - play25%</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Music - play50%</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Music - play75%</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Music - playEnd</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Music - rating</label>
+				<nb_events>4</nb_events>
+				<nb_events_with_value>4</nb_events_with_value>
+				<sum_event_value>38</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>10</max_event_value>
+				<avg_event_value>9.5</avg_event_value>
+			</row>
+			<row>
+				<label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;--- - event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>2</nb_events_with_value>
+				<sum_event_value>19.32</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>9.66</max_event_value>
+				<avg_event_value>9.66</avg_event_value>
+			</row>
+		</result>
+		<result prettyDate="Monday 4 January 2010" />
+		<result prettyDate="Tuesday 5 January 2010" />
+		<result prettyDate="Wednesday 6 January 2010" />
+		<result prettyDate="Thursday 7 January 2010" />
+		<result prettyDate="Friday 8 January 2010" />
+		<result prettyDate="Saturday 9 January 2010" />
+	</reportData>
+	<reportMetadata>
+		<result prettyDate="Sunday 3 January 2010" />
+		<result prettyDate="Monday 4 January 2010" />
+		<result prettyDate="Tuesday 5 January 2010" />
+		<result prettyDate="Wednesday 6 January 2010" />
+		<result prettyDate="Thursday 7 January 2010" />
+		<result prettyDate="Friday 8 January 2010" />
+		<result prettyDate="Saturday 9 January 2010" />
+	</reportMetadata>
+	<reportTotal>
+		<nb_visits>42</nb_visits>
+		<nb_uniq_visitors>40</nb_uniq_visitors>
+	</reportTotal>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml
index dbf61d55a0..6116b82403 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml
@@ -80,12 +80,15 @@
 	<reportMetadata>
 		<result prettyDate="Sunday 3 January 2010">
 			<row>
+				<segment>eventCategory==Movie</segment>
 				
 			</row>
 			<row>
+				<segment>eventCategory==Music</segment>
 				
 			</row>
 			<row>
+				<segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 				
 			</row>
 		</result>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml
new file mode 100644
index 0000000000..e3745e71ba
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml
@@ -0,0 +1,246 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<website>Piwik test</website>
+	<prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
+	<metadata>
+		<category>Events</category>
+		<name>Event Names</name>
+		<module>Events</module>
+		<action>getName</action>
+		<dimension>Event Name</dimension>
+		<metrics>
+			<nb_events>Total events</nb_events>
+			<sum_event_value>Total value</sum_event_value>
+			<min_event_value>Minimum value</min_event_value>
+			<max_event_value>Maximum value</max_event_value>
+			<nb_events_with_value>Events with a value</nb_events_with_value>
+		</metrics>
+		<metricsDocumentation>
+			<nb_events>Total number of events</nb_events>
+			<sum_event_value>The sum of event values</sum_event_value>
+			<min_event_value>The minimum value for this event</min_event_value>
+			<max_event_value>The maximum value for this event</max_event_value>
+			<nb_events_with_value>Number of events where an Event value was set</nb_events_with_value>
+			<avg_event_value>The average of all values for this event</avg_event_value>
+		</metricsDocumentation>
+		<processedMetrics>
+			<avg_event_value>The average of all values for this event</avg_event_value>
+		</processedMetrics>
+		<actionToLoadSubTables>getActionFromNameId</actionToLoadSubTables>
+		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=Events&amp;apiAction=getName&amp;period=range&amp;date=2010-01-03,2010-01-09</imageGraphUrl>
+		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=Events&amp;apiAction=getName&amp;period=day&amp;date=2010-01-03,2010-01-09</imageGraphEvolutionUrl>
+		<uniqueId>Events_getName</uniqueId>
+	</metadata>
+	<columns>
+		<label>Event Name</label>
+		<nb_events>Total events</nb_events>
+		<sum_event_value>Total value</sum_event_value>
+		<min_event_value>Minimum value</min_event_value>
+		<max_event_value>Maximum value</max_event_value>
+		<nb_events_with_value>Events with a value</nb_events_with_value>
+		<avg_event_value>The average of all values for this event</avg_event_value>
+	</columns>
+	<reportData>
+		<result prettyDate="Sunday 3 January 2010">
+			<row>
+				<label>Spirited Away (千と千尋の神隠し) - clickBuyNow</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Spirited Away (千と千尋の神隠し) - play25%</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Spirited Away (千と千尋の神隠し) - play50%</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Spirited Away (千と千尋の神隠し) - play75%</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Spirited Away (千と千尋の神隠し) - playEnd</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Spirited Away (千と千尋の神隠し) - playStart</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Spirited Away (千と千尋の神隠し) - playTrailer</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Spirited Away (千と千尋の神隠し) - rating</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>2</nb_events_with_value>
+				<sum_event_value>19.32</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>9.66</max_event_value>
+				<avg_event_value>9.66</avg_event_value>
+			</row>
+			<row>
+				<label>La fiancée de l&amp;#039;eau - play</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>La fiancée de l&amp;#039;eau - play25%</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>La fiancée de l&amp;#039;eau - play50%</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>La fiancée de l&amp;#039;eau - play75%</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>La fiancée de l&amp;#039;eau - playEnd</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>La fiancée de l&amp;#039;eau - rating</label>
+				<nb_events>4</nb_events>
+				<nb_events_with_value>4</nb_events_with_value>
+				<sum_event_value>38</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>10</max_event_value>
+				<avg_event_value>9.5</avg_event_value>
+			</row>
+			<row>
+				<label>Event Name not defined - Search</label>
+				<nb_events>4</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Event Name not defined - Purchase</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;--- - event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>2</nb_events_with_value>
+				<sum_event_value>19.32</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>9.66</max_event_value>
+				<avg_event_value>9.66</avg_event_value>
+			</row>
+			<row>
+				<label>Ponyo (崖の上のポニョ) - playTrailer</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Princess Mononoke (もののけ姫) - playTrailer</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Search query here - Search</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+		</result>
+		<result prettyDate="Monday 4 January 2010" />
+		<result prettyDate="Tuesday 5 January 2010" />
+		<result prettyDate="Wednesday 6 January 2010" />
+		<result prettyDate="Thursday 7 January 2010" />
+		<result prettyDate="Friday 8 January 2010" />
+		<result prettyDate="Saturday 9 January 2010" />
+	</reportData>
+	<reportMetadata>
+		<result prettyDate="Sunday 3 January 2010" />
+		<result prettyDate="Monday 4 January 2010" />
+		<result prettyDate="Tuesday 5 January 2010" />
+		<result prettyDate="Wednesday 6 January 2010" />
+		<result prettyDate="Thursday 7 January 2010" />
+		<result prettyDate="Friday 8 January 2010" />
+		<result prettyDate="Saturday 9 January 2010" />
+	</reportMetadata>
+	<reportTotal>
+		<nb_visits>42</nb_visits>
+		<nb_uniq_visitors>40</nb_uniq_visitors>
+	</reportTotal>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml
index 15678442b5..3827317e63 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml
@@ -116,24 +116,30 @@
 	<reportMetadata>
 		<result prettyDate="Sunday 3 January 2010">
 			<row>
+				<segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment>
 				
 			</row>
 			<row>
+				<segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment>
 				
 			</row>
 			<row>
 				
 			</row>
 			<row>
+				<segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 				
 			</row>
 			<row>
+				<segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment>
 				
 			</row>
 			<row>
+				<segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment>
 				
 			</row>
 			<row>
+				<segment>eventName==Search+query+here</segment>
 				
 			</row>
 		</result>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_day.xml
index b09bbc9e7f..2539c55bb3 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_day.xml
@@ -16,6 +16,7 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0.666</avg_time_generation>
 		<url>http://example.org/movies</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fmovies</segment>
 	</row>
 	<row>
 		<label>/webradio</label>
@@ -36,5 +37,6 @@
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.333</avg_time_generation>
 		<url>http://example.org/webradio</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fwebradio</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml
index 5e6a7b260b..dfbc1b65a0 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml
@@ -16,6 +16,7 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0.666</avg_time_generation>
 		<url>http://example.org/movies</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fmovies</segment>
 	</row>
 	<row>
 		<label>/webradio</label>
@@ -36,5 +37,6 @@
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.333</avg_time_generation>
 		<url>http://example.org/webradio</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fwebradio</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_day.xml
index 26752bbd7b..022083daa9 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_day.xml
@@ -10,6 +10,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==playTrailer</segment>
 		<subtable>
 			<row>
 				<label>Ponyo (崖の上のポニョ)</label>
@@ -56,6 +57,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==Search</segment>
 		<subtable>
 			<row>
 				<label>Search query here</label>
@@ -80,6 +82,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play25%25</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -115,6 +118,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play50%25</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -150,6 +154,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play75%25</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -185,6 +190,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==playEnd</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -220,6 +226,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>10</max_event_value>
 		<avg_event_value>9.55</avg_event_value>
+		<segment>eventAction==rating</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -255,6 +262,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==clickBuyNow</segment>
 		<subtable>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
@@ -279,6 +287,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>9.66</max_event_value>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 		<subtable>
 			<row>
 				<label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
@@ -303,6 +312,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -327,6 +337,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==playStart</segment>
 		<subtable>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
@@ -351,5 +362,6 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==Purchase</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml
index 9868947268..690d452cd5 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml
@@ -10,6 +10,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==playTrailer</segment>
 		<subtable>
 			<row>
 				<label>Ponyo (崖の上のポニョ)</label>
@@ -56,6 +57,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==Search</segment>
 		<subtable>
 			<row>
 				<label>Search query here</label>
@@ -80,6 +82,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play25%25</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -115,6 +118,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play50%25</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -150,6 +154,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play75%25</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -185,6 +190,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==playEnd</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -220,6 +226,7 @@
 		<max_event_value>10</max_event_value>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.55</avg_event_value>
+		<segment>eventAction==rating</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -255,6 +262,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==clickBuyNow</segment>
 		<subtable>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
@@ -279,6 +287,7 @@
 		<max_event_value>9.66</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 		<subtable>
 			<row>
 				<label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
@@ -303,6 +312,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -327,6 +337,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==playStart</segment>
 		<subtable>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
@@ -351,5 +362,6 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==Purchase</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_day.xml
index 5f3469aa23..0616bb52ea 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_day.xml
@@ -10,6 +10,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>9.66</max_event_value>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventCategory==Movie</segment>
 		<subtable>
 			<row>
 				<label>playTrailer</label>
@@ -133,6 +134,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>10</max_event_value>
 		<avg_event_value>9.5</avg_event_value>
+		<segment>eventCategory==Music</segment>
 		<subtable>
 			<row>
 				<label>play</label>
@@ -212,6 +214,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>9.66</max_event_value>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 		<subtable>
 			<row>
 				<label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml
index 1f8fdb7c02..43d8ed7afe 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml
@@ -10,6 +10,7 @@
 		<max_event_value>9.66</max_event_value>
 		<sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventCategory==Movie</segment>
 		<subtable>
 			<row>
 				<label>playTrailer</label>
@@ -133,6 +134,7 @@
 		<max_event_value>10</max_event_value>
 		<sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.5</avg_event_value>
+		<segment>eventCategory==Music</segment>
 		<subtable>
 			<row>
 				<label>play</label>
@@ -212,6 +214,7 @@
 		<max_event_value>9.66</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 		<subtable>
 			<row>
 				<label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_day.xml
index 9461eeb42e..686c2a12c1 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_day.xml
@@ -10,6 +10,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>9.66</max_event_value>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment>
 		<subtable>
 			<row>
 				<label>clickBuyNow</label>
@@ -111,6 +112,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>10</max_event_value>
 		<avg_event_value>9.5</avg_event_value>
+		<segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment>
 		<subtable>
 			<row>
 				<label>play</label>
@@ -225,6 +227,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>9.66</max_event_value>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 		<subtable>
 			<row>
 				<label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
@@ -249,6 +252,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment>
 		<subtable>
 			<row>
 				<label>playTrailer</label>
@@ -273,6 +277,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment>
 		<subtable>
 			<row>
 				<label>playTrailer</label>
@@ -297,6 +302,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventName==Search+query+here</segment>
 		<subtable>
 			<row>
 				<label>Search</label>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml
index 5f8de9463f..3ddb207d33 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml
@@ -10,6 +10,7 @@
 		<max_event_value>9.66</max_event_value>
 		<sum_daily_nb_uniq_visitors>16</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment>
 		<subtable>
 			<row>
 				<label>clickBuyNow</label>
@@ -111,6 +112,7 @@
 		<max_event_value>10</max_event_value>
 		<sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.5</avg_event_value>
+		<segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment>
 		<subtable>
 			<row>
 				<label>play</label>
@@ -225,6 +227,7 @@
 		<max_event_value>9.66</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 		<subtable>
 			<row>
 				<label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
@@ -249,6 +252,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment>
 		<subtable>
 			<row>
 				<label>playTrailer</label>
@@ -273,6 +277,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment>
 		<subtable>
 			<row>
 				<label>playTrailer</label>
@@ -297,6 +302,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventName==Search+query+here</segment>
 		<subtable>
 			<row>
 				<label>Search</label>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
index a45e6b00b5..926d5d5b89 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
@@ -15,6 +15,7 @@
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Purchase</eventAction>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -24,8 +25,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -39,35 +38,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Visit Scope Custom var</customVariableName1>
-				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -79,21 +73,30 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Visit Scope Custom var</customVariableName1>
+				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -115,6 +118,7 @@
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Search</eventAction>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -124,8 +128,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -139,35 +141,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Visit Scope Custom var</customVariableName1>
-				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -179,21 +176,30 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Visit Scope Custom var</customVariableName1>
+				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -218,6 +224,7 @@
 				<timeSpent>1320</timeSpent>
 				<timeSpentPretty>22 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -231,6 +238,7 @@
 				<timeSpent>420</timeSpent>
 				<timeSpentPretty>7 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -244,6 +252,7 @@
 				<timeSpent>900</timeSpent>
 				<timeSpentPretty>15 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -257,6 +266,7 @@
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -271,6 +281,7 @@
 				<timeSpent>720</timeSpent>
 				<timeSpentPretty>12 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -283,6 +294,7 @@
 				<eventName>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventName>
 				<eventValue>9.66</eventValue>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -292,8 +304,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>6</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -307,35 +317,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>3481</visitDuration>
 		<visitDurationPretty>58 min 1s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Visit Scope Custom var</customVariableName1>
-				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>6</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>6</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -347,21 +352,30 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Visit Scope Custom var</customVariableName1>
+				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -383,6 +397,7 @@
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Search</eventAction>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -392,8 +407,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -407,35 +420,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Visit Scope Custom var</customVariableName1>
-				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -447,21 +455,30 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Visit Scope Custom var</customVariableName1>
+				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -485,6 +502,7 @@
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -495,6 +513,7 @@
 				
 				<url>http://example.org/webradio</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -514,6 +533,7 @@
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -533,6 +553,7 @@
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -552,6 +573,7 @@
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -571,6 +593,7 @@
 				<timeSpent>30</timeSpent>
 				<timeSpentPretty>30s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -590,6 +613,7 @@
 				<timeSpent>30</timeSpent>
 				<timeSpentPretty>30s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -610,6 +634,7 @@
 				<timeSpent>1</timeSpent>
 				<timeSpentPretty>1s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -630,6 +655,7 @@
 				<timeSpent>1499</timeSpent>
 				<timeSpentPretty>24 min 59s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -642,6 +668,7 @@
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -655,6 +682,7 @@
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -668,6 +696,7 @@
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -681,6 +710,7 @@
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -694,6 +724,7 @@
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -707,6 +738,7 @@
 				<timeSpent>1320</timeSpent>
 				<timeSpentPretty>22 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -718,6 +750,7 @@
 				<eventAction>play25%</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -727,8 +760,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>15</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -742,35 +773,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>3601</visitDuration>
 		<visitDurationPretty>1 hours 0 min</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Visit Scope Custom var</customVariableName1>
-				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>15</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>13</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -782,21 +808,30 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Visit Scope Custom var</customVariableName1>
+				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -818,6 +853,7 @@
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Purchase</eventAction>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -827,8 +863,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -842,35 +876,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Visit Scope Custom var</customVariableName1>
-				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -882,17 +911,26 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Visit Scope Custom var</customVariableName1>
+				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -914,6 +952,7 @@
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Search</eventAction>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -923,8 +962,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -938,35 +975,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Visit Scope Custom var</customVariableName1>
-				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -978,17 +1010,26 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Visit Scope Custom var</customVariableName1>
+				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -1013,6 +1054,7 @@
 				<timeSpent>1320</timeSpent>
 				<timeSpentPretty>22 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1026,6 +1068,7 @@
 				<timeSpent>420</timeSpent>
 				<timeSpentPretty>7 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1039,6 +1082,7 @@
 				<timeSpent>900</timeSpent>
 				<timeSpentPretty>15 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1052,6 +1096,7 @@
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1066,6 +1111,7 @@
 				<timeSpent>720</timeSpent>
 				<timeSpentPretty>12 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1078,6 +1124,7 @@
 				<eventName>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventName>
 				<eventValue>9.66</eventValue>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -1087,8 +1134,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>6</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -1102,35 +1147,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>3481</visitDuration>
 		<visitDurationPretty>58 min 1s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Visit Scope Custom var</customVariableName1>
-				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>6</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>6</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -1142,17 +1182,26 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Visit Scope Custom var</customVariableName1>
+				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -1174,6 +1223,7 @@
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Search</eventAction>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -1183,8 +1233,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -1198,35 +1246,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Visit Scope Custom var</customVariableName1>
-				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -1238,17 +1281,26 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Visit Scope Custom var</customVariableName1>
+				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -1272,6 +1324,7 @@
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -1282,6 +1335,7 @@
 				
 				<url>http://example.org/webradio</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1301,6 +1355,7 @@
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1320,6 +1375,7 @@
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1339,6 +1395,7 @@
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1358,6 +1415,7 @@
 				<timeSpent>30</timeSpent>
 				<timeSpentPretty>30s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1377,6 +1435,7 @@
 				<timeSpent>30</timeSpent>
 				<timeSpentPretty>30s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1397,6 +1456,7 @@
 				<timeSpent>1</timeSpent>
 				<timeSpentPretty>1s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1417,6 +1477,7 @@
 				<timeSpent>1499</timeSpent>
 				<timeSpentPretty>24 min 59s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -1429,6 +1490,7 @@
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1442,6 +1504,7 @@
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1455,6 +1518,7 @@
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1468,6 +1532,7 @@
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1481,6 +1546,7 @@
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1494,6 +1560,7 @@
 				<timeSpent>1320</timeSpent>
 				<timeSpentPretty>22 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1505,6 +1572,7 @@
 				<eventAction>play25%</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -1514,8 +1582,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>15</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -1529,35 +1595,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>3601</visitDuration>
 		<visitDurationPretty>1 hours 0 min</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Visit Scope Custom var</customVariableName1>
-				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>15</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>13</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -1569,17 +1630,26 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Visit Scope Custom var</customVariableName1>
+				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
index a45e6b00b5..926d5d5b89 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
@@ -15,6 +15,7 @@
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Purchase</eventAction>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -24,8 +25,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -39,35 +38,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Visit Scope Custom var</customVariableName1>
-				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -79,21 +73,30 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Visit Scope Custom var</customVariableName1>
+				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -115,6 +118,7 @@
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Search</eventAction>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -124,8 +128,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -139,35 +141,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Visit Scope Custom var</customVariableName1>
-				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -179,21 +176,30 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Visit Scope Custom var</customVariableName1>
+				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -218,6 +224,7 @@
 				<timeSpent>1320</timeSpent>
 				<timeSpentPretty>22 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -231,6 +238,7 @@
 				<timeSpent>420</timeSpent>
 				<timeSpentPretty>7 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -244,6 +252,7 @@
 				<timeSpent>900</timeSpent>
 				<timeSpentPretty>15 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -257,6 +266,7 @@
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -271,6 +281,7 @@
 				<timeSpent>720</timeSpent>
 				<timeSpentPretty>12 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -283,6 +294,7 @@
 				<eventName>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventName>
 				<eventValue>9.66</eventValue>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -292,8 +304,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>6</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -307,35 +317,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>3481</visitDuration>
 		<visitDurationPretty>58 min 1s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Visit Scope Custom var</customVariableName1>
-				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>6</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>6</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -347,21 +352,30 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Visit Scope Custom var</customVariableName1>
+				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -383,6 +397,7 @@
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Search</eventAction>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -392,8 +407,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -407,35 +420,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Visit Scope Custom var</customVariableName1>
-				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -447,21 +455,30 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Visit Scope Custom var</customVariableName1>
+				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -485,6 +502,7 @@
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -495,6 +513,7 @@
 				
 				<url>http://example.org/webradio</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -514,6 +533,7 @@
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -533,6 +553,7 @@
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -552,6 +573,7 @@
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -571,6 +593,7 @@
 				<timeSpent>30</timeSpent>
 				<timeSpentPretty>30s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -590,6 +613,7 @@
 				<timeSpent>30</timeSpent>
 				<timeSpentPretty>30s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -610,6 +634,7 @@
 				<timeSpent>1</timeSpent>
 				<timeSpentPretty>1s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -630,6 +655,7 @@
 				<timeSpent>1499</timeSpent>
 				<timeSpentPretty>24 min 59s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -642,6 +668,7 @@
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -655,6 +682,7 @@
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -668,6 +696,7 @@
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -681,6 +710,7 @@
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -694,6 +724,7 @@
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -707,6 +738,7 @@
 				<timeSpent>1320</timeSpent>
 				<timeSpentPretty>22 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -718,6 +750,7 @@
 				<eventAction>play25%</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -727,8 +760,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>15</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -742,35 +773,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>3601</visitDuration>
 		<visitDurationPretty>1 hours 0 min</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Visit Scope Custom var</customVariableName1>
-				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>15</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>13</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -782,21 +808,30 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Visit Scope Custom var</customVariableName1>
+				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -818,6 +853,7 @@
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Purchase</eventAction>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -827,8 +863,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -842,35 +876,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Visit Scope Custom var</customVariableName1>
-				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -882,17 +911,26 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Visit Scope Custom var</customVariableName1>
+				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -914,6 +952,7 @@
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Search</eventAction>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -923,8 +962,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -938,35 +975,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Visit Scope Custom var</customVariableName1>
-				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -978,17 +1010,26 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Visit Scope Custom var</customVariableName1>
+				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -1013,6 +1054,7 @@
 				<timeSpent>1320</timeSpent>
 				<timeSpentPretty>22 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1026,6 +1068,7 @@
 				<timeSpent>420</timeSpent>
 				<timeSpentPretty>7 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1039,6 +1082,7 @@
 				<timeSpent>900</timeSpent>
 				<timeSpentPretty>15 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1052,6 +1096,7 @@
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1066,6 +1111,7 @@
 				<timeSpent>720</timeSpent>
 				<timeSpentPretty>12 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1078,6 +1124,7 @@
 				<eventName>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventName>
 				<eventValue>9.66</eventValue>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -1087,8 +1134,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>6</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -1102,35 +1147,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>3481</visitDuration>
 		<visitDurationPretty>58 min 1s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Visit Scope Custom var</customVariableName1>
-				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>6</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>6</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -1142,17 +1182,26 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Visit Scope Custom var</customVariableName1>
+				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -1174,6 +1223,7 @@
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Search</eventAction>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -1183,8 +1233,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -1198,35 +1246,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Visit Scope Custom var</customVariableName1>
-				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -1238,17 +1281,26 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Visit Scope Custom var</customVariableName1>
+				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -1272,6 +1324,7 @@
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -1282,6 +1335,7 @@
 				
 				<url>http://example.org/webradio</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1301,6 +1355,7 @@
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1320,6 +1375,7 @@
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1339,6 +1395,7 @@
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1358,6 +1415,7 @@
 				<timeSpent>30</timeSpent>
 				<timeSpentPretty>30s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1377,6 +1435,7 @@
 				<timeSpent>30</timeSpent>
 				<timeSpentPretty>30s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1397,6 +1456,7 @@
 				<timeSpent>1</timeSpent>
 				<timeSpentPretty>1s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1417,6 +1477,7 @@
 				<timeSpent>1499</timeSpent>
 				<timeSpentPretty>24 min 59s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -1429,6 +1490,7 @@
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1442,6 +1504,7 @@
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1455,6 +1518,7 @@
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1468,6 +1532,7 @@
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1481,6 +1546,7 @@
 				<timeSpent>120</timeSpent>
 				<timeSpentPretty>2 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1494,6 +1560,7 @@
 				<timeSpent>1320</timeSpent>
 				<timeSpentPretty>22 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1505,6 +1572,7 @@
 				<eventAction>play25%</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -1514,8 +1582,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>15</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -1529,35 +1595,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>3601</visitDuration>
 		<visitDurationPretty>1 hours 0 min</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Visit Scope Custom var</customVariableName1>
-				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>15</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>13</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -1569,17 +1630,26 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Visit Scope Custom var</customVariableName1>
+				<customVariableValue1>should not appear in events report Bis</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getAction_day.xml
index d70e8c2950..6be4d52e8b 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getAction_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getAction_day.xml
@@ -10,6 +10,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==playTrailer</segment>
 		<subtable>
 			<row>
 				<label>Ponyo (崖の上のポニョ)</label>
@@ -56,6 +57,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==Search</segment>
 		<subtable>
 			<row>
 				<label>Search query here</label>
@@ -80,6 +82,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play25%25</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -115,6 +118,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play50%25</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -150,6 +154,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play75%25</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -185,6 +190,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==playEnd</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -220,6 +226,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>10</max_event_value>
 		<avg_event_value>9.55</avg_event_value>
+		<segment>eventAction==rating</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -255,6 +262,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==clickBuyNow</segment>
 		<subtable>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
@@ -279,6 +287,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -303,6 +312,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==playStart</segment>
 		<subtable>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
@@ -327,5 +337,6 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==Purchase</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getCategory_day.xml
index d65a2784c3..2c7daee22f 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getCategory_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getCategory_day.xml
@@ -10,6 +10,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>9.66</max_event_value>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventCategory==Movie</segment>
 		<subtable>
 			<row>
 				<label>playTrailer</label>
@@ -133,6 +134,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>10</max_event_value>
 		<avg_event_value>9.5</avg_event_value>
+		<segment>eventCategory==Music</segment>
 		<subtable>
 			<row>
 				<label>play</label>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getName_day.xml
index 71ccc3d69b..e703cb83fd 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getName_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getName_day.xml
@@ -10,6 +10,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>9.66</max_event_value>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment>
 		<subtable>
 			<row>
 				<label>clickBuyNow</label>
@@ -111,6 +112,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>10</max_event_value>
 		<avg_event_value>9.5</avg_event_value>
+		<segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment>
 		<subtable>
 			<row>
 				<label>play</label>
@@ -225,6 +227,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment>
 		<subtable>
 			<row>
 				<label>playTrailer</label>
@@ -249,6 +252,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment>
 		<subtable>
 			<row>
 				<label>playTrailer</label>
@@ -273,6 +277,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventName==Search+query+here</segment>
 		<subtable>
 			<row>
 				<label>Search</label>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_day.xml
index 5f3469aa23..0616bb52ea 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_day.xml
@@ -10,6 +10,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>9.66</max_event_value>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventCategory==Movie</segment>
 		<subtable>
 			<row>
 				<label>playTrailer</label>
@@ -133,6 +134,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>10</max_event_value>
 		<avg_event_value>9.5</avg_event_value>
+		<segment>eventCategory==Music</segment>
 		<subtable>
 			<row>
 				<label>play</label>
@@ -212,6 +214,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>9.66</max_event_value>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 		<subtable>
 			<row>
 				<label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml
index 1f8fdb7c02..43d8ed7afe 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml
@@ -10,6 +10,7 @@
 		<max_event_value>9.66</max_event_value>
 		<sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventCategory==Movie</segment>
 		<subtable>
 			<row>
 				<label>playTrailer</label>
@@ -133,6 +134,7 @@
 		<max_event_value>10</max_event_value>
 		<sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.5</avg_event_value>
+		<segment>eventCategory==Music</segment>
 		<subtable>
 			<row>
 				<label>play</label>
@@ -212,6 +214,7 @@
 		<max_event_value>9.66</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 		<subtable>
 			<row>
 				<label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml
index 9461eeb42e..686c2a12c1 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml
@@ -10,6 +10,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>9.66</max_event_value>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment>
 		<subtable>
 			<row>
 				<label>clickBuyNow</label>
@@ -111,6 +112,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>10</max_event_value>
 		<avg_event_value>9.5</avg_event_value>
+		<segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment>
 		<subtable>
 			<row>
 				<label>play</label>
@@ -225,6 +227,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>9.66</max_event_value>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 		<subtable>
 			<row>
 				<label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
@@ -249,6 +252,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment>
 		<subtable>
 			<row>
 				<label>playTrailer</label>
@@ -273,6 +277,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment>
 		<subtable>
 			<row>
 				<label>playTrailer</label>
@@ -297,6 +302,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventName==Search+query+here</segment>
 		<subtable>
 			<row>
 				<label>Search</label>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml
index 5f8de9463f..3ddb207d33 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml
@@ -10,6 +10,7 @@
 		<max_event_value>9.66</max_event_value>
 		<sum_daily_nb_uniq_visitors>16</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment>
 		<subtable>
 			<row>
 				<label>clickBuyNow</label>
@@ -111,6 +112,7 @@
 		<max_event_value>10</max_event_value>
 		<sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.5</avg_event_value>
+		<segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment>
 		<subtable>
 			<row>
 				<label>play</label>
@@ -225,6 +227,7 @@
 		<max_event_value>9.66</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 		<subtable>
 			<row>
 				<label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
@@ -249,6 +252,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment>
 		<subtable>
 			<row>
 				<label>playTrailer</label>
@@ -273,6 +277,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment>
 		<subtable>
 			<row>
 				<label>playTrailer</label>
@@ -297,6 +302,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventName==Search+query+here</segment>
 		<subtable>
 			<row>
 				<label>Search</label>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_day.xml
index 8d225ad12f..b32b2ae040 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_day.xml
@@ -10,6 +10,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==playTrailer</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
@@ -34,6 +35,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==Search</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
@@ -58,6 +60,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play25%25</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
@@ -93,6 +96,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play50%25</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
@@ -128,6 +132,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play75%25</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
@@ -163,6 +168,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==playEnd</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
@@ -198,6 +204,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>10</max_event_value>
 		<avg_event_value>9.55</avg_event_value>
+		<segment>eventAction==rating</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
@@ -233,6 +240,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==clickBuyNow</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
@@ -257,6 +265,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>9.66</max_event_value>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 		<subtable>
 			<row>
 				<label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
@@ -281,6 +290,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play</segment>
 		<subtable>
 			<row>
 				<label>Music</label>
@@ -305,6 +315,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==playStart</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
@@ -329,6 +340,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==Purchase</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml
index f558d64451..a6a3d0be52 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml
@@ -10,6 +10,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==playTrailer</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
@@ -34,6 +35,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==Search</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
@@ -58,6 +60,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play25%25</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
@@ -93,6 +96,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play50%25</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
@@ -128,6 +132,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play75%25</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
@@ -163,6 +168,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==playEnd</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
@@ -198,6 +204,7 @@
 		<max_event_value>10</max_event_value>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.55</avg_event_value>
+		<segment>eventAction==rating</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
@@ -233,6 +240,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==clickBuyNow</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
@@ -257,6 +265,7 @@
 		<max_event_value>9.66</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 		<subtable>
 			<row>
 				<label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
@@ -281,6 +290,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play</segment>
 		<subtable>
 			<row>
 				<label>Music</label>
@@ -305,6 +315,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==playStart</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
@@ -329,6 +340,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==Purchase</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml
index 03b5718c7b..999268fdc6 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml
@@ -10,6 +10,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>9.66</max_event_value>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
@@ -34,6 +35,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>10</max_event_value>
 		<avg_event_value>9.5</avg_event_value>
+		<segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment>
 		<subtable>
 			<row>
 				<label>Music</label>
@@ -82,6 +84,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>9.66</max_event_value>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 		<subtable>
 			<row>
 				<label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
@@ -106,6 +109,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
@@ -130,6 +134,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
@@ -154,6 +159,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventName==Search+query+here</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml
index 54676e7511..d19bd1fefd 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml
@@ -10,6 +10,7 @@
 		<max_event_value>9.66</max_event_value>
 		<sum_daily_nb_uniq_visitors>16</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
@@ -34,6 +35,7 @@
 		<max_event_value>10</max_event_value>
 		<sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.5</avg_event_value>
+		<segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment>
 		<subtable>
 			<row>
 				<label>Music</label>
@@ -82,6 +84,7 @@
 		<max_event_value>9.66</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 		<subtable>
 			<row>
 				<label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
@@ -106,6 +109,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
@@ -130,6 +134,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
@@ -154,6 +159,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventName==Search+query+here</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_day.xml
index 26752bbd7b..022083daa9 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_day.xml
@@ -10,6 +10,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==playTrailer</segment>
 		<subtable>
 			<row>
 				<label>Ponyo (崖の上のポニョ)</label>
@@ -56,6 +57,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==Search</segment>
 		<subtable>
 			<row>
 				<label>Search query here</label>
@@ -80,6 +82,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play25%25</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -115,6 +118,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play50%25</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -150,6 +154,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play75%25</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -185,6 +190,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==playEnd</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -220,6 +226,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>10</max_event_value>
 		<avg_event_value>9.55</avg_event_value>
+		<segment>eventAction==rating</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -255,6 +262,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==clickBuyNow</segment>
 		<subtable>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
@@ -279,6 +287,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>9.66</max_event_value>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 		<subtable>
 			<row>
 				<label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
@@ -303,6 +312,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -327,6 +337,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==playStart</segment>
 		<subtable>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
@@ -351,5 +362,6 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==Purchase</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml
index 9868947268..690d452cd5 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml
@@ -10,6 +10,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==playTrailer</segment>
 		<subtable>
 			<row>
 				<label>Ponyo (崖の上のポニョ)</label>
@@ -56,6 +57,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==Search</segment>
 		<subtable>
 			<row>
 				<label>Search query here</label>
@@ -80,6 +82,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play25%25</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -115,6 +118,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play50%25</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -150,6 +154,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play75%25</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -185,6 +190,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==playEnd</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -220,6 +226,7 @@
 		<max_event_value>10</max_event_value>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.55</avg_event_value>
+		<segment>eventAction==rating</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -255,6 +262,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==clickBuyNow</segment>
 		<subtable>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
@@ -279,6 +287,7 @@
 		<max_event_value>9.66</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 		<subtable>
 			<row>
 				<label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
@@ -303,6 +312,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -327,6 +337,7 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==playStart</segment>
 		<subtable>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
@@ -351,5 +362,6 @@
 		<max_event_value>0</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==Purchase</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml
index d6f7a63bbe..793018425d 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml
@@ -10,6 +10,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>9.66</max_event_value>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventCategory==Movie</segment>
 		<subtable>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
@@ -67,6 +68,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>10</max_event_value>
 		<avg_event_value>9.5</avg_event_value>
+		<segment>eventCategory==Music</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -91,6 +93,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>9.66</max_event_value>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 		<subtable>
 			<row>
 				<label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml
index 835e7cc629..c958defeb9 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml
@@ -10,6 +10,7 @@
 		<max_event_value>9.66</max_event_value>
 		<sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventCategory==Movie</segment>
 		<subtable>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
@@ -67,6 +68,7 @@
 		<max_event_value>10</max_event_value>
 		<sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.5</avg_event_value>
+		<segment>eventCategory==Music</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -91,6 +93,7 @@
 		<max_event_value>9.66</max_event_value>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
+		<segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 		<subtable>
 			<row>
 				<label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getAction_day.xml
index 609b2b8d6c..49170578d6 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getAction_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getAction_day.xml
@@ -10,6 +10,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==playTrailer</segment>
 		<subtable>
 			<row>
 				<label>Ponyo (崖の上のポニョ)</label>
@@ -56,6 +57,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play25%25</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -91,6 +93,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play50%25</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -126,6 +129,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play75%25</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -161,6 +165,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==playEnd</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -196,6 +201,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -220,6 +226,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==playStart</segment>
 		<subtable>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getCategory_day.xml
index 7582baa657..319be3b443 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getCategory_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getCategory_day.xml
@@ -10,6 +10,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventCategory==Movie</segment>
 		<subtable>
 			<row>
 				<label>playTrailer</label>
@@ -89,6 +90,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventCategory==Music</segment>
 		<subtable>
 			<row>
 				<label>play</label>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getName_day.xml
index e1aa570c57..11f30a6954 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getName_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getName_day.xml
@@ -10,6 +10,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment>
 		<subtable>
 			<row>
 				<label>play25%</label>
@@ -89,6 +90,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment>
 		<subtable>
 			<row>
 				<label>play</label>
@@ -157,6 +159,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment>
 		<subtable>
 			<row>
 				<label>playTrailer</label>
@@ -181,6 +184,7 @@
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
 		<avg_event_value>0</avg_event_value>
+		<segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment>
 		<subtable>
 			<row>
 				<label>playTrailer</label>
diff --git a/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml
index 1db9719c00..59b45f61fe 100644
--- a/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml
@@ -19,6 +19,7 @@
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.15</avg_time_generation>
 		<url>http://example.org/dir1/sub/dir/page0.html</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir1%2Fsub%2Fdir%2Fpage0.html</segment>
 	</row>
 	<row>
 		<label>dir1/sub/dir/page1.html</label>
@@ -34,6 +35,7 @@
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.3</avg_time_generation>
 		<url>http://example.org/dir1/sub/dir/page1.html</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir1%2Fsub%2Fdir%2Fpage1.html</segment>
 	</row>
 	<row>
 		<label>dir1/sub/dir/page2.html</label>
@@ -51,6 +53,7 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0.45</avg_time_generation>
 		<url>http://example.org/dir1/sub/dir/page2.html</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir1%2Fsub%2Fdir%2Fpage2.html</segment>
 	</row>
 	<row>
 		<label>dir2/sub/dir/page0.html</label>
@@ -71,6 +74,7 @@
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.3</avg_time_generation>
 		<url>http://example.org/dir2/sub/dir/page0.html</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage0.html</segment>
 	</row>
 	<row>
 		<label>dir2/sub/dir/page1.html</label>
@@ -86,6 +90,7 @@
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.6</avg_time_generation>
 		<url>http://example.org/dir2/sub/dir/page1.html</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage1.html</segment>
 	</row>
 	<row>
 		<label>dir2/sub/dir/page2.html</label>
@@ -103,6 +108,7 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0.9</avg_time_generation>
 		<url>http://example.org/dir2/sub/dir/page2.html</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage2.html</segment>
 	</row>
 	<row>
 		<label>dir3/sub/dir/page0.html</label>
@@ -123,6 +129,7 @@
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.45</avg_time_generation>
 		<url>http://example.org/dir3/sub/dir/page0.html</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage0.html</segment>
 	</row>
 	<row>
 		<label>dir3/sub/dir/page1.html</label>
@@ -138,6 +145,7 @@
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.9</avg_time_generation>
 		<url>http://example.org/dir3/sub/dir/page1.html</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage1.html</segment>
 	</row>
 	<row>
 		<label>dir3/sub/dir/page2.html</label>
@@ -155,6 +163,7 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>1.35</avg_time_generation>
 		<url>http://example.org/dir3/sub/dir/page2.html</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage2.html</segment>
 	</row>
 	<row>
 		<label>page1.html</label>
@@ -171,6 +180,7 @@
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>100%</exit_rate>
 		<url>http://example.org/page1.html</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fpage1.html</segment>
 	</row>
 	<row>
 		<label>sub/dir/dir1/page1.html</label>
@@ -187,5 +197,6 @@
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
 		<url>http://example.org/sub/dir/dir1/page1.html</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fsub%2Fdir%2Fdir1%2Fpage1.html</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_FlattenReports_expandedWithDepth__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_FlattenReports_expandedWithDepth__Actions.getPageUrls_week.xml
index 60400f15ef..41aff4d22e 100644
--- a/tests/PHPUnit/System/expected/test_FlattenReports_expandedWithDepth__Actions.getPageUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_FlattenReports_expandedWithDepth__Actions.getPageUrls_week.xml
@@ -130,6 +130,7 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0</avg_time_generation>
 		<url>http://example.org/page1.html</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fpage1.html</segment>
 	</row>
 	<row>
 		<label>sub</label>
diff --git a/tests/PHPUnit/System/expected/test_FlattenReports_flatFilterPatternRecursive__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_FlattenReports_flatFilterPatternRecursive__Actions.getPageUrls_week.xml
index 6acf67f60c..a2c2fa204e 100644
--- a/tests/PHPUnit/System/expected/test_FlattenReports_flatFilterPatternRecursive__Actions.getPageUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_FlattenReports_flatFilterPatternRecursive__Actions.getPageUrls_week.xml
@@ -19,6 +19,7 @@
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.3</avg_time_generation>
 		<url>http://example.org/dir2/sub/dir/page0.html</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage0.html</segment>
 	</row>
 	<row>
 		<label>dir2/sub/dir/page1.html</label>
@@ -34,6 +35,7 @@
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.6</avg_time_generation>
 		<url>http://example.org/dir2/sub/dir/page1.html</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage1.html</segment>
 	</row>
 	<row>
 		<label>dir2/sub/dir/page2.html</label>
@@ -51,5 +53,6 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0.9</avg_time_generation>
 		<url>http://example.org/dir2/sub/dir/page2.html</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage2.html</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml
index eda55355bc..d02a61ce87 100644
--- a/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml
@@ -76,6 +76,7 @@
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.15</avg_time_generation>
 		<url>http://example.org/dir1/sub/dir/page0.html</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir1%2Fsub%2Fdir%2Fpage0.html</segment>
 		<is_aggregate>0</is_aggregate>
 	</row>
 	<row>
@@ -92,6 +93,7 @@
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.3</avg_time_generation>
 		<url>http://example.org/dir1/sub/dir/page1.html</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir1%2Fsub%2Fdir%2Fpage1.html</segment>
 		<is_aggregate>0</is_aggregate>
 	</row>
 	<row>
@@ -110,6 +112,7 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0.45</avg_time_generation>
 		<url>http://example.org/dir1/sub/dir/page2.html</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir1%2Fsub%2Fdir%2Fpage2.html</segment>
 		<is_aggregate>0</is_aggregate>
 	</row>
 	<row>
@@ -188,6 +191,7 @@
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.3</avg_time_generation>
 		<url>http://example.org/dir2/sub/dir/page0.html</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage0.html</segment>
 		<is_aggregate>0</is_aggregate>
 	</row>
 	<row>
@@ -204,6 +208,7 @@
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.6</avg_time_generation>
 		<url>http://example.org/dir2/sub/dir/page1.html</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage1.html</segment>
 		<is_aggregate>0</is_aggregate>
 	</row>
 	<row>
@@ -222,6 +227,7 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0.9</avg_time_generation>
 		<url>http://example.org/dir2/sub/dir/page2.html</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage2.html</segment>
 		<is_aggregate>0</is_aggregate>
 	</row>
 	<row>
@@ -300,6 +306,7 @@
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.45</avg_time_generation>
 		<url>http://example.org/dir3/sub/dir/page0.html</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage0.html</segment>
 		<is_aggregate>0</is_aggregate>
 	</row>
 	<row>
@@ -316,6 +323,7 @@
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.9</avg_time_generation>
 		<url>http://example.org/dir3/sub/dir/page1.html</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage1.html</segment>
 		<is_aggregate>0</is_aggregate>
 	</row>
 	<row>
@@ -334,6 +342,7 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>1.35</avg_time_generation>
 		<url>http://example.org/dir3/sub/dir/page2.html</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage2.html</segment>
 		<is_aggregate>0</is_aggregate>
 	</row>
 	<row>
@@ -353,6 +362,7 @@
 		<avg_time_generation>0</avg_time_generation>
 		<url>http://example.org/page1.html</url>
 		<is_aggregate>0</is_aggregate>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fpage1.html</segment>
 	</row>
 	<row>
 		<label>sub</label>
@@ -418,6 +428,7 @@
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0</avg_time_generation>
 		<url>http://example.org/sub/dir/dir1/page1.html</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fsub%2Fdir%2Fdir1%2Fpage1.html</segment>
 		<is_aggregate>0</is_aggregate>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml
index 77e2b64918..a67474528f 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml
@@ -2,18 +2,40 @@
 <result>
 	<row>
 		<label>301</label>
-		<nb_visits>1</nb_visits>
-		<nb_hits>1</nb_hits>
+		<nb_visits>3</nb_visits>
+		<nb_hits>3</nb_hits>
 		<sum_time_spent>180</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
+		<entry_nb_visits>2</entry_nb_visits>
+		<entry_nb_actions>3</entry_nb_actions>
 		<entry_sum_visit_length>182</entry_sum_visit_length>
-		<entry_bounce_count>0</entry_bounce_count>
-		<avg_time_on_page>180</avg_time_on_page>
-		<bounce_rate>0%</bounce_rate>
-		<exit_rate>0%</exit_rate>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>2</exit_nb_visits>
+		<avg_time_on_page>60</avg_time_on_page>
+		<bounce_rate>50%</bounce_rate>
+		<exit_rate>67%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
+				<label> URL = http://piwik.net/Topic/hw43061</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+			</row>
+			<row>
 				<label> URL = http://piwik.net/moved-permanently</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
@@ -32,23 +54,51 @@
 	</row>
 	<row>
 		<label>404</label>
-		<nb_visits>1</nb_visits>
-		<nb_hits>1</nb_hits>
+		<nb_visits>3</nb_visits>
+		<nb_hits>3</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
+		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+		<min_time_generation>0.359</min_time_generation>
+		<max_time_generation>0.359</max_time_generation>
+		<entry_nb_visits>2</entry_nb_visits>
+		<entry_nb_actions>2</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
+		<entry_bounce_count>2</entry_bounce_count>
+		<exit_nb_visits>3</exit_nb_visits>
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0.359</avg_time_generation>
 		<subtable>
 			<row>
+				<label> URL = http://piwik.net/hello/world/6,681965</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+			</row>
+			<row>
 				<label> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+				<min_time_generation />
+				<max_time_generation />
 				<entry_nb_visits>1</entry_nb_visits>
 				<entry_nb_actions>1</entry_nb_actions>
 				<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -60,6 +110,44 @@
 				<avg_time_on_page>0</avg_time_on_page>
 				<bounce_rate>100%</bounce_rate>
 				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0</avg_time_generation>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>302</label>
+		<nb_visits>1</nb_visits>
+		<nb_hits>1</nb_hits>
+		<sum_time_spent>240</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>2</entry_nb_actions>
+		<entry_sum_visit_length>242</entry_sum_visit_length>
+		<entry_bounce_count>0</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>240</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
+		<subtable>
+			<row>
+				<label> URL = http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</label>
+				<nb_visits>1</nb_visits>
+				<nb_hits>1</nb_hits>
+				<sum_time_spent>240</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>2</entry_nb_actions>
+				<entry_sum_visit_length>242</entry_sum_visit_length>
+				<entry_bounce_count>0</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>240</avg_time_on_page>
+				<bounce_rate>0%</bounce_rate>
+				<exit_rate>100%</exit_rate>
 			</row>
 		</subtable>
 	</row>
@@ -68,6 +156,9 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -76,6 +167,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label> URL = http://piwik.net/to-an-error</label>
@@ -101,6 +193,9 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation />
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -112,12 +207,16 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 	</row>
 	<row>
 		<label> Piwik Forums</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation />
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -129,5 +228,6 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml
index 2d81bb9f19..44e3bd5eeb 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml
@@ -22,44 +22,41 @@
 		<avg_time_generation>0.177</avg_time_generation>
 	</row>
 	<row>
-		<label> Log Analytics - Analytics - Piwik</label>
-		<nb_visits>2</nb_visits>
-		<nb_hits>2</nb_hits>
-		<sum_time_spent>0</sum_time_spent>
-		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
-		<min_time_generation>0.145</min_time_generation>
-		<max_time_generation>0.145</max_time_generation>
-		<entry_nb_visits>2</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>2</entry_bounce_count>
-		<exit_nb_visits>2</exit_nb_visits>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
-		<avg_time_on_page>0</avg_time_on_page>
-		<bounce_rate>100%</bounce_rate>
-		<exit_rate>100%</exit_rate>
-		<avg_time_generation>0.145</avg_time_generation>
-	</row>
-	<row>
 		<label>301</label>
-		<nb_visits>1</nb_visits>
-		<nb_hits>1</nb_hits>
+		<nb_visits>3</nb_visits>
+		<nb_hits>3</nb_hits>
 		<sum_time_spent>180</sum_time_spent>
 		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 		<min_time_generation />
 		<max_time_generation>0</max_time_generation>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
+		<entry_nb_visits>2</entry_nb_visits>
+		<entry_nb_actions>3</entry_nb_actions>
 		<entry_sum_visit_length>182</entry_sum_visit_length>
-		<entry_bounce_count>0</entry_bounce_count>
-		<avg_time_on_page>180</avg_time_on_page>
-		<bounce_rate>0%</bounce_rate>
-		<exit_rate>0%</exit_rate>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>2</exit_nb_visits>
+		<avg_time_on_page>60</avg_time_on_page>
+		<bounce_rate>50%</bounce_rate>
+		<exit_rate>67%</exit_rate>
 		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
+				<label> URL = http://piwik.net/Topic/hw43061</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+			</row>
+			<row>
 				<label> URL = http://piwik.net/moved-permanently</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
@@ -78,27 +75,51 @@
 	</row>
 	<row>
 		<label>404</label>
-		<nb_visits>1</nb_visits>
-		<nb_hits>1</nb_hits>
+		<nb_visits>3</nb_visits>
+		<nb_hits>3</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-		<min_time_generation />
-		<max_time_generation>0</max_time_generation>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
+		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+		<min_time_generation>0.359</min_time_generation>
+		<max_time_generation>0.359</max_time_generation>
+		<entry_nb_visits>2</entry_nb_visits>
+		<entry_nb_actions>2</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
+		<entry_bounce_count>2</entry_bounce_count>
+		<exit_nb_visits>3</exit_nb_visits>
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
-		<avg_time_generation>0</avg_time_generation>
+		<avg_time_generation>0.359</avg_time_generation>
 		<subtable>
 			<row>
+				<label> URL = http://piwik.net/hello/world/6,681965</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+			</row>
+			<row>
 				<label> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+				<min_time_generation />
+				<max_time_generation />
 				<entry_nb_visits>1</entry_nb_visits>
 				<entry_nb_actions>1</entry_nb_actions>
 				<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -110,6 +131,65 @@
 				<avg_time_on_page>0</avg_time_on_page>
 				<bounce_rate>100%</bounce_rate>
 				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0</avg_time_generation>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label> Log Analytics - Analytics - Piwik</label>
+		<nb_visits>2</nb_visits>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+		<min_time_generation>0.145</min_time_generation>
+		<max_time_generation>0.145</max_time_generation>
+		<entry_nb_visits>2</entry_nb_visits>
+		<entry_nb_actions>2</entry_nb_actions>
+		<entry_sum_visit_length>0</entry_sum_visit_length>
+		<entry_bounce_count>2</entry_bounce_count>
+		<exit_nb_visits>2</exit_nb_visits>
+		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
+		<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>100%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0.145</avg_time_generation>
+	</row>
+	<row>
+		<label>302</label>
+		<nb_visits>1</nb_visits>
+		<nb_hits>1</nb_hits>
+		<sum_time_spent>240</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>2</entry_nb_actions>
+		<entry_sum_visit_length>242</entry_sum_visit_length>
+		<entry_bounce_count>0</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>240</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
+		<subtable>
+			<row>
+				<label> URL = http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</label>
+				<nb_visits>1</nb_visits>
+				<nb_hits>1</nb_hits>
+				<sum_time_spent>240</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>2</entry_nb_actions>
+				<entry_sum_visit_length>242</entry_sum_visit_length>
+				<entry_bounce_count>0</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>240</avg_time_on_page>
+				<bounce_rate>0%</bounce_rate>
+				<exit_rate>100%</exit_rate>
 			</row>
 		</subtable>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
index 8845a80655..0b8861041c 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
@@ -5,6 +5,9 @@
 		<nb_visits>5</nb_visits>
 		<nb_hits>5</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>5</entry_nb_visits>
 		<entry_nb_actions>5</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -13,6 +16,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label>category</label>
@@ -171,6 +175,9 @@
 		<nb_visits>4</nb_visits>
 		<nb_hits>4</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>4</entry_nb_visits>
 		<entry_nb_actions>4</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -179,6 +186,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label>manage-websites</label>
@@ -273,6 +281,9 @@
 		<nb_visits>4</nb_visits>
 		<nb_hits>4</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>4</entry_nb_visits>
 		<entry_nb_actions>4</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -281,6 +292,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label>/index</label>
@@ -371,28 +383,302 @@
 		</subtable>
 	</row>
 	<row>
+		<label>hello</label>
+		<nb_visits>4</nb_visits>
+		<nb_hits>4</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>4</nb_hits_with_time_generation>
+		<min_time_generation>0.359</min_time_generation>
+		<max_time_generation>0.359</max_time_generation>
+		<entry_nb_visits>3</entry_nb_visits>
+		<entry_nb_actions>4</entry_nb_actions>
+		<entry_sum_visit_length>2</entry_sum_visit_length>
+		<entry_bounce_count>2</entry_bounce_count>
+		<exit_nb_visits>3</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>67%</bounce_rate>
+		<exit_rate>75%</exit_rate>
+		<avg_time_generation>0.359</avg_time_generation>
+		<subtable>
+			<row>
+				<label>from</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>2</entry_nb_visits>
+				<entry_nb_actions>3</entry_nb_actions>
+				<entry_sum_visit_length>2</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>50%</bounce_rate>
+				<exit_rate>50%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+				<subtable>
+					<row>
+						<label>another</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+						<min_time_generation>0.359</min_time_generation>
+						<max_time_generation>0.359</max_time_generation>
+						<entry_nb_visits>2</entry_nb_visits>
+						<entry_nb_actions>3</entry_nb_actions>
+						<entry_sum_visit_length>2</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>1</exit_nb_visits>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>50%</bounce_rate>
+						<exit_rate>50%</exit_rate>
+						<avg_time_generation>0.359</avg_time_generation>
+						<subtable>
+							<row>
+								<label>world</label>
+								<nb_visits>2</nb_visits>
+								<nb_hits>2</nb_hits>
+								<sum_time_spent>0</sum_time_spent>
+								<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+								<min_time_generation>0.359</min_time_generation>
+								<max_time_generation>0.359</max_time_generation>
+								<entry_nb_visits>2</entry_nb_visits>
+								<entry_nb_actions>3</entry_nb_actions>
+								<entry_sum_visit_length>2</entry_sum_visit_length>
+								<entry_bounce_count>1</entry_bounce_count>
+								<exit_nb_visits>1</exit_nb_visits>
+								<avg_time_on_page>0</avg_time_on_page>
+								<bounce_rate>50%</bounce_rate>
+								<exit_rate>50%</exit_rate>
+								<avg_time_generation>0.359</avg_time_generation>
+								<subtable>
+									<row>
+										<label>/6,681965</label>
+										<nb_visits>2</nb_visits>
+										<nb_hits>2</nb_hits>
+										<sum_time_spent>0</sum_time_spent>
+										<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+										<min_time_generation>0.359</min_time_generation>
+										<max_time_generation>0.359</max_time_generation>
+										<entry_nb_visits>2</entry_nb_visits>
+										<entry_nb_actions>3</entry_nb_actions>
+										<entry_sum_visit_length>2</entry_sum_visit_length>
+										<entry_bounce_count>1</entry_bounce_count>
+										<exit_nb_visits>1</exit_nb_visits>
+										<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+										<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+										<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+										<avg_time_on_page>0</avg_time_on_page>
+										<bounce_rate>50%</bounce_rate>
+										<exit_rate>50%</exit_rate>
+										<avg_time_generation>0.359</avg_time_generation>
+										<url>http://piwik.net/hello/from/another/world/6,681965</url>
+									</row>
+								</subtable>
+							</row>
+						</subtable>
+					</row>
+				</subtable>
+			</row>
+			<row>
+				<label>world</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+				<subtable>
+					<row>
+						<label>/6,681965</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+						<min_time_generation>0.359</min_time_generation>
+						<max_time_generation>0.359</max_time_generation>
+						<entry_nb_visits>1</entry_nb_visits>
+						<entry_nb_actions>1</entry_nb_actions>
+						<entry_sum_visit_length>0</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>2</exit_nb_visits>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+						<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>100%</bounce_rate>
+						<exit_rate>100%</exit_rate>
+						<avg_time_generation>0.359</avg_time_generation>
+						<url>http://piwik.net/hello/world/6,681965</url>
+					</row>
+				</subtable>
+			</row>
+		</subtable>
+	</row>
+	<row>
 		<label>/index</label>
-		<nb_visits>2</nb_visits>
-		<nb_hits>2</nb_hits>
+		<nb_visits>3</nb_visits>
+		<nb_hits>3</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>2</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
+		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+		<min_time_generation>0.001</min_time_generation>
+		<max_time_generation>0.001</max_time_generation>
+		<entry_nb_visits>3</entry_nb_visits>
+		<entry_nb_actions>3</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>2</entry_bounce_count>
-		<exit_nb_visits>2</exit_nb_visits>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
+		<entry_bounce_count>3</entry_bounce_count>
+		<exit_nb_visits>3</exit_nb_visits>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+		<sum_daily_entry_nb_uniq_visitors>3</sum_daily_entry_nb_uniq_visitors>
+		<sum_daily_exit_nb_uniq_visitors>3</sum_daily_exit_nb_uniq_visitors>
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0.001</avg_time_generation>
 		<url>http://piwik.net/</url>
+		<segment>entryPageUrl==http%3A%2F%2Fpiwik.net%2F</segment>
+	</row>
+	<row>
+		<label>Citrix</label>
+		<nb_visits>2</nb_visits>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>240</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>2</entry_nb_actions>
+		<entry_sum_visit_length>242</entry_sum_visit_length>
+		<entry_bounce_count>0</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>120</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>50%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
+		<subtable>
+			<row>
+				<label>XenApp</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>240</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>2</entry_nb_actions>
+				<entry_sum_visit_length>242</entry_sum_visit_length>
+				<entry_bounce_count>0</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>120</avg_time_on_page>
+				<bounce_rate>0%</bounce_rate>
+				<exit_rate>50%</exit_rate>
+				<subtable>
+					<row>
+						<label>Wan</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>240</sum_time_spent>
+						<entry_nb_visits>1</entry_nb_visits>
+						<entry_nb_actions>2</entry_nb_actions>
+						<entry_sum_visit_length>242</entry_sum_visit_length>
+						<entry_bounce_count>0</entry_bounce_count>
+						<exit_nb_visits>1</exit_nb_visits>
+						<avg_time_on_page>120</avg_time_on_page>
+						<bounce_rate>0%</bounce_rate>
+						<exit_rate>50%</exit_rate>
+						<subtable>
+							<row>
+								<label>auth</label>
+								<nb_visits>2</nb_visits>
+								<nb_hits>2</nb_hits>
+								<sum_time_spent>240</sum_time_spent>
+								<entry_nb_visits>1</entry_nb_visits>
+								<entry_nb_actions>2</entry_nb_actions>
+								<entry_sum_visit_length>242</entry_sum_visit_length>
+								<entry_bounce_count>0</entry_bounce_count>
+								<exit_nb_visits>1</exit_nb_visits>
+								<avg_time_on_page>120</avg_time_on_page>
+								<bounce_rate>0%</bounce_rate>
+								<exit_rate>50%</exit_rate>
+								<subtable>
+									<row>
+										<label>/login.jsp</label>
+										<nb_visits>1</nb_visits>
+										<nb_hits>1</nb_hits>
+										<sum_time_spent>240</sum_time_spent>
+										<entry_nb_visits>1</entry_nb_visits>
+										<entry_nb_actions>2</entry_nb_actions>
+										<entry_sum_visit_length>242</entry_sum_visit_length>
+										<entry_bounce_count>0</entry_bounce_count>
+										<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+										<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+										<avg_time_on_page>240</avg_time_on_page>
+										<bounce_rate>0%</bounce_rate>
+										<exit_rate>0%</exit_rate>
+										<url>http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</url>
+									</row>
+								</subtable>
+							</row>
+						</subtable>
+					</row>
+				</subtable>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Topic</label>
+		<nb_visits>2</nb_visits>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>1</entry_nb_actions>
+		<entry_sum_visit_length>0</entry_sum_visit_length>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>100%</bounce_rate>
+		<exit_rate>50%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
+		<subtable>
+			<row>
+				<label>/hw43061</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>50%</exit_rate>
+				<url>http://piwik.net/Topic/hw43061</url>
+			</row>
+		</subtable>
 	</row>
 	<row>
 		<label>/index.htm</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation />
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -404,13 +690,18 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<url>http://example.org/index.htm</url>
+		<segment>entryPageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 	</row>
 	<row>
 		<label>/moved-permanently</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>180</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation />
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>2</entry_nb_actions>
 		<entry_sum_visit_length>182</entry_sum_visit_length>
@@ -420,13 +711,18 @@
 		<avg_time_on_page>180</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<url>http://piwik.net/moved-permanently</url>
+		<segment>entryPageUrl==http%3A%2F%2Fpiwik.net%2Fmoved-permanently</segment>
 	</row>
 	<row>
 		<label>/register.php?0,approve=9a94a02145599</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation />
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -438,13 +734,18 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url>
+		<segment>entryPageUrl==http%3A%2F%2Fforum.piwik.org%2Fregister.php%3F0%2Capprove%3D9a94a02145599</segment>
 	</row>
 	<row>
 		<label>/to-an-error</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation />
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -456,13 +757,18 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<url>http://piwik.net/to-an-error</url>
+		<segment>entryPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment>
 	</row>
 	<row>
 		<label>download</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -471,6 +777,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label>counter</label>
@@ -513,6 +820,9 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -521,6 +831,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label>/index</label>
@@ -547,6 +858,9 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -555,6 +869,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label>/index</label>
@@ -581,6 +896,9 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -589,6 +907,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label>/index</label>
@@ -611,10 +930,55 @@
 		</subtable>
 	</row>
 	<row>
+		<label>Products</label>
+		<nb_visits>1</nb_visits>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+		<min_time_generation>0.109</min_time_generation>
+		<max_time_generation>0.109</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>3</entry_nb_actions>
+		<entry_sum_visit_length>2</entry_sum_visit_length>
+		<entry_bounce_count>0</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0.109</avg_time_generation>
+		<subtable>
+			<row>
+				<label>/theProduct</label>
+				<nb_visits>1</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+				<min_time_generation>0.109</min_time_generation>
+				<max_time_generation>0.109</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>3</entry_nb_actions>
+				<entry_sum_visit_length>2</entry_sum_visit_length>
+				<entry_bounce_count>0</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>0%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.109</avg_time_generation>
+				<url>http://piwik.net/Products/theProduct</url>
+			</row>
+		</subtable>
+	</row>
+	<row>
 		<label>this</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -623,6 +987,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label>is</label>
@@ -777,6 +1142,9 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -785,6 +1153,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label>/index</label>
@@ -806,4 +1175,66 @@
 			</row>
 		</subtable>
 	</row>
+	<row>
+		<label>view</label>
+		<nb_visits>1</nb_visits>
+		<nb_hits>1</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+		<min_time_generation>0.001</min_time_generation>
+		<max_time_generation>0.001</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>1</entry_nb_actions>
+		<entry_sum_visit_length>0</entry_sum_visit_length>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>100%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0.001</avg_time_generation>
+		<subtable>
+			<row>
+				<label>my</label>
+				<nb_visits>1</nb_visits>
+				<nb_hits>1</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+				<min_time_generation>0.001</min_time_generation>
+				<max_time_generation>0.001</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.001</avg_time_generation>
+				<subtable>
+					<row>
+						<label>/file.html</label>
+						<nb_visits>1</nb_visits>
+						<nb_hits>1</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+						<min_time_generation>0.001</min_time_generation>
+						<max_time_generation>0.001</max_time_generation>
+						<entry_nb_visits>1</entry_nb_visits>
+						<entry_nb_actions>1</entry_nb_actions>
+						<entry_sum_visit_length>0</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>1</exit_nb_visits>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+						<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>100%</bounce_rate>
+						<exit_rate>100%</exit_rate>
+						<avg_time_generation>0.001</avg_time_generation>
+						<url>http://piwik.net/view/my/file.html</url>
+					</row>
+				</subtable>
+			</row>
+		</subtable>
+	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
index b7cbdc125b..c9e4eac6d9 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
@@ -4,7 +4,7 @@
 		<label>blog</label>
 		<nb_visits>9</nb_visits>
 		<nb_hits>12</nb_hits>
-		<sum_time_spent>170</sum_time_spent>
+		<sum_time_spent>166</sum_time_spent>
 		<nb_hits_with_time_generation>7</nb_hits_with_time_generation>
 		<min_time_generation>0.023</min_time_generation>
 		<max_time_generation>1.324</max_time_generation>
@@ -13,7 +13,7 @@
 		<entry_sum_visit_length>54</entry_sum_visit_length>
 		<entry_bounce_count>7</entry_bounce_count>
 		<exit_nb_visits>7</exit_nb_visits>
-		<avg_time_on_page>19</avg_time_on_page>
+		<avg_time_on_page>18</avg_time_on_page>
 		<bounce_rate>88%</bounce_rate>
 		<exit_rate>78%</exit_rate>
 		<avg_time_generation>0.389</avg_time_generation>
@@ -22,7 +22,7 @@
 				<label>category</label>
 				<nb_visits>6</nb_visits>
 				<nb_hits>9</nb_hits>
-				<sum_time_spent>170</sum_time_spent>
+				<sum_time_spent>166</sum_time_spent>
 				<nb_hits_with_time_generation>5</nb_hits_with_time_generation>
 				<min_time_generation>0.023</min_time_generation>
 				<max_time_generation>1.324</max_time_generation>
@@ -40,7 +40,7 @@
 						<label>meta</label>
 						<nb_visits>4</nb_visits>
 						<nb_hits>6</nb_hits>
-						<sum_time_spent>156</sum_time_spent>
+						<sum_time_spent>151</sum_time_spent>
 						<nb_hits_with_time_generation>3</nb_hits_with_time_generation>
 						<min_time_generation>0.023</min_time_generation>
 						<max_time_generation>0.123</max_time_generation>
@@ -49,7 +49,7 @@
 						<entry_sum_visit_length>54</entry_sum_visit_length>
 						<entry_bounce_count>3</entry_bounce_count>
 						<exit_nb_visits>3</exit_nb_visits>
-						<avg_time_on_page>39</avg_time_on_page>
+						<avg_time_on_page>38</avg_time_on_page>
 						<bounce_rate>75%</bounce_rate>
 						<exit_rate>75%</exit_rate>
 						<avg_time_generation>0.089</avg_time_generation>
@@ -58,7 +58,7 @@
 								<label>/index</label>
 								<nb_visits>4</nb_visits>
 								<nb_hits>6</nb_hits>
-								<sum_time_spent>156</sum_time_spent>
+								<sum_time_spent>151</sum_time_spent>
 								<nb_hits_with_time_generation>3</nb_hits_with_time_generation>
 								<min_time_generation>0.023</min_time_generation>
 								<max_time_generation>0.123</max_time_generation>
@@ -70,7 +70,7 @@
 								<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 								<sum_daily_entry_nb_uniq_visitors>4</sum_daily_entry_nb_uniq_visitors>
 								<sum_daily_exit_nb_uniq_visitors>3</sum_daily_exit_nb_uniq_visitors>
-								<avg_time_on_page>39</avg_time_on_page>
+								<avg_time_on_page>38</avg_time_on_page>
 								<bounce_rate>75%</bounce_rate>
 								<exit_rate>75%</exit_rate>
 								<avg_time_generation>0.089</avg_time_generation>
@@ -82,7 +82,7 @@
 						<label>community</label>
 						<nb_visits>2</nb_visits>
 						<nb_hits>3</nb_hits>
-						<sum_time_spent>14</sum_time_spent>
+						<sum_time_spent>15</sum_time_spent>
 						<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 						<min_time_generation>0.624</min_time_generation>
 						<max_time_generation>1.324</max_time_generation>
@@ -91,7 +91,7 @@
 						<entry_sum_visit_length>0</entry_sum_visit_length>
 						<entry_bounce_count>1</entry_bounce_count>
 						<exit_nb_visits>1</exit_nb_visits>
-						<avg_time_on_page>7</avg_time_on_page>
+						<avg_time_on_page>8</avg_time_on_page>
 						<bounce_rate>100%</bounce_rate>
 						<exit_rate>50%</exit_rate>
 						<avg_time_generation>0.974</avg_time_generation>
@@ -100,7 +100,7 @@
 								<label>/index</label>
 								<nb_visits>2</nb_visits>
 								<nb_hits>3</nb_hits>
-								<sum_time_spent>14</sum_time_spent>
+								<sum_time_spent>15</sum_time_spent>
 								<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 								<min_time_generation>0.624</min_time_generation>
 								<max_time_generation>1.324</max_time_generation>
@@ -112,7 +112,7 @@
 								<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 								<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
 								<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
-								<avg_time_on_page>7</avg_time_on_page>
+								<avg_time_on_page>8</avg_time_on_page>
 								<bounce_rate>100%</bounce_rate>
 								<exit_rate>50%</exit_rate>
 								<avg_time_generation>0.974</avg_time_generation>
@@ -344,25 +344,26 @@
 	</row>
 	<row>
 		<label>/index</label>
-		<nb_visits>6</nb_visits>
-		<nb_hits>6</nb_hits>
+		<nb_visits>7</nb_visits>
+		<nb_hits>7</nb_hits>
 		<sum_time_spent>34</sum_time_spent>
-		<nb_hits_with_time_generation>3</nb_hits_with_time_generation>
-		<min_time_generation>0.058</min_time_generation>
+		<nb_hits_with_time_generation>4</nb_hits_with_time_generation>
+		<min_time_generation>0.001</min_time_generation>
 		<max_time_generation>0.292</max_time_generation>
-		<entry_nb_visits>6</entry_nb_visits>
-		<entry_nb_actions>9</entry_nb_actions>
+		<entry_nb_visits>7</entry_nb_visits>
+		<entry_nb_actions>10</entry_nb_actions>
 		<entry_sum_visit_length>44</entry_sum_visit_length>
-		<entry_bounce_count>4</entry_bounce_count>
-		<exit_nb_visits>4</exit_nb_visits>
-		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>6</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors>
-		<avg_time_on_page>6</avg_time_on_page>
-		<bounce_rate>67%</bounce_rate>
-		<exit_rate>67%</exit_rate>
-		<avg_time_generation>0.177</avg_time_generation>
+		<entry_bounce_count>5</entry_bounce_count>
+		<exit_nb_visits>5</exit_nb_visits>
+		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
+		<sum_daily_entry_nb_uniq_visitors>7</sum_daily_entry_nb_uniq_visitors>
+		<sum_daily_exit_nb_uniq_visitors>5</sum_daily_exit_nb_uniq_visitors>
+		<avg_time_on_page>5</avg_time_on_page>
+		<bounce_rate>71%</bounce_rate>
+		<exit_rate>71%</exit_rate>
+		<avg_time_generation>0.133</avg_time_generation>
 		<url>http://piwik.net/</url>
+		<segment>entryPageUrl==http%3A%2F%2Fpiwik.net%2F</segment>
 	</row>
 	<row>
 		<label>docs</label>
@@ -647,6 +648,234 @@
 		</subtable>
 	</row>
 	<row>
+		<label>hello</label>
+		<nb_visits>4</nb_visits>
+		<nb_hits>4</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>4</nb_hits_with_time_generation>
+		<min_time_generation>0.359</min_time_generation>
+		<max_time_generation>0.359</max_time_generation>
+		<entry_nb_visits>3</entry_nb_visits>
+		<entry_nb_actions>4</entry_nb_actions>
+		<entry_sum_visit_length>2</entry_sum_visit_length>
+		<entry_bounce_count>2</entry_bounce_count>
+		<exit_nb_visits>3</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>67%</bounce_rate>
+		<exit_rate>75%</exit_rate>
+		<avg_time_generation>0.359</avg_time_generation>
+		<subtable>
+			<row>
+				<label>from</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>2</entry_nb_visits>
+				<entry_nb_actions>3</entry_nb_actions>
+				<entry_sum_visit_length>2</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>50%</bounce_rate>
+				<exit_rate>50%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+				<subtable>
+					<row>
+						<label>another</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+						<min_time_generation>0.359</min_time_generation>
+						<max_time_generation>0.359</max_time_generation>
+						<entry_nb_visits>2</entry_nb_visits>
+						<entry_nb_actions>3</entry_nb_actions>
+						<entry_sum_visit_length>2</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>1</exit_nb_visits>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>50%</bounce_rate>
+						<exit_rate>50%</exit_rate>
+						<avg_time_generation>0.359</avg_time_generation>
+						<subtable>
+							<row>
+								<label>world</label>
+								<nb_visits>2</nb_visits>
+								<nb_hits>2</nb_hits>
+								<sum_time_spent>0</sum_time_spent>
+								<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+								<min_time_generation>0.359</min_time_generation>
+								<max_time_generation>0.359</max_time_generation>
+								<entry_nb_visits>2</entry_nb_visits>
+								<entry_nb_actions>3</entry_nb_actions>
+								<entry_sum_visit_length>2</entry_sum_visit_length>
+								<entry_bounce_count>1</entry_bounce_count>
+								<exit_nb_visits>1</exit_nb_visits>
+								<avg_time_on_page>0</avg_time_on_page>
+								<bounce_rate>50%</bounce_rate>
+								<exit_rate>50%</exit_rate>
+								<avg_time_generation>0.359</avg_time_generation>
+								<subtable>
+									<row>
+										<label>/6,681965</label>
+										<nb_visits>2</nb_visits>
+										<nb_hits>2</nb_hits>
+										<sum_time_spent>0</sum_time_spent>
+										<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+										<min_time_generation>0.359</min_time_generation>
+										<max_time_generation>0.359</max_time_generation>
+										<entry_nb_visits>2</entry_nb_visits>
+										<entry_nb_actions>3</entry_nb_actions>
+										<entry_sum_visit_length>2</entry_sum_visit_length>
+										<entry_bounce_count>1</entry_bounce_count>
+										<exit_nb_visits>1</exit_nb_visits>
+										<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+										<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+										<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+										<avg_time_on_page>0</avg_time_on_page>
+										<bounce_rate>50%</bounce_rate>
+										<exit_rate>50%</exit_rate>
+										<avg_time_generation>0.359</avg_time_generation>
+										<url>http://piwik.net/hello/from/another/world/6,681965</url>
+									</row>
+								</subtable>
+							</row>
+						</subtable>
+					</row>
+				</subtable>
+			</row>
+			<row>
+				<label>world</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+				<subtable>
+					<row>
+						<label>/6,681965</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+						<min_time_generation>0.359</min_time_generation>
+						<max_time_generation>0.359</max_time_generation>
+						<entry_nb_visits>1</entry_nb_visits>
+						<entry_nb_actions>1</entry_nb_actions>
+						<entry_sum_visit_length>0</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>2</exit_nb_visits>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+						<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>100%</bounce_rate>
+						<exit_rate>100%</exit_rate>
+						<avg_time_generation>0.359</avg_time_generation>
+						<url>http://piwik.net/hello/world/6,681965</url>
+					</row>
+				</subtable>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Citrix</label>
+		<nb_visits>2</nb_visits>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>240</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>2</entry_nb_actions>
+		<entry_sum_visit_length>242</entry_sum_visit_length>
+		<entry_bounce_count>0</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>120</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>50%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
+		<subtable>
+			<row>
+				<label>XenApp</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>240</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>2</entry_nb_actions>
+				<entry_sum_visit_length>242</entry_sum_visit_length>
+				<entry_bounce_count>0</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>120</avg_time_on_page>
+				<bounce_rate>0%</bounce_rate>
+				<exit_rate>50%</exit_rate>
+				<subtable>
+					<row>
+						<label>Wan</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>240</sum_time_spent>
+						<entry_nb_visits>1</entry_nb_visits>
+						<entry_nb_actions>2</entry_nb_actions>
+						<entry_sum_visit_length>242</entry_sum_visit_length>
+						<entry_bounce_count>0</entry_bounce_count>
+						<exit_nb_visits>1</exit_nb_visits>
+						<avg_time_on_page>120</avg_time_on_page>
+						<bounce_rate>0%</bounce_rate>
+						<exit_rate>50%</exit_rate>
+						<subtable>
+							<row>
+								<label>auth</label>
+								<nb_visits>2</nb_visits>
+								<nb_hits>2</nb_hits>
+								<sum_time_spent>240</sum_time_spent>
+								<entry_nb_visits>1</entry_nb_visits>
+								<entry_nb_actions>2</entry_nb_actions>
+								<entry_sum_visit_length>242</entry_sum_visit_length>
+								<entry_bounce_count>0</entry_bounce_count>
+								<exit_nb_visits>1</exit_nb_visits>
+								<avg_time_on_page>120</avg_time_on_page>
+								<bounce_rate>0%</bounce_rate>
+								<exit_rate>50%</exit_rate>
+								<subtable>
+									<row>
+										<label>/login.jsp</label>
+										<nb_visits>1</nb_visits>
+										<nb_hits>1</nb_hits>
+										<sum_time_spent>240</sum_time_spent>
+										<entry_nb_visits>1</entry_nb_visits>
+										<entry_nb_actions>2</entry_nb_actions>
+										<entry_sum_visit_length>242</entry_sum_visit_length>
+										<entry_bounce_count>0</entry_bounce_count>
+										<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+										<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+										<avg_time_on_page>240</avg_time_on_page>
+										<bounce_rate>0%</bounce_rate>
+										<exit_rate>0%</exit_rate>
+										<url>http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</url>
+									</row>
+								</subtable>
+							</row>
+						</subtable>
+					</row>
+				</subtable>
+			</row>
+		</subtable>
+	</row>
+	<row>
 		<label>download</label>
 		<nb_visits>2</nb_visits>
 		<nb_hits>2</nb_hits>
@@ -743,6 +972,44 @@
 		</subtable>
 	</row>
 	<row>
+		<label>Topic</label>
+		<nb_visits>2</nb_visits>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>1</entry_nb_actions>
+		<entry_sum_visit_length>0</entry_sum_visit_length>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>100%</bounce_rate>
+		<exit_rate>50%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
+		<subtable>
+			<row>
+				<label>/hw43061</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>50%</exit_rate>
+				<url>http://piwik.net/Topic/hw43061</url>
+			</row>
+		</subtable>
+	</row>
+	<row>
 		<label>/index.htm</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
@@ -763,6 +1030,7 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0</avg_time_generation>
 		<url>http://example.org/index.htm</url>
+		<segment>entryPageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 	</row>
 	<row>
 		<label>/index.php?module=CoreHome&amp;action=index&amp;date=yesterday&amp;period=day&amp;idSite=7</label>
@@ -785,6 +1053,7 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0.413</avg_time_generation>
 		<url>http://demo.piwik.org/index.php?module=CoreHome&amp;action=index&amp;date=yesterday&amp;period=day&amp;idSite=7</url>
+		<segment>entryPageUrl==http%3A%2F%2Fdemo.piwik.org%2Findex.php%3Fmodule%3DCoreHome%26action%3Dindex%26date%3Dyesterday%26period%3Dday%26idSite%3D7</segment>
 	</row>
 	<row>
 		<label>/moved-permanently</label>
@@ -805,6 +1074,7 @@
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0</avg_time_generation>
 		<url>http://piwik.net/moved-permanently</url>
+		<segment>entryPageUrl==http%3A%2F%2Fpiwik.net%2Fmoved-permanently</segment>
 	</row>
 	<row>
 		<label>/register.php?0,approve=9a94a02145599</label>
@@ -827,6 +1097,7 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0</avg_time_generation>
 		<url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url>
+		<segment>entryPageUrl==http%3A%2F%2Fforum.piwik.org%2Fregister.php%3F0%2Capprove%3D9a94a02145599</segment>
 	</row>
 	<row>
 		<label>/to-an-error</label>
@@ -849,6 +1120,7 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0</avg_time_generation>
 		<url>http://piwik.net/to-an-error</url>
+		<segment>entryPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment>
 	</row>
 	<row>
 		<label>changelog</label>
@@ -1000,6 +1272,48 @@
 		</subtable>
 	</row>
 	<row>
+		<label>Products</label>
+		<nb_visits>1</nb_visits>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+		<min_time_generation>0.109</min_time_generation>
+		<max_time_generation>0.109</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>3</entry_nb_actions>
+		<entry_sum_visit_length>2</entry_sum_visit_length>
+		<entry_bounce_count>0</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0.109</avg_time_generation>
+		<subtable>
+			<row>
+				<label>/theProduct</label>
+				<nb_visits>1</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+				<min_time_generation>0.109</min_time_generation>
+				<max_time_generation>0.109</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>3</entry_nb_actions>
+				<entry_sum_visit_length>2</entry_sum_visit_length>
+				<entry_bounce_count>0</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>0%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.109</avg_time_generation>
+				<url>http://piwik.net/Products/theProduct</url>
+			</row>
+		</subtable>
+	</row>
+	<row>
 		<label>this</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
@@ -1203,4 +1517,66 @@
 			</row>
 		</subtable>
 	</row>
+	<row>
+		<label>view</label>
+		<nb_visits>1</nb_visits>
+		<nb_hits>1</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+		<min_time_generation>0.001</min_time_generation>
+		<max_time_generation>0.001</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>1</entry_nb_actions>
+		<entry_sum_visit_length>0</entry_sum_visit_length>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>100%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0.001</avg_time_generation>
+		<subtable>
+			<row>
+				<label>my</label>
+				<nb_visits>1</nb_visits>
+				<nb_hits>1</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+				<min_time_generation>0.001</min_time_generation>
+				<max_time_generation>0.001</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.001</avg_time_generation>
+				<subtable>
+					<row>
+						<label>/file.html</label>
+						<nb_visits>1</nb_visits>
+						<nb_hits>1</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+						<min_time_generation>0.001</min_time_generation>
+						<max_time_generation>0.001</max_time_generation>
+						<entry_nb_visits>1</entry_nb_visits>
+						<entry_nb_actions>1</entry_nb_actions>
+						<entry_sum_visit_length>0</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>1</exit_nb_visits>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+						<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>100%</bounce_rate>
+						<exit_rate>100%</exit_rate>
+						<avg_time_generation>0.001</avg_time_generation>
+						<url>http://piwik.net/view/my/file.html</url>
+					</row>
+				</subtable>
+			</row>
+		</subtable>
+	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml
index f1b90a5e1d..e6e2c17213 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml
@@ -1,58 +1,165 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
-		<label>307</label>
-		<nb_visits>1</nb_visits>
-		<nb_hits>1</nb_hits>
+		<label>301</label>
+		<nb_visits>3</nb_visits>
+		<nb_hits>3</nb_hits>
+		<sum_time_spent>180</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
+		<entry_nb_visits>2</entry_nb_visits>
+		<entry_nb_actions>3</entry_nb_actions>
+		<entry_sum_visit_length>182</entry_sum_visit_length>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>2</exit_nb_visits>
+		<avg_time_on_page>60</avg_time_on_page>
+		<bounce_rate>50%</bounce_rate>
+		<exit_rate>67%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
+		<subtable>
+			<row>
+				<label> URL = http://piwik.net/Topic/hw43061</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>404</label>
+		<nb_visits>3</nb_visits>
+		<nb_hits>3</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<exit_nb_visits>1</exit_nb_visits>
+		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+		<min_time_generation>0.359</min_time_generation>
+		<max_time_generation>0.359</max_time_generation>
+		<entry_nb_visits>2</entry_nb_visits>
+		<entry_nb_actions>2</entry_nb_actions>
+		<entry_sum_visit_length>0</entry_sum_visit_length>
+		<entry_bounce_count>2</entry_bounce_count>
+		<exit_nb_visits>3</exit_nb_visits>
 		<avg_time_on_page>0</avg_time_on_page>
-		<bounce_rate>0%</bounce_rate>
+		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0.359</avg_time_generation>
 		<subtable>
 			<row>
-				<label> URL = http://piwik.net/temp-redirect</label>
+				<label> URL = http://piwik.net/hello/world/6,681965</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+			</row>
+			<row>
+				<label> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+				<min_time_generation />
+				<max_time_generation />
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
 				<exit_nb_visits>1</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
 				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0</avg_time_generation>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>302</label>
+		<nb_visits>1</nb_visits>
+		<nb_hits>1</nb_hits>
+		<sum_time_spent>240</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>2</entry_nb_actions>
+		<entry_sum_visit_length>242</entry_sum_visit_length>
+		<entry_bounce_count>0</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>240</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
+		<subtable>
+			<row>
+				<label> URL = http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</label>
+				<nb_visits>1</nb_visits>
+				<nb_hits>1</nb_hits>
+				<sum_time_spent>240</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>2</entry_nb_actions>
+				<entry_sum_visit_length>242</entry_sum_visit_length>
+				<entry_bounce_count>0</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>240</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>100%</exit_rate>
 			</row>
 		</subtable>
 	</row>
 	<row>
-		<label>404</label>
+		<label>307</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<exit_nb_visits>1</exit_nb_visits>
 		<avg_time_on_page>0</avg_time_on_page>
-		<bounce_rate>100%</bounce_rate>
+		<bounce_rate>0%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
-				<label> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label>
+				<label> URL = http://piwik.net/temp-redirect</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
-				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
 				<exit_nb_visits>1</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
 				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<avg_time_on_page>0</avg_time_on_page>
-				<bounce_rate>100%</bounce_rate>
+				<bounce_rate>0%</bounce_rate>
 				<exit_rate>100%</exit_rate>
 			</row>
 		</subtable>
@@ -62,6 +169,9 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -70,6 +180,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label> URL = http://piwik.net/to-an-error</label>
@@ -95,6 +206,9 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation />
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -106,12 +220,16 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 	</row>
 	<row>
 		<label> Piwik Forums</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation />
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -123,5 +241,6 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml
index 867e27cd0d..86e26ebf31 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml
@@ -22,6 +22,105 @@
 		<avg_time_generation>0.177</avg_time_generation>
 	</row>
 	<row>
+		<label>301</label>
+		<nb_visits>3</nb_visits>
+		<nb_hits>3</nb_hits>
+		<sum_time_spent>180</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
+		<entry_nb_visits>2</entry_nb_visits>
+		<entry_nb_actions>3</entry_nb_actions>
+		<entry_sum_visit_length>182</entry_sum_visit_length>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>2</exit_nb_visits>
+		<avg_time_on_page>60</avg_time_on_page>
+		<bounce_rate>50%</bounce_rate>
+		<exit_rate>67%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
+		<subtable>
+			<row>
+				<label> URL = http://piwik.net/Topic/hw43061</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>404</label>
+		<nb_visits>3</nb_visits>
+		<nb_hits>3</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+		<min_time_generation>0.359</min_time_generation>
+		<max_time_generation>0.359</max_time_generation>
+		<entry_nb_visits>2</entry_nb_visits>
+		<entry_nb_actions>2</entry_nb_actions>
+		<entry_sum_visit_length>0</entry_sum_visit_length>
+		<entry_bounce_count>2</entry_bounce_count>
+		<exit_nb_visits>3</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>100%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0.359</avg_time_generation>
+		<subtable>
+			<row>
+				<label> URL = http://piwik.net/hello/world/6,681965</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+			</row>
+			<row>
+				<label> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label>
+				<nb_visits>1</nb_visits>
+				<nb_hits>1</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+				<min_time_generation />
+				<max_time_generation />
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0</avg_time_generation>
+			</row>
+		</subtable>
+	</row>
+	<row>
 		<label> Log Analytics - Analytics - Piwik</label>
 		<nb_visits>2</nb_visits>
 		<nb_hits>2</nb_hits>
@@ -43,66 +142,66 @@
 		<avg_time_generation>0.145</avg_time_generation>
 	</row>
 	<row>
-		<label>307</label>
+		<label>302</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
-		<sum_time_spent>0</sum_time_spent>
+		<sum_time_spent>240</sum_time_spent>
 		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 		<min_time_generation />
 		<max_time_generation>0</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>2</entry_nb_actions>
+		<entry_sum_visit_length>242</entry_sum_visit_length>
+		<entry_bounce_count>0</entry_bounce_count>
 		<exit_nb_visits>1</exit_nb_visits>
-		<avg_time_on_page>0</avg_time_on_page>
+		<avg_time_on_page>240</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
-				<label> URL = http://piwik.net/temp-redirect</label>
+				<label> URL = http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
-				<sum_time_spent>0</sum_time_spent>
+				<sum_time_spent>240</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>2</entry_nb_actions>
+				<entry_sum_visit_length>242</entry_sum_visit_length>
+				<entry_bounce_count>0</entry_bounce_count>
 				<exit_nb_visits>1</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
 				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
-				<avg_time_on_page>0</avg_time_on_page>
+				<avg_time_on_page>240</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>100%</exit_rate>
 			</row>
 		</subtable>
 	</row>
 	<row>
-		<label>404</label>
+		<label>307</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
 		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 		<min_time_generation />
 		<max_time_generation>0</max_time_generation>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
 		<exit_nb_visits>1</exit_nb_visits>
 		<avg_time_on_page>0</avg_time_on_page>
-		<bounce_rate>100%</bounce_rate>
+		<bounce_rate>0%</bounce_rate>
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
-				<label> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label>
+				<label> URL = http://piwik.net/temp-redirect</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
-				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
 				<exit_nb_visits>1</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
 				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<avg_time_on_page>0</avg_time_on_page>
-				<bounce_rate>100%</bounce_rate>
+				<bounce_rate>0%</bounce_rate>
 				<exit_rate>100%</exit_rate>
 			</row>
 		</subtable>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
index 28acca1242..2a26e63c8d 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
@@ -5,6 +5,9 @@
 		<nb_visits>5</nb_visits>
 		<nb_hits>5</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>5</entry_nb_visits>
 		<entry_nb_actions>5</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -13,6 +16,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label>category</label>
@@ -171,6 +175,9 @@
 		<nb_visits>4</nb_visits>
 		<nb_hits>4</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>4</entry_nb_visits>
 		<entry_nb_actions>4</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -179,6 +186,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label>manage-websites</label>
@@ -273,6 +281,9 @@
 		<nb_visits>4</nb_visits>
 		<nb_hits>4</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>4</entry_nb_visits>
 		<entry_nb_actions>4</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -281,6 +292,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label>/index</label>
@@ -371,28 +383,299 @@
 		</subtable>
 	</row>
 	<row>
+		<label>hello</label>
+		<nb_visits>4</nb_visits>
+		<nb_hits>4</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>4</nb_hits_with_time_generation>
+		<min_time_generation>0.359</min_time_generation>
+		<max_time_generation>0.359</max_time_generation>
+		<entry_nb_visits>3</entry_nb_visits>
+		<entry_nb_actions>4</entry_nb_actions>
+		<entry_sum_visit_length>2</entry_sum_visit_length>
+		<entry_bounce_count>2</entry_bounce_count>
+		<exit_nb_visits>3</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>67%</bounce_rate>
+		<exit_rate>75%</exit_rate>
+		<avg_time_generation>0.359</avg_time_generation>
+		<subtable>
+			<row>
+				<label>from</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>2</entry_nb_visits>
+				<entry_nb_actions>3</entry_nb_actions>
+				<entry_sum_visit_length>2</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>50%</bounce_rate>
+				<exit_rate>50%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+				<subtable>
+					<row>
+						<label>another</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+						<min_time_generation>0.359</min_time_generation>
+						<max_time_generation>0.359</max_time_generation>
+						<entry_nb_visits>2</entry_nb_visits>
+						<entry_nb_actions>3</entry_nb_actions>
+						<entry_sum_visit_length>2</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>1</exit_nb_visits>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>50%</bounce_rate>
+						<exit_rate>50%</exit_rate>
+						<avg_time_generation>0.359</avg_time_generation>
+						<subtable>
+							<row>
+								<label>world</label>
+								<nb_visits>2</nb_visits>
+								<nb_hits>2</nb_hits>
+								<sum_time_spent>0</sum_time_spent>
+								<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+								<min_time_generation>0.359</min_time_generation>
+								<max_time_generation>0.359</max_time_generation>
+								<entry_nb_visits>2</entry_nb_visits>
+								<entry_nb_actions>3</entry_nb_actions>
+								<entry_sum_visit_length>2</entry_sum_visit_length>
+								<entry_bounce_count>1</entry_bounce_count>
+								<exit_nb_visits>1</exit_nb_visits>
+								<avg_time_on_page>0</avg_time_on_page>
+								<bounce_rate>50%</bounce_rate>
+								<exit_rate>50%</exit_rate>
+								<avg_time_generation>0.359</avg_time_generation>
+								<subtable>
+									<row>
+										<label>/6,681965</label>
+										<nb_visits>2</nb_visits>
+										<nb_hits>2</nb_hits>
+										<sum_time_spent>0</sum_time_spent>
+										<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+										<min_time_generation>0.359</min_time_generation>
+										<max_time_generation>0.359</max_time_generation>
+										<entry_nb_visits>2</entry_nb_visits>
+										<entry_nb_actions>3</entry_nb_actions>
+										<entry_sum_visit_length>2</entry_sum_visit_length>
+										<entry_bounce_count>1</entry_bounce_count>
+										<exit_nb_visits>1</exit_nb_visits>
+										<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+										<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+										<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+										<avg_time_on_page>0</avg_time_on_page>
+										<bounce_rate>50%</bounce_rate>
+										<exit_rate>50%</exit_rate>
+										<avg_time_generation>0.359</avg_time_generation>
+										<url>http://piwik.net/hello/from/another/world/6,681965</url>
+									</row>
+								</subtable>
+							</row>
+						</subtable>
+					</row>
+				</subtable>
+			</row>
+			<row>
+				<label>world</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+				<subtable>
+					<row>
+						<label>/6,681965</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+						<min_time_generation>0.359</min_time_generation>
+						<max_time_generation>0.359</max_time_generation>
+						<entry_nb_visits>1</entry_nb_visits>
+						<entry_nb_actions>1</entry_nb_actions>
+						<entry_sum_visit_length>0</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>2</exit_nb_visits>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+						<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>100%</bounce_rate>
+						<exit_rate>100%</exit_rate>
+						<avg_time_generation>0.359</avg_time_generation>
+						<url>http://piwik.net/hello/world/6,681965</url>
+					</row>
+				</subtable>
+			</row>
+		</subtable>
+	</row>
+	<row>
 		<label>/index</label>
-		<nb_visits>2</nb_visits>
-		<nb_hits>2</nb_hits>
+		<nb_visits>3</nb_visits>
+		<nb_hits>3</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>2</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
+		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+		<min_time_generation>0.001</min_time_generation>
+		<max_time_generation>0.001</max_time_generation>
+		<entry_nb_visits>3</entry_nb_visits>
+		<entry_nb_actions>3</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>2</entry_bounce_count>
-		<exit_nb_visits>2</exit_nb_visits>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
+		<entry_bounce_count>3</entry_bounce_count>
+		<exit_nb_visits>3</exit_nb_visits>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+		<sum_daily_entry_nb_uniq_visitors>3</sum_daily_entry_nb_uniq_visitors>
+		<sum_daily_exit_nb_uniq_visitors>3</sum_daily_exit_nb_uniq_visitors>
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0.001</avg_time_generation>
 		<url>http://piwik.net/</url>
+		<segment>exitPageUrl==http%3A%2F%2Fpiwik.net%2F</segment>
+	</row>
+	<row>
+		<label>Citrix</label>
+		<nb_visits>2</nb_visits>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>240</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>2</entry_nb_actions>
+		<entry_sum_visit_length>242</entry_sum_visit_length>
+		<entry_bounce_count>0</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>120</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>50%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
+		<subtable>
+			<row>
+				<label>XenApp</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>240</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>2</entry_nb_actions>
+				<entry_sum_visit_length>242</entry_sum_visit_length>
+				<entry_bounce_count>0</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>120</avg_time_on_page>
+				<bounce_rate>0%</bounce_rate>
+				<exit_rate>50%</exit_rate>
+				<subtable>
+					<row>
+						<label>Wan</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>240</sum_time_spent>
+						<entry_nb_visits>1</entry_nb_visits>
+						<entry_nb_actions>2</entry_nb_actions>
+						<entry_sum_visit_length>242</entry_sum_visit_length>
+						<entry_bounce_count>0</entry_bounce_count>
+						<exit_nb_visits>1</exit_nb_visits>
+						<avg_time_on_page>120</avg_time_on_page>
+						<bounce_rate>0%</bounce_rate>
+						<exit_rate>50%</exit_rate>
+						<subtable>
+							<row>
+								<label>auth</label>
+								<nb_visits>2</nb_visits>
+								<nb_hits>2</nb_hits>
+								<sum_time_spent>240</sum_time_spent>
+								<entry_nb_visits>1</entry_nb_visits>
+								<entry_nb_actions>2</entry_nb_actions>
+								<entry_sum_visit_length>242</entry_sum_visit_length>
+								<entry_bounce_count>0</entry_bounce_count>
+								<exit_nb_visits>1</exit_nb_visits>
+								<avg_time_on_page>120</avg_time_on_page>
+								<bounce_rate>0%</bounce_rate>
+								<exit_rate>50%</exit_rate>
+								<subtable>
+									<row>
+										<label>/silentDetection.jsp</label>
+										<nb_visits>1</nb_visits>
+										<nb_hits>1</nb_hits>
+										<sum_time_spent>0</sum_time_spent>
+										<exit_nb_visits>1</exit_nb_visits>
+										<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+										<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+										<avg_time_on_page>0</avg_time_on_page>
+										<bounce_rate>0%</bounce_rate>
+										<exit_rate>100%</exit_rate>
+										<url>http://piwik.net/Citrix/XenApp/Wan/auth/silentDetection.jsp</url>
+									</row>
+								</subtable>
+							</row>
+						</subtable>
+					</row>
+				</subtable>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Topic</label>
+		<nb_visits>2</nb_visits>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>1</entry_nb_actions>
+		<entry_sum_visit_length>0</entry_sum_visit_length>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>100%</bounce_rate>
+		<exit_rate>50%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
+		<subtable>
+			<row>
+				<label>/hw43061</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>50%</exit_rate>
+				<url>http://piwik.net/Topic/hw43061</url>
+			</row>
+		</subtable>
 	</row>
 	<row>
 		<label>/index.htm</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation />
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -404,13 +687,18 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<url>http://example.org/index.htm</url>
+		<segment>exitPageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 	</row>
 	<row>
 		<label>/register.php?0,approve=9a94a02145599</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation />
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -422,26 +710,36 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url>
+		<segment>exitPageUrl==http%3A%2F%2Fforum.piwik.org%2Fregister.php%3F0%2Capprove%3D9a94a02145599</segment>
 	</row>
 	<row>
 		<label>/temp-redirect</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation />
 		<exit_nb_visits>1</exit_nb_visits>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<url>http://piwik.net/temp-redirect</url>
+		<segment>exitPageUrl==http%3A%2F%2Fpiwik.net%2Ftemp-redirect</segment>
 	</row>
 	<row>
 		<label>/to-an-error</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation />
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -453,13 +751,18 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<url>http://piwik.net/to-an-error</url>
+		<segment>exitPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment>
 	</row>
 	<row>
 		<label>download</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -468,6 +771,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label>counter</label>
@@ -510,6 +814,9 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -518,6 +825,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label>/index</label>
@@ -544,6 +852,9 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -552,6 +863,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label>/index</label>
@@ -578,6 +890,9 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -586,6 +901,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label>/index</label>
@@ -608,10 +924,55 @@
 		</subtable>
 	</row>
 	<row>
+		<label>Products</label>
+		<nb_visits>1</nb_visits>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+		<min_time_generation>0.109</min_time_generation>
+		<max_time_generation>0.109</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>3</entry_nb_actions>
+		<entry_sum_visit_length>2</entry_sum_visit_length>
+		<entry_bounce_count>0</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0.109</avg_time_generation>
+		<subtable>
+			<row>
+				<label>/theProduct</label>
+				<nb_visits>1</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+				<min_time_generation>0.109</min_time_generation>
+				<max_time_generation>0.109</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>3</entry_nb_actions>
+				<entry_sum_visit_length>2</entry_sum_visit_length>
+				<entry_bounce_count>0</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>0%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.109</avg_time_generation>
+				<url>http://piwik.net/Products/theProduct</url>
+			</row>
+		</subtable>
+	</row>
+	<row>
 		<label>this</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -620,6 +981,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label>is</label>
@@ -774,6 +1136,9 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -782,6 +1147,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label>/index</label>
@@ -803,4 +1169,66 @@
 			</row>
 		</subtable>
 	</row>
+	<row>
+		<label>view</label>
+		<nb_visits>1</nb_visits>
+		<nb_hits>1</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+		<min_time_generation>0.001</min_time_generation>
+		<max_time_generation>0.001</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>1</entry_nb_actions>
+		<entry_sum_visit_length>0</entry_sum_visit_length>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>100%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0.001</avg_time_generation>
+		<subtable>
+			<row>
+				<label>my</label>
+				<nb_visits>1</nb_visits>
+				<nb_hits>1</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+				<min_time_generation>0.001</min_time_generation>
+				<max_time_generation>0.001</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.001</avg_time_generation>
+				<subtable>
+					<row>
+						<label>/file.html</label>
+						<nb_visits>1</nb_visits>
+						<nb_hits>1</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+						<min_time_generation>0.001</min_time_generation>
+						<max_time_generation>0.001</max_time_generation>
+						<entry_nb_visits>1</entry_nb_visits>
+						<entry_nb_actions>1</entry_nb_actions>
+						<entry_sum_visit_length>0</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>1</exit_nb_visits>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+						<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>100%</bounce_rate>
+						<exit_rate>100%</exit_rate>
+						<avg_time_generation>0.001</avg_time_generation>
+						<url>http://piwik.net/view/my/file.html</url>
+					</row>
+				</subtable>
+			</row>
+		</subtable>
+	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
index 7721a10da1..ac8f0a9482 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
@@ -4,7 +4,7 @@
 		<label>blog</label>
 		<nb_visits>9</nb_visits>
 		<nb_hits>12</nb_hits>
-		<sum_time_spent>170</sum_time_spent>
+		<sum_time_spent>166</sum_time_spent>
 		<nb_hits_with_time_generation>7</nb_hits_with_time_generation>
 		<min_time_generation>0.023</min_time_generation>
 		<max_time_generation>1.324</max_time_generation>
@@ -13,7 +13,7 @@
 		<entry_sum_visit_length>54</entry_sum_visit_length>
 		<entry_bounce_count>7</entry_bounce_count>
 		<exit_nb_visits>7</exit_nb_visits>
-		<avg_time_on_page>19</avg_time_on_page>
+		<avg_time_on_page>18</avg_time_on_page>
 		<bounce_rate>88%</bounce_rate>
 		<exit_rate>78%</exit_rate>
 		<avg_time_generation>0.389</avg_time_generation>
@@ -22,7 +22,7 @@
 				<label>category</label>
 				<nb_visits>6</nb_visits>
 				<nb_hits>9</nb_hits>
-				<sum_time_spent>170</sum_time_spent>
+				<sum_time_spent>166</sum_time_spent>
 				<nb_hits_with_time_generation>5</nb_hits_with_time_generation>
 				<min_time_generation>0.023</min_time_generation>
 				<max_time_generation>1.324</max_time_generation>
@@ -40,7 +40,7 @@
 						<label>meta</label>
 						<nb_visits>4</nb_visits>
 						<nb_hits>6</nb_hits>
-						<sum_time_spent>156</sum_time_spent>
+						<sum_time_spent>151</sum_time_spent>
 						<nb_hits_with_time_generation>3</nb_hits_with_time_generation>
 						<min_time_generation>0.023</min_time_generation>
 						<max_time_generation>0.123</max_time_generation>
@@ -49,7 +49,7 @@
 						<entry_sum_visit_length>54</entry_sum_visit_length>
 						<entry_bounce_count>3</entry_bounce_count>
 						<exit_nb_visits>3</exit_nb_visits>
-						<avg_time_on_page>39</avg_time_on_page>
+						<avg_time_on_page>38</avg_time_on_page>
 						<bounce_rate>75%</bounce_rate>
 						<exit_rate>75%</exit_rate>
 						<avg_time_generation>0.089</avg_time_generation>
@@ -58,7 +58,7 @@
 								<label>/index</label>
 								<nb_visits>4</nb_visits>
 								<nb_hits>6</nb_hits>
-								<sum_time_spent>156</sum_time_spent>
+								<sum_time_spent>151</sum_time_spent>
 								<nb_hits_with_time_generation>3</nb_hits_with_time_generation>
 								<min_time_generation>0.023</min_time_generation>
 								<max_time_generation>0.123</max_time_generation>
@@ -70,7 +70,7 @@
 								<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 								<sum_daily_entry_nb_uniq_visitors>4</sum_daily_entry_nb_uniq_visitors>
 								<sum_daily_exit_nb_uniq_visitors>3</sum_daily_exit_nb_uniq_visitors>
-								<avg_time_on_page>39</avg_time_on_page>
+								<avg_time_on_page>38</avg_time_on_page>
 								<bounce_rate>75%</bounce_rate>
 								<exit_rate>75%</exit_rate>
 								<avg_time_generation>0.089</avg_time_generation>
@@ -82,7 +82,7 @@
 						<label>community</label>
 						<nb_visits>2</nb_visits>
 						<nb_hits>3</nb_hits>
-						<sum_time_spent>14</sum_time_spent>
+						<sum_time_spent>15</sum_time_spent>
 						<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 						<min_time_generation>0.624</min_time_generation>
 						<max_time_generation>1.324</max_time_generation>
@@ -91,7 +91,7 @@
 						<entry_sum_visit_length>0</entry_sum_visit_length>
 						<entry_bounce_count>1</entry_bounce_count>
 						<exit_nb_visits>1</exit_nb_visits>
-						<avg_time_on_page>7</avg_time_on_page>
+						<avg_time_on_page>8</avg_time_on_page>
 						<bounce_rate>100%</bounce_rate>
 						<exit_rate>50%</exit_rate>
 						<avg_time_generation>0.974</avg_time_generation>
@@ -100,7 +100,7 @@
 								<label>/index</label>
 								<nb_visits>2</nb_visits>
 								<nb_hits>3</nb_hits>
-								<sum_time_spent>14</sum_time_spent>
+								<sum_time_spent>15</sum_time_spent>
 								<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 								<min_time_generation>0.624</min_time_generation>
 								<max_time_generation>1.324</max_time_generation>
@@ -112,7 +112,7 @@
 								<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 								<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
 								<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
-								<avg_time_on_page>7</avg_time_on_page>
+								<avg_time_on_page>8</avg_time_on_page>
 								<bounce_rate>100%</bounce_rate>
 								<exit_rate>50%</exit_rate>
 								<avg_time_generation>0.974</avg_time_generation>
@@ -344,25 +344,26 @@
 	</row>
 	<row>
 		<label>/index</label>
-		<nb_visits>6</nb_visits>
-		<nb_hits>6</nb_hits>
+		<nb_visits>7</nb_visits>
+		<nb_hits>7</nb_hits>
 		<sum_time_spent>34</sum_time_spent>
-		<nb_hits_with_time_generation>3</nb_hits_with_time_generation>
-		<min_time_generation>0.058</min_time_generation>
+		<nb_hits_with_time_generation>4</nb_hits_with_time_generation>
+		<min_time_generation>0.001</min_time_generation>
 		<max_time_generation>0.292</max_time_generation>
-		<entry_nb_visits>6</entry_nb_visits>
-		<entry_nb_actions>9</entry_nb_actions>
+		<entry_nb_visits>7</entry_nb_visits>
+		<entry_nb_actions>10</entry_nb_actions>
 		<entry_sum_visit_length>44</entry_sum_visit_length>
-		<entry_bounce_count>4</entry_bounce_count>
-		<exit_nb_visits>4</exit_nb_visits>
-		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>6</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors>
-		<avg_time_on_page>6</avg_time_on_page>
-		<bounce_rate>67%</bounce_rate>
-		<exit_rate>67%</exit_rate>
-		<avg_time_generation>0.177</avg_time_generation>
+		<entry_bounce_count>5</entry_bounce_count>
+		<exit_nb_visits>5</exit_nb_visits>
+		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
+		<sum_daily_entry_nb_uniq_visitors>7</sum_daily_entry_nb_uniq_visitors>
+		<sum_daily_exit_nb_uniq_visitors>5</sum_daily_exit_nb_uniq_visitors>
+		<avg_time_on_page>5</avg_time_on_page>
+		<bounce_rate>71%</bounce_rate>
+		<exit_rate>71%</exit_rate>
+		<avg_time_generation>0.133</avg_time_generation>
 		<url>http://piwik.net/</url>
+		<segment>exitPageUrl==http%3A%2F%2Fpiwik.net%2F</segment>
 	</row>
 	<row>
 		<label>docs</label>
@@ -647,6 +648,231 @@
 		</subtable>
 	</row>
 	<row>
+		<label>hello</label>
+		<nb_visits>4</nb_visits>
+		<nb_hits>4</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>4</nb_hits_with_time_generation>
+		<min_time_generation>0.359</min_time_generation>
+		<max_time_generation>0.359</max_time_generation>
+		<entry_nb_visits>3</entry_nb_visits>
+		<entry_nb_actions>4</entry_nb_actions>
+		<entry_sum_visit_length>2</entry_sum_visit_length>
+		<entry_bounce_count>2</entry_bounce_count>
+		<exit_nb_visits>3</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>67%</bounce_rate>
+		<exit_rate>75%</exit_rate>
+		<avg_time_generation>0.359</avg_time_generation>
+		<subtable>
+			<row>
+				<label>from</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>2</entry_nb_visits>
+				<entry_nb_actions>3</entry_nb_actions>
+				<entry_sum_visit_length>2</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>50%</bounce_rate>
+				<exit_rate>50%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+				<subtable>
+					<row>
+						<label>another</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+						<min_time_generation>0.359</min_time_generation>
+						<max_time_generation>0.359</max_time_generation>
+						<entry_nb_visits>2</entry_nb_visits>
+						<entry_nb_actions>3</entry_nb_actions>
+						<entry_sum_visit_length>2</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>1</exit_nb_visits>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>50%</bounce_rate>
+						<exit_rate>50%</exit_rate>
+						<avg_time_generation>0.359</avg_time_generation>
+						<subtable>
+							<row>
+								<label>world</label>
+								<nb_visits>2</nb_visits>
+								<nb_hits>2</nb_hits>
+								<sum_time_spent>0</sum_time_spent>
+								<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+								<min_time_generation>0.359</min_time_generation>
+								<max_time_generation>0.359</max_time_generation>
+								<entry_nb_visits>2</entry_nb_visits>
+								<entry_nb_actions>3</entry_nb_actions>
+								<entry_sum_visit_length>2</entry_sum_visit_length>
+								<entry_bounce_count>1</entry_bounce_count>
+								<exit_nb_visits>1</exit_nb_visits>
+								<avg_time_on_page>0</avg_time_on_page>
+								<bounce_rate>50%</bounce_rate>
+								<exit_rate>50%</exit_rate>
+								<avg_time_generation>0.359</avg_time_generation>
+								<subtable>
+									<row>
+										<label>/6,681965</label>
+										<nb_visits>2</nb_visits>
+										<nb_hits>2</nb_hits>
+										<sum_time_spent>0</sum_time_spent>
+										<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+										<min_time_generation>0.359</min_time_generation>
+										<max_time_generation>0.359</max_time_generation>
+										<entry_nb_visits>2</entry_nb_visits>
+										<entry_nb_actions>3</entry_nb_actions>
+										<entry_sum_visit_length>2</entry_sum_visit_length>
+										<entry_bounce_count>1</entry_bounce_count>
+										<exit_nb_visits>1</exit_nb_visits>
+										<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+										<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+										<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+										<avg_time_on_page>0</avg_time_on_page>
+										<bounce_rate>50%</bounce_rate>
+										<exit_rate>50%</exit_rate>
+										<avg_time_generation>0.359</avg_time_generation>
+										<url>http://piwik.net/hello/from/another/world/6,681965</url>
+									</row>
+								</subtable>
+							</row>
+						</subtable>
+					</row>
+				</subtable>
+			</row>
+			<row>
+				<label>world</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+				<subtable>
+					<row>
+						<label>/6,681965</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+						<min_time_generation>0.359</min_time_generation>
+						<max_time_generation>0.359</max_time_generation>
+						<entry_nb_visits>1</entry_nb_visits>
+						<entry_nb_actions>1</entry_nb_actions>
+						<entry_sum_visit_length>0</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>2</exit_nb_visits>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+						<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>100%</bounce_rate>
+						<exit_rate>100%</exit_rate>
+						<avg_time_generation>0.359</avg_time_generation>
+						<url>http://piwik.net/hello/world/6,681965</url>
+					</row>
+				</subtable>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Citrix</label>
+		<nb_visits>2</nb_visits>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>240</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>2</entry_nb_actions>
+		<entry_sum_visit_length>242</entry_sum_visit_length>
+		<entry_bounce_count>0</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>120</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>50%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
+		<subtable>
+			<row>
+				<label>XenApp</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>240</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>2</entry_nb_actions>
+				<entry_sum_visit_length>242</entry_sum_visit_length>
+				<entry_bounce_count>0</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>120</avg_time_on_page>
+				<bounce_rate>0%</bounce_rate>
+				<exit_rate>50%</exit_rate>
+				<subtable>
+					<row>
+						<label>Wan</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>240</sum_time_spent>
+						<entry_nb_visits>1</entry_nb_visits>
+						<entry_nb_actions>2</entry_nb_actions>
+						<entry_sum_visit_length>242</entry_sum_visit_length>
+						<entry_bounce_count>0</entry_bounce_count>
+						<exit_nb_visits>1</exit_nb_visits>
+						<avg_time_on_page>120</avg_time_on_page>
+						<bounce_rate>0%</bounce_rate>
+						<exit_rate>50%</exit_rate>
+						<subtable>
+							<row>
+								<label>auth</label>
+								<nb_visits>2</nb_visits>
+								<nb_hits>2</nb_hits>
+								<sum_time_spent>240</sum_time_spent>
+								<entry_nb_visits>1</entry_nb_visits>
+								<entry_nb_actions>2</entry_nb_actions>
+								<entry_sum_visit_length>242</entry_sum_visit_length>
+								<entry_bounce_count>0</entry_bounce_count>
+								<exit_nb_visits>1</exit_nb_visits>
+								<avg_time_on_page>120</avg_time_on_page>
+								<bounce_rate>0%</bounce_rate>
+								<exit_rate>50%</exit_rate>
+								<subtable>
+									<row>
+										<label>/silentDetection.jsp</label>
+										<nb_visits>1</nb_visits>
+										<nb_hits>1</nb_hits>
+										<sum_time_spent>0</sum_time_spent>
+										<exit_nb_visits>1</exit_nb_visits>
+										<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+										<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+										<avg_time_on_page>0</avg_time_on_page>
+										<bounce_rate>0%</bounce_rate>
+										<exit_rate>100%</exit_rate>
+										<url>http://piwik.net/Citrix/XenApp/Wan/auth/silentDetection.jsp</url>
+									</row>
+								</subtable>
+							</row>
+						</subtable>
+					</row>
+				</subtable>
+			</row>
+		</subtable>
+	</row>
+	<row>
 		<label>download</label>
 		<nb_visits>2</nb_visits>
 		<nb_hits>2</nb_hits>
@@ -743,6 +969,44 @@
 		</subtable>
 	</row>
 	<row>
+		<label>Topic</label>
+		<nb_visits>2</nb_visits>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>1</entry_nb_actions>
+		<entry_sum_visit_length>0</entry_sum_visit_length>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>100%</bounce_rate>
+		<exit_rate>50%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
+		<subtable>
+			<row>
+				<label>/hw43061</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>50%</exit_rate>
+				<url>http://piwik.net/Topic/hw43061</url>
+			</row>
+		</subtable>
+	</row>
+	<row>
 		<label>/index.htm</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
@@ -763,6 +1027,7 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0</avg_time_generation>
 		<url>http://example.org/index.htm</url>
+		<segment>exitPageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 	</row>
 	<row>
 		<label>/index.php?module=CoreHome&amp;action=index&amp;date=yesterday&amp;period=day&amp;idSite=7</label>
@@ -785,6 +1050,7 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0.413</avg_time_generation>
 		<url>http://demo.piwik.org/index.php?module=CoreHome&amp;action=index&amp;date=yesterday&amp;period=day&amp;idSite=7</url>
+		<segment>exitPageUrl==http%3A%2F%2Fdemo.piwik.org%2Findex.php%3Fmodule%3DCoreHome%26action%3Dindex%26date%3Dyesterday%26period%3Dday%26idSite%3D7</segment>
 	</row>
 	<row>
 		<label>/register.php?0,approve=9a94a02145599</label>
@@ -807,6 +1073,7 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0</avg_time_generation>
 		<url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url>
+		<segment>exitPageUrl==http%3A%2F%2Fforum.piwik.org%2Fregister.php%3F0%2Capprove%3D9a94a02145599</segment>
 	</row>
 	<row>
 		<label>/temp-redirect</label>
@@ -824,6 +1091,7 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0</avg_time_generation>
 		<url>http://piwik.net/temp-redirect</url>
+		<segment>exitPageUrl==http%3A%2F%2Fpiwik.net%2Ftemp-redirect</segment>
 	</row>
 	<row>
 		<label>/to-an-error</label>
@@ -846,6 +1114,7 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0</avg_time_generation>
 		<url>http://piwik.net/to-an-error</url>
+		<segment>exitPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment>
 	</row>
 	<row>
 		<label>contact</label>
@@ -991,6 +1260,48 @@
 		</subtable>
 	</row>
 	<row>
+		<label>Products</label>
+		<nb_visits>1</nb_visits>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+		<min_time_generation>0.109</min_time_generation>
+		<max_time_generation>0.109</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>3</entry_nb_actions>
+		<entry_sum_visit_length>2</entry_sum_visit_length>
+		<entry_bounce_count>0</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0.109</avg_time_generation>
+		<subtable>
+			<row>
+				<label>/theProduct</label>
+				<nb_visits>1</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+				<min_time_generation>0.109</min_time_generation>
+				<max_time_generation>0.109</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>3</entry_nb_actions>
+				<entry_sum_visit_length>2</entry_sum_visit_length>
+				<entry_bounce_count>0</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>0%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.109</avg_time_generation>
+				<url>http://piwik.net/Products/theProduct</url>
+			</row>
+		</subtable>
+	</row>
+	<row>
 		<label>this</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
@@ -1195,6 +1506,68 @@
 		</subtable>
 	</row>
 	<row>
+		<label>view</label>
+		<nb_visits>1</nb_visits>
+		<nb_hits>1</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+		<min_time_generation>0.001</min_time_generation>
+		<max_time_generation>0.001</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>1</entry_nb_actions>
+		<entry_sum_visit_length>0</entry_sum_visit_length>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>100%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0.001</avg_time_generation>
+		<subtable>
+			<row>
+				<label>my</label>
+				<nb_visits>1</nb_visits>
+				<nb_hits>1</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+				<min_time_generation>0.001</min_time_generation>
+				<max_time_generation>0.001</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.001</avg_time_generation>
+				<subtable>
+					<row>
+						<label>/file.html</label>
+						<nb_visits>1</nb_visits>
+						<nb_hits>1</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+						<min_time_generation>0.001</min_time_generation>
+						<max_time_generation>0.001</max_time_generation>
+						<entry_nb_visits>1</entry_nb_visits>
+						<entry_nb_actions>1</entry_nb_actions>
+						<entry_sum_visit_length>0</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>1</exit_nb_visits>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+						<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>100%</bounce_rate>
+						<exit_rate>100%</exit_rate>
+						<avg_time_generation>0.001</avg_time_generation>
+						<url>http://piwik.net/view/my/file.html</url>
+					</row>
+				</subtable>
+			</row>
+		</subtable>
+	</row>
+	<row>
 		<label>what-is-piwisk</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml
index 143229b5e7..a15246afad 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml
@@ -2,28 +2,54 @@
 <result>
 	<row>
 		<label>Page Name not defined</label>
-		<nb_visits>20</nb_visits>
-		<nb_hits>20</nb_hits>
+		<nb_visits>26</nb_visits>
+		<nb_hits>27</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors>
+		<nb_hits_with_time_generation>6</nb_hits_with_time_generation>
+		<min_time_generation>0.001</min_time_generation>
+		<max_time_generation>0.359</max_time_generation>
+		<sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors>
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
+		<avg_time_generation>0.156</avg_time_generation>
 	</row>
 	<row>
 		<label>301</label>
-		<nb_visits>1</nb_visits>
-		<nb_hits>1</nb_hits>
+		<nb_visits>3</nb_visits>
+		<nb_hits>3</nb_hits>
 		<sum_time_spent>180</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
+		<entry_nb_visits>2</entry_nb_visits>
+		<entry_nb_actions>3</entry_nb_actions>
 		<entry_sum_visit_length>182</entry_sum_visit_length>
-		<entry_bounce_count>0</entry_bounce_count>
-		<avg_time_on_page>180</avg_time_on_page>
-		<bounce_rate>0%</bounce_rate>
-		<exit_rate>0%</exit_rate>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>2</exit_nb_visits>
+		<avg_time_on_page>60</avg_time_on_page>
+		<bounce_rate>50%</bounce_rate>
+		<exit_rate>67%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
+				<label> URL = http://piwik.net/Topic/hw43061</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+			</row>
+			<row>
 				<label> URL = http://piwik.net/moved-permanently</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
@@ -41,58 +67,128 @@
 		</subtable>
 	</row>
 	<row>
-		<label>307</label>
-		<nb_visits>1</nb_visits>
-		<nb_hits>1</nb_hits>
+		<label>404</label>
+		<nb_visits>3</nb_visits>
+		<nb_hits>3</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<exit_nb_visits>1</exit_nb_visits>
+		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+		<min_time_generation>0.359</min_time_generation>
+		<max_time_generation>0.359</max_time_generation>
+		<entry_nb_visits>2</entry_nb_visits>
+		<entry_nb_actions>2</entry_nb_actions>
+		<entry_sum_visit_length>0</entry_sum_visit_length>
+		<entry_bounce_count>2</entry_bounce_count>
+		<exit_nb_visits>3</exit_nb_visits>
 		<avg_time_on_page>0</avg_time_on_page>
-		<bounce_rate>0%</bounce_rate>
+		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0.359</avg_time_generation>
 		<subtable>
 			<row>
-				<label> URL = http://piwik.net/temp-redirect</label>
+				<label> URL = http://piwik.net/hello/world/6,681965</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+			</row>
+			<row>
+				<label> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+				<min_time_generation />
+				<max_time_generation />
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
 				<exit_nb_visits>1</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
 				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0</avg_time_generation>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>302</label>
+		<nb_visits>1</nb_visits>
+		<nb_hits>1</nb_hits>
+		<sum_time_spent>240</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>2</entry_nb_actions>
+		<entry_sum_visit_length>242</entry_sum_visit_length>
+		<entry_bounce_count>0</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>240</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
+		<subtable>
+			<row>
+				<label> URL = http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</label>
+				<nb_visits>1</nb_visits>
+				<nb_hits>1</nb_hits>
+				<sum_time_spent>240</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>2</entry_nb_actions>
+				<entry_sum_visit_length>242</entry_sum_visit_length>
+				<entry_bounce_count>0</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>240</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>100%</exit_rate>
 			</row>
 		</subtable>
 	</row>
 	<row>
-		<label>404</label>
+		<label>307</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<exit_nb_visits>1</exit_nb_visits>
 		<avg_time_on_page>0</avg_time_on_page>
-		<bounce_rate>100%</bounce_rate>
+		<bounce_rate>0%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
-				<label> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label>
+				<label> URL = http://piwik.net/temp-redirect</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
-				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
 				<exit_nb_visits>1</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
 				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<avg_time_on_page>0</avg_time_on_page>
-				<bounce_rate>100%</bounce_rate>
+				<bounce_rate>0%</bounce_rate>
 				<exit_rate>100%</exit_rate>
 			</row>
 		</subtable>
@@ -102,6 +198,9 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -110,6 +209,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label> URL = http://piwik.net/to-an-error</label>
@@ -135,6 +235,9 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation />
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -146,12 +249,16 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 	</row>
 	<row>
 		<label> Piwik Forums</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation />
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -163,5 +270,6 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml
index 509723308f..4eaa547bf9 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml
@@ -2,17 +2,17 @@
 <result>
 	<row>
 		<label>Page Name not defined</label>
-		<nb_visits>21</nb_visits>
-		<nb_hits>30</nb_hits>
+		<nb_visits>27</nb_visits>
+		<nb_hits>37</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<nb_hits_with_time_generation>10</nb_hits_with_time_generation>
-		<min_time_generation>0.023</min_time_generation>
+		<nb_hits_with_time_generation>16</nb_hits_with_time_generation>
+		<min_time_generation>0.001</min_time_generation>
 		<max_time_generation>1.324</max_time_generation>
-		<sum_daily_nb_uniq_visitors>21</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors>
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
-		<avg_time_generation>0.387</avg_time_generation>
+		<avg_time_generation>0.3</avg_time_generation>
 	</row>
 	<row>
 		<label> Liberate Web Analytics - Analytics - Piwik</label>
@@ -36,6 +36,120 @@
 		<avg_time_generation>0.177</avg_time_generation>
 	</row>
 	<row>
+		<label>301</label>
+		<nb_visits>3</nb_visits>
+		<nb_hits>3</nb_hits>
+		<sum_time_spent>180</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
+		<entry_nb_visits>2</entry_nb_visits>
+		<entry_nb_actions>3</entry_nb_actions>
+		<entry_sum_visit_length>182</entry_sum_visit_length>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>2</exit_nb_visits>
+		<avg_time_on_page>60</avg_time_on_page>
+		<bounce_rate>50%</bounce_rate>
+		<exit_rate>67%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
+		<subtable>
+			<row>
+				<label> URL = http://piwik.net/Topic/hw43061</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+			</row>
+			<row>
+				<label> URL = http://piwik.net/moved-permanently</label>
+				<nb_visits>1</nb_visits>
+				<nb_hits>1</nb_hits>
+				<sum_time_spent>180</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>2</entry_nb_actions>
+				<entry_sum_visit_length>182</entry_sum_visit_length>
+				<entry_bounce_count>0</entry_bounce_count>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<avg_time_on_page>180</avg_time_on_page>
+				<bounce_rate>0%</bounce_rate>
+				<exit_rate>0%</exit_rate>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>404</label>
+		<nb_visits>3</nb_visits>
+		<nb_hits>3</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+		<min_time_generation>0.359</min_time_generation>
+		<max_time_generation>0.359</max_time_generation>
+		<entry_nb_visits>2</entry_nb_visits>
+		<entry_nb_actions>2</entry_nb_actions>
+		<entry_sum_visit_length>0</entry_sum_visit_length>
+		<entry_bounce_count>2</entry_bounce_count>
+		<exit_nb_visits>3</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>100%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0.359</avg_time_generation>
+		<subtable>
+			<row>
+				<label> URL = http://piwik.net/hello/world/6,681965</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+			</row>
+			<row>
+				<label> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label>
+				<nb_visits>1</nb_visits>
+				<nb_hits>1</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+				<min_time_generation />
+				<max_time_generation />
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0</avg_time_generation>
+			</row>
+		</subtable>
+	</row>
+	<row>
 		<label> Log Analytics - Analytics - Piwik</label>
 		<nb_visits>2</nb_visits>
 		<nb_hits>2</nb_hits>
@@ -57,36 +171,39 @@
 		<avg_time_generation>0.145</avg_time_generation>
 	</row>
 	<row>
-		<label>301</label>
+		<label>302</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
-		<sum_time_spent>180</sum_time_spent>
+		<sum_time_spent>240</sum_time_spent>
 		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 		<min_time_generation />
 		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>2</entry_nb_actions>
-		<entry_sum_visit_length>182</entry_sum_visit_length>
+		<entry_sum_visit_length>242</entry_sum_visit_length>
 		<entry_bounce_count>0</entry_bounce_count>
-		<avg_time_on_page>180</avg_time_on_page>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>240</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
-		<exit_rate>0%</exit_rate>
+		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
-				<label> URL = http://piwik.net/moved-permanently</label>
+				<label> URL = http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
-				<sum_time_spent>180</sum_time_spent>
+				<sum_time_spent>240</sum_time_spent>
 				<entry_nb_visits>1</entry_nb_visits>
 				<entry_nb_actions>2</entry_nb_actions>
-				<entry_sum_visit_length>182</entry_sum_visit_length>
+				<entry_sum_visit_length>242</entry_sum_visit_length>
 				<entry_bounce_count>0</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-				<avg_time_on_page>180</avg_time_on_page>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>240</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
-				<exit_rate>0%</exit_rate>
+				<exit_rate>100%</exit_rate>
 			</row>
 		</subtable>
 	</row>
@@ -119,43 +236,6 @@
 		</subtable>
 	</row>
 	<row>
-		<label>404</label>
-		<nb_visits>1</nb_visits>
-		<nb_hits>1</nb_hits>
-		<sum_time_spent>0</sum_time_spent>
-		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-		<min_time_generation />
-		<max_time_generation>0</max_time_generation>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
-		<avg_time_on_page>0</avg_time_on_page>
-		<bounce_rate>100%</bounce_rate>
-		<exit_rate>100%</exit_rate>
-		<avg_time_generation>0</avg_time_generation>
-		<subtable>
-			<row>
-				<label> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label>
-				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
-				<sum_time_spent>0</sum_time_spent>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
-				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_visits>1</exit_nb_visits>
-				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
-				<avg_time_on_page>0</avg_time_on_page>
-				<bounce_rate>100%</bounce_rate>
-				<exit_rate>100%</exit_rate>
-			</row>
-		</subtable>
-	</row>
-	<row>
 		<label>500</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_day.xml
index 94423ac9d9..ce5ec3dc77 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_day.xml
@@ -4,7 +4,7 @@
 		<label>blog</label>
 		<nb_visits>2</nb_visits>
 		<nb_hits>5</nb_hits>
-		<sum_time_spent>170</sum_time_spent>
+		<sum_time_spent>166</sum_time_spent>
 		<nb_hits_with_time_generation>5</nb_hits_with_time_generation>
 		<min_time_generation>0.023</min_time_generation>
 		<max_time_generation>1.324</max_time_generation>
@@ -12,7 +12,7 @@
 		<entry_nb_actions>10</entry_nb_actions>
 		<entry_sum_visit_length>54</entry_sum_visit_length>
 		<entry_bounce_count>0</entry_bounce_count>
-		<avg_time_on_page>85</avg_time_on_page>
+		<avg_time_on_page>83</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.443</avg_time_generation>
@@ -21,7 +21,7 @@
 				<label>category</label>
 				<nb_visits>2</nb_visits>
 				<nb_hits>5</nb_hits>
-				<sum_time_spent>170</sum_time_spent>
+				<sum_time_spent>166</sum_time_spent>
 				<nb_hits_with_time_generation>5</nb_hits_with_time_generation>
 				<min_time_generation>0.023</min_time_generation>
 				<max_time_generation>1.324</max_time_generation>
@@ -29,7 +29,7 @@
 				<entry_nb_actions>10</entry_nb_actions>
 				<entry_sum_visit_length>54</entry_sum_visit_length>
 				<entry_bounce_count>0</entry_bounce_count>
-				<avg_time_on_page>85</avg_time_on_page>
+				<avg_time_on_page>83</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 				<avg_time_generation>0.443</avg_time_generation>
@@ -38,11 +38,11 @@
 						<label>community</label>
 						<nb_visits>1</nb_visits>
 						<nb_hits>2</nb_hits>
-						<sum_time_spent>14</sum_time_spent>
+						<sum_time_spent>15</sum_time_spent>
 						<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 						<min_time_generation>0.624</min_time_generation>
 						<max_time_generation>1.324</max_time_generation>
-						<avg_time_on_page>14</avg_time_on_page>
+						<avg_time_on_page>15</avg_time_on_page>
 						<bounce_rate>0%</bounce_rate>
 						<exit_rate>0%</exit_rate>
 						<avg_time_generation>0.974</avg_time_generation>
@@ -52,11 +52,11 @@
 								<nb_visits>1</nb_visits>
 								<nb_uniq_visitors>1</nb_uniq_visitors>
 								<nb_hits>2</nb_hits>
-								<sum_time_spent>14</sum_time_spent>
+								<sum_time_spent>15</sum_time_spent>
 								<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 								<min_time_generation>0.624</min_time_generation>
 								<max_time_generation>1.324</max_time_generation>
-								<avg_time_on_page>14</avg_time_on_page>
+								<avg_time_on_page>15</avg_time_on_page>
 								<bounce_rate>0%</bounce_rate>
 								<exit_rate>0%</exit_rate>
 								<avg_time_generation>0.974</avg_time_generation>
@@ -68,7 +68,7 @@
 						<label>meta</label>
 						<nb_visits>1</nb_visits>
 						<nb_hits>3</nb_hits>
-						<sum_time_spent>156</sum_time_spent>
+						<sum_time_spent>151</sum_time_spent>
 						<nb_hits_with_time_generation>3</nb_hits_with_time_generation>
 						<min_time_generation>0.023</min_time_generation>
 						<max_time_generation>0.123</max_time_generation>
@@ -76,7 +76,7 @@
 						<entry_nb_actions>10</entry_nb_actions>
 						<entry_sum_visit_length>54</entry_sum_visit_length>
 						<entry_bounce_count>0</entry_bounce_count>
-						<avg_time_on_page>156</avg_time_on_page>
+						<avg_time_on_page>151</avg_time_on_page>
 						<bounce_rate>0%</bounce_rate>
 						<exit_rate>0%</exit_rate>
 						<avg_time_generation>0.089</avg_time_generation>
@@ -86,7 +86,7 @@
 								<nb_visits>1</nb_visits>
 								<nb_uniq_visitors>1</nb_uniq_visitors>
 								<nb_hits>3</nb_hits>
-								<sum_time_spent>156</sum_time_spent>
+								<sum_time_spent>151</sum_time_spent>
 								<nb_hits_with_time_generation>3</nb_hits_with_time_generation>
 								<min_time_generation>0.023</min_time_generation>
 								<max_time_generation>0.123</max_time_generation>
@@ -95,7 +95,7 @@
 								<entry_nb_actions>10</entry_nb_actions>
 								<entry_sum_visit_length>54</entry_sum_visit_length>
 								<entry_bounce_count>0</entry_bounce_count>
-								<avg_time_on_page>156</avg_time_on_page>
+								<avg_time_on_page>151</avg_time_on_page>
 								<bounce_rate>0%</bounce_rate>
 								<exit_rate>0%</exit_rate>
 								<avg_time_generation>0.089</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml
index c3f7304c25..47829dd214 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml
@@ -5,6 +5,9 @@
 		<nb_visits>5</nb_visits>
 		<nb_hits>5</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>5</entry_nb_visits>
 		<entry_nb_actions>5</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -13,6 +16,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label>category</label>
@@ -171,6 +175,9 @@
 		<nb_visits>4</nb_visits>
 		<nb_hits>4</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>4</entry_nb_visits>
 		<entry_nb_actions>4</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -179,6 +186,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label>manage-websites</label>
@@ -273,6 +281,9 @@
 		<nb_visits>4</nb_visits>
 		<nb_hits>4</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>4</entry_nb_visits>
 		<entry_nb_actions>4</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -281,6 +292,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label>/index</label>
@@ -371,28 +383,315 @@
 		</subtable>
 	</row>
 	<row>
+		<label>hello</label>
+		<nb_visits>4</nb_visits>
+		<nb_hits>4</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>4</nb_hits_with_time_generation>
+		<min_time_generation>0.359</min_time_generation>
+		<max_time_generation>0.359</max_time_generation>
+		<entry_nb_visits>3</entry_nb_visits>
+		<entry_nb_actions>4</entry_nb_actions>
+		<entry_sum_visit_length>2</entry_sum_visit_length>
+		<entry_bounce_count>2</entry_bounce_count>
+		<exit_nb_visits>3</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>67%</bounce_rate>
+		<exit_rate>75%</exit_rate>
+		<avg_time_generation>0.359</avg_time_generation>
+		<subtable>
+			<row>
+				<label>from</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>2</entry_nb_visits>
+				<entry_nb_actions>3</entry_nb_actions>
+				<entry_sum_visit_length>2</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>50%</bounce_rate>
+				<exit_rate>50%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+				<subtable>
+					<row>
+						<label>another</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+						<min_time_generation>0.359</min_time_generation>
+						<max_time_generation>0.359</max_time_generation>
+						<entry_nb_visits>2</entry_nb_visits>
+						<entry_nb_actions>3</entry_nb_actions>
+						<entry_sum_visit_length>2</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>1</exit_nb_visits>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>50%</bounce_rate>
+						<exit_rate>50%</exit_rate>
+						<avg_time_generation>0.359</avg_time_generation>
+						<subtable>
+							<row>
+								<label>world</label>
+								<nb_visits>2</nb_visits>
+								<nb_hits>2</nb_hits>
+								<sum_time_spent>0</sum_time_spent>
+								<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+								<min_time_generation>0.359</min_time_generation>
+								<max_time_generation>0.359</max_time_generation>
+								<entry_nb_visits>2</entry_nb_visits>
+								<entry_nb_actions>3</entry_nb_actions>
+								<entry_sum_visit_length>2</entry_sum_visit_length>
+								<entry_bounce_count>1</entry_bounce_count>
+								<exit_nb_visits>1</exit_nb_visits>
+								<avg_time_on_page>0</avg_time_on_page>
+								<bounce_rate>50%</bounce_rate>
+								<exit_rate>50%</exit_rate>
+								<avg_time_generation>0.359</avg_time_generation>
+								<subtable>
+									<row>
+										<label>/6,681965</label>
+										<nb_visits>2</nb_visits>
+										<nb_hits>2</nb_hits>
+										<sum_time_spent>0</sum_time_spent>
+										<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+										<min_time_generation>0.359</min_time_generation>
+										<max_time_generation>0.359</max_time_generation>
+										<entry_nb_visits>2</entry_nb_visits>
+										<entry_nb_actions>3</entry_nb_actions>
+										<entry_sum_visit_length>2</entry_sum_visit_length>
+										<entry_bounce_count>1</entry_bounce_count>
+										<exit_nb_visits>1</exit_nb_visits>
+										<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+										<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+										<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+										<avg_time_on_page>0</avg_time_on_page>
+										<bounce_rate>50%</bounce_rate>
+										<exit_rate>50%</exit_rate>
+										<avg_time_generation>0.359</avg_time_generation>
+										<url>http://piwik.net/hello/from/another/world/6,681965</url>
+									</row>
+								</subtable>
+							</row>
+						</subtable>
+					</row>
+				</subtable>
+			</row>
+			<row>
+				<label>world</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+				<subtable>
+					<row>
+						<label>/6,681965</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+						<min_time_generation>0.359</min_time_generation>
+						<max_time_generation>0.359</max_time_generation>
+						<entry_nb_visits>1</entry_nb_visits>
+						<entry_nb_actions>1</entry_nb_actions>
+						<entry_sum_visit_length>0</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>2</exit_nb_visits>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+						<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>100%</bounce_rate>
+						<exit_rate>100%</exit_rate>
+						<avg_time_generation>0.359</avg_time_generation>
+						<url>http://piwik.net/hello/world/6,681965</url>
+					</row>
+				</subtable>
+			</row>
+		</subtable>
+	</row>
+	<row>
 		<label>/index</label>
-		<nb_visits>2</nb_visits>
-		<nb_hits>2</nb_hits>
+		<nb_visits>3</nb_visits>
+		<nb_hits>3</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>2</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
+		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+		<min_time_generation>0.001</min_time_generation>
+		<max_time_generation>0.001</max_time_generation>
+		<entry_nb_visits>3</entry_nb_visits>
+		<entry_nb_actions>3</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>2</entry_bounce_count>
-		<exit_nb_visits>2</exit_nb_visits>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
+		<entry_bounce_count>3</entry_bounce_count>
+		<exit_nb_visits>3</exit_nb_visits>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+		<sum_daily_entry_nb_uniq_visitors>3</sum_daily_entry_nb_uniq_visitors>
+		<sum_daily_exit_nb_uniq_visitors>3</sum_daily_exit_nb_uniq_visitors>
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0.001</avg_time_generation>
 		<url>http://piwik.net/</url>
+		<segment>pageUrl==http%3A%2F%2Fpiwik.net%2F</segment>
+	</row>
+	<row>
+		<label>Citrix</label>
+		<nb_visits>2</nb_visits>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>240</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>2</entry_nb_actions>
+		<entry_sum_visit_length>242</entry_sum_visit_length>
+		<entry_bounce_count>0</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>120</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>50%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
+		<subtable>
+			<row>
+				<label>XenApp</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>240</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>2</entry_nb_actions>
+				<entry_sum_visit_length>242</entry_sum_visit_length>
+				<entry_bounce_count>0</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>120</avg_time_on_page>
+				<bounce_rate>0%</bounce_rate>
+				<exit_rate>50%</exit_rate>
+				<subtable>
+					<row>
+						<label>Wan</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>240</sum_time_spent>
+						<entry_nb_visits>1</entry_nb_visits>
+						<entry_nb_actions>2</entry_nb_actions>
+						<entry_sum_visit_length>242</entry_sum_visit_length>
+						<entry_bounce_count>0</entry_bounce_count>
+						<exit_nb_visits>1</exit_nb_visits>
+						<avg_time_on_page>120</avg_time_on_page>
+						<bounce_rate>0%</bounce_rate>
+						<exit_rate>50%</exit_rate>
+						<subtable>
+							<row>
+								<label>auth</label>
+								<nb_visits>2</nb_visits>
+								<nb_hits>2</nb_hits>
+								<sum_time_spent>240</sum_time_spent>
+								<entry_nb_visits>1</entry_nb_visits>
+								<entry_nb_actions>2</entry_nb_actions>
+								<entry_sum_visit_length>242</entry_sum_visit_length>
+								<entry_bounce_count>0</entry_bounce_count>
+								<exit_nb_visits>1</exit_nb_visits>
+								<avg_time_on_page>120</avg_time_on_page>
+								<bounce_rate>0%</bounce_rate>
+								<exit_rate>50%</exit_rate>
+								<subtable>
+									<row>
+										<label>/login.jsp</label>
+										<nb_visits>1</nb_visits>
+										<nb_hits>1</nb_hits>
+										<sum_time_spent>240</sum_time_spent>
+										<entry_nb_visits>1</entry_nb_visits>
+										<entry_nb_actions>2</entry_nb_actions>
+										<entry_sum_visit_length>242</entry_sum_visit_length>
+										<entry_bounce_count>0</entry_bounce_count>
+										<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+										<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+										<avg_time_on_page>240</avg_time_on_page>
+										<bounce_rate>0%</bounce_rate>
+										<exit_rate>0%</exit_rate>
+										<url>http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</url>
+									</row>
+									<row>
+										<label>/silentDetection.jsp</label>
+										<nb_visits>1</nb_visits>
+										<nb_hits>1</nb_hits>
+										<sum_time_spent>0</sum_time_spent>
+										<exit_nb_visits>1</exit_nb_visits>
+										<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+										<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+										<avg_time_on_page>0</avg_time_on_page>
+										<bounce_rate>0%</bounce_rate>
+										<exit_rate>100%</exit_rate>
+										<url>http://piwik.net/Citrix/XenApp/Wan/auth/silentDetection.jsp</url>
+									</row>
+								</subtable>
+							</row>
+						</subtable>
+					</row>
+				</subtable>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Topic</label>
+		<nb_visits>2</nb_visits>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>1</entry_nb_actions>
+		<entry_sum_visit_length>0</entry_sum_visit_length>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>100%</bounce_rate>
+		<exit_rate>50%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
+		<subtable>
+			<row>
+				<label>/hw43061</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>50%</exit_rate>
+				<url>http://piwik.net/Topic/hw43061</url>
+			</row>
+		</subtable>
 	</row>
 	<row>
 		<label>/index.htm</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation />
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -404,13 +703,18 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<url>http://example.org/index.htm</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 	</row>
 	<row>
 		<label>/moved-permanently</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>180</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation />
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>2</entry_nb_actions>
 		<entry_sum_visit_length>182</entry_sum_visit_length>
@@ -420,13 +724,18 @@
 		<avg_time_on_page>180</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<url>http://piwik.net/moved-permanently</url>
+		<segment>pageUrl==http%3A%2F%2Fpiwik.net%2Fmoved-permanently</segment>
 	</row>
 	<row>
 		<label>/register.php?0,approve=9a94a02145599</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation />
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -438,26 +747,36 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url>
+		<segment>pageUrl==http%3A%2F%2Fforum.piwik.org%2Fregister.php%3F0%2Capprove%3D9a94a02145599</segment>
 	</row>
 	<row>
 		<label>/temp-redirect</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation />
 		<exit_nb_visits>1</exit_nb_visits>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<url>http://piwik.net/temp-redirect</url>
+		<segment>pageUrl==http%3A%2F%2Fpiwik.net%2Ftemp-redirect</segment>
 	</row>
 	<row>
 		<label>/to-an-error</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation />
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -469,13 +788,18 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<url>http://piwik.net/to-an-error</url>
+		<segment>pageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment>
 	</row>
 	<row>
 		<label>download</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -484,6 +808,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label>counter</label>
@@ -526,6 +851,9 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -534,6 +862,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label>/index</label>
@@ -560,6 +889,9 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -568,6 +900,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label>/index</label>
@@ -594,6 +927,9 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -602,6 +938,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label>/index</label>
@@ -624,10 +961,55 @@
 		</subtable>
 	</row>
 	<row>
+		<label>Products</label>
+		<nb_visits>1</nb_visits>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+		<min_time_generation>0.109</min_time_generation>
+		<max_time_generation>0.109</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>3</entry_nb_actions>
+		<entry_sum_visit_length>2</entry_sum_visit_length>
+		<entry_bounce_count>0</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0.109</avg_time_generation>
+		<subtable>
+			<row>
+				<label>/theProduct</label>
+				<nb_visits>1</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+				<min_time_generation>0.109</min_time_generation>
+				<max_time_generation>0.109</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>3</entry_nb_actions>
+				<entry_sum_visit_length>2</entry_sum_visit_length>
+				<entry_bounce_count>0</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>0%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.109</avg_time_generation>
+				<url>http://piwik.net/Products/theProduct</url>
+			</row>
+		</subtable>
+	</row>
+	<row>
 		<label>this</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -636,6 +1018,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label>is</label>
@@ -790,6 +1173,9 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
 		<entry_nb_visits>1</entry_nb_visits>
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -798,6 +1184,7 @@
 		<avg_time_on_page>0</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
 		<subtable>
 			<row>
 				<label>/index</label>
@@ -819,4 +1206,66 @@
 			</row>
 		</subtable>
 	</row>
+	<row>
+		<label>view</label>
+		<nb_visits>1</nb_visits>
+		<nb_hits>1</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+		<min_time_generation>0.001</min_time_generation>
+		<max_time_generation>0.001</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>1</entry_nb_actions>
+		<entry_sum_visit_length>0</entry_sum_visit_length>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>100%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0.001</avg_time_generation>
+		<subtable>
+			<row>
+				<label>my</label>
+				<nb_visits>1</nb_visits>
+				<nb_hits>1</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+				<min_time_generation>0.001</min_time_generation>
+				<max_time_generation>0.001</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.001</avg_time_generation>
+				<subtable>
+					<row>
+						<label>/file.html</label>
+						<nb_visits>1</nb_visits>
+						<nb_hits>1</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+						<min_time_generation>0.001</min_time_generation>
+						<max_time_generation>0.001</max_time_generation>
+						<entry_nb_visits>1</entry_nb_visits>
+						<entry_nb_actions>1</entry_nb_actions>
+						<entry_sum_visit_length>0</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>1</exit_nb_visits>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+						<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>100%</bounce_rate>
+						<exit_rate>100%</exit_rate>
+						<avg_time_generation>0.001</avg_time_generation>
+						<url>http://piwik.net/view/my/file.html</url>
+					</row>
+				</subtable>
+			</row>
+		</subtable>
+	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
index aaabfb8fc3..188824c3b3 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
@@ -4,7 +4,7 @@
 		<label>blog</label>
 		<nb_visits>9</nb_visits>
 		<nb_hits>12</nb_hits>
-		<sum_time_spent>170</sum_time_spent>
+		<sum_time_spent>166</sum_time_spent>
 		<nb_hits_with_time_generation>7</nb_hits_with_time_generation>
 		<min_time_generation>0.023</min_time_generation>
 		<max_time_generation>1.324</max_time_generation>
@@ -13,7 +13,7 @@
 		<entry_sum_visit_length>54</entry_sum_visit_length>
 		<entry_bounce_count>7</entry_bounce_count>
 		<exit_nb_visits>7</exit_nb_visits>
-		<avg_time_on_page>19</avg_time_on_page>
+		<avg_time_on_page>18</avg_time_on_page>
 		<bounce_rate>88%</bounce_rate>
 		<exit_rate>78%</exit_rate>
 		<avg_time_generation>0.389</avg_time_generation>
@@ -22,7 +22,7 @@
 				<label>category</label>
 				<nb_visits>6</nb_visits>
 				<nb_hits>9</nb_hits>
-				<sum_time_spent>170</sum_time_spent>
+				<sum_time_spent>166</sum_time_spent>
 				<nb_hits_with_time_generation>5</nb_hits_with_time_generation>
 				<min_time_generation>0.023</min_time_generation>
 				<max_time_generation>1.324</max_time_generation>
@@ -40,7 +40,7 @@
 						<label>meta</label>
 						<nb_visits>4</nb_visits>
 						<nb_hits>6</nb_hits>
-						<sum_time_spent>156</sum_time_spent>
+						<sum_time_spent>151</sum_time_spent>
 						<nb_hits_with_time_generation>3</nb_hits_with_time_generation>
 						<min_time_generation>0.023</min_time_generation>
 						<max_time_generation>0.123</max_time_generation>
@@ -49,7 +49,7 @@
 						<entry_sum_visit_length>54</entry_sum_visit_length>
 						<entry_bounce_count>3</entry_bounce_count>
 						<exit_nb_visits>3</exit_nb_visits>
-						<avg_time_on_page>39</avg_time_on_page>
+						<avg_time_on_page>38</avg_time_on_page>
 						<bounce_rate>75%</bounce_rate>
 						<exit_rate>75%</exit_rate>
 						<avg_time_generation>0.089</avg_time_generation>
@@ -58,7 +58,7 @@
 								<label>/index</label>
 								<nb_visits>4</nb_visits>
 								<nb_hits>6</nb_hits>
-								<sum_time_spent>156</sum_time_spent>
+								<sum_time_spent>151</sum_time_spent>
 								<nb_hits_with_time_generation>3</nb_hits_with_time_generation>
 								<min_time_generation>0.023</min_time_generation>
 								<max_time_generation>0.123</max_time_generation>
@@ -70,7 +70,7 @@
 								<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 								<sum_daily_entry_nb_uniq_visitors>4</sum_daily_entry_nb_uniq_visitors>
 								<sum_daily_exit_nb_uniq_visitors>3</sum_daily_exit_nb_uniq_visitors>
-								<avg_time_on_page>39</avg_time_on_page>
+								<avg_time_on_page>38</avg_time_on_page>
 								<bounce_rate>75%</bounce_rate>
 								<exit_rate>75%</exit_rate>
 								<avg_time_generation>0.089</avg_time_generation>
@@ -82,7 +82,7 @@
 						<label>community</label>
 						<nb_visits>2</nb_visits>
 						<nb_hits>3</nb_hits>
-						<sum_time_spent>14</sum_time_spent>
+						<sum_time_spent>15</sum_time_spent>
 						<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 						<min_time_generation>0.624</min_time_generation>
 						<max_time_generation>1.324</max_time_generation>
@@ -91,7 +91,7 @@
 						<entry_sum_visit_length>0</entry_sum_visit_length>
 						<entry_bounce_count>1</entry_bounce_count>
 						<exit_nb_visits>1</exit_nb_visits>
-						<avg_time_on_page>7</avg_time_on_page>
+						<avg_time_on_page>8</avg_time_on_page>
 						<bounce_rate>100%</bounce_rate>
 						<exit_rate>50%</exit_rate>
 						<avg_time_generation>0.974</avg_time_generation>
@@ -100,7 +100,7 @@
 								<label>/index</label>
 								<nb_visits>2</nb_visits>
 								<nb_hits>3</nb_hits>
-								<sum_time_spent>14</sum_time_spent>
+								<sum_time_spent>15</sum_time_spent>
 								<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 								<min_time_generation>0.624</min_time_generation>
 								<max_time_generation>1.324</max_time_generation>
@@ -112,7 +112,7 @@
 								<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 								<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
 								<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
-								<avg_time_on_page>7</avg_time_on_page>
+								<avg_time_on_page>8</avg_time_on_page>
 								<bounce_rate>100%</bounce_rate>
 								<exit_rate>50%</exit_rate>
 								<avg_time_generation>0.974</avg_time_generation>
@@ -344,25 +344,26 @@
 	</row>
 	<row>
 		<label>/index</label>
-		<nb_visits>6</nb_visits>
-		<nb_hits>6</nb_hits>
+		<nb_visits>7</nb_visits>
+		<nb_hits>7</nb_hits>
 		<sum_time_spent>34</sum_time_spent>
-		<nb_hits_with_time_generation>3</nb_hits_with_time_generation>
-		<min_time_generation>0.058</min_time_generation>
+		<nb_hits_with_time_generation>4</nb_hits_with_time_generation>
+		<min_time_generation>0.001</min_time_generation>
 		<max_time_generation>0.292</max_time_generation>
-		<entry_nb_visits>6</entry_nb_visits>
-		<entry_nb_actions>9</entry_nb_actions>
+		<entry_nb_visits>7</entry_nb_visits>
+		<entry_nb_actions>10</entry_nb_actions>
 		<entry_sum_visit_length>44</entry_sum_visit_length>
-		<entry_bounce_count>4</entry_bounce_count>
-		<exit_nb_visits>4</exit_nb_visits>
-		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>6</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors>
-		<avg_time_on_page>6</avg_time_on_page>
-		<bounce_rate>67%</bounce_rate>
-		<exit_rate>67%</exit_rate>
-		<avg_time_generation>0.177</avg_time_generation>
+		<entry_bounce_count>5</entry_bounce_count>
+		<exit_nb_visits>5</exit_nb_visits>
+		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
+		<sum_daily_entry_nb_uniq_visitors>7</sum_daily_entry_nb_uniq_visitors>
+		<sum_daily_exit_nb_uniq_visitors>5</sum_daily_exit_nb_uniq_visitors>
+		<avg_time_on_page>5</avg_time_on_page>
+		<bounce_rate>71%</bounce_rate>
+		<exit_rate>71%</exit_rate>
+		<avg_time_generation>0.133</avg_time_generation>
 		<url>http://piwik.net/</url>
+		<segment>pageUrl==http%3A%2F%2Fpiwik.net%2F</segment>
 	</row>
 	<row>
 		<label>docs</label>
@@ -647,6 +648,247 @@
 		</subtable>
 	</row>
 	<row>
+		<label>hello</label>
+		<nb_visits>4</nb_visits>
+		<nb_hits>4</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>4</nb_hits_with_time_generation>
+		<min_time_generation>0.359</min_time_generation>
+		<max_time_generation>0.359</max_time_generation>
+		<entry_nb_visits>3</entry_nb_visits>
+		<entry_nb_actions>4</entry_nb_actions>
+		<entry_sum_visit_length>2</entry_sum_visit_length>
+		<entry_bounce_count>2</entry_bounce_count>
+		<exit_nb_visits>3</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>67%</bounce_rate>
+		<exit_rate>75%</exit_rate>
+		<avg_time_generation>0.359</avg_time_generation>
+		<subtable>
+			<row>
+				<label>from</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>2</entry_nb_visits>
+				<entry_nb_actions>3</entry_nb_actions>
+				<entry_sum_visit_length>2</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>50%</bounce_rate>
+				<exit_rate>50%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+				<subtable>
+					<row>
+						<label>another</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+						<min_time_generation>0.359</min_time_generation>
+						<max_time_generation>0.359</max_time_generation>
+						<entry_nb_visits>2</entry_nb_visits>
+						<entry_nb_actions>3</entry_nb_actions>
+						<entry_sum_visit_length>2</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>1</exit_nb_visits>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>50%</bounce_rate>
+						<exit_rate>50%</exit_rate>
+						<avg_time_generation>0.359</avg_time_generation>
+						<subtable>
+							<row>
+								<label>world</label>
+								<nb_visits>2</nb_visits>
+								<nb_hits>2</nb_hits>
+								<sum_time_spent>0</sum_time_spent>
+								<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+								<min_time_generation>0.359</min_time_generation>
+								<max_time_generation>0.359</max_time_generation>
+								<entry_nb_visits>2</entry_nb_visits>
+								<entry_nb_actions>3</entry_nb_actions>
+								<entry_sum_visit_length>2</entry_sum_visit_length>
+								<entry_bounce_count>1</entry_bounce_count>
+								<exit_nb_visits>1</exit_nb_visits>
+								<avg_time_on_page>0</avg_time_on_page>
+								<bounce_rate>50%</bounce_rate>
+								<exit_rate>50%</exit_rate>
+								<avg_time_generation>0.359</avg_time_generation>
+								<subtable>
+									<row>
+										<label>/6,681965</label>
+										<nb_visits>2</nb_visits>
+										<nb_hits>2</nb_hits>
+										<sum_time_spent>0</sum_time_spent>
+										<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+										<min_time_generation>0.359</min_time_generation>
+										<max_time_generation>0.359</max_time_generation>
+										<entry_nb_visits>2</entry_nb_visits>
+										<entry_nb_actions>3</entry_nb_actions>
+										<entry_sum_visit_length>2</entry_sum_visit_length>
+										<entry_bounce_count>1</entry_bounce_count>
+										<exit_nb_visits>1</exit_nb_visits>
+										<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+										<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+										<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+										<avg_time_on_page>0</avg_time_on_page>
+										<bounce_rate>50%</bounce_rate>
+										<exit_rate>50%</exit_rate>
+										<avg_time_generation>0.359</avg_time_generation>
+										<url>http://piwik.net/hello/from/another/world/6,681965</url>
+									</row>
+								</subtable>
+							</row>
+						</subtable>
+					</row>
+				</subtable>
+			</row>
+			<row>
+				<label>world</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+				<min_time_generation>0.359</min_time_generation>
+				<max_time_generation>0.359</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.359</avg_time_generation>
+				<subtable>
+					<row>
+						<label>/6,681965</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+						<min_time_generation>0.359</min_time_generation>
+						<max_time_generation>0.359</max_time_generation>
+						<entry_nb_visits>1</entry_nb_visits>
+						<entry_nb_actions>1</entry_nb_actions>
+						<entry_sum_visit_length>0</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>2</exit_nb_visits>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+						<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>100%</bounce_rate>
+						<exit_rate>100%</exit_rate>
+						<avg_time_generation>0.359</avg_time_generation>
+						<url>http://piwik.net/hello/world/6,681965</url>
+					</row>
+				</subtable>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Citrix</label>
+		<nb_visits>2</nb_visits>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>240</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>2</entry_nb_actions>
+		<entry_sum_visit_length>242</entry_sum_visit_length>
+		<entry_bounce_count>0</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>120</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>50%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
+		<subtable>
+			<row>
+				<label>XenApp</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>240</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>2</entry_nb_actions>
+				<entry_sum_visit_length>242</entry_sum_visit_length>
+				<entry_bounce_count>0</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>120</avg_time_on_page>
+				<bounce_rate>0%</bounce_rate>
+				<exit_rate>50%</exit_rate>
+				<subtable>
+					<row>
+						<label>Wan</label>
+						<nb_visits>2</nb_visits>
+						<nb_hits>2</nb_hits>
+						<sum_time_spent>240</sum_time_spent>
+						<entry_nb_visits>1</entry_nb_visits>
+						<entry_nb_actions>2</entry_nb_actions>
+						<entry_sum_visit_length>242</entry_sum_visit_length>
+						<entry_bounce_count>0</entry_bounce_count>
+						<exit_nb_visits>1</exit_nb_visits>
+						<avg_time_on_page>120</avg_time_on_page>
+						<bounce_rate>0%</bounce_rate>
+						<exit_rate>50%</exit_rate>
+						<subtable>
+							<row>
+								<label>auth</label>
+								<nb_visits>2</nb_visits>
+								<nb_hits>2</nb_hits>
+								<sum_time_spent>240</sum_time_spent>
+								<entry_nb_visits>1</entry_nb_visits>
+								<entry_nb_actions>2</entry_nb_actions>
+								<entry_sum_visit_length>242</entry_sum_visit_length>
+								<entry_bounce_count>0</entry_bounce_count>
+								<exit_nb_visits>1</exit_nb_visits>
+								<avg_time_on_page>120</avg_time_on_page>
+								<bounce_rate>0%</bounce_rate>
+								<exit_rate>50%</exit_rate>
+								<subtable>
+									<row>
+										<label>/login.jsp</label>
+										<nb_visits>1</nb_visits>
+										<nb_hits>1</nb_hits>
+										<sum_time_spent>240</sum_time_spent>
+										<entry_nb_visits>1</entry_nb_visits>
+										<entry_nb_actions>2</entry_nb_actions>
+										<entry_sum_visit_length>242</entry_sum_visit_length>
+										<entry_bounce_count>0</entry_bounce_count>
+										<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+										<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+										<avg_time_on_page>240</avg_time_on_page>
+										<bounce_rate>0%</bounce_rate>
+										<exit_rate>0%</exit_rate>
+										<url>http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</url>
+									</row>
+									<row>
+										<label>/silentDetection.jsp</label>
+										<nb_visits>1</nb_visits>
+										<nb_hits>1</nb_hits>
+										<sum_time_spent>0</sum_time_spent>
+										<exit_nb_visits>1</exit_nb_visits>
+										<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+										<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+										<avg_time_on_page>0</avg_time_on_page>
+										<bounce_rate>0%</bounce_rate>
+										<exit_rate>100%</exit_rate>
+										<url>http://piwik.net/Citrix/XenApp/Wan/auth/silentDetection.jsp</url>
+									</row>
+								</subtable>
+							</row>
+						</subtable>
+					</row>
+				</subtable>
+			</row>
+		</subtable>
+	</row>
+	<row>
 		<label>download</label>
 		<nb_visits>2</nb_visits>
 		<nb_hits>2</nb_hits>
@@ -762,6 +1004,44 @@
 		</subtable>
 	</row>
 	<row>
+		<label>Topic</label>
+		<nb_visits>2</nb_visits>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+		<min_time_generation />
+		<max_time_generation>0</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>1</entry_nb_actions>
+		<entry_sum_visit_length>0</entry_sum_visit_length>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>100%</bounce_rate>
+		<exit_rate>50%</exit_rate>
+		<avg_time_generation>0</avg_time_generation>
+		<subtable>
+			<row>
+				<label>/hw43061</label>
+				<nb_visits>2</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>50%</exit_rate>
+				<url>http://piwik.net/Topic/hw43061</url>
+			</row>
+		</subtable>
+	</row>
+	<row>
 		<label>/index.htm</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
@@ -782,6 +1062,7 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0</avg_time_generation>
 		<url>http://example.org/index.htm</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 	</row>
 	<row>
 		<label>/index.php?module=CoreHome&amp;action=index&amp;date=yesterday&amp;period=day&amp;idSite=7</label>
@@ -804,6 +1085,7 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0.413</avg_time_generation>
 		<url>http://demo.piwik.org/index.php?module=CoreHome&amp;action=index&amp;date=yesterday&amp;period=day&amp;idSite=7</url>
+		<segment>pageUrl==http%3A%2F%2Fdemo.piwik.org%2Findex.php%3Fmodule%3DCoreHome%26action%3Dindex%26date%3Dyesterday%26period%3Dday%26idSite%3D7</segment>
 	</row>
 	<row>
 		<label>/moved-permanently</label>
@@ -824,6 +1106,7 @@
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0</avg_time_generation>
 		<url>http://piwik.net/moved-permanently</url>
+		<segment>pageUrl==http%3A%2F%2Fpiwik.net%2Fmoved-permanently</segment>
 	</row>
 	<row>
 		<label>/register.php?0,approve=9a94a02145599</label>
@@ -846,6 +1129,7 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0</avg_time_generation>
 		<url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url>
+		<segment>pageUrl==http%3A%2F%2Fforum.piwik.org%2Fregister.php%3F0%2Capprove%3D9a94a02145599</segment>
 	</row>
 	<row>
 		<label>/temp-redirect</label>
@@ -863,6 +1147,7 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0</avg_time_generation>
 		<url>http://piwik.net/temp-redirect</url>
+		<segment>pageUrl==http%3A%2F%2Fpiwik.net%2Ftemp-redirect</segment>
 	</row>
 	<row>
 		<label>/to-an-error</label>
@@ -885,6 +1170,7 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0</avg_time_generation>
 		<url>http://piwik.net/to-an-error</url>
+		<segment>pageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment>
 	</row>
 	<row>
 		<label>changelog</label>
@@ -1065,6 +1351,48 @@
 		</subtable>
 	</row>
 	<row>
+		<label>Products</label>
+		<nb_visits>1</nb_visits>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+		<min_time_generation>0.109</min_time_generation>
+		<max_time_generation>0.109</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>3</entry_nb_actions>
+		<entry_sum_visit_length>2</entry_sum_visit_length>
+		<entry_bounce_count>0</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0.109</avg_time_generation>
+		<subtable>
+			<row>
+				<label>/theProduct</label>
+				<nb_visits>1</nb_visits>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+				<min_time_generation>0.109</min_time_generation>
+				<max_time_generation>0.109</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>3</entry_nb_actions>
+				<entry_sum_visit_length>2</entry_sum_visit_length>
+				<entry_bounce_count>0</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>0%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.109</avg_time_generation>
+				<url>http://piwik.net/Products/theProduct</url>
+			</row>
+		</subtable>
+	</row>
+	<row>
 		<label>this</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
@@ -1269,6 +1597,68 @@
 		</subtable>
 	</row>
 	<row>
+		<label>view</label>
+		<nb_visits>1</nb_visits>
+		<nb_hits>1</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+		<min_time_generation>0.001</min_time_generation>
+		<max_time_generation>0.001</max_time_generation>
+		<entry_nb_visits>1</entry_nb_visits>
+		<entry_nb_actions>1</entry_nb_actions>
+		<entry_sum_visit_length>0</entry_sum_visit_length>
+		<entry_bounce_count>1</entry_bounce_count>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>100%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0.001</avg_time_generation>
+		<subtable>
+			<row>
+				<label>my</label>
+				<nb_visits>1</nb_visits>
+				<nb_hits>1</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+				<min_time_generation>0.001</min_time_generation>
+				<max_time_generation>0.001</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.001</avg_time_generation>
+				<subtable>
+					<row>
+						<label>/file.html</label>
+						<nb_visits>1</nb_visits>
+						<nb_hits>1</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+						<min_time_generation>0.001</min_time_generation>
+						<max_time_generation>0.001</max_time_generation>
+						<entry_nb_visits>1</entry_nb_visits>
+						<entry_nb_actions>1</entry_nb_actions>
+						<entry_sum_visit_length>0</entry_sum_visit_length>
+						<entry_bounce_count>1</entry_bounce_count>
+						<exit_nb_visits>1</exit_nb_visits>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+						<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>100%</bounce_rate>
+						<exit_rate>100%</exit_rate>
+						<avg_time_generation>0.001</avg_time_generation>
+						<url>http://piwik.net/view/my/file.html</url>
+					</row>
+				</subtable>
+			</row>
+		</subtable>
+	</row>
+	<row>
 		<label>what-is-piwisk</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml
index c8388c1f4d..13b24ecfac 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
-	<nb_pageviews>26</nb_pageviews>
-	<nb_uniq_pageviews>26</nb_uniq_pageviews>
+	<nb_pageviews>38</nb_pageviews>
+	<nb_uniq_pageviews>37</nb_uniq_pageviews>
 	<nb_downloads>4</nb_downloads>
 	<nb_uniq_downloads>4</nb_uniq_downloads>
 	<nb_outlinks>0</nb_outlinks>
 	<nb_uniq_outlinks>0</nb_uniq_outlinks>
 	<nb_searches>0</nb_searches>
 	<nb_keywords>0</nb_keywords>
+	<avg_time_generation>0.206</avg_time_generation>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml
index a87ec05ee3..80680b1482 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
-	<nb_pageviews>50</nb_pageviews>
-	<nb_uniq_pageviews>44</nb_uniq_pageviews>
+	<nb_pageviews>62</nb_pageviews>
+	<nb_uniq_pageviews>55</nb_uniq_pageviews>
 	<nb_downloads>5</nb_downloads>
 	<nb_uniq_downloads>5</nb_uniq_downloads>
 	<nb_outlinks>1</nb_outlinks>
 	<nb_uniq_outlinks>1</nb_uniq_outlinks>
 	<nb_searches>0</nb_searches>
 	<nb_keywords>0</nb_keywords>
-	<avg_time_generation>0.301</avg_time_generation>
+	<avg_time_generation>0.273</avg_time_generation>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
index 6f8a9a4c98..d24c6ab527 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
@@ -2,28 +2,34 @@
 <result>
 	<row>
 		<label>HTTP-code</label>
-		<nb_actions>29</nb_actions>
+		<nb_actions>43</nb_actions>
 		<subtable>
 			<row>
 				<label>200</label>
-				<nb_visits>23</nb_visits>
-				<nb_actions>25</nb_actions>
-				<sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors>
+				<nb_visits>32</nb_visits>
+				<nb_actions>34</nb_actions>
+				<sum_daily_nb_uniq_visitors>32</sum_daily_nb_uniq_visitors>
 			</row>
 			<row>
 				<label>301</label>
-				<nb_visits>1</nb_visits>
-				<nb_actions>1</nb_actions>
-				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<nb_visits>3</nb_visits>
+				<nb_actions>3</nb_actions>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 			</row>
 			<row>
-				<label>307</label>
+				<label>404</label>
+				<nb_visits>3</nb_visits>
+				<nb_actions>3</nb_actions>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+			</row>
+			<row>
+				<label>302</label>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 			</row>
 			<row>
-				<label>404</label>
+				<label>307</label>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
@@ -126,6 +132,119 @@
 		</subtable>
 	</row>
 	<row>
+		<label>User Name</label>
+		<nb_visits>3</nb_visits>
+		<nb_actions>5</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>3</sum_visit_length>
+		<bounce_count>2</bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>2</nb_conversions>
+				<nb_visits_converted>2</nb_visits_converted>
+				<revenue>10</revenue>
+			</row>
+		</goals>
+		<nb_conversions>2</nb_conversions>
+		<revenue>10</revenue>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<subtable>
+			<row>
+				<label>user1</label>
+				<nb_visits>2</nb_visits>
+				<nb_actions>4</nb_actions>
+				<max_actions>3</max_actions>
+				<sum_visit_length>2</sum_visit_length>
+				<bounce_count>1</bounce_count>
+				<goals>
+					<row idgoal='1'>
+						<nb_conversions>1</nb_conversions>
+						<nb_visits_converted>1</nb_visits_converted>
+						<revenue>5</revenue>
+					</row>
+				</goals>
+				<nb_conversions>1</nb_conversions>
+				<revenue>5</revenue>
+				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_users>1</sum_daily_nb_users>
+			</row>
+			<row>
+				<label>user2</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<max_actions>1</max_actions>
+				<sum_visit_length>1</sum_visit_length>
+				<bounce_count>1</bounce_count>
+				<goals>
+					<row idgoal='1'>
+						<nb_conversions>1</nb_conversions>
+						<nb_visits_converted>1</nb_visits_converted>
+						<revenue>5</revenue>
+					</row>
+				</goals>
+				<nb_conversions>1</nb_conversions>
+				<revenue>5</revenue>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Generation Time</label>
+		<nb_actions>4</nb_actions>
+		<subtable>
+			<row>
+				<label>359</label>
+				<nb_visits>2</nb_visits>
+				<nb_actions>2</nb_actions>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			</row>
+			<row>
+				<label>0</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			</row>
+			<row>
+				<label>109</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Windows Status Code</label>
+		<nb_actions>4</nb_actions>
+		<subtable>
+			<row>
+				<label>24</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			</row>
+			<row>
+				<label>32</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			</row>
+			<row>
+				<label>42</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			</row>
+			<row>
+				<label>96</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			</row>
+		</subtable>
+	</row>
+	<row>
 		<label>Bot</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml
new file mode 100644
index 0000000000..b3aef9f3d3
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>Cookie</label>
+		<nb_visits>2</nb_visits>
+		<nb_visits_percentage>7%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/cookie.gif</logo>
+	</row>
+	<row>
+		<label>Flash</label>
+		<nb_visits>2</nb_visits>
+		<nb_visits_percentage>7%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/flash.gif</logo>
+	</row>
+	<row>
+		<label>Java</label>
+		<nb_visits>2</nb_visits>
+		<nb_visits_percentage>7%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/java.gif</logo>
+	</row>
+	<row>
+		<label>Director</label>
+		<nb_visits>1</nb_visits>
+		<nb_visits_percentage>3%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/director.gif</logo>
+	</row>
+	<row>
+		<label>Gears</label>
+		<nb_visits>1</nb_visits>
+		<nb_visits_percentage>3%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/gears.gif</logo>
+	</row>
+	<row>
+		<label>Pdf</label>
+		<nb_visits>1</nb_visits>
+		<nb_visits_percentage>3%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/pdf.gif</logo>
+	</row>
+	<row>
+		<label>Windowsmedia</label>
+		<nb_visits>1</nb_visits>
+		<nb_visits_percentage>3%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/windowsmedia.gif</logo>
+	</row>
+	<row>
+		<label>Quicktime</label>
+		<nb_visits>0</nb_visits>
+		<nb_visits_percentage>0%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/quicktime.gif</logo>
+	</row>
+	<row>
+		<label>Realplayer</label>
+		<nb_visits>0</nb_visits>
+		<nb_visits_percentage>0%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/realplayer.gif</logo>
+	</row>
+	<row>
+		<label>Silverlight</label>
+		<nb_visits>0</nb_visits>
+		<nb_visits_percentage>0%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/silverlight.gif</logo>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
index 38d80d2b64..48593c4304 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
@@ -2,14 +2,14 @@
 <result>
 	<row>
 		<label>Unknown</label>
-		<nb_visits>25</nb_visits>
-		<nb_actions>28</nb_actions>
+		<nb_visits>34</nb_visits>
+		<nb_actions>39</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>305</sum_visit_length>
-		<bounce_count>23</bounce_count>
-		<nb_visits_converted>23</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<sum_visit_length>549</sum_visit_length>
+		<bounce_count>30</bounce_count>
+		<nb_visits_converted>30</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>32</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo>
 	</row>
 	<row>
@@ -24,4 +24,16 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/brand/HTC.ico</logo>
 	</row>
+	<row>
+		<label>Samsung</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>3</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>0</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<logo>plugins/DevicesDetection/images/brand/Samsung.ico</logo>
+	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml
index bb6679c971..1fb125914d 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml
@@ -10,28 +10,43 @@
 		<nb_visits_converted>16</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>17</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>browserEngine==WebKit</segment>
 	</row>
 	<row>
 		<label>Trident (IE)</label>
-		<nb_visits>6</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
+		<nb_visits>7</nb_visits>
+		<nb_actions>8</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>242</sum_visit_length>
 		<bounce_count>6</bounce_count>
-		<nb_visits_converted>6</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
+		<nb_visits_converted>7</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>browserEngine==Trident</segment>
+	</row>
+	<row>
+		<label>Blink (Chrome, Opera)</label>
+		<nb_visits>6</nb_visits>
+		<nb_actions>9</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>4</bounce_count>
+		<nb_visits_converted>6</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<segment>browserEngine==Blink</segment>
 	</row>
 	<row>
 		<label>Unknown</label>
-		<nb_visits>2</nb_visits>
-		<nb_actions>2</nb_actions>
+		<nb_visits>5</nb_visits>
+		<nb_actions>5</nb_actions>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>2</bounce_count>
-		<nb_visits_converted>1</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<bounce_count>5</bounce_count>
+		<nb_visits_converted>2</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>browserEngine==</segment>
 	</row>
 	<row>
 		<label>Gecko (Firefox)</label>
@@ -43,5 +58,6 @@
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>browserEngine==Gecko</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
index 8723d1a05f..930e0f0aa7 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
-		<label>Internet Explorer</label>
-		<nb_visits>6</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>6</bounce_count>
-		<nb_visits_converted>6</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/IE.gif</logo>
+		<label>Chrome</label>
+		<nb_visits>10</nb_visits>
+		<nb_actions>11</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>9</bounce_count>
+		<nb_visits_converted>10</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
 	</row>
 	<row>
-		<label>Chrome</label>
-		<nb_visits>5</nb_visits>
-		<nb_actions>5</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>5</bounce_count>
-		<nb_visits_converted>5</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+		<label>Internet Explorer</label>
+		<nb_visits>7</nb_visits>
+		<nb_actions>8</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>242</sum_visit_length>
+		<bounce_count>6</bounce_count>
+		<nb_visits_converted>7</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+		<logo>plugins/DevicesDetection/images/browsers/IE.gif</logo>
 	</row>
 	<row>
 		<label>Epiphany</label>
@@ -34,7 +34,7 @@
 		<nb_visits_converted>5</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/EP.gif</logo>
+		<logo>plugins/DevicesDetection/images/browsers/EP.gif</logo>
 	</row>
 	<row>
 		<label>RockMelt</label>
@@ -46,22 +46,22 @@
 		<nb_visits_converted>4</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
 	</row>
 	<row>
-		<label>Android Browser</label>
-		<nb_visits>2</nb_visits>
-		<nb_actions>2</nb_actions>
+		<label>Unknown</label>
+		<nb_visits>5</nb_visits>
+		<nb_actions>5</nb_actions>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>2</bounce_count>
+		<bounce_count>5</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/AN.gif</logo>
+		<logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo>
 	</row>
 	<row>
-		<label>Firefox</label>
+		<label>Android Browser</label>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
 		<max_actions>1</max_actions>
@@ -70,18 +70,30 @@
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+		<logo>plugins/DevicesDetection/images/browsers/AN.gif</logo>
 	</row>
 	<row>
-		<label>Unknown</label>
+		<label>Firefox</label>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
-		<nb_visits_converted>1</nb_visits_converted>
+		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
+		<logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
+	</row>
+	<row>
+		<label>Chrome Mobile</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>3</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>0</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<logo>plugins/DevicesDetection/images/browsers/CM.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
index 80d06470a3..2c687028a7 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
@@ -10,7 +10,8 @@
 		<nb_visits_converted>5</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/EP.gif</logo>
+		<segment>browserCode==EP;browserVersion==2.30</segment>
+		<logo>plugins/DevicesDetection/images/browsers/EP.gif</logo>
 	</row>
 	<row>
 		<label>Internet Explorer 9.0</label>
@@ -22,7 +23,8 @@
 		<nb_visits_converted>5</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/IE.gif</logo>
+		<segment>browserCode==IE;browserVersion==9.0</segment>
+		<logo>plugins/DevicesDetection/images/browsers/IE.gif</logo>
 	</row>
 	<row>
 		<label>RockMelt 0.9</label>
@@ -34,7 +36,34 @@
 		<nb_visits_converted>4</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+		<segment>browserCode==RM;browserVersion==0.9</segment>
+		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
+	</row>
+	<row>
+		<label>Unknown</label>
+		<nb_visits>5</nb_visits>
+		<nb_actions>5</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>5</bounce_count>
+		<nb_visits_converted>2</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>browserCode==UNK;browserVersion==</segment>
+		<logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo>
+	</row>
+	<row>
+		<label>Chrome 37.0</label>
+		<nb_visits>3</nb_visits>
+		<nb_actions>4</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>2</bounce_count>
+		<nb_visits_converted>3</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<segment>browserCode==CH;browserVersion==37.0</segment>
+		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
 	</row>
 	<row>
 		<label>Android Browser</label>
@@ -46,7 +75,8 @@
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/AN.gif</logo>
+		<segment>browserCode==AN;browserVersion==</segment>
+		<logo>plugins/DevicesDetection/images/browsers/AN.gif</logo>
 	</row>
 	<row>
 		<label>Chrome 19.0</label>
@@ -58,7 +88,8 @@
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+		<segment>browserCode==CH;browserVersion==19.0</segment>
+		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
 	</row>
 	<row>
 		<label>Chrome 20.0</label>
@@ -70,7 +101,8 @@
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+		<segment>browserCode==CH;browserVersion==20.0</segment>
+		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
 	</row>
 	<row>
 		<label>Firefox 6.0</label>
@@ -82,22 +114,37 @@
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+		<segment>browserCode==FF;browserVersion==6.0</segment>
+		<logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
 	</row>
 	<row>
-		<label>Unknown</label>
-		<nb_visits>2</nb_visits>
-		<nb_actions>2</nb_actions>
+		<label>Chrome 11.0</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>2</bounce_count>
+		<bounce_count>1</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
+		<segment>browserCode==CH;browserVersion==11.0</segment>
+		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
 	</row>
 	<row>
-		<label>Chrome 11.0</label>
+		<label>Chrome 39.0</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>browserCode==CH;browserVersion==39.0</segment>
+		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
+	</row>
+	<row>
+		<label>Chrome 41.0</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
 		<max_actions>1</max_actions>
@@ -106,7 +153,21 @@
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+		<segment>browserCode==CH;browserVersion==41.0</segment>
+		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
+	</row>
+	<row>
+		<label>Chrome Mobile 39.0</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>3</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>0</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<segment>browserCode==CM;browserVersion==39.0</segment>
+		<logo>plugins/DevicesDetection/images/browsers/CM.gif</logo>
 	</row>
 	<row>
 		<label>Internet Explorer 6.0</label>
@@ -118,6 +179,20 @@
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/IE.gif</logo>
+		<segment>browserCode==IE;browserVersion==6.0</segment>
+		<logo>plugins/DevicesDetection/images/browsers/IE.gif</logo>
+	</row>
+	<row>
+		<label>Internet Explorer 8.0</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>2</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>242</sum_visit_length>
+		<bounce_count>0</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>browserCode==IE;browserVersion==8.0</segment>
+		<logo>plugins/DevicesDetection/images/browsers/IE.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
index 8723d1a05f..16aa9095e1 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
@@ -1,28 +1,30 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
-		<label>Internet Explorer</label>
-		<nb_visits>6</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>6</bounce_count>
-		<nb_visits_converted>6</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/IE.gif</logo>
+		<label>Chrome</label>
+		<nb_visits>10</nb_visits>
+		<nb_actions>11</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>9</bounce_count>
+		<nb_visits_converted>10</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
+		<segment>browserCode==CH</segment>
 	</row>
 	<row>
-		<label>Chrome</label>
-		<nb_visits>5</nb_visits>
-		<nb_actions>5</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>5</bounce_count>
-		<nb_visits_converted>5</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+		<label>Internet Explorer</label>
+		<nb_visits>7</nb_visits>
+		<nb_actions>8</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>242</sum_visit_length>
+		<bounce_count>6</bounce_count>
+		<nb_visits_converted>7</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+		<logo>plugins/DevicesDetection/images/browsers/IE.gif</logo>
+		<segment>browserCode==IE</segment>
 	</row>
 	<row>
 		<label>Epiphany</label>
@@ -34,7 +36,8 @@
 		<nb_visits_converted>5</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/EP.gif</logo>
+		<logo>plugins/DevicesDetection/images/browsers/EP.gif</logo>
+		<segment>browserCode==EP</segment>
 	</row>
 	<row>
 		<label>RockMelt</label>
@@ -46,22 +49,24 @@
 		<nb_visits_converted>4</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
+		<segment>browserCode==RM</segment>
 	</row>
 	<row>
-		<label>Android Browser</label>
-		<nb_visits>2</nb_visits>
-		<nb_actions>2</nb_actions>
+		<label>Unknown</label>
+		<nb_visits>5</nb_visits>
+		<nb_actions>5</nb_actions>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>2</bounce_count>
+		<bounce_count>5</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/AN.gif</logo>
+		<logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo>
+		<segment>browserCode==UNK</segment>
 	</row>
 	<row>
-		<label>Firefox</label>
+		<label>Android Browser</label>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
 		<max_actions>1</max_actions>
@@ -70,18 +75,33 @@
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+		<logo>plugins/DevicesDetection/images/browsers/AN.gif</logo>
+		<segment>browserCode==AN</segment>
 	</row>
 	<row>
-		<label>Unknown</label>
+		<label>Firefox</label>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
-		<nb_visits_converted>1</nb_visits_converted>
+		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
+		<logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
+		<segment>browserCode==FF</segment>
+	</row>
+	<row>
+		<label>Chrome Mobile</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>3</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>0</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<logo>plugins/DevicesDetection/images/browsers/CM.gif</logo>
+		<segment>browserCode==CM</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
index b9bf650ebc..98c5db77ba 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
@@ -2,14 +2,14 @@
 <result>
 	<row>
 		<label>Unknown</label>
-		<nb_visits>25</nb_visits>
-		<nb_actions>28</nb_actions>
+		<nb_visits>34</nb_visits>
+		<nb_actions>39</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>305</sum_visit_length>
-		<bounce_count>23</bounce_count>
-		<nb_visits_converted>23</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<sum_visit_length>549</sum_visit_length>
+		<bounce_count>30</bounce_count>
+		<nb_visits_converted>30</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>32</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
 	</row>
 	<row>
 		<label>Vision</label>
@@ -22,4 +22,15 @@
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
+	<row>
+		<label>GALAXY S5</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>3</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>0</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
index 62d091d83d..813ebfe05a 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
@@ -1,6 +1,30 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
+		<label>Mac</label>
+		<nb_visits>11</nb_visits>
+		<nb_actions>15</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>307</sum_visit_length>
+		<bounce_count>8</bounce_count>
+		<nb_visits_converted>10</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<logo>plugins/DevicesDetection/images/os/MAC.gif</logo>
+	</row>
+	<row>
+		<label>Windows</label>
+		<nb_visits>11</nb_visits>
+		<nb_actions>12</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>242</sum_visit_length>
+		<bounce_count>10</bounce_count>
+		<nb_visits_converted>11</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<logo>plugins/DevicesDetection/images/os/WIN.gif</logo>
+	</row>
+	<row>
 		<label>GNU/Linux</label>
 		<nb_visits>8</nb_visits>
 		<nb_actions>8</nb_actions>
@@ -10,43 +34,31 @@
 		<nb_visits_converted>8</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/os/LIN.gif</logo>
+		<logo>plugins/DevicesDetection/images/os/LIN.gif</logo>
 	</row>
 	<row>
-		<label>Windows</label>
-		<nb_visits>9</nb_visits>
-		<nb_actions>9</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>9</bounce_count>
-		<nb_visits_converted>9</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/os/WI7.gif</logo>
-	</row>
-	<row>
-		<label>Mac</label>
-		<nb_visits>6</nb_visits>
-		<nb_actions>9</nb_actions>
+		<label>Android</label>
+		<nb_visits>3</nb_visits>
+		<nb_actions>5</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>305</sum_visit_length>
-		<bounce_count>4</bounce_count>
-		<nb_visits_converted>5</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/os/MAC.gif</logo>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>2</bounce_count>
+		<nb_visits_converted>3</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<logo>plugins/DevicesDetection/images/os/AND.gif</logo>
 	</row>
 	<row>
-		<label>Android</label>
-		<nb_visits>2</nb_visits>
-		<nb_actions>2</nb_actions>
+		<label>Unknown</label>
+		<nb_visits>3</nb_visits>
+		<nb_actions>3</nb_actions>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>2</bounce_count>
-		<nb_visits_converted>2</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<bounce_count>3</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/os/AND.gif</logo>
+		<logo>plugins/DevicesDetection/images/os/UNK.gif</logo>
 	</row>
 	<row>
 		<label>Bot</label>
@@ -58,18 +70,6 @@
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/os/UNK.gif</logo>
-	</row>
-	<row>
-		<label>Unknown</label>
-		<nb_visits>1</nb_visits>
-		<nb_actions>1</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>1</bounce_count>
-		<nb_visits_converted>0</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/os/UNK.gif</logo>
+		<logo>plugins/DevicesDetection/images/os/UNK.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
index 7cad47e0a1..38dd7759a4 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
@@ -10,7 +10,8 @@
 		<nb_visits_converted>8</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/os/LIN.gif</logo>
+		<segment>operatingSystemCode==LIN;operatingSystemVersion==</segment>
+		<logo>plugins/DevicesDetection/images/os/LIN.gif</logo>
 	</row>
 	<row>
 		<label>Windows 7</label>
@@ -22,7 +23,8 @@
 		<nb_visits_converted>7</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/os/WI7.gif</logo>
+		<segment>operatingSystemCode==WIN;operatingSystemVersion==7</segment>
+		<logo>plugins/DevicesDetection/images/os/WIN.gif</logo>
 	</row>
 	<row>
 		<label>Mac 10.6</label>
@@ -34,22 +36,50 @@
 		<nb_visits_converted>4</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/os/MAC.gif</logo>
+		<segment>operatingSystemCode==MAC;operatingSystemVersion==10.6</segment>
+		<logo>plugins/DevicesDetection/images/os/MAC.gif</logo>
 	</row>
 	<row>
-		<label>Android 2.3</label>
-		<nb_visits>2</nb_visits>
-		<nb_actions>2</nb_actions>
+		<label>Mac 10.10</label>
+		<nb_visits>4</nb_visits>
+		<nb_actions>5</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>3</bounce_count>
+		<nb_visits_converted>4</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<segment>operatingSystemCode==MAC;operatingSystemVersion==10.10</segment>
+		<logo>plugins/DevicesDetection/images/os/MAC.gif</logo>
+	</row>
+	<row>
+		<label>Unknown</label>
+		<nb_visits>3</nb_visits>
+		<nb_actions>3</nb_actions>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>2</bounce_count>
-		<nb_visits_converted>2</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<bounce_count>3</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/os/AND.gif</logo>
+		<segment>operatingSystemCode==UNK;operatingSystemVersion==UNK</segment>
+		<logo>plugins/DevicesDetection/images/os/UNK.gif</logo>
 	</row>
 	<row>
 		<label>Windows XP</label>
+		<nb_visits>3</nb_visits>
+		<nb_actions>3</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>3</bounce_count>
+		<nb_visits_converted>3</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>operatingSystemCode==WIN;operatingSystemVersion==XP</segment>
+		<logo>plugins/DevicesDetection/images/os/WIN.gif</logo>
+	</row>
+	<row>
+		<label>Android 2.3</label>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
 		<max_actions>1</max_actions>
@@ -58,7 +88,21 @@
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/os/WXP.gif</logo>
+		<segment>operatingSystemCode==AND;operatingSystemVersion==2.3</segment>
+		<logo>plugins/DevicesDetection/images/os/AND.gif</logo>
+	</row>
+	<row>
+		<label>Android 4.4</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>3</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>0</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<segment>operatingSystemCode==AND;operatingSystemVersion==4.4</segment>
+		<logo>plugins/DevicesDetection/images/os/AND.gif</logo>
 	</row>
 	<row>
 		<label>Bot</label>
@@ -70,10 +114,11 @@
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/os/UNK.gif</logo>
+		<segment>operatingSystemCode==BOT;operatingSystemVersion==UNK</segment>
+		<logo>plugins/DevicesDetection/images/os/UNK.gif</logo>
 	</row>
 	<row>
-		<label>Mac 10.8</label>
+		<label>Mac</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
 		<max_actions>1</max_actions>
@@ -82,18 +127,33 @@
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/os/MAC.gif</logo>
+		<segment>operatingSystemCode==MAC;operatingSystemVersion==</segment>
+		<logo>plugins/DevicesDetection/images/os/MAC.gif</logo>
 	</row>
 	<row>
-		<label>Unknown</label>
+		<label>Mac 10.8</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>1</bounce_count>
-		<nb_visits_converted>0</nb_visits_converted>
+		<nb_visits_converted>1</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>operatingSystemCode==MAC;operatingSystemVersion==10.8</segment>
+		<logo>plugins/DevicesDetection/images/os/MAC.gif</logo>
+	</row>
+	<row>
+		<label>Windows</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>2</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>242</sum_visit_length>
+		<bounce_count>0</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/os/UNK.gif</logo>
+		<segment>operatingSystemCode==WIN;operatingSystemVersion==</segment>
+		<logo>plugins/DevicesDetection/images/os/WIN.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml
index 0a059a62d6..7ebd0835aa 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml
@@ -2,73 +2,88 @@
 <result>
 	<row>
 		<label>Desktop</label>
-		<nb_visits>23</nb_visits>
-		<nb_actions>26</nb_actions>
+		<nb_visits>30</nb_visits>
+		<nb_actions>35</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>305</sum_visit_length>
-		<bounce_count>21</bounce_count>
-		<nb_visits_converted>22</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<sum_visit_length>549</sum_visit_length>
+		<bounce_count>26</bounce_count>
+		<nb_visits_converted>29</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<segment>deviceType==desktop</segment>
 		<logo>plugins/DevicesDetection/images/screens/normal.gif</logo>
 	</row>
 	<row>
 		<label>Unknown</label>
-		<nb_visits>2</nb_visits>
-		<nb_actions>2</nb_actions>
+		<nb_visits>4</nb_visits>
+		<nb_actions>4</nb_actions>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>2</bounce_count>
+		<bounce_count>4</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
 	</row>
 	<row>
 		<label>Smartphone</label>
-		<nb_visits>2</nb_visits>
-		<nb_actions>2</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
+		<nb_visits>3</nb_visits>
+		<nb_actions>5</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>2</sum_visit_length>
 		<bounce_count>2</bounce_count>
-		<nb_visits_converted>2</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<nb_visits_converted>3</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<segment>deviceType==smartphone</segment>
 		<logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
 	</row>
 	<row>
 		<label>Tablet</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==tablet</segment>
 		<logo>plugins/DevicesDetection/images/screens/tablet.png</logo>
 	</row>
 	<row>
 		<label>Feature phone</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==feature+phone</segment>
 		<logo>plugins/DevicesDetection/images/screens/mobile.gif</logo>
 	</row>
 	<row>
 		<label>Console</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==console</segment>
 		<logo>plugins/DevicesDetection/images/screens/console.gif</logo>
 	</row>
 	<row>
 		<label>Tv</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==tv</segment>
 		<logo>plugins/DevicesDetection/images/screens/tv.png</logo>
 	</row>
 	<row>
 		<label>Car browser</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==car+browser</segment>
 		<logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo>
 	</row>
 	<row>
 		<label>Smart display</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==smart+display</segment>
 		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
 	</row>
 	<row>
 		<label>Camera</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==camera</segment>
 		<logo>plugins/DevicesDetection/images/screens/camera.png</logo>
 	</row>
+	<row>
+		<label>Portable media player</label>
+		<nb_visits>0</nb_visits>
+		<segment>deviceType==portable+media+player</segment>
+		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
+	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getAction_month.xml
index c234bed59e..bac3a36cd1 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getAction_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getAction_month.xml
@@ -1,2 +1,40 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result />
\ No newline at end of file
+<result>
+	<row>
+		<label>connect</label>
+		<nb_visits>1</nb_visits>
+		<nb_events>1</nb_events>
+		<nb_events_with_value>0</nb_events_with_value>
+		<sum_event_value>0</sum_event_value>
+		<min_event_value>0</min_event_value>
+		<max_event_value>0</max_event_value>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==connect</segment>
+	</row>
+	<row>
+		<label>play</label>
+		<nb_visits>1</nb_visits>
+		<nb_events>1</nb_events>
+		<nb_events_with_value>0</nb_events_with_value>
+		<sum_event_value>0</sum_event_value>
+		<min_event_value>0</min_event_value>
+		<max_event_value>0</max_event_value>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<avg_event_value>0</avg_event_value>
+		<segment>eventAction==play</segment>
+		<subtable>
+			<row>
+				<label>myvideo</label>
+				<nb_visits>1</nb_visits>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<avg_event_value>0</avg_event_value>
+			</row>
+		</subtable>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getCategory_month.xml
index c234bed59e..43f62b91e7 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getCategory_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getCategory_month.xml
@@ -1,2 +1,39 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result />
\ No newline at end of file
+<result>
+	<row>
+		<label>cloudfront_rtmp</label>
+		<nb_visits>2</nb_visits>
+		<nb_events>2</nb_events>
+		<nb_events_with_value>0</nb_events_with_value>
+		<sum_event_value>0</sum_event_value>
+		<min_event_value>0</min_event_value>
+		<max_event_value>0</max_event_value>
+		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<avg_event_value>0</avg_event_value>
+		<segment>eventCategory==cloudfront_rtmp</segment>
+		<subtable>
+			<row>
+				<label>connect</label>
+				<nb_visits>1</nb_visits>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>play</label>
+				<nb_visits>1</nb_visits>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<avg_event_value>0</avg_event_value>
+			</row>
+		</subtable>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getName_month.xml
index c234bed59e..d2ad8c6a1a 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getName_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getName_month.xml
@@ -1,2 +1,52 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result />
\ No newline at end of file
+<result>
+	<row>
+		<label>myvideo</label>
+		<nb_visits>1</nb_visits>
+		<nb_events>1</nb_events>
+		<nb_events_with_value>0</nb_events_with_value>
+		<sum_event_value>0</sum_event_value>
+		<min_event_value>0</min_event_value>
+		<max_event_value>0</max_event_value>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<avg_event_value>0</avg_event_value>
+		<segment>eventName==myvideo</segment>
+		<subtable>
+			<row>
+				<label>play</label>
+				<nb_visits>1</nb_visits>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<avg_event_value>0</avg_event_value>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Event Name not defined</label>
+		<nb_visits>1</nb_visits>
+		<nb_events>1</nb_events>
+		<nb_events_with_value>0</nb_events_with_value>
+		<sum_event_value>0</sum_event_value>
+		<min_event_value>0</min_event_value>
+		<max_event_value>0</max_event_value>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<avg_event_value>0</avg_event_value>
+		<subtable>
+			<row>
+				<label>connect</label>
+				<nb_visits>1</nb_visits>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<avg_event_value>0</avg_event_value>
+			</row>
+		</subtable>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__ExamplePlugin.getExampleReport_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__ExamplePlugin.getExampleReport_month.xml
index 1b2fed39f9..49765ba76c 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__ExamplePlugin.getExampleReport_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__ExamplePlugin.getExampleReport_month.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
+		<label>My Label 1</label>
+		<nb_visits>1</nb_visits>
+	</row>
+	<row>
+		<label>My Label 2</label>
 		<nb_visits>5</nb_visits>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
index 1ba1449d50..e8f75dee69 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
@@ -2,7 +2,7 @@
 <result>
 	<row>
 		<label>0 days</label>
-		<nb_conversions>24</nb_conversions>
+		<nb_conversions>32</nb_conversions>
 	</row>
 	<row>
 		<label>1 day</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
index 0a94d5f36d..f906c7ccaf 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
@@ -2,7 +2,7 @@
 <result>
 	<row>
 		<label>1 visit</label>
-		<nb_conversions>25</nb_conversions>
+		<nb_conversions>33</nb_conversions>
 	</row>
 	<row>
 		<label>2 visits</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml
index 4c6855264a..7ada36be0d 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
-	<nb_conversions>25</nb_conversions>
-	<nb_visits_converted>25</nb_visits_converted>
-	<revenue>125</revenue>
-	<conversion_rate>92.59%</conversion_rate>
+	<nb_conversions>33</nb_conversions>
+	<nb_visits_converted>33</nb_visits_converted>
+	<revenue>165</revenue>
+	<conversion_rate>89.19%</conversion_rate>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
index 93c0819d6c..2a5e64791e 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
@@ -15,6 +15,7 @@
 				
 				<url>http://piwik.org/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -31,6 +32,7 @@
 				</customVariables>
 				<generationTime>0.29s</generationTime>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -40,8 +42,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -55,35 +55,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Domain landed</customVariableName1>
-				<customVariableValue1>piwik.org</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>website</referrerType>
+		<referrerTypeName>Websites</referrerTypeName>
+		<referrerName>blog.comperiosearch.com</referrerName>
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl>http://blog.comperiosearch.com/blog/2014/02/05/dynamic-search-ranking-using-elasticsearch-neo4j-and-piwik/</referrerUrl>
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows 8.1</operatingSystem>
-		<operatingSystemCode>W81</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/W81.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>8.1</operatingSystemVersion>
 		<browserFamily>Blink</browserFamily>
 		<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
 		<browser>Chrome 33.0</browser>
 		<browserName>Chrome</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>33.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>website</referrerType>
-		<referrerTypeName>Websites</referrerTypeName>
-		<referrerName>blog.comperiosearch.com</referrerName>
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl>http://blog.comperiosearch.com/blog/2014/02/05/dynamic-search-ranking-using-elasticsearch-neo4j-and-piwik/</referrerUrl>
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
 		<country>United States</country>
@@ -95,25 +90,34 @@
 		<location>Raleigh, North Carolina, United States</location>
 		<latitude>35.771999</latitude>
 		<longitude>-78.639000</longitude>
+		<visitLocalTime>20:34:49</visitLocalTime>
+		<visitLocalHour>20</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Domain landed</customVariableName1>
+				<customVariableValue1>piwik.org</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>1366x768</resolution>
 		<plugins>pdf, flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/pdf.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon>
 				<pluginName>pdf</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>20:34:49</visitLocalTime>
-		<visitLocalHour>20</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -142,6 +146,7 @@
 				<timeSpent>79</timeSpent>
 				<timeSpentPretty>1 min 19s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -152,6 +157,7 @@
 				
 				<url>http://piwik.org/changelog/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -167,6 +173,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -176,8 +183,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>2</actions>
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -191,35 +196,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>81</visitDuration>
 		<visitDurationPretty>1 min 21s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Domain landed</customVariableName1>
-				<customVariableValue1>piwik.org</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>2</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl>http://piwik.org/what-is-piwik/</referrerUrl>
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemCode>WI7</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>7</operatingSystemVersion>
 		<browserFamily>Trident</browserFamily>
 		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
 		<browser>Internet Explorer 8.0</browser>
 		<browserName>Internet Explorer</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>8.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl>http://piwik.org/what-is-piwik/</referrerUrl>
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
 		<country>United States</country>
@@ -231,12 +231,21 @@
 		<location>Lake Forest, California, United States</location>
 		<latitude>33.645000</latitude>
 		<longitude>-117.679001</longitude>
-		<resolution>1536x864</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>17:33:27</visitLocalTime>
 		<visitLocalHour>17</visitLocalHour>
 		<daysSinceLastVisit>181</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Domain landed</customVariableName1>
+				<customVariableValue1>piwik.org</customVariableValue1>
+			</row>
+		</customVariables>
+		<resolution>1536x864</resolution>
+		<plugins />
+		<pluginsIcons />
 		
 		
 		
@@ -258,6 +267,7 @@
 				
 				<url>http://demo.piwik.org/index.php?module=CoreHome&amp;action=index&amp;date=yesterday&amp;period=day&amp;idSite=7</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -274,6 +284,7 @@
 				</customVariables>
 				<generationTime>0.41s</generationTime>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -283,8 +294,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -298,39 +307,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Domain landed</customVariableName1>
-				<customVariableValue1>piwik.org</customVariableValue1>
-			</row>
-			<row>
-				<customVariableName2>Demo language</customVariableName2>
-				<customVariableValue2>English</customVariableValue2>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl>http://demo.piwik.org/index.php?module=MultiSites&amp;action=index&amp;date=yesterday&amp;period=day&amp;idSite=32</referrerUrl>
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemCode>WI7</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>7</operatingSystemVersion>
 		<browserFamily>Blink</browserFamily>
 		<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
 		<browser>Chrome 34.0</browser>
 		<browserName>Chrome</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>34.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl>http://demo.piwik.org/index.php?module=MultiSites&amp;action=index&amp;date=yesterday&amp;period=day&amp;idSite=32</referrerUrl>
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>Germany</country>
@@ -342,33 +342,46 @@
 		<location>Germany</location>
 		<latitude>51</latitude>
 		<longitude>9</longitude>
+		<visitLocalTime>01:34:37</visitLocalTime>
+		<visitLocalHour>1</visitLocalHour>
+		<daysSinceLastVisit>4</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Domain landed</customVariableName1>
+				<customVariableValue1>piwik.org</customVariableValue1>
+			</row>
+			<row>
+				<customVariableName2>Demo language</customVariableName2>
+				<customVariableValue2>English</customVariableValue2>
+			</row>
+		</customVariables>
 		<resolution>1920x1200</resolution>
 		<plugins>pdf, flash, java, quicktime, silverlight</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/pdf.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon>
 				<pluginName>pdf</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/quicktime.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon>
 				<pluginName>quicktime</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/silverlight.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon>
 				<pluginName>silverlight</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>01:34:37</visitLocalTime>
-		<visitLocalHour>1</visitLocalHour>
-		<daysSinceLastVisit>4</daysSinceLastVisit>
 		
 		
 		
@@ -397,6 +410,7 @@
 				<timeSpent>32</timeSpent>
 				<timeSpentPretty>32s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -407,6 +421,7 @@
 				
 				<url>http://piwik.org/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -422,6 +437,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -431,8 +447,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>2</actions>
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -446,35 +460,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>34</visitDuration>
 		<visitDurationPretty>34s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Domain landed</customVariableName1>
-				<customVariableValue1>piwik.org</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>2</actions>
+		<referrerType>search</referrerType>
+		<referrerTypeName>Search Engines</referrerTypeName>
+		<referrerName>Google</referrerName>
+		<referrerKeyword>Keyword not defined</referrerKeyword>
+		<referrerKeywordPosition>1</referrerKeywordPosition>
+		<referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl>
+		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
+		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<deviceType>Desktop</deviceType>
-		<operatingSystem>Mac</operatingSystem>
+		<operatingSystem>Mac 10.9</operatingSystem>
+		<operatingSystemName>Mac</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
 		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
+		<operatingSystemVersion>10.9</operatingSystemVersion>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
 		<browser>Safari 7.0</browser>
 		<browserName>Safari</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon>
 		<browserCode>SF</browserCode>
 		<browserVersion>7.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>search</referrerType>
-		<referrerTypeName>Search Engines</referrerTypeName>
-		<referrerName>Google</referrerName>
-		<referrerKeyword>Keyword not defined</referrerKeyword>
-		<referrerKeywordPosition>1</referrerKeywordPosition>
-		<referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl>
-		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
-		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
 		<country>United States</country>
@@ -486,29 +495,38 @@
 		<location>United States</location>
 		<latitude>38</latitude>
 		<longitude>-97</longitude>
+		<visitLocalTime>19:34:01</visitLocalTime>
+		<visitLocalHour>19</visitLocalHour>
+		<daysSinceLastVisit>6</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Domain landed</customVariableName1>
+				<customVariableValue1>piwik.org</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>2880x1800</resolution>
 		<plugins>pdf, flash, java, quicktime</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/pdf.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon>
 				<pluginName>pdf</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/quicktime.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon>
 				<pluginName>quicktime</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>19:34:01</visitLocalTime>
-		<visitLocalHour>19</visitLocalHour>
-		<daysSinceLastVisit>6</daysSinceLastVisit>
 		
 		
 		
@@ -535,6 +553,7 @@
 					</row>
 				</customVariables>
 				<icon>plugins/Morpheus/images/link.gif</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -544,8 +563,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -559,35 +576,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Domain landed</customVariableName1>
-				<customVariableValue1>piwik.org</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>website</referrerType>
+		<referrerTypeName>Websites</referrerTypeName>
+		<referrerName>musicforeveryoneradio.be</referrerName>
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl>http://musicforeveryoneradio.be:2222/CMD_PLUGINS/installatron/index.raw</referrerUrl>
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemCode>WI7</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>7</operatingSystemVersion>
 		<browserFamily>Blink</browserFamily>
 		<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
 		<browser>Chrome 33.0</browser>
 		<browserName>Chrome</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>33.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>website</referrerType>
-		<referrerTypeName>Websites</referrerTypeName>
-		<referrerName>musicforeveryoneradio.be</referrerName>
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl>http://musicforeveryoneradio.be:2222/CMD_PLUGINS/installatron/index.raw</referrerUrl>
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>Belgium</country>
@@ -599,29 +611,38 @@
 		<location>Maaseik, Limburg, Belgium</location>
 		<latitude>51.099998</latitude>
 		<longitude>5.800000</longitude>
+		<visitLocalTime>01:34:24</visitLocalTime>
+		<visitLocalHour>1</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Domain landed</customVariableName1>
+				<customVariableValue1>piwik.org</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>1920x1080</resolution>
 		<plugins>pdf, flash, java, silverlight</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/pdf.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon>
 				<pluginName>pdf</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/silverlight.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon>
 				<pluginName>silverlight</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>01:34:24</visitLocalTime>
-		<visitLocalHour>1</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -643,6 +664,7 @@
 				
 				<url>http://piwik.org/blog/2012/10/integrate-piwik-into-your-rails-application/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -659,6 +681,7 @@
 				</customVariables>
 				<generationTime>0.39s</generationTime>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -668,8 +691,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -683,35 +704,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Domain landed</customVariableName1>
-				<customVariableValue1>piwik.org</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>search</referrerType>
+		<referrerTypeName>Search Engines</referrerTypeName>
+		<referrerName>Google</referrerName>
+		<referrerKeyword>Keyword not defined</referrerKeyword>
+		<referrerKeywordPosition />
+		<referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl>
+		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
+		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<deviceType>Desktop</deviceType>
-		<operatingSystem>Mac</operatingSystem>
+		<operatingSystem>Mac 10.9</operatingSystem>
+		<operatingSystemName>Mac</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
 		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
+		<operatingSystemVersion>10.9</operatingSystemVersion>
 		<browserFamily>Blink</browserFamily>
 		<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
 		<browser>Chrome 33.0</browser>
 		<browserName>Chrome</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>33.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>search</referrerType>
-		<referrerTypeName>Search Engines</referrerTypeName>
-		<referrerName>Google</referrerName>
-		<referrerKeyword>Keyword not defined</referrerKeyword>
-		<referrerKeywordPosition />
-		<referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl>
-		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
-		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
 		<country>United States</country>
@@ -723,37 +739,46 @@
 		<location>San Francisco, California, United States</location>
 		<latitude>37.792000</latitude>
 		<longitude>-122.408997</longitude>
+		<visitLocalTime>17:33:58</visitLocalTime>
+		<visitLocalHour>17</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Domain landed</customVariableName1>
+				<customVariableValue1>piwik.org</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>1360x768</resolution>
 		<plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/pdf.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon>
 				<pluginName>pdf</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/quicktime.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon>
 				<pluginName>quicktime</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/windowsmedia.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.gif</pluginIcon>
 				<pluginName>windowsmedia</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/silverlight.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon>
 				<pluginName>silverlight</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>17:33:58</visitLocalTime>
-		<visitLocalHour>17</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -775,6 +800,7 @@
 				
 				<url>https://piwik.org/log-analytics/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -790,6 +816,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -799,8 +826,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -814,35 +839,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Domain landed</customVariableName1>
-				<customVariableValue1>piwik.org</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>search</referrerType>
+		<referrerTypeName>Search Engines</referrerTypeName>
+		<referrerName>Google</referrerName>
+		<referrerKeyword>Keyword not defined</referrerKeyword>
+		<referrerKeywordPosition>2</referrerKeywordPosition>
+		<referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl>
+		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
+		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<deviceType>Desktop</deviceType>
-		<operatingSystem>Mac</operatingSystem>
+		<operatingSystem>Mac 10.9</operatingSystem>
+		<operatingSystemName>Mac</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
 		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
+		<operatingSystemVersion>10.9</operatingSystemVersion>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
 		<browser>Safari 7.0</browser>
 		<browserName>Safari</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon>
 		<browserCode>SF</browserCode>
 		<browserVersion>7.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>search</referrerType>
-		<referrerTypeName>Search Engines</referrerTypeName>
-		<referrerName>Google</referrerName>
-		<referrerKeyword>Keyword not defined</referrerKeyword>
-		<referrerKeywordPosition>2</referrerKeywordPosition>
-		<referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl>
-		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
-		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
 		<country>Japan</country>
@@ -854,25 +874,34 @@
 		<location>Nihon'odori, Kanagawa, Japan</location>
 		<latitude>35.450001</latitude>
 		<longitude>139.649994</longitude>
+		<visitLocalTime>09:33:50</visitLocalTime>
+		<visitLocalHour>9</visitLocalHour>
+		<daysSinceLastVisit>1</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Domain landed</customVariableName1>
+				<customVariableValue1>piwik.org</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>2560x1440</resolution>
 		<plugins>pdf, java, quicktime</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/pdf.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon>
 				<pluginName>pdf</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/quicktime.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon>
 				<pluginName>quicktime</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>09:33:50</visitLocalTime>
-		<visitLocalHour>9</visitLocalHour>
-		<daysSinceLastVisit>1</daysSinceLastVisit>
 		
 		
 		
@@ -894,6 +923,7 @@
 				
 				<url>http://piwik.org/blog/2014/03/piwik-2-1-massive-performance-reliability-improvements/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -910,6 +940,7 @@
 				</customVariables>
 				<generationTime>0.12s</generationTime>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -919,8 +950,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -934,35 +963,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Domain landed</customVariableName1>
-				<customVariableValue1>piwik.org</customVariableValue1>
-			</row>
-		</customVariables>
-		<deviceType>Unknown</deviceType>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>website</referrerType>
+		<referrerTypeName>Websites</referrerTypeName>
+		<referrerName>berndjung.com</referrerName>
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl>http://berndjung.com/piwik/index.php?module=CoreHome&amp;action=index&amp;idSite=1&amp;period=day&amp;date=today</referrerUrl>
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
+		<deviceType>Smartphone</deviceType>
 		<operatingSystem>Android</operatingSystem>
+		<operatingSystemName>Android</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon>
 		<operatingSystemCode>AND</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon>
+		<operatingSystemVersion />
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 27.0</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>27.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>website</referrerType>
-		<referrerTypeName>Websites</referrerTypeName>
-		<referrerName>berndjung.com</referrerName>
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl>http://berndjung.com/piwik/index.php?module=CoreHome&amp;action=index&amp;idSite=1&amp;period=day&amp;date=today</referrerUrl>
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>Germany</country>
@@ -974,17 +998,26 @@
 		<location>Weilerswist, Nordrhein-Westfalen, Germany</location>
 		<latitude>50.766998</latitude>
 		<longitude>6.833000</longitude>
+		<visitLocalTime>01:33:31</visitLocalTime>
+		<visitLocalHour>1</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Domain landed</customVariableName1>
+				<customVariableValue1>piwik.org</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>360x640</resolution>
 		<plugins>flash</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>01:33:31</visitLocalTime>
-		<visitLocalHour>1</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -1006,6 +1039,7 @@
 				
 				<url>http://piwik.org/log-analytics/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -1022,6 +1056,7 @@
 				</customVariables>
 				<generationTime>0.15s</generationTime>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -1031,8 +1066,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -1046,35 +1079,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Domain landed</customVariableName1>
-				<customVariableValue1>piwik.org</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>website</referrerType>
+		<referrerTypeName>Websites</referrerTypeName>
+		<referrerName>forum.golem.de</referrerName>
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl>http://forum.golem.de/kommentare/security/urteil-zu-tracking-nutzer-muessen-piwik-analyse-widersprechen-koennen/piwik-log-analytics/80715,3669355,3669355,read.html</referrerUrl>
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemCode>WI7</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>7</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 27.0</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>27.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>website</referrerType>
-		<referrerTypeName>Websites</referrerTypeName>
-		<referrerName>forum.golem.de</referrerName>
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl>http://forum.golem.de/kommentare/security/urteil-zu-tracking-nutzer-muessen-piwik-analyse-widersprechen-koennen/piwik-log-analytics/80715,3669355,3669355,read.html</referrerUrl>
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>Germany</country>
@@ -1086,37 +1114,46 @@
 		<location>Mainz, Rheinland-Pfalz, Germany</location>
 		<latitude>50</latitude>
 		<longitude>8.271000</longitude>
+		<visitLocalTime>01:33:13</visitLocalTime>
+		<visitLocalHour>1</visitLocalHour>
+		<daysSinceLastVisit>3</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Domain landed</customVariableName1>
+				<customVariableValue1>piwik.org</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>2560x1440</resolution>
 		<plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/pdf.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon>
 				<pluginName>pdf</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/quicktime.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon>
 				<pluginName>quicktime</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/windowsmedia.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.gif</pluginIcon>
 				<pluginName>windowsmedia</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/silverlight.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon>
 				<pluginName>silverlight</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>01:33:13</visitLocalTime>
-		<visitLocalHour>1</visitLocalHour>
-		<daysSinceLastVisit>3</daysSinceLastVisit>
 		
 		
 		
@@ -1146,6 +1183,7 @@
 				<timeSpent>2</timeSpent>
 				<timeSpentPretty>2s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -1156,6 +1194,7 @@
 				
 				<url>http://piwik.org/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -1174,6 +1213,7 @@
 				<timeSpent>7</timeSpent>
 				<timeSpentPretty>7s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>download</type>
@@ -1189,6 +1229,7 @@
 					</row>
 				</customVariables>
 				<icon>plugins/Morpheus/images/download.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -1198,8 +1239,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>3</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -1213,35 +1252,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>10</visitDuration>
 		<visitDurationPretty>10s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Domain landed</customVariableName1>
-				<customVariableValue1>piwik.org</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>3</actions>
+		<referrerType>search</referrerType>
+		<referrerTypeName>Search Engines</referrerTypeName>
+		<referrerName>Google</referrerName>
+		<referrerKeyword>Keyword not defined</referrerKeyword>
+		<referrerKeywordPosition>1</referrerKeywordPosition>
+		<referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl>
+		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
+		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows 8</operatingSystem>
-		<operatingSystemCode>WI8</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI8.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>8</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 27.0</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>27.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>search</referrerType>
-		<referrerTypeName>Search Engines</referrerTypeName>
-		<referrerName>Google</referrerName>
-		<referrerKeyword>Keyword not defined</referrerKeyword>
-		<referrerKeywordPosition>1</referrerKeywordPosition>
-		<referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl>
-		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
-		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>Russian Federation</country>
@@ -1253,21 +1287,30 @@
 		<location>Moscow, Moscow City, Russian Federation</location>
 		<latitude>55.751999</latitude>
 		<longitude>37.616001</longitude>
+		<visitLocalTime>04:28:18</visitLocalTime>
+		<visitLocalHour>4</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Domain landed</customVariableName1>
+				<customVariableValue1>piwik.org</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>1920x1080</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>04:28:18</visitLocalTime>
-		<visitLocalHour>4</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -1289,6 +1332,7 @@
 				
 				<url>http://piwik.org/docs/installation/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -1305,6 +1349,7 @@
 				</customVariables>
 				<generationTime>0.13s</generationTime>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -1314,8 +1359,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -1329,35 +1372,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Domain landed</customVariableName1>
-				<customVariableValue1>piwik.org</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl>http://piwik.org/docs/installation/</referrerUrl>
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemCode>WI7</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>7</operatingSystemVersion>
 		<browserFamily>Blink</browserFamily>
 		<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
 		<browser>Chrome 33.0</browser>
 		<browserName>Chrome</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>33.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl>http://piwik.org/docs/installation/</referrerUrl>
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>Turkey</country>
@@ -1369,29 +1407,38 @@
 		<location>Esentepe, Rize, Turkey</location>
 		<latitude>40.979000</latitude>
 		<longitude>40.415001</longitude>
+		<visitLocalTime>02:32:21</visitLocalTime>
+		<visitLocalHour>2</visitLocalHour>
+		<daysSinceLastVisit>8</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Domain landed</customVariableName1>
+				<customVariableValue1>piwik.org</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>1366x768</resolution>
 		<plugins>pdf, flash, java, silverlight</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/pdf.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon>
 				<pluginName>pdf</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/silverlight.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon>
 				<pluginName>silverlight</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>02:32:21</visitLocalTime>
-		<visitLocalHour>2</visitLocalHour>
-		<daysSinceLastVisit>8</daysSinceLastVisit>
 		
 		
 		
@@ -1413,6 +1460,7 @@
 				
 				<url>http://piwik.org/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -1429,6 +1477,7 @@
 				</customVariables>
 				<generationTime>0.06s</generationTime>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -1438,8 +1487,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -1453,35 +1500,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Domain landed</customVariableName1>
-				<customVariableValue1>piwik.org</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>website</referrerType>
+		<referrerTypeName>Websites</referrerTypeName>
+		<referrerName>musicforeveryoneradio.be</referrerName>
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl>http://musicforeveryoneradio.be:2222/CMD_PLUGINS/installatron/index.raw</referrerUrl>
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemCode>WI7</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>7</operatingSystemVersion>
 		<browserFamily>Blink</browserFamily>
 		<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
 		<browser>Chrome 33.0</browser>
 		<browserName>Chrome</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>33.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>website</referrerType>
-		<referrerTypeName>Websites</referrerTypeName>
-		<referrerName>musicforeveryoneradio.be</referrerName>
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl>http://musicforeveryoneradio.be:2222/CMD_PLUGINS/installatron/index.raw</referrerUrl>
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>Belgium</country>
@@ -1493,29 +1535,38 @@
 		<location>Maaseik, Limburg, Belgium</location>
 		<latitude>51.099998</latitude>
 		<longitude>5.800000</longitude>
+		<visitLocalTime>01:34:18</visitLocalTime>
+		<visitLocalHour>1</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Domain landed</customVariableName1>
+				<customVariableValue1>piwik.org</customVariableValue1>
+			</row>
+		</customVariables>
 		<resolution>1920x1080</resolution>
 		<plugins>pdf, flash, java, silverlight</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/pdf.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon>
 				<pluginName>pdf</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/silverlight.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon>
 				<pluginName>silverlight</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>01:34:18</visitLocalTime>
-		<visitLocalHour>1</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -1529,32 +1580,34 @@
 		
 		<actionDetails>
 			<row>
-				<type>goal</type>
-				<goalName>all</goalName>
-				<goalId>1</goalId>
-				<revenue>5</revenue>
-				<goalPageId>48</goalPageId>
-				
-				<url>http://piwik.net/blog/category/meta/</url>
-				<icon>plugins/Morpheus/images/goal.png</icon>
-			</row>
-			<row>
 				<type>action</type>
 				<url>http://piwik.net/blog/category/meta/</url>
 				<pageTitle />
 				<pageIdAction>1</pageIdAction>
 				
-				<pageId>56</pageId>
+				<pageId>48</pageId>
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTime>0.02s</generationTime>
-				<timeSpent>52</timeSpent>
-				<timeSpentPretty>52s</timeSpentPretty>
+				<generationTime>0.12s</generationTime>
+				<timeSpent>0</timeSpent>
+				<timeSpentPretty>0s</timeSpentPretty>
 				<icon />
+				
+			</row>
+			<row>
+				<type>goal</type>
+				<goalName>all</goalName>
+				<goalId>1</goalId>
+				<revenue>5</revenue>
+				<goalPageId>48</goalPageId>
+				
+				<url>http://piwik.net/blog/category/meta/</url>
+				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -1573,6 +1626,7 @@
 				<timeSpent>0</timeSpent>
 				<timeSpentPretty>0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -1580,17 +1634,18 @@
 				<pageTitle />
 				<pageIdAction>1</pageIdAction>
 				
-				<pageId>48</pageId>
+				<pageId>56</pageId>
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTime>0.12s</generationTime>
-				<timeSpent>0</timeSpent>
-				<timeSpentPretty>0s</timeSpentPretty>
+				<generationTime>0.02s</generationTime>
+				<timeSpent>52</timeSpent>
+				<timeSpentPretty>52s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -1598,17 +1653,18 @@
 				<pageTitle />
 				<pageIdAction>2</pageIdAction>
 				
-				<pageId>57</pageId>
+				<pageId>49</pageId>
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTime>0.24s</generationTime>
-				<timeSpent>26</timeSpent>
-				<timeSpentPretty>26s</timeSpentPretty>
+				<generationTime>0.23s</generationTime>
+				<timeSpent>50</timeSpent>
+				<timeSpentPretty>50s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -1616,17 +1672,18 @@
 				<pageTitle />
 				<pageIdAction>2</pageIdAction>
 				
-				<pageId>49</pageId>
+				<pageId>53</pageId>
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTime>0.23s</generationTime>
-				<timeSpent>52</timeSpent>
-				<timeSpentPretty>52s</timeSpentPretty>
+				<generationTime>0.29s</generationTime>
+				<timeSpent>49</timeSpent>
+				<timeSpentPretty>49s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -1634,17 +1691,18 @@
 				<pageTitle />
 				<pageIdAction>2</pageIdAction>
 				
-				<pageId>53</pageId>
+				<pageId>57</pageId>
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTime>0.29s</generationTime>
-				<timeSpent>52</timeSpent>
-				<timeSpentPretty>52s</timeSpentPretty>
+				<generationTime>0.24s</generationTime>
+				<timeSpent>26</timeSpent>
+				<timeSpentPretty>26s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -1652,17 +1710,18 @@
 				<pageTitle />
 				<pageIdAction>3</pageIdAction>
 				
-				<pageId>54</pageId>
+				<pageId>50</pageId>
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTime>0.62s</generationTime>
-				<timeSpent>7</timeSpent>
-				<timeSpentPretty>7s</timeSpentPretty>
+				<generationTime>1.32s</generationTime>
+				<timeSpent>26</timeSpent>
+				<timeSpentPretty>26s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -1670,17 +1729,18 @@
 				<pageTitle />
 				<pageIdAction>3</pageIdAction>
 				
-				<pageId>50</pageId>
+				<pageId>54</pageId>
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTime>1.32s</generationTime>
-				<timeSpent>26</timeSpent>
-				<timeSpentPretty>26s</timeSpentPretty>
+				<generationTime>0.62s</generationTime>
+				<timeSpent>7</timeSpent>
+				<timeSpentPretty>7s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -1688,15 +1748,18 @@
 				<pageTitle />
 				<pageIdAction>4</pageIdAction>
 				
-				<pageId>55</pageId>
+				<pageId>51</pageId>
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTime>0.34s</generationTime>
+				<generationTime>0.54s</generationTime>
+				<timeSpent>8</timeSpent>
+				<timeSpentPretty>8s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -1704,17 +1767,16 @@
 				<pageTitle />
 				<pageIdAction>4</pageIdAction>
 				
-				<pageId>51</pageId>
+				<pageId>55</pageId>
 				<customVariables>
 					<row>
 						<customVariablePageName1>HTTP-code</customVariablePageName1>
 						<customVariablePageValue1>200</customVariablePageValue1>
 					</row>
 				</customVariables>
-				<generationTime>0.54s</generationTime>
-				<timeSpent>7</timeSpent>
-				<timeSpentPretty>7s</timeSpentPretty>
+				<generationTime>0.34s</generationTime>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -1724,8 +1786,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>10</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -1739,23 +1799,115 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>54</visitDuration>
 		<visitDurationPretty>54s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>10</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Unknown</deviceType>
 		<operatingSystem>Unknown</operatingSystem>
+		<operatingSystemName>Unknown</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
 		<operatingSystemCode>UNK</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+		<operatingSystemVersion>UNK</operatingSystemVersion>
 		<browserFamily />
 		<browserFamilyDescription>Unknown</browserFamilyDescription>
 		<browser>Unknown</browser>
 		<browserName>Unknown</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion />
 		<events>0</events>
+		<continent>Asia</continent>
+		<continentCode>asi</continentCode>
+		<country>Japan</country>
+		<countryCode>jp</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Japan</location>
+		<latitude>36</latitude>
+		<longitude>138</longitude>
+		<visitLocalTime>08:10:38</visitLocalTime>
+		<visitLocalHour>8</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
+		<customVariables>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
+		
+		
+		
+		
+		
+	</row>
+	<row>
+		<idSite>1</idSite>
+		<idVisit>46</idVisit>
+		<visitIp>192.0.2.10</visitIp>
+		
+		<actionDetails>
+			<row>
+				<type>goal</type>
+				<goalName>all</goalName>
+				<goalId>1</goalId>
+				<revenue>5</revenue>
+				<goalPageId>64</goalPageId>
+				
+				<url>http://piwik.net/view/my/file.html</url>
+				<icon>plugins/Morpheus/images/goal.png</icon>
+				
+			</row>
+			<row>
+				<type>action</type>
+				<url>http://piwik.net/view/my/file.html</url>
+				<pageTitle />
+				<pageIdAction>64</pageIdAction>
+				
+				<pageId>64</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
+				<generationTime>0.001s</generationTime>
+				<icon />
+				
+			</row>
+		</actionDetails>
+		<goalConversions>1</goalConversions>
+		<siteCurrency>USD</siteCurrency>
+		<siteCurrencySymbol>$</siteCurrencySymbol>
+		
+		
+		
+		
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+		<visitCount>1</visitCount>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
+		<daysSinceFirstVisit>0</daysSinceFirstVisit>
+		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>1</actions>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -1764,23 +1916,800 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<continent>Asia</continent>
-		<continentCode>asi</continentCode>
-		<country>Japan</country>
-		<countryCode>jp</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/jp.png</countryFlag>
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Mac</operatingSystem>
+		<operatingSystemName>Mac</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
+		<operatingSystemCode>MAC</operatingSystemCode>
+		<operatingSystemVersion />
+		<browserFamily />
+		<browserFamilyDescription>Unknown</browserFamilyDescription>
+		<browser>Unknown</browser>
+		<browserName>Unknown</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+		<browserCode>UNK</browserCode>
+		<browserVersion />
+		<events>0</events>
+		<continent>Unknown</continent>
+		<continentCode>unk</continentCode>
+		<country>Unknown</country>
+		<countryCode>xx</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
 		<region />
 		<regionCode />
 		<city />
-		<location>Japan</location>
-		<latitude>36</latitude>
-		<longitude>138</longitude>
+		<location>Unknown</location>
+		<latitude />
+		<longitude />
+		<visitLocalTime>01:13:11</visitLocalTime>
+		<visitLocalHour>1</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
 		<resolution>unknown</resolution>
 		<plugins />
 		<pluginsIcons />
-		<visitLocalTime>08:10:38</visitLocalTime>
-		<visitLocalHour>8</visitLocalHour>
+		
+		
+		
+		
+		
+	</row>
+	<row>
+		<idSite>1</idSite>
+		<idVisit>45</idVisit>
+		<visitIp>172.20.1.0</visitIp>
+		
+		<actionDetails>
+			<row>
+				<type>action</type>
+				<url>http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</url>
+				<pageTitle>302/URL = http%3A%2F%2Fpiwik.net%2FCitrix%2FXenApp%2FWan%2Fauth%2Flogin.jsp</pageTitle>
+				<pageIdAction>62</pageIdAction>
+				
+				<pageId>62</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>302</customVariablePageValue1>
+					</row>
+				</customVariables>
+				<timeSpent>240</timeSpent>
+				<timeSpentPretty>4 min 0s</timeSpentPretty>
+				<icon />
+				
+			</row>
+			<row>
+				<type>goal</type>
+				<goalName>all</goalName>
+				<goalId>1</goalId>
+				<revenue>5</revenue>
+				<goalPageId>62</goalPageId>
+				
+				<url>http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</url>
+				<icon>plugins/Morpheus/images/goal.png</icon>
+				
+			</row>
+			<row>
+				<type>action</type>
+				<url>http://piwik.net/Citrix/XenApp/Wan/auth/silentDetection.jsp</url>
+				<pageTitle />
+				<pageIdAction>63</pageIdAction>
+				
+				<pageId>63</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
+				<icon />
+				
+			</row>
+		</actionDetails>
+		<goalConversions>1</goalConversions>
+		<siteCurrency>USD</siteCurrency>
+		<siteCurrencySymbol>$</siteCurrencySymbol>
+		
+		
+		
+		
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+		<visitCount>1</visitCount>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
+		<daysSinceFirstVisit>0</daysSinceFirstVisit>
+		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+		<visitDuration>242</visitDuration>
+		<visitDurationPretty>4 min 2s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>2</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows</operatingSystem>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion />
+		<browserFamily>Trident</browserFamily>
+		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
+		<browser>Internet Explorer 8.0</browser>
+		<browserName>Internet Explorer</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
+		<browserCode>IE</browserCode>
+		<browserVersion>8.0</browserVersion>
+		<events>0</events>
+		<continent>Unknown</continent>
+		<continentCode>unk</continentCode>
+		<country>Unknown</country>
+		<countryCode>xx</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Unknown</location>
+		<latitude />
+		<longitude />
+		<visitLocalTime>11:55:13</visitLocalTime>
+		<visitLocalHour>11</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
+		
+		
+		
+		
+		
+	</row>
+	<row>
+		<idSite>1</idSite>
+		<idVisit>51</idVisit>
+		<visitIp>173.5.0.0</visitIp>
+		
+		<actionDetails>
+			<row>
+				<type>goal</type>
+				<goalName>all</goalName>
+				<goalId>1</goalId>
+				<revenue>5</revenue>
+				<goalPageId>71</goalPageId>
+				
+				<url>http://piwik.net/hello/from/another/world/6,681965</url>
+				<icon>plugins/Morpheus/images/goal.png</icon>
+				
+			</row>
+			<row>
+				<type>action</type>
+				<url>http://piwik.net/hello/from/another/world/6,681965</url>
+				<pageTitle />
+				<pageIdAction>60</pageIdAction>
+				
+				<pageId>71</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>Generation Time</customVariablePageName1>
+						<customVariablePageValue1>359</customVariablePageValue1>
+					</row>
+					<row>
+						<customVariablePageName2>Windows Status Code</customVariablePageName2>
+						<customVariablePageValue2>96</customVariablePageValue2>
+					</row>
+					<row>
+						<customVariablePageName3>HTTP-code</customVariablePageName3>
+						<customVariablePageValue3>200</customVariablePageValue3>
+					</row>
+				</customVariables>
+				<generationTime>0.36s</generationTime>
+				<icon />
+				
+			</row>
+		</actionDetails>
+		<goalConversions>1</goalConversions>
+		<siteCurrency>USD</siteCurrency>
+		<siteCurrencySymbol>$</siteCurrencySymbol>
+		
+		
+		
+		
+		<userId />
+		<visitorType>returning</visitorType>
+		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+		<visitCount>1</visitCount>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
+		<daysSinceFirstVisit>0</daysSinceFirstVisit>
+		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+		<visitDuration>1</visitDuration>
+		<visitDurationPretty>1s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Mac 10.10</operatingSystem>
+		<operatingSystemName>Mac</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
+		<operatingSystemCode>MAC</operatingSystemCode>
+		<operatingSystemVersion>10.10</operatingSystemVersion>
+		<browserFamily>Blink</browserFamily>
+		<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
+		<browser>Chrome 37.0</browser>
+		<browserName>Chrome</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
+		<browserCode>CH</browserCode>
+		<browserVersion>37.0</browserVersion>
+		<events>0</events>
+		<continent>North America</continent>
+		<continentCode>amn</continentCode>
+		<country>United States</country>
+		<countryCode>us</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>United States</location>
+		<latitude>38</latitude>
+		<longitude>-97</longitude>
+		<visitLocalTime>17:30:00</visitLocalTime>
+		<visitLocalHour>17</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>User Name</customVariableName1>
+				<customVariableValue1>user2</customVariableValue1>
+			</row>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
+		
+		
+		
+		
+		
+	</row>
+	<row>
+		<idSite>1</idSite>
+		<idVisit>42</idVisit>
+		<visitIp>70.95.0.0</visitIp>
+		
+		<actionDetails>
+			<row>
+				<type>action</type>
+				<url>http://piwik.net/Products/theProduct</url>
+				<pageTitle />
+				<pageIdAction>55</pageIdAction>
+				
+				<pageId>58</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
+				<generationTime>0.11s</generationTime>
+				<timeSpent>0</timeSpent>
+				<timeSpentPretty>0s</timeSpentPretty>
+				<icon />
+				
+			</row>
+			<row>
+				<type>goal</type>
+				<goalName>all</goalName>
+				<goalId>1</goalId>
+				<revenue>5</revenue>
+				<goalPageId>58</goalPageId>
+				
+				<url>http://piwik.net/Products/theProduct</url>
+				<icon>plugins/Morpheus/images/goal.png</icon>
+				
+			</row>
+			<row>
+				<type>action</type>
+				<url>http://piwik.net/Topic/hw43061</url>
+				<pageTitle>301/URL = http%3A%2F%2Fpiwik.net%2FTopic%2Fhw43061</pageTitle>
+				<pageIdAction>57</pageIdAction>
+				
+				<pageId>59</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>301</customVariablePageValue1>
+					</row>
+				</customVariables>
+				<timeSpent>0</timeSpent>
+				<timeSpentPretty>0s</timeSpentPretty>
+				<icon />
+				
+			</row>
+			<row>
+				<type>action</type>
+				<url>http://piwik.net/Products/theProduct</url>
+				<pageTitle />
+				<pageIdAction>55</pageIdAction>
+				
+				<pageId>68</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>Generation Time</customVariablePageName1>
+						<customVariablePageValue1>109</customVariablePageValue1>
+					</row>
+					<row>
+						<customVariablePageName2>Windows Status Code</customVariablePageName2>
+						<customVariablePageValue2>32</customVariablePageValue2>
+					</row>
+					<row>
+						<customVariablePageName3>HTTP-code</customVariablePageName3>
+						<customVariablePageValue3>200</customVariablePageValue3>
+					</row>
+				</customVariables>
+				<generationTime>0.11s</generationTime>
+				<icon />
+				
+			</row>
+		</actionDetails>
+		<goalConversions>1</goalConversions>
+		<siteCurrency>USD</siteCurrency>
+		<siteCurrencySymbol>$</siteCurrencySymbol>
+		
+		
+		
+		
+		<userId>user1</userId>
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+		<visitCount>1</visitCount>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
+		<daysSinceFirstVisit>0</daysSinceFirstVisit>
+		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+		<visitDuration>2</visitDuration>
+		<visitDurationPretty>2s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>3</actions>
+		<referrerType>website</referrerType>
+		<referrerTypeName>Websites</referrerTypeName>
+		<referrerName>example.com</referrerName>
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl>http://example.com/Search/SearchResults.pg?informationRecipient.languageCode.c=en</referrerUrl>
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
+		<deviceType>Smartphone</deviceType>
+		<operatingSystem>Android 4.4</operatingSystem>
+		<operatingSystemName>Android</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon>
+		<operatingSystemCode>AND</operatingSystemCode>
+		<operatingSystemVersion>4.4</operatingSystemVersion>
+		<browserFamily>Blink</browserFamily>
+		<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
+		<browser>Chrome Mobile 39.0</browser>
+		<browserName>Chrome Mobile</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CM.gif</browserIcon>
+		<browserCode>CM</browserCode>
+		<browserVersion>39.0</browserVersion>
+		<events>0</events>
+		<continent>North America</continent>
+		<continentCode>amn</continentCode>
+		<country>United States</country>
+		<countryCode>us</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>United States</location>
+		<latitude>38</latitude>
+		<longitude>-97</longitude>
+		<visitLocalTime>17:00:00</visitLocalTime>
+		<visitLocalHour>17</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>User Name</customVariableName1>
+				<customVariableValue1>user1</customVariableValue1>
+			</row>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
+		
+		
+		
+		
+		
+	</row>
+	<row>
+		<idSite>1</idSite>
+		<idVisit>43</idVisit>
+		<visitIp>173.5.0.0</visitIp>
+		
+		<actionDetails>
+			<row>
+				<type>goal</type>
+				<goalName>all</goalName>
+				<goalId>1</goalId>
+				<revenue>5</revenue>
+				<goalPageId>60</goalPageId>
+				
+				<url>http://piwik.net/hello/world/6,681965</url>
+				<icon>plugins/Morpheus/images/goal.png</icon>
+				
+			</row>
+			<row>
+				<type>action</type>
+				<url>http://piwik.net/hello/world/6,681965</url>
+				<pageTitle>404/URL = http%3A%2F%2Fpiwik.net%2Fhello%2Fworld%2F6%2C681965</pageTitle>
+				<pageIdAction>59</pageIdAction>
+				
+				<pageId>60</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>404</customVariablePageValue1>
+					</row>
+				</customVariables>
+				<generationTime>0.36s</generationTime>
+				<icon />
+				
+			</row>
+		</actionDetails>
+		<goalConversions>1</goalConversions>
+		<siteCurrency>USD</siteCurrency>
+		<siteCurrencySymbol>$</siteCurrencySymbol>
+		
+		
+		
+		
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+		<visitCount>1</visitCount>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
+		<daysSinceFirstVisit>0</daysSinceFirstVisit>
+		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Mac 10.10</operatingSystem>
+		<operatingSystemName>Mac</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
+		<operatingSystemCode>MAC</operatingSystemCode>
+		<operatingSystemVersion>10.10</operatingSystemVersion>
+		<browserFamily>Blink</browserFamily>
+		<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
+		<browser>Chrome 37.0</browser>
+		<browserName>Chrome</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
+		<browserCode>CH</browserCode>
+		<browserVersion>37.0</browserVersion>
+		<events>0</events>
+		<continent>North America</continent>
+		<continentCode>amn</continentCode>
+		<country>United States</country>
+		<countryCode>us</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>United States</location>
+		<latitude>38</latitude>
+		<longitude>-97</longitude>
+		<visitLocalTime>17:00:00</visitLocalTime>
+		<visitLocalHour>17</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
+		
+		
+		
+		
+		
+	</row>
+	<row>
+		<idSite>1</idSite>
+		<idVisit>44</idVisit>
+		<visitIp>173.5.0.0</visitIp>
+		
+		<actionDetails>
+			<row>
+				<type>action</type>
+				<url>http://piwik.net/hello/world/6,681965</url>
+				<pageTitle>404/URL = http%3A%2F%2Fpiwik.net%2Fhello%2Fworld%2F6%2C681965</pageTitle>
+				<pageIdAction>59</pageIdAction>
+				
+				<pageId>70</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>Generation Time</customVariablePageName1>
+						<customVariablePageValue1>359</customVariablePageValue1>
+					</row>
+					<row>
+						<customVariablePageName2>Windows Status Code</customVariablePageName2>
+						<customVariablePageValue2>24</customVariablePageValue2>
+					</row>
+					<row>
+						<customVariablePageName3>HTTP-code</customVariablePageName3>
+						<customVariablePageValue3>404</customVariablePageValue3>
+					</row>
+				</customVariables>
+				<generationTime>0.36s</generationTime>
+				<timeSpent>0</timeSpent>
+				<timeSpentPretty>0s</timeSpentPretty>
+				<icon />
+				
+			</row>
+			<row>
+				<type>goal</type>
+				<goalName>all</goalName>
+				<goalId>1</goalId>
+				<revenue>5</revenue>
+				<goalPageId>61</goalPageId>
+				
+				<url>http://piwik.net/hello/from/another/world/6,681965</url>
+				<icon>plugins/Morpheus/images/goal.png</icon>
+				
+			</row>
+			<row>
+				<type>action</type>
+				<url>http://piwik.net/hello/from/another/world/6,681965</url>
+				<pageTitle />
+				<pageIdAction>60</pageIdAction>
+				
+				<pageId>61</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
+				<generationTime>0.36s</generationTime>
+				<icon />
+				
+			</row>
+		</actionDetails>
+		<goalConversions>1</goalConversions>
+		<siteCurrency>USD</siteCurrency>
+		<siteCurrencySymbol>$</siteCurrencySymbol>
+		
+		
+		
+		
+		<userId>user2</userId>
+		<visitorType>returning</visitorType>
+		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+		<visitCount>1</visitCount>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
+		<daysSinceFirstVisit>0</daysSinceFirstVisit>
+		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+		<visitDuration>1</visitDuration>
+		<visitDurationPretty>1s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>2</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Mac 10.10</operatingSystem>
+		<operatingSystemName>Mac</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
+		<operatingSystemCode>MAC</operatingSystemCode>
+		<operatingSystemVersion>10.10</operatingSystemVersion>
+		<browserFamily>Blink</browserFamily>
+		<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
+		<browser>Chrome 37.0</browser>
+		<browserName>Chrome</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
+		<browserCode>CH</browserCode>
+		<browserVersion>37.0</browserVersion>
+		<events>0</events>
+		<continent>North America</continent>
+		<continentCode>amn</continentCode>
+		<country>United States</country>
+		<countryCode>us</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>United States</location>
+		<latitude>38</latitude>
+		<longitude>-97</longitude>
+		<visitLocalTime>17:30:00</visitLocalTime>
+		<visitLocalHour>17</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
+		
+		
+		
+		
+		
+	</row>
+	<row>
+		<idSite>1</idSite>
+		<idVisit>50</idVisit>
+		<visitIp>70.95.32.0</visitIp>
+		
+		<actionDetails>
+			<row>
+				<type>goal</type>
+				<goalName>all</goalName>
+				<goalId>1</goalId>
+				<revenue>5</revenue>
+				<goalPageId>69</goalPageId>
+				
+				<url>http://piwik.net/Topic/hw43061</url>
+				<icon>plugins/Morpheus/images/goal.png</icon>
+				
+			</row>
+			<row>
+				<type>action</type>
+				<url>http://piwik.net/Topic/hw43061</url>
+				<pageTitle>301/URL = http%3A%2F%2Fpiwik.net%2FTopic%2Fhw43061</pageTitle>
+				<pageIdAction>57</pageIdAction>
+				
+				<pageId>69</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>Generation Time</customVariablePageName1>
+						<customVariablePageValue1>0</customVariablePageValue1>
+					</row>
+					<row>
+						<customVariablePageName2>Windows Status Code</customVariablePageName2>
+						<customVariablePageValue2>42</customVariablePageValue2>
+					</row>
+					<row>
+						<customVariablePageName3>HTTP-code</customVariablePageName3>
+						<customVariablePageValue3>301</customVariablePageValue3>
+					</row>
+				</customVariables>
+				<icon />
+				
+			</row>
+		</actionDetails>
+		<goalConversions>1</goalConversions>
+		<siteCurrency>USD</siteCurrency>
+		<siteCurrencySymbol>$</siteCurrencySymbol>
+		
+		
+		
+		
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+		<visitCount>1</visitCount>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
+		<daysSinceFirstVisit>0</daysSinceFirstVisit>
+		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Mac 10.10</operatingSystem>
+		<operatingSystemName>Mac</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
+		<operatingSystemCode>MAC</operatingSystemCode>
+		<operatingSystemVersion>10.10</operatingSystemVersion>
+		<browserFamily>Blink</browserFamily>
+		<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
+		<browser>Chrome 41.0</browser>
+		<browserName>Chrome</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
+		<browserCode>CH</browserCode>
+		<browserVersion>41.0</browserVersion>
+		<events>0</events>
+		<continent>North America</continent>
+		<continentCode>amn</continentCode>
+		<country>United States</country>
+		<countryCode>us</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>United States</location>
+		<latitude>38</latitude>
+		<longitude>-97</longitude>
+		<visitLocalTime>17:00:00</visitLocalTime>
+		<visitLocalHour>17</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>User Name</customVariableName1>
+				<customVariableValue1>user1</customVariableValue1>
+			</row>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		
 		
 		
@@ -1802,6 +2731,7 @@
 				
 				<url>http://example.org/index.htm</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -1825,6 +2755,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -1834,8 +2765,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -1849,35 +2778,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName5>VisitorType</customVariableName5>
-				<customVariableValue5>NewLoggedOut</customVariableValue5>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>website</referrerType>
+		<referrerTypeName>Websites</referrerTypeName>
+		<referrerName>piwik.org</referrerName>
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl>http://piwik.org/contribute%</referrerUrl>
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Trident</browserFamily>
 		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
 		<browser>Internet Explorer 6.0</browser>
 		<browserName>Internet Explorer</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>6.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>website</referrerType>
-		<referrerTypeName>Websites</referrerTypeName>
-		<referrerName>piwik.org</referrerName>
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl>http://piwik.org/contribute%</referrerUrl>
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
 		<country>Unknown</country>
@@ -1889,21 +2813,30 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName5>VisitorType</customVariableName5>
+				<customVariableValue5>NewLoggedOut</customVariableValue5>
+			</row>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -1925,6 +2858,7 @@
 				
 				<url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -1940,6 +2874,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -1949,8 +2884,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -1964,35 +2897,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName3>Forum status</customVariableName3>
-				<customVariableValue3>Anonymous</customVariableValue3>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>website</referrerType>
+		<referrerTypeName>Websites</referrerTypeName>
+		<referrerName>sn110w.snt110.mail.live.com</referrerName>
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl>http://sn110w.snt110.mail.live.com/mail/InboxLight.aspx?n=184083971</referrerUrl>
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
 		<browser>Chrome 11.0</browser>
 		<browserName>Chrome</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>11.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>website</referrerType>
-		<referrerTypeName>Websites</referrerTypeName>
-		<referrerName>sn110w.snt110.mail.live.com</referrerName>
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl>http://sn110w.snt110.mail.live.com/mail/InboxLight.aspx?n=184083971</referrerUrl>
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
 		<country>Unknown</country>
@@ -2004,37 +2932,346 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>08:00:47</visitLocalTime>
+		<visitLocalHour>8</visitLocalHour>
+		<daysSinceLastVisit>444</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName3>Forum status</customVariableName3>
+				<customVariableValue3>Anonymous</customVariableValue3>
+			</row>
+		</customVariables>
 		<resolution>1280x800</resolution>
 		<plugins>pdf, flash, java, director, windowsmedia, gears</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/pdf.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon>
 				<pluginName>pdf</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
 				<pluginName>director</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/windowsmedia.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.gif</pluginIcon>
 				<pluginName>windowsmedia</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/gears.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/gears.gif</pluginIcon>
 				<pluginName>gears</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>08:00:47</visitLocalTime>
-		<visitLocalHour>8</visitLocalHour>
-		<daysSinceLastVisit>444</daysSinceLastVisit>
+		
+		
+		
+		
+		
+	</row>
+	<row>
+		<idSite>1</idSite>
+		<idVisit>49</idVisit>
+		<visitIp>72.45.67.32</visitIp>
+		
+		<actionDetails>
+			<row>
+				<type>goal</type>
+				<goalName>all</goalName>
+				<goalId>1</goalId>
+				<revenue>5</revenue>
+				<goalPageId>67</goalPageId>
+				
+				<url>http://piwik.net/</url>
+				<icon>plugins/Morpheus/images/goal.png</icon>
+				
+			</row>
+			<row>
+				<type>action</type>
+				<url>http://piwik.net/</url>
+				<pageTitle />
+				<pageIdAction>5</pageIdAction>
+				
+				<pageId>67</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
+				<generationTime>0.001s</generationTime>
+				<icon />
+				
+			</row>
+		</actionDetails>
+		<goalConversions>1</goalConversions>
+		<siteCurrency>USD</siteCurrency>
+		<siteCurrencySymbol>$</siteCurrencySymbol>
+		
+		
+		
+		
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+		<visitCount>1</visitCount>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
+		<daysSinceFirstVisit>0</daysSinceFirstVisit>
+		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>website</referrerType>
+		<referrerTypeName>Websites</referrerTypeName>
+		<referrerName>www.test.nl</referrerName>
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl>https://www.test.nl/</referrerUrl>
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
+		<deviceType>Desktop</deviceType>
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
+		<browserFamily>Blink</browserFamily>
+		<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
+		<browser>Chrome 39.0</browser>
+		<browserName>Chrome</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
+		<browserCode>CH</browserCode>
+		<browserVersion>39.0</browserVersion>
+		<events>0</events>
+		<continent>North America</continent>
+		<continentCode>amn</continentCode>
+		<country>Canada</country>
+		<countryCode>ca</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/ca.png</countryFlag>
+		<region>Nunavut</region>
+		<regionCode>NU</regionCode>
+		<city>Igloolik</city>
+		<location>Igloolik, Nunavut, Canada</location>
+		<latitude>69.400002</latitude>
+		<longitude>-81.800003</longitude>
+		<visitLocalTime>12:20:31</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
+		
+		
+		
+		
+		
+	</row>
+	<row>
+		<idSite>1</idSite>
+		<idVisit>48</idVisit>
+		<visitIp>192.0.2.222</visitIp>
+		
+		<actionDetails>
+			<row>
+				<type>event</type>
+				<url>http://piwik.net/shqshne4jdp4b6.cloudfront.net/cfx/st​?key=value</url>
+				<pageIdAction>65</pageIdAction>
+				
+				<pageId>66</pageId>
+				<eventCategory>cloudfront_rtmp</eventCategory>
+				<eventAction>play</eventAction>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
+				<eventName>myvideo</eventName>
+				<icon>plugins/Morpheus/images/event.png</icon>
+				
+			</row>
+		</actionDetails>
+		<goalConversions>0</goalConversions>
+		<siteCurrency>USD</siteCurrency>
+		<siteCurrencySymbol>$</siteCurrencySymbol>
+		
+		
+		
+		
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>0</visitConverted>
+		<visitConvertedIcon />
+		<visitCount>1</visitCount>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
+		<daysSinceFirstVisit>0</daysSinceFirstVisit>
+		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
+		<deviceType>Unknown</deviceType>
+		<operatingSystem>Unknown</operatingSystem>
+		<operatingSystemName>Unknown</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+		<operatingSystemCode>UNK</operatingSystemCode>
+		<operatingSystemVersion>UNK</operatingSystemVersion>
+		<browserFamily />
+		<browserFamilyDescription>Unknown</browserFamilyDescription>
+		<browser>Unknown</browser>
+		<browserName>Unknown</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+		<browserCode>UNK</browserCode>
+		<browserVersion />
+		<events>1</events>
+		<continent>Unknown</continent>
+		<continentCode>unk</continentCode>
+		<country>Unknown</country>
+		<countryCode>xx</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Unknown</location>
+		<latitude />
+		<longitude />
+		<visitLocalTime>23:51:21</visitLocalTime>
+		<visitLocalHour>23</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
+		
+		
+		
+		
+		
+	</row>
+	<row>
+		<idSite>1</idSite>
+		<idVisit>47</idVisit>
+		<visitIp>192.0.2.147</visitIp>
+		
+		<actionDetails>
+			<row>
+				<type>event</type>
+				<url>http://piwik.net/shqshne4jdp4b6.cloudfront.net/cfx/st​?key=value</url>
+				<pageIdAction>65</pageIdAction>
+				
+				<pageId>65</pageId>
+				<eventCategory>cloudfront_rtmp</eventCategory>
+				<eventAction>connect</eventAction>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
+				<icon>plugins/Morpheus/images/event.png</icon>
+				
+			</row>
+		</actionDetails>
+		<goalConversions>0</goalConversions>
+		<siteCurrency>USD</siteCurrency>
+		<siteCurrencySymbol>$</siteCurrencySymbol>
+		
+		
+		
+		
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>0</visitConverted>
+		<visitConvertedIcon />
+		<visitCount>1</visitCount>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
+		<daysSinceFirstVisit>0</daysSinceFirstVisit>
+		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+		<visitDuration>0</visitDuration>
+		<visitDurationPretty>0s</visitDurationPretty>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
+		<deviceType>Unknown</deviceType>
+		<operatingSystem>Unknown</operatingSystem>
+		<operatingSystemName>Unknown</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
+		<operatingSystemCode>UNK</operatingSystemCode>
+		<operatingSystemVersion>UNK</operatingSystemVersion>
+		<browserFamily />
+		<browserFamilyDescription>Unknown</browserFamilyDescription>
+		<browser>Unknown</browser>
+		<browserName>Unknown</browserName>
+		<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+		<browserCode>UNK</browserCode>
+		<browserVersion />
+		<events>1</events>
+		<continent>Unknown</continent>
+		<continentCode>unk</continentCode>
+		<country>Unknown</country>
+		<countryCode>xx</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Unknown</location>
+		<latitude />
+		<longitude />
+		<visitLocalTime>23:51:20</visitLocalTime>
+		<visitLocalHour>23</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		
 		
 		
@@ -2056,6 +3293,7 @@
 				
 				<url>http://piwik.net/blog/category/meta/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -2071,6 +3309,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -2080,8 +3319,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -2095,35 +3332,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Not-Bot</customVariableName1>
-				<customVariableValue1>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
-		<operatingSystem>Mac</operatingSystem>
+		<operatingSystem>Mac 10.6</operatingSystem>
+		<operatingSystemName>Mac</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
 		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
+		<operatingSystemVersion>10.6</operatingSystemVersion>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
 		<browser>RockMelt 0.9</browser>
 		<browserName>RockMelt</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
 		<browserCode>RM</browserCode>
 		<browserVersion>0.9</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
 		<country>Japan</country>
@@ -2135,12 +3367,21 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>20:15:41</visitLocalTime>
 		<visitLocalHour>20</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Not-Bot</customVariableName1>
+				<customVariableValue1>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</customVariableValue1>
+			</row>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		
 		
 		
@@ -2169,6 +3410,7 @@
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -2179,6 +3421,7 @@
 				
 				<url>http://piwik.net/moved-permanently</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -2194,6 +3437,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -2203,8 +3447,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>2</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -2218,35 +3460,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>182</visitDuration>
 		<visitDurationPretty>3 min 2s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Not-Bot</customVariableName1>
-				<customVariableValue1>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>2</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
-		<operatingSystem>Mac</operatingSystem>
+		<operatingSystem>Mac 10.6</operatingSystem>
+		<operatingSystemName>Mac</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
 		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
+		<operatingSystemVersion>10.6</operatingSystemVersion>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
 		<browser>RockMelt 0.9</browser>
 		<browserName>RockMelt</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
 		<browserCode>RM</browserCode>
 		<browserVersion>0.9</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
 		<country>Japan</country>
@@ -2258,12 +3495,21 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>19:12:40</visitLocalTime>
 		<visitLocalHour>19</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Not-Bot</customVariableName1>
+				<customVariableValue1>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</customVariableValue1>
+			</row>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		
 		
 		
@@ -2292,6 +3538,7 @@
 				<timeSpent>61</timeSpent>
 				<timeSpentPretty>1 min 1s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/download.png</icon>
+				
 			</row>
 			<row>
 				<type>download</type>
@@ -2309,6 +3556,7 @@
 				<timeSpent>61</timeSpent>
 				<timeSpentPretty>1 min 1s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/download.png</icon>
+				
 			</row>
 			<row>
 				<type>download</type>
@@ -2324,6 +3572,7 @@
 					</row>
 				</customVariables>
 				<icon>plugins/Morpheus/images/download.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -2333,8 +3582,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>3</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -2348,35 +3595,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>123</visitDuration>
 		<visitDurationPretty>2 min 3s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Not-Bot</customVariableName1>
-				<customVariableValue1>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>3</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
-		<operatingSystem>Mac</operatingSystem>
+		<operatingSystem>Mac 10.6</operatingSystem>
+		<operatingSystemName>Mac</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
 		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
+		<operatingSystemVersion>10.6</operatingSystemVersion>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
 		<browser>RockMelt 0.9</browser>
 		<browserName>RockMelt</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
 		<browserCode>RM</browserCode>
 		<browserVersion>0.9</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
 		<country>Japan</country>
@@ -2388,12 +3630,21 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>18:10:38</visitLocalTime>
 		<visitLocalHour>18</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Not-Bot</customVariableName1>
+				<customVariableValue1>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</customVariableValue1>
+			</row>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		
 		
 		
@@ -2415,6 +3666,7 @@
 				
 				<url>http://piwik.net/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -2430,6 +3682,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -2439,8 +3692,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -2454,35 +3705,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Bot</customVariableName1>
-				<customVariableValue1>Googlebot/2.1 (+http://www.googlebot.com/bot.html)</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Unknown</deviceType>
 		<operatingSystem>Bot</operatingSystem>
+		<operatingSystemName>Bot</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
 		<operatingSystemCode>BOT</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+		<operatingSystemVersion>UNK</operatingSystemVersion>
 		<browserFamily />
 		<browserFamilyDescription>Unknown</browserFamilyDescription>
 		<browser>Unknown</browser>
 		<browserName>Unknown</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion />
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
 		<country>United States</country>
@@ -2494,12 +3740,21 @@
 		<location>Ashburn, Virginia, United States</location>
 		<latitude>39.043999</latitude>
 		<longitude>-77.487999</longitude>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>17:48:08</visitLocalTime>
 		<visitLocalHour>17</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Bot</customVariableName1>
+				<customVariableValue1>Googlebot/2.1 (+http://www.googlebot.com/bot.html)</customVariableValue1>
+			</row>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		
 		
 		
@@ -2521,6 +3776,7 @@
 				
 				<url>http://piwik.net/to-an-error</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -2536,6 +3792,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -2545,8 +3802,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -2560,35 +3815,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Not-Bot</customVariableName1>
-				<customVariableValue1>Mozilla/5.0 (compatible; MSIE 10.6; Windows NT 6.1; Trident/5.0; InfoPath.2; SLCC1; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; .NET CLR 2.0.50727) 3gpp-gba UNTRUSTED/1.0</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemCode>WI7</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>7</operatingSystemVersion>
 		<browserFamily>Trident</browserFamily>
 		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
 		<browser>Internet Explorer 9.0</browser>
 		<browserName>Internet Explorer</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>9.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
 		<country>United States</country>
@@ -2600,12 +3850,21 @@
 		<location>Ashburn, Virginia, United States</location>
 		<latitude>39.043999</latitude>
 		<longitude>-77.487999</longitude>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>17:48:07</visitLocalTime>
 		<visitLocalHour>17</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Not-Bot</customVariableName1>
+				<customVariableValue1>Mozilla/5.0 (compatible; MSIE 10.6; Windows NT 6.1; Trident/5.0; InfoPath.2; SLCC1; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; .NET CLR 2.0.50727) 3gpp-gba UNTRUSTED/1.0</customVariableValue1>
+			</row>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		
 		
 		
@@ -2632,6 +3891,7 @@
 					</row>
 				</customVariables>
 				<icon>plugins/Morpheus/images/download.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -2641,8 +3901,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -2656,35 +3914,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Not-Bot</customVariableName1>
-				<customVariableValue1>Apache-HttpClient/4.2.1 (java 1.5)</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Unknown</deviceType>
 		<operatingSystem>Unknown</operatingSystem>
+		<operatingSystemName>Unknown</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
 		<operatingSystemCode>UNK</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+		<operatingSystemVersion>UNK</operatingSystemVersion>
 		<browserFamily />
 		<browserFamilyDescription>Unknown</browserFamilyDescription>
 		<browser>Unknown</browser>
 		<browserName>Unknown</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion />
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Oceania</continent>
 		<continentCode>oce</continentCode>
 		<country>Australia</country>
@@ -2696,12 +3949,21 @@
 		<location>Australia</location>
 		<latitude>-27</latitude>
 		<longitude>133</longitude>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>17:46:03</visitLocalTime>
 		<visitLocalHour>17</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Not-Bot</customVariableName1>
+				<customVariableValue1>Apache-HttpClient/4.2.1 (java 1.5)</customVariableValue1>
+			</row>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		
 		
 		
@@ -2723,6 +3985,7 @@
 				
 				<url>http://piwik.net/this/is/not/the/page/i/am/looking/for/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -2738,6 +4001,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -2747,8 +4011,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -2762,35 +4024,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Not-Bot</customVariableName1>
-				<customVariableValue1>Mozilla/5.0 (Linux; U; Android 2.3.5; en-us; HTC Vision Build/GRI40) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Smartphone</deviceType>
-		<operatingSystem>Android</operatingSystem>
+		<operatingSystem>Android 2.3</operatingSystem>
+		<operatingSystemName>Android</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon>
 		<operatingSystemCode>AND</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon>
+		<operatingSystemVersion>2.3</operatingSystemVersion>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
 		<browser>Android Browser</browser>
 		<browserName>Android Browser</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon>
 		<browserCode>AN</browserCode>
 		<browserVersion />
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
 		<country>Japan</country>
@@ -2802,12 +4059,21 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>16:11:30</visitLocalTime>
 		<visitLocalHour>16</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Not-Bot</customVariableName1>
+				<customVariableValue1>Mozilla/5.0 (Linux; U; Android 2.3.5; en-us; HTC Vision Build/GRI40) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1</customVariableValue1>
+			</row>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		
 		
 		
@@ -2829,6 +4095,7 @@
 				
 				<url>http://piwik.net/blog/category/meta/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -2844,6 +4111,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -2853,8 +4121,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -2868,35 +4134,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>Not-Bot</customVariableName1>
-				<customVariableValue1>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</customVariableValue1>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
-		<operatingSystem>Mac</operatingSystem>
+		<operatingSystem>Mac 10.6</operatingSystem>
+		<operatingSystemName>Mac</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
 		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
+		<operatingSystemVersion>10.6</operatingSystemVersion>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
 		<browser>RockMelt 0.9</browser>
 		<browserName>RockMelt</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
 		<browserCode>RM</browserCode>
 		<browserVersion>0.9</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
 		<country>Japan</country>
@@ -2908,12 +4169,21 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>16:10:38</visitLocalTime>
 		<visitLocalHour>16</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>Not-Bot</customVariableName1>
+				<customVariableValue1>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</customVariableValue1>
+			</row>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		
 		
 		
@@ -2935,6 +4205,7 @@
 				
 				<url>http://piwik.net/hosting/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -2950,6 +4221,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -2959,8 +4231,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -2974,31 +4244,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemCode>WI7</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>7</operatingSystemVersion>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
 		<browser>Chrome 20.0</browser>
 		<browserName>Chrome</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>20.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
 		<country>Unknown</country>
@@ -3010,12 +4279,17 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>15:31:05</visitLocalTime>
 		<visitLocalHour>15</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		
 		
 		
@@ -3037,6 +4311,7 @@
 				
 				<url>http://piwik.net/faq/how-to-install/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -3052,6 +4327,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -3061,8 +4337,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -3076,31 +4350,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>GNU/Linux</operatingSystem>
+		<operatingSystemName>GNU/Linux</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
 		<operatingSystemCode>LIN</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
+		<operatingSystemVersion />
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
 		<browser>Epiphany 2.30</browser>
 		<browserName>Epiphany</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon>
 		<browserCode>EP</browserCode>
 		<browserVersion>2.30</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
 		<country>Unknown</country>
@@ -3112,12 +4385,17 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>13:49:46</visitLocalTime>
 		<visitLocalHour>13</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		
 		
 		
@@ -3139,6 +4417,7 @@
 				
 				<url>http://piwik.net/blog/2012/08/survey-your-opinion-matters/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -3154,6 +4433,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -3163,8 +4443,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -3178,31 +4456,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemCode>WI7</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>7</operatingSystemVersion>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
 		<browser>Chrome 20.0</browser>
 		<browserName>Chrome</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>20.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>South America</continent>
 		<continentCode>ams</continentCode>
 		<country>Brazil</country>
@@ -3214,12 +4491,17 @@
 		<location>Brazil</location>
 		<latitude>-10</latitude>
 		<longitude>-55</longitude>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>20:22:08</visitLocalTime>
 		<visitLocalHour>20</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		
 		
 		
@@ -3241,6 +4523,7 @@
 				
 				<url>http://piwik.net/intranet-analytics/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -3256,6 +4539,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -3265,8 +4549,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -3280,31 +4562,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>GNU/Linux</operatingSystem>
+		<operatingSystemName>GNU/Linux</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
 		<operatingSystemCode>LIN</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
+		<operatingSystemVersion />
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
 		<browser>Epiphany 2.30</browser>
 		<browserName>Epiphany</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon>
 		<browserCode>EP</browserCode>
 		<browserVersion>2.30</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>South America</continent>
 		<continentCode>ams</continentCode>
 		<country>Brazil</country>
@@ -3316,12 +4597,17 @@
 		<location>Brazil</location>
 		<latitude>-10</latitude>
 		<longitude>-55</longitude>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>20:21:28</visitLocalTime>
 		<visitLocalHour>20</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		
 		
 		
@@ -3343,6 +4629,7 @@
 				
 				<url>http://piwik.net/docs/manage-websites/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -3358,6 +4645,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -3367,8 +4655,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -3382,31 +4668,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemCode>WI7</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>7</operatingSystemVersion>
 		<browserFamily>Trident</browserFamily>
 		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
 		<browser>Internet Explorer 9.0</browser>
 		<browserName>Internet Explorer</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>9.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>South America</continent>
 		<continentCode>ams</continentCode>
 		<country>Brazil</country>
@@ -3418,12 +4703,17 @@
 		<location>Brazil</location>
 		<latitude>-10</latitude>
 		<longitude>-55</longitude>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>20:21:03</visitLocalTime>
 		<visitLocalHour>20</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		
 		
 		
@@ -3445,6 +4735,7 @@
 				
 				<url>http://piwik.net/faq/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -3460,6 +4751,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -3469,8 +4761,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -3484,31 +4774,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>GNU/Linux</operatingSystem>
+		<operatingSystemName>GNU/Linux</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
 		<operatingSystemCode>LIN</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
+		<operatingSystemVersion />
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
 		<browser>Epiphany 2.30</browser>
 		<browserName>Epiphany</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon>
 		<browserCode>EP</browserCode>
 		<browserVersion>2.30</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
 		<country>Japan</country>
@@ -3520,12 +4809,17 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>20:01:17</visitLocalTime>
 		<visitLocalHour>20</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		
 		
 		
@@ -3547,6 +4841,7 @@
 				
 				<url>http://piwik.net/faq/how-to/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -3562,6 +4857,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -3571,8 +4867,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -3586,31 +4880,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemCode>WI7</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>7</operatingSystemVersion>
 		<browserFamily>Trident</browserFamily>
 		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
 		<browser>Internet Explorer 9.0</browser>
 		<browserName>Internet Explorer</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>9.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
 		<country>Japan</country>
@@ -3622,12 +4915,17 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>19:59:50</visitLocalTime>
 		<visitLocalHour>19</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		
 		
 		
@@ -3649,6 +4947,7 @@
 				
 				<url>http://piwik.net/newsletter/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -3664,6 +4963,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -3673,8 +4973,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -3688,31 +4986,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemCode>WI7</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>7</operatingSystemVersion>
 		<browserFamily>Trident</browserFamily>
 		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
 		<browser>Internet Explorer 9.0</browser>
 		<browserName>Internet Explorer</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>9.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
 		<country>Unknown</country>
@@ -3724,12 +5021,17 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>18:03:40</visitLocalTime>
 		<visitLocalHour>18</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		
 		
 		
@@ -3751,6 +5053,7 @@
 				
 				<url>http://piwik.net/docs/manage-users/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -3766,6 +5069,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -3775,8 +5079,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -3790,31 +5092,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
-		<operatingSystem>Mac</operatingSystem>
+		<operatingSystem>Mac 10.8</operatingSystem>
+		<operatingSystemName>Mac</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
 		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
+		<operatingSystemVersion>10.8</operatingSystemVersion>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
 		<browser>Chrome 19.0</browser>
 		<browserName>Chrome</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>19.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
 		<country>Unknown</country>
@@ -3826,12 +5127,17 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>21:00:42</visitLocalTime>
 		<visitLocalHour>21</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		
 		
 		
@@ -3853,6 +5159,7 @@
 				
 				<url>http://piwik.net/docs/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -3868,6 +5175,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -3877,8 +5185,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -3892,31 +5198,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>GNU/Linux</operatingSystem>
+		<operatingSystemName>GNU/Linux</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
 		<operatingSystemCode>LIN</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
+		<operatingSystemVersion />
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 6.0</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>6.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
 		<country>Unknown</country>
@@ -3928,12 +5233,17 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>20:56:45</visitLocalTime>
 		<visitLocalHour>20</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		
 		
 		
@@ -3955,6 +5265,7 @@
 				
 				<url>http://piwik.net/translations/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -3970,6 +5281,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -3979,8 +5291,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -3994,31 +5304,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>GNU/Linux</operatingSystem>
+		<operatingSystemName>GNU/Linux</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
 		<operatingSystemCode>LIN</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
+		<operatingSystemVersion />
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
 		<browser>Chrome 19.0</browser>
 		<browserName>Chrome</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
 		<browserCode>CH</browserCode>
 		<browserVersion>19.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
 		<country>United States</country>
@@ -4030,12 +5339,17 @@
 		<location>Ashburn, Virginia, United States</location>
 		<latitude>39.043999</latitude>
 		<longitude>-77.487999</longitude>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>13:49:48</visitLocalTime>
 		<visitLocalHour>13</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		
 		
 		
@@ -4057,6 +5371,7 @@
 				
 				<url>http://piwik.net/download/counter/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -4072,6 +5387,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -4081,8 +5397,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -4096,31 +5410,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>GNU/Linux</operatingSystem>
+		<operatingSystemName>GNU/Linux</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
 		<operatingSystemCode>LIN</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
+		<operatingSystemVersion />
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
 		<browser>Epiphany 2.30</browser>
 		<browserName>Epiphany</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon>
 		<browserCode>EP</browserCode>
 		<browserVersion>2.30</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
 		<country>United States</country>
@@ -4132,12 +5445,17 @@
 		<location>Ashburn, Virginia, United States</location>
 		<latitude>39.043999</latitude>
 		<longitude>-77.487999</longitude>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>13:48:20</visitLocalTime>
 		<visitLocalHour>13</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		
 		
 		
@@ -4159,6 +5477,7 @@
 				
 				<url>http://piwik.net/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -4174,6 +5493,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -4183,8 +5503,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -4198,31 +5516,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemCode>WI7</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>7</operatingSystemVersion>
 		<browserFamily>Trident</browserFamily>
 		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
 		<browser>Internet Explorer 9.0</browser>
 		<browserName>Internet Explorer</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>9.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>North America</continent>
 		<continentCode>amn</continentCode>
 		<country>United States</country>
@@ -4234,12 +5551,17 @@
 		<location>Ashburn, Virginia, United States</location>
 		<latitude>39.043999</latitude>
 		<longitude>-77.487999</longitude>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>13:48:07</visitLocalTime>
 		<visitLocalHour>13</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		
 		
 		
@@ -4261,6 +5583,7 @@
 				
 				<url>http://piwik.net/docs/manage-websites/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -4276,6 +5599,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -4285,8 +5609,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -4300,31 +5622,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>GNU/Linux</operatingSystem>
+		<operatingSystemName>GNU/Linux</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
 		<operatingSystemCode>LIN</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
+		<operatingSystemVersion />
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 6.0</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>6.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
 		<country>Japan</country>
@@ -4336,12 +5657,17 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>08:12:03</visitLocalTime>
 		<visitLocalHour>8</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		
 		
 		
@@ -4363,6 +5689,7 @@
 				
 				<url>http://piwik.net/blog/category/community/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -4378,6 +5705,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -4387,8 +5715,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -4402,31 +5728,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>GNU/Linux</operatingSystem>
+		<operatingSystemName>GNU/Linux</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
 		<operatingSystemCode>LIN</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
+		<operatingSystemVersion />
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
 		<browser>Epiphany 2.30</browser>
 		<browserName>Epiphany</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon>
 		<browserCode>EP</browserCode>
 		<browserVersion>2.30</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
 		<country>Japan</country>
@@ -4438,12 +5763,17 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>08:11:56</visitLocalTime>
 		<visitLocalHour>8</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		
 		
 		
@@ -4465,6 +5795,7 @@
 				
 				<url>http://piwik.net/faq/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -4480,6 +5811,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -4489,8 +5821,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -4504,31 +5834,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Smartphone</deviceType>
-		<operatingSystem>Android</operatingSystem>
+		<operatingSystem>Android 2.3</operatingSystem>
+		<operatingSystemName>Android</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon>
 		<operatingSystemCode>AND</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon>
+		<operatingSystemVersion>2.3</operatingSystemVersion>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
 		<browser>Android Browser</browser>
 		<browserName>Android Browser</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon>
 		<browserCode>AN</browserCode>
 		<browserVersion />
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
 		<country>Japan</country>
@@ -4540,12 +5869,17 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>08:11:30</visitLocalTime>
 		<visitLocalHour>8</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		
 		
 		
@@ -4567,6 +5901,7 @@
 				
 				<url>http://piwik.net/blog/category/meta/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -4582,6 +5917,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -4591,8 +5927,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -4606,31 +5940,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
-		<operatingSystem>Mac</operatingSystem>
+		<operatingSystem>Mac 10.6</operatingSystem>
+		<operatingSystemName>Mac</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
 		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
+		<operatingSystemVersion>10.6</operatingSystemVersion>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
 		<browser>RockMelt 0.9</browser>
 		<browserName>RockMelt</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
 		<browserCode>RM</browserCode>
 		<browserVersion>0.9</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Asia</continent>
 		<continentCode>asi</continentCode>
 		<country>Japan</country>
@@ -4642,12 +5975,17 @@
 		<location>Japan</location>
 		<latitude>36</latitude>
 		<longitude>138</longitude>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>08:10:38</visitLocalTime>
 		<visitLocalHour>8</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		
 		
 		
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml
index eb2209a224..74524d2848 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml
@@ -2,10 +2,10 @@
 <result>
 	<row>
 		<label>Piwik test</label>
-		<nb_visits>27</nb_visits>
-		<nb_actions>30</nb_actions>
-		<nb_pageviews>26</nb_pageviews>
-		<revenue>125</revenue>
+		<nb_visits>37</nb_visits>
+		<nb_actions>44</nb_actions>
+		<nb_pageviews>38</nb_pageviews>
+		<revenue>165</revenue>
 		<visits_evolution>100%</visits_evolution>
 		<actions_evolution>100%</actions_evolution>
 		<pageviews_evolution>100%</pageviews_evolution>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml
index 1fb93e2a2a..79c9ff4ab6 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
-	<nb_visits>27</nb_visits>
-	<nb_actions>30</nb_actions>
+	<nb_visits>37</nb_visits>
+	<nb_actions>44</nb_actions>
 	<visits_evolution>100%</visits_evolution>
 	<actions_evolution>100%</actions_evolution>
 	<pageviews_evolution>100%</pageviews_evolution>
 	<revenue_evolution>100%</revenue_evolution>
-	<nb_pageviews>26</nb_pageviews>
-	<revenue>125</revenue>
+	<nb_pageviews>38</nb_pageviews>
+	<revenue>165</revenue>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml
index 8cc6494492..5078a3ef19 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml
@@ -2,14 +2,14 @@
 <result>
 	<row>
 		<label>Unknown</label>
-		<nb_visits>27</nb_visits>
-		<nb_actions>30</nb_actions>
+		<nb_visits>37</nb_visits>
+		<nb_actions>44</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>305</sum_visit_length>
-		<bounce_count>25</bounce_count>
-		<nb_visits_converted>25</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<sum_visit_length>551</sum_visit_length>
+		<bounce_count>32</bounce_count>
+		<nb_visits_converted>33</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>35</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>2</sum_daily_nb_users>
 		<url />
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getAll_month.xml
index 808d27a0c7..c9f1986b2e 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getAll_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getAll_month.xml
@@ -1,6 +1,26 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
+		<label>www.test.nl</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>5</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>5</revenue>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<referer_type>3</referer_type>
+	</row>
+	<row>
 		<label>sn110w.snt110.mail.live.com</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
@@ -40,4 +60,24 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<referer_type>3</referer_type>
 	</row>
+	<row>
+		<label>example.com</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>3</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>0</bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>5</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>5</revenue>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<referer_type>3</referer_type>
+	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsitesUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsitesUrls_month.xml
index 13002b2017..6593897748 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsitesUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsitesUrls_month.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>2</result>
\ No newline at end of file
+<result>4</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsites_day.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsites_day.xml
new file mode 100644
index 0000000000..6b2972cde9
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsites_day.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2012-08-09" />
+	<result date="2012-08-10" />
+	<result date="2012-08-11" />
+	<result date="2012-08-12" />
+	<result date="2012-08-13">1</result>
+	<result date="2012-08-14" />
+	<result date="2012-08-15">3</result>
+</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsites_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsites_month.xml
index 13002b2017..6593897748 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsites_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsites_month.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>2</result>
\ No newline at end of file
+<result>4</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
index 80a6349ac1..b0ecf5b676 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
@@ -2,43 +2,63 @@
 <result>
 	<row>
 		<label>Direct Entry</label>
-		<nb_visits>25</nb_visits>
-		<nb_actions>28</nb_actions>
+		<nb_visits>33</nb_visits>
+		<nb_actions>38</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>305</sum_visit_length>
-		<bounce_count>23</bounce_count>
+		<sum_visit_length>549</sum_visit_length>
+		<bounce_count>29</bounce_count>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>23</nb_conversions>
-				<nb_visits_converted>23</nb_visits_converted>
-				<revenue>115</revenue>
+				<nb_conversions>29</nb_conversions>
+				<nb_visits_converted>29</nb_visits_converted>
+				<revenue>145</revenue>
 			</row>
 		</goals>
-		<nb_conversions>23</nb_conversions>
-		<revenue>115</revenue>
-		<sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<nb_conversions>29</nb_conversions>
+		<revenue>145</revenue>
+		<sum_daily_nb_uniq_visitors>31</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<nb_visits_converted>0</nb_visits_converted>
 	</row>
 	<row>
 		<label>Websites</label>
-		<nb_visits>2</nb_visits>
-		<nb_actions>2</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>2</bounce_count>
+		<nb_visits>4</nb_visits>
+		<nb_actions>6</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>3</bounce_count>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>2</nb_conversions>
-				<nb_visits_converted>2</nb_visits_converted>
-				<revenue>10</revenue>
+				<nb_conversions>4</nb_conversions>
+				<nb_visits_converted>4</nb_visits_converted>
+				<revenue>20</revenue>
 			</row>
 		</goals>
-		<nb_conversions>2</nb_conversions>
-		<revenue>10</revenue>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<nb_conversions>4</nb_conversions>
+		<revenue>20</revenue>
+		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
 		<subtable>
 			<row>
+				<label>example.com</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>3</nb_actions>
+				<max_actions>3</max_actions>
+				<sum_visit_length>2</sum_visit_length>
+				<bounce_count>0</bounce_count>
+				<goals>
+					<row idgoal='1'>
+						<nb_conversions>1</nb_conversions>
+						<nb_visits_converted>1</nb_visits_converted>
+						<revenue>5</revenue>
+					</row>
+				</goals>
+				<nb_conversions>1</nb_conversions>
+				<revenue>5</revenue>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_users>1</sum_daily_nb_users>
+			</row>
+			<row>
 				<label>piwik.org</label>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
@@ -76,6 +96,25 @@
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_nb_users>0</sum_daily_nb_users>
 			</row>
+			<row>
+				<label>www.test.nl</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<max_actions>1</max_actions>
+				<sum_visit_length>0</sum_visit_length>
+				<bounce_count>1</bounce_count>
+				<goals>
+					<row idgoal='1'>
+						<nb_conversions>1</nb_conversions>
+						<nb_visits_converted>1</nb_visits_converted>
+						<revenue>5</revenue>
+					</row>
+				</goals>
+				<nb_conversions>1</nb_conversions>
+				<revenue>5</revenue>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
+			</row>
 		</subtable>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getWebsites_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getWebsites_month.xml
index bfba8f21af..f872b378ad 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getWebsites_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getWebsites_month.xml
@@ -1,6 +1,39 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
+		<label>example.com</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>3</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>0</bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>5</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>5</revenue>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<segment>referrerName==example.com</segment>
+		<subtable>
+			<row>
+				<label>http://example.com/Search/SearchResults.pg?informationRecipient.languageCode.c=en</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>3</nb_actions>
+				<max_actions>3</max_actions>
+				<sum_visit_length>2</sum_visit_length>
+				<bounce_count>0</bounce_count>
+				<nb_visits_converted>1</nb_visits_converted>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_users>1</sum_daily_nb_users>
+			</row>
+		</subtable>
+	</row>
+	<row>
 		<label>piwik.org</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
@@ -18,6 +51,7 @@
 		<revenue>5</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>referrerName==piwik.org</segment>
 		<subtable>
 			<row>
 				<label>http://piwik.org/contribute%</label>
@@ -50,6 +84,7 @@
 		<revenue>5</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>referrerName==sn110w.snt110.mail.live.com</segment>
 		<subtable>
 			<row>
 				<label>http://sn110w.snt110.mail.live.com/mail/InboxLight.aspx?n=184083971</label>
@@ -64,4 +99,37 @@
 			</row>
 		</subtable>
 	</row>
+	<row>
+		<label>www.test.nl</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>5</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>5</revenue>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>referrerName==www.test.nl</segment>
+		<subtable>
+			<row>
+				<label>https://www.test.nl/</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<max_actions>1</max_actions>
+				<sum_visit_length>0</sum_visit_length>
+				<bounce_count>1</bounce_count>
+				<nb_visits_converted>1</nb_visits_converted>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
+			</row>
+		</subtable>
+	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml
new file mode 100644
index 0000000000..c1067505c8
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>Windows / Internet Explorer / unknown</label>
+		<nb_visits>6</nb_visits>
+		<nb_actions>7</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>242</sum_visit_length>
+		<bounce_count>5</bounce_count>
+		<nb_visits_converted>6</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+	</row>
+	<row>
+		<label>GNU/Linux / Epiphany / unknown</label>
+		<nb_visits>5</nb_visits>
+		<nb_actions>5</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>5</bounce_count>
+		<nb_visits_converted>5</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+	</row>
+	<row>
+		<label>Mac / Chrome / unknown</label>
+		<nb_visits>5</nb_visits>
+		<nb_actions>6</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>4</bounce_count>
+		<nb_visits_converted>5</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+	</row>
+	<row>
+		<label>Mac / RockMelt / unknown</label>
+		<nb_visits>5</nb_visits>
+		<nb_actions>8</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>305</sum_visit_length>
+		<bounce_count>3</bounce_count>
+		<nb_visits_converted>4</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+	</row>
+	<row>
+		<label>Unknown / Unknown / unknown</label>
+		<nb_visits>3</nb_visits>
+		<nb_actions>3</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>3</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+	</row>
+	<row>
+		<label>Windows / Chrome / unknown</label>
+		<nb_visits>3</nb_visits>
+		<nb_actions>3</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>3</bounce_count>
+		<nb_visits_converted>3</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+	</row>
+	<row>
+		<label>Android / Android Browser / unknown</label>
+		<nb_visits>2</nb_visits>
+		<nb_actions>2</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>2</bounce_count>
+		<nb_visits_converted>2</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+	</row>
+	<row>
+		<label>GNU/Linux / Firefox / unknown</label>
+		<nb_visits>2</nb_visits>
+		<nb_actions>2</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>2</bounce_count>
+		<nb_visits_converted>2</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+	</row>
+	<row>
+		<label>Android / Chrome Mobile / unknown</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>3</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>0</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+	</row>
+	<row>
+		<label>Bot / Unknown / unknown</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+	</row>
+	<row>
+		<label>GNU/Linux / Chrome / unknown</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+	</row>
+	<row>
+		<label>Mac / Unknown / unknown</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+	</row>
+	<row>
+		<label>Windows / Chrome / 1280x800</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+	</row>
+	<row>
+		<label>Windows / Internet Explorer / 1024x768</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml
new file mode 100644
index 0000000000..6adc37a0cd
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>unknown</label>
+		<nb_visits>35</nb_visits>
+		<nb_actions>42</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>551</sum_visit_length>
+		<bounce_count>30</bounce_count>
+		<nb_visits_converted>31</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<segment>resolution==unknown</segment>
+	</row>
+	<row>
+		<label>1024x768</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>resolution==1024x768</segment>
+	</row>
+	<row>
+		<label>1280x800</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>resolution==1280x800</segment>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml
index a14f0cec91..d91f34ccc0 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml
@@ -2,22 +2,23 @@
 <result>
 	<row>
 		<label>Unknown</label>
-		<nb_visits>22</nb_visits>
-		<nb_actions>25</nb_actions>
+		<nb_visits>31</nb_visits>
+		<nb_actions>38</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>305</sum_visit_length>
-		<bounce_count>20</bounce_count>
+		<sum_visit_length>551</sum_visit_length>
+		<bounce_count>26</bounce_count>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>20</nb_conversions>
-				<nb_visits_converted>20</nb_visits_converted>
-				<revenue>100</revenue>
+				<nb_conversions>27</nb_conversions>
+				<nb_visits_converted>27</nb_visits_converted>
+				<revenue>135</revenue>
 			</row>
 		</goals>
-		<nb_conversions>20</nb_conversions>
-		<revenue>100</revenue>
-		<sum_daily_nb_uniq_visitors>22</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<nb_conversions>27</nb_conversions>
+		<revenue>135</revenue>
+		<sum_daily_nb_uniq_visitors>29</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<nb_visits_converted>0</nb_visits_converted>
 		<city_name>Unknown</city_name>
 		<city>xx</city>
 		<region>xx</region>
@@ -46,6 +47,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<lat>39.044</lat>
 		<long>-77.488</long>
+		<segment>city==Ashburn;regionCode==VA;countryCode==us</segment>
 		<city_name>Ashburn</city_name>
 		<region>VA</region>
 		<country>us</country>
@@ -53,4 +55,32 @@
 		<region_name>Virginia</region_name>
 		<logo>plugins/UserCountry/images/flags/us.png</logo>
 	</row>
+	<row>
+		<label>Igloolik, Nunavut, Canada</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>5</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>5</revenue>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<lat>69.4</lat>
+		<long>-81.8</long>
+		<segment>city==Igloolik;regionCode==NU;countryCode==ca</segment>
+		<city_name>Igloolik</city_name>
+		<region>NU</region>
+		<country>ca</country>
+		<country_name>Canada</country_name>
+		<region_name>Nunavut</region_name>
+		<logo>plugins/UserCountry/images/flags/ca.png</logo>
+	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml
index 23e244b751..13a7188162 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml
@@ -22,42 +22,43 @@
 	</row>
 	<row>
 		<label>Unknown</label>
-		<nb_visits>7</nb_visits>
-		<nb_actions>7</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>7</bounce_count>
+		<nb_visits>11</nb_visits>
+		<nb_actions>12</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>242</sum_visit_length>
+		<bounce_count>10</bounce_count>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>7</nb_conversions>
-				<nb_visits_converted>7</nb_visits_converted>
-				<revenue>35</revenue>
+				<nb_conversions>9</nb_conversions>
+				<nb_visits_converted>9</nb_visits_converted>
+				<revenue>45</revenue>
 			</row>
 		</goals>
-		<nb_conversions>7</nb_conversions>
-		<revenue>35</revenue>
-		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
+		<nb_conversions>9</nb_conversions>
+		<revenue>45</revenue>
+		<sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<nb_visits_converted>0</nb_visits_converted>
 		<code>Unknown</code>
 	</row>
 	<row>
 		<label>North America</label>
-		<nb_visits>5</nb_visits>
-		<nb_actions>5</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>5</bounce_count>
+		<nb_visits>11</nb_visits>
+		<nb_actions>14</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>9</bounce_count>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>5</nb_conversions>
-				<nb_visits_converted>5</nb_visits_converted>
-				<revenue>25</revenue>
+				<nb_conversions>11</nb_conversions>
+				<nb_visits_converted>11</nb_visits_converted>
+				<revenue>55</revenue>
 			</row>
 		</goals>
-		<nb_conversions>5</nb_conversions>
-		<revenue>25</revenue>
-		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<nb_conversions>11</nb_conversions>
+		<revenue>55</revenue>
+		<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>2</sum_daily_nb_users>
 		<code>North America</code>
 	</row>
 	<row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml
index ce5523efde..2faa0742a5 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml
@@ -20,52 +20,56 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>jp</code>
 		<logo>plugins/UserCountry/images/flags/jp.png</logo>
+		<segment>countryCode==jp</segment>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
 	<row>
 		<label>Unknown</label>
-		<nb_visits>7</nb_visits>
-		<nb_actions>7</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>7</bounce_count>
+		<nb_visits>11</nb_visits>
+		<nb_actions>12</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>242</sum_visit_length>
+		<bounce_count>10</bounce_count>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>7</nb_conversions>
-				<nb_visits_converted>7</nb_visits_converted>
-				<revenue>35</revenue>
+				<nb_conversions>9</nb_conversions>
+				<nb_visits_converted>9</nb_visits_converted>
+				<revenue>45</revenue>
 			</row>
 		</goals>
-		<nb_conversions>7</nb_conversions>
-		<revenue>35</revenue>
-		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
+		<nb_conversions>9</nb_conversions>
+		<revenue>45</revenue>
+		<sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<nb_visits_converted>0</nb_visits_converted>
 		<code>xx</code>
 		<logo>plugins/UserCountry/images/flags/xx.png</logo>
+		<segment>countryCode==xx</segment>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
 	<row>
 		<label>United States</label>
-		<nb_visits>5</nb_visits>
-		<nb_actions>5</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>5</bounce_count>
+		<nb_visits>10</nb_visits>
+		<nb_actions>13</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>8</bounce_count>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>5</nb_conversions>
-				<nb_visits_converted>5</nb_visits_converted>
-				<revenue>25</revenue>
+				<nb_conversions>10</nb_conversions>
+				<nb_visits_converted>10</nb_visits_converted>
+				<revenue>50</revenue>
 			</row>
 		</goals>
-		<nb_conversions>5</nb_conversions>
-		<revenue>25</revenue>
-		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<nb_conversions>10</nb_conversions>
+		<revenue>50</revenue>
+		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>2</sum_daily_nb_users>
 		<code>us</code>
 		<logo>plugins/UserCountry/images/flags/us.png</logo>
+		<segment>countryCode==us</segment>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -89,6 +93,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>br</code>
 		<logo>plugins/UserCountry/images/flags/br.png</logo>
+		<segment>countryCode==br</segment>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -104,6 +109,31 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>au</code>
 		<logo>plugins/UserCountry/images/flags/au.png</logo>
+		<segment>countryCode==au</segment>
+		<logoWidth>16</logoWidth>
+		<logoHeight>11</logoHeight>
+	</row>
+	<row>
+		<label>Canada</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>5</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>5</revenue>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<code>ca</code>
+		<logo>plugins/UserCountry/images/flags/ca.png</logo>
+		<segment>countryCode==ca</segment>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml
index 17feb622cc..3cc2819f51 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>5</result>
\ No newline at end of file
+<result>6</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml
index 4067fb2618..5631e75efb 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml
@@ -2,22 +2,23 @@
 <result>
 	<row>
 		<label>Unknown</label>
-		<nb_visits>22</nb_visits>
-		<nb_actions>25</nb_actions>
+		<nb_visits>31</nb_visits>
+		<nb_actions>38</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>305</sum_visit_length>
-		<bounce_count>20</bounce_count>
+		<sum_visit_length>551</sum_visit_length>
+		<bounce_count>26</bounce_count>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>20</nb_conversions>
-				<nb_visits_converted>20</nb_visits_converted>
-				<revenue>100</revenue>
+				<nb_conversions>27</nb_conversions>
+				<nb_visits_converted>27</nb_visits_converted>
+				<revenue>135</revenue>
 			</row>
 		</goals>
-		<nb_conversions>20</nb_conversions>
-		<revenue>100</revenue>
-		<sum_daily_nb_uniq_visitors>22</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<nb_conversions>27</nb_conversions>
+		<revenue>135</revenue>
+		<sum_daily_nb_uniq_visitors>29</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<nb_visits_converted>0</nb_visits_converted>
 		<region>xx</region>
 		<country>xx</country>
 		<country_name>Unknown</country_name>
@@ -42,10 +43,36 @@
 		<revenue>25</revenue>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>regionCode==VA;countryCode==us</segment>
 		<region>VA</region>
 		<country>us</country>
 		<country_name>United States</country_name>
 		<region_name>Virginia</region_name>
 		<logo>plugins/UserCountry/images/flags/us.png</logo>
 	</row>
+	<row>
+		<label>Nunavut, Canada</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>5</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>5</revenue>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>regionCode==NU;countryCode==ca</segment>
+		<region>NU</region>
+		<country>ca</country>
+		<country_name>Canada</country_name>
+		<region_name>Nunavut</region_name>
+		<logo>plugins/UserCountry/images/flags/ca.png</logo>
+	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml
new file mode 100644
index 0000000000..a65efd846c
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>Unknown (xx)</label>
+		<nb_visits>37</nb_visits>
+		<nb_actions>44</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>551</sum_visit_length>
+		<bounce_count>32</bounce_count>
+		<nb_visits_converted>33</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>35</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>2</sum_daily_nb_users>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml
new file mode 100644
index 0000000000..dadcad320c
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>Unknown</label>
+		<nb_visits>37</nb_visits>
+		<nb_actions>44</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>551</sum_visit_length>
+		<bounce_count>32</bounce_count>
+		<nb_visits_converted>33</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>35</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>2</sum_daily_nb_users>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
index bb6679c971..1fb125914d 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
@@ -10,28 +10,43 @@
 		<nb_visits_converted>16</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>17</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>browserEngine==WebKit</segment>
 	</row>
 	<row>
 		<label>Trident (IE)</label>
-		<nb_visits>6</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
+		<nb_visits>7</nb_visits>
+		<nb_actions>8</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>242</sum_visit_length>
 		<bounce_count>6</bounce_count>
-		<nb_visits_converted>6</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
+		<nb_visits_converted>7</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>browserEngine==Trident</segment>
+	</row>
+	<row>
+		<label>Blink (Chrome, Opera)</label>
+		<nb_visits>6</nb_visits>
+		<nb_actions>9</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>4</bounce_count>
+		<nb_visits_converted>6</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<segment>browserEngine==Blink</segment>
 	</row>
 	<row>
 		<label>Unknown</label>
-		<nb_visits>2</nb_visits>
-		<nb_actions>2</nb_actions>
+		<nb_visits>5</nb_visits>
+		<nb_actions>5</nb_actions>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>2</bounce_count>
-		<nb_visits_converted>1</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<bounce_count>5</bounce_count>
+		<nb_visits_converted>2</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>browserEngine==</segment>
 	</row>
 	<row>
 		<label>Gecko (Firefox)</label>
@@ -43,5 +58,6 @@
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>browserEngine==Gecko</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml
index 80d06470a3..2c687028a7 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml
@@ -10,7 +10,8 @@
 		<nb_visits_converted>5</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/EP.gif</logo>
+		<segment>browserCode==EP;browserVersion==2.30</segment>
+		<logo>plugins/DevicesDetection/images/browsers/EP.gif</logo>
 	</row>
 	<row>
 		<label>Internet Explorer 9.0</label>
@@ -22,7 +23,8 @@
 		<nb_visits_converted>5</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/IE.gif</logo>
+		<segment>browserCode==IE;browserVersion==9.0</segment>
+		<logo>plugins/DevicesDetection/images/browsers/IE.gif</logo>
 	</row>
 	<row>
 		<label>RockMelt 0.9</label>
@@ -34,7 +36,34 @@
 		<nb_visits_converted>4</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+		<segment>browserCode==RM;browserVersion==0.9</segment>
+		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
+	</row>
+	<row>
+		<label>Unknown</label>
+		<nb_visits>5</nb_visits>
+		<nb_actions>5</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>5</bounce_count>
+		<nb_visits_converted>2</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>browserCode==UNK;browserVersion==</segment>
+		<logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo>
+	</row>
+	<row>
+		<label>Chrome 37.0</label>
+		<nb_visits>3</nb_visits>
+		<nb_actions>4</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>2</bounce_count>
+		<nb_visits_converted>3</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<segment>browserCode==CH;browserVersion==37.0</segment>
+		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
 	</row>
 	<row>
 		<label>Android Browser</label>
@@ -46,7 +75,8 @@
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/AN.gif</logo>
+		<segment>browserCode==AN;browserVersion==</segment>
+		<logo>plugins/DevicesDetection/images/browsers/AN.gif</logo>
 	</row>
 	<row>
 		<label>Chrome 19.0</label>
@@ -58,7 +88,8 @@
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+		<segment>browserCode==CH;browserVersion==19.0</segment>
+		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
 	</row>
 	<row>
 		<label>Chrome 20.0</label>
@@ -70,7 +101,8 @@
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+		<segment>browserCode==CH;browserVersion==20.0</segment>
+		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
 	</row>
 	<row>
 		<label>Firefox 6.0</label>
@@ -82,22 +114,37 @@
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+		<segment>browserCode==FF;browserVersion==6.0</segment>
+		<logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
 	</row>
 	<row>
-		<label>Unknown</label>
-		<nb_visits>2</nb_visits>
-		<nb_actions>2</nb_actions>
+		<label>Chrome 11.0</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>2</bounce_count>
+		<bounce_count>1</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
+		<segment>browserCode==CH;browserVersion==11.0</segment>
+		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
 	</row>
 	<row>
-		<label>Chrome 11.0</label>
+		<label>Chrome 39.0</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>browserCode==CH;browserVersion==39.0</segment>
+		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
+	</row>
+	<row>
+		<label>Chrome 41.0</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
 		<max_actions>1</max_actions>
@@ -106,7 +153,21 @@
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+		<segment>browserCode==CH;browserVersion==41.0</segment>
+		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
+	</row>
+	<row>
+		<label>Chrome Mobile 39.0</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>3</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>0</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<segment>browserCode==CM;browserVersion==39.0</segment>
+		<logo>plugins/DevicesDetection/images/browsers/CM.gif</logo>
 	</row>
 	<row>
 		<label>Internet Explorer 6.0</label>
@@ -118,6 +179,20 @@
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/IE.gif</logo>
+		<segment>browserCode==IE;browserVersion==6.0</segment>
+		<logo>plugins/DevicesDetection/images/browsers/IE.gif</logo>
+	</row>
+	<row>
+		<label>Internet Explorer 8.0</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>2</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>242</sum_visit_length>
+		<bounce_count>0</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>browserCode==IE;browserVersion==8.0</segment>
+		<logo>plugins/DevicesDetection/images/browsers/IE.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
index 8723d1a05f..16aa9095e1 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
@@ -1,28 +1,30 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
-		<label>Internet Explorer</label>
-		<nb_visits>6</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>6</bounce_count>
-		<nb_visits_converted>6</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/IE.gif</logo>
+		<label>Chrome</label>
+		<nb_visits>10</nb_visits>
+		<nb_actions>11</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>9</bounce_count>
+		<nb_visits_converted>10</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
+		<segment>browserCode==CH</segment>
 	</row>
 	<row>
-		<label>Chrome</label>
-		<nb_visits>5</nb_visits>
-		<nb_actions>5</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>5</bounce_count>
-		<nb_visits_converted>5</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+		<label>Internet Explorer</label>
+		<nb_visits>7</nb_visits>
+		<nb_actions>8</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>242</sum_visit_length>
+		<bounce_count>6</bounce_count>
+		<nb_visits_converted>7</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+		<logo>plugins/DevicesDetection/images/browsers/IE.gif</logo>
+		<segment>browserCode==IE</segment>
 	</row>
 	<row>
 		<label>Epiphany</label>
@@ -34,7 +36,8 @@
 		<nb_visits_converted>5</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/EP.gif</logo>
+		<logo>plugins/DevicesDetection/images/browsers/EP.gif</logo>
+		<segment>browserCode==EP</segment>
 	</row>
 	<row>
 		<label>RockMelt</label>
@@ -46,22 +49,24 @@
 		<nb_visits_converted>4</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+		<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
+		<segment>browserCode==RM</segment>
 	</row>
 	<row>
-		<label>Android Browser</label>
-		<nb_visits>2</nb_visits>
-		<nb_actions>2</nb_actions>
+		<label>Unknown</label>
+		<nb_visits>5</nb_visits>
+		<nb_actions>5</nb_actions>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>2</bounce_count>
+		<bounce_count>5</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/AN.gif</logo>
+		<logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo>
+		<segment>browserCode==UNK</segment>
 	</row>
 	<row>
-		<label>Firefox</label>
+		<label>Android Browser</label>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
 		<max_actions>1</max_actions>
@@ -70,18 +75,33 @@
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+		<logo>plugins/DevicesDetection/images/browsers/AN.gif</logo>
+		<segment>browserCode==AN</segment>
 	</row>
 	<row>
-		<label>Unknown</label>
+		<label>Firefox</label>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
-		<nb_visits_converted>1</nb_visits_converted>
+		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
+		<logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
+		<segment>browserCode==FF</segment>
+	</row>
+	<row>
+		<label>Chrome Mobile</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>3</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>0</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<logo>plugins/DevicesDetection/images/browsers/CM.gif</logo>
+		<segment>browserCode==CM</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml
index 446d719865..c1067505c8 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml
@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
+		<label>Windows / Internet Explorer / unknown</label>
+		<nb_visits>6</nb_visits>
+		<nb_actions>7</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>242</sum_visit_length>
+		<bounce_count>5</bounce_count>
+		<nb_visits_converted>6</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+	</row>
+	<row>
 		<label>GNU/Linux / Epiphany / unknown</label>
 		<nb_visits>5</nb_visits>
 		<nb_actions>5</nb_actions>
@@ -12,6 +23,17 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
+		<label>Mac / Chrome / unknown</label>
+		<nb_visits>5</nb_visits>
+		<nb_actions>6</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>4</bounce_count>
+		<nb_visits_converted>5</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+	</row>
+	<row>
 		<label>Mac / RockMelt / unknown</label>
 		<nb_visits>5</nb_visits>
 		<nb_actions>8</nb_actions>
@@ -23,29 +45,29 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
-		<label>Windows 7 / Internet Explorer / unknown</label>
-		<nb_visits>5</nb_visits>
-		<nb_actions>5</nb_actions>
+		<label>Unknown / Unknown / unknown</label>
+		<nb_visits>3</nb_visits>
+		<nb_actions>3</nb_actions>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>5</bounce_count>
-		<nb_visits_converted>5</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+		<bounce_count>3</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
-		<label>Android / Android Browser / unknown</label>
-		<nb_visits>2</nb_visits>
-		<nb_actions>2</nb_actions>
+		<label>Windows / Chrome / unknown</label>
+		<nb_visits>3</nb_visits>
+		<nb_actions>3</nb_actions>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>2</bounce_count>
-		<nb_visits_converted>2</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<bounce_count>3</bounce_count>
+		<nb_visits_converted>3</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
-		<label>GNU/Linux / Firefox / unknown</label>
+		<label>Android / Android Browser / unknown</label>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
 		<max_actions>1</max_actions>
@@ -56,7 +78,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
-		<label>Windows 7 / Chrome / unknown</label>
+		<label>GNU/Linux / Firefox / unknown</label>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
 		<max_actions>1</max_actions>
@@ -67,18 +89,18 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
-		<label>Bot / Unknown / unknown</label>
+		<label>Android / Chrome Mobile / unknown</label>
 		<nb_visits>1</nb_visits>
-		<nb_actions>1</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>1</bounce_count>
+		<nb_actions>3</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>0</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
 	</row>
 	<row>
-		<label>GNU/Linux / Chrome / unknown</label>
+		<label>Bot / Unknown / unknown</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
 		<max_actions>1</max_actions>
@@ -89,7 +111,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
-		<label>Mac / Chrome / unknown</label>
+		<label>GNU/Linux / Chrome / unknown</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
 		<max_actions>1</max_actions>
@@ -100,18 +122,18 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
-		<label>Unknown / Unknown / unknown</label>
+		<label>Mac / Unknown / unknown</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>1</bounce_count>
-		<nb_visits_converted>0</nb_visits_converted>
+		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
-		<label>Windows XP / Chrome / 1280x800</label>
+		<label>Windows / Chrome / 1280x800</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
 		<max_actions>1</max_actions>
@@ -122,7 +144,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
-		<label>Windows XP / Internet Explorer / 1024x768</label>
+		<label>Windows / Internet Explorer / 1024x768</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
 		<max_actions>1</max_actions>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml
index fc37ec8a8f..a65efd846c 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml
@@ -2,13 +2,13 @@
 <result>
 	<row>
 		<label>Unknown (xx)</label>
-		<nb_visits>27</nb_visits>
-		<nb_actions>30</nb_actions>
+		<nb_visits>37</nb_visits>
+		<nb_actions>44</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>305</sum_visit_length>
-		<bounce_count>25</bounce_count>
-		<nb_visits_converted>25</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<sum_visit_length>551</sum_visit_length>
+		<bounce_count>32</bounce_count>
+		<nb_visits_converted>33</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>35</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>2</sum_daily_nb_users>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguage_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguage_month.xml
index 1f8c578db7..dadcad320c 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguage_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguage_month.xml
@@ -2,13 +2,13 @@
 <result>
 	<row>
 		<label>Unknown</label>
-		<nb_visits>27</nb_visits>
-		<nb_actions>30</nb_actions>
+		<nb_visits>37</nb_visits>
+		<nb_actions>44</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>305</sum_visit_length>
-		<bounce_count>25</bounce_count>
-		<nb_visits_converted>25</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<sum_visit_length>551</sum_visit_length>
+		<bounce_count>32</bounce_count>
+		<nb_visits_converted>33</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>35</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>2</sum_daily_nb_users>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml
index 0a059a62d6..7ebd0835aa 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml
@@ -2,73 +2,88 @@
 <result>
 	<row>
 		<label>Desktop</label>
-		<nb_visits>23</nb_visits>
-		<nb_actions>26</nb_actions>
+		<nb_visits>30</nb_visits>
+		<nb_actions>35</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>305</sum_visit_length>
-		<bounce_count>21</bounce_count>
-		<nb_visits_converted>22</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<sum_visit_length>549</sum_visit_length>
+		<bounce_count>26</bounce_count>
+		<nb_visits_converted>29</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<segment>deviceType==desktop</segment>
 		<logo>plugins/DevicesDetection/images/screens/normal.gif</logo>
 	</row>
 	<row>
 		<label>Unknown</label>
-		<nb_visits>2</nb_visits>
-		<nb_actions>2</nb_actions>
+		<nb_visits>4</nb_visits>
+		<nb_actions>4</nb_actions>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>2</bounce_count>
+		<bounce_count>4</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
 	</row>
 	<row>
 		<label>Smartphone</label>
-		<nb_visits>2</nb_visits>
-		<nb_actions>2</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
+		<nb_visits>3</nb_visits>
+		<nb_actions>5</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>2</sum_visit_length>
 		<bounce_count>2</bounce_count>
-		<nb_visits_converted>2</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<nb_visits_converted>3</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<segment>deviceType==smartphone</segment>
 		<logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
 	</row>
 	<row>
 		<label>Tablet</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==tablet</segment>
 		<logo>plugins/DevicesDetection/images/screens/tablet.png</logo>
 	</row>
 	<row>
 		<label>Feature phone</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==feature+phone</segment>
 		<logo>plugins/DevicesDetection/images/screens/mobile.gif</logo>
 	</row>
 	<row>
 		<label>Console</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==console</segment>
 		<logo>plugins/DevicesDetection/images/screens/console.gif</logo>
 	</row>
 	<row>
 		<label>Tv</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==tv</segment>
 		<logo>plugins/DevicesDetection/images/screens/tv.png</logo>
 	</row>
 	<row>
 		<label>Car browser</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==car+browser</segment>
 		<logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo>
 	</row>
 	<row>
 		<label>Smart display</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==smart+display</segment>
 		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
 	</row>
 	<row>
 		<label>Camera</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==camera</segment>
 		<logo>plugins/DevicesDetection/images/screens/camera.png</logo>
 	</row>
+	<row>
+		<label>Portable media player</label>
+		<nb_visits>0</nb_visits>
+		<segment>deviceType==portable+media+player</segment>
+		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
+	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml
index 62d091d83d..813ebfe05a 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml
@@ -1,6 +1,30 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
+		<label>Mac</label>
+		<nb_visits>11</nb_visits>
+		<nb_actions>15</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>307</sum_visit_length>
+		<bounce_count>8</bounce_count>
+		<nb_visits_converted>10</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<logo>plugins/DevicesDetection/images/os/MAC.gif</logo>
+	</row>
+	<row>
+		<label>Windows</label>
+		<nb_visits>11</nb_visits>
+		<nb_actions>12</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>242</sum_visit_length>
+		<bounce_count>10</bounce_count>
+		<nb_visits_converted>11</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<logo>plugins/DevicesDetection/images/os/WIN.gif</logo>
+	</row>
+	<row>
 		<label>GNU/Linux</label>
 		<nb_visits>8</nb_visits>
 		<nb_actions>8</nb_actions>
@@ -10,43 +34,31 @@
 		<nb_visits_converted>8</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/os/LIN.gif</logo>
+		<logo>plugins/DevicesDetection/images/os/LIN.gif</logo>
 	</row>
 	<row>
-		<label>Windows</label>
-		<nb_visits>9</nb_visits>
-		<nb_actions>9</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>9</bounce_count>
-		<nb_visits_converted>9</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/os/WI7.gif</logo>
-	</row>
-	<row>
-		<label>Mac</label>
-		<nb_visits>6</nb_visits>
-		<nb_actions>9</nb_actions>
+		<label>Android</label>
+		<nb_visits>3</nb_visits>
+		<nb_actions>5</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>305</sum_visit_length>
-		<bounce_count>4</bounce_count>
-		<nb_visits_converted>5</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/os/MAC.gif</logo>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>2</bounce_count>
+		<nb_visits_converted>3</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<logo>plugins/DevicesDetection/images/os/AND.gif</logo>
 	</row>
 	<row>
-		<label>Android</label>
-		<nb_visits>2</nb_visits>
-		<nb_actions>2</nb_actions>
+		<label>Unknown</label>
+		<nb_visits>3</nb_visits>
+		<nb_actions>3</nb_actions>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>2</bounce_count>
-		<nb_visits_converted>2</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<bounce_count>3</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/os/AND.gif</logo>
+		<logo>plugins/DevicesDetection/images/os/UNK.gif</logo>
 	</row>
 	<row>
 		<label>Bot</label>
@@ -58,18 +70,6 @@
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/os/UNK.gif</logo>
-	</row>
-	<row>
-		<label>Unknown</label>
-		<nb_visits>1</nb_visits>
-		<nb_actions>1</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>1</bounce_count>
-		<nb_visits_converted>0</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/os/UNK.gif</logo>
+		<logo>plugins/DevicesDetection/images/os/UNK.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml
index 7cad47e0a1..38dd7759a4 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml
@@ -10,7 +10,8 @@
 		<nb_visits_converted>8</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/os/LIN.gif</logo>
+		<segment>operatingSystemCode==LIN;operatingSystemVersion==</segment>
+		<logo>plugins/DevicesDetection/images/os/LIN.gif</logo>
 	</row>
 	<row>
 		<label>Windows 7</label>
@@ -22,7 +23,8 @@
 		<nb_visits_converted>7</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/os/WI7.gif</logo>
+		<segment>operatingSystemCode==WIN;operatingSystemVersion==7</segment>
+		<logo>plugins/DevicesDetection/images/os/WIN.gif</logo>
 	</row>
 	<row>
 		<label>Mac 10.6</label>
@@ -34,22 +36,50 @@
 		<nb_visits_converted>4</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/os/MAC.gif</logo>
+		<segment>operatingSystemCode==MAC;operatingSystemVersion==10.6</segment>
+		<logo>plugins/DevicesDetection/images/os/MAC.gif</logo>
 	</row>
 	<row>
-		<label>Android 2.3</label>
-		<nb_visits>2</nb_visits>
-		<nb_actions>2</nb_actions>
+		<label>Mac 10.10</label>
+		<nb_visits>4</nb_visits>
+		<nb_actions>5</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>3</bounce_count>
+		<nb_visits_converted>4</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<segment>operatingSystemCode==MAC;operatingSystemVersion==10.10</segment>
+		<logo>plugins/DevicesDetection/images/os/MAC.gif</logo>
+	</row>
+	<row>
+		<label>Unknown</label>
+		<nb_visits>3</nb_visits>
+		<nb_actions>3</nb_actions>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>2</bounce_count>
-		<nb_visits_converted>2</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<bounce_count>3</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/os/AND.gif</logo>
+		<segment>operatingSystemCode==UNK;operatingSystemVersion==UNK</segment>
+		<logo>plugins/DevicesDetection/images/os/UNK.gif</logo>
 	</row>
 	<row>
 		<label>Windows XP</label>
+		<nb_visits>3</nb_visits>
+		<nb_actions>3</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>3</bounce_count>
+		<nb_visits_converted>3</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>operatingSystemCode==WIN;operatingSystemVersion==XP</segment>
+		<logo>plugins/DevicesDetection/images/os/WIN.gif</logo>
+	</row>
+	<row>
+		<label>Android 2.3</label>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
 		<max_actions>1</max_actions>
@@ -58,7 +88,21 @@
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/os/WXP.gif</logo>
+		<segment>operatingSystemCode==AND;operatingSystemVersion==2.3</segment>
+		<logo>plugins/DevicesDetection/images/os/AND.gif</logo>
+	</row>
+	<row>
+		<label>Android 4.4</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>3</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>2</sum_visit_length>
+		<bounce_count>0</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<segment>operatingSystemCode==AND;operatingSystemVersion==4.4</segment>
+		<logo>plugins/DevicesDetection/images/os/AND.gif</logo>
 	</row>
 	<row>
 		<label>Bot</label>
@@ -70,10 +114,11 @@
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/os/UNK.gif</logo>
+		<segment>operatingSystemCode==BOT;operatingSystemVersion==UNK</segment>
+		<logo>plugins/DevicesDetection/images/os/UNK.gif</logo>
 	</row>
 	<row>
-		<label>Mac 10.8</label>
+		<label>Mac</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
 		<max_actions>1</max_actions>
@@ -82,18 +127,33 @@
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/os/MAC.gif</logo>
+		<segment>operatingSystemCode==MAC;operatingSystemVersion==</segment>
+		<logo>plugins/DevicesDetection/images/os/MAC.gif</logo>
 	</row>
 	<row>
-		<label>Unknown</label>
+		<label>Mac 10.8</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>1</bounce_count>
-		<nb_visits_converted>0</nb_visits_converted>
+		<nb_visits_converted>1</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>operatingSystemCode==MAC;operatingSystemVersion==10.8</segment>
+		<logo>plugins/DevicesDetection/images/os/MAC.gif</logo>
+	</row>
+	<row>
+		<label>Windows</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>2</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>242</sum_visit_length>
+		<bounce_count>0</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<logo>plugins/UserSettings/images/os/UNK.gif</logo>
+		<segment>operatingSystemCode==WIN;operatingSystemVersion==</segment>
+		<logo>plugins/DevicesDetection/images/os/WIN.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml
index d1f2bda02f..b3aef9f3d3 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml
@@ -3,61 +3,61 @@
 	<row>
 		<label>Cookie</label>
 		<nb_visits>2</nb_visits>
-		<nb_visits_percentage>10%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/cookie.gif</logo>
+		<nb_visits_percentage>7%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/cookie.gif</logo>
 	</row>
 	<row>
 		<label>Flash</label>
 		<nb_visits>2</nb_visits>
-		<nb_visits_percentage>10%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/flash.gif</logo>
+		<nb_visits_percentage>7%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/flash.gif</logo>
 	</row>
 	<row>
 		<label>Java</label>
 		<nb_visits>2</nb_visits>
-		<nb_visits_percentage>10%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/java.gif</logo>
+		<nb_visits_percentage>7%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/java.gif</logo>
 	</row>
 	<row>
 		<label>Director</label>
 		<nb_visits>1</nb_visits>
-		<nb_visits_percentage>5%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/director.gif</logo>
+		<nb_visits_percentage>3%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/director.gif</logo>
 	</row>
 	<row>
 		<label>Gears</label>
 		<nb_visits>1</nb_visits>
-		<nb_visits_percentage>5%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/gears.gif</logo>
+		<nb_visits_percentage>3%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/gears.gif</logo>
 	</row>
 	<row>
 		<label>Pdf</label>
 		<nb_visits>1</nb_visits>
-		<nb_visits_percentage>5%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/pdf.gif</logo>
+		<nb_visits_percentage>3%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/pdf.gif</logo>
 	</row>
 	<row>
 		<label>Windowsmedia</label>
 		<nb_visits>1</nb_visits>
-		<nb_visits_percentage>5%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/windowsmedia.gif</logo>
+		<nb_visits_percentage>3%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/windowsmedia.gif</logo>
 	</row>
 	<row>
 		<label>Quicktime</label>
 		<nb_visits>0</nb_visits>
 		<nb_visits_percentage>0%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/quicktime.gif</logo>
+		<logo>plugins/DevicePlugins/images/plugins/quicktime.gif</logo>
 	</row>
 	<row>
 		<label>Realplayer</label>
 		<nb_visits>0</nb_visits>
 		<nb_visits_percentage>0%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/realplayer.gif</logo>
+		<logo>plugins/DevicePlugins/images/plugins/realplayer.gif</logo>
 	</row>
 	<row>
 		<label>Silverlight</label>
 		<nb_visits>0</nb_visits>
 		<nb_visits_percentage>0%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/silverlight.gif</logo>
+		<logo>plugins/DevicePlugins/images/plugins/silverlight.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml
index 659d5beea1..6adc37a0cd 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml
@@ -2,14 +2,15 @@
 <result>
 	<row>
 		<label>unknown</label>
-		<nb_visits>25</nb_visits>
-		<nb_actions>28</nb_actions>
+		<nb_visits>35</nb_visits>
+		<nb_actions>42</nb_actions>
 		<max_actions>3</max_actions>
-		<sum_visit_length>305</sum_visit_length>
-		<bounce_count>23</bounce_count>
-		<nb_visits_converted>23</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<sum_visit_length>551</sum_visit_length>
+		<bounce_count>30</bounce_count>
+		<nb_visits_converted>31</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<segment>resolution==unknown</segment>
 	</row>
 	<row>
 		<label>1024x768</label>
@@ -21,6 +22,7 @@
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>resolution==1024x768</segment>
 	</row>
 	<row>
 		<label>1280x800</label>
@@ -32,5 +34,6 @@
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>resolution==1280x800</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_month.xml
index 3633fe5914..8528e781f7 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_month.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
-	<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
-	<nb_users_returning>0</nb_users_returning>
-	<nb_visits_returning>1</nb_visits_returning>
-	<nb_actions_returning>1</nb_actions_returning>
-	<nb_visits_converted_returning>1</nb_visits_converted_returning>
-	<bounce_count_returning>1</bounce_count_returning>
-	<sum_visit_length_returning>0</sum_visit_length_returning>
-	<max_actions_returning>1</max_actions_returning>
-	<bounce_rate_returning>100%</bounce_rate_returning>
-	<nb_actions_per_visit_returning>1</nb_actions_per_visit_returning>
-	<avg_time_on_site_returning>0</avg_time_on_site_returning>
+	<nb_uniq_visitors_returning>2</nb_uniq_visitors_returning>
+	<nb_users_returning>1</nb_users_returning>
+	<nb_visits_returning>3</nb_visits_returning>
+	<nb_actions_returning>4</nb_actions_returning>
+	<nb_visits_converted_returning>3</nb_visits_converted_returning>
+	<bounce_count_returning>2</bounce_count_returning>
+	<sum_visit_length_returning>2</sum_visit_length_returning>
+	<max_actions_returning>2</max_actions_returning>
+	<bounce_rate_returning>67%</bounce_rate_returning>
+	<nb_actions_per_visit_returning>1.3</nb_actions_per_visit_returning>
+	<avg_time_on_site_returning>1</avg_time_on_site_returning>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_range.xml
index f301254690..779b4397e3 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_range.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
-	<nb_visits_returning>10</nb_visits_returning>
-	<nb_actions_returning>12</nb_actions_returning>
-	<nb_visits_converted_returning>9</nb_visits_converted_returning>
-	<bounce_count_returning>8</bounce_count_returning>
-	<sum_visit_length_returning>115</sum_visit_length_returning>
+	<nb_visits_returning>12</nb_visits_returning>
+	<nb_actions_returning>15</nb_actions_returning>
+	<nb_visits_converted_returning>11</nb_visits_converted_returning>
+	<bounce_count_returning>9</bounce_count_returning>
+	<sum_visit_length_returning>117</sum_visit_length_returning>
 	<max_actions_returning>2</max_actions_returning>
-	<bounce_rate_returning>80%</bounce_rate_returning>
-	<nb_actions_per_visit_returning>1.2</nb_actions_per_visit_returning>
-	<avg_time_on_site_returning>12</avg_time_on_site_returning>
+	<bounce_rate_returning>75%</bounce_rate_returning>
+	<nb_actions_per_visit_returning>1.3</nb_actions_per_visit_returning>
+	<avg_time_on_site_returning>10</avg_time_on_site_returning>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
index 1a729a8e26..f23909c920 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
@@ -2,7 +2,13 @@
 <result>
 	<row>
 		<label>Monday</label>
-		<nb_visits>0</nb_visits>
+		<nb_visits>1</nb_visits>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
 		<day_of_week>1</day_of_week>
 	</row>
 	<row>
@@ -12,24 +18,24 @@
 	</row>
 	<row>
 		<label>Wednesday</label>
-		<nb_visits>2</nb_visits>
-		<nb_uniq_visitors>2</nb_uniq_visitors>
-		<nb_actions>2</nb_actions>
-		<nb_users>0</nb_users>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>2</bounce_count>
-		<nb_visits_converted>2</nb_visits_converted>
+		<nb_visits>7</nb_visits>
+		<nb_uniq_visitors>5</nb_uniq_visitors>
+		<nb_actions>10</nb_actions>
+		<nb_users>2</nb_users>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>5</bounce_count>
+		<nb_visits_converted>7</nb_visits_converted>
 		<day_of_week>3</day_of_week>
 	</row>
 	<row>
 		<label>Thursday</label>
-		<nb_visits>9</nb_visits>
-		<nb_uniq_visitors>9</nb_uniq_visitors>
-		<nb_actions>9</nb_actions>
+		<nb_visits>11</nb_visits>
+		<nb_uniq_visitors>11</nb_uniq_visitors>
+		<nb_actions>12</nb_actions>
 		<nb_users>0</nb_users>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>9</bounce_count>
-		<nb_visits_converted>9</nb_visits_converted>
+		<sum_visit_length>242</sum_visit_length>
+		<bounce_count>10</bounce_count>
+		<nb_visits_converted>11</nb_visits_converted>
 		<day_of_week>4</day_of_week>
 	</row>
 	<row>
@@ -56,7 +62,13 @@
 	</row>
 	<row>
 		<label>Sunday</label>
-		<nb_visits>0</nb_visits>
+		<nb_visits>2</nb_visits>
+		<nb_uniq_visitors>2</nb_uniq_visitors>
+		<nb_actions>2</nb_actions>
+		<nb_users>0</nb_users>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>2</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
 		<day_of_week>7</day_of_week>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
index 427319a89f..e3f6916792 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
@@ -10,17 +10,19 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitLocalHour==0</segment>
 	</row>
 	<row>
 		<label>1h</label>
-		<nb_visits>0</nb_visits>
-		<nb_actions>0</nb_actions>
-		<max_actions>0</max_actions>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>0</bounce_count>
-		<nb_visits_converted>0</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitLocalHour==1</segment>
 	</row>
 	<row>
 		<label>2h</label>
@@ -32,6 +34,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitLocalHour==2</segment>
 	</row>
 	<row>
 		<label>3h</label>
@@ -43,6 +46,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitLocalHour==3</segment>
 	</row>
 	<row>
 		<label>4h</label>
@@ -54,6 +58,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitLocalHour==4</segment>
 	</row>
 	<row>
 		<label>5h</label>
@@ -65,6 +70,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitLocalHour==5</segment>
 	</row>
 	<row>
 		<label>6h</label>
@@ -76,6 +82,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitLocalHour==6</segment>
 	</row>
 	<row>
 		<label>7h</label>
@@ -87,6 +94,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitLocalHour==7</segment>
 	</row>
 	<row>
 		<label>8h</label>
@@ -98,6 +106,7 @@
 		<nb_visits_converted>5</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitLocalHour==8</segment>
 	</row>
 	<row>
 		<label>9h</label>
@@ -109,6 +118,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitLocalHour==9</segment>
 	</row>
 	<row>
 		<label>10h</label>
@@ -120,28 +130,31 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitLocalHour==10</segment>
 	</row>
 	<row>
 		<label>11h</label>
-		<nb_visits>0</nb_visits>
-		<nb_actions>0</nb_actions>
-		<max_actions>0</max_actions>
-		<sum_visit_length>0</sum_visit_length>
+		<nb_visits>1</nb_visits>
+		<nb_actions>2</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>242</sum_visit_length>
 		<bounce_count>0</bounce_count>
-		<nb_visits_converted>0</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
+		<nb_visits_converted>1</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitLocalHour==11</segment>
 	</row>
 	<row>
 		<label>12h</label>
-		<nb_visits>1</nb_visits>
-		<nb_actions>1</nb_actions>
+		<nb_visits>2</nb_visits>
+		<nb_actions>2</nb_actions>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>1</bounce_count>
-		<nb_visits_converted>1</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+		<bounce_count>2</bounce_count>
+		<nb_visits_converted>2</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitLocalHour==12</segment>
 	</row>
 	<row>
 		<label>13h</label>
@@ -153,6 +166,7 @@
 		<nb_visits_converted>4</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitLocalHour==13</segment>
 	</row>
 	<row>
 		<label>14h</label>
@@ -164,6 +178,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitLocalHour==14</segment>
 	</row>
 	<row>
 		<label>15h</label>
@@ -175,6 +190,7 @@
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitLocalHour==15</segment>
 	</row>
 	<row>
 		<label>16h</label>
@@ -186,17 +202,19 @@
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitLocalHour==16</segment>
 	</row>
 	<row>
 		<label>17h</label>
-		<nb_visits>3</nb_visits>
-		<nb_actions>3</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>3</bounce_count>
-		<nb_visits_converted>2</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<nb_visits>8</nb_visits>
+		<nb_actions>11</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>6</bounce_count>
+		<nb_visits_converted>7</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<segment>visitLocalHour==17</segment>
 	</row>
 	<row>
 		<label>18h</label>
@@ -208,6 +226,7 @@
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitLocalHour==18</segment>
 	</row>
 	<row>
 		<label>19h</label>
@@ -219,6 +238,7 @@
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitLocalHour==19</segment>
 	</row>
 	<row>
 		<label>20h</label>
@@ -230,6 +250,7 @@
 		<nb_visits_converted>6</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitLocalHour==20</segment>
 	</row>
 	<row>
 		<label>21h</label>
@@ -241,6 +262,7 @@
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitLocalHour==21</segment>
 	</row>
 	<row>
 		<label>22h</label>
@@ -252,16 +274,18 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitLocalHour==22</segment>
 	</row>
 	<row>
 		<label>23h</label>
-		<nb_visits>0</nb_visits>
-		<nb_actions>0</nb_actions>
-		<max_actions>0</max_actions>
+		<nb_visits>2</nb_visits>
+		<nb_actions>2</nb_actions>
+		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>0</bounce_count>
+		<bounce_count>2</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitLocalHour==23</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
index 515e54eb3b..da07966d39 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
@@ -10,17 +10,28 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==0</segment>
 	</row>
 	<row>
 		<label>1h</label>
-		<nb_visits>0</nb_visits>
-		<nb_actions>0</nb_actions>
-		<max_actions>0</max_actions>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>0</bounce_count>
+		<bounce_count>1</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>5</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>5</revenue>
+		<segment>visitServerHour==1</segment>
 	</row>
 	<row>
 		<label>2h</label>
@@ -32,6 +43,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==2</segment>
 	</row>
 	<row>
 		<label>3h</label>
@@ -43,6 +55,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==3</segment>
 	</row>
 	<row>
 		<label>4h</label>
@@ -63,6 +76,7 @@
 		</goals>
 		<nb_conversions>1</nb_conversions>
 		<revenue>5</revenue>
+		<segment>visitServerHour==4</segment>
 	</row>
 	<row>
 		<label>5h</label>
@@ -74,6 +88,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==5</segment>
 	</row>
 	<row>
 		<label>6h</label>
@@ -85,6 +100,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==6</segment>
 	</row>
 	<row>
 		<label>7h</label>
@@ -105,6 +121,7 @@
 		</goals>
 		<nb_conversions>1</nb_conversions>
 		<revenue>5</revenue>
+		<segment>visitServerHour==7</segment>
 	</row>
 	<row>
 		<label>8h</label>
@@ -125,6 +142,7 @@
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==8</segment>
 	</row>
 	<row>
 		<label>9h</label>
@@ -136,6 +154,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==9</segment>
 	</row>
 	<row>
 		<label>10h</label>
@@ -147,28 +166,49 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==10</segment>
 	</row>
 	<row>
 		<label>11h</label>
-		<nb_visits>0</nb_visits>
-		<nb_actions>0</nb_actions>
-		<max_actions>0</max_actions>
-		<sum_visit_length>0</sum_visit_length>
+		<nb_visits>1</nb_visits>
+		<nb_actions>2</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>242</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>5</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>5</revenue>
+		<segment>visitServerHour==11</segment>
 	</row>
 	<row>
 		<label>12h</label>
-		<nb_visits>0</nb_visits>
-		<nb_actions>0</nb_actions>
-		<max_actions>0</max_actions>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>0</bounce_count>
+		<bounce_count>1</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>5</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>5</revenue>
+		<segment>visitServerHour==12</segment>
 	</row>
 	<row>
 		<label>13h</label>
@@ -189,6 +229,7 @@
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==13</segment>
 	</row>
 	<row>
 		<label>14h</label>
@@ -200,6 +241,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==14</segment>
 	</row>
 	<row>
 		<label>15h</label>
@@ -220,6 +262,7 @@
 		</goals>
 		<nb_conversions>1</nb_conversions>
 		<revenue>5</revenue>
+		<segment>visitServerHour==15</segment>
 	</row>
 	<row>
 		<label>16h</label>
@@ -240,26 +283,28 @@
 		</goals>
 		<nb_conversions>2</nb_conversions>
 		<revenue>10</revenue>
+		<segment>visitServerHour==16</segment>
 	</row>
 	<row>
 		<label>17h</label>
-		<nb_visits>3</nb_visits>
-		<nb_actions>3</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>3</bounce_count>
+		<nb_visits>8</nb_visits>
+		<nb_actions>11</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>6</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>2</sum_daily_nb_users>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>2</nb_conversions>
-				<nb_visits_converted>2</nb_visits_converted>
-				<revenue>10</revenue>
+				<nb_conversions>7</nb_conversions>
+				<nb_visits_converted>7</nb_visits_converted>
+				<revenue>35</revenue>
 			</row>
 		</goals>
-		<nb_conversions>2</nb_conversions>
-		<revenue>10</revenue>
+		<nb_conversions>7</nb_conversions>
+		<revenue>35</revenue>
+		<segment>visitServerHour==17</segment>
 	</row>
 	<row>
 		<label>18h</label>
@@ -280,6 +325,7 @@
 		</goals>
 		<nb_conversions>1</nb_conversions>
 		<revenue>5</revenue>
+		<segment>visitServerHour==18</segment>
 	</row>
 	<row>
 		<label>19h</label>
@@ -300,6 +346,7 @@
 		</goals>
 		<nb_conversions>2</nb_conversions>
 		<revenue>10</revenue>
+		<segment>visitServerHour==19</segment>
 	</row>
 	<row>
 		<label>20h</label>
@@ -320,6 +367,7 @@
 		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==20</segment>
 	</row>
 	<row>
 		<label>21h</label>
@@ -340,6 +388,7 @@
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==21</segment>
 	</row>
 	<row>
 		<label>22h</label>
@@ -351,16 +400,18 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==22</segment>
 	</row>
 	<row>
 		<label>23h</label>
-		<nb_visits>0</nb_visits>
-		<nb_actions>0</nb_actions>
-		<max_actions>0</max_actions>
+		<nb_visits>2</nb_visits>
+		<nb_actions>2</nb_actions>
+		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>0</bounce_count>
+		<bounce_count>2</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==23</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
index c47de22fc4..cfcc9e97d1 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
@@ -2,11 +2,11 @@
 <result>
 	<row>
 		<label>New visits</label>
-		<nb_visits>26</nb_visits>
+		<nb_visits>34</nb_visits>
 	</row>
 	<row>
 		<label>0 days</label>
-		<nb_visits>0</nb_visits>
+		<nb_visits>2</nb_visits>
 	</row>
 	<row>
 		<label>1 day</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml
index c7ed81d100..e5413c84fb 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml
@@ -2,11 +2,11 @@
 <result>
 	<row>
 		<label>New visits</label>
-		<nb_visits>30</nb_visits>
+		<nb_visits>38</nb_visits>
 	</row>
 	<row>
 		<label>0 days</label>
-		<nb_visits>3</nb_visits>
+		<nb_visits>5</nb_visits>
 	</row>
 	<row>
 		<label>1 day</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
index 0830ca0d10..dbf2a47c48 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
@@ -2,7 +2,7 @@
 <result>
 	<row>
 		<label>1 visit</label>
-		<nb_visits>27</nb_visits>
+		<nb_visits>37</nb_visits>
 		<nb_visits_percentage>100%</nb_visits_percentage>
 	</row>
 	<row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml
index d7672ae30c..789e9e8110 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml
@@ -2,13 +2,13 @@
 <result>
 	<row>
 		<label>1 visit</label>
-		<nb_visits>33</nb_visits>
-		<nb_visits_percentage>83%</nb_visits_percentage>
+		<nb_visits>43</nb_visits>
+		<nb_visits_percentage>86%</nb_visits_percentage>
 	</row>
 	<row>
 		<label>2 visits</label>
 		<nb_visits>2</nb_visits>
-		<nb_visits_percentage>5%</nb_visits_percentage>
+		<nb_visits_percentage>4%</nb_visits_percentage>
 	</row>
 	<row>
 		<label>3 visits</label>
@@ -18,12 +18,12 @@
 	<row>
 		<label>4 visits</label>
 		<nb_visits>1</nb_visits>
-		<nb_visits_percentage>3%</nb_visits_percentage>
+		<nb_visits_percentage>2%</nb_visits_percentage>
 	</row>
 	<row>
 		<label>5 visits</label>
 		<nb_visits>2</nb_visits>
-		<nb_visits_percentage>5%</nb_visits_percentage>
+		<nb_visits_percentage>4%</nb_visits_percentage>
 	</row>
 	<row>
 		<label>6 visits</label>
@@ -33,7 +33,7 @@
 	<row>
 		<label>7 visits</label>
 		<nb_visits>1</nb_visits>
-		<nb_visits_percentage>3%</nb_visits_percentage>
+		<nb_visits_percentage>2%</nb_visits_percentage>
 	</row>
 	<row>
 		<label>8 visits</label>
@@ -58,7 +58,7 @@
 	<row>
 		<label>51-100 visits</label>
 		<nb_visits>1</nb_visits>
-		<nb_visits_percentage>3%</nb_visits_percentage>
+		<nb_visits_percentage>2%</nb_visits_percentage>
 	</row>
 	<row>
 		<label>101-200 visits</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
index 4e6a9ab29e..8829c9b1a5 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
@@ -2,15 +2,15 @@
 <result>
 	<row>
 		<label>1 page</label>
-		<nb_visits>25</nb_visits>
+		<nb_visits>32</nb_visits>
 	</row>
 	<row>
 		<label>2 pages</label>
-		<nb_visits>1</nb_visits>
+		<nb_visits>3</nb_visits>
 	</row>
 	<row>
 		<label>3 pages</label>
-		<nb_visits>1</nb_visits>
+		<nb_visits>2</nb_visits>
 	</row>
 	<row>
 		<label>4 pages</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml
index 11e27426c0..d99a7802f0 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml
@@ -2,15 +2,15 @@
 <result>
 	<row>
 		<label>1 page</label>
-		<nb_visits>34</nb_visits>
+		<nb_visits>41</nb_visits>
 	</row>
 	<row>
 		<label>2 pages</label>
-		<nb_visits>3</nb_visits>
+		<nb_visits>5</nb_visits>
 	</row>
 	<row>
 		<label>3 pages</label>
-		<nb_visits>2</nb_visits>
+		<nb_visits>3</nb_visits>
 	</row>
 	<row>
 		<label>4 pages</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
index a64c14a967..eac22754d0 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
@@ -2,7 +2,7 @@
 <result>
 	<row>
 		<label>0-10s</label>
-		<nb_visits>25</nb_visits>
+		<nb_visits>34</nb_visits>
 	</row>
 	<row>
 		<label>11-30s</label>
@@ -22,7 +22,7 @@
 	</row>
 	<row>
 		<label>4-7 min</label>
-		<nb_visits>0</nb_visits>
+		<nb_visits>1</nb_visits>
 	</row>
 	<row>
 		<label>7-10 min</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml
index a0cba6d294..0fa5658a92 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml
@@ -2,7 +2,7 @@
 <result>
 	<row>
 		<label>0-10s</label>
-		<nb_visits>35</nb_visits>
+		<nb_visits>44</nb_visits>
 	</row>
 	<row>
 		<label>11-30s</label>
@@ -22,7 +22,7 @@
 	</row>
 	<row>
 		<label>4-7 min</label>
-		<nb_visits>0</nb_visits>
+		<nb_visits>1</nb_visits>
 	</row>
 	<row>
 		<label>7-10 min</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
index 3fb9469667..1e4ba1a5cb 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>30</result>
\ No newline at end of file
+<result>44</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
index 4c77f1f6e6..a946f8e505 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>25</result>
\ No newline at end of file
+<result>32</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml
index 0a9c671f55..9ce15e5960 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>5 min 5s</result>
\ No newline at end of file
+<result>9 min 11s</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml
index df25f1c1f3..c3d46f00fb 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>305</result>
\ No newline at end of file
+<result>551</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
index 40bd2e592a..8e4b837a62 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>27</result>
\ No newline at end of file
+<result>35</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml
index f5722c2b94..13002b2017 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>0</result>
\ No newline at end of file
+<result>2</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
index 4c77f1f6e6..95aa700980 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>25</result>
\ No newline at end of file
+<result>33</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
index 40bd2e592a..51a0bb8472 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>27</result>
\ No newline at end of file
+<result>37</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml
index 327d564f47..1d536766e2 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
-	<nb_uniq_visitors>27</nb_uniq_visitors>
-	<nb_users>0</nb_users>
-	<nb_visits>27</nb_visits>
-	<nb_actions>30</nb_actions>
-	<nb_visits_converted>25</nb_visits_converted>
-	<bounce_count>25</bounce_count>
-	<sum_visit_length>305</sum_visit_length>
+	<nb_uniq_visitors>35</nb_uniq_visitors>
+	<nb_users>2</nb_users>
+	<nb_visits>37</nb_visits>
+	<nb_actions>44</nb_actions>
+	<nb_visits_converted>33</nb_visits_converted>
+	<bounce_count>32</bounce_count>
+	<sum_visit_length>551</sum_visit_length>
 	<max_actions>3</max_actions>
-	<bounce_rate>93%</bounce_rate>
-	<nb_actions_per_visit>1.1</nb_actions_per_visit>
-	<avg_time_on_site>11</avg_time_on_site>
+	<bounce_rate>86%</bounce_rate>
+	<nb_actions_per_visit>1.2</nb_actions_per_visit>
+	<avg_time_on_site>15</avg_time_on_site>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml
index 0fb183d46f..84d1611e02 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml
@@ -3,11 +3,11 @@
 	<result date="2012-08">
 		<row>
 			<label>Piwik test</label>
-			<nb_visits>27</nb_visits>
-			<nb_actions>30</nb_actions>
-			<nb_pageviews>26</nb_pageviews>
-			<revenue>125</revenue>
-			<nb_conversions>25</nb_conversions>
+			<nb_visits>37</nb_visits>
+			<nb_actions>44</nb_actions>
+			<nb_pageviews>38</nb_pageviews>
+			<revenue>165</revenue>
+			<nb_conversions>33</nb_conversions>
 			<visits_evolution>100%</visits_evolution>
 			<actions_evolution>100%</actions_evolution>
 			<pageviews_evolution>100%</pageviews_evolution>
@@ -42,11 +42,11 @@
 			<nb_pageviews>10</nb_pageviews>
 			<revenue>5</revenue>
 			<nb_conversions>1</nb_conversions>
-			<visits_evolution>-96.3%</visits_evolution>
-			<actions_evolution>-66.7%</actions_evolution>
-			<pageviews_evolution>-61.5%</pageviews_evolution>
-			<revenue_evolution>-96%</revenue_evolution>
-			<nb_conversions_evolution>-96%</nb_conversions_evolution>
+			<visits_evolution>-97.3%</visits_evolution>
+			<actions_evolution>-77.3%</actions_evolution>
+			<pageviews_evolution>-73.7%</pageviews_evolution>
+			<revenue_evolution>-97%</revenue_evolution>
+			<nb_conversions_evolution>-97%</nb_conversions_evolution>
 			<group />
 			<main_url>http://piwik.net</main_url>
 			<idsite>1</idsite>
diff --git a/tests/PHPUnit/System/expected/test_LabelFilter_0__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_0__Actions.getPageUrls_day.xml
index 88bdbcf6cd..ba2ccdf172 100644
--- a/tests/PHPUnit/System/expected/test_LabelFilter_0__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_LabelFilter_0__Actions.getPageUrls_day.xml
@@ -16,5 +16,6 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0.635</avg_time_generation>
 		<url>http://example.org/0</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2F0</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_LabelFilter_dir2sub0filephp__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_dir2sub0filephp__Actions.getPageUrls_day.xml
index 8cedb2f9a9..2f4b47c2f8 100644
--- a/tests/PHPUnit/System/expected/test_LabelFilter_dir2sub0filephp__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_LabelFilter_dir2sub0filephp__Actions.getPageUrls_day.xml
@@ -10,5 +10,6 @@
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
 		<url>http://example.org/dir2/sub/0/file.php</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2F0%2Ffile.php</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_LabelFilter_dirfilephpfoobarfoo2bar__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_dirfilephpfoobarfoo2bar__Actions.getPageUrls_day.xml
index b557287b32..576c78dacd 100644
--- a/tests/PHPUnit/System/expected/test_LabelFilter_dirfilephpfoobarfoo2bar__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_LabelFilter_dirfilephpfoobarfoo2bar__Actions.getPageUrls_day.xml
@@ -14,5 +14,6 @@
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.123</avg_time_generation>
 		<url>http://example.org/dir/file.php?foo=bar&amp;foo2=bar</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir%2Ffile.php%3Ffoo%3Dbar%26foo2%3Dbar</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_LabelFilter_terminalOperator_selectTerminal__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_terminalOperator_selectTerminal__Actions.getPageUrls_day.xml
index 2a3958ceba..c79c3b7ae5 100644
--- a/tests/PHPUnit/System/expected/test_LabelFilter_terminalOperator_selectTerminal__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_LabelFilter_terminalOperator_selectTerminal__Actions.getPageUrls_day.xml
@@ -14,5 +14,6 @@
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.333</avg_time_generation>
 		<url>http://example.org/dir/subdir</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir%2Fsubdir</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml
index 4cec8aa9aa..65c519b014 100644
--- a/tests/PHPUnit/System/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml
@@ -19,5 +19,6 @@
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.523</avg_time_generation>
 		<url>http://example.org/%C3%A9%C3%A9%C3%A9%22%27...%20%3Cthis%20is%20cool%3E!</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2F%C3%A9%C3%A9%C3%A9%22%27...+%3Cthis+is+cool%3E%21</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml
index 0879f6fb5b..7bfd771393 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml
@@ -94,12 +94,12 @@
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<deviceType>Desktop</deviceType>
@@ -215,12 +215,12 @@
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<deviceType>Desktop</deviceType>
@@ -336,12 +336,12 @@
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<deviceType>Desktop</deviceType>
@@ -457,12 +457,12 @@
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<deviceType>Desktop</deviceType>
@@ -609,12 +609,12 @@
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<deviceType>Desktop</deviceType>
@@ -761,12 +761,12 @@
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browserName>Firefox 3.6</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<deviceType>Desktop</deviceType>
@@ -906,11 +906,11 @@
 		<referrerSearchEngineIcon />
 		<operatingSystem>Unknown</operatingSystem>
 		<operatingSystemCode>UNK</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
 		<browserFamily>unknown</browserFamily>
 		<browserFamilyDescription>Unknown</browserFamilyDescription>
 		<browserName>Unknown</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion>UNK</browserVersion>
 		<deviceType>Desktop</deviceType>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml
index d252d03f5d..13a602c5e9 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml
@@ -15,6 +15,7 @@
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -34,6 +35,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -66,27 +68,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -102,6 +94,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -136,6 +140,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -147,6 +152,7 @@
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>search</type>
@@ -164,6 +170,7 @@
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -174,6 +181,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -186,6 +194,7 @@
 				<eventName>Name0</eventName>
 				<eventValue>345.678</eventValue>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -218,27 +227,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -254,6 +253,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -288,6 +299,7 @@
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -307,6 +319,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -339,27 +352,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -375,6 +378,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -409,6 +424,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -420,6 +436,7 @@
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>search</type>
@@ -437,6 +454,7 @@
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -447,6 +465,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -459,6 +478,7 @@
 				<eventName>Name0</eventName>
 				<eventValue>345.678</eventValue>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -491,27 +511,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -527,6 +537,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -561,6 +583,7 @@
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -580,6 +603,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -612,27 +636,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -648,6 +662,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -682,6 +708,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -693,6 +720,7 @@
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>search</type>
@@ -710,6 +738,7 @@
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -720,6 +749,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -732,6 +762,7 @@
 				<eventName>Name0</eventName>
 				<eventValue>345.678</eventValue>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -764,27 +795,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Unknown</deviceType>
 		<operatingSystem>Unknown</operatingSystem>
+		<operatingSystemName>Unknown</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
 		<operatingSystemCode>UNK</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+		<operatingSystemVersion>UNK</operatingSystemVersion>
 		<browserFamily />
 		<browserFamilyDescription>Unknown</browserFamilyDescription>
 		<browser>Unknown</browser>
 		<browserName>Unknown</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion />
 		<events>1</events>
@@ -800,6 +821,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -826,6 +859,7 @@
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -845,6 +879,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -877,27 +912,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -913,6 +938,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
index 2975b07bcb..aad2221cad 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
@@ -15,6 +15,7 @@
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -24,6 +25,7 @@
 				
 				<pageId>61</pageId>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -56,27 +58,17 @@
 		<referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
 		<browser>Safari</browser>
 		<browserName>Safari</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon>
 		<browserCode>SF</browserCode>
 		<browserVersion />
 		<events>0</events>
@@ -94,6 +86,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -120,6 +124,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -131,6 +136,7 @@
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>search</type>
@@ -148,6 +154,7 @@
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -158,6 +165,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -170,6 +178,7 @@
 				<eventName>Name8</eventName>
 				<eventValue>353.678</eventValue>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -202,27 +211,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -240,6 +239,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -274,6 +285,7 @@
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -293,6 +305,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -325,27 +338,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -363,6 +366,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -397,6 +412,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -408,6 +424,7 @@
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -418,6 +435,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -430,6 +448,7 @@
 				<eventName>Name7</eventName>
 				<eventValue>352.678</eventValue>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -462,27 +481,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -500,6 +509,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -534,6 +555,7 @@
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -553,6 +575,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -585,27 +608,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -623,6 +636,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -657,6 +682,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -668,6 +694,7 @@
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>search</type>
@@ -685,6 +712,7 @@
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -695,6 +723,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -707,6 +736,7 @@
 				<eventName>Name6</eventName>
 				<eventValue>351.678</eventValue>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -739,27 +769,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -777,6 +797,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -811,6 +843,7 @@
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -830,6 +863,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -862,27 +896,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -900,6 +924,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml
index 759645d39d..e2655f545e 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml
@@ -15,6 +15,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -26,6 +27,7 @@
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>search</type>
@@ -43,6 +45,7 @@
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -53,6 +56,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -65,6 +69,7 @@
 				<eventName>Name8</eventName>
 				<eventValue>353.678</eventValue>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -97,27 +102,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -135,6 +130,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -169,6 +176,7 @@
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -188,6 +196,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -220,27 +229,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -258,6 +257,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -292,6 +303,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -303,6 +315,7 @@
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>search</type>
@@ -320,6 +333,7 @@
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -330,6 +344,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -342,6 +357,7 @@
 				<eventName>Name6</eventName>
 				<eventValue>351.678</eventValue>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -374,27 +390,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -412,6 +418,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -446,6 +464,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -457,6 +476,7 @@
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -467,6 +487,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -479,6 +500,7 @@
 				<eventName>Name7</eventName>
 				<eventValue>352.678</eventValue>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -511,27 +533,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -549,6 +561,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -583,6 +607,7 @@
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -602,6 +627,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -634,27 +660,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -672,6 +688,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -706,6 +734,7 @@
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -725,6 +754,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -757,27 +787,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -795,6 +815,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -829,6 +861,7 @@
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -838,6 +871,7 @@
 				
 				<pageId>61</pageId>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -870,27 +904,17 @@
 		<referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
 		<browser>Safari</browser>
 		<browserName>Safari</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon>
 		<browserCode>SF</browserCode>
 		<browserVersion />
 		<events>0</events>
@@ -908,6 +932,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
index 2975b07bcb..aad2221cad 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
@@ -15,6 +15,7 @@
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -24,6 +25,7 @@
 				
 				<pageId>61</pageId>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -56,27 +58,17 @@
 		<referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
 		<browser>Safari</browser>
 		<browserName>Safari</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon>
 		<browserCode>SF</browserCode>
 		<browserVersion />
 		<events>0</events>
@@ -94,6 +86,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -120,6 +124,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -131,6 +136,7 @@
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>search</type>
@@ -148,6 +154,7 @@
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -158,6 +165,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -170,6 +178,7 @@
 				<eventName>Name8</eventName>
 				<eventValue>353.678</eventValue>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -202,27 +211,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -240,6 +239,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -274,6 +285,7 @@
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -293,6 +305,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -325,27 +338,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -363,6 +366,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -397,6 +412,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -408,6 +424,7 @@
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -418,6 +435,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -430,6 +448,7 @@
 				<eventName>Name7</eventName>
 				<eventValue>352.678</eventValue>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -462,27 +481,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -500,6 +509,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -534,6 +555,7 @@
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -553,6 +575,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -585,27 +608,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -623,6 +636,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -657,6 +682,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -668,6 +694,7 @@
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>search</type>
@@ -685,6 +712,7 @@
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -695,6 +723,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -707,6 +736,7 @@
 				<eventName>Name6</eventName>
 				<eventValue>351.678</eventValue>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -739,27 +769,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -777,6 +797,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -811,6 +843,7 @@
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -830,6 +863,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -862,27 +896,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -900,6 +924,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
index bd23daaa04..fd578a862c 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
@@ -15,6 +15,7 @@
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -24,6 +25,7 @@
 				
 				<pageId>61</pageId>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -56,27 +58,17 @@
 		<referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl>
 		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
 		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>WebKit</browserFamily>
 		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
 		<browser>Safari</browser>
 		<browserName>Safari</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon>
 		<browserCode>SF</browserCode>
 		<browserVersion />
 		<events>0</events>
@@ -94,6 +86,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -120,6 +124,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -131,6 +136,7 @@
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>search</type>
@@ -148,6 +154,7 @@
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -158,6 +165,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -170,6 +178,7 @@
 				<eventName>Name8</eventName>
 				<eventValue>353.678</eventValue>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -202,27 +211,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -240,6 +239,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -274,6 +285,7 @@
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -293,6 +305,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -325,27 +338,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -363,6 +366,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -397,6 +412,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -408,6 +424,7 @@
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -418,6 +435,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -430,6 +448,7 @@
 				<eventName>Name7</eventName>
 				<eventValue>352.678</eventValue>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -462,27 +481,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -500,6 +509,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -534,6 +555,7 @@
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -553,6 +575,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -585,27 +608,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -623,6 +636,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -657,6 +682,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -668,6 +694,7 @@
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>search</type>
@@ -685,6 +712,7 @@
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -695,6 +723,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -707,6 +736,7 @@
 				<eventName>Name6</eventName>
 				<eventValue>351.678</eventValue>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -739,27 +769,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -777,6 +797,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -811,6 +843,7 @@
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -830,6 +863,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -862,27 +896,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -900,6 +924,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -934,6 +970,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -945,6 +982,7 @@
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -955,6 +993,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -967,6 +1006,7 @@
 				<eventName>Name5</eventName>
 				<eventValue>350.678</eventValue>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -999,27 +1039,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -1037,6 +1067,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -1071,6 +1113,7 @@
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -1090,6 +1133,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -1122,27 +1166,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
@@ -1160,6 +1194,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>11</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
 		<providerUrl />
@@ -1194,6 +1240,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -1205,6 +1252,7 @@
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>search</type>
@@ -1222,6 +1270,7 @@
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -1232,6 +1281,7 @@
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>event</type>
@@ -1244,6 +1294,7 @@
 				<eventName>Name4</eventName>
 				<eventValue>349.678</eventValue>
 				<icon>plugins/Morpheus/images/event.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -1276,27 +1327,17 @@
 		<referrerUrl />
 		<referrerSearchEngineUrl />
 		<referrerSearchEngineIcon />
-		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>1</events>
@@ -1314,6 +1355,18 @@
 		<visitLocalTime>12:34:06</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>10</daysSinceLastVisit>
+		<resolution>1024x768</resolution>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
 		<provider>awesomeisp.com</provider>
 		<providerName>Awesomeisp</providerName>
 		<providerUrl>http://www.awesomeisp.com/</providerUrl>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
index 15d7f11b70..4526378f9b 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
@@ -56,6 +56,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<lat>49.25</lat>
 		<long>-123.133</long>
+		<segment>city==Vancouver;regionCode==BC;countryCode==ca</segment>
 		<city_name>Vancouver</city_name>
 		<region>BC</region>
 		<country>ca</country>
@@ -88,6 +89,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<lat>124.456</lat>
 		<long>22.231</long>
+		<segment>city==Stratford-upon-Avon;regionCode==P3;countryCode==gb</segment>
 		<city_name>Stratford-upon-Avon</city_name>
 		<region>P3</region>
 		<country>gb</country>
@@ -120,6 +122,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<lat>47.249</lat>
 		<long>6.018</long>
+		<segment>city==Besan%C3%A7on;regionCode==A6;countryCode==fr</segment>
 		<city_name>Besançon</city_name>
 		<region>A6</region>
 		<country>fr</country>
@@ -150,6 +153,7 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>city==Hlubok%C3%A1+nad+Vltavou;regionCode==66;countryCode==ru</segment>
 		<city_name>Hluboká nad Vltavou</city_name>
 		<region>66</region>
 		<country>ru</country>
@@ -182,6 +186,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<lat>29.65</lat>
 		<long>91.1</long>
+		<segment>city==Lhasa;regionCode==1;countryCode==ti</segment>
 		<city_name>Lhasa</city_name>
 		<region>1</region>
 		<country>ti</country>
@@ -212,6 +217,7 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>city==London;regionCode==H9;countryCode==gb</segment>
 		<city_name>London</city_name>
 		<region>H9</region>
 		<country>gb</country>
@@ -242,6 +248,7 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>city==Nuneaton+and+Bedworth;regionCode==P3;countryCode==gb</segment>
 		<city_name>Nuneaton and Bedworth</city_name>
 		<region>P3</region>
 		<country>gb</country>
@@ -272,6 +279,7 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>city==Stratford-upon-Avon;regionCode==66;countryCode==mk</segment>
 		<city_name>Stratford-upon-Avon</city_name>
 		<region>66</region>
 		<country>mk</country>
@@ -302,6 +310,7 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>city==Stratford-upon-Avon;regionCode==66;countryCode==ru</segment>
 		<city_name>Stratford-upon-Avon</city_name>
 		<region>66</region>
 		<country>ru</country>
@@ -332,6 +341,7 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>city==Stratford-upon-Avon;regionCode==G5;countryCode==gb</segment>
 		<city_name>Stratford-upon-Avon</city_name>
 		<region>G5</region>
 		<country>gb</country>
@@ -359,6 +369,7 @@
 		<sum_daily_nb_users>1</sum_daily_nb_users>
 		<lat>1</lat>
 		<long>2</long>
+		<segment>city==not+a+city;regionCode==CA;countryCode==us</segment>
 		<city_name>not a city</city_name>
 		<region>CA</region>
 		<country>us</country>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
index c56807d771..50b14e2ae4 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
@@ -25,6 +25,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>gb</code>
 		<logo>plugins/UserCountry/images/flags/gb.png</logo>
+		<segment>countryCode==gb</segment>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -53,6 +54,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>ca</code>
 		<logo>plugins/UserCountry/images/flags/ca.png</logo>
+		<segment>countryCode==ca</segment>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -81,6 +83,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>ru</code>
 		<logo>plugins/UserCountry/images/flags/ru.png</logo>
+		<segment>countryCode==ru</segment>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -109,6 +112,7 @@
 		<sum_daily_nb_users>1</sum_daily_nb_users>
 		<code>us</code>
 		<logo>plugins/UserCountry/images/flags/us.png</logo>
+		<segment>countryCode==us</segment>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -137,6 +141,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>fr</code>
 		<logo>plugins/UserCountry/images/flags/fr.png</logo>
+		<segment>countryCode==fr</segment>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -165,6 +170,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>id</code>
 		<logo>plugins/UserCountry/images/flags/id.png</logo>
+		<segment>countryCode==id</segment>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -193,6 +199,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>it</code>
 		<logo>plugins/UserCountry/images/flags/it.png</logo>
+		<segment>countryCode==it</segment>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -221,6 +228,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>mk</code>
 		<logo>plugins/UserCountry/images/flags/mk.png</logo>
+		<segment>countryCode==mk</segment>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -249,6 +257,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>ti</code>
 		<logo>plugins/UserCountry/images/flags/ti.png</logo>
+		<segment>countryCode==ti</segment>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -277,6 +286,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>xx</code>
 		<logo>plugins/UserCountry/images/flags/xx.png</logo>
+		<segment>countryCode==xx</segment>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
index dc3dfb8724..3f66e47721 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
@@ -52,6 +52,7 @@
 		<revenue>45</revenue>
 		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>regionCode==BC;countryCode==ca</segment>
 		<region>BC</region>
 		<country>ca</country>
 		<country_name>Canada</country_name>
@@ -81,6 +82,7 @@
 		<revenue>45</revenue>
 		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>regionCode==P3;countryCode==gb</segment>
 		<region>P3</region>
 		<country>gb</country>
 		<country_name>United Kingdom</country_name>
@@ -110,6 +112,7 @@
 		<revenue>30</revenue>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>regionCode==66;countryCode==ru</segment>
 		<region>66</region>
 		<country>ru</country>
 		<country_name>Russian Federation</country_name>
@@ -139,6 +142,7 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>regionCode==1;countryCode==ti</segment>
 		<region>1</region>
 		<country>ti</country>
 		<country_name>Tibet</country_name>
@@ -168,6 +172,7 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>regionCode==66;countryCode==mk</segment>
 		<region>66</region>
 		<country>mk</country>
 		<country_name>Macedonia, the Former Yugoslav Republic of</country_name>
@@ -197,6 +202,7 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>regionCode==A6;countryCode==fr</segment>
 		<region>A6</region>
 		<country>fr</country>
 		<country_name>France</country_name>
@@ -226,6 +232,7 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>regionCode==G5;countryCode==gb</segment>
 		<region>G5</region>
 		<country>gb</country>
 		<country_name>United Kingdom</country_name>
@@ -255,6 +262,7 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>regionCode==H9;countryCode==gb</segment>
 		<region>H9</region>
 		<country>gb</country>
 		<country_name>United Kingdom</country_name>
@@ -279,6 +287,7 @@
 		<revenue>5</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<segment>regionCode==CA;countryCode==us</segment>
 		<region>CA</region>
 		<country>us</country>
 		<country_name>United States</country_name>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml
index 9f9d42d029..fa25ca307f 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml
@@ -25,6 +25,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<lat>124.456</lat>
 		<long>22.231</long>
+		<segment>city==Stratford-upon-Avon;regionCode==P3;countryCode==gb</segment>
 		<city_name>Stratford-upon-Avon</city_name>
 		<region>P3</region>
 		<country>gb</country>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml
index 369a9aa0e0..3fae74571b 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml
@@ -25,6 +25,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>gb</code>
 		<logo>plugins/UserCountry/images/flags/gb.png</logo>
+		<segment>countryCode==gb</segment>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml
index 1324cdf0bc..673c09f94d 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml
@@ -23,6 +23,7 @@
 		<revenue>30</revenue>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>regionCode==P3;countryCode==gb</segment>
 		<region>P3</region>
 		<country>gb</country>
 		<country_name>United Kingdom</country_name>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml
index 18fe81f3a0..92c88ab042 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml
@@ -25,6 +25,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>gb</code>
 		<logo>plugins/UserCountry/images/flags/gb.png</logo>
+		<segment>countryCode==gb</segment>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -53,6 +54,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>ru</code>
 		<logo>plugins/UserCountry/images/flags/ru.png</logo>
+		<segment>countryCode==ru</segment>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -81,6 +83,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>fr</code>
 		<logo>plugins/UserCountry/images/flags/fr.png</logo>
+		<segment>countryCode==fr</segment>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -109,6 +112,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>it</code>
 		<logo>plugins/UserCountry/images/flags/it.png</logo>
+		<segment>countryCode==it</segment>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -137,6 +141,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>mk</code>
 		<logo>plugins/UserCountry/images/flags/mk.png</logo>
+		<segment>countryCode==mk</segment>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml
index 77c07df86f..b64ec6a819 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml
@@ -25,6 +25,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<lat>49.25</lat>
 		<long>-123.133</long>
+		<segment>city==Vancouver;regionCode==BC;countryCode==ca</segment>
 		<city_name>Vancouver</city_name>
 		<region>BC</region>
 		<country>ca</country>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml
index f881b40d77..211b3504c1 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml
@@ -25,6 +25,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>ca</code>
 		<logo>plugins/UserCountry/images/flags/ca.png</logo>
+		<segment>countryCode==ca</segment>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml
index 16373b92ee..3fdca68028 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml
@@ -23,6 +23,7 @@
 		<revenue>45</revenue>
 		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>regionCode==BC;countryCode==ca</segment>
 		<region>BC</region>
 		<country>ca</country>
 		<country_name>Canada</country_name>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml
index 0f87ed59f3..57d7264bdc 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml
@@ -25,6 +25,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<lat>124.456</lat>
 		<long>22.231</long>
+		<segment>city==Stratford-upon-Avon;regionCode==P3;countryCode==gb</segment>
 		<city_name>Stratford-upon-Avon</city_name>
 		<region>P3</region>
 		<country>gb</country>
@@ -55,6 +56,7 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>city==Nuneaton+and+Bedworth;regionCode==P3;countryCode==gb</segment>
 		<city_name>Nuneaton and Bedworth</city_name>
 		<region>P3</region>
 		<country>gb</country>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml
index 48c3eea1ad..a1e694906d 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml
@@ -25,6 +25,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>gb</code>
 		<logo>plugins/UserCountry/images/flags/gb.png</logo>
+		<segment>countryCode==gb</segment>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml
index 5b3a0754a3..04e7049815 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml
@@ -23,6 +23,7 @@
 		<revenue>45</revenue>
 		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>regionCode==P3;countryCode==gb</segment>
 		<region>P3</region>
 		<country>gb</country>
 		<country_name>United Kingdom</country_name>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml
index 3861e6c668..db0e68eec9 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml
@@ -314,7 +314,80 @@
 			<revenue>$ 0</revenue>
 		</row>
 	</reportData>
-	<reportMetadata />
+	<reportMetadata>
+		<row>
+			<segment>visitServerHour==12</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==11</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==0</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==1</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==2</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==3</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==4</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==5</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==6</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==7</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==8</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==9</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==10</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==13</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==14</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==15</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==16</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==17</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==18</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==19</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==20</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==21</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==22</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==23</segment>
+		</row>
+	</reportMetadata>
 	<reportTotal>
 		<nb_visits>8</nb_visits>
 		<nb_uniq_visitors>8</nb_uniq_visitors>
diff --git a/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageUrls_day.xml
index 3b556b046b..b03bf17f1b 100644
--- a/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageUrls_day.xml
@@ -13,6 +13,7 @@
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>100%</exit_rate>
 		<url>http://example.org/exit-page</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fexit-page</segment>
 	</row>
 	<row>
 		<label>page</label>
diff --git a/tests/PHPUnit/System/expected/test_NonUnicode__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_NonUnicode__Referrers.getWebsites_day.xml
index bf07781a28..b60059d21a 100644
--- a/tests/PHPUnit/System/expected/test_NonUnicode__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_NonUnicode__Referrers.getWebsites_day.xml
@@ -10,6 +10,7 @@
 		<sum_visit_length>721</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerName==anothersite.com</segment>
 		<subtable>
 			<row>
 				<label>http://anothersite.com/whatever.html</label>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml
index 782624f6dc..03f73e41df 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml
@@ -20,6 +20,7 @@
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.234</avg_time_generation>
 		<url>http://example.org/index.htm?parameter=Should display</url>
+		<segment>entryPageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fparameter%3DShould+display</segment>
 	</row>
 	<row>
 		<label>store</label>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml
index 39e9d36014..cbe0c54470 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml
@@ -17,6 +17,7 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0.023</avg_time_generation>
 		<url>http://example.org/index.htm</url>
+		<segment>exitPageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 	</row>
 	<row>
 		<label>store</label>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml
index 099d3c8c45..2a46f6f4a1 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml
@@ -15,6 +15,7 @@
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.224</avg_time_generation>
 		<url>http://example.org/</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2F</segment>
 	</row>
 	<row>
 		<label>/index.htm</label>
@@ -33,6 +34,7 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0.023</avg_time_generation>
 		<url>http://example.org/index.htm</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 	</row>
 	<row>
 		<label>/index.htm?parameter=Should display</label>
@@ -54,6 +56,7 @@
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.234</avg_time_generation>
 		<url>http://example.org/index.htm?parameter=Should display</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fparameter%3DShould+display</segment>
 	</row>
 	<row>
 		<label>store</label>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicePlugins.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicePlugins.getPlugin_day.xml
new file mode 100644
index 0000000000..72728977e1
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicePlugins.getPlugin_day.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>Cookie</label>
+		<nb_visits>2</nb_visits>
+		<nb_visits_percentage>100%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/cookie.gif</logo>
+	</row>
+	<row>
+		<label>Flash</label>
+		<nb_visits>2</nb_visits>
+		<nb_visits_percentage>100%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/flash.gif</logo>
+	</row>
+	<row>
+		<label>Java</label>
+		<nb_visits>2</nb_visits>
+		<nb_visits_percentage>100%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/java.gif</logo>
+	</row>
+	<row>
+		<label>Director</label>
+		<nb_visits>0</nb_visits>
+		<nb_visits_percentage>0%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/director.gif</logo>
+	</row>
+	<row>
+		<label>Gears</label>
+		<nb_visits>0</nb_visits>
+		<nb_visits_percentage>0%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/gears.gif</logo>
+	</row>
+	<row>
+		<label>Pdf</label>
+		<nb_visits>0</nb_visits>
+		<nb_visits_percentage>0%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/pdf.gif</logo>
+	</row>
+	<row>
+		<label>Quicktime</label>
+		<nb_visits>0</nb_visits>
+		<nb_visits_percentage>0%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/quicktime.gif</logo>
+	</row>
+	<row>
+		<label>Realplayer</label>
+		<nb_visits>0</nb_visits>
+		<nb_visits_percentage>0%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/realplayer.gif</logo>
+	</row>
+	<row>
+		<label>Silverlight</label>
+		<nb_visits>0</nb_visits>
+		<nb_visits_percentage>0%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/silverlight.gif</logo>
+	</row>
+	<row>
+		<label>Windowsmedia</label>
+		<nb_visits>0</nb_visits>
+		<nb_visits_percentage>0%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/windowsmedia.gif</logo>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserEngines_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserEngines_day.xml
index 935548a360..5b118e92d7 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserEngines_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserEngines_day.xml
@@ -9,5 +9,6 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
+		<segment>browserEngine==Gecko</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml
index 84860eba92..d2b191ec2f 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml
@@ -9,6 +9,6 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
-		<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+		<logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml
index 6f656fdf68..3b81bc098d 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml
@@ -9,6 +9,7 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
-		<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+		<segment>browserCode==FF;browserVersion==3.6</segment>
+		<logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml
index 84860eba92..a5759e34ec 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml
@@ -9,6 +9,7 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
-		<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+		<logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
+		<segment>browserCode==FF</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml
index 379e429ee3..4b9b40aeea 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml
@@ -9,6 +9,6 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
-		<logo>plugins/UserSettings/images/os/WI7.gif</logo>
+		<logo>plugins/DevicesDetection/images/os/WIN.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml
index 4e417535ae..9707adaacf 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml
@@ -9,6 +9,7 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
-		<logo>plugins/UserSettings/images/os/WXP.gif</logo>
+		<segment>operatingSystemCode==WIN;operatingSystemVersion==XP</segment>
+		<logo>plugins/DevicesDetection/images/os/WIN.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml
index d1aae4191e..2607acf076 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml
@@ -9,46 +9,61 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
+		<segment>deviceType==desktop</segment>
 		<logo>plugins/DevicesDetection/images/screens/normal.gif</logo>
 	</row>
 	<row>
 		<label>Smartphone</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==smartphone</segment>
 		<logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
 	</row>
 	<row>
 		<label>Tablet</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==tablet</segment>
 		<logo>plugins/DevicesDetection/images/screens/tablet.png</logo>
 	</row>
 	<row>
 		<label>Feature phone</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==feature+phone</segment>
 		<logo>plugins/DevicesDetection/images/screens/mobile.gif</logo>
 	</row>
 	<row>
 		<label>Console</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==console</segment>
 		<logo>plugins/DevicesDetection/images/screens/console.gif</logo>
 	</row>
 	<row>
 		<label>Tv</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==tv</segment>
 		<logo>plugins/DevicesDetection/images/screens/tv.png</logo>
 	</row>
 	<row>
 		<label>Car browser</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==car+browser</segment>
 		<logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo>
 	</row>
 	<row>
 		<label>Smart display</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==smart+display</segment>
 		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
 	</row>
 	<row>
 		<label>Camera</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==camera</segment>
 		<logo>plugins/DevicesDetection/images/screens/camera.png</logo>
 	</row>
+	<row>
+		<label>Portable media player</label>
+		<nb_visits>0</nb_visits>
+		<segment>deviceType==portable+media+player</segment>
+		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
+	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__ExamplePlugin.getExampleReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__ExamplePlugin.getExampleReport_day.xml
index 1b2fed39f9..49765ba76c 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__ExamplePlugin.getExampleReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__ExamplePlugin.getExampleReport_day.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
+		<label>My Label 1</label>
+		<nb_visits>1</nb_visits>
+	</row>
+	<row>
+		<label>My Label 2</label>
 		<nb_visits>5</nb_visits>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getKeywords_day.xml
index e5e6ad0926..58e9ba46bb 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getKeywords_day.xml
@@ -17,6 +17,7 @@
 		</goals>
 		<nb_conversions>1</nb_conversions>
 		<revenue>1</revenue>
+		<segment>referrerType==search;referrerKeyword==purchase</segment>
 		<subtable>
 			<row>
 				<label>Yahoo!</label>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctCampaigns_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctCampaigns_day.xml
index 606fbb5241..f5722c2b94 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctCampaigns_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctCampaigns_day.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>1</result>
\ No newline at end of file
+<result>0</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml
index 8a34da6deb..9c7860d9da 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml
@@ -17,6 +17,7 @@
 		</goals>
 		<nb_conversions>1</nb_conversions>
 		<revenue>1</revenue>
+		<segment>referrerType==search;referrerName==Yahoo%21</segment>
 		<url>http://search.yahoo.com</url>
 		<logo>plugins/Referrers/images/searchEngines/search.yahoo.com.png</logo>
 		<subtable>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getWebsites_day.xml
index 5d8d25b332..37df5a9869 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getWebsites_day.xml
@@ -17,6 +17,7 @@
 		</goals>
 		<nb_conversions>1</nb_conversions>
 		<revenue>42</revenue>
+		<segment>referrerName==referrer.com</segment>
 		<subtable>
 			<row>
 				<label>http://referrer.com/page.htm?param=valuewith some spaces</label>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getConfiguration_day.xml
new file mode 100644
index 0000000000..318d2a3375
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getConfiguration_day.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>Windows / Firefox / 1024x768</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>2</nb_visits>
+		<nb_actions>8</nb_actions>
+		<max_actions>7</max_actions>
+		<sum_visit_length>1621</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>2</nb_visits_converted>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getResolution_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getResolution_day.xml
new file mode 100644
index 0000000000..28af23e62d
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getResolution_day.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>1024x768</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>2</nb_visits>
+		<nb_actions>8</nb_actions>
+		<max_actions>7</max_actions>
+		<sum_visit_length>1621</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>2</nb_visits_converted>
+		<segment>resolution==1024x768</segment>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml
index 86f61ceeba..d358b9a330 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml
@@ -24,6 +24,7 @@
 		<revenue>43</revenue>
 		<code>fr</code>
 		<logo>plugins/UserCountry/images/flags/fr.png</logo>
+		<segment>countryCode==fr</segment>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserLanguage.getLanguageCode_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserLanguage.getLanguageCode_day.xml
new file mode 100644
index 0000000000..b5d5e44542
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserLanguage.getLanguageCode_day.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>French (fr)</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>2</nb_visits>
+		<nb_actions>8</nb_actions>
+		<max_actions>7</max_actions>
+		<sum_visit_length>1621</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>2</nb_visits_converted>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserLanguage.getLanguage_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserLanguage.getLanguage_day.xml
new file mode 100644
index 0000000000..a1a81bcc68
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserLanguage.getLanguage_day.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>French</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>2</nb_visits>
+		<nb_actions>8</nb_actions>
+		<max_actions>7</max_actions>
+		<sum_visit_length>1621</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>2</nb_visits_converted>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml
index 935548a360..5b118e92d7 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml
@@ -9,5 +9,6 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
+		<segment>browserEngine==Gecko</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml
index 6f656fdf68..3b81bc098d 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml
@@ -9,6 +9,7 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
-		<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+		<segment>browserCode==FF;browserVersion==3.6</segment>
+		<logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml
index 84860eba92..a5759e34ec 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml
@@ -9,6 +9,7 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
-		<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+		<logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
+		<segment>browserCode==FF</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getConfiguration_day.xml
index 1a63f1933a..318d2a3375 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getConfiguration_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getConfiguration_day.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
-		<label>Windows XP / Firefox / 1024x768</label>
+		<label>Windows / Firefox / 1024x768</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>8</nb_actions>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml
index d1aae4191e..2607acf076 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml
@@ -9,46 +9,61 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
+		<segment>deviceType==desktop</segment>
 		<logo>plugins/DevicesDetection/images/screens/normal.gif</logo>
 	</row>
 	<row>
 		<label>Smartphone</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==smartphone</segment>
 		<logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
 	</row>
 	<row>
 		<label>Tablet</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==tablet</segment>
 		<logo>plugins/DevicesDetection/images/screens/tablet.png</logo>
 	</row>
 	<row>
 		<label>Feature phone</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==feature+phone</segment>
 		<logo>plugins/DevicesDetection/images/screens/mobile.gif</logo>
 	</row>
 	<row>
 		<label>Console</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==console</segment>
 		<logo>plugins/DevicesDetection/images/screens/console.gif</logo>
 	</row>
 	<row>
 		<label>Tv</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==tv</segment>
 		<logo>plugins/DevicesDetection/images/screens/tv.png</logo>
 	</row>
 	<row>
 		<label>Car browser</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==car+browser</segment>
 		<logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo>
 	</row>
 	<row>
 		<label>Smart display</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==smart+display</segment>
 		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
 	</row>
 	<row>
 		<label>Camera</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==camera</segment>
 		<logo>plugins/DevicesDetection/images/screens/camera.png</logo>
 	</row>
+	<row>
+		<label>Portable media player</label>
+		<nb_visits>0</nb_visits>
+		<segment>deviceType==portable+media+player</segment>
+		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
+	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml
index 379e429ee3..4b9b40aeea 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml
@@ -9,6 +9,6 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
-		<logo>plugins/UserSettings/images/os/WI7.gif</logo>
+		<logo>plugins/DevicesDetection/images/os/WIN.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml
index 4e417535ae..9707adaacf 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml
@@ -9,6 +9,7 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
-		<logo>plugins/UserSettings/images/os/WXP.gif</logo>
+		<segment>operatingSystemCode==WIN;operatingSystemVersion==XP</segment>
+		<logo>plugins/DevicesDetection/images/os/WIN.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getPlugin_day.xml
index 9ddd1bed44..72728977e1 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getPlugin_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getPlugin_day.xml
@@ -4,60 +4,60 @@
 		<label>Cookie</label>
 		<nb_visits>2</nb_visits>
 		<nb_visits_percentage>100%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/cookie.gif</logo>
+		<logo>plugins/DevicePlugins/images/plugins/cookie.gif</logo>
 	</row>
 	<row>
 		<label>Flash</label>
 		<nb_visits>2</nb_visits>
 		<nb_visits_percentage>100%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/flash.gif</logo>
+		<logo>plugins/DevicePlugins/images/plugins/flash.gif</logo>
 	</row>
 	<row>
 		<label>Java</label>
 		<nb_visits>2</nb_visits>
 		<nb_visits_percentage>100%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/java.gif</logo>
+		<logo>plugins/DevicePlugins/images/plugins/java.gif</logo>
 	</row>
 	<row>
 		<label>Director</label>
 		<nb_visits>0</nb_visits>
 		<nb_visits_percentage>0%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/director.gif</logo>
+		<logo>plugins/DevicePlugins/images/plugins/director.gif</logo>
 	</row>
 	<row>
 		<label>Gears</label>
 		<nb_visits>0</nb_visits>
 		<nb_visits_percentage>0%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/gears.gif</logo>
+		<logo>plugins/DevicePlugins/images/plugins/gears.gif</logo>
 	</row>
 	<row>
 		<label>Pdf</label>
 		<nb_visits>0</nb_visits>
 		<nb_visits_percentage>0%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/pdf.gif</logo>
+		<logo>plugins/DevicePlugins/images/plugins/pdf.gif</logo>
 	</row>
 	<row>
 		<label>Quicktime</label>
 		<nb_visits>0</nb_visits>
 		<nb_visits_percentage>0%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/quicktime.gif</logo>
+		<logo>plugins/DevicePlugins/images/plugins/quicktime.gif</logo>
 	</row>
 	<row>
 		<label>Realplayer</label>
 		<nb_visits>0</nb_visits>
 		<nb_visits_percentage>0%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/realplayer.gif</logo>
+		<logo>plugins/DevicePlugins/images/plugins/realplayer.gif</logo>
 	</row>
 	<row>
 		<label>Silverlight</label>
 		<nb_visits>0</nb_visits>
 		<nb_visits_percentage>0%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/silverlight.gif</logo>
+		<logo>plugins/DevicePlugins/images/plugins/silverlight.gif</logo>
 	</row>
 	<row>
 		<label>Windowsmedia</label>
 		<nb_visits>0</nb_visits>
 		<nb_visits_percentage>0%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/windowsmedia.gif</logo>
+		<logo>plugins/DevicePlugins/images/plugins/windowsmedia.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getResolution_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getResolution_day.xml
index ede209680d..28af23e62d 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getResolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getResolution_day.xml
@@ -9,5 +9,6 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
+		<segment>resolution==1024x768</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml
index b95f277bfc..0b6712aa1b 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml
@@ -9,6 +9,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==0</segment>
 	</row>
 	<row>
 		<label>1h</label>
@@ -19,6 +20,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==1</segment>
 	</row>
 	<row>
 		<label>2h</label>
@@ -29,6 +31,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==2</segment>
 	</row>
 	<row>
 		<label>3h</label>
@@ -39,6 +42,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==3</segment>
 	</row>
 	<row>
 		<label>4h</label>
@@ -49,6 +53,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==4</segment>
 	</row>
 	<row>
 		<label>5h</label>
@@ -59,6 +64,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==5</segment>
 	</row>
 	<row>
 		<label>6h</label>
@@ -69,6 +75,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==6</segment>
 	</row>
 	<row>
 		<label>7h</label>
@@ -79,6 +86,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==7</segment>
 	</row>
 	<row>
 		<label>8h</label>
@@ -89,6 +97,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==8</segment>
 	</row>
 	<row>
 		<label>9h</label>
@@ -99,6 +108,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==9</segment>
 	</row>
 	<row>
 		<label>10h</label>
@@ -109,6 +119,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==10</segment>
 	</row>
 	<row>
 		<label>11h</label>
@@ -119,6 +130,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==11</segment>
 	</row>
 	<row>
 		<label>12h</label>
@@ -129,6 +141,7 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
+		<segment>visitLocalHour==12</segment>
 	</row>
 	<row>
 		<label>13h</label>
@@ -139,6 +152,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==13</segment>
 	</row>
 	<row>
 		<label>14h</label>
@@ -149,6 +163,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==14</segment>
 	</row>
 	<row>
 		<label>15h</label>
@@ -159,6 +174,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==15</segment>
 	</row>
 	<row>
 		<label>16h</label>
@@ -169,6 +185,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==16</segment>
 	</row>
 	<row>
 		<label>17h</label>
@@ -179,6 +196,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==17</segment>
 	</row>
 	<row>
 		<label>18h</label>
@@ -189,6 +207,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==18</segment>
 	</row>
 	<row>
 		<label>19h</label>
@@ -199,6 +218,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==19</segment>
 	</row>
 	<row>
 		<label>20h</label>
@@ -209,6 +229,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==20</segment>
 	</row>
 	<row>
 		<label>21h</label>
@@ -219,6 +240,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==21</segment>
 	</row>
 	<row>
 		<label>22h</label>
@@ -229,6 +251,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==22</segment>
 	</row>
 	<row>
 		<label>23h</label>
@@ -239,5 +262,6 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==23</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml
index 5f96c55a5b..6626c3ffaf 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml
@@ -9,6 +9,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==0</segment>
 	</row>
 	<row>
 		<label>1h</label>
@@ -19,6 +20,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==1</segment>
 	</row>
 	<row>
 		<label>2h</label>
@@ -29,6 +31,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==2</segment>
 	</row>
 	<row>
 		<label>3h</label>
@@ -39,6 +42,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==3</segment>
 	</row>
 	<row>
 		<label>4h</label>
@@ -49,6 +53,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==4</segment>
 	</row>
 	<row>
 		<label>5h</label>
@@ -59,6 +64,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==5</segment>
 	</row>
 	<row>
 		<label>6h</label>
@@ -69,6 +75,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==6</segment>
 	</row>
 	<row>
 		<label>7h</label>
@@ -79,6 +86,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==7</segment>
 	</row>
 	<row>
 		<label>8h</label>
@@ -89,6 +97,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==8</segment>
 	</row>
 	<row>
 		<label>9h</label>
@@ -99,6 +108,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==9</segment>
 	</row>
 	<row>
 		<label>10h</label>
@@ -109,6 +119,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==10</segment>
 	</row>
 	<row>
 		<label>11h</label>
@@ -127,6 +138,7 @@
 		</goals>
 		<nb_conversions>1</nb_conversions>
 		<revenue>42</revenue>
+		<segment>visitServerHour==11</segment>
 	</row>
 	<row>
 		<label>12h</label>
@@ -145,6 +157,7 @@
 		</goals>
 		<nb_conversions>1</nb_conversions>
 		<revenue>1</revenue>
+		<segment>visitServerHour==12</segment>
 	</row>
 	<row>
 		<label>13h</label>
@@ -155,6 +168,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==13</segment>
 	</row>
 	<row>
 		<label>14h</label>
@@ -165,6 +179,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==14</segment>
 	</row>
 	<row>
 		<label>15h</label>
@@ -175,6 +190,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==15</segment>
 	</row>
 	<row>
 		<label>16h</label>
@@ -185,6 +201,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==16</segment>
 	</row>
 	<row>
 		<label>17h</label>
@@ -195,6 +212,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==17</segment>
 	</row>
 	<row>
 		<label>18h</label>
@@ -205,6 +223,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==18</segment>
 	</row>
 	<row>
 		<label>19h</label>
@@ -215,6 +234,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==19</segment>
 	</row>
 	<row>
 		<label>20h</label>
@@ -225,6 +245,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==20</segment>
 	</row>
 	<row>
 		<label>21h</label>
@@ -235,6 +256,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==21</segment>
 	</row>
 	<row>
 		<label>22h</label>
@@ -245,6 +267,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==22</segment>
 	</row>
 	<row>
 		<label>23h</label>
@@ -255,5 +278,6 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==23</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml
index 1c2d3f6a74..4995a7684d 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml
@@ -55,6 +55,7 @@
 	<reportMetadata>
 		<row>
 			<url>http://example.org/store/purchase.htm</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2Fstore%2Fpurchase.htm</segment>
 		</row>
 	</reportMetadata>
 	<reportTotal>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml
index 1a1180bbff..9b846c1895 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml
@@ -153,7 +153,80 @@
 			<revenue>$ 0</revenue>
 		</row>
 	</reportData>
-	<reportMetadata />
+	<reportMetadata>
+		<row>
+			<segment>visitServerHour==0</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==1</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==2</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==3</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==4</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==5</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==6</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==7</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==8</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==9</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==10</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==11</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==12</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==13</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==14</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==15</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==16</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==17</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==18</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==19</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==20</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==21</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==22</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==23</segment>
+		</row>
+	</reportMetadata>
 	<reportTotal>
 		<nb_visits>2</nb_visits>
 	</reportTotal>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml
index 5e51da8014..1e0a59c457 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml
@@ -19,6 +19,7 @@
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.234</avg_time_generation>
 		<url>http://example.org/index.htm?parameter=Should display</url>
+		<segment>entryPageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fparameter%3DShould+display</segment>
 	</row>
 	<row>
 		<label>store</label>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml
index ef8f599623..d61ef0162c 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml
@@ -17,6 +17,7 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0.024</avg_time_generation>
 		<url>http://example.org/index.htm</url>
+		<segment>exitPageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 	</row>
 	<row>
 		<label>store</label>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml
index ad64d61bfe..c86cc78b13 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml
@@ -14,6 +14,7 @@
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.224</avg_time_generation>
 		<url>http://example.org/</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2F</segment>
 	</row>
 	<row>
 		<label>/index.htm</label>
@@ -32,6 +33,7 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0.024</avg_time_generation>
 		<url>http://example.org/index.htm</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 	</row>
 	<row>
 		<label>/index.htm?parameter=Should display</label>
@@ -52,6 +54,7 @@
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.234</avg_time_generation>
 		<url>http://example.org/index.htm?parameter=Should display</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fparameter%3DShould+display</segment>
 	</row>
 	<row>
 		<label>store</label>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicePlugins.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicePlugins.getPlugin_day.xml
new file mode 100644
index 0000000000..72728977e1
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicePlugins.getPlugin_day.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>Cookie</label>
+		<nb_visits>2</nb_visits>
+		<nb_visits_percentage>100%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/cookie.gif</logo>
+	</row>
+	<row>
+		<label>Flash</label>
+		<nb_visits>2</nb_visits>
+		<nb_visits_percentage>100%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/flash.gif</logo>
+	</row>
+	<row>
+		<label>Java</label>
+		<nb_visits>2</nb_visits>
+		<nb_visits_percentage>100%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/java.gif</logo>
+	</row>
+	<row>
+		<label>Director</label>
+		<nb_visits>0</nb_visits>
+		<nb_visits_percentage>0%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/director.gif</logo>
+	</row>
+	<row>
+		<label>Gears</label>
+		<nb_visits>0</nb_visits>
+		<nb_visits_percentage>0%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/gears.gif</logo>
+	</row>
+	<row>
+		<label>Pdf</label>
+		<nb_visits>0</nb_visits>
+		<nb_visits_percentage>0%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/pdf.gif</logo>
+	</row>
+	<row>
+		<label>Quicktime</label>
+		<nb_visits>0</nb_visits>
+		<nb_visits_percentage>0%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/quicktime.gif</logo>
+	</row>
+	<row>
+		<label>Realplayer</label>
+		<nb_visits>0</nb_visits>
+		<nb_visits_percentage>0%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/realplayer.gif</logo>
+	</row>
+	<row>
+		<label>Silverlight</label>
+		<nb_visits>0</nb_visits>
+		<nb_visits_percentage>0%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/silverlight.gif</logo>
+	</row>
+	<row>
+		<label>Windowsmedia</label>
+		<nb_visits>0</nb_visits>
+		<nb_visits_percentage>0%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/windowsmedia.gif</logo>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserEngines_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserEngines_day.xml
index 5bcb7b02d6..14c3dc0d52 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserEngines_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserEngines_day.xml
@@ -10,5 +10,6 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
+		<segment>browserEngine==Gecko</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml
index 968ffc7d90..da553644d5 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml
@@ -10,6 +10,6 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
-		<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+		<logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml
index b8deec1d68..10868debe6 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml
@@ -10,6 +10,7 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
-		<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+		<segment>browserCode==FF;browserVersion==3.6</segment>
+		<logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml
index 968ffc7d90..0bb4fd3f0b 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml
@@ -10,6 +10,7 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
-		<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+		<logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
+		<segment>browserCode==FF</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml
index 04cebec91e..59b8d0aee1 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml
@@ -10,6 +10,6 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
-		<logo>plugins/UserSettings/images/os/WI7.gif</logo>
+		<logo>plugins/DevicesDetection/images/os/WIN.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml
index 785661d383..205baa4d5b 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml
@@ -10,6 +10,7 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
-		<logo>plugins/UserSettings/images/os/WXP.gif</logo>
+		<segment>operatingSystemCode==WIN;operatingSystemVersion==XP</segment>
+		<logo>plugins/DevicesDetection/images/os/WIN.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml
index 782397bace..d52006abf9 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml
@@ -10,46 +10,61 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
+		<segment>deviceType==desktop</segment>
 		<logo>plugins/DevicesDetection/images/screens/normal.gif</logo>
 	</row>
 	<row>
 		<label>Smartphone</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==smartphone</segment>
 		<logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
 	</row>
 	<row>
 		<label>Tablet</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==tablet</segment>
 		<logo>plugins/DevicesDetection/images/screens/tablet.png</logo>
 	</row>
 	<row>
 		<label>Feature phone</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==feature+phone</segment>
 		<logo>plugins/DevicesDetection/images/screens/mobile.gif</logo>
 	</row>
 	<row>
 		<label>Console</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==console</segment>
 		<logo>plugins/DevicesDetection/images/screens/console.gif</logo>
 	</row>
 	<row>
 		<label>Tv</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==tv</segment>
 		<logo>plugins/DevicesDetection/images/screens/tv.png</logo>
 	</row>
 	<row>
 		<label>Car browser</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==car+browser</segment>
 		<logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo>
 	</row>
 	<row>
 		<label>Smart display</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==smart+display</segment>
 		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
 	</row>
 	<row>
 		<label>Camera</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==camera</segment>
 		<logo>plugins/DevicesDetection/images/screens/camera.png</logo>
 	</row>
+	<row>
+		<label>Portable media player</label>
+		<nb_visits>0</nb_visits>
+		<segment>deviceType==portable+media+player</segment>
+		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
+	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
index 6649f123d9..22c0fc786e 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
@@ -15,6 +15,7 @@
 				
 				<url>http://example.org/store/purchase.htm</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -25,6 +26,7 @@
 				<pageId>9</pageId>
 				<generationTime>0.13s</generationTime>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -34,8 +36,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -49,31 +49,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>search</referrerType>
+		<referrerTypeName>Search Engines</referrerTypeName>
+		<referrerName>Yahoo!</referrerName>
+		<referrerKeyword>purchase</referrerKeyword>
+		<referrerKeywordPosition />
+		<referrerUrl>http://search.yahoo.com/search?p=purchase</referrerUrl>
+		<referrerSearchEngineUrl>http://search.yahoo.com</referrerSearchEngineUrl>
+		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/search.yahoo.com.png</referrerSearchEngineIcon>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>search</referrerType>
-		<referrerTypeName>Search Engines</referrerTypeName>
-		<referrerName>Yahoo!</referrerName>
-		<referrerKeyword>purchase</referrerKeyword>
-		<referrerKeywordPosition />
-		<referrerUrl>http://search.yahoo.com/search?p=purchase</referrerUrl>
-		<referrerSearchEngineUrl>http://search.yahoo.com</referrerSearchEngineUrl>
-		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/search.yahoo.com.png</referrerSearchEngineIcon>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -85,21 +84,26 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -123,6 +127,7 @@
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -135,6 +140,7 @@
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>outlink</type>
@@ -146,6 +152,7 @@
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/link.gif</icon>
+				
 			</row>
 			<row>
 				<type>download</type>
@@ -157,6 +164,7 @@
 				<timeSpent>72</timeSpent>
 				<timeSpentPretty>1 min 12s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/download.png</icon>
+				
 			</row>
 			<row>
 				<type>outlink</type>
@@ -168,6 +176,7 @@
 				<timeSpent>108</timeSpent>
 				<timeSpentPretty>1 min 48s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/link.gif</icon>
+				
 			</row>
 			<row>
 				<type>outlink</type>
@@ -179,6 +188,7 @@
 				<timeSpent>72</timeSpent>
 				<timeSpentPretty>1 min 12s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/link.gif</icon>
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -189,6 +199,7 @@
 				
 				<url>http://example.org/</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>search</type>
@@ -201,6 +212,7 @@
 				<timeSpent>108</timeSpent>
 				<timeSpentPretty>1 min 48s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/search_ico.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -211,6 +223,7 @@
 				<pageId>8</pageId>
 				<generationTime>0.02s</generationTime>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -220,8 +233,6 @@
 		
 		
 		
-		<searches>1</searches>
-		<actions>8</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -235,31 +246,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>1621</visitDuration>
 		<visitDurationPretty>27 min 1s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>1</searches>
+		<actions>8</actions>
+		<referrerType>website</referrerType>
+		<referrerTypeName>Websites</referrerTypeName>
+		<referrerName>referrer.com</referrerName>
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl>http://referrer.com/page.htm?param=valuewith some spaces</referrerUrl>
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>website</referrerType>
-		<referrerTypeName>Websites</referrerTypeName>
-		<referrerName>referrer.com</referrerName>
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl>http://referrer.com/page.htm?param=valuewith some spaces</referrerUrl>
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -271,21 +281,26 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml
index 52501d1f57..0776d8038e 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml
@@ -18,6 +18,7 @@
 		</goals>
 		<nb_conversions>1</nb_conversions>
 		<revenue>1</revenue>
+		<segment>referrerType==search;referrerKeyword==purchase</segment>
 		<subtable>
 			<row>
 				<label>Yahoo!</label>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctCampaigns_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctCampaigns_day.xml
index 606fbb5241..f5722c2b94 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctCampaigns_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctCampaigns_day.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>1</result>
\ No newline at end of file
+<result>0</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml
index 325ad6ac4f..35b195308e 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml
@@ -18,6 +18,7 @@
 		</goals>
 		<nb_conversions>1</nb_conversions>
 		<revenue>1</revenue>
+		<segment>referrerType==search;referrerName==Yahoo%21</segment>
 		<url>http://search.yahoo.com</url>
 		<logo>plugins/Referrers/images/searchEngines/search.yahoo.com.png</logo>
 		<subtable>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getWebsites_day.xml
index b3100810b3..265598f6ee 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getWebsites_day.xml
@@ -18,6 +18,7 @@
 		</goals>
 		<nb_conversions>1</nb_conversions>
 		<revenue>42</revenue>
+		<segment>referrerName==referrer.com</segment>
 		<subtable>
 			<row>
 				<label>http://referrer.com/page.htm?param=valuewith some spaces</label>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml
index c7cdb13402..c95226160c 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml
@@ -25,6 +25,7 @@
 		<revenue>43</revenue>
 		<code>fr</code>
 		<logo>plugins/UserCountry/images/flags/fr.png</logo>
+		<segment>countryCode==fr</segment>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml
index 5bcb7b02d6..14c3dc0d52 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml
@@ -10,5 +10,6 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
+		<segment>browserEngine==Gecko</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml
index b8deec1d68..10868debe6 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml
@@ -10,6 +10,7 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
-		<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+		<segment>browserCode==FF;browserVersion==3.6</segment>
+		<logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml
index 968ffc7d90..0bb4fd3f0b 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml
@@ -10,6 +10,7 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
-		<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+		<logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
+		<segment>browserCode==FF</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getConfiguration_day.xml
index 7ce7628e83..f5eb1b4a1f 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getConfiguration_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getConfiguration_day.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
-		<label>Windows XP / Firefox / 1024x768</label>
+		<label>Windows / Firefox / 1024x768</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>9</nb_actions>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml
index 782397bace..d52006abf9 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml
@@ -10,46 +10,61 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
+		<segment>deviceType==desktop</segment>
 		<logo>plugins/DevicesDetection/images/screens/normal.gif</logo>
 	</row>
 	<row>
 		<label>Smartphone</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==smartphone</segment>
 		<logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
 	</row>
 	<row>
 		<label>Tablet</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==tablet</segment>
 		<logo>plugins/DevicesDetection/images/screens/tablet.png</logo>
 	</row>
 	<row>
 		<label>Feature phone</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==feature+phone</segment>
 		<logo>plugins/DevicesDetection/images/screens/mobile.gif</logo>
 	</row>
 	<row>
 		<label>Console</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==console</segment>
 		<logo>plugins/DevicesDetection/images/screens/console.gif</logo>
 	</row>
 	<row>
 		<label>Tv</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==tv</segment>
 		<logo>plugins/DevicesDetection/images/screens/tv.png</logo>
 	</row>
 	<row>
 		<label>Car browser</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==car+browser</segment>
 		<logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo>
 	</row>
 	<row>
 		<label>Smart display</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==smart+display</segment>
 		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
 	</row>
 	<row>
 		<label>Camera</label>
 		<nb_visits>0</nb_visits>
+		<segment>deviceType==camera</segment>
 		<logo>plugins/DevicesDetection/images/screens/camera.png</logo>
 	</row>
+	<row>
+		<label>Portable media player</label>
+		<nb_visits>0</nb_visits>
+		<segment>deviceType==portable+media+player</segment>
+		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
+	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml
index 04cebec91e..59b8d0aee1 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml
@@ -10,6 +10,6 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
-		<logo>plugins/UserSettings/images/os/WI7.gif</logo>
+		<logo>plugins/DevicesDetection/images/os/WIN.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml
index 785661d383..205baa4d5b 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml
@@ -10,6 +10,7 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
-		<logo>plugins/UserSettings/images/os/WXP.gif</logo>
+		<segment>operatingSystemCode==WIN;operatingSystemVersion==XP</segment>
+		<logo>plugins/DevicesDetection/images/os/WIN.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getPlugin_day.xml
index 9ddd1bed44..72728977e1 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getPlugin_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getPlugin_day.xml
@@ -4,60 +4,60 @@
 		<label>Cookie</label>
 		<nb_visits>2</nb_visits>
 		<nb_visits_percentage>100%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/cookie.gif</logo>
+		<logo>plugins/DevicePlugins/images/plugins/cookie.gif</logo>
 	</row>
 	<row>
 		<label>Flash</label>
 		<nb_visits>2</nb_visits>
 		<nb_visits_percentage>100%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/flash.gif</logo>
+		<logo>plugins/DevicePlugins/images/plugins/flash.gif</logo>
 	</row>
 	<row>
 		<label>Java</label>
 		<nb_visits>2</nb_visits>
 		<nb_visits_percentage>100%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/java.gif</logo>
+		<logo>plugins/DevicePlugins/images/plugins/java.gif</logo>
 	</row>
 	<row>
 		<label>Director</label>
 		<nb_visits>0</nb_visits>
 		<nb_visits_percentage>0%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/director.gif</logo>
+		<logo>plugins/DevicePlugins/images/plugins/director.gif</logo>
 	</row>
 	<row>
 		<label>Gears</label>
 		<nb_visits>0</nb_visits>
 		<nb_visits_percentage>0%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/gears.gif</logo>
+		<logo>plugins/DevicePlugins/images/plugins/gears.gif</logo>
 	</row>
 	<row>
 		<label>Pdf</label>
 		<nb_visits>0</nb_visits>
 		<nb_visits_percentage>0%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/pdf.gif</logo>
+		<logo>plugins/DevicePlugins/images/plugins/pdf.gif</logo>
 	</row>
 	<row>
 		<label>Quicktime</label>
 		<nb_visits>0</nb_visits>
 		<nb_visits_percentage>0%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/quicktime.gif</logo>
+		<logo>plugins/DevicePlugins/images/plugins/quicktime.gif</logo>
 	</row>
 	<row>
 		<label>Realplayer</label>
 		<nb_visits>0</nb_visits>
 		<nb_visits_percentage>0%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/realplayer.gif</logo>
+		<logo>plugins/DevicePlugins/images/plugins/realplayer.gif</logo>
 	</row>
 	<row>
 		<label>Silverlight</label>
 		<nb_visits>0</nb_visits>
 		<nb_visits_percentage>0%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/silverlight.gif</logo>
+		<logo>plugins/DevicePlugins/images/plugins/silverlight.gif</logo>
 	</row>
 	<row>
 		<label>Windowsmedia</label>
 		<nb_visits>0</nb_visits>
 		<nb_visits_percentage>0%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/windowsmedia.gif</logo>
+		<logo>plugins/DevicePlugins/images/plugins/windowsmedia.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml
index 05f05aaf02..3ed29e7c44 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml
@@ -10,5 +10,6 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
+		<segment>resolution==1024x768</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml
index 09556822a9..c89a8a6d25 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml
@@ -10,6 +10,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==0</segment>
 	</row>
 	<row>
 		<label>1h</label>
@@ -21,6 +22,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==1</segment>
 	</row>
 	<row>
 		<label>2h</label>
@@ -32,6 +34,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==2</segment>
 	</row>
 	<row>
 		<label>3h</label>
@@ -43,6 +46,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==3</segment>
 	</row>
 	<row>
 		<label>4h</label>
@@ -54,6 +58,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==4</segment>
 	</row>
 	<row>
 		<label>5h</label>
@@ -65,6 +70,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==5</segment>
 	</row>
 	<row>
 		<label>6h</label>
@@ -76,6 +82,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==6</segment>
 	</row>
 	<row>
 		<label>7h</label>
@@ -87,6 +94,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==7</segment>
 	</row>
 	<row>
 		<label>8h</label>
@@ -98,6 +106,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==8</segment>
 	</row>
 	<row>
 		<label>9h</label>
@@ -109,6 +118,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==9</segment>
 	</row>
 	<row>
 		<label>10h</label>
@@ -120,6 +130,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==10</segment>
 	</row>
 	<row>
 		<label>11h</label>
@@ -131,6 +142,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==11</segment>
 	</row>
 	<row>
 		<label>12h</label>
@@ -142,6 +154,7 @@
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
+		<segment>visitLocalHour==12</segment>
 	</row>
 	<row>
 		<label>13h</label>
@@ -153,6 +166,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==13</segment>
 	</row>
 	<row>
 		<label>14h</label>
@@ -164,6 +178,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==14</segment>
 	</row>
 	<row>
 		<label>15h</label>
@@ -175,6 +190,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==15</segment>
 	</row>
 	<row>
 		<label>16h</label>
@@ -186,6 +202,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==16</segment>
 	</row>
 	<row>
 		<label>17h</label>
@@ -197,6 +214,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==17</segment>
 	</row>
 	<row>
 		<label>18h</label>
@@ -208,6 +226,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==18</segment>
 	</row>
 	<row>
 		<label>19h</label>
@@ -219,6 +238,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==19</segment>
 	</row>
 	<row>
 		<label>20h</label>
@@ -230,6 +250,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==20</segment>
 	</row>
 	<row>
 		<label>21h</label>
@@ -241,6 +262,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==21</segment>
 	</row>
 	<row>
 		<label>22h</label>
@@ -252,6 +274,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==22</segment>
 	</row>
 	<row>
 		<label>23h</label>
@@ -263,5 +286,6 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==23</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml
index 9ded5c32c2..944821160b 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml
@@ -10,6 +10,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==0</segment>
 	</row>
 	<row>
 		<label>1h</label>
@@ -21,6 +22,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==1</segment>
 	</row>
 	<row>
 		<label>2h</label>
@@ -32,6 +34,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==2</segment>
 	</row>
 	<row>
 		<label>3h</label>
@@ -43,6 +46,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==3</segment>
 	</row>
 	<row>
 		<label>4h</label>
@@ -54,6 +58,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==4</segment>
 	</row>
 	<row>
 		<label>5h</label>
@@ -65,6 +70,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==5</segment>
 	</row>
 	<row>
 		<label>6h</label>
@@ -76,6 +82,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==6</segment>
 	</row>
 	<row>
 		<label>7h</label>
@@ -87,6 +94,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==7</segment>
 	</row>
 	<row>
 		<label>8h</label>
@@ -98,6 +106,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==8</segment>
 	</row>
 	<row>
 		<label>9h</label>
@@ -109,6 +118,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==9</segment>
 	</row>
 	<row>
 		<label>10h</label>
@@ -120,6 +130,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==10</segment>
 	</row>
 	<row>
 		<label>11h</label>
@@ -139,6 +150,7 @@
 		</goals>
 		<nb_conversions>1</nb_conversions>
 		<revenue>42</revenue>
+		<segment>visitServerHour==11</segment>
 	</row>
 	<row>
 		<label>12h</label>
@@ -158,6 +170,7 @@
 		</goals>
 		<nb_conversions>1</nb_conversions>
 		<revenue>1</revenue>
+		<segment>visitServerHour==12</segment>
 	</row>
 	<row>
 		<label>13h</label>
@@ -169,6 +182,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==13</segment>
 	</row>
 	<row>
 		<label>14h</label>
@@ -180,6 +194,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==14</segment>
 	</row>
 	<row>
 		<label>15h</label>
@@ -191,6 +206,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==15</segment>
 	</row>
 	<row>
 		<label>16h</label>
@@ -202,6 +218,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==16</segment>
 	</row>
 	<row>
 		<label>17h</label>
@@ -213,6 +230,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==17</segment>
 	</row>
 	<row>
 		<label>18h</label>
@@ -224,6 +242,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==18</segment>
 	</row>
 	<row>
 		<label>19h</label>
@@ -235,6 +254,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==19</segment>
 	</row>
 	<row>
 		<label>20h</label>
@@ -246,6 +266,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==20</segment>
 	</row>
 	<row>
 		<label>21h</label>
@@ -257,6 +278,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==21</segment>
 	</row>
 	<row>
 		<label>22h</label>
@@ -268,6 +290,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==22</segment>
 	</row>
 	<row>
 		<label>23h</label>
@@ -279,5 +302,6 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==23</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__Actions.getPageUrls_day.xml
index d1914d0e11..aaf619965e 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__Actions.getPageUrls_day.xml
@@ -17,6 +17,7 @@
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
 		<url>http://example.org/contact.htm</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fcontact.htm</segment>
 	</row>
 	<row>
 		<label>category</label>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__DevicePlugins.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__DevicePlugins.getPlugin_day.xml
new file mode 100644
index 0000000000..000a410083
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__DevicePlugins.getPlugin_day.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>Cookie</label>
+		<nb_visits>7</nb_visits>
+		<nb_visits_percentage>100%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/cookie.gif</logo>
+	</row>
+	<row>
+		<label>Flash</label>
+		<nb_visits>7</nb_visits>
+		<nb_visits_percentage>100%</nb_visits_percentage>
+		<logo>plugins/DevicePlugins/images/plugins/flash.gif</logo>
+	</row>
+	<row>
+		<label>Autres</label>
+		<nb_visits>7</nb_visits>
+		<nb_visits_percentage>100%</nb_visits_percentage>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__Referrers.getKeywords_day.xml
index aa89682153..26274c83a1 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__Referrers.getKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__Referrers.getKeywords_day.xml
@@ -10,6 +10,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>5</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerType==search;referrerKeyword==kia+ora</segment>
 		<subtable>
 			<row>
 				<label>Google</label>
@@ -56,6 +57,7 @@
 		<sum_visit_length>1</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerType==search;referrerKeyword==hello+world</segment>
 		<subtable>
 			<row>
 				<label>Bing</label>
@@ -80,6 +82,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerType==search;referrerKeyword==salut</segment>
 		<subtable>
 			<row>
 				<label>Google</label>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__UserSettings.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__UserSettings.getPlugin_day.xml
index aa46939be4..000a410083 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__UserSettings.getPlugin_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__UserSettings.getPlugin_day.xml
@@ -4,13 +4,13 @@
 		<label>Cookie</label>
 		<nb_visits>7</nb_visits>
 		<nb_visits_percentage>100%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/cookie.gif</logo>
+		<logo>plugins/DevicePlugins/images/plugins/cookie.gif</logo>
 	</row>
 	<row>
 		<label>Flash</label>
 		<nb_visits>7</nb_visits>
 		<nb_visits_percentage>100%</nb_visits_percentage>
-		<logo>plugins/UserSettings/images/plugins/flash.gif</logo>
+		<logo>plugins/DevicePlugins/images/plugins/flash.gif</logo>
 	</row>
 	<row>
 		<label>Autres</label>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
index 9b0149ac2a..788e394e76 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
@@ -14,6 +14,7 @@
 				
 				<pageId>2</pageId>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -23,8 +24,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -38,31 +37,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>search</referrerType>
+		<referrerTypeName>Moteurs de recherche</referrerTypeName>
+		<referrerName>Google</referrerName>
+		<referrerKeyword>&lt;&gt;&amp;\&quot;the pdo extension is required for this adapter but the extension is not loaded</referrerKeyword>
+		<referrerKeywordPosition>4</referrerKeywordPosition>
+		<referrerUrl>http://www.google.com.vn/search?q=%3C%3E%26%5C%22the+pdo+extension+is+required+for+this+adapter+but+the+extension+is+not+loaded</referrerUrl>
+		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
+		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<deviceType>Inconnu</deviceType>
 		<operatingSystem>Bot</operatingSystem>
+		<operatingSystemName>Bot</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
 		<operatingSystemCode>BOT</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+		<operatingSystemVersion>UNK</operatingSystemVersion>
 		<browserFamily />
 		<browserFamilyDescription>Inconnu</browserFamilyDescription>
 		<browser>Inconnu</browser>
 		<browserName>Inconnu</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion />
 		<events>0</events>
-		<provider>Inconnu</provider>
-		<providerName>Inconnu</providerName>
-		<providerUrl />
-		<referrerType>search</referrerType>
-		<referrerTypeName>Moteurs de recherche</referrerTypeName>
-		<referrerName>Google</referrerName>
-		<referrerKeyword>&lt;&gt;&amp;\&quot;the pdo extension is required for this adapter but the extension is not loaded</referrerKeyword>
-		<referrerKeywordPosition>4</referrerKeywordPosition>
-		<referrerUrl>http://www.google.com.vn/search?q=%3C%3E%26%5C%22the+pdo+extension+is+required+for+this+adapter+but+the+extension+is+not+loaded</referrerUrl>
-		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
-		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -74,21 +72,26 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Inconnu</provider>
+		<providerName>Inconnu</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -109,6 +112,7 @@
 				
 				<pageId>1</pageId>
 				<icon />
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -119,6 +123,7 @@
 				
 				<url>http://example.org/this%20is%20cool!</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -128,8 +133,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -143,31 +146,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>1084</visitDuration>
 		<visitDurationPretty>18 min 4s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>search</referrerType>
+		<referrerTypeName>Moteurs de recherche</referrerTypeName>
+		<referrerName>Google</referrerName>
+		<referrerKeyword>Mot-clé indéfini</referrerKeyword>
+		<referrerKeywordPosition>1</referrerKeywordPosition>
+		<referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl>
+		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
+		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<deviceType>Inconnu</deviceType>
 		<operatingSystem>Bot</operatingSystem>
+		<operatingSystemName>Bot</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon>
 		<operatingSystemCode>BOT</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
+		<operatingSystemVersion>UNK</operatingSystemVersion>
 		<browserFamily />
 		<browserFamilyDescription>Inconnu</browserFamilyDescription>
 		<browser>Inconnu</browser>
 		<browserName>Inconnu</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
 		<browserCode>UNK</browserCode>
 		<browserVersion />
 		<events>0</events>
-		<provider>Inconnu</provider>
-		<providerName>Inconnu</providerName>
-		<providerUrl />
-		<referrerType>search</referrerType>
-		<referrerTypeName>Moteurs de recherche</referrerTypeName>
-		<referrerName>Google</referrerName>
-		<referrerKeyword>Mot-clé indéfini</referrerKeyword>
-		<referrerKeywordPosition>1</referrerKeywordPosition>
-		<referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl>
-		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
-		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -179,21 +181,26 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Inconnu</provider>
+		<providerName>Inconnu</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Referrers.getKeywords_day.xml
index 8555f09801..20c01e5dd5 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Referrers.getKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Referrers.getKeywords_day.xml
@@ -18,6 +18,7 @@
 		</goals>
 		<nb_conversions>1</nb_conversions>
 		<revenue>42</revenue>
+		<segment>referrerType==search;referrerKeyword==</segment>
 		<subtable>
 			<row>
 				<label>Google</label>
@@ -42,6 +43,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerType==search;referrerKeyword==%3C%3E%26%5C%22the+pdo+extension+is+required+for+this+adapter+but+the+extension+is+not+loaded</segment>
 		<subtable>
 			<row>
 				<label>Google</label>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
index 4eb429a763..1306581590 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
@@ -3,7 +3,7 @@
 	<row>
 		<idSite>1</idSite>
 		<idVisit>1</idVisit>
-		<visitIp>74.125.31.147</visitIp>
+		<visitIp>24.125.31.147</visitIp>
 		<actionDetails>
 			<row>
 				<type>action</type>
@@ -19,6 +19,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				<timestamp>1365328800</timestamp>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -28,8 +29,6 @@
 		<visitServerHour>10</visitServerHour>
 		<lastActionTimestamp>1365328800</lastActionTimestamp>
 		<lastActionDateTime>2013-04-07 10:00:00</lastActionDateTime>
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -43,31 +42,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows Vista</operatingSystem>
-		<operatingSystemCode>WVI</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>Vista</operatingSystemVersion>
 		<browserFamily>Trident</browserFamily>
 		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
 		<browser>Internet Explorer 7.0</browser>
 		<browserName>Internet Explorer</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>7.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
 		<country>Unknown</country>
@@ -79,12 +77,17 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>10:00:00</visitLocalTime>
 		<visitLocalHour>10</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		<serverTimestamp>1365328800</serverTimestamp>
 		<serverTimePretty>10:00:00</serverTimePretty>
 		<serverDatePretty>Sun 7 Apr</serverDatePretty>
@@ -94,7 +97,7 @@
 	<row>
 		<idSite>1</idSite>
 		<idVisit>2</idVisit>
-		<visitIp>74.125.31.147</visitIp>
+		<visitIp>24.125.31.147</visitIp>
 		<actionDetails>
 			<row>
 				<type>action</type>
@@ -110,6 +113,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				<timestamp>1365246000</timestamp>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -119,8 +123,6 @@
 		<visitServerHour>11</visitServerHour>
 		<lastActionTimestamp>1365246000</lastActionTimestamp>
 		<lastActionDateTime>2013-04-06 11:00:00</lastActionDateTime>
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -134,31 +136,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows Vista</operatingSystem>
-		<operatingSystemCode>WVI</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>Vista</operatingSystemVersion>
 		<browserFamily>Trident</browserFamily>
 		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
 		<browser>Internet Explorer 7.0</browser>
 		<browserName>Internet Explorer</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>7.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
 		<country>Unknown</country>
@@ -170,12 +171,17 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>11:00:00</visitLocalTime>
 		<visitLocalHour>11</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		<serverTimestamp>1365246000</serverTimestamp>
 		<serverTimePretty>11:00:00</serverTimePretty>
 		<serverDatePretty>Sat 6 Apr</serverDatePretty>
@@ -185,7 +191,7 @@
 	<row>
 		<idSite>1</idSite>
 		<idVisit>3</idVisit>
-		<visitIp>74.125.31.147</visitIp>
+		<visitIp>24.125.31.147</visitIp>
 		<actionDetails>
 			<row>
 				<type>action</type>
@@ -201,6 +207,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				<timestamp>1365163200</timestamp>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -210,8 +217,6 @@
 		<visitServerHour>12</visitServerHour>
 		<lastActionTimestamp>1365163200</lastActionTimestamp>
 		<lastActionDateTime>2013-04-05 12:00:00</lastActionDateTime>
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -225,31 +230,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows Vista</operatingSystem>
-		<operatingSystemCode>WVI</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>Vista</operatingSystemVersion>
 		<browserFamily>Trident</browserFamily>
 		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
 		<browser>Internet Explorer 7.0</browser>
 		<browserName>Internet Explorer</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
 		<browserCode>IE</browserCode>
 		<browserVersion>7.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Unknown</continent>
 		<continentCode>unk</continentCode>
 		<country>Unknown</country>
@@ -261,12 +265,17 @@
 		<location>Unknown</location>
 		<latitude />
 		<longitude />
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
 		<visitLocalTime>12:00:00</visitLocalTime>
 		<visitLocalHour>12</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
+		<resolution>unknown</resolution>
+		<plugins />
+		<pluginsIcons />
 		<serverTimestamp>1365163200</serverTimestamp>
 		<serverTimePretty>12:00:00</serverTimePretty>
 		<serverDatePretty>Fri 5 Apr</serverDatePretty>
diff --git a/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml
index 0ad33169a4..981347b803 100644
--- a/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml
+++ b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml
@@ -2,13 +2,13 @@
 <result>
 	<row>
 		<label>ga campaign</label>
-		<nb_uniq_visitors>3</nb_uniq_visitors>
-		<nb_visits>3</nb_visits>
-		<nb_actions>3</nb_actions>
+		<nb_uniq_visitors>4</nb_uniq_visitors>
+		<nb_visits>4</nb_visits>
+		<nb_actions>4</nb_actions>
 		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>1084</sum_visit_length>
-		<bounce_count>3</bounce_count>
+		<bounce_count>4</bounce_count>
 		<goals>
 			<row idgoal='1'>
 				<nb_conversions>1</nb_conversions>
@@ -18,16 +18,17 @@
 		</goals>
 		<nb_conversions>1</nb_conversions>
 		<revenue>42.26</revenue>
+		<segment>referrerType==campaign;referrerName==ga+campaign</segment>
 		<subtable>
 			<row>
 				<label>piwik kwd</label>
-				<nb_uniq_visitors>1</nb_uniq_visitors>
-				<nb_visits>1</nb_visits>
-				<nb_actions>1</nb_actions>
+				<nb_uniq_visitors>2</nb_uniq_visitors>
+				<nb_visits>2</nb_visits>
+				<nb_actions>2</nb_actions>
 				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>1084</sum_visit_length>
-				<bounce_count>1</bounce_count>
+				<bounce_count>2</bounce_count>
 				<goals>
 					<row idgoal='1'>
 						<nb_conversions>1</nb_conversions>
@@ -72,6 +73,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerType==campaign;referrerName==adwords+campaign</segment>
 		<subtable>
 			<row>
 				<label>(adwords) www.adwords-publisher-website.org</label>
@@ -107,6 +109,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerType==campaign;referrerName==adwords+%28text%29</segment>
 		<subtable>
 			<row>
 				<label>(adwords) www.example.com</label>
@@ -131,6 +134,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerType==campaign;referrerName==adwords+%28text_image%29</segment>
 		<subtable>
 			<row>
 				<label>(adwords) example.com</label>
@@ -146,6 +150,47 @@
 		</subtable>
 	</row>
 	<row>
+		<label>credited to another goal</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>0</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>0</max_actions>
+		<sum_visit_length>3</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>24</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>24</revenue>
+		<segment>referrerType==campaign;referrerName==credited+to+another+goal</segment>
+		<subtable>
+			<row>
+				<label>example.org</label>
+				<nb_uniq_visitors>1</nb_uniq_visitors>
+				<nb_visits>1</nb_visits>
+				<nb_actions>0</nb_actions>
+				<nb_users>0</nb_users>
+				<max_actions>0</max_actions>
+				<sum_visit_length>3</sum_visit_length>
+				<bounce_count>1</bounce_count>
+				<goals>
+					<row idgoal='1'>
+						<nb_conversions>1</nb_conversions>
+						<nb_visits_converted>1</nb_visits_converted>
+						<revenue>24</revenue>
+					</row>
+				</goals>
+				<nb_conversions>1</nb_conversions>
+				<revenue>24</revenue>
+			</row>
+		</subtable>
+	</row>
+	<row>
 		<label>credited to goal please</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
@@ -163,6 +208,7 @@
 		</goals>
 		<nb_conversions>1</nb_conversions>
 		<revenue>42</revenue>
+		<segment>referrerType==campaign;referrerName==credited+to+goal+please</segment>
 		<subtable>
 			<row>
 				<label>example.org</label>
diff --git a/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getWebsites_day.xml
index c234bed59e..7312e0fedc 100644
--- a/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getWebsites_day.xml
@@ -1,2 +1,78 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result />
\ No newline at end of file
+<result>
+	<row>
+		<label>mutantregistration.com</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerName==mutantregistration.com</segment>
+		<subtable>
+			<row>
+				<label>http://mutantregistration.com</label>
+				<nb_uniq_visitors>1</nb_uniq_visitors>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<nb_users>0</nb_users>
+				<max_actions>1</max_actions>
+				<sum_visit_length>0</sum_visit_length>
+				<bounce_count>1</bounce_count>
+				<nb_visits_converted>0</nb_visits_converted>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>myotherreferrerwebsite.com</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>2</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>2</max_actions>
+		<sum_visit_length>361</sum_visit_length>
+		<bounce_count>0</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerName==myotherreferrerwebsite.com</segment>
+		<subtable>
+			<row>
+				<label>http://myotherreferrerwebsite.com</label>
+				<nb_uniq_visitors>1</nb_uniq_visitors>
+				<nb_visits>1</nb_visits>
+				<nb_actions>2</nb_actions>
+				<nb_users>0</nb_users>
+				<max_actions>2</max_actions>
+				<sum_visit_length>361</sum_visit_length>
+				<bounce_count>0</bounce_count>
+				<nb_visits_converted>0</nb_visits_converted>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>myreferrerwebsite.com</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerName==myreferrerwebsite.com</segment>
+		<subtable>
+			<row>
+				<label>http://myreferrerwebsite.com</label>
+				<nb_uniq_visitors>1</nb_uniq_visitors>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<nb_users>0</nb_users>
+				<max_actions>1</max_actions>
+				<sum_visit_length>0</sum_visit_length>
+				<bounce_count>1</bounce_count>
+				<nb_visits_converted>0</nb_visits_converted>
+			</row>
+		</subtable>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml
index 78c6610886..3e911d8174 100644
--- a/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml
@@ -2,13 +2,13 @@
 <result>
 	<nb_uniq_visitors>3</nb_uniq_visitors>
 	<nb_users>0</nb_users>
-	<nb_visits>8</nb_visits>
-	<nb_actions>7</nb_actions>
-	<nb_visits_converted>2</nb_visits_converted>
-	<bounce_count>8</bounce_count>
-	<sum_visit_length>1084</sum_visit_length>
-	<max_actions>1</max_actions>
-	<bounce_rate>100%</bounce_rate>
+	<nb_visits>15</nb_visits>
+	<nb_actions>14</nb_actions>
+	<nb_visits_converted>3</nb_visits_converted>
+	<bounce_count>14</bounce_count>
+	<sum_visit_length>1448</sum_visit_length>
+	<max_actions>2</max_actions>
+	<bounce_rate>93%</bounce_rate>
 	<nb_actions_per_visit>0.9</nb_actions_per_visit>
-	<avg_time_on_site>136</avg_time_on_site>
+	<avg_time_on_site>97</avg_time_on_site>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml
index 68837cb7a6..ec4c9be19c 100644
--- a/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml
@@ -49,7 +49,7 @@
 		<metrics>
 			<nb_visits_0>
 				<name>Firefox (Visits)</name>
-				<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+				<logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
 				<min>0</min>
 				<max>1</max>
 			</nb_visits_0>
@@ -58,7 +58,7 @@
 			</nb_visits_1>
 			<nb_visits_2>
 				<name>Opera (Visits)</name>
-				<logo>plugins/UserSettings/images/browsers/OP.gif</logo>
+				<logo>plugins/DevicesDetection/images/browsers/OP.gif</logo>
 				<min>0</min>
 				<max>1</max>
 				<change>-100%</change>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
index 0e98c5b577..ac8e26d1f4 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
@@ -77,12 +77,15 @@
 		<result prettyDate="Sunday 3 January 2010">
 			<row>
 				<url>http://example.org/index.htm</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 			</row>
 			<row>
 				<url>http://example.org/index.htm?gkwd=SHOULD be a PageView, NOT a search</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3DSHOULD+be+a+PageView%2C+NOT+a+search</segment>
 			</row>
 			<row>
 				<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26mykwd%3D%26IS_FOLLOWING_SEARCH+ONCE</segment>
 			</row>
 		</result>
 		<result prettyDate="Monday 4 January 2010" />
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml
index ac1a2430de..570f393b9a 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml
@@ -77,12 +77,15 @@
 		<result prettyDate="2010, January">
 			<row>
 				<url>http://example.org/index.htm</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 			</row>
 			<row>
 				<url>http://example.org/index.htm?gkwd=SHOULD be a PageView, NOT a search</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3DSHOULD+be+a+PageView%2C+NOT+a+search</segment>
 			</row>
 			<row>
 				<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26mykwd%3D%26IS_FOLLOWING_SEARCH+ONCE</segment>
 			</row>
 		</result>
 		<result prettyDate="2010, February" />
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_day.xml
index 9a97a11562..f0c9afbbfc 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_day.xml
@@ -51,7 +51,7 @@
 			<nb_uniq_downloads>0</nb_uniq_downloads>
 			<nb_outlinks>0</nb_outlinks>
 			<nb_uniq_outlinks>0</nb_uniq_outlinks>
-			<nb_searches>5</nb_searches>
+			<nb_searches>9</nb_searches>
 			<nb_keywords>3</nb_keywords>
 		</result>
 		<result prettyDate="Monday 4 January 2010">
@@ -61,7 +61,7 @@
 			<nb_uniq_downloads>0</nb_uniq_downloads>
 			<nb_outlinks>0</nb_outlinks>
 			<nb_uniq_outlinks>0</nb_uniq_outlinks>
-			<nb_searches>3</nb_searches>
+			<nb_searches>4</nb_searches>
 			<nb_keywords>3</nb_keywords>
 		</result>
 		<result prettyDate="Tuesday 5 January 2010" />
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_month.xml
index c62212321d..b4ee70644f 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_month.xml
@@ -51,7 +51,7 @@
 			<nb_uniq_downloads>0</nb_uniq_downloads>
 			<nb_outlinks>0</nb_outlinks>
 			<nb_uniq_outlinks>0</nb_uniq_outlinks>
-			<nb_searches>8</nb_searches>
+			<nb_searches>13</nb_searches>
 			<nb_keywords>5</nb_keywords>
 		</result>
 		<result prettyDate="2010, February" />
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml
index ff058d70eb..b001f1be29 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml
@@ -13,6 +13,7 @@
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 				<url>http://example.org/index.htm</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 			</row>
 			<row>
 				<label>/index.htm?gkwd=SHOULD be a PageView, NOT a search</label>
@@ -26,6 +27,7 @@
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>100%</exit_rate>
 				<url>http://example.org/index.htm?gkwd=SHOULD be a PageView, NOT a search</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3DSHOULD+be+a+PageView%2C+NOT+a+search</segment>
 			</row>
 			<row>
 				<label>/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</label>
@@ -38,6 +40,7 @@
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 				<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26mykwd%3D%26IS_FOLLOWING_SEARCH+ONCE</segment>
 			</row>
 		</result>
 		<result date="2010-01-04" />
@@ -64,6 +67,7 @@
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 				<url>http://example.org/index.htm?q=Search 1&amp;IsPageView=1</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fq%3DSearch+1%26IsPageView%3D1</segment>
 			</row>
 			<row>
 				<label>/index.htm?random=PAGEVIEW, NOT SEARCH&amp;gcat=Cat not but not keyword, so this is not search</label>
@@ -75,6 +79,7 @@
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 				<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&amp;gcat=Cat not but not keyword, so this is not search</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26gcat%3DCat+not+but+not+keyword%2C+so+this+is+not+search</segment>
 			</row>
 		</result>
 		<result date="2010-01-04" />
@@ -98,6 +103,7 @@
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>100%</exit_rate>
 				<url>http://example.org/index.htm?%2C%20%C3%8Dslenska%2C%20Italiano%2C%20%E6%97%A5%E6%9C%AC%E8%AA%9E%2C%20%E1%83%A5%E1%83%90%E1%83%A0%E1%83%97%E1%83%A3%E1%83%9A%E1%83%98%2C%20%ED%95%9C%EA%B5%AD%EC%96%B4%2C%20Lietuvi%C5%B3%2C%20Latvie%C5%A1u%2C%20Norsk%20(bokm%C3%A5l)%2C%20Nederlands%2C%20Norsk%20(nynorsk)%2C%20Polski%2C%20Portugu%C3%AAs%20brasileiro%2C%20Portugu%C3%AAs%2C%20Rom%C3%A2n%C4%83%2C%20%D0%A0%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9%2C%20Slovensky%2C%20Sloven%C5%A1%C4%8Dina%2C%20Shqip%2C%20Srpski%2C%20Svenska%2C%20%E0%B0%A4%E0%B1%86%E0%B0%B2%E0%B1%81%E0%B0%97%E0%B1%81%2C%20%E0%B8%A0%E0%B8%B2%E0%B8%A9%E0%B8%B2%E0%B9%84%E0%B8%97%E0%B8%A2%2C%20T%C3%BCrk%C3%A7e%2C%20%D0%A3%D0%BA%D1%80%D0%B0%D1%97%D0%BD%D1%81%D1%8C%D0%BA%D0%B0%2C%20%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87%2C%20%E7%B9%81%E9%AB%94%E4%B8%AD%E6%96%87.</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3F%2C+%C3%8Dslenska%2C+Italiano%2C+%E6%97%A5%E6%9C%AC%E8%AA%9E%2C+%E1%83%A5%E1%83%90%E1%83%A0%E1%83%97%E1%83%A3%E1%83%9A%E1%83%98%2C+%ED%95%9C%EA%B5%AD%EC%96%B4%2C+Lietuvi%C5%B3%2C+Latvie%C5%A1u%2C+Norsk+%28bokm%C3%A5l%29%2C+Nederlands%2C+Norsk+%28nynorsk%29%2C+Polski%2C+Portugu%C3%AAs+brasileiro%2C+Portugu%C3%AAs%2C+Rom%C3%A2n%C4%83%2C+%D0%A0%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9%2C+Slovensky%2C+Sloven%C5%A1%C4%8Dina%2C+Shqip%2C+Srpski%2C+Svenska%2C+%E0%B0%A4%E0%B1%86%E0%B0%B2%E0%B1%81%E0%B0%97%E0%B1%81%2C+%E0%B8%A0%E0%B8%B2%E0%B8%A9%E0%B8%B2%E0%B9%84%E0%B8%97%E0%B8%A2%2C+T%C3%BCrk%C3%A7e%2C+%D0%A3%D0%BA%D1%80%D0%B0%D1%97%D0%BD%D1%81%D1%8C%D0%BA%D0%B0%2C+%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87%2C+%E7%B9%81%E9%AB%94%E4%B8%AD%E6%96%87.</segment>
 			</row>
 			<row>
 				<label>/index.htm?gkwd=test not a keyword&amp;gcat=Cat not but not keyword, so this is not search</label>
@@ -109,6 +115,7 @@
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 				<url>http://example.org/index.htm?gkwd=test not a keyword&amp;gcat=Cat not but not keyword, so this is not search</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3Dtest+not+a+keyword%26gcat%3DCat+not+but+not+keyword%2C+so+this+is+not+search</segment>
 			</row>
 			<row>
 				<label>/index.htm?q=Search 1&amp;IsPageView=1</label>
@@ -125,6 +132,7 @@
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 				<url>http://example.org/index.htm?q=Search 1&amp;IsPageView=1</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fq%3DSearch+1%26IsPageView%3D1</segment>
 			</row>
 		</result>
 		<result date="2010-01-04" />
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml
index 87e23ee986..ddae944352 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml
@@ -13,6 +13,7 @@
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 				<url>http://example.org/index.htm</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 			</row>
 			<row>
 				<label>/index.htm?gkwd=SHOULD be a PageView, NOT a search</label>
@@ -26,6 +27,7 @@
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>100%</exit_rate>
 				<url>http://example.org/index.htm?gkwd=SHOULD be a PageView, NOT a search</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3DSHOULD+be+a+PageView%2C+NOT+a+search</segment>
 			</row>
 			<row>
 				<label>/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</label>
@@ -38,6 +40,7 @@
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 				<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26mykwd%3D%26IS_FOLLOWING_SEARCH+ONCE</segment>
 			</row>
 		</result>
 		<result date="2010-02" />
@@ -64,6 +67,7 @@
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 				<url>http://example.org/index.htm?q=Search 1&amp;IsPageView=1</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fq%3DSearch+1%26IsPageView%3D1</segment>
 			</row>
 			<row>
 				<label>/index.htm?random=PAGEVIEW, NOT SEARCH&amp;gcat=Cat not but not keyword, so this is not search</label>
@@ -75,6 +79,7 @@
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 				<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&amp;gcat=Cat not but not keyword, so this is not search</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26gcat%3DCat+not+but+not+keyword%2C+so+this+is+not+search</segment>
 			</row>
 		</result>
 		<result date="2010-02" />
@@ -98,6 +103,7 @@
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>100%</exit_rate>
 				<url>http://example.org/index.htm?%2C%20%C3%8Dslenska%2C%20Italiano%2C%20%E6%97%A5%E6%9C%AC%E8%AA%9E%2C%20%E1%83%A5%E1%83%90%E1%83%A0%E1%83%97%E1%83%A3%E1%83%9A%E1%83%98%2C%20%ED%95%9C%EA%B5%AD%EC%96%B4%2C%20Lietuvi%C5%B3%2C%20Latvie%C5%A1u%2C%20Norsk%20(bokm%C3%A5l)%2C%20Nederlands%2C%20Norsk%20(nynorsk)%2C%20Polski%2C%20Portugu%C3%AAs%20brasileiro%2C%20Portugu%C3%AAs%2C%20Rom%C3%A2n%C4%83%2C%20%D0%A0%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9%2C%20Slovensky%2C%20Sloven%C5%A1%C4%8Dina%2C%20Shqip%2C%20Srpski%2C%20Svenska%2C%20%E0%B0%A4%E0%B1%86%E0%B0%B2%E0%B1%81%E0%B0%97%E0%B1%81%2C%20%E0%B8%A0%E0%B8%B2%E0%B8%A9%E0%B8%B2%E0%B9%84%E0%B8%97%E0%B8%A2%2C%20T%C3%BCrk%C3%A7e%2C%20%D0%A3%D0%BA%D1%80%D0%B0%D1%97%D0%BD%D1%81%D1%8C%D0%BA%D0%B0%2C%20%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87%2C%20%E7%B9%81%E9%AB%94%E4%B8%AD%E6%96%87.</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3F%2C+%C3%8Dslenska%2C+Italiano%2C+%E6%97%A5%E6%9C%AC%E8%AA%9E%2C+%E1%83%A5%E1%83%90%E1%83%A0%E1%83%97%E1%83%A3%E1%83%9A%E1%83%98%2C+%ED%95%9C%EA%B5%AD%EC%96%B4%2C+Lietuvi%C5%B3%2C+Latvie%C5%A1u%2C+Norsk+%28bokm%C3%A5l%29%2C+Nederlands%2C+Norsk+%28nynorsk%29%2C+Polski%2C+Portugu%C3%AAs+brasileiro%2C+Portugu%C3%AAs%2C+Rom%C3%A2n%C4%83%2C+%D0%A0%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9%2C+Slovensky%2C+Sloven%C5%A1%C4%8Dina%2C+Shqip%2C+Srpski%2C+Svenska%2C+%E0%B0%A4%E0%B1%86%E0%B0%B2%E0%B1%81%E0%B0%97%E0%B1%81%2C+%E0%B8%A0%E0%B8%B2%E0%B8%A9%E0%B8%B2%E0%B9%84%E0%B8%97%E0%B8%A2%2C+T%C3%BCrk%C3%A7e%2C+%D0%A3%D0%BA%D1%80%D0%B0%D1%97%D0%BD%D1%81%D1%8C%D0%BA%D0%B0%2C+%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87%2C+%E7%B9%81%E9%AB%94%E4%B8%AD%E6%96%87.</segment>
 			</row>
 			<row>
 				<label>/index.htm?gkwd=test not a keyword&amp;gcat=Cat not but not keyword, so this is not search</label>
@@ -109,6 +115,7 @@
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 				<url>http://example.org/index.htm?gkwd=test not a keyword&amp;gcat=Cat not but not keyword, so this is not search</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3Dtest+not+a+keyword%26gcat%3DCat+not+but+not+keyword%2C+so+this+is+not+search</segment>
 			</row>
 			<row>
 				<label>/index.htm?q=Search 1&amp;IsPageView=1</label>
@@ -125,6 +132,7 @@
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
 				<url>http://example.org/index.htm?q=Search 1&amp;IsPageView=1</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fq%3DSearch+1%26IsPageView%3D1</segment>
 			</row>
 		</result>
 		<result date="2010-02" />
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.get_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.get_day.xml
index 17aad549b7..f8d0b194c3 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.get_day.xml
@@ -8,7 +8,7 @@
 			<nb_uniq_downloads>0</nb_uniq_downloads>
 			<nb_outlinks>0</nb_outlinks>
 			<nb_uniq_outlinks>0</nb_uniq_outlinks>
-			<nb_searches>5</nb_searches>
+			<nb_searches>9</nb_searches>
 			<nb_keywords>3</nb_keywords>
 		</result>
 		<result date="2010-01-04">
@@ -18,7 +18,7 @@
 			<nb_uniq_downloads>0</nb_uniq_downloads>
 			<nb_outlinks>0</nb_outlinks>
 			<nb_uniq_outlinks>0</nb_uniq_outlinks>
-			<nb_searches>3</nb_searches>
+			<nb_searches>4</nb_searches>
 			<nb_keywords>3</nb_keywords>
 		</result>
 		<result date="2010-01-05" />
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.get_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.get_month.xml
index 9f2910f086..968a1d94f2 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.get_month.xml
@@ -8,7 +8,7 @@
 			<nb_uniq_downloads>0</nb_uniq_downloads>
 			<nb_outlinks>0</nb_outlinks>
 			<nb_uniq_outlinks>0</nb_uniq_outlinks>
-			<nb_searches>8</nb_searches>
+			<nb_searches>13</nb_searches>
 			<nb_keywords>5</nb_keywords>
 		</result>
 		<result date="2010-02" />
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml
index f709bef598..5617717b0d 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml
@@ -11,6 +11,7 @@
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
 		<url>http://example.org/index.htm</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 	</row>
 	<row>
 		<label>/index.htm?gkwd=SHOULD be a PageView, NOT a search</label>
@@ -24,6 +25,7 @@
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>100%</exit_rate>
 		<url>http://example.org/index.htm?gkwd=SHOULD be a PageView, NOT a search</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3DSHOULD+be+a+PageView%2C+NOT+a+search</segment>
 	</row>
 	<row>
 		<label>/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</label>
@@ -36,5 +38,6 @@
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
 		<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26mykwd%3D%26IS_FOLLOWING_SEARCH+ONCE</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml
index a7eeb309c9..12b4aea3ad 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml
@@ -11,6 +11,7 @@
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
 		<url>http://example.org/index.htm</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 	</row>
 	<row>
 		<label>/index.htm?gkwd=SHOULD be a PageView, NOT a search</label>
@@ -24,6 +25,7 @@
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>100%</exit_rate>
 		<url>http://example.org/index.htm?gkwd=SHOULD be a PageView, NOT a search</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Fgkwd%3DSHOULD+be+a+PageView%2C+NOT+a+search</segment>
 	</row>
 	<row>
 		<label>/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</label>
@@ -36,5 +38,6 @@
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
 		<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26mykwd%3D%26IS_FOLLOWING_SEARCH+ONCE</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.get_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.get_day.xml
index a5e5d16d73..6ee4ef618f 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.get_day.xml
@@ -6,6 +6,6 @@
 	<nb_uniq_downloads>0</nb_uniq_downloads>
 	<nb_outlinks>0</nb_outlinks>
 	<nb_uniq_outlinks>0</nb_uniq_outlinks>
-	<nb_searches>5</nb_searches>
+	<nb_searches>9</nb_searches>
 	<nb_keywords>3</nb_keywords>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.get_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.get_month.xml
index f1ac621851..8d1611b8db 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.get_month.xml
@@ -6,6 +6,6 @@
 	<nb_uniq_downloads>0</nb_uniq_downloads>
 	<nb_outlinks>0</nb_outlinks>
 	<nb_uniq_outlinks>0</nb_uniq_outlinks>
-	<nb_searches>8</nb_searches>
+	<nb_searches>13</nb_searches>
 	<nb_keywords>5</nb_keywords>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
index 17d9192ba4..a6b84490de 100644
--- a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
@@ -14,6 +14,7 @@
 				
 				<pageId>1</pageId>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -23,8 +24,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -38,31 +37,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -74,21 +72,26 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
index 6d2cd7c44f..f1ab94a928 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
@@ -49,7 +49,7 @@
 				<nb_hits>2</nb_hits>
 				<bounce_rate>100%</bounce_rate>
 				<avg_time_on_page>00:00:00</avg_time_on_page>
-				<exit_rate>50%</exit_rate>
+				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.14s</avg_time_generation>
 			</row>
 		</result>
@@ -213,10 +213,10 @@
 		<nb_visits>18</nb_visits>
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_hits>18</nb_hits>
-		<entry_bounce_count>1</entry_bounce_count>
-		<entry_nb_visits>6</entry_nb_visits>
-		<entry_nb_actions>26</entry_nb_actions>
-		<exit_nb_visits>1</exit_nb_visits>
-		<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
+		<entry_bounce_count>2</entry_bounce_count>
+		<entry_nb_visits>7</entry_nb_visits>
+		<entry_nb_actions>27</entry_nb_actions>
+		<exit_nb_visits>2</exit_nb_visits>
+		<exit_nb_uniq_visitors>2</exit_nb_uniq_visitors>
 	</reportTotal>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
index 1ce5abef77..50de1f59c4 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
@@ -47,9 +47,9 @@
 				<label>/index.htm</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
-				<bounce_rate>0%</bounce_rate>
+				<bounce_rate>100%</bounce_rate>
 				<avg_time_on_page>00:00:00</avg_time_on_page>
-				<exit_rate>0%</exit_rate>
+				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.12s</avg_time_generation>
 			</row>
 			<row>
@@ -223,9 +223,11 @@
 		<result prettyDate="Sunday 3 January 2010">
 			<row>
 				<url>http://example.org/index.htm</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 			</row>
 			<row>
 				<url>http://example.org/products</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segment>
 			</row>
 		</result>
 		<result prettyDate="Monday 4 January 2010">
@@ -236,9 +238,11 @@
 		<result prettyDate="Tuesday 5 January 2010">
 			<row>
 				<url>http://example.org/index.htm</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 			</row>
 			<row>
 				<url>http://example.org/thankyou</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment>
 			</row>
 			<row>
 				<url />
@@ -247,9 +251,11 @@
 		<result prettyDate="Wednesday 6 January 2010">
 			<row>
 				<url>http://example.org/index.htm</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 			</row>
 			<row>
 				<url>http://example.org/thankyou</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment>
 			</row>
 			<row>
 				<url />
@@ -258,9 +264,11 @@
 		<result prettyDate="Thursday 7 January 2010">
 			<row>
 				<url>http://example.org/index.htm</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 			</row>
 			<row>
 				<url>http://example.org/thankyou</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment>
 			</row>
 			<row>
 				<url />
@@ -269,9 +277,11 @@
 		<result prettyDate="Friday 8 January 2010">
 			<row>
 				<url>http://example.org/index.htm</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 			</row>
 			<row>
 				<url>http://example.org/thankyou</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment>
 			</row>
 			<row>
 				<url />
@@ -280,9 +290,11 @@
 		<result prettyDate="Saturday 9 January 2010">
 			<row>
 				<url>http://example.org/index.htm</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 			</row>
 			<row>
 				<url>http://example.org/thankyou</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment>
 			</row>
 			<row>
 				<url />
@@ -293,8 +305,10 @@
 		<nb_visits>18</nb_visits>
 		<nb_uniq_visitors>18</nb_uniq_visitors>
 		<nb_hits>28</nb_hits>
-		<entry_bounce_count>0</entry_bounce_count>
-		<entry_nb_visits>5</entry_nb_visits>
-		<entry_nb_actions>25</entry_nb_actions>
+		<entry_bounce_count>2</entry_bounce_count>
+		<entry_nb_visits>7</entry_nb_visits>
+		<entry_nb_actions>27</entry_nb_actions>
+		<exit_nb_visits>2</exit_nb_visits>
+		<exit_nb_uniq_visitors>2</exit_nb_uniq_visitors>
 	</reportTotal>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_day.xml
index 89cd627339..79c0ec2744 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_day.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
 	<result idSite="1">
-		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_users>0</nb_users>
-		<nb_visits>1</nb_visits>
-		<nb_actions>1</nb_actions>
-		<nb_visits_converted>1</nb_visits_converted>
-		<bounce_count>1</bounce_count>
+		<nb_visits>2</nb_visits>
+		<nb_actions>2</nb_actions>
+		<nb_visits_converted>2</nb_visits_converted>
+		<bounce_count>2</bounce_count>
 		<sum_visit_length>0</sum_visit_length>
 		<max_actions>1</max_actions>
 		<bounce_rate>100%</bounce_rate>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_month.xml
index 50c77f2755..e0096e9667 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_month.xml
@@ -3,15 +3,15 @@
 	<result idSite="1">
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_users>0</nb_users>
-		<nb_visits>10</nb_visits>
+		<nb_visits>11</nb_visits>
 		<nb_actions>43</nb_actions>
 		<nb_visits_converted>10</nb_visits_converted>
-		<bounce_count>1</bounce_count>
-		<sum_visit_length>7577</sum_visit_length>
+		<bounce_count>3</bounce_count>
+		<sum_visit_length>7216</sum_visit_length>
 		<max_actions>5</max_actions>
-		<bounce_rate>10%</bounce_rate>
-		<nb_actions_per_visit>4.3</nb_actions_per_visit>
-		<avg_time_on_site>758</avg_time_on_site>
+		<bounce_rate>27%</bounce_rate>
+		<nb_actions_per_visit>3.9</nb_actions_per_visit>
+		<avg_time_on_site>656</avg_time_on_site>
 	</result>
 	<result idSite="2">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_week.xml
index 89cd627339..79c0ec2744 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_week.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
 	<result idSite="1">
-		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_users>0</nb_users>
-		<nb_visits>1</nb_visits>
-		<nb_actions>1</nb_actions>
-		<nb_visits_converted>1</nb_visits_converted>
-		<bounce_count>1</bounce_count>
+		<nb_visits>2</nb_visits>
+		<nb_actions>2</nb_actions>
+		<nb_visits_converted>2</nb_visits_converted>
+		<bounce_count>2</bounce_count>
 		<sum_visit_length>0</sum_visit_length>
 		<max_actions>1</max_actions>
 		<bounce_rate>100%</bounce_rate>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_year.xml
index f520263652..763766e468 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_year.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
 	<result idSite="1">
-		<nb_visits>10</nb_visits>
+		<nb_visits>11</nb_visits>
 		<nb_actions>43</nb_actions>
 		<nb_visits_converted>10</nb_visits_converted>
-		<bounce_count>1</bounce_count>
-		<sum_visit_length>7577</sum_visit_length>
+		<bounce_count>3</bounce_count>
+		<sum_visit_length>7216</sum_visit_length>
 		<max_actions>5</max_actions>
-		<bounce_rate>10%</bounce_rate>
-		<nb_actions_per_visit>4.3</nb_actions_per_visit>
-		<avg_time_on_site>758</avg_time_on_site>
+		<bounce_rate>27%</bounce_rate>
+		<nb_actions_per_visit>3.9</nb_actions_per_visit>
+		<avg_time_on_site>656</avg_time_on_site>
 	</result>
 	<result idSite="2">
 		<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore_isDateRange__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore_isDateRange__VisitsSummary.get_range.xml
index f520263652..763766e468 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore_isDateRange__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore_isDateRange__VisitsSummary.get_range.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
 	<result idSite="1">
-		<nb_visits>10</nb_visits>
+		<nb_visits>11</nb_visits>
 		<nb_actions>43</nb_actions>
 		<nb_visits_converted>10</nb_visits_converted>
-		<bounce_count>1</bounce_count>
-		<sum_visit_length>7577</sum_visit_length>
+		<bounce_count>3</bounce_count>
+		<sum_visit_length>7216</sum_visit_length>
 		<max_actions>5</max_actions>
-		<bounce_rate>10%</bounce_rate>
-		<nb_actions_per_visit>4.3</nb_actions_per_visit>
-		<avg_time_on_site>758</avg_time_on_site>
+		<bounce_rate>27%</bounce_rate>
+		<nb_actions_per_visit>3.9</nb_actions_per_visit>
+		<avg_time_on_site>656</avg_time_on_site>
 	</result>
 	<result idSite="2">
 		<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabledBefore_isDateRange__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabledBefore_isDateRange__VisitsSummary.get_range.xml
index f520263652..763766e468 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabledBefore_isDateRange__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabledBefore_isDateRange__VisitsSummary.get_range.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
 	<result idSite="1">
-		<nb_visits>10</nb_visits>
+		<nb_visits>11</nb_visits>
 		<nb_actions>43</nb_actions>
 		<nb_visits_converted>10</nb_visits_converted>
-		<bounce_count>1</bounce_count>
-		<sum_visit_length>7577</sum_visit_length>
+		<bounce_count>3</bounce_count>
+		<sum_visit_length>7216</sum_visit_length>
 		<max_actions>5</max_actions>
-		<bounce_rate>10%</bounce_rate>
-		<nb_actions_per_visit>4.3</nb_actions_per_visit>
-		<avg_time_on_site>758</avg_time_on_site>
+		<bounce_rate>27%</bounce_rate>
+		<nb_actions_per_visit>3.9</nb_actions_per_visit>
+		<avg_time_on_site>656</avg_time_on_site>
 	</result>
 	<result idSite="2">
 		<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_day.xml
index 89cd627339..79c0ec2744 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_day.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
 	<result idSite="1">
-		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_users>0</nb_users>
-		<nb_visits>1</nb_visits>
-		<nb_actions>1</nb_actions>
-		<nb_visits_converted>1</nb_visits_converted>
-		<bounce_count>1</bounce_count>
+		<nb_visits>2</nb_visits>
+		<nb_actions>2</nb_actions>
+		<nb_visits_converted>2</nb_visits_converted>
+		<bounce_count>2</bounce_count>
 		<sum_visit_length>0</sum_visit_length>
 		<max_actions>1</max_actions>
 		<bounce_rate>100%</bounce_rate>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_month.xml
index 50c77f2755..e0096e9667 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_month.xml
@@ -3,15 +3,15 @@
 	<result idSite="1">
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_users>0</nb_users>
-		<nb_visits>10</nb_visits>
+		<nb_visits>11</nb_visits>
 		<nb_actions>43</nb_actions>
 		<nb_visits_converted>10</nb_visits_converted>
-		<bounce_count>1</bounce_count>
-		<sum_visit_length>7577</sum_visit_length>
+		<bounce_count>3</bounce_count>
+		<sum_visit_length>7216</sum_visit_length>
 		<max_actions>5</max_actions>
-		<bounce_rate>10%</bounce_rate>
-		<nb_actions_per_visit>4.3</nb_actions_per_visit>
-		<avg_time_on_site>758</avg_time_on_site>
+		<bounce_rate>27%</bounce_rate>
+		<nb_actions_per_visit>3.9</nb_actions_per_visit>
+		<avg_time_on_site>656</avg_time_on_site>
 	</result>
 	<result idSite="2">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_week.xml
index 89cd627339..79c0ec2744 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_week.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
 	<result idSite="1">
-		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_users>0</nb_users>
-		<nb_visits>1</nb_visits>
-		<nb_actions>1</nb_actions>
-		<nb_visits_converted>1</nb_visits_converted>
-		<bounce_count>1</bounce_count>
+		<nb_visits>2</nb_visits>
+		<nb_actions>2</nb_actions>
+		<nb_visits_converted>2</nb_visits_converted>
+		<bounce_count>2</bounce_count>
 		<sum_visit_length>0</sum_visit_length>
 		<max_actions>1</max_actions>
 		<bounce_rate>100%</bounce_rate>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_year.xml
index f520263652..763766e468 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_year.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
 	<result idSite="1">
-		<nb_visits>10</nb_visits>
+		<nb_visits>11</nb_visits>
 		<nb_actions>43</nb_actions>
 		<nb_visits_converted>10</nb_visits_converted>
-		<bounce_count>1</bounce_count>
-		<sum_visit_length>7577</sum_visit_length>
+		<bounce_count>3</bounce_count>
+		<sum_visit_length>7216</sum_visit_length>
 		<max_actions>5</max_actions>
-		<bounce_rate>10%</bounce_rate>
-		<nb_actions_per_visit>4.3</nb_actions_per_visit>
-		<avg_time_on_site>758</avg_time_on_site>
+		<bounce_rate>27%</bounce_rate>
+		<nb_actions_per_visit>3.9</nb_actions_per_visit>
+		<avg_time_on_site>656</avg_time_on_site>
 	</result>
 	<result idSite="2">
 		<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml
index aabc0dcb25..885d4243f4 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml
@@ -56,8 +56,8 @@
 		<result prettyDate="Sunday 3 January 2010">
 			<row>
 				<label>Site 1</label>
-				<nb_visits>1</nb_visits>
-				<nb_actions>1</nb_actions>
+				<nb_visits>2</nb_visits>
+				<nb_actions>2</nb_actions>
 				<nb_pageviews>2</nb_pageviews>
 				<revenue>$ 10</revenue>
 				<visits_evolution>100%</visits_evolution>
@@ -76,11 +76,11 @@
 			<row>
 				<label>Site 1</label>
 				<nb_visits>1</nb_visits>
-				<nb_actions>2</nb_actions>
+				<nb_actions>1</nb_actions>
 				<nb_pageviews>1</nb_pageviews>
 				<revenue>$ 0</revenue>
-				<visits_evolution>0%</visits_evolution>
-				<actions_evolution>100%</actions_evolution>
+				<visits_evolution>-50%</visits_evolution>
+				<actions_evolution>-50%</actions_evolution>
 				<pageviews_evolution>-50%</pageviews_evolution>
 				<revenue_evolution>-100%</revenue_evolution>
 				<nb_conversions>0</nb_conversions>
@@ -116,7 +116,7 @@
 				<nb_pageviews>5</nb_pageviews>
 				<revenue>$ 5</revenue>
 				<visits_evolution>0%</visits_evolution>
-				<actions_evolution>150%</actions_evolution>
+				<actions_evolution>400%</actions_evolution>
 				<pageviews_evolution>400%</pageviews_evolution>
 				<revenue_evolution>100%</revenue_evolution>
 				<nb_conversions>0</nb_conversions>
@@ -261,7 +261,7 @@
 		</result>
 	</reportMetadata>
 	<reportTotal>
-		<nb_visits>8</nb_visits>
+		<nb_visits>9</nb_visits>
 		<nb_actions>31</nb_actions>
 		<revenue>35</revenue>
 	</reportTotal>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_day.xml
index 13d4b19d4b..129e48b7e9 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_day.xml
@@ -2,7 +2,7 @@
 <results>
 	<result idSite="1">
 		<nb_conversions>2</nb_conversions>
-		<nb_visits_converted>1</nb_visits_converted>
+		<nb_visits_converted>2</nb_visits_converted>
 		<revenue>10</revenue>
 		<conversion_rate>100%</conversion_rate>
 	</result>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_month.xml
index 11701117f1..7268853bb5 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_month.xml
@@ -4,7 +4,7 @@
 		<nb_conversions>14</nb_conversions>
 		<nb_visits_converted>10</nb_visits_converted>
 		<revenue>50</revenue>
-		<conversion_rate>100%</conversion_rate>
+		<conversion_rate>90.91%</conversion_rate>
 	</result>
 	<result idSite="2">
 		<nb_conversions>1</nb_conversions>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml
index 89cd627339..79c0ec2744 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
 	<result idSite="1">
-		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_users>0</nb_users>
-		<nb_visits>1</nb_visits>
-		<nb_actions>1</nb_actions>
-		<nb_visits_converted>1</nb_visits_converted>
-		<bounce_count>1</bounce_count>
+		<nb_visits>2</nb_visits>
+		<nb_actions>2</nb_actions>
+		<nb_visits_converted>2</nb_visits_converted>
+		<bounce_count>2</bounce_count>
 		<sum_visit_length>0</sum_visit_length>
 		<max_actions>1</max_actions>
 		<bounce_rate>100%</bounce_rate>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml
index 50c77f2755..e0096e9667 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml
@@ -3,15 +3,15 @@
 	<result idSite="1">
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_users>0</nb_users>
-		<nb_visits>10</nb_visits>
+		<nb_visits>11</nb_visits>
 		<nb_actions>43</nb_actions>
 		<nb_visits_converted>10</nb_visits_converted>
-		<bounce_count>1</bounce_count>
-		<sum_visit_length>7577</sum_visit_length>
+		<bounce_count>3</bounce_count>
+		<sum_visit_length>7216</sum_visit_length>
 		<max_actions>5</max_actions>
-		<bounce_rate>10%</bounce_rate>
-		<nb_actions_per_visit>4.3</nb_actions_per_visit>
-		<avg_time_on_site>758</avg_time_on_site>
+		<bounce_rate>27%</bounce_rate>
+		<nb_actions_per_visit>3.9</nb_actions_per_visit>
+		<avg_time_on_site>656</avg_time_on_site>
 	</result>
 	<result idSite="2">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Live.getLastVisitsDetails_year.xml
index 631793f274..90d97250a4 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Live.getLastVisitsDetails_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Live.getLastVisitsDetails_year.xml
@@ -2,82 +2,82 @@
 <result>
 	<row>
 		<lastActionDateTime>2010-01-12 11:37:33</lastActionDateTime>
-		<actions>5</actions>
 		<visitConverted>1</visitConverted>
-		<events>0</events>
+		<actions>5</actions>
 		<referrerType>campaign</referrerType>
 		<referrerName>goal-matching-url-parameter</referrerName>
+		<events>0</events>
 	</row>
 	<row>
 		<lastActionDateTime>2010-01-11 11:37:33</lastActionDateTime>
-		<actions>5</actions>
 		<visitConverted>1</visitConverted>
-		<events>0</events>
+		<actions>5</actions>
 		<referrerType>website</referrerType>
 		<referrerName>referrer.com</referrerName>
+		<events>0</events>
 	</row>
 	<row>
 		<lastActionDateTime>2010-01-10 11:37:33</lastActionDateTime>
-		<actions>5</actions>
 		<visitConverted>1</visitConverted>
-		<events>0</events>
+		<actions>5</actions>
 		<referrerType>website</referrerType>
 		<referrerName>referrer.com</referrerName>
+		<events>0</events>
 	</row>
 	<row>
 		<lastActionDateTime>2010-01-09 11:37:33</lastActionDateTime>
-		<actions>5</actions>
 		<visitConverted>1</visitConverted>
-		<events>0</events>
+		<actions>5</actions>
 		<referrerType>website</referrerType>
 		<referrerName>referrer.com</referrerName>
+		<events>0</events>
 	</row>
 	<row>
 		<lastActionDateTime>2010-01-08 11:37:33</lastActionDateTime>
-		<actions>5</actions>
 		<visitConverted>1</visitConverted>
-		<events>0</events>
+		<actions>5</actions>
 		<referrerType>website</referrerType>
 		<referrerName>referrer.com</referrerName>
+		<events>0</events>
 	</row>
 	<row>
 		<lastActionDateTime>2010-01-07 11:37:33</lastActionDateTime>
-		<actions>5</actions>
 		<visitConverted>1</visitConverted>
-		<events>0</events>
+		<actions>5</actions>
 		<referrerType>campaign</referrerType>
 		<referrerName>goal-matching-url-parameter</referrerName>
+		<events>0</events>
 	</row>
 	<row>
 		<lastActionDateTime>2010-01-06 11:37:33</lastActionDateTime>
-		<actions>5</actions>
 		<visitConverted>1</visitConverted>
-		<events>0</events>
+		<actions>5</actions>
 		<referrerType>campaign</referrerType>
 		<referrerName>goal-matching-url-parameter</referrerName>
+		<events>0</events>
 	</row>
 	<row>
 		<lastActionDateTime>2010-01-05 11:37:33</lastActionDateTime>
-		<actions>5</actions>
 		<visitConverted>1</visitConverted>
-		<events>0</events>
+		<actions>5</actions>
 		<referrerType>campaign</referrerType>
 		<referrerName>goal-matching-url-parameter</referrerName>
+		<events>0</events>
 	</row>
 	<row>
 		<lastActionDateTime>2010-01-04 00:01:00</lastActionDateTime>
-		<actions>2</actions>
-		<visitConverted>1</visitConverted>
-		<events>0</events>
+		<visitConverted>0</visitConverted>
+		<actions>1</actions>
 		<referrerType>website</referrerType>
 		<referrerName>referrer.com</referrerName>
+		<events>0</events>
 	</row>
 	<row>
-		<lastActionDateTime>2010-01-03 12:22:33</lastActionDateTime>
-		<actions>1</actions>
+		<lastActionDateTime>2010-01-03 23:55:00</lastActionDateTime>
 		<visitConverted>1</visitConverted>
+		<actions>1</actions>
+		<referrerType>website</referrerType>
+		<referrerName>referrer.com</referrerName>
 		<events>0</events>
-		<referrerType>direct</referrerType>
-		<referrerName />
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_day.xml
index cb0f03a1ca..365dd2ff8d 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_day.xml
@@ -3,8 +3,8 @@
 	<result date="2010-01-03">
 		<row>
 			<label>Site 1</label>
-			<nb_visits>1</nb_visits>
-			<nb_actions>1</nb_actions>
+			<nb_visits>2</nb_visits>
+			<nb_actions>2</nb_actions>
 			<nb_pageviews>2</nb_pageviews>
 			<revenue>10</revenue>
 			<visits_evolution>100%</visits_evolution>
@@ -20,11 +20,11 @@
 		<row>
 			<label>Site 1</label>
 			<nb_visits>1</nb_visits>
-			<nb_actions>2</nb_actions>
+			<nb_actions>1</nb_actions>
 			<nb_pageviews>1</nb_pageviews>
 			<revenue>0</revenue>
-			<visits_evolution>0%</visits_evolution>
-			<actions_evolution>100%</actions_evolution>
+			<visits_evolution>-50%</visits_evolution>
+			<actions_evolution>-50%</actions_evolution>
 			<pageviews_evolution>-50%</pageviews_evolution>
 			<revenue_evolution>-100%</revenue_evolution>
 			<group />
@@ -54,7 +54,7 @@
 			<nb_pageviews>5</nb_pageviews>
 			<revenue>5</revenue>
 			<visits_evolution>0%</visits_evolution>
-			<actions_evolution>150%</actions_evolution>
+			<actions_evolution>400%</actions_evolution>
 			<pageviews_evolution>400%</pageviews_evolution>
 			<revenue_evolution>100%</revenue_evolution>
 			<group />
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml
index 7abc0f83ec..cf37606414 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml
@@ -3,7 +3,7 @@
 	<result date="2010-01">
 		<row>
 			<label>Site 1</label>
-			<nb_visits>10</nb_visits>
+			<nb_visits>11</nb_visits>
 			<nb_actions>43</nb_actions>
 			<nb_pageviews>43</nb_pageviews>
 			<revenue>50</revenue>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml
index 8283409adb..59f331588b 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml
@@ -3,8 +3,8 @@
 	<result date="From 2009-12-28 to 2010-01-03">
 		<row>
 			<label>Site 1</label>
-			<nb_visits>1</nb_visits>
-			<nb_actions>1</nb_actions>
+			<nb_visits>2</nb_visits>
+			<nb_actions>2</nb_actions>
 			<nb_pageviews>2</nb_pageviews>
 			<revenue>10</revenue>
 			<visits_evolution>100%</visits_evolution>
@@ -20,11 +20,11 @@
 		<row>
 			<label>Site 1</label>
 			<nb_visits>7</nb_visits>
-			<nb_actions>32</nb_actions>
+			<nb_actions>31</nb_actions>
 			<nb_pageviews>31</nb_pageviews>
 			<revenue>30</revenue>
-			<visits_evolution>600%</visits_evolution>
-			<actions_evolution>3100%</actions_evolution>
+			<visits_evolution>250%</visits_evolution>
+			<actions_evolution>1450%</actions_evolution>
 			<pageviews_evolution>1450%</pageviews_evolution>
 			<revenue_evolution>200%</revenue_evolution>
 			<group />
@@ -54,7 +54,7 @@
 			<nb_pageviews>10</nb_pageviews>
 			<revenue>10</revenue>
 			<visits_evolution>-71.4%</visits_evolution>
-			<actions_evolution>-68.8%</actions_evolution>
+			<actions_evolution>-67.7%</actions_evolution>
 			<pageviews_evolution>-67.7%</pageviews_evolution>
 			<revenue_evolution>-66.7%</revenue_evolution>
 			<group />
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml
index 9feb3bf709..b58279dbc5 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml
@@ -3,7 +3,7 @@
 	<result date="2010">
 		<row>
 			<label>Site 1</label>
-			<nb_visits>10</nb_visits>
+			<nb_visits>11</nb_visits>
 			<nb_actions>43</nb_actions>
 			<nb_pageviews>43</nb_pageviews>
 			<revenue>50</revenue>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_day.xml
index cb0f03a1ca..365dd2ff8d 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_day.xml
@@ -3,8 +3,8 @@
 	<result date="2010-01-03">
 		<row>
 			<label>Site 1</label>
-			<nb_visits>1</nb_visits>
-			<nb_actions>1</nb_actions>
+			<nb_visits>2</nb_visits>
+			<nb_actions>2</nb_actions>
 			<nb_pageviews>2</nb_pageviews>
 			<revenue>10</revenue>
 			<visits_evolution>100%</visits_evolution>
@@ -20,11 +20,11 @@
 		<row>
 			<label>Site 1</label>
 			<nb_visits>1</nb_visits>
-			<nb_actions>2</nb_actions>
+			<nb_actions>1</nb_actions>
 			<nb_pageviews>1</nb_pageviews>
 			<revenue>0</revenue>
-			<visits_evolution>0%</visits_evolution>
-			<actions_evolution>100%</actions_evolution>
+			<visits_evolution>-50%</visits_evolution>
+			<actions_evolution>-50%</actions_evolution>
 			<pageviews_evolution>-50%</pageviews_evolution>
 			<revenue_evolution>-100%</revenue_evolution>
 			<group />
@@ -54,7 +54,7 @@
 			<nb_pageviews>5</nb_pageviews>
 			<revenue>5</revenue>
 			<visits_evolution>0%</visits_evolution>
-			<actions_evolution>150%</actions_evolution>
+			<actions_evolution>400%</actions_evolution>
 			<pageviews_evolution>400%</pageviews_evolution>
 			<revenue_evolution>100%</revenue_evolution>
 			<group />
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml
index 7abc0f83ec..cf37606414 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml
@@ -3,7 +3,7 @@
 	<result date="2010-01">
 		<row>
 			<label>Site 1</label>
-			<nb_visits>10</nb_visits>
+			<nb_visits>11</nb_visits>
 			<nb_actions>43</nb_actions>
 			<nb_pageviews>43</nb_pageviews>
 			<revenue>50</revenue>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_week.xml
index 8283409adb..59f331588b 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_week.xml
@@ -3,8 +3,8 @@
 	<result date="From 2009-12-28 to 2010-01-03">
 		<row>
 			<label>Site 1</label>
-			<nb_visits>1</nb_visits>
-			<nb_actions>1</nb_actions>
+			<nb_visits>2</nb_visits>
+			<nb_actions>2</nb_actions>
 			<nb_pageviews>2</nb_pageviews>
 			<revenue>10</revenue>
 			<visits_evolution>100%</visits_evolution>
@@ -20,11 +20,11 @@
 		<row>
 			<label>Site 1</label>
 			<nb_visits>7</nb_visits>
-			<nb_actions>32</nb_actions>
+			<nb_actions>31</nb_actions>
 			<nb_pageviews>31</nb_pageviews>
 			<revenue>30</revenue>
-			<visits_evolution>600%</visits_evolution>
-			<actions_evolution>3100%</actions_evolution>
+			<visits_evolution>250%</visits_evolution>
+			<actions_evolution>1450%</actions_evolution>
 			<pageviews_evolution>1450%</pageviews_evolution>
 			<revenue_evolution>200%</revenue_evolution>
 			<group />
@@ -54,7 +54,7 @@
 			<nb_pageviews>10</nb_pageviews>
 			<revenue>10</revenue>
 			<visits_evolution>-71.4%</visits_evolution>
-			<actions_evolution>-68.8%</actions_evolution>
+			<actions_evolution>-67.7%</actions_evolution>
 			<pageviews_evolution>-67.7%</pageviews_evolution>
 			<revenue_evolution>-66.7%</revenue_evolution>
 			<group />
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_year.xml
index 9feb3bf709..b58279dbc5 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_year.xml
@@ -3,7 +3,7 @@
 	<result date="2010">
 		<row>
 			<label>Site 1</label>
-			<nb_visits>10</nb_visits>
+			<nb_visits>11</nb_visits>
 			<nb_actions>43</nb_actions>
 			<nb_pageviews>43</nb_pageviews>
 			<revenue>50</revenue>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml
index 296741c7a0..b29e30280b 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
 	<result idSite="1">
-		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_users>0</nb_users>
-		<nb_visits>1</nb_visits>
-		<nb_actions>1</nb_actions>
+		<nb_visits>2</nb_visits>
+		<nb_actions>2</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
-		<bounce_count>1</bounce_count>
+		<bounce_count>2</bounce_count>
 		<sum_visit_length>0</sum_visit_length>
 		<max_actions>1</max_actions>
 		<bounce_rate>100%</bounce_rate>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml
index 9aa711753b..6b172ffff7 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml
@@ -3,15 +3,15 @@
 	<result idSite="1">
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_users>0</nb_users>
-		<nb_visits>10</nb_visits>
+		<nb_visits>11</nb_visits>
 		<nb_actions>43</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
-		<bounce_count>1</bounce_count>
-		<sum_visit_length>7569</sum_visit_length>
+		<bounce_count>3</bounce_count>
+		<sum_visit_length>7208</sum_visit_length>
 		<max_actions>5</max_actions>
-		<bounce_rate>10%</bounce_rate>
-		<nb_actions_per_visit>4.3</nb_actions_per_visit>
-		<avg_time_on_site>757</avg_time_on_site>
+		<bounce_rate>27%</bounce_rate>
+		<nb_actions_per_visit>3.9</nb_actions_per_visit>
+		<avg_time_on_site>655</avg_time_on_site>
 	</result>
 	<result idSite="2">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml
index eb3f03db1b..215d5fe694 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml
@@ -50,17 +50,29 @@
 		<revenue>Revenue</revenue>
 	</columns>
 	<reportData>
-		<result prettyDate="Sunday 3 January 2010" />
+		<result prettyDate="Sunday 3 January 2010">
+			<row>
+				<label>referrer.com</label>
+				<nb_uniq_visitors>1</nb_uniq_visitors>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<nb_users>0</nb_users>
+				<nb_actions_per_visit>1</nb_actions_per_visit>
+				<avg_time_on_site>00:00:00</avg_time_on_site>
+				<bounce_rate>100%</bounce_rate>
+				<revenue>$ 0</revenue>
+			</row>
+		</result>
 		<result prettyDate="Monday 4 January 2010">
 			<row>
 				<label>referrer.com</label>
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
-				<nb_actions>2</nb_actions>
+				<nb_actions>1</nb_actions>
 				<nb_users>0</nb_users>
-				<nb_actions_per_visit>2</nb_actions_per_visit>
-				<avg_time_on_site>00:06:01</avg_time_on_site>
-				<bounce_rate>0%</bounce_rate>
+				<nb_actions_per_visit>1</nb_actions_per_visit>
+				<avg_time_on_site>00:00:00</avg_time_on_site>
+				<bounce_rate>100%</bounce_rate>
 				<revenue>$ 0</revenue>
 			</row>
 		</result>
@@ -95,9 +107,15 @@
 		</result>
 	</reportData>
 	<reportMetadata>
-		<result prettyDate="Sunday 3 January 2010" />
+		<result prettyDate="Sunday 3 January 2010">
+			<row>
+				<segment>referrerName==referrer.com</segment>
+				
+			</row>
+		</result>
 		<result prettyDate="Monday 4 January 2010">
 			<row>
+				<segment>referrerName==referrer.com</segment>
 				
 			</row>
 		</result>
@@ -106,20 +124,22 @@
 		<result prettyDate="Thursday 7 January 2010" />
 		<result prettyDate="Friday 8 January 2010">
 			<row>
+				<segment>referrerName==referrer.com</segment>
 				
 			</row>
 		</result>
 		<result prettyDate="Saturday 9 January 2010">
 			<row>
+				<segment>referrerName==referrer.com</segment>
 				
 			</row>
 		</result>
 	</reportMetadata>
 	<reportTotal>
-		<nb_visits>3</nb_visits>
-		<nb_uniq_visitors>3</nb_uniq_visitors>
+		<nb_visits>4</nb_visits>
+		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_actions>12</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
-		<bounce_count>0</bounce_count>
+		<bounce_count>2</bounce_count>
 	</reportTotal>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitFrequency.get_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitFrequency.get_firstSite_lastN__API.getProcessedReport_day.xml
index dae913cd1b..5d889eb52f 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitFrequency.get_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitFrequency.get_firstSite_lastN__API.getProcessedReport_day.xml
@@ -35,7 +35,16 @@
 	</columns>
 	<reportData>
 		<result prettyDate="Sunday 3 January 2010" />
-		<result prettyDate="Monday 4 January 2010" />
+		<result prettyDate="Monday 4 January 2010">
+			<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
+			<nb_users_returning>0</nb_users_returning>
+			<nb_visits_returning>1</nb_visits_returning>
+			<nb_actions_returning>1</nb_actions_returning>
+			<max_actions_returning>1</max_actions_returning>
+			<bounce_rate_returning>100%</bounce_rate_returning>
+			<nb_actions_per_visit_returning>1</nb_actions_per_visit_returning>
+			<avg_time_on_site_returning>00:00:00</avg_time_on_site_returning>
+		</result>
 		<result prettyDate="Tuesday 5 January 2010">
 			<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
 			<nb_users_returning>0</nb_users_returning>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml
index 0cfdf60b49..b7072a3a35 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml
@@ -27,7 +27,7 @@
 		<result prettyDate="Sunday 3 January 2010">
 			<row>
 				<label>New visits</label>
-				<nb_visits>1</nb_visits>
+				<nb_visits>2</nb_visits>
 			</row>
 			<row>
 				<label>0 days</label>
@@ -89,11 +89,11 @@
 		<result prettyDate="Monday 4 January 2010">
 			<row>
 				<label>New visits</label>
-				<nb_visits>1</nb_visits>
+				<nb_visits>0</nb_visits>
 			</row>
 			<row>
 				<label>0 days</label>
-				<nb_visits>0</nb_visits>
+				<nb_visits>1</nb_visits>
 			</row>
 			<row>
 				<label>1 day</label>
@@ -469,6 +469,6 @@
 		<result prettyDate="Saturday 9 January 2010" />
 	</reportMetadata>
 	<reportTotal>
-		<nb_visits>7</nb_visits>
+		<nb_visits>8</nb_visits>
 	</reportTotal>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml
index 8c6861a211..63b6741a62 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml
@@ -10,14 +10,12 @@
 		<metrics>
 			<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
 			<nb_visits>Visits</nb_visits>
-			<nb_users>Users</nb_users>
 			<nb_actions>Actions</nb_actions>
 			<max_actions>Maximum actions in one visit</max_actions>
 		</metrics>
 		<metricsDocumentation>
 			<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
 			<nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
-			<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
 			<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
 			<bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
 			<nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
@@ -35,7 +33,6 @@
 	<columns>
 		<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
 		<nb_visits>Visits</nb_visits>
-		<nb_users>Users</nb_users>
 		<nb_actions>Actions</nb_actions>
 		<max_actions>Maximum actions in one visit</max_actions>
 		<bounce_rate>Bounce Rate</bounce_rate>
@@ -44,10 +41,9 @@
 	</columns>
 	<reportData>
 		<result prettyDate="Sunday 3 January 2010">
-			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>0</nb_users>
-			<nb_visits>1</nb_visits>
-			<nb_actions>1</nb_actions>
+			<nb_uniq_visitors>2</nb_uniq_visitors>
+			<nb_visits>2</nb_visits>
+			<nb_actions>2</nb_actions>
 			<max_actions>1</max_actions>
 			<nb_actions_per_visit>1</nb_actions_per_visit>
 			<avg_time_on_site>00:00:00</avg_time_on_site>
@@ -55,17 +51,15 @@
 		</result>
 		<result prettyDate="Monday 4 January 2010">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>0</nb_users>
 			<nb_visits>1</nb_visits>
-			<nb_actions>2</nb_actions>
-			<max_actions>2</max_actions>
-			<nb_actions_per_visit>2</nb_actions_per_visit>
-			<avg_time_on_site>00:06:01</avg_time_on_site>
-			<bounce_rate>0%</bounce_rate>
+			<nb_actions>1</nb_actions>
+			<max_actions>1</max_actions>
+			<nb_actions_per_visit>1</nb_actions_per_visit>
+			<avg_time_on_site>00:00:00</avg_time_on_site>
+			<bounce_rate>100%</bounce_rate>
 		</result>
 		<result prettyDate="Tuesday 5 January 2010">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>0</nb_users>
 			<nb_visits>1</nb_visits>
 			<nb_actions>5</nb_actions>
 			<max_actions>5</max_actions>
@@ -75,7 +69,6 @@
 		</result>
 		<result prettyDate="Wednesday 6 January 2010">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>0</nb_users>
 			<nb_visits>1</nb_visits>
 			<nb_actions>5</nb_actions>
 			<max_actions>5</max_actions>
@@ -85,7 +78,6 @@
 		</result>
 		<result prettyDate="Thursday 7 January 2010">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>0</nb_users>
 			<nb_visits>1</nb_visits>
 			<nb_actions>5</nb_actions>
 			<max_actions>5</max_actions>
@@ -95,7 +87,6 @@
 		</result>
 		<result prettyDate="Friday 8 January 2010">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>0</nb_users>
 			<nb_visits>1</nb_visits>
 			<nb_actions>5</nb_actions>
 			<max_actions>5</max_actions>
@@ -105,7 +96,6 @@
 		</result>
 		<result prettyDate="Saturday 9 January 2010">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>0</nb_users>
 			<nb_visits>1</nb_visits>
 			<nb_actions>5</nb_actions>
 			<max_actions>5</max_actions>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml
index 41b3ee1ab8..9ca9e9d1ce 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml
@@ -11,16 +11,16 @@
 				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 				<min_time_generation>0.123</min_time_generation>
 				<max_time_generation>0.153</max_time_generation>
-				<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
+				<entry_nb_uniq_visitors>2</entry_nb_uniq_visitors>
+				<entry_nb_visits>2</entry_nb_visits>
+				<entry_nb_actions>2</entry_nb_actions>
 				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
-				<exit_nb_visits>1</exit_nb_visits>
+				<entry_bounce_count>2</entry_bounce_count>
+				<exit_nb_uniq_visitors>2</exit_nb_uniq_visitors>
+				<exit_nb_visits>2</exit_nb_visits>
 				<avg_time_on_page>0</avg_time_on_page>
 				<bounce_rate>100%</bounce_rate>
-				<exit_rate>50%</exit_rate>
+				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.138</avg_time_generation>
 			</row>
 		</result>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml
index d803ad11f9..9ccdac5d66 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml
@@ -113,17 +113,17 @@
 				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 				<min_time_generation>0.123</min_time_generation>
 				<max_time_generation>0.153</max_time_generation>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
+				<entry_nb_visits>2</entry_nb_visits>
+				<entry_nb_actions>2</entry_nb_actions>
 				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_visits>1</exit_nb_visits>
+				<entry_bounce_count>2</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
 				<avg_time_on_page>0</avg_time_on_page>
 				<bounce_rate>100%</bounce_rate>
-				<exit_rate>50%</exit_rate>
+				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.138</avg_time_generation>
 			</row>
 			<row>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml
index d04244796f..727d6c25f1 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml
@@ -10,17 +10,17 @@
 				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 				<min_time_generation>0.123</min_time_generation>
 				<max_time_generation>0.153</max_time_generation>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
+				<entry_nb_visits>2</entry_nb_visits>
+				<entry_nb_actions>2</entry_nb_actions>
 				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_visits>1</exit_nb_visits>
+				<entry_bounce_count>2</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
 				<avg_time_on_page>0</avg_time_on_page>
 				<bounce_rate>100%</bounce_rate>
-				<exit_rate>50%</exit_rate>
+				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.138</avg_time_generation>
 			</row>
 		</result>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml
index 8622de5d82..1a031a49e2 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml
@@ -113,17 +113,17 @@
 				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 				<min_time_generation>0.123</min_time_generation>
 				<max_time_generation>0.153</max_time_generation>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
+				<entry_nb_visits>2</entry_nb_visits>
+				<entry_nb_actions>2</entry_nb_actions>
 				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_visits>1</exit_nb_visits>
+				<entry_bounce_count>2</entry_bounce_count>
+				<exit_nb_visits>2</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
 				<avg_time_on_page>0</avg_time_on_page>
 				<bounce_rate>100%</bounce_rate>
-				<exit_rate>50%</exit_rate>
+				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.138</avg_time_generation>
 			</row>
 			<row>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_day.xml
index baf847ce36..649f9a2c52 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_day.xml
@@ -10,9 +10,16 @@
 			<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 			<min_time_generation>0.123</min_time_generation>
 			<max_time_generation>0.123</max_time_generation>
+			<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
+			<entry_nb_visits>1</entry_nb_visits>
+			<entry_nb_actions>1</entry_nb_actions>
+			<entry_sum_visit_length>0</entry_sum_visit_length>
+			<entry_bounce_count>1</entry_bounce_count>
+			<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
+			<exit_nb_visits>1</exit_nb_visits>
 			<avg_time_on_page>0</avg_time_on_page>
-			<bounce_rate>0%</bounce_rate>
-			<exit_rate>0%</exit_rate>
+			<bounce_rate>100%</bounce_rate>
+			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.123</avg_time_generation>
 			<url>http://example.org/index.htm</url>
 		</row>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_month.xml
index 00bb5030af..bc95c7710c 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_month.xml
@@ -9,15 +9,17 @@
 			<nb_hits_with_time_generation>9</nb_hits_with_time_generation>
 			<min_time_generation>0.123</min_time_generation>
 			<max_time_generation>0.323</max_time_generation>
-			<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
-			<entry_nb_visits>8</entry_nb_visits>
-			<entry_nb_actions>40</entry_nb_actions>
+			<entry_nb_visits>9</entry_nb_visits>
+			<entry_nb_actions>41</entry_nb_actions>
 			<entry_sum_visit_length>7208</entry_sum_visit_length>
-			<entry_bounce_count>0</entry_bounce_count>
-			<sum_daily_entry_nb_uniq_visitors>8</sum_daily_entry_nb_uniq_visitors>
+			<entry_bounce_count>1</entry_bounce_count>
+			<exit_nb_visits>1</exit_nb_visits>
+			<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
+			<sum_daily_entry_nb_uniq_visitors>9</sum_daily_entry_nb_uniq_visitors>
+			<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 			<avg_time_on_page>320</avg_time_on_page>
-			<bounce_rate>0%</bounce_rate>
-			<exit_rate>0%</exit_rate>
+			<bounce_rate>11%</bounce_rate>
+			<exit_rate>11%</exit_rate>
 			<avg_time_generation>0.301</avg_time_generation>
 			<url>http://example.org/index.htm</url>
 		</row>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_week.xml
index a8fdd76865..89897d9983 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_week.xml
@@ -9,10 +9,17 @@
 			<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 			<min_time_generation>0.123</min_time_generation>
 			<max_time_generation>0.123</max_time_generation>
+			<entry_nb_visits>1</entry_nb_visits>
+			<entry_nb_actions>1</entry_nb_actions>
+			<entry_sum_visit_length>0</entry_sum_visit_length>
+			<entry_bounce_count>1</entry_bounce_count>
+			<exit_nb_visits>1</exit_nb_visits>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+			<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 			<avg_time_on_page>0</avg_time_on_page>
-			<bounce_rate>0%</bounce_rate>
-			<exit_rate>0%</exit_rate>
+			<bounce_rate>100%</bounce_rate>
+			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.123</avg_time_generation>
 			<url>http://example.org/index.htm</url>
 		</row>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_year.xml
index 00bb5030af..bc95c7710c 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_year.xml
@@ -9,15 +9,17 @@
 			<nb_hits_with_time_generation>9</nb_hits_with_time_generation>
 			<min_time_generation>0.123</min_time_generation>
 			<max_time_generation>0.323</max_time_generation>
-			<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
-			<entry_nb_visits>8</entry_nb_visits>
-			<entry_nb_actions>40</entry_nb_actions>
+			<entry_nb_visits>9</entry_nb_visits>
+			<entry_nb_actions>41</entry_nb_actions>
 			<entry_sum_visit_length>7208</entry_sum_visit_length>
-			<entry_bounce_count>0</entry_bounce_count>
-			<sum_daily_entry_nb_uniq_visitors>8</sum_daily_entry_nb_uniq_visitors>
+			<entry_bounce_count>1</entry_bounce_count>
+			<exit_nb_visits>1</exit_nb_visits>
+			<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
+			<sum_daily_entry_nb_uniq_visitors>9</sum_daily_entry_nb_uniq_visitors>
+			<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 			<avg_time_on_page>320</avg_time_on_page>
-			<bounce_rate>0%</bounce_rate>
-			<exit_rate>0%</exit_rate>
+			<bounce_rate>11%</bounce_rate>
+			<exit_rate>11%</exit_rate>
 			<avg_time_generation>0.301</avg_time_generation>
 			<url>http://example.org/index.htm</url>
 		</row>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml
index eda852deae..c67d91399b 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml
@@ -11,11 +11,19 @@
 				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 				<min_time_generation>0.123</min_time_generation>
 				<max_time_generation>0.123</max_time_generation>
+				<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
+				<exit_nb_visits>1</exit_nb_visits>
 				<avg_time_on_page>0</avg_time_on_page>
-				<bounce_rate>0%</bounce_rate>
-				<exit_rate>0%</exit_rate>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.123</avg_time_generation>
 				<url>http://example.org/index.htm</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 			</row>
 			<row>
 				<label>/products</label>
@@ -38,6 +46,7 @@
 				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.153</avg_time_generation>
 				<url>http://example.org/products</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segment>
 			</row>
 		</result>
 		<result date="2010-01-04">
@@ -77,6 +86,7 @@
 				<exit_rate>0%</exit_rate>
 				<avg_time_generation>0.323</avg_time_generation>
 				<url>http://example.org/index.htm</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 			</row>
 			<row>
 				<label>/thankyou</label>
@@ -94,6 +104,7 @@
 				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.313</avg_time_generation>
 				<url>http://example.org/thankyou</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment>
 			</row>
 			<row>
 				<label>Page URL not defined</label>
@@ -131,6 +142,7 @@
 				<exit_rate>0%</exit_rate>
 				<avg_time_generation>0.323</avg_time_generation>
 				<url>http://example.org/index.htm</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 			</row>
 			<row>
 				<label>/thankyou</label>
@@ -148,6 +160,7 @@
 				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.313</avg_time_generation>
 				<url>http://example.org/thankyou</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment>
 			</row>
 			<row>
 				<label>Page URL not defined</label>
@@ -185,6 +198,7 @@
 				<exit_rate>0%</exit_rate>
 				<avg_time_generation>0.323</avg_time_generation>
 				<url>http://example.org/index.htm</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 			</row>
 			<row>
 				<label>/thankyou</label>
@@ -202,6 +216,7 @@
 				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.313</avg_time_generation>
 				<url>http://example.org/thankyou</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment>
 			</row>
 			<row>
 				<label>Page URL not defined</label>
@@ -239,6 +254,7 @@
 				<exit_rate>0%</exit_rate>
 				<avg_time_generation>0.323</avg_time_generation>
 				<url>http://example.org/index.htm</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 			</row>
 			<row>
 				<label>/thankyou</label>
@@ -256,6 +272,7 @@
 				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.313</avg_time_generation>
 				<url>http://example.org/thankyou</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment>
 			</row>
 			<row>
 				<label>Page URL not defined</label>
@@ -293,6 +310,7 @@
 				<exit_rate>0%</exit_rate>
 				<avg_time_generation>0.323</avg_time_generation>
 				<url>http://example.org/index.htm</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 			</row>
 			<row>
 				<label>/thankyou</label>
@@ -310,6 +328,7 @@
 				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.313</avg_time_generation>
 				<url>http://example.org/thankyou</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment>
 			</row>
 			<row>
 				<label>Page URL not defined</label>
@@ -352,6 +371,7 @@
 				<exit_rate>50%</exit_rate>
 				<avg_time_generation>0.348</avg_time_generation>
 				<url>http://example2.com/home#notIgnoredFragment</url>
+				<segment>pageUrl==http%3A%2F%2Fexample2.com%2Fhome%23notIgnoredFragment</segment>
 			</row>
 			<row>
 				<label>Page URL not defined</label>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml
index faa058da6b..08d1c90f9a 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml
@@ -10,17 +10,20 @@
 				<nb_hits_with_time_generation>9</nb_hits_with_time_generation>
 				<min_time_generation>0.123</min_time_generation>
 				<max_time_generation>0.323</max_time_generation>
-				<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
-				<entry_nb_visits>8</entry_nb_visits>
-				<entry_nb_actions>40</entry_nb_actions>
+				<entry_nb_visits>9</entry_nb_visits>
+				<entry_nb_actions>41</entry_nb_actions>
 				<entry_sum_visit_length>7208</entry_sum_visit_length>
-				<entry_bounce_count>0</entry_bounce_count>
-				<sum_daily_entry_nb_uniq_visitors>8</sum_daily_entry_nb_uniq_visitors>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>9</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<avg_time_on_page>320</avg_time_on_page>
-				<bounce_rate>0%</bounce_rate>
-				<exit_rate>0%</exit_rate>
+				<bounce_rate>11%</bounce_rate>
+				<exit_rate>11%</exit_rate>
 				<avg_time_generation>0.301</avg_time_generation>
 				<url>http://example.org/index.htm</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 			</row>
 			<row>
 				<label>Page URL not defined</label>
@@ -53,6 +56,7 @@
 				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.313</avg_time_generation>
 				<url>http://example.org/thankyou</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment>
 			</row>
 			<row>
 				<label>/products</label>
@@ -75,6 +79,7 @@
 				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.153</avg_time_generation>
 				<url>http://example.org/products</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segment>
 			</row>
 		</result>
 		<result date="2010-02" />
@@ -107,6 +112,7 @@
 				<exit_rate>50%</exit_rate>
 				<avg_time_generation>0.348</avg_time_generation>
 				<url>http://example2.com/home#notIgnoredFragment</url>
+				<segment>pageUrl==http%3A%2F%2Fexample2.com%2Fhome%23notIgnoredFragment</segment>
 			</row>
 			<row>
 				<label>Page URL not defined</label>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml
index 89ffb01c30..fc85313690 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml
@@ -10,12 +10,20 @@
 				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 				<min_time_generation>0.123</min_time_generation>
 				<max_time_generation>0.123</max_time_generation>
+				<entry_nb_visits>1</entry_nb_visits>
+				<entry_nb_actions>1</entry_nb_actions>
+				<entry_sum_visit_length>0</entry_sum_visit_length>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<avg_time_on_page>0</avg_time_on_page>
-				<bounce_rate>0%</bounce_rate>
-				<exit_rate>0%</exit_rate>
+				<bounce_rate>100%</bounce_rate>
+				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.123</avg_time_generation>
 				<url>http://example.org/index.htm</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 			</row>
 			<row>
 				<label>/products</label>
@@ -38,6 +46,7 @@
 				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.153</avg_time_generation>
 				<url>http://example.org/products</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segment>
 			</row>
 		</result>
 		<result date="From 2010-01-04 to 2010-01-10">
@@ -75,6 +84,7 @@
 				<exit_rate>0%</exit_rate>
 				<avg_time_generation>0.323</avg_time_generation>
 				<url>http://example.org/index.htm</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 			</row>
 			<row>
 				<label>/thankyou</label>
@@ -92,6 +102,7 @@
 				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.313</avg_time_generation>
 				<url>http://example.org/thankyou</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment>
 			</row>
 		</result>
 		<result date="From 2010-01-11 to 2010-01-17">
@@ -114,6 +125,7 @@
 				<exit_rate>0%</exit_rate>
 				<avg_time_generation>0.323</avg_time_generation>
 				<url>http://example.org/index.htm</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 			</row>
 			<row>
 				<label>/thankyou</label>
@@ -131,6 +143,7 @@
 				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.313</avg_time_generation>
 				<url>http://example.org/thankyou</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment>
 			</row>
 			<row>
 				<label>Page URL not defined</label>
@@ -177,6 +190,7 @@
 				<exit_rate>50%</exit_rate>
 				<avg_time_generation>0.348</avg_time_generation>
 				<url>http://example2.com/home#notIgnoredFragment</url>
+				<segment>pageUrl==http%3A%2F%2Fexample2.com%2Fhome%23notIgnoredFragment</segment>
 			</row>
 			<row>
 				<label>Page URL not defined</label>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml
index 4bccd4e8bc..0d0f6aaca8 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml
@@ -10,17 +10,20 @@
 				<nb_hits_with_time_generation>9</nb_hits_with_time_generation>
 				<min_time_generation>0.123</min_time_generation>
 				<max_time_generation>0.323</max_time_generation>
-				<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
-				<entry_nb_visits>8</entry_nb_visits>
-				<entry_nb_actions>40</entry_nb_actions>
+				<entry_nb_visits>9</entry_nb_visits>
+				<entry_nb_actions>41</entry_nb_actions>
 				<entry_sum_visit_length>7208</entry_sum_visit_length>
-				<entry_bounce_count>0</entry_bounce_count>
-				<sum_daily_entry_nb_uniq_visitors>8</sum_daily_entry_nb_uniq_visitors>
+				<entry_bounce_count>1</entry_bounce_count>
+				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
+				<sum_daily_entry_nb_uniq_visitors>9</sum_daily_entry_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<avg_time_on_page>320</avg_time_on_page>
-				<bounce_rate>0%</bounce_rate>
-				<exit_rate>0%</exit_rate>
+				<bounce_rate>11%</bounce_rate>
+				<exit_rate>11%</exit_rate>
 				<avg_time_generation>0.301</avg_time_generation>
 				<url>http://example.org/index.htm</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 			</row>
 			<row>
 				<label>Page URL not defined</label>
@@ -53,6 +56,7 @@
 				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.313</avg_time_generation>
 				<url>http://example.org/thankyou</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment>
 			</row>
 			<row>
 				<label>/products</label>
@@ -75,6 +79,7 @@
 				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.153</avg_time_generation>
 				<url>http://example.org/products</url>
+				<segment>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segment>
 			</row>
 		</result>
 		<result date="2011" />
@@ -107,6 +112,7 @@
 				<exit_rate>50%</exit_rate>
 				<avg_time_generation>0.348</avg_time_generation>
 				<url>http://example2.com/home#notIgnoredFragment</url>
+				<segment>pageUrl==http%3A%2F%2Fexample2.com%2Fhome%23notIgnoredFragment</segment>
 			</row>
 			<row>
 				<label>Page URL not defined</label>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml
index fa36e9ed05..68cf105bb4 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml
@@ -1,28 +1,55 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
 	<result idSite="1">
-		<result date="2010-01-03" />
+		<result date="2010-01-03">
+			<row>
+				<label>referrer.com</label>
+				<nb_uniq_visitors>1</nb_uniq_visitors>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<nb_users>0</nb_users>
+				<max_actions>1</max_actions>
+				<sum_visit_length>0</sum_visit_length>
+				<bounce_count>1</bounce_count>
+				<nb_visits_converted>0</nb_visits_converted>
+				<segment>referrerName==referrer.com</segment>
+				<subtable>
+					<row>
+						<label>http://referrer.com/page.htm?param=valuewith some spaces</label>
+						<nb_uniq_visitors>1</nb_uniq_visitors>
+						<nb_visits>1</nb_visits>
+						<nb_actions>1</nb_actions>
+						<nb_users>0</nb_users>
+						<max_actions>1</max_actions>
+						<sum_visit_length>0</sum_visit_length>
+						<bounce_count>1</bounce_count>
+						<nb_visits_converted>0</nb_visits_converted>
+					</row>
+				</subtable>
+			</row>
+		</result>
 		<result date="2010-01-04">
 			<row>
 				<label>referrer.com</label>
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
-				<nb_actions>2</nb_actions>
+				<nb_actions>1</nb_actions>
 				<nb_users>0</nb_users>
-				<max_actions>2</max_actions>
-				<sum_visit_length>361</sum_visit_length>
-				<bounce_count>0</bounce_count>
+				<max_actions>1</max_actions>
+				<sum_visit_length>0</sum_visit_length>
+				<bounce_count>1</bounce_count>
 				<nb_visits_converted>0</nb_visits_converted>
+				<segment>referrerName==referrer.com</segment>
 				<subtable>
 					<row>
 						<label>http://referrer.com/page.htm?param=valuewith some spaces</label>
 						<nb_uniq_visitors>1</nb_uniq_visitors>
 						<nb_visits>1</nb_visits>
-						<nb_actions>2</nb_actions>
+						<nb_actions>1</nb_actions>
 						<nb_users>0</nb_users>
-						<max_actions>2</max_actions>
-						<sum_visit_length>361</sum_visit_length>
-						<bounce_count>0</bounce_count>
+						<max_actions>1</max_actions>
+						<sum_visit_length>0</sum_visit_length>
+						<bounce_count>1</bounce_count>
 						<nb_visits_converted>0</nb_visits_converted>
 					</row>
 				</subtable>
@@ -42,6 +69,7 @@
 				<sum_visit_length>901</sum_visit_length>
 				<bounce_count>0</bounce_count>
 				<nb_visits_converted>0</nb_visits_converted>
+				<segment>referrerName==referrer.com</segment>
 				<subtable>
 					<row>
 						<label>http://referrer.com/Other_Page.htm</label>
@@ -68,6 +96,7 @@
 				<sum_visit_length>901</sum_visit_length>
 				<bounce_count>0</bounce_count>
 				<nb_visits_converted>0</nb_visits_converted>
+				<segment>referrerName==referrer.com</segment>
 				<subtable>
 					<row>
 						<label>http://referrer.com/Other_Page.htm</label>
@@ -97,6 +126,7 @@
 				<sum_visit_length>1</sum_visit_length>
 				<bounce_count>0</bounce_count>
 				<nb_visits_converted>0</nb_visits_converted>
+				<segment>referrerName==only-homepage-referrer.com</segment>
 				<subtable>
 					<row>
 						<label>http://only-homepage-referrer.com/</label>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml
index 40af378380..cb53e090a5 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml
@@ -4,14 +4,15 @@
 		<result date="2010-01">
 			<row>
 				<label>referrer.com</label>
-				<nb_visits>5</nb_visits>
+				<nb_visits>6</nb_visits>
 				<nb_actions>22</nb_actions>
 				<max_actions>5</max_actions>
-				<sum_visit_length>3965</sum_visit_length>
-				<bounce_count>0</bounce_count>
+				<sum_visit_length>3604</sum_visit_length>
+				<bounce_count>2</bounce_count>
 				<nb_visits_converted>0</nb_visits_converted>
-				<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 				<sum_daily_nb_users>0</sum_daily_nb_users>
+				<segment>referrerName==referrer.com</segment>
 				<subtable>
 					<row>
 						<label>http://referrer.com/Other_Page.htm</label>
@@ -26,13 +27,13 @@
 					</row>
 					<row>
 						<label>http://referrer.com/page.htm?param=valuewith some spaces</label>
-						<nb_visits>1</nb_visits>
+						<nb_visits>2</nb_visits>
 						<nb_actions>2</nb_actions>
-						<max_actions>2</max_actions>
-						<sum_visit_length>361</sum_visit_length>
-						<bounce_count>0</bounce_count>
+						<max_actions>1</max_actions>
+						<sum_visit_length>0</sum_visit_length>
+						<bounce_count>2</bounce_count>
 						<nb_visits_converted>0</nb_visits_converted>
-						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+						<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 						<sum_daily_nb_users>0</sum_daily_nb_users>
 					</row>
 				</subtable>
@@ -57,6 +58,7 @@
 				<nb_visits_converted>0</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_nb_users>0</sum_daily_nb_users>
+				<segment>referrerName==only-homepage-referrer.com</segment>
 				<subtable>
 					<row>
 						<label>http://only-homepage-referrer.com/</label>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml
index 936d04f579..dad94debe3 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml
@@ -1,18 +1,45 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
 	<result idSite="1">
-		<result date="From 2009-12-28 to 2010-01-03" />
+		<result date="From 2009-12-28 to 2010-01-03">
+			<row>
+				<label>referrer.com</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<max_actions>1</max_actions>
+				<sum_visit_length>0</sum_visit_length>
+				<bounce_count>1</bounce_count>
+				<nb_visits_converted>0</nb_visits_converted>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
+				<segment>referrerName==referrer.com</segment>
+				<subtable>
+					<row>
+						<label>http://referrer.com/page.htm?param=valuewith some spaces</label>
+						<nb_visits>1</nb_visits>
+						<nb_actions>1</nb_actions>
+						<max_actions>1</max_actions>
+						<sum_visit_length>0</sum_visit_length>
+						<bounce_count>1</bounce_count>
+						<nb_visits_converted>0</nb_visits_converted>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+						<sum_daily_nb_users>0</sum_daily_nb_users>
+					</row>
+				</subtable>
+			</row>
+		</result>
 		<result date="From 2010-01-04 to 2010-01-10">
 			<row>
 				<label>referrer.com</label>
 				<nb_visits>4</nb_visits>
-				<nb_actions>17</nb_actions>
+				<nb_actions>16</nb_actions>
 				<max_actions>5</max_actions>
-				<sum_visit_length>3064</sum_visit_length>
-				<bounce_count>0</bounce_count>
+				<sum_visit_length>2703</sum_visit_length>
+				<bounce_count>1</bounce_count>
 				<nb_visits_converted>0</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 				<sum_daily_nb_users>0</sum_daily_nb_users>
+				<segment>referrerName==referrer.com</segment>
 				<subtable>
 					<row>
 						<label>http://referrer.com/Other_Page.htm</label>
@@ -28,10 +55,10 @@
 					<row>
 						<label>http://referrer.com/page.htm?param=valuewith some spaces</label>
 						<nb_visits>1</nb_visits>
-						<nb_actions>2</nb_actions>
-						<max_actions>2</max_actions>
-						<sum_visit_length>361</sum_visit_length>
-						<bounce_count>0</bounce_count>
+						<nb_actions>1</nb_actions>
+						<max_actions>1</max_actions>
+						<sum_visit_length>0</sum_visit_length>
+						<bounce_count>1</bounce_count>
 						<nb_visits_converted>0</nb_visits_converted>
 						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 						<sum_daily_nb_users>0</sum_daily_nb_users>
@@ -50,6 +77,7 @@
 				<nb_visits_converted>0</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_nb_users>0</sum_daily_nb_users>
+				<segment>referrerName==referrer.com</segment>
 				<subtable>
 					<row>
 						<label>http://referrer.com/Other_Page.htm</label>
@@ -83,6 +111,7 @@
 				<nb_visits_converted>0</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_nb_users>0</sum_daily_nb_users>
+				<segment>referrerName==only-homepage-referrer.com</segment>
 				<subtable>
 					<row>
 						<label>http://only-homepage-referrer.com/</label>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml
index fec8a07c30..a20510ef16 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml
@@ -4,14 +4,15 @@
 		<result date="2010">
 			<row>
 				<label>referrer.com</label>
-				<nb_visits>5</nb_visits>
+				<nb_visits>6</nb_visits>
 				<nb_actions>22</nb_actions>
 				<max_actions>5</max_actions>
-				<sum_visit_length>3965</sum_visit_length>
-				<bounce_count>0</bounce_count>
+				<sum_visit_length>3604</sum_visit_length>
+				<bounce_count>2</bounce_count>
 				<nb_visits_converted>0</nb_visits_converted>
-				<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 				<sum_daily_nb_users>0</sum_daily_nb_users>
+				<segment>referrerName==referrer.com</segment>
 				<subtable>
 					<row>
 						<label>http://referrer.com/Other_Page.htm</label>
@@ -26,13 +27,13 @@
 					</row>
 					<row>
 						<label>http://referrer.com/page.htm?param=valuewith some spaces</label>
-						<nb_visits>1</nb_visits>
+						<nb_visits>2</nb_visits>
 						<nb_actions>2</nb_actions>
-						<max_actions>2</max_actions>
-						<sum_visit_length>361</sum_visit_length>
-						<bounce_count>0</bounce_count>
+						<max_actions>1</max_actions>
+						<sum_visit_length>0</sum_visit_length>
+						<bounce_count>2</bounce_count>
 						<nb_visits_converted>0</nb_visits_converted>
-						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+						<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 						<sum_daily_nb_users>0</sum_daily_nb_users>
 					</row>
 				</subtable>
@@ -57,6 +58,7 @@
 				<nb_visits_converted>0</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_nb_users>0</sum_daily_nb_users>
+				<segment>referrerName==only-homepage-referrer.com</segment>
 				<subtable>
 					<row>
 						<label>http://only-homepage-referrer.com/</label>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml
index 1132f1191d..dbc541c129 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml
@@ -2,7 +2,19 @@
 <results>
 	<result idSite="1">
 		<result date="2010-01-03" />
-		<result date="2010-01-04" />
+		<result date="2010-01-04">
+			<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
+			<nb_users_returning>0</nb_users_returning>
+			<nb_visits_returning>1</nb_visits_returning>
+			<nb_actions_returning>1</nb_actions_returning>
+			<nb_visits_converted_returning>0</nb_visits_converted_returning>
+			<bounce_count_returning>1</bounce_count_returning>
+			<sum_visit_length_returning>0</sum_visit_length_returning>
+			<max_actions_returning>1</max_actions_returning>
+			<bounce_rate_returning>100%</bounce_rate_returning>
+			<nb_actions_per_visit_returning>1</nb_actions_per_visit_returning>
+			<avg_time_on_site_returning>0</avg_time_on_site_returning>
+		</result>
 		<result date="2010-01-05">
 			<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
 			<nb_users_returning>0</nb_users_returning>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml
index f6da2a541d..9ec4ba810f 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml
@@ -2,17 +2,17 @@
 <results>
 	<result idSite="1">
 		<result date="2010-01">
-			<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
+			<nb_uniq_visitors_returning>2</nb_uniq_visitors_returning>
 			<nb_users_returning>0</nb_users_returning>
-			<nb_visits_returning>8</nb_visits_returning>
-			<nb_actions_returning>40</nb_actions_returning>
+			<nb_visits_returning>9</nb_visits_returning>
+			<nb_actions_returning>41</nb_actions_returning>
 			<nb_visits_converted_returning>0</nb_visits_converted_returning>
-			<bounce_count_returning>0</bounce_count_returning>
+			<bounce_count_returning>1</bounce_count_returning>
 			<sum_visit_length_returning>7208</sum_visit_length_returning>
 			<max_actions_returning>5</max_actions_returning>
-			<bounce_rate_returning>0%</bounce_rate_returning>
-			<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
-			<avg_time_on_site_returning>901</avg_time_on_site_returning>
+			<bounce_rate_returning>11%</bounce_rate_returning>
+			<nb_actions_per_visit_returning>4.6</nb_actions_per_visit_returning>
+			<avg_time_on_site_returning>801</avg_time_on_site_returning>
 		</result>
 		<result date="2010-02" />
 		<result date="2010-03" />
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml
index d64e929e8a..4ec591ba36 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml
@@ -3,17 +3,17 @@
 	<result idSite="1">
 		<result date="From 2009-12-28 to 2010-01-03" />
 		<result date="From 2010-01-04 to 2010-01-10">
-			<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
+			<nb_uniq_visitors_returning>2</nb_uniq_visitors_returning>
 			<nb_users_returning>0</nb_users_returning>
-			<nb_visits_returning>6</nb_visits_returning>
-			<nb_actions_returning>30</nb_actions_returning>
+			<nb_visits_returning>7</nb_visits_returning>
+			<nb_actions_returning>31</nb_actions_returning>
 			<nb_visits_converted_returning>0</nb_visits_converted_returning>
-			<bounce_count_returning>0</bounce_count_returning>
+			<bounce_count_returning>1</bounce_count_returning>
 			<sum_visit_length_returning>5406</sum_visit_length_returning>
 			<max_actions_returning>5</max_actions_returning>
-			<bounce_rate_returning>0%</bounce_rate_returning>
-			<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
-			<avg_time_on_site_returning>901</avg_time_on_site_returning>
+			<bounce_rate_returning>14%</bounce_rate_returning>
+			<nb_actions_per_visit_returning>4.4</nb_actions_per_visit_returning>
+			<avg_time_on_site_returning>772</avg_time_on_site_returning>
 		</result>
 		<result date="From 2010-01-11 to 2010-01-17">
 			<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml
index dd6204a199..3203a1977d 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml
@@ -2,15 +2,15 @@
 <results>
 	<result idSite="1">
 		<result date="2010">
-			<nb_visits_returning>8</nb_visits_returning>
-			<nb_actions_returning>40</nb_actions_returning>
+			<nb_visits_returning>9</nb_visits_returning>
+			<nb_actions_returning>41</nb_actions_returning>
 			<nb_visits_converted_returning>0</nb_visits_converted_returning>
-			<bounce_count_returning>0</bounce_count_returning>
+			<bounce_count_returning>1</bounce_count_returning>
 			<sum_visit_length_returning>7208</sum_visit_length_returning>
 			<max_actions_returning>5</max_actions_returning>
-			<bounce_rate_returning>0%</bounce_rate_returning>
-			<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
-			<avg_time_on_site_returning>901</avg_time_on_site_returning>
+			<bounce_rate_returning>11%</bounce_rate_returning>
+			<nb_actions_per_visit_returning>4.6</nb_actions_per_visit_returning>
+			<avg_time_on_site_returning>801</avg_time_on_site_returning>
 		</result>
 		<result date="2011" />
 		<result date="2012" />
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
index 0bc2b88f8f..503513f1e4 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
@@ -4,7 +4,7 @@
 		<result date="2010-01-03">
 			<row>
 				<label>New visits</label>
-				<nb_visits>1</nb_visits>
+				<nb_visits>2</nb_visits>
 			</row>
 			<row>
 				<label>0 days</label>
@@ -66,11 +66,11 @@
 		<result date="2010-01-04">
 			<row>
 				<label>New visits</label>
-				<nb_visits>1</nb_visits>
+				<nb_visits>0</nb_visits>
 			</row>
 			<row>
 				<label>0 days</label>
-				<nb_visits>0</nb_visits>
+				<nb_visits>1</nb_visits>
 			</row>
 			<row>
 				<label>1 day</label>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
index 16113a3774..89dfb22009 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
@@ -8,7 +8,7 @@
 			</row>
 			<row>
 				<label>0 days</label>
-				<nb_visits>0</nb_visits>
+				<nb_visits>1</nb_visits>
 			</row>
 			<row>
 				<label>1 day</label>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml
index 7595c2461e..23ac772564 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml
@@ -4,7 +4,7 @@
 		<result date="From 2009-12-28 to 2010-01-03">
 			<row>
 				<label>New visits</label>
-				<nb_visits>1</nb_visits>
+				<nb_visits>2</nb_visits>
 			</row>
 			<row>
 				<label>0 days</label>
@@ -66,11 +66,11 @@
 		<result date="From 2010-01-04 to 2010-01-10">
 			<row>
 				<label>New visits</label>
-				<nb_visits>1</nb_visits>
+				<nb_visits>0</nb_visits>
 			</row>
 			<row>
 				<label>0 days</label>
-				<nb_visits>0</nb_visits>
+				<nb_visits>1</nb_visits>
 			</row>
 			<row>
 				<label>1 day</label>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_year.xml
index 59903493cd..a61fb7f87c 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_year.xml
@@ -8,7 +8,7 @@
 			</row>
 			<row>
 				<label>0 days</label>
-				<nb_visits>0</nb_visits>
+				<nb_visits>1</nb_visits>
 			</row>
 			<row>
 				<label>1 day</label>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml
index c0f0001ebf..e2081a72ab 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml
@@ -2,12 +2,12 @@
 <results>
 	<result idSite="1">
 		<result date="2010-01-03">
-			<nb_uniq_visitors>1</nb_uniq_visitors>
+			<nb_uniq_visitors>2</nb_uniq_visitors>
 			<nb_users>0</nb_users>
-			<nb_visits>1</nb_visits>
-			<nb_actions>1</nb_actions>
+			<nb_visits>2</nb_visits>
+			<nb_actions>2</nb_actions>
 			<nb_visits_converted>0</nb_visits_converted>
-			<bounce_count>1</bounce_count>
+			<bounce_count>2</bounce_count>
 			<sum_visit_length>0</sum_visit_length>
 			<max_actions>1</max_actions>
 			<bounce_rate>100%</bounce_rate>
@@ -18,14 +18,14 @@
 			<nb_uniq_visitors>1</nb_uniq_visitors>
 			<nb_users>0</nb_users>
 			<nb_visits>1</nb_visits>
-			<nb_actions>2</nb_actions>
+			<nb_actions>1</nb_actions>
 			<nb_visits_converted>0</nb_visits_converted>
-			<bounce_count>0</bounce_count>
-			<sum_visit_length>361</sum_visit_length>
-			<max_actions>2</max_actions>
-			<bounce_rate>0%</bounce_rate>
-			<nb_actions_per_visit>2</nb_actions_per_visit>
-			<avg_time_on_site>361</avg_time_on_site>
+			<bounce_count>1</bounce_count>
+			<sum_visit_length>0</sum_visit_length>
+			<max_actions>1</max_actions>
+			<bounce_rate>100%</bounce_rate>
+			<nb_actions_per_visit>1</nb_actions_per_visit>
+			<avg_time_on_site>0</avg_time_on_site>
 		</result>
 		<result date="2010-01-05">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml
index d60436c3c9..53d4405192 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml
@@ -4,15 +4,15 @@
 		<result date="2010-01">
 			<nb_uniq_visitors>2</nb_uniq_visitors>
 			<nb_users>0</nb_users>
-			<nb_visits>10</nb_visits>
+			<nb_visits>11</nb_visits>
 			<nb_actions>43</nb_actions>
 			<nb_visits_converted>0</nb_visits_converted>
-			<bounce_count>1</bounce_count>
-			<sum_visit_length>7569</sum_visit_length>
+			<bounce_count>3</bounce_count>
+			<sum_visit_length>7208</sum_visit_length>
 			<max_actions>5</max_actions>
-			<bounce_rate>10%</bounce_rate>
-			<nb_actions_per_visit>4.3</nb_actions_per_visit>
-			<avg_time_on_site>757</avg_time_on_site>
+			<bounce_rate>27%</bounce_rate>
+			<nb_actions_per_visit>3.9</nb_actions_per_visit>
+			<avg_time_on_site>655</avg_time_on_site>
 		</result>
 		<result date="2010-02" />
 		<result date="2010-03" />
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml
index f754acd177..79fa415766 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml
@@ -2,12 +2,12 @@
 <results>
 	<result idSite="1">
 		<result date="From 2009-12-28 to 2010-01-03">
-			<nb_uniq_visitors>1</nb_uniq_visitors>
+			<nb_uniq_visitors>2</nb_uniq_visitors>
 			<nb_users>0</nb_users>
-			<nb_visits>1</nb_visits>
-			<nb_actions>1</nb_actions>
+			<nb_visits>2</nb_visits>
+			<nb_actions>2</nb_actions>
 			<nb_visits_converted>0</nb_visits_converted>
-			<bounce_count>1</bounce_count>
+			<bounce_count>2</bounce_count>
 			<sum_visit_length>0</sum_visit_length>
 			<max_actions>1</max_actions>
 			<bounce_rate>100%</bounce_rate>
@@ -18,14 +18,14 @@
 			<nb_uniq_visitors>2</nb_uniq_visitors>
 			<nb_users>0</nb_users>
 			<nb_visits>7</nb_visits>
-			<nb_actions>32</nb_actions>
+			<nb_actions>31</nb_actions>
 			<nb_visits_converted>0</nb_visits_converted>
-			<bounce_count>0</bounce_count>
-			<sum_visit_length>5767</sum_visit_length>
+			<bounce_count>1</bounce_count>
+			<sum_visit_length>5406</sum_visit_length>
 			<max_actions>5</max_actions>
-			<bounce_rate>0%</bounce_rate>
-			<nb_actions_per_visit>4.6</nb_actions_per_visit>
-			<avg_time_on_site>824</avg_time_on_site>
+			<bounce_rate>14%</bounce_rate>
+			<nb_actions_per_visit>4.4</nb_actions_per_visit>
+			<avg_time_on_site>772</avg_time_on_site>
 		</result>
 		<result date="From 2010-01-11 to 2010-01-17">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_year.xml
index 301adee7ee..9de6d3fd9b 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_year.xml
@@ -2,15 +2,15 @@
 <results>
 	<result idSite="1">
 		<result date="2010">
-			<nb_visits>10</nb_visits>
+			<nb_visits>11</nb_visits>
 			<nb_actions>43</nb_actions>
 			<nb_visits_converted>0</nb_visits_converted>
-			<bounce_count>1</bounce_count>
-			<sum_visit_length>7569</sum_visit_length>
+			<bounce_count>3</bounce_count>
+			<sum_visit_length>7208</sum_visit_length>
 			<max_actions>5</max_actions>
-			<bounce_rate>10%</bounce_rate>
-			<nb_actions_per_visit>4.3</nb_actions_per_visit>
-			<avg_time_on_site>757</avg_time_on_site>
+			<bounce_rate>27%</bounce_rate>
+			<nb_actions_per_visit>3.9</nb_actions_per_visit>
+			<avg_time_on_site>655</avg_time_on_site>
 		</result>
 		<result date="2011" />
 		<result date="2012" />
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_day.xml
index 9f120e0ee0..2c6f0f0c6b 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_day.xml
@@ -10,16 +10,16 @@
 			<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 			<min_time_generation>0.123</min_time_generation>
 			<max_time_generation>0.153</max_time_generation>
-			<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
-			<entry_nb_visits>1</entry_nb_visits>
-			<entry_nb_actions>1</entry_nb_actions>
+			<entry_nb_uniq_visitors>2</entry_nb_uniq_visitors>
+			<entry_nb_visits>2</entry_nb_visits>
+			<entry_nb_actions>2</entry_nb_actions>
 			<entry_sum_visit_length>0</entry_sum_visit_length>
-			<entry_bounce_count>1</entry_bounce_count>
-			<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
-			<exit_nb_visits>1</exit_nb_visits>
+			<entry_bounce_count>2</entry_bounce_count>
+			<exit_nb_uniq_visitors>2</exit_nb_uniq_visitors>
+			<exit_nb_visits>2</exit_nb_visits>
 			<avg_time_on_page>0</avg_time_on_page>
 			<bounce_rate>100%</bounce_rate>
-			<exit_rate>50%</exit_rate>
+			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.138</avg_time_generation>
 		</row>
 	</result>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_month.xml
index 7b53ef8a32..766132cf07 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_month.xml
@@ -112,17 +112,17 @@
 			<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 			<min_time_generation>0.123</min_time_generation>
 			<max_time_generation>0.153</max_time_generation>
-			<entry_nb_visits>1</entry_nb_visits>
-			<entry_nb_actions>1</entry_nb_actions>
+			<entry_nb_visits>2</entry_nb_visits>
+			<entry_nb_actions>2</entry_nb_actions>
 			<entry_sum_visit_length>0</entry_sum_visit_length>
-			<entry_bounce_count>1</entry_bounce_count>
-			<exit_nb_visits>1</exit_nb_visits>
+			<entry_bounce_count>2</entry_bounce_count>
+			<exit_nb_visits>2</exit_nb_visits>
 			<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-			<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-			<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+			<sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
+			<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
 			<avg_time_on_page>0</avg_time_on_page>
 			<bounce_rate>100%</bounce_rate>
-			<exit_rate>50%</exit_rate>
+			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.138</avg_time_generation>
 		</row>
 		<row>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_week.xml
index c8f777c165..a3b1c910dd 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_week.xml
@@ -9,17 +9,17 @@
 			<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 			<min_time_generation>0.123</min_time_generation>
 			<max_time_generation>0.153</max_time_generation>
-			<entry_nb_visits>1</entry_nb_visits>
-			<entry_nb_actions>1</entry_nb_actions>
+			<entry_nb_visits>2</entry_nb_visits>
+			<entry_nb_actions>2</entry_nb_actions>
 			<entry_sum_visit_length>0</entry_sum_visit_length>
-			<entry_bounce_count>1</entry_bounce_count>
-			<exit_nb_visits>1</exit_nb_visits>
+			<entry_bounce_count>2</entry_bounce_count>
+			<exit_nb_visits>2</exit_nb_visits>
 			<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-			<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-			<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+			<sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
+			<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
 			<avg_time_on_page>0</avg_time_on_page>
 			<bounce_rate>100%</bounce_rate>
-			<exit_rate>50%</exit_rate>
+			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.138</avg_time_generation>
 		</row>
 	</result>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_year.xml
index 0d8b62b451..20075ee956 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_year.xml
@@ -112,17 +112,17 @@
 			<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 			<min_time_generation>0.123</min_time_generation>
 			<max_time_generation>0.153</max_time_generation>
-			<entry_nb_visits>1</entry_nb_visits>
-			<entry_nb_actions>1</entry_nb_actions>
+			<entry_nb_visits>2</entry_nb_visits>
+			<entry_nb_actions>2</entry_nb_actions>
 			<entry_sum_visit_length>0</entry_sum_visit_length>
-			<entry_bounce_count>1</entry_bounce_count>
-			<exit_nb_visits>1</exit_nb_visits>
+			<entry_bounce_count>2</entry_bounce_count>
+			<exit_nb_visits>2</exit_nb_visits>
 			<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-			<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-			<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+			<sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
+			<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
 			<avg_time_on_page>0</avg_time_on_page>
 			<bounce_rate>100%</bounce_rate>
-			<exit_rate>50%</exit_rate>
+			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.138</avg_time_generation>
 		</row>
 		<row>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_day.xml
index b5ee40f53b..8f4fdae7d0 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_day.xml
@@ -10,9 +10,16 @@
 			<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 			<min_time_generation>0.123</min_time_generation>
 			<max_time_generation>0.123</max_time_generation>
+			<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
+			<entry_nb_visits>1</entry_nb_visits>
+			<entry_nb_actions>1</entry_nb_actions>
+			<entry_sum_visit_length>0</entry_sum_visit_length>
+			<entry_bounce_count>1</entry_bounce_count>
+			<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
+			<exit_nb_visits>1</exit_nb_visits>
 			<avg_time_on_page>0</avg_time_on_page>
-			<bounce_rate>0%</bounce_rate>
-			<exit_rate>0%</exit_rate>
+			<bounce_rate>100%</bounce_rate>
+			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.123</avg_time_generation>
 			<url>http://example.org/index.htm</url>
 		</row>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_month.xml
index b12b6dbe6a..64f981e8cd 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_month.xml
@@ -9,15 +9,17 @@
 			<nb_hits_with_time_generation>9</nb_hits_with_time_generation>
 			<min_time_generation>0.123</min_time_generation>
 			<max_time_generation>0.323</max_time_generation>
-			<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
-			<entry_nb_visits>8</entry_nb_visits>
-			<entry_nb_actions>40</entry_nb_actions>
+			<entry_nb_visits>9</entry_nb_visits>
+			<entry_nb_actions>41</entry_nb_actions>
 			<entry_sum_visit_length>7208</entry_sum_visit_length>
-			<entry_bounce_count>0</entry_bounce_count>
-			<sum_daily_entry_nb_uniq_visitors>8</sum_daily_entry_nb_uniq_visitors>
+			<entry_bounce_count>1</entry_bounce_count>
+			<exit_nb_visits>1</exit_nb_visits>
+			<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
+			<sum_daily_entry_nb_uniq_visitors>9</sum_daily_entry_nb_uniq_visitors>
+			<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 			<avg_time_on_page>320</avg_time_on_page>
-			<bounce_rate>0%</bounce_rate>
-			<exit_rate>0%</exit_rate>
+			<bounce_rate>11%</bounce_rate>
+			<exit_rate>11%</exit_rate>
 			<avg_time_generation>0.301</avg_time_generation>
 			<url>http://example.org/index.htm</url>
 		</row>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_week.xml
index 3227ff9c6a..4126d4ba0f 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_week.xml
@@ -9,10 +9,17 @@
 			<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 			<min_time_generation>0.123</min_time_generation>
 			<max_time_generation>0.123</max_time_generation>
+			<entry_nb_visits>1</entry_nb_visits>
+			<entry_nb_actions>1</entry_nb_actions>
+			<entry_sum_visit_length>0</entry_sum_visit_length>
+			<entry_bounce_count>1</entry_bounce_count>
+			<exit_nb_visits>1</exit_nb_visits>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+			<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 			<avg_time_on_page>0</avg_time_on_page>
-			<bounce_rate>0%</bounce_rate>
-			<exit_rate>0%</exit_rate>
+			<bounce_rate>100%</bounce_rate>
+			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.123</avg_time_generation>
 			<url>http://example.org/index.htm</url>
 		</row>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_year.xml
index 071c0d3fa2..38d33953ca 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_year.xml
@@ -9,15 +9,17 @@
 			<nb_hits_with_time_generation>9</nb_hits_with_time_generation>
 			<min_time_generation>0.123</min_time_generation>
 			<max_time_generation>0.323</max_time_generation>
-			<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
-			<entry_nb_visits>8</entry_nb_visits>
-			<entry_nb_actions>40</entry_nb_actions>
+			<entry_nb_visits>9</entry_nb_visits>
+			<entry_nb_actions>41</entry_nb_actions>
 			<entry_sum_visit_length>7208</entry_sum_visit_length>
-			<entry_bounce_count>0</entry_bounce_count>
-			<sum_daily_entry_nb_uniq_visitors>8</sum_daily_entry_nb_uniq_visitors>
+			<entry_bounce_count>1</entry_bounce_count>
+			<exit_nb_visits>1</exit_nb_visits>
+			<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
+			<sum_daily_entry_nb_uniq_visitors>9</sum_daily_entry_nb_uniq_visitors>
+			<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 			<avg_time_on_page>320</avg_time_on_page>
-			<bounce_rate>0%</bounce_rate>
-			<exit_rate>0%</exit_rate>
+			<bounce_rate>11%</bounce_rate>
+			<exit_rate>11%</exit_rate>
 			<avg_time_generation>0.301</avg_time_generation>
 			<url>http://example.org/index.htm</url>
 		</row>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml
index efb03f5be4..4087b624e2 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml
@@ -10,11 +10,19 @@
 			<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 			<min_time_generation>0.123</min_time_generation>
 			<max_time_generation>0.123</max_time_generation>
+			<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
+			<entry_nb_visits>1</entry_nb_visits>
+			<entry_nb_actions>1</entry_nb_actions>
+			<entry_sum_visit_length>0</entry_sum_visit_length>
+			<entry_bounce_count>1</entry_bounce_count>
+			<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
+			<exit_nb_visits>1</exit_nb_visits>
 			<avg_time_on_page>0</avg_time_on_page>
-			<bounce_rate>0%</bounce_rate>
-			<exit_rate>0%</exit_rate>
+			<bounce_rate>100%</bounce_rate>
+			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.123</avg_time_generation>
 			<url>http://example.org/index.htm</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 		</row>
 		<row>
 			<label>/products</label>
@@ -37,6 +45,7 @@
 			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.153</avg_time_generation>
 			<url>http://example.org/products</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segment>
 		</row>
 	</result>
 	<result date="2010-01-04">
@@ -76,6 +85,7 @@
 			<exit_rate>0%</exit_rate>
 			<avg_time_generation>0.323</avg_time_generation>
 			<url>http://example.org/index.htm</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 		</row>
 		<row>
 			<label>/thankyou</label>
@@ -93,6 +103,7 @@
 			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.313</avg_time_generation>
 			<url>http://example.org/thankyou</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment>
 		</row>
 		<row>
 			<label>Page URL not defined</label>
@@ -130,6 +141,7 @@
 			<exit_rate>0%</exit_rate>
 			<avg_time_generation>0.323</avg_time_generation>
 			<url>http://example.org/index.htm</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 		</row>
 		<row>
 			<label>/thankyou</label>
@@ -147,6 +159,7 @@
 			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.313</avg_time_generation>
 			<url>http://example.org/thankyou</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment>
 		</row>
 		<row>
 			<label>Page URL not defined</label>
@@ -184,6 +197,7 @@
 			<exit_rate>0%</exit_rate>
 			<avg_time_generation>0.323</avg_time_generation>
 			<url>http://example.org/index.htm</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 		</row>
 		<row>
 			<label>/thankyou</label>
@@ -201,6 +215,7 @@
 			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.313</avg_time_generation>
 			<url>http://example.org/thankyou</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment>
 		</row>
 		<row>
 			<label>Page URL not defined</label>
@@ -238,6 +253,7 @@
 			<exit_rate>0%</exit_rate>
 			<avg_time_generation>0.323</avg_time_generation>
 			<url>http://example.org/index.htm</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 		</row>
 		<row>
 			<label>/thankyou</label>
@@ -255,6 +271,7 @@
 			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.313</avg_time_generation>
 			<url>http://example.org/thankyou</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment>
 		</row>
 		<row>
 			<label>Page URL not defined</label>
@@ -292,6 +309,7 @@
 			<exit_rate>0%</exit_rate>
 			<avg_time_generation>0.323</avg_time_generation>
 			<url>http://example.org/index.htm</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 		</row>
 		<row>
 			<label>/thankyou</label>
@@ -309,6 +327,7 @@
 			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.313</avg_time_generation>
 			<url>http://example.org/thankyou</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment>
 		</row>
 		<row>
 			<label>Page URL not defined</label>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml
index 56e3fc8c35..6e13a1e872 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml
@@ -9,17 +9,20 @@
 			<nb_hits_with_time_generation>9</nb_hits_with_time_generation>
 			<min_time_generation>0.123</min_time_generation>
 			<max_time_generation>0.323</max_time_generation>
-			<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
-			<entry_nb_visits>8</entry_nb_visits>
-			<entry_nb_actions>40</entry_nb_actions>
+			<entry_nb_visits>9</entry_nb_visits>
+			<entry_nb_actions>41</entry_nb_actions>
 			<entry_sum_visit_length>7208</entry_sum_visit_length>
-			<entry_bounce_count>0</entry_bounce_count>
-			<sum_daily_entry_nb_uniq_visitors>8</sum_daily_entry_nb_uniq_visitors>
+			<entry_bounce_count>1</entry_bounce_count>
+			<exit_nb_visits>1</exit_nb_visits>
+			<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
+			<sum_daily_entry_nb_uniq_visitors>9</sum_daily_entry_nb_uniq_visitors>
+			<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 			<avg_time_on_page>320</avg_time_on_page>
-			<bounce_rate>0%</bounce_rate>
-			<exit_rate>0%</exit_rate>
+			<bounce_rate>11%</bounce_rate>
+			<exit_rate>11%</exit_rate>
 			<avg_time_generation>0.301</avg_time_generation>
 			<url>http://example.org/index.htm</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 		</row>
 		<row>
 			<label>Page URL not defined</label>
@@ -52,6 +55,7 @@
 			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.313</avg_time_generation>
 			<url>http://example.org/thankyou</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment>
 		</row>
 		<row>
 			<label>/products</label>
@@ -74,6 +78,7 @@
 			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.153</avg_time_generation>
 			<url>http://example.org/products</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segment>
 		</row>
 	</result>
 	<result date="2010-02" />
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml
index 7d086860eb..8366107a19 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml
@@ -9,12 +9,20 @@
 			<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 			<min_time_generation>0.123</min_time_generation>
 			<max_time_generation>0.123</max_time_generation>
+			<entry_nb_visits>1</entry_nb_visits>
+			<entry_nb_actions>1</entry_nb_actions>
+			<entry_sum_visit_length>0</entry_sum_visit_length>
+			<entry_bounce_count>1</entry_bounce_count>
+			<exit_nb_visits>1</exit_nb_visits>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+			<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 			<avg_time_on_page>0</avg_time_on_page>
-			<bounce_rate>0%</bounce_rate>
-			<exit_rate>0%</exit_rate>
+			<bounce_rate>100%</bounce_rate>
+			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.123</avg_time_generation>
 			<url>http://example.org/index.htm</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 		</row>
 		<row>
 			<label>/products</label>
@@ -37,6 +45,7 @@
 			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.153</avg_time_generation>
 			<url>http://example.org/products</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segment>
 		</row>
 	</result>
 	<result date="From 2010-01-04 to 2010-01-10">
@@ -74,6 +83,7 @@
 			<exit_rate>0%</exit_rate>
 			<avg_time_generation>0.323</avg_time_generation>
 			<url>http://example.org/index.htm</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 		</row>
 		<row>
 			<label>/thankyou</label>
@@ -91,6 +101,7 @@
 			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.313</avg_time_generation>
 			<url>http://example.org/thankyou</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment>
 		</row>
 	</result>
 	<result date="From 2010-01-11 to 2010-01-17">
@@ -113,6 +124,7 @@
 			<exit_rate>0%</exit_rate>
 			<avg_time_generation>0.323</avg_time_generation>
 			<url>http://example.org/index.htm</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 		</row>
 		<row>
 			<label>/thankyou</label>
@@ -130,6 +142,7 @@
 			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.313</avg_time_generation>
 			<url>http://example.org/thankyou</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment>
 		</row>
 		<row>
 			<label>Page URL not defined</label>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml
index 284466a853..fb02cf8629 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml
@@ -9,17 +9,20 @@
 			<nb_hits_with_time_generation>9</nb_hits_with_time_generation>
 			<min_time_generation>0.123</min_time_generation>
 			<max_time_generation>0.323</max_time_generation>
-			<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
-			<entry_nb_visits>8</entry_nb_visits>
-			<entry_nb_actions>40</entry_nb_actions>
+			<entry_nb_visits>9</entry_nb_visits>
+			<entry_nb_actions>41</entry_nb_actions>
 			<entry_sum_visit_length>7208</entry_sum_visit_length>
-			<entry_bounce_count>0</entry_bounce_count>
-			<sum_daily_entry_nb_uniq_visitors>8</sum_daily_entry_nb_uniq_visitors>
+			<entry_bounce_count>1</entry_bounce_count>
+			<exit_nb_visits>1</exit_nb_visits>
+			<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
+			<sum_daily_entry_nb_uniq_visitors>9</sum_daily_entry_nb_uniq_visitors>
+			<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 			<avg_time_on_page>320</avg_time_on_page>
-			<bounce_rate>0%</bounce_rate>
-			<exit_rate>0%</exit_rate>
+			<bounce_rate>11%</bounce_rate>
+			<exit_rate>11%</exit_rate>
 			<avg_time_generation>0.301</avg_time_generation>
 			<url>http://example.org/index.htm</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
 		</row>
 		<row>
 			<label>Page URL not defined</label>
@@ -52,6 +55,7 @@
 			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.313</avg_time_generation>
 			<url>http://example.org/thankyou</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2Fthankyou</segment>
 		</row>
 		<row>
 			<label>/products</label>
@@ -74,6 +78,7 @@
 			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.153</avg_time_generation>
 			<url>http://example.org/products</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segment>
 		</row>
 	</result>
 	<result date="2011" />
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml
index 26f579966b..67bf4d2ac5 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml
@@ -1,27 +1,54 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
-	<result date="2010-01-03" />
+	<result date="2010-01-03">
+		<row>
+			<label>referrer.com</label>
+			<nb_uniq_visitors>1</nb_uniq_visitors>
+			<nb_visits>1</nb_visits>
+			<nb_actions>1</nb_actions>
+			<nb_users>0</nb_users>
+			<max_actions>1</max_actions>
+			<sum_visit_length>0</sum_visit_length>
+			<bounce_count>1</bounce_count>
+			<nb_visits_converted>0</nb_visits_converted>
+			<segment>referrerName==referrer.com</segment>
+			<subtable>
+				<row>
+					<label>http://referrer.com/page.htm?param=valuewith some spaces</label>
+					<nb_uniq_visitors>1</nb_uniq_visitors>
+					<nb_visits>1</nb_visits>
+					<nb_actions>1</nb_actions>
+					<nb_users>0</nb_users>
+					<max_actions>1</max_actions>
+					<sum_visit_length>0</sum_visit_length>
+					<bounce_count>1</bounce_count>
+					<nb_visits_converted>0</nb_visits_converted>
+				</row>
+			</subtable>
+		</row>
+	</result>
 	<result date="2010-01-04">
 		<row>
 			<label>referrer.com</label>
 			<nb_uniq_visitors>1</nb_uniq_visitors>
 			<nb_visits>1</nb_visits>
-			<nb_actions>2</nb_actions>
+			<nb_actions>1</nb_actions>
 			<nb_users>0</nb_users>
-			<max_actions>2</max_actions>
-			<sum_visit_length>361</sum_visit_length>
-			<bounce_count>0</bounce_count>
+			<max_actions>1</max_actions>
+			<sum_visit_length>0</sum_visit_length>
+			<bounce_count>1</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
+			<segment>referrerName==referrer.com</segment>
 			<subtable>
 				<row>
 					<label>http://referrer.com/page.htm?param=valuewith some spaces</label>
 					<nb_uniq_visitors>1</nb_uniq_visitors>
 					<nb_visits>1</nb_visits>
-					<nb_actions>2</nb_actions>
+					<nb_actions>1</nb_actions>
 					<nb_users>0</nb_users>
-					<max_actions>2</max_actions>
-					<sum_visit_length>361</sum_visit_length>
-					<bounce_count>0</bounce_count>
+					<max_actions>1</max_actions>
+					<sum_visit_length>0</sum_visit_length>
+					<bounce_count>1</bounce_count>
 					<nb_visits_converted>0</nb_visits_converted>
 				</row>
 			</subtable>
@@ -41,6 +68,7 @@
 			<sum_visit_length>901</sum_visit_length>
 			<bounce_count>0</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
+			<segment>referrerName==referrer.com</segment>
 			<subtable>
 				<row>
 					<label>http://referrer.com/Other_Page.htm</label>
@@ -67,6 +95,7 @@
 			<sum_visit_length>901</sum_visit_length>
 			<bounce_count>0</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
+			<segment>referrerName==referrer.com</segment>
 			<subtable>
 				<row>
 					<label>http://referrer.com/Other_Page.htm</label>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml
index d84b27e20b..d04b442b1c 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml
@@ -3,14 +3,15 @@
 	<result date="2010-01">
 		<row>
 			<label>referrer.com</label>
-			<nb_visits>5</nb_visits>
+			<nb_visits>6</nb_visits>
 			<nb_actions>22</nb_actions>
 			<max_actions>5</max_actions>
-			<sum_visit_length>3965</sum_visit_length>
-			<bounce_count>0</bounce_count>
+			<sum_visit_length>3604</sum_visit_length>
+			<bounce_count>2</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
-			<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+			<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 			<sum_daily_nb_users>0</sum_daily_nb_users>
+			<segment>referrerName==referrer.com</segment>
 			<subtable>
 				<row>
 					<label>http://referrer.com/Other_Page.htm</label>
@@ -25,13 +26,13 @@
 				</row>
 				<row>
 					<label>http://referrer.com/page.htm?param=valuewith some spaces</label>
-					<nb_visits>1</nb_visits>
+					<nb_visits>2</nb_visits>
 					<nb_actions>2</nb_actions>
-					<max_actions>2</max_actions>
-					<sum_visit_length>361</sum_visit_length>
-					<bounce_count>0</bounce_count>
+					<max_actions>1</max_actions>
+					<sum_visit_length>0</sum_visit_length>
+					<bounce_count>2</bounce_count>
 					<nb_visits_converted>0</nb_visits_converted>
-					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+					<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 					<sum_daily_nb_users>0</sum_daily_nb_users>
 				</row>
 			</subtable>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml
index 808baafb9a..1af9b3a261 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml
@@ -1,17 +1,44 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
-	<result date="From 2009-12-28 to 2010-01-03" />
+	<result date="From 2009-12-28 to 2010-01-03">
+		<row>
+			<label>referrer.com</label>
+			<nb_visits>1</nb_visits>
+			<nb_actions>1</nb_actions>
+			<max_actions>1</max_actions>
+			<sum_visit_length>0</sum_visit_length>
+			<bounce_count>1</bounce_count>
+			<nb_visits_converted>0</nb_visits_converted>
+			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<sum_daily_nb_users>0</sum_daily_nb_users>
+			<segment>referrerName==referrer.com</segment>
+			<subtable>
+				<row>
+					<label>http://referrer.com/page.htm?param=valuewith some spaces</label>
+					<nb_visits>1</nb_visits>
+					<nb_actions>1</nb_actions>
+					<max_actions>1</max_actions>
+					<sum_visit_length>0</sum_visit_length>
+					<bounce_count>1</bounce_count>
+					<nb_visits_converted>0</nb_visits_converted>
+					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+					<sum_daily_nb_users>0</sum_daily_nb_users>
+				</row>
+			</subtable>
+		</row>
+	</result>
 	<result date="From 2010-01-04 to 2010-01-10">
 		<row>
 			<label>referrer.com</label>
 			<nb_visits>4</nb_visits>
-			<nb_actions>17</nb_actions>
+			<nb_actions>16</nb_actions>
 			<max_actions>5</max_actions>
-			<sum_visit_length>3064</sum_visit_length>
-			<bounce_count>0</bounce_count>
+			<sum_visit_length>2703</sum_visit_length>
+			<bounce_count>1</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 			<sum_daily_nb_users>0</sum_daily_nb_users>
+			<segment>referrerName==referrer.com</segment>
 			<subtable>
 				<row>
 					<label>http://referrer.com/Other_Page.htm</label>
@@ -27,10 +54,10 @@
 				<row>
 					<label>http://referrer.com/page.htm?param=valuewith some spaces</label>
 					<nb_visits>1</nb_visits>
-					<nb_actions>2</nb_actions>
-					<max_actions>2</max_actions>
-					<sum_visit_length>361</sum_visit_length>
-					<bounce_count>0</bounce_count>
+					<nb_actions>1</nb_actions>
+					<max_actions>1</max_actions>
+					<sum_visit_length>0</sum_visit_length>
+					<bounce_count>1</bounce_count>
 					<nb_visits_converted>0</nb_visits_converted>
 					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 					<sum_daily_nb_users>0</sum_daily_nb_users>
@@ -49,6 +76,7 @@
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 			<sum_daily_nb_users>0</sum_daily_nb_users>
+			<segment>referrerName==referrer.com</segment>
 			<subtable>
 				<row>
 					<label>http://referrer.com/Other_Page.htm</label>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml
index 09f596aa7b..c80e5068c0 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml
@@ -3,14 +3,15 @@
 	<result date="2010">
 		<row>
 			<label>referrer.com</label>
-			<nb_visits>5</nb_visits>
+			<nb_visits>6</nb_visits>
 			<nb_actions>22</nb_actions>
 			<max_actions>5</max_actions>
-			<sum_visit_length>3965</sum_visit_length>
-			<bounce_count>0</bounce_count>
+			<sum_visit_length>3604</sum_visit_length>
+			<bounce_count>2</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
-			<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+			<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 			<sum_daily_nb_users>0</sum_daily_nb_users>
+			<segment>referrerName==referrer.com</segment>
 			<subtable>
 				<row>
 					<label>http://referrer.com/Other_Page.htm</label>
@@ -25,13 +26,13 @@
 				</row>
 				<row>
 					<label>http://referrer.com/page.htm?param=valuewith some spaces</label>
-					<nb_visits>1</nb_visits>
+					<nb_visits>2</nb_visits>
 					<nb_actions>2</nb_actions>
-					<max_actions>2</max_actions>
-					<sum_visit_length>361</sum_visit_length>
-					<bounce_count>0</bounce_count>
+					<max_actions>1</max_actions>
+					<sum_visit_length>0</sum_visit_length>
+					<bounce_count>2</bounce_count>
 					<nb_visits_converted>0</nb_visits_converted>
-					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+					<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 					<sum_daily_nb_users>0</sum_daily_nb_users>
 				</row>
 			</subtable>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml
index f760097ff0..a3b880a884 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml
@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
 	<result date="2010-01-03" />
-	<result date="2010-01-04" />
+	<result date="2010-01-04">
+		<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
+		<nb_users_returning>0</nb_users_returning>
+		<nb_visits_returning>1</nb_visits_returning>
+		<nb_actions_returning>1</nb_actions_returning>
+		<nb_visits_converted_returning>0</nb_visits_converted_returning>
+		<bounce_count_returning>1</bounce_count_returning>
+		<sum_visit_length_returning>0</sum_visit_length_returning>
+		<max_actions_returning>1</max_actions_returning>
+		<bounce_rate_returning>100%</bounce_rate_returning>
+		<nb_actions_per_visit_returning>1</nb_actions_per_visit_returning>
+		<avg_time_on_site_returning>0</avg_time_on_site_returning>
+	</result>
 	<result date="2010-01-05">
 		<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
 		<nb_users_returning>0</nb_users_returning>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml
index ddce4b63c9..2cc7acdb90 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
 	<result date="2010-01">
-		<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
+		<nb_uniq_visitors_returning>2</nb_uniq_visitors_returning>
 		<nb_users_returning>0</nb_users_returning>
-		<nb_visits_returning>8</nb_visits_returning>
-		<nb_actions_returning>40</nb_actions_returning>
+		<nb_visits_returning>9</nb_visits_returning>
+		<nb_actions_returning>41</nb_actions_returning>
 		<nb_visits_converted_returning>0</nb_visits_converted_returning>
-		<bounce_count_returning>0</bounce_count_returning>
+		<bounce_count_returning>1</bounce_count_returning>
 		<sum_visit_length_returning>7208</sum_visit_length_returning>
 		<max_actions_returning>5</max_actions_returning>
-		<bounce_rate_returning>0%</bounce_rate_returning>
-		<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
-		<avg_time_on_site_returning>901</avg_time_on_site_returning>
+		<bounce_rate_returning>11%</bounce_rate_returning>
+		<nb_actions_per_visit_returning>4.6</nb_actions_per_visit_returning>
+		<avg_time_on_site_returning>801</avg_time_on_site_returning>
 	</result>
 	<result date="2010-02" />
 	<result date="2010-03" />
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml
index d44fe0f184..ac109df88c 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml
@@ -2,17 +2,17 @@
 <results>
 	<result date="From 2009-12-28 to 2010-01-03" />
 	<result date="From 2010-01-04 to 2010-01-10">
-		<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
+		<nb_uniq_visitors_returning>2</nb_uniq_visitors_returning>
 		<nb_users_returning>0</nb_users_returning>
-		<nb_visits_returning>6</nb_visits_returning>
-		<nb_actions_returning>30</nb_actions_returning>
+		<nb_visits_returning>7</nb_visits_returning>
+		<nb_actions_returning>31</nb_actions_returning>
 		<nb_visits_converted_returning>0</nb_visits_converted_returning>
-		<bounce_count_returning>0</bounce_count_returning>
+		<bounce_count_returning>1</bounce_count_returning>
 		<sum_visit_length_returning>5406</sum_visit_length_returning>
 		<max_actions_returning>5</max_actions_returning>
-		<bounce_rate_returning>0%</bounce_rate_returning>
-		<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
-		<avg_time_on_site_returning>901</avg_time_on_site_returning>
+		<bounce_rate_returning>14%</bounce_rate_returning>
+		<nb_actions_per_visit_returning>4.4</nb_actions_per_visit_returning>
+		<avg_time_on_site_returning>772</avg_time_on_site_returning>
 	</result>
 	<result date="From 2010-01-11 to 2010-01-17">
 		<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_year.xml
index a7e7659d80..c8ec57d870 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_year.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
 	<result date="2010">
-		<nb_visits_returning>8</nb_visits_returning>
-		<nb_actions_returning>40</nb_actions_returning>
+		<nb_visits_returning>9</nb_visits_returning>
+		<nb_actions_returning>41</nb_actions_returning>
 		<nb_visits_converted_returning>0</nb_visits_converted_returning>
-		<bounce_count_returning>0</bounce_count_returning>
+		<bounce_count_returning>1</bounce_count_returning>
 		<sum_visit_length_returning>7208</sum_visit_length_returning>
 		<max_actions_returning>5</max_actions_returning>
-		<bounce_rate_returning>0%</bounce_rate_returning>
-		<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
-		<avg_time_on_site_returning>901</avg_time_on_site_returning>
+		<bounce_rate_returning>11%</bounce_rate_returning>
+		<nb_actions_per_visit_returning>4.6</nb_actions_per_visit_returning>
+		<avg_time_on_site_returning>801</avg_time_on_site_returning>
 	</result>
 	<result date="2011" />
 	<result date="2012" />
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
index c5d48206a0..6cea847885 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
@@ -3,7 +3,7 @@
 	<result date="2010-01-03">
 		<row>
 			<label>New visits</label>
-			<nb_visits>1</nb_visits>
+			<nb_visits>2</nb_visits>
 		</row>
 		<row>
 			<label>0 days</label>
@@ -65,11 +65,11 @@
 	<result date="2010-01-04">
 		<row>
 			<label>New visits</label>
-			<nb_visits>1</nb_visits>
+			<nb_visits>0</nb_visits>
 		</row>
 		<row>
 			<label>0 days</label>
-			<nb_visits>0</nb_visits>
+			<nb_visits>1</nb_visits>
 		</row>
 		<row>
 			<label>1 day</label>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
index 617d79b103..1b7c0dccfe 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
@@ -7,7 +7,7 @@
 		</row>
 		<row>
 			<label>0 days</label>
-			<nb_visits>0</nb_visits>
+			<nb_visits>1</nb_visits>
 		</row>
 		<row>
 			<label>1 day</label>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml
index d657c3bad5..ccb87b955c 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml
@@ -3,7 +3,7 @@
 	<result date="From 2009-12-28 to 2010-01-03">
 		<row>
 			<label>New visits</label>
-			<nb_visits>1</nb_visits>
+			<nb_visits>2</nb_visits>
 		</row>
 		<row>
 			<label>0 days</label>
@@ -65,11 +65,11 @@
 	<result date="From 2010-01-04 to 2010-01-10">
 		<row>
 			<label>New visits</label>
-			<nb_visits>1</nb_visits>
+			<nb_visits>0</nb_visits>
 		</row>
 		<row>
 			<label>0 days</label>
-			<nb_visits>0</nb_visits>
+			<nb_visits>1</nb_visits>
 		</row>
 		<row>
 			<label>1 day</label>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_year.xml
index 491a6fce6e..0611694756 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_year.xml
@@ -7,7 +7,7 @@
 		</row>
 		<row>
 			<label>0 days</label>
-			<nb_visits>0</nb_visits>
+			<nb_visits>1</nb_visits>
 		</row>
 		<row>
 			<label>1 day</label>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml
index 057ccb1b63..d9dcb4da51 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
 	<result date="2010-01-03">
-		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_users>0</nb_users>
-		<nb_visits>1</nb_visits>
-		<nb_actions>1</nb_actions>
+		<nb_visits>2</nb_visits>
+		<nb_actions>2</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
-		<bounce_count>1</bounce_count>
+		<bounce_count>2</bounce_count>
 		<sum_visit_length>0</sum_visit_length>
 		<max_actions>1</max_actions>
 		<bounce_rate>100%</bounce_rate>
@@ -17,14 +17,14 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
-		<nb_actions>2</nb_actions>
+		<nb_actions>1</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
-		<bounce_count>0</bounce_count>
-		<sum_visit_length>361</sum_visit_length>
-		<max_actions>2</max_actions>
-		<bounce_rate>0%</bounce_rate>
-		<nb_actions_per_visit>2</nb_actions_per_visit>
-		<avg_time_on_site>361</avg_time_on_site>
+		<bounce_count>1</bounce_count>
+		<sum_visit_length>0</sum_visit_length>
+		<max_actions>1</max_actions>
+		<bounce_rate>100%</bounce_rate>
+		<nb_actions_per_visit>1</nb_actions_per_visit>
+		<avg_time_on_site>0</avg_time_on_site>
 	</result>
 	<result date="2010-01-05">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml
index 30c69614b1..4d3952de6d 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml
@@ -3,15 +3,15 @@
 	<result date="2010-01">
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_users>0</nb_users>
-		<nb_visits>10</nb_visits>
+		<nb_visits>11</nb_visits>
 		<nb_actions>43</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
-		<bounce_count>1</bounce_count>
-		<sum_visit_length>7569</sum_visit_length>
+		<bounce_count>3</bounce_count>
+		<sum_visit_length>7208</sum_visit_length>
 		<max_actions>5</max_actions>
-		<bounce_rate>10%</bounce_rate>
-		<nb_actions_per_visit>4.3</nb_actions_per_visit>
-		<avg_time_on_site>757</avg_time_on_site>
+		<bounce_rate>27%</bounce_rate>
+		<nb_actions_per_visit>3.9</nb_actions_per_visit>
+		<avg_time_on_site>655</avg_time_on_site>
 	</result>
 	<result date="2010-02" />
 	<result date="2010-03" />
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml
index bb7f2a5509..373cf49902 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
 	<result date="From 2009-12-28 to 2010-01-03">
-		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_users>0</nb_users>
-		<nb_visits>1</nb_visits>
-		<nb_actions>1</nb_actions>
+		<nb_visits>2</nb_visits>
+		<nb_actions>2</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
-		<bounce_count>1</bounce_count>
+		<bounce_count>2</bounce_count>
 		<sum_visit_length>0</sum_visit_length>
 		<max_actions>1</max_actions>
 		<bounce_rate>100%</bounce_rate>
@@ -17,14 +17,14 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_users>0</nb_users>
 		<nb_visits>7</nb_visits>
-		<nb_actions>32</nb_actions>
+		<nb_actions>31</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
-		<bounce_count>0</bounce_count>
-		<sum_visit_length>5767</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<sum_visit_length>5406</sum_visit_length>
 		<max_actions>5</max_actions>
-		<bounce_rate>0%</bounce_rate>
-		<nb_actions_per_visit>4.6</nb_actions_per_visit>
-		<avg_time_on_site>824</avg_time_on_site>
+		<bounce_rate>14%</bounce_rate>
+		<nb_actions_per_visit>4.4</nb_actions_per_visit>
+		<avg_time_on_site>772</avg_time_on_site>
 	</result>
 	<result date="From 2010-01-11 to 2010-01-17">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_year.xml
index 10e5329cb6..d0ed0b7b25 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_year.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
 	<result date="2010">
-		<nb_visits>10</nb_visits>
+		<nb_visits>11</nb_visits>
 		<nb_actions>43</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
-		<bounce_count>1</bounce_count>
-		<sum_visit_length>7569</sum_visit_length>
+		<bounce_count>3</bounce_count>
+		<sum_visit_length>7208</sum_visit_length>
 		<max_actions>5</max_actions>
-		<bounce_rate>10%</bounce_rate>
-		<nb_actions_per_visit>4.3</nb_actions_per_visit>
-		<avg_time_on_site>757</avg_time_on_site>
+		<bounce_rate>27%</bounce_rate>
+		<nb_actions_per_visit>3.9</nb_actions_per_visit>
+		<avg_time_on_site>655</avg_time_on_site>
 	</result>
 	<result date="2011" />
 	<result date="2012" />
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
index 67b84fe8b9..bab09c3b04 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
@@ -1,15 +1,15 @@
 All Websites dashboard
 label,nb_visits,nb_actions,nb_pageviews,revenue,nb_conversions,visits_evolution,actions_evolution,pageviews_evolution,revenue_evolution,nb_conversions_evolution,orders,ecommerce_revenue,orders_evolution,ecommerce_revenue_evolution
-Site 1,10,43,43,$ 0,0,100%,100%,100%,0%,0%,0,$ 0,0,0
+Site 1,11,43,43,$ 0,0,100%,100%,100%,0%,0%,0,$ 0,0,0
 Site 2,1,3,3,$ 0,0,100%,100%,100%,0%,0%,0,$ 0,0,0
 
 Visits Summary
-nb_uniq_visitors,nb_users,nb_visits,nb_actions,max_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate
-2,0,10,43,5,4.3,00:12:37,10%
+nb_uniq_visitors,nb_visits,nb_actions,max_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate
+2,11,43,5,3.9,00:10:55,27%
 
 Visits by Server Time
 label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue
-0h,1,2,2,00:06:01,0%,$ 0
+0h,1,1,1,00:00:00,100%,$ 0
 1h,0,0,0,00:00:00,0%,$ 0
 2h,0,0,0,00:00:00,0%,$ 0
 3h,0,0,0,00:00:00,0%,$ 0
@@ -32,7 +32,7 @@ label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,rev
 20h,0,0,0,00:00:00,0%,$ 0
 21h,0,0,0,00:00:00,0%,$ 0
 22h,0,0,0,00:00:00,0%,$ 0
-23h,0,0,0,00:00:00,0%,$ 0
+23h,1,1,1,00:00:00,100%,$ 0
 
 Visits by Local Time
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
@@ -48,7 +48,7 @@ label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site
 9h,0,0,0%,0,00:00:00,0%
 10h,0,0,0%,0,00:00:00,0%
 11h,0,0,0%,0,00:00:00,0%
-12h,10,43,0%,4.3,00:12:37,10%
+12h,11,43,0%,3.9,00:10:55,27%
 13h,0,0,0%,0,00:00:00,0%
 14h,0,0,0%,0,00:00:00,0%
 15h,0,0,0%,0,00:00:00,0%
@@ -63,24 +63,24 @@ label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site
 
 Visits by Day of Week
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Monday,2,7,0%,3.5,00:10:31,0%
+Monday,2,6,0%,3,00:07:31,50%
 Tuesday,2,10,0%,5,00:15:01,0%
 Wednesday,1,5,0%,5,00:15:01,0%
 Thursday,1,5,0%,5,00:15:01,0%
 Friday,1,5,0%,5,00:15:01,0%
 Saturday,1,5,0%,5,00:15:01,0%
-Sunday,2,6,0%,3,00:07:31,50%
+Sunday,3,7,0%,2.3,00:05:00,67%
 
 Screen Resolution
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
 800x300,9,41,0%,4.6,00:13:21,11%
-1024x768,1,2,0%,2,00:06:01,0%
+1024x768,2,2,0%,1,00:00:00,100%
 
 Browser Plugins
 label,nb_visits,nb_visits_percentage
-Cookie,10,100%
-Flash,10,100%
-Java,10,100%
+Cookie,11,100%
+Flash,11,100%
+Java,11,100%
 Director,0,0%
 Gears,0,0%
 Pdf,0,0%
@@ -92,18 +92,18 @@ Windowsmedia,0,0%
 Visitor Configuration
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
 Unknown / Unknown / 800x300,8,40,0%,5,00:15:01,0%
-Windows XP / Firefox / 1024x768,1,2,0%,2,00:06:01,0%
-Windows XP / Opera / 800x300,1,1,0%,1,00:00:00,100%
+Windows / Firefox / 1024x768,2,2,0%,1,00:00:00,100%
+Windows / Opera / 800x300,1,1,0%,1,00:00:00,100%
 
 Browser language
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
 Unknown,8,40,0%,5,00:15:01,0%
-French,2,3,0%,1.5,00:03:01,50%
+French,3,3,0%,1,00:00:00,100%
 
 Language code
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
 Unknown (xx),8,40,0%,5,00:15:01,0%
-French (fr),2,3,0%,1.5,00:03:01,50%
+French (fr),3,3,0%,1,00:00:00,100%
 
 Actions - Main metrics
 nb_pageviews,nb_uniq_pageviews,nb_downloads,nb_uniq_downloads,nb_outlinks,nb_uniq_outlinks,nb_searches,nb_keywords,avg_time_generation
@@ -111,18 +111,19 @@ nb_pageviews,nb_uniq_pageviews,nb_downloads,nb_uniq_downloads,nb_outlinks,nb_uni
 
 Page URLs
 label,nb_visits,nb_hits,bounce_rate,avg_time_on_page,exit_rate,avg_time_generation
-/index.htm,9,9,0%,00:05:20,0%,0.3s
+/index.htm,9,9,11%,00:05:20,11%,0.3s
 Page URL not defined,9,17,0%,00:00:00,0%,0.22s
 /thankyou,8,16,0%,00:06:00,100%,0.31s
 /products,1,1,100%,00:00:00,100%,0.15s
 
 Entry pages
 label,entry_nb_visits,entry_bounce_count,bounce_rate,avg_time_generation
-/index.htm,8,0,0%,0.3s
+/index.htm,9,1,11%,0.3s
 /products,1,1,100%,0.15s
 
 Exit pages
 label,nb_visits,exit_nb_visits,exit_rate,avg_time_generation
+/index.htm,9,1,11%,0.3s
 /thankyou,8,8,100%,0.31s
 /products,1,1,100%,0.15s
 
@@ -130,18 +131,18 @@ Page titles
 label,nb_visits,nb_hits,bounce_rate,avg_time_on_page,exit_rate,avg_time_generation
 second visitor,16,16,0%,00:07:30,0%,0.25s
 Checkout,8,8,0%,00:00:00,100%,0.45s
- first page view,2,2,100%,00:00:00,50%,0.14s
+ first page view,2,2,100%,00:00:00,100%,0.14s
 Page Name not defined,1,1,0%,00:00:00,0%,0.22s
 
 Entry page titles
 label,entry_nb_visits,entry_bounce_count,bounce_rate,avg_time_generation
 second visitor,8,0,0%,0.25s
- first page view,1,1,100%,0.14s
+ first page view,2,2,100%,0.14s
 
 Exit page titles
 label,nb_visits,exit_nb_visits,exit_rate,avg_time_generation
 Checkout,8,8,100%,0.45s
- first page view,2,1,50%,0.14s
+ first page view,2,2,100%,0.14s
 
 Outlinks
 No data available
@@ -181,21 +182,21 @@ No data available
 
 Referrer Type
 label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue
-Websites,5,22,4.4,00:13:13,0%,$ 0
+Websites,6,22,3.7,00:10:01,33%,$ 0
 Campaigns,4,20,5,00:15:01,0%,$ 0
 Direct Entry,1,1,1,00:00:00,100%,$ 0
 
 All Referrers
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
 goal-matching-url-parameter,4,20,0%,5,00:15:01,0%
-referrer.com,5,22,0%,4.4,00:13:13,0%
+referrer.com,6,22,0%,3.7,00:10:01,33%
 
 Keywords
 No data available
 
 Websites
 label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue
-referrer.com,5,22,4.4,00:13:13,0%,$ 0
+referrer.com,6,22,3.7,00:10:01,33%,$ 0
 
 Search Engines
 No data available
@@ -219,33 +220,33 @@ No data available
 
 Country
 label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue
-Unknown,8,40,5,00:15:01,0%,$ 0
-France,2,3,1.5,00:03:01,50%,$ 0
+Unknown,9,41,4.6,00:13:21,11%,$ 0
+France,2,2,1,00:00:00,100%,$ 0
 
 Continent
 label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue
-Unknown,8,40,5,00:15:01,0%,$ 0
-Europe,2,3,1.5,00:03:01,50%,$ 0
+Unknown,9,41,4.6,00:13:21,11%,$ 0
+Europe,2,2,1,00:00:00,100%,$ 0
 
 Region
 label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue
-Unknown,10,43,4.3,00:12:37,10%,$ 0
+Unknown,11,43,3.9,00:10:55,27%,$ 0
 
 City
 label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue
-Unknown,10,43,4.3,00:12:37,10%,$ 0
+Unknown,11,43,3.9,00:10:55,27%,$ 0
 
 Custom Variables
 No data available
 
 Length of Visits
 label,nb_visits
-0-10s,1
+0-10s,3
 11-30s,0
 31-60s,0
 1-2 min,0
 2-4 min,0
-4-7 min,1
+4-7 min,0
 7-10 min,0
 10-15 min,0
 15-30 min,8
@@ -253,8 +254,8 @@ label,nb_visits
 
 Pages per Visit
 label,nb_visits
-1 page,1
-2 pages,1
+1 page,3
+2 pages,0
 3 pages,0
 4 pages,0
 5 pages,8
@@ -266,8 +267,8 @@ label,nb_visits
 
 Visits by Visit Number
 label,nb_visits,nb_visits_percentage
-1 visit,2,20%
-2 visits,8,80%
+1 visit,3,27%
+2 visits,8,73%
 3 visits,0,0%
 4 visits,0,0%
 5 visits,0,0%
@@ -284,7 +285,7 @@ label,nb_visits,nb_visits_percentage
 Visits by days since last visit
 label,nb_visits
 New visits,2
-0 days,0
+0 days,1
 1 day,0
 2 days,1
 3 days,1
@@ -301,50 +302,50 @@ New visits,2
 
 Returning Visits
 nb_uniq_visitors_returning,nb_users_returning,nb_visits_returning,nb_actions_returning,max_actions_returning,bounce_rate_returning,nb_actions_per_visit_returning,avg_time_on_site_returning
-1,0,8,40,5,0%,5,00:15:01
+2,0,9,41,5,11%,4.6,00:13:21
 
 Provider
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Unknown,10,43,0%,4.3,00:12:37,10%
+Unknown,11,43,0%,3.9,00:10:55,27%
 
 Device type
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
 Unknown,8,40,0%,5,00:15:01,0%
-Desktop,2,3,0%,1.5,00:03:01,50%
+Desktop,3,3,0%,1,00:00:00,100%
 
 Visitor Browser
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
 Unknown,8,40,0%,5,00:15:01,0%
-Firefox,1,2,0%,2,00:06:01,0%
+Firefox,2,2,0%,1,00:00:00,100%
 Opera,1,1,0%,1,00:00:00,100%
 
 Device brand
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Unknown,10,43,0%,4.3,00:12:37,10%
+Unknown,11,43,0%,3.9,00:10:55,27%
+
+Device model
+label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
+Unknown,11,43,0%,3.9,00:10:55,27%
 
 Browser version
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
 Unknown,8,40,0%,5,00:15:01,0%
-Firefox 3.6,1,2,0%,2,00:06:01,0%
+Firefox 3.6,2,2,0%,1,00:00:00,100%
 Opera 9.63,1,1,0%,1,00:00:00,100%
 
-Device model
-label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Unknown,10,43,0%,4.3,00:12:37,10%
-
 Operating System families
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
 Unknown,8,40,0%,5,00:15:01,0%
-Windows,2,3,0%,1.5,00:03:01,50%
+Windows,3,3,0%,1,00:00:00,100%
 
 Operating System versions
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
 Unknown,8,40,0%,5,00:15:01,0%
-Windows XP,2,3,0%,1.5,00:03:01,50%
+Windows XP,3,3,0%,1,00:00:00,100%
 
 Browser engines
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
 Unknown,8,40,0%,5,00:15:01,0%
-Gecko (Firefox),1,2,0%,2,00:06:01,0%
+Gecko (Firefox),2,2,0%,1,00:00:00,100%
 Presto (Opera),1,1,0%,1,00:00:00,100%
 
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
index 8ca1417d42..b765ca6ef2 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
@@ -4713,7 +4713,7 @@
                                                     
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/UNK.gif'>
+                                                                                                                                        <img src='plugins/DevicesDetection/images/browsers/UNK.gif'>
                                         &nbsp;
                                                                                                             Unknown                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -4738,7 +4738,7 @@
                             
                                                                     <tr style="background-color: rgb(249,250,250)">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
+                                                                                                                                        <img src='plugins/DevicesDetection/images/browsers/FF.gif'>
                                         &nbsp;
                                                                                                             Firefox                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -4763,7 +4763,7 @@
                             
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/OP.gif'>
+                                                                                                                                        <img src='plugins/DevicesDetection/images/browsers/OP.gif'>
                                         &nbsp;
                                                                                                             Opera                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -4831,7 +4831,7 @@
                                                     
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/UNK.gif'>
+                                                                                                                                        <img src='plugins/DevicesDetection/images/browsers/UNK.gif'>
                                         &nbsp;
                                                                                                             Unknown                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -4856,7 +4856,7 @@
                             
                                                                     <tr style="background-color: rgb(249,250,250)">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
+                                                                                                                                        <img src='plugins/DevicesDetection/images/browsers/FF.gif'>
                                         &nbsp;
                                                                                                             Firefox 3.6                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -4881,7 +4881,7 @@
                             
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/OP.gif'>
+                                                                                                                                        <img src='plugins/DevicesDetection/images/browsers/OP.gif'>
                                         &nbsp;
                                                                                                             Opera 9.63                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -5015,7 +5015,7 @@
                                                     
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/UNK.gif'>
+                                                                                                                                        <img src='plugins/DevicesDetection/images/os/UNK.gif'>
                                         &nbsp;
                                                                                                             Unknown                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -5040,7 +5040,7 @@
                             
                                                                     <tr style="background-color: rgb(249,250,250)">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/WI7.gif'>
+                                                                                                                                        <img src='plugins/DevicesDetection/images/os/WIN.gif'>
                                         &nbsp;
                                                                                                             Windows                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -5108,7 +5108,7 @@
                                                     
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/UNK.gif'>
+                                                                                                                                        <img src='plugins/DevicesDetection/images/os/UNK.gif'>
                                         &nbsp;
                                                                                                             Unknown                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -5133,7 +5133,7 @@
                             
                                                                     <tr style="background-color: rgb(249,250,250)">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/WXP.gif'>
+                                                                                                                                        <img src='plugins/DevicesDetection/images/os/WIN.gif'>
                                         &nbsp;
                                                                                                             Windows XP                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
index 89c97c7ba3..83950954a4 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
@@ -2,11 +2,11 @@
 <head>
     <meta charset="utf-8">
 </head>
-<body style="color: rgb(68,68,68);">
+<body style="font-family: dejavusans; color: rgb(13,13,13);line-height: 1.33;">
 
 <a id="reportTop" rel="noreferrer" target="_blank" href=""><img title="Go to Piwik" border="0" alt="Piwik" src='plugins/Morpheus/images/logo-header.png'/></a>
 
-<h1 style="color: rgb(126,115,99); font-size: 11pt;">
+<h1 style="font-weight:normal; color: rgb(13,13,13); font-size: 24pt;">
     Site 1
 </h1>
 
@@ -15,5124 +15,5135 @@
 </p>
 
 
-    <h2 style="color: rgb(126,115,99); font-size: 11pt;">
+    <h2 style="font-weight:normal; color: rgb(13,13,13); font-size: 24pt;">
         Report list
     </h2>
     <ul>
                     <li>
-                <a href="#MultiSites_getAll" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#MultiSites_getAll" style="text-decoration:none; color: rgb(13,13,13);">
                     All Websites dashboard
                 </a>
             </li>
                     <li>
-                <a href="#VisitsSummary_get" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#VisitsSummary_get" style="text-decoration:none; color: rgb(13,13,13);">
                     Visits Summary
                 </a>
             </li>
                     <li>
-                <a href="#VisitTime_getVisitInformationPerServerTime" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#VisitTime_getVisitInformationPerServerTime" style="text-decoration:none; color: rgb(13,13,13);">
                     Visits by Server Time
                 </a>
             </li>
                     <li>
-                <a href="#VisitTime_getVisitInformationPerLocalTime" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#VisitTime_getVisitInformationPerLocalTime" style="text-decoration:none; color: rgb(13,13,13);">
                     Visits by Local Time
                 </a>
             </li>
                     <li>
-                <a href="#VisitTime_getByDayOfWeek" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#VisitTime_getByDayOfWeek" style="text-decoration:none; color: rgb(13,13,13);">
                     Visits by Day of Week
                 </a>
             </li>
                     <li>
-                <a href="#UserSettings_getResolution" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Resolution_getResolution" style="text-decoration:none; color: rgb(13,13,13);">
                     Screen Resolution
                 </a>
             </li>
                     <li>
-                <a href="#UserSettings_getPlugin" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#DevicePlugins_getPlugin" style="text-decoration:none; color: rgb(13,13,13);">
                     Browser Plugins
                 </a>
             </li>
                     <li>
-                <a href="#UserSettings_getConfiguration" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Resolution_getConfiguration" style="text-decoration:none; color: rgb(13,13,13);">
                     Visitor Configuration
                 </a>
             </li>
                     <li>
-                <a href="#UserSettings_getLanguage" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#UserLanguage_getLanguage" style="text-decoration:none; color: rgb(13,13,13);">
                     Browser language
                 </a>
             </li>
                     <li>
-                <a href="#UserSettings_getLanguageCode" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#UserLanguage_getLanguageCode" style="text-decoration:none; color: rgb(13,13,13);">
                     Language code
                 </a>
             </li>
                     <li>
-                <a href="#Actions_get" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Actions_get" style="text-decoration:none; color: rgb(13,13,13);">
                     Actions - Main metrics
                 </a>
             </li>
                     <li>
-                <a href="#Actions_getPageUrls" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Actions_getPageUrls" style="text-decoration:none; color: rgb(13,13,13);">
                     Page URLs
                 </a>
             </li>
                     <li>
-                <a href="#Actions_getEntryPageUrls" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Actions_getEntryPageUrls" style="text-decoration:none; color: rgb(13,13,13);">
                     Entry pages
                 </a>
             </li>
                     <li>
-                <a href="#Actions_getExitPageUrls" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Actions_getExitPageUrls" style="text-decoration:none; color: rgb(13,13,13);">
                     Exit pages
                 </a>
             </li>
                     <li>
-                <a href="#Actions_getPageTitles" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Actions_getPageTitles" style="text-decoration:none; color: rgb(13,13,13);">
                     Page titles
                 </a>
             </li>
                     <li>
-                <a href="#Actions_getEntryPageTitles" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Actions_getEntryPageTitles" style="text-decoration:none; color: rgb(13,13,13);">
                     Entry page titles
                 </a>
             </li>
                     <li>
-                <a href="#Actions_getExitPageTitles" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Actions_getExitPageTitles" style="text-decoration:none; color: rgb(13,13,13);">
                     Exit page titles
                 </a>
             </li>
                     <li>
-                <a href="#Actions_getOutlinks" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Actions_getOutlinks" style="text-decoration:none; color: rgb(13,13,13);">
                     Outlinks
                 </a>
             </li>
                     <li>
-                <a href="#Actions_getDownloads" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Actions_getDownloads" style="text-decoration:none; color: rgb(13,13,13);">
                     Downloads
                 </a>
             </li>
                     <li>
-                <a href="#Contents_getContentNames" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Contents_getContentNames" style="text-decoration:none; color: rgb(13,13,13);">
                     Content Name
                 </a>
             </li>
                     <li>
-                <a href="#Contents_getContentPieces" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Contents_getContentPieces" style="text-decoration:none; color: rgb(13,13,13);">
                     Content Piece
                 </a>
             </li>
                     <li>
-                <a href="#Events_getCategory" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Events_getCategory" style="text-decoration:none; color: rgb(13,13,13);">
                     Event Categories
                 </a>
             </li>
                     <li>
-                <a href="#Events_getAction" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Events_getAction" style="text-decoration:none; color: rgb(13,13,13);">
                     Event Actions
                 </a>
             </li>
                     <li>
-                <a href="#Events_getName" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Events_getName" style="text-decoration:none; color: rgb(13,13,13);">
                     Event Names
                 </a>
             </li>
                     <li>
-                <a href="#Actions_getSiteSearchKeywords" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Actions_getSiteSearchKeywords" style="text-decoration:none; color: rgb(13,13,13);">
                     Site Search Keywords
                 </a>
             </li>
                     <li>
-                <a href="#Actions_getSiteSearchNoResultKeywords" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Actions_getSiteSearchNoResultKeywords" style="text-decoration:none; color: rgb(13,13,13);">
                     Search Keywords with No Results
                 </a>
             </li>
                     <li>
-                <a href="#Actions_getSiteSearchCategories" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Actions_getSiteSearchCategories" style="text-decoration:none; color: rgb(13,13,13);">
                     Search Categories
                 </a>
             </li>
                     <li>
-                <a href="#Actions_getPageUrlsFollowingSiteSearch" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Actions_getPageUrlsFollowingSiteSearch" style="text-decoration:none; color: rgb(13,13,13);">
                     Pages Following a Site Search
                 </a>
             </li>
                     <li>
-                <a href="#Actions_getPageTitlesFollowingSiteSearch" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Actions_getPageTitlesFollowingSiteSearch" style="text-decoration:none; color: rgb(13,13,13);">
                     Page Titles Following a Site Search
                 </a>
             </li>
                     <li>
-                <a href="#Referrers_getReferrerType" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Referrers_getReferrerType" style="text-decoration:none; color: rgb(13,13,13);">
                     Referrer Type
                 </a>
             </li>
                     <li>
-                <a href="#Referrers_getAll" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Referrers_getAll" style="text-decoration:none; color: rgb(13,13,13);">
                     All Referrers
                 </a>
             </li>
                     <li>
-                <a href="#Referrers_getKeywords" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Referrers_getKeywords" style="text-decoration:none; color: rgb(13,13,13);">
                     Keywords
                 </a>
             </li>
                     <li>
-                <a href="#Referrers_getWebsites" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Referrers_getWebsites" style="text-decoration:none; color: rgb(13,13,13);">
                     Websites
                 </a>
             </li>
                     <li>
-                <a href="#Referrers_getSearchEngines" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Referrers_getSearchEngines" style="text-decoration:none; color: rgb(13,13,13);">
                     Search Engines
                 </a>
             </li>
                     <li>
-                <a href="#Referrers_getCampaigns" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Referrers_getCampaigns" style="text-decoration:none; color: rgb(13,13,13);">
                     Campaigns
                 </a>
             </li>
                     <li>
-                <a href="#Referrers_getSocials" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Referrers_getSocials" style="text-decoration:none; color: rgb(13,13,13);">
                     Social Networks
                 </a>
             </li>
                     <li>
-                <a href="#Goals_get" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Goals_get" style="text-decoration:none; color: rgb(13,13,13);">
                     Goals
                 </a>
             </li>
                     <li>
-                <a href="#Goals_getVisitsUntilConversion" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Goals_getVisitsUntilConversion" style="text-decoration:none; color: rgb(13,13,13);">
                     Visits to Conversion
                 </a>
             </li>
                     <li>
-                <a href="#Goals_getDaysToConversion" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Goals_getDaysToConversion" style="text-decoration:none; color: rgb(13,13,13);">
                     Days to Conversion
                 </a>
             </li>
                     <li>
-                <a href="#UserCountry_getCountry" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#UserCountry_getCountry" style="text-decoration:none; color: rgb(13,13,13);">
                     Country
                 </a>
             </li>
                     <li>
-                <a href="#UserCountry_getContinent" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#UserCountry_getContinent" style="text-decoration:none; color: rgb(13,13,13);">
                     Continent
                 </a>
             </li>
                     <li>
-                <a href="#UserCountry_getRegion" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#UserCountry_getRegion" style="text-decoration:none; color: rgb(13,13,13);">
                     Region
                 </a>
             </li>
                     <li>
-                <a href="#UserCountry_getCity" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#UserCountry_getCity" style="text-decoration:none; color: rgb(13,13,13);">
                     City
                 </a>
             </li>
                     <li>
-                <a href="#CustomVariables_getCustomVariables" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#CustomVariables_getCustomVariables" style="text-decoration:none; color: rgb(13,13,13);">
                     Custom Variables
                 </a>
             </li>
                     <li>
-                <a href="#VisitorInterest_getNumberOfVisitsPerVisitDuration" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#VisitorInterest_getNumberOfVisitsPerVisitDuration" style="text-decoration:none; color: rgb(13,13,13);">
                     Length of Visits
                 </a>
             </li>
                     <li>
-                <a href="#VisitorInterest_getNumberOfVisitsPerPage" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#VisitorInterest_getNumberOfVisitsPerPage" style="text-decoration:none; color: rgb(13,13,13);">
                     Pages per Visit
                 </a>
             </li>
                     <li>
-                <a href="#VisitorInterest_getNumberOfVisitsByVisitCount" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#VisitorInterest_getNumberOfVisitsByVisitCount" style="text-decoration:none; color: rgb(13,13,13);">
                     Visits by Visit Number
                 </a>
             </li>
                     <li>
-                <a href="#VisitorInterest_getNumberOfVisitsByDaysSinceLast" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#VisitorInterest_getNumberOfVisitsByDaysSinceLast" style="text-decoration:none; color: rgb(13,13,13);">
                     Visits by days since last visit
                 </a>
             </li>
                     <li>
-                <a href="#VisitFrequency_get" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#VisitFrequency_get" style="text-decoration:none; color: rgb(13,13,13);">
                     Returning Visits
                 </a>
             </li>
                     <li>
-                <a href="#Provider_getProvider" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Provider_getProvider" style="text-decoration:none; color: rgb(13,13,13);">
                     Provider
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getType" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#DevicesDetection_getType" style="text-decoration:none; color: rgb(13,13,13);">
                     Device type
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getBrowsers" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#DevicesDetection_getBrowsers" style="text-decoration:none; color: rgb(13,13,13);">
                     Visitor Browser
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getBrand" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#DevicesDetection_getBrand" style="text-decoration:none; color: rgb(13,13,13);">
                     Device brand
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);">
-                    Browser version
+                <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(13,13,13);">
+                    Device model
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(68,68,68);">
-                    Device model
+                <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(13,13,13);">
+                    Browser version
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: rgb(13,13,13);">
                     Operating System families
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getOsVersions" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#DevicesDetection_getOsVersions" style="text-decoration:none; color: rgb(13,13,13);">
                     Operating System versions
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getBrowserEngines" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#DevicesDetection_getBrowserEngines" style="text-decoration:none; color: rgb(13,13,13);">
                     Browser engines
                 </a>
             </li>
             </ul>
-<h2 id="MultiSites_getAll" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="MultiSites_getAll" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     All Websites dashboard
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Pageviews&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Revenue&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Ecommerce Orders&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Product Revenue&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Site 1                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                10
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                11
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 43
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 43
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Site 2                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="VisitsSummary_get" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="VisitsSummary_get" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Visits Summary
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Name&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Value&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Unique visitors                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                                                        Users                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0
-                                                                                    </td>
-                                    </tr>
-                            
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                10
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                11
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Actions                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 43
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Maximum actions in one visit                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Actions per Visit                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                4.3
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                3.9
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Avg. Visit Duration (in seconds)                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:12:37
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                00:10:55
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Bounce Rate                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                10%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                27%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="VisitTime_getVisitInformationPerServerTime" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="VisitTime_getVisitInformationPerServerTime" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Visits by Server Time
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Server time&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Revenue&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         0h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:06:01
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         1h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         2h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         3h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         4h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         5h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         6h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         7h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         8h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         9h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         10h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         11h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 8
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 40
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:15:01
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         12h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         13h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         14h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         15h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         16h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         17h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         18h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         19h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         20h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         21h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         22h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         23h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="VisitTime_getVisitInformationPerLocalTime" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="VisitTime_getVisitInformationPerLocalTime" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Visits by Local Time
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Local time&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         0h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         1h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         2h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         3h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         4h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         5h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         6h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         7h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         8h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         9h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         10h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         11h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         12h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                10
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                11
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 43
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                4.3
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                3.9
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:12:37
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                00:10:55
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                10%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                27%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         13h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         14h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         15h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         16h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         17h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         18h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         19h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         20h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         21h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         22h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         23h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="VisitTime_getByDayOfWeek" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="VisitTime_getByDayOfWeek" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Visits by Day of Week
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Day of the week&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Monday                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                7
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                6
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                3.5
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:10:31
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                00:07:31
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                50%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Tuesday                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 10
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:15:01
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Wednesday                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:15:01
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Thursday                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:15:01
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Friday                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:15:01
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Saturday                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:15:01
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Sunday                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                6
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                7
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                3
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                2.3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:07:31
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                00:05:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                50%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                67%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getResolution" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Resolution_getResolution" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Screen Resolution
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Resolution&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         800x300                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 9
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 41
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4.6
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:13:21
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 11%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         1024x768                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:06:01
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                00:00:00
+                                                                                    </td>
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getPlugin" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="DevicePlugins_getPlugin" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Browser Plugins
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Plugin&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;% Visits&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/plugins/cookie.gif'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicePlugins/images/plugins/cookie.gif'>
                                         &nbsp;
                                                                                                             Cookie                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                10
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                11
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/plugins/flash.gif'>
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicePlugins/images/plugins/flash.gif'>
                                         &nbsp;
                                                                                                             Flash                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                10
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                11
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/plugins/java.gif'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicePlugins/images/plugins/java.gif'>
                                         &nbsp;
                                                                                                             Java                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                10
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                11
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/plugins/director.gif'>
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicePlugins/images/plugins/director.gif'>
                                         &nbsp;
                                                                                                             Director                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/plugins/gears.gif'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicePlugins/images/plugins/gears.gif'>
                                         &nbsp;
                                                                                                             Gears                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/plugins/pdf.gif'>
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicePlugins/images/plugins/pdf.gif'>
                                         &nbsp;
                                                                                                             Pdf                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/plugins/quicktime.gif'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicePlugins/images/plugins/quicktime.gif'>
                                         &nbsp;
                                                                                                             Quicktime                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/plugins/realplayer.gif'>
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicePlugins/images/plugins/realplayer.gif'>
                                         &nbsp;
                                                                                                             Realplayer                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/plugins/silverlight.gif'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicePlugins/images/plugins/silverlight.gif'>
                                         &nbsp;
                                                                                                             Silverlight                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/plugins/windowsmedia.gif'>
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicePlugins/images/plugins/windowsmedia.gif'>
                                         &nbsp;
                                                                                                             Windowsmedia                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getConfiguration" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Resolution_getConfiguration" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Visitor Configuration
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Configuration&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Unknown / Unknown / 800x300                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 8
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 40
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:15:01
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                                                        Windows XP / Firefox / 1024x768                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                                                        Windows / Firefox / 1024x768                                                                                                                        </td>
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:06:01
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                100%
+                                                                                    </td>
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                                                        Windows XP / Opera / 800x300                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                                                        Windows / Opera / 800x300                                                                                                                        </td>
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getLanguage" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="UserLanguage_getLanguage" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Browser language
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Language&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 8
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 40
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:15:01
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         French                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1.5
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:03:01
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                50%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getLanguageCode" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="UserLanguage_getLanguageCode" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Language code
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Language&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Unknown (xx)                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 8
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 40
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:15:01
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         French (fr)                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1.5
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:03:01
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                50%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Actions_get" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Actions_get" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Actions - Main metrics
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Name&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Value&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Pageviews                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 43
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Unique Pageviews                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 27
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Downloads                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Unique Downloads                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Outlinks                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Unique Outlinks                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Searches                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Unique Keywords                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Avg. generation time                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0.3s
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Actions_getPageUrls" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Actions_getPageUrls" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Page URLs
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Page URL&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Pageviews&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Unique Pageviews&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. time on page&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Exit rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. generation time&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                                                            <a style="color: rgb(68,68,68);" href='http://example.org/index.htm'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                                                            <a style="color: rgb(13,13,13);" href='http://example.org/index.htm'>
                                                                         /index.htm                                                                            </a>
                                                                                                                         </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 9
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 9
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:05:20
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                11%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                11%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0.3s
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                                                            <a style="color: rgb(68,68,68);" href='http://'>
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                                                            <a style="color: rgb(13,13,13);" href='http://'>
                                                                         Page URL not defined                                                                            </a>
                                                                                                                         </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 17
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 9
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0.22s
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                                                            <a style="color: rgb(68,68,68);" href='http://example.org/thankyou'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                                                            <a style="color: rgb(13,13,13);" href='http://example.org/thankyou'>
                                                                         /thankyou                                                                            </a>
                                                                                                                         </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 16
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 8
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:06:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0.31s
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                                                            <a style="color: rgb(68,68,68);" href='http://example.org/products'>
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                                                            <a style="color: rgb(13,13,13);" href='http://example.org/products'>
                                                                         /products                                                                            </a>
                                                                                                                         </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0.15s
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Actions_getEntryPageUrls" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Actions_getEntryPageUrls" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Entry pages
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Entry Page URL&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Entrances&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounces&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. generation time&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                                                            <a style="color: rgb(68,68,68);" href='http://example.org/index.htm'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                                                            <a style="color: rgb(13,13,13);" href='http://example.org/index.htm'>
                                                                         /index.htm                                                                            </a>
                                                                                                                         </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                8
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                9
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                11%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0.3s
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                                                            <a style="color: rgb(68,68,68);" href='http://example.org/products'>
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                                                            <a style="color: rgb(13,13,13);" href='http://example.org/products'>
                                                                         /products                                                                            </a>
                                                                                                                         </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0.15s
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Actions_getExitPageUrls" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Actions_getExitPageUrls" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Exit pages
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Exit Page URL&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Exits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Unique Pageviews&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Exit rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. generation time&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                                                            <a style="color: rgb(68,68,68);" href='http://example.org/thankyou'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                                                            <a style="color: rgb(13,13,13);" href='http://example.org/index.htm'>
+                                                                        /index.htm                                                                            </a>
+                                                                                                                        </td>
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                1
+                                                                                    </td>
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                9
+                                                                                    </td>
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                11%
+                                                                                    </td>
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                0.3s
+                                                                                    </td>
+                                    </tr>
+                            
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                                                            <a style="color: rgb(13,13,13);" href='http://example.org/thankyou'>
                                                                         /thankyou                                                                            </a>
                                                                                                                         </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 8
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 8
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0.31s
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                                                            <a style="color: rgb(68,68,68);" href='http://example.org/products'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                                                            <a style="color: rgb(13,13,13);" href='http://example.org/products'>
                                                                         /products                                                                            </a>
                                                                                                                         </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0.15s
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Actions_getPageTitles" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Actions_getPageTitles" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Page titles
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Page Name&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Pageviews&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Unique Pageviews&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. time on page&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Exit rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. generation time&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         second visitor                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 16
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 16
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:07:30
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0.25s
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Checkout                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 8
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 8
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0.45s
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                          first page view                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                50%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0.14s
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Page Name not defined                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0.22s
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Actions_getEntryPageTitles" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Actions_getEntryPageTitles" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Entry page titles
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Entry Page title&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Entrances&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounces&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. generation time&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         second visitor                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 8
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0.25s
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                          first page view                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0.14s
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Actions_getExitPageTitles" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Actions_getExitPageTitles" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Exit page titles
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Exit Page Title&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Exits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Unique Pageviews&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Exit rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. generation time&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Checkout                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 8
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 8
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0.45s
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                          first page view                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                50%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0.14s
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Actions_getOutlinks" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Actions_getOutlinks" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Outlinks
 </h2>
 
     There is no data for this report.
-<h2 id="Actions_getDownloads" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Actions_getDownloads" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Downloads
 </h2>
 
     There is no data for this report.
-<h2 id="Contents_getContentNames" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Contents_getContentNames" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Content Name
 </h2>
 
     There is no data for this report.
-<h2 id="Contents_getContentPieces" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Contents_getContentPieces" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Content Piece
 </h2>
 
     There is no data for this report.
-<h2 id="Events_getCategory" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Events_getCategory" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Event Categories
 </h2>
 
     There is no data for this report.
-<h2 id="Events_getAction" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Events_getAction" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Event Actions
 </h2>
 
     There is no data for this report.
-<h2 id="Events_getName" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Events_getName" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Event Names
 </h2>
 
     There is no data for this report.
-<h2 id="Actions_getSiteSearchKeywords" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Actions_getSiteSearchKeywords" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Site Search Keywords
 </h2>
 
     There is no data for this report.
-<h2 id="Actions_getSiteSearchNoResultKeywords" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Actions_getSiteSearchNoResultKeywords" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Search Keywords with No Results
 </h2>
 
     There is no data for this report.
-<h2 id="Actions_getSiteSearchCategories" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Actions_getSiteSearchCategories" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Search Categories
 </h2>
 
     There is no data for this report.
-<h2 id="Actions_getPageUrlsFollowingSiteSearch" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Actions_getPageUrlsFollowingSiteSearch" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Pages Following a Site Search
 </h2>
 
     There is no data for this report.
-<h2 id="Actions_getPageTitlesFollowingSiteSearch" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Actions_getPageTitlesFollowingSiteSearch" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Page Titles Following a Site Search
 </h2>
 
     There is no data for this report.
-<h2 id="Referrers_getReferrerType" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Referrers_getReferrerType" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Referrer Type
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Referrer Type&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Revenue&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Websites                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                6
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 22
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                4.4
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                3.7
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:13:13
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                00:10:01
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                33%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Campaigns                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 20
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:15:01
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Direct Entry                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Referrers_getAll" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Referrers_getAll" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     All Referrers
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Referrer&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         goal-matching-url-parameter                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 20
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:15:01
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         referrer.com                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                6
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 22
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                4.4
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                3.7
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:13:13
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                00:10:01
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                33%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Referrers_getKeywords" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Referrers_getKeywords" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Keywords
 </h2>
 
     There is no data for this report.
-<h2 id="Referrers_getWebsites" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Referrers_getWebsites" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Websites
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Revenue&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         referrer.com                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                6
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 22
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                4.4
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                3.7
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:13:13
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                00:10:01
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                33%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Referrers_getSearchEngines" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Referrers_getSearchEngines" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Search Engines
 </h2>
 
     There is no data for this report.
-<h2 id="Referrers_getCampaigns" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Referrers_getCampaigns" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Campaigns
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Campaign&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Revenue&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         goal-matching-url-parameter                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 20
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:15:01
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Referrers_getSocials" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Referrers_getSocials" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Social Networks
 </h2>
 
     There is no data for this report.
-<h2 id="Goals_get" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Goals_get" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Goals
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Name&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Value&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Conversions                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Visits with Conversions                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Revenue                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Conversion Rate                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Goals_getVisitsUntilConversion" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Goals_getVisitsUntilConversion" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Visits to Conversion
 </h2>
 
     There is no data for this report.
-<h2 id="Goals_getDaysToConversion" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Goals_getDaysToConversion" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Days to Conversion
 </h2>
 
     There is no data for this report.
-<h2 id="UserCountry_getCountry" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="UserCountry_getCountry" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Country
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Country&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Revenue&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                         <img src='plugins/UserCountry/images/flags/xx.png'>
                                         &nbsp;
                                                                                                             Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                8
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                9
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                40
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                41
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                4.6
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:15:01
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                00:13:21
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                11%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                         <img src='plugins/UserCountry/images/flags/fr.png'>
                                         &nbsp;
                                                                                                             France                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                3
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1.5
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:03:01
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                50%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserCountry_getContinent" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="UserCountry_getContinent" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Continent
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Continent&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Revenue&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                8
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                9
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                40
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                41
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                4.6
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:15:01
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                00:13:21
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                11%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Europe                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                3
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1.5
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:03:01
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                50%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserCountry_getRegion" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="UserCountry_getRegion" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Region
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Region&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Revenue&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                         <img src='plugins/UserCountry/images/flags/xx.png'>
                                         &nbsp;
                                                                                                             Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                10
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                11
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 43
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                4.3
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                3.9
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:12:37
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                00:10:55
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                10%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                27%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserCountry_getCity" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="UserCountry_getCity" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     City
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;City&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Revenue&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                         <img src='plugins/UserCountry/images/flags/xx.png'>
                                         &nbsp;
                                                                                                             Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                10
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                11
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 43
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                4.3
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                3.9
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:12:37
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                00:10:55
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                10%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                27%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="CustomVariables_getCustomVariables" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="CustomVariables_getCustomVariables" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Custom Variables
 </h2>
 
     There is no data for this report.
-<h2 id="VisitorInterest_getNumberOfVisitsPerVisitDuration" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="VisitorInterest_getNumberOfVisitsPerVisitDuration" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Length of Visits
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visit duration&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         0-10s                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                3
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         11-30s                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         31-60s                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         1-2 min                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         2-4 min                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         4-7 min                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         7-10 min                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         10-15 min                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         15-30 min                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 8
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         30+ min                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="VisitorInterest_getNumberOfVisitsPerPage" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="VisitorInterest_getNumberOfVisitsPerPage" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Pages per Visit
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Pages per visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         1 page                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                3
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         2 pages                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         3 pages                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         4 pages                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         5 pages                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 8
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         6-7 pages                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         8-10 pages                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         11-14 pages                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         15-20 pages                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         21+ pages                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="VisitorInterest_getNumberOfVisitsByVisitCount" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="VisitorInterest_getNumberOfVisitsByVisitCount" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Visits by Visit Number
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits by Visit Number&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;% Visits&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         1 visit                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                20%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                27%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         2 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 8
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                80%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                73%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         3 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         4 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         5 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         6 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         7 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         8 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         9-14 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         15-25 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         26-50 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         51-100 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         101-200 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         201+ visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="VisitorInterest_getNumberOfVisitsByDaysSinceLast" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="VisitorInterest_getNumberOfVisitsByDaysSinceLast" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Visits by days since last visit
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits by days since last visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         New visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         0 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                1
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         1 day                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         2 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         3 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         4 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         5 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         6 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         7 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         8-14 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         15-30 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         31-60 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         61-120 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         121-364 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         365+ days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="VisitFrequency_get" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="VisitFrequency_get" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Returning Visits
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Name&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Value&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Unique returning visitors                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                2
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Returning Users                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Returning Visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                8
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                9
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Actions by Returning Visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                40
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                41
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Maximum actions in one returning visit                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Bounce Rate for Returning Visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                11%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Avg. Actions per Returning Visit                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                5
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                4.6
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Avg. Duration of a Returning Visit (in sec)                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:15:01
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                00:13:21
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Provider_getProvider" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Provider_getProvider" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Provider
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Provider&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                                                            <a style="color: rgb(68,68,68);" href='http://'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                                                            <a style="color: rgb(13,13,13);" href='http://'>
                                                                         Unknown                                                                            </a>
                                                                                                                         </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                10
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                11
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 43
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                4.3
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                3.9
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:12:37
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                00:10:55
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                10%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                27%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getType" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="DevicesDetection_getType" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Device type
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Device type&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                         <img src='plugins/DevicesDetection/images/screens/unknown.gif'>
                                         &nbsp;
                                                                                                             Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 8
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 40
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:15:01
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                         <img src='plugins/DevicesDetection/images/screens/normal.gif'>
                                         &nbsp;
                                                                                                             Desktop                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1.5
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:03:01
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                50%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getBrowsers" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="DevicesDetection_getBrowsers" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Visitor Browser
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Browser&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/UNK.gif'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicesDetection/images/browsers/UNK.gif'>
                                         &nbsp;
                                                                                                             Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 8
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 40
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:15:01
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicesDetection/images/browsers/FF.gif'>
                                         &nbsp;
                                                                                                             Firefox                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:06:01
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                100%
+                                                                                    </td>
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/OP.gif'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicesDetection/images/browsers/OP.gif'>
                                         &nbsp;
                                                                                                             Opera                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getBrand" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="DevicesDetection_getBrand" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Device brand
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Device brand&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                         <img src='plugins/DevicesDetection/images/brand/Unknown.ico'>
                                         &nbsp;
                                                                                                             Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                10
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                11
+                                                                                    </td>
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                43
+                                                                                    </td>
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                3.9
+                                                                                    </td>
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                00:10:55
+                                                                                    </td>
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                27%
+                                                                                    </td>
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                0%
+                                                                                    </td>
+                                    </tr>
+                        </tbody>
+        </table>
+        <br/>
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
+        Back to top
+    </a>
+<h2 id="DevicesDetection_getModel" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
+    Device model
+</h2>
+
+    
+    
+            <table style="border-collapse:collapse; margin-left: 5px;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
+                    &nbsp;Device model&nbsp;&nbsp;
+                </th>
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
+                    &nbsp;Visits&nbsp;&nbsp;
+                </th>
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
+                    &nbsp;Actions&nbsp;&nbsp;
+                </th>
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
+                    &nbsp;Actions per Visit&nbsp;&nbsp;
+                </th>
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
+                    &nbsp;Avg. Time on Website&nbsp;&nbsp;
+                </th>
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
+                    &nbsp;Bounce Rate&nbsp;&nbsp;
+                </th>
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
+                    &nbsp;Conversion Rate&nbsp;&nbsp;
+                </th>
+                        </thead>
+            <tbody>
+                                                    
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                                                        Unknown                                                                                                                        </td>
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                11
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 43
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                4.3
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                3.9
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:12:37
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                00:10:55
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                10%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                27%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Browser version
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Browser version&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/UNK.gif'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicesDetection/images/browsers/UNK.gif'>
                                         &nbsp;
                                                                                                             Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 8
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 40
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:15:01
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicesDetection/images/browsers/FF.gif'>
                                         &nbsp;
                                                                                                             Firefox 3.6                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:06:01
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                1
+                                                                                    </td>
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/OP.gif'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicesDetection/images/browsers/OP.gif'>
                                         &nbsp;
                                                                                                             Opera 9.63                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getModel" style="color: rgb(126,115,99); font-size: 11pt;">
-    Device model
-</h2>
-
-    
-    
-            <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
-                    &nbsp;Device model&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Visits&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Actions per Visit&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Avg. Time on Website&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Bounce Rate&nbsp;&nbsp;
-                </th>
-                            <th style="padding: 6px 0;">
-                    &nbsp;Conversion Rate&nbsp;&nbsp;
-                </th>
-                        </thead>
-            <tbody>
-                                                    
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                                                        Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                10
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                43
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                4.3
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:12:37
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                10%
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
-                                                                                    </td>
-                                    </tr>
-                        </tbody>
-        </table>
-        <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
-        Back to top
-    </a>
-<h2 id="DevicesDetection_getOsFamilies" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="DevicesDetection_getOsFamilies" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Operating System families
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Operating system family&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/UNK.gif'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicesDetection/images/os/UNK.gif'>
                                         &nbsp;
                                                                                                             Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 8
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 40
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:15:01
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/WI7.gif'>
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicesDetection/images/os/WIN.gif'>
                                         &nbsp;
                                                                                                             Windows                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1.5
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:03:01
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                50%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getOsVersions" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="DevicesDetection_getOsVersions" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Operating System versions
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Operating System versions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/UNK.gif'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicesDetection/images/os/UNK.gif'>
                                         &nbsp;
                                                                                                             Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 8
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 40
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:15:01
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/WXP.gif'>
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicesDetection/images/os/WIN.gif'>
                                         &nbsp;
                                                                                                             Windows XP                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                2
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1.5
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:03:01
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                50%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getBrowserEngines" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="DevicesDetection_getBrowserEngines" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Browser engines
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Browser engine&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 8
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 40
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:15:01
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Gecko (Firefox)                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
-                                                                                    </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                00:06:01
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                1
+                                                                                    </td>
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Presto (Opera)                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
 </body>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_month.original.sms.txt b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_month.original.sms.txt
index dd8d8a31dd..9012a16b8e 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_month.original.sms.txt
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_month.original.sms.txt
@@ -1 +1 @@
-2010, January. Site 1: 10 Visits (+100%), 43 Actions (+100%). Site 2: 1 Visits (+100%), 3 Actions (+100%)
\ No newline at end of file
+2010, January. Site 1: 11 Visits (+100%), 43 Actions (+100%). Site 2: 1 Visits (+100%), 3 Actions (+100%)
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_month.original.sms.txt b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_month.original.sms.txt
index 176db1187b..5e1a234843 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_month.original.sms.txt
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_month.original.sms.txt
@@ -1 +1 @@
-2010, January. 10 Visits (+100%), 43 Actions (+100%)
\ No newline at end of file
+2010, January. 11 Visits (+100%), 43 Actions (+100%)
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml
index 551c6e66c3..b68a0a14a1 100644
--- a/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml
@@ -12,11 +12,12 @@
 				<serverTimePretty>Sat 6 Mar 11:22:33</serverTimePretty>
 				<pageId>1</pageId>
 				<icon />
+				<timestamp>1267874553</timestamp>
 			</row>
 		</actionDetails>
 		<lastActionDateTime>2010-03-06 11:22:33</lastActionDateTime>
-		<actions>1</actions>
 		<userId />
+		<actions>1</actions>
 	</row>
 	<row>
 		<idVisit>2</idVisit>
@@ -32,6 +33,7 @@
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon />
+				<timestamp>1267874733</timestamp>
 			</row>
 			<row>
 				<type>action</type>
@@ -41,11 +43,12 @@
 				<serverTimePretty>Sat 6 Mar 11:28:33</serverTimePretty>
 				<pageId>3</pageId>
 				<icon />
+				<timestamp>1267874913</timestamp>
 			</row>
 		</actionDetails>
 		<lastActionDateTime>2010-03-06 11:28:33</lastActionDateTime>
-		<actions>2</actions>
 		<userId />
+		<actions>2</actions>
 	</row>
 	<row>
 		<idVisit>3</idVisit>
@@ -61,6 +64,7 @@
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<icon />
+				<timestamp>1267881393</timestamp>
 			</row>
 			<row>
 				<type>action</type>
@@ -72,6 +76,7 @@
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<icon />
+				<timestamp>1267881753</timestamp>
 			</row>
 			<row>
 				<type>action</type>
@@ -81,11 +86,12 @@
 				<serverTimePretty>Sat 6 Mar 13:28:33</serverTimePretty>
 				<pageId>6</pageId>
 				<icon />
+				<timestamp>1267882113</timestamp>
 			</row>
 		</actionDetails>
 		<lastActionDateTime>2010-03-06 13:28:33</lastActionDateTime>
-		<actions>3</actions>
 		<userId>email@example.com</userId>
+		<actions>3</actions>
 	</row>
 	<row>
 		<idVisit>4</idVisit>
@@ -99,11 +105,12 @@
 				<serverTimePretty>Sat 6 Mar 13:34:33</serverTimePretty>
 				<pageId>7</pageId>
 				<icon />
+				<timestamp>1267882473</timestamp>
 			</row>
 		</actionDetails>
 		<lastActionDateTime>2010-03-06 13:34:33</lastActionDateTime>
-		<actions>1</actions>
 		<userId>new-email@example.com</userId>
+		<actions>1</actions>
 	</row>
 	<row>
 		<idVisit>5</idVisit>
@@ -119,6 +126,7 @@
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<icon />
+				<timestamp>1267892553</timestamp>
 			</row>
 			<row>
 				<type>action</type>
@@ -128,6 +136,7 @@
 				<serverTimePretty>Sat 6 Mar 16:28:33</serverTimePretty>
 				<pageId>9</pageId>
 				<icon />
+				<timestamp>1267892913</timestamp>
 			</row>
 			<row>
 				<type>goal</type>
@@ -138,6 +147,7 @@
 				<serverTimePretty>Sat 6 Mar 16:34:33</serverTimePretty>
 				<url>http://example.org/home</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				<timestamp>1267893273</timestamp>
 			</row>
 			<row>
 				<type>ecommerceAbandonedCart</type>
@@ -154,11 +164,12 @@
 					</row>
 				</itemDetails>
 				<icon>plugins/Morpheus/images/ecommerceAbandonedCart.gif</icon>
+				<timestamp>1267893633</timestamp>
 			</row>
 		</actionDetails>
 		<lastActionDateTime>2010-03-06 16:40:33</lastActionDateTime>
-		<actions>2</actions>
 		<userId>new-email@example.com</userId>
+		<actions>2</actions>
 	</row>
 	<row>
 		<idVisit>6</idVisit>
@@ -172,11 +183,12 @@
 				<serverTimePretty>Sat 6 Mar 16:28:33</serverTimePretty>
 				<pageId>10</pageId>
 				<icon />
+				<timestamp>1267892913</timestamp>
 			</row>
 		</actionDetails>
 		<lastActionDateTime>2010-03-06 16:28:33</lastActionDateTime>
-		<actions>1</actions>
 		<userId />
+		<actions>1</actions>
 	</row>
 	<row>
 		<idVisit>7</idVisit>
@@ -190,11 +202,12 @@
 				<serverTimePretty>Sun 14 Mar 11:22:33</serverTimePretty>
 				<pageId>11</pageId>
 				<icon />
+				<timestamp>1268565753</timestamp>
 			</row>
 		</actionDetails>
 		<lastActionDateTime>2010-03-14 11:22:33</lastActionDateTime>
-		<actions>1</actions>
 		<userId>email@example.com</userId>
+		<actions>1</actions>
 	</row>
 	<row>
 		<idVisit>8</idVisit>
@@ -208,10 +221,11 @@
 				<serverTimePretty>Sun 14 Mar 11:46:33</serverTimePretty>
 				<pageId>12</pageId>
 				<icon />
+				<timestamp>1268567193</timestamp>
 			</row>
 		</actionDetails>
 		<lastActionDateTime>2010-03-14 11:46:33</lastActionDateTime>
-		<actions>1</actions>
 		<userId>new-user-id@one-weeklater</userId>
+		<actions>1</actions>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__Actions.getPageUrls_month.xml
index 2f10eb3f97..f48878ed7e 100644
--- a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__Actions.getPageUrls_month.xml
@@ -123,6 +123,7 @@
 			<bounce_rate>0%</bounce_rate>
 			<exit_rate>0%</exit_rate>
 			<url>http://example.org/Contact</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2FContact</segment>
 		</row>
 		<row>
 			<label>/Home</label>
@@ -134,6 +135,7 @@
 			<bounce_rate>0%</bounce_rate>
 			<exit_rate>0%</exit_rate>
 			<url>http://example.org/Home</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2FHome</segment>
 		</row>
 		<row>
 			<label>Contact</label>
diff --git a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml
index 89eec3fbc3..f48878ed7e 100644
--- a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml
@@ -1,6 +1,63 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
-	<result date="2010-01" />
+	<result date="2010-01">
+		<row>
+			<label>category</label>
+			<nb_visits>3</nb_visits>
+			<nb_hits>4</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<entry_nb_visits>1</entry_nb_visits>
+			<entry_nb_actions>4</entry_nb_actions>
+			<entry_sum_visit_length>1</entry_sum_visit_length>
+			<entry_bounce_count>0</entry_bounce_count>
+			<exit_nb_visits>1</exit_nb_visits>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>33%</exit_rate>
+			<subtable>
+				<row>
+					<label>/Page1</label>
+					<nb_visits>1</nb_visits>
+					<nb_hits>2</nb_hits>
+					<sum_time_spent>0</sum_time_spent>
+					<entry_nb_visits>1</entry_nb_visits>
+					<entry_nb_actions>4</entry_nb_actions>
+					<entry_sum_visit_length>1</entry_sum_visit_length>
+					<entry_bounce_count>0</entry_bounce_count>
+					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+					<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+					<avg_time_on_page>0</avg_time_on_page>
+					<bounce_rate>0%</bounce_rate>
+					<exit_rate>0%</exit_rate>
+					<url>http://example.org/category/Page1</url>
+				</row>
+				<row>
+					<label>/Page2</label>
+					<nb_visits>1</nb_visits>
+					<nb_hits>1</nb_hits>
+					<sum_time_spent>0</sum_time_spent>
+					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+					<avg_time_on_page>0</avg_time_on_page>
+					<bounce_rate>0%</bounce_rate>
+					<exit_rate>0%</exit_rate>
+					<url>http://example.org/category/Page2</url>
+				</row>
+				<row>
+					<label>/Pagexx</label>
+					<nb_visits>1</nb_visits>
+					<nb_hits>1</nb_hits>
+					<sum_time_spent>0</sum_time_spent>
+					<exit_nb_visits>1</exit_nb_visits>
+					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+					<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+					<avg_time_on_page>0</avg_time_on_page>
+					<bounce_rate>0%</bounce_rate>
+					<exit_rate>100%</exit_rate>
+					<url>http://example.org/category/Pagexx</url>
+				</row>
+			</subtable>
+		</row>
+	</result>
 	<result date="2010-02" />
 	<result date="2010-03">
 		<row>
@@ -66,6 +123,7 @@
 			<bounce_rate>0%</bounce_rate>
 			<exit_rate>0%</exit_rate>
 			<url>http://example.org/Contact</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2FContact</segment>
 		</row>
 		<row>
 			<label>/Home</label>
@@ -77,6 +135,7 @@
 			<bounce_rate>0%</bounce_rate>
 			<exit_rate>0%</exit_rate>
 			<url>http://example.org/Home</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2FHome</segment>
 		</row>
 		<row>
 			<label>Contact</label>
diff --git a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__VisitsSummary.get_month.xml
index d84e6c4f35..2f7ce19aa5 100644
--- a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__VisitsSummary.get_month.xml
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
-	<result date="2010-01" />
+	<result date="2010-01">
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_users>0</nb_users>
+		<nb_visits>1</nb_visits>
+		<nb_actions>4</nb_actions>
+		<nb_visits_converted>0</nb_visits_converted>
+		<bounce_count>0</bounce_count>
+		<sum_visit_length>1</sum_visit_length>
+		<max_actions>4</max_actions>
+		<bounce_rate>0%</bounce_rate>
+		<nb_actions_per_visit>4</nb_actions_per_visit>
+		<avg_time_on_site>1</avg_time_on_site>
+	</result>
 	<result date="2010-02" />
 	<result date="2010-03">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
diff --git a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml
index 401e8d2dc7..cd12df23f8 100644
--- a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml
@@ -124,6 +124,7 @@
 			<bounce_rate>0%</bounce_rate>
 			<exit_rate>0%</exit_rate>
 			<url>http://example.org/Contact</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2FContact</segment>
 		</row>
 		<row>
 			<label>/Home</label>
@@ -135,6 +136,7 @@
 			<bounce_rate>0%</bounce_rate>
 			<exit_rate>0%</exit_rate>
 			<url>http://example.org/Home</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2FHome</segment>
 		</row>
 		<row>
 			<label>Contact</label>
diff --git a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml
index aaef3a0ec5..cd12df23f8 100644
--- a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml
@@ -1,6 +1,63 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
-	<result date="2009-10" />
+	<result date="2009-10">
+		<row>
+			<label>category</label>
+			<nb_visits>3</nb_visits>
+			<nb_hits>5</nb_hits>
+			<sum_time_spent>360</sum_time_spent>
+			<entry_nb_visits>1</entry_nb_visits>
+			<entry_nb_actions>5</entry_nb_actions>
+			<entry_sum_visit_length>361</entry_sum_visit_length>
+			<entry_bounce_count>0</entry_bounce_count>
+			<exit_nb_visits>1</exit_nb_visits>
+			<avg_time_on_page>120</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>33%</exit_rate>
+			<subtable>
+				<row>
+					<label>/Page1</label>
+					<nb_visits>1</nb_visits>
+					<nb_hits>2</nb_hits>
+					<sum_time_spent>0</sum_time_spent>
+					<entry_nb_visits>1</entry_nb_visits>
+					<entry_nb_actions>5</entry_nb_actions>
+					<entry_sum_visit_length>361</entry_sum_visit_length>
+					<entry_bounce_count>0</entry_bounce_count>
+					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+					<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+					<avg_time_on_page>0</avg_time_on_page>
+					<bounce_rate>0%</bounce_rate>
+					<exit_rate>0%</exit_rate>
+					<url>http://example.org/category/Page1</url>
+				</row>
+				<row>
+					<label>/Page2</label>
+					<nb_visits>1</nb_visits>
+					<nb_hits>1</nb_hits>
+					<sum_time_spent>0</sum_time_spent>
+					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+					<avg_time_on_page>0</avg_time_on_page>
+					<bounce_rate>0%</bounce_rate>
+					<exit_rate>0%</exit_rate>
+					<url>http://example.org/category/Page2</url>
+				</row>
+				<row>
+					<label>/Pageyy</label>
+					<nb_visits>1</nb_visits>
+					<nb_hits>2</nb_hits>
+					<sum_time_spent>360</sum_time_spent>
+					<exit_nb_visits>1</exit_nb_visits>
+					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+					<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+					<avg_time_on_page>360</avg_time_on_page>
+					<bounce_rate>0%</bounce_rate>
+					<exit_rate>100%</exit_rate>
+					<url>http://example.org/category/Pageyy</url>
+				</row>
+			</subtable>
+		</row>
+	</result>
 	<result date="2009-11" />
 	<result date="2009-12" />
 	<result date="2010-01">
@@ -67,6 +124,7 @@
 			<bounce_rate>0%</bounce_rate>
 			<exit_rate>0%</exit_rate>
 			<url>http://example.org/Contact</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2FContact</segment>
 		</row>
 		<row>
 			<label>/Home</label>
@@ -78,6 +136,7 @@
 			<bounce_rate>0%</bounce_rate>
 			<exit_rate>0%</exit_rate>
 			<url>http://example.org/Home</url>
+			<segment>pageUrl==http%3A%2F%2Fexample.org%2FHome</segment>
 		</row>
 		<row>
 			<label>Contact</label>
diff --git a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__VisitsSummary.get_month.xml
index d046dca549..ed3e2b6ade 100644
--- a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__VisitsSummary.get_month.xml
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
-	<result date="2009-10" />
+	<result date="2009-10">
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_users>0</nb_users>
+		<nb_visits>1</nb_visits>
+		<nb_actions>5</nb_actions>
+		<nb_visits_converted>0</nb_visits_converted>
+		<bounce_count>0</bounce_count>
+		<sum_visit_length>361</sum_visit_length>
+		<max_actions>5</max_actions>
+		<bounce_rate>0%</bounce_rate>
+		<nb_actions_per_visit>5</nb_actions_per_visit>
+		<avg_time_on_site>361</avg_time_on_site>
+	</result>
 	<result date="2009-11" />
 	<result date="2009-12" />
 	<result date="2010-01">
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getDefaultMetricTranslations.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getDefaultMetricTranslations.xml
index a878da03dd..0993a20cd0 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getDefaultMetricTranslations.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getDefaultMetricTranslations.xml
@@ -48,15 +48,13 @@
 		<avg_time_generation>Avg. generation time</avg_time_generation>
 		<nb_pages_per_search>Search Results pages</nb_pages_per_search>
 		<nb_hits_following_search>Clicked in search results</nb_hits_following_search>
-		<nb_impressions>Impressions</nb_impressions>
-		<nb_interactions>Interactions</nb_interactions>
-		<interaction_rate>Interaction Rate</interaction_rate>
-		<nb_events>Total events</nb_events>
-		<sum_event_value>Total value</sum_event_value>
-		<min_event_value>Minimum value</min_event_value>
-		<max_event_value>Maximum value</max_event_value>
-		<avg_event_value>Average value</avg_event_value>
-		<nb_events_with_value>Events with a value</nb_events_with_value>
+		<visits_evolution>Visits Evolution</visits_evolution>
+		<actions_evolution>Actions Evolution</actions_evolution>
+		<pageviews_evolution>Pageviews Evolution</pageviews_evolution>
+		<revenue_evolution>Revenue Evolution</revenue_evolution>
+		<nb_conversions_evolution>Conversions Evolution</nb_conversions_evolution>
+		<orders_evolution>Ecommerce Orders Evolution</orders_evolution>
+		<ecommerce_revenue_evolution>Product Revenue Evolution</ecommerce_revenue_evolution>
 		<orders>Ecommerce Orders</orders>
 		<ecommerce_revenue>Product Revenue</ecommerce_revenue>
 		<revenue_per_visit>Revenue per Visit</revenue_per_visit>
@@ -68,14 +66,12 @@
 		<revenue_shipping>Shipping</revenue_shipping>
 		<revenue_discount>Discount</revenue_discount>
 		<avg_order_revenue>Average Order Value</avg_order_revenue>
-		<visits_evolution>Visits Evolution</visits_evolution>
-		<actions_evolution>Actions Evolution</actions_evolution>
-		<pageviews_evolution>Pageviews Evolution</pageviews_evolution>
-		<revenue_evolution>Revenue Evolution</revenue_evolution>
-		<nb_conversions_evolution>Conversions Evolution</nb_conversions_evolution>
-		<orders_evolution>Ecommerce Orders Evolution</orders_evolution>
-		<ecommerce_revenue_evolution>Product Revenue Evolution</ecommerce_revenue_evolution>
-		<nb_visits_percentage>% Visits</nb_visits_percentage>
+		<nb_events>Total events</nb_events>
+		<sum_event_value>Total value</sum_event_value>
+		<min_event_value>Minimum value</min_event_value>
+		<max_event_value>Maximum value</max_event_value>
+		<avg_event_value>Average value</avg_event_value>
+		<nb_events_with_value>Events with a value</nb_events_with_value>
 		<nb_visits_returning>Returning Visits</nb_visits_returning>
 		<nb_actions_returning>Actions by Returning Visits</nb_actions_returning>
 		<avg_time_on_site_returning>Avg. Duration of a Returning Visit (in sec)</avg_time_on_site_returning>
@@ -83,5 +79,9 @@
 		<nb_actions_per_visit_returning>Avg. Actions per Returning Visit</nb_actions_per_visit_returning>
 		<nb_uniq_visitors_returning>Unique returning visitors</nb_uniq_visitors_returning>
 		<nb_users_returning>Returning Users</nb_users_returning>
+		<nb_impressions>Impressions</nb_impressions>
+		<nb_interactions>Interactions</nb_interactions>
+		<interaction_rate>Interaction Rate</interaction_rate>
+		<nb_visits_percentage>% Visits</nb_visits_percentage>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml
index f08e134ae6..3d396ecdb8 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml
@@ -61,6 +61,7 @@
 		<row>
 			<code>fr</code>
 			<logo>plugins/UserCountry/images/flags/fr.png</logo>
+			<segment>countryCode==fr</segment>
 			<logoWidth>16</logoWidth>
 			<logoHeight>11</logoHeight>
 		</row>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
index 90ebe565a7..efa250ecf4 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
@@ -192,7 +192,7 @@
 	<row>
 		<category>Visitor Settings</category>
 		<name>Screen Resolution</name>
-		<module>UserSettings</module>
+		<module>Resolution</module>
 		<action>getResolution</action>
 		<dimension>Resolution</dimension>
 		<metrics>
@@ -213,14 +213,14 @@
 			<bounce_rate>Bounce Rate</bounce_rate>
 			<conversion_rate>Conversion Rate</conversion_rate>
 		</processedMetrics>
-		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserSettings&amp;apiAction=getResolution&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
-		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserSettings&amp;apiAction=getResolution&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
-		<uniqueId>UserSettings_getResolution</uniqueId>
+		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=Resolution&amp;apiAction=getResolution&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
+		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=Resolution&amp;apiAction=getResolution&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
+		<uniqueId>Resolution_getResolution</uniqueId>
 	</row>
 	<row>
 		<category>Visitor Settings</category>
 		<name>Browser Plugins</name>
-		<module>UserSettings</module>
+		<module>DevicePlugins</module>
 		<action>getPlugin</action>
 		<dimension>Plugin</dimension>
 		<documentation>This report shows which browser plugins your visitors had enabled. This information might be important for choosing the right way to deliver your content.</documentation>
@@ -234,13 +234,13 @@
 			<nb_visits_percentage>% Visits</nb_visits_percentage>
 		</processedMetrics>
 		<constantRowsCount>1</constantRowsCount>
-		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserSettings&amp;apiAction=getPlugin&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
-		<uniqueId>UserSettings_getPlugin</uniqueId>
+		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicePlugins&amp;apiAction=getPlugin&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
+		<uniqueId>DevicePlugins_getPlugin</uniqueId>
 	</row>
 	<row>
 		<category>Visitor Settings</category>
 		<name>Visitor Configuration</name>
-		<module>UserSettings</module>
+		<module>Resolution</module>
 		<action>getConfiguration</action>
 		<dimension>Configuration</dimension>
 		<documentation>This report shows the most common overall configurations that your visitors had. A configuration is the combination of an operating system, a browser type and a screen resolution.</documentation>
@@ -262,14 +262,14 @@
 			<bounce_rate>Bounce Rate</bounce_rate>
 			<conversion_rate>Conversion Rate</conversion_rate>
 		</processedMetrics>
-		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserSettings&amp;apiAction=getConfiguration&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
-		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserSettings&amp;apiAction=getConfiguration&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
-		<uniqueId>UserSettings_getConfiguration</uniqueId>
+		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=Resolution&amp;apiAction=getConfiguration&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
+		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=Resolution&amp;apiAction=getConfiguration&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
+		<uniqueId>Resolution_getConfiguration</uniqueId>
 	</row>
 	<row>
 		<category>Visitor Settings</category>
 		<name>Browser language</name>
-		<module>UserSettings</module>
+		<module>UserLanguage</module>
 		<action>getLanguage</action>
 		<dimension>Language</dimension>
 		<metrics>
@@ -290,14 +290,14 @@
 			<bounce_rate>Bounce Rate</bounce_rate>
 			<conversion_rate>Conversion Rate</conversion_rate>
 		</processedMetrics>
-		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserSettings&amp;apiAction=getLanguage&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
-		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserSettings&amp;apiAction=getLanguage&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
-		<uniqueId>UserSettings_getLanguage</uniqueId>
+		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserLanguage&amp;apiAction=getLanguage&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
+		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserLanguage&amp;apiAction=getLanguage&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
+		<uniqueId>UserLanguage_getLanguage</uniqueId>
 	</row>
 	<row>
 		<category>Visitor Settings</category>
 		<name>Language code</name>
-		<module>UserSettings</module>
+		<module>UserLanguage</module>
 		<action>getLanguageCode</action>
 		<dimension>Language</dimension>
 		<metrics>
@@ -318,9 +318,9 @@
 			<bounce_rate>Bounce Rate</bounce_rate>
 			<conversion_rate>Conversion Rate</conversion_rate>
 		</processedMetrics>
-		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserSettings&amp;apiAction=getLanguageCode&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
-		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserSettings&amp;apiAction=getLanguageCode&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
-		<uniqueId>UserSettings_getLanguageCode</uniqueId>
+		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserLanguage&amp;apiAction=getLanguageCode&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
+		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserLanguage&amp;apiAction=getLanguageCode&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
+		<uniqueId>UserLanguage_getLanguageCode</uniqueId>
 	</row>
 	<row>
 		<category>API</category>
@@ -339,16 +339,16 @@
 			<nb_conversions>Conversions</nb_conversions>
 			<nb_visits_converted>Visits with Conversions</nb_visits_converted>
 			<revenue>Revenue</revenue>
-			<nb_visits_returning>Returning Visits</nb_visits_returning>
-			<nb_actions_returning>Actions by Returning Visits</nb_actions_returning>
-			<nb_uniq_visitors_returning>Unique returning visitors</nb_uniq_visitors_returning>
-			<nb_users_returning>Returning Users</nb_users_returning>
-			<max_actions_returning>Maximum actions in one returning visit</max_actions_returning>
 			<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
 			<nb_visits>Visits</nb_visits>
 			<nb_users>Users</nb_users>
 			<nb_actions>Actions</nb_actions>
 			<max_actions>Maximum actions in one visit</max_actions>
+			<nb_visits_returning>Returning Visits</nb_visits_returning>
+			<nb_actions_returning>Actions by Returning Visits</nb_actions_returning>
+			<nb_uniq_visitors_returning>Unique returning visitors</nb_uniq_visitors_returning>
+			<nb_users_returning>Returning Users</nb_users_returning>
+			<max_actions_returning>Maximum actions in one returning visit</max_actions_returning>
 		</metrics>
 		<metricsDocumentation>
 			<nb_pageviews>The number of times this page was visited.</nb_pageviews>
@@ -371,12 +371,12 @@
 		<processedMetrics>
 			<avg_time_generation>Avg. generation time</avg_time_generation>
 			<conversion_rate>Conversion Rate</conversion_rate>
-			<avg_time_on_site_returning>Avg. Duration of a Returning Visit (in sec)</avg_time_on_site_returning>
-			<nb_actions_per_visit_returning>Avg. Actions per Returning Visit</nb_actions_per_visit_returning>
-			<bounce_rate_returning>Bounce Rate for Returning Visits</bounce_rate_returning>
 			<bounce_rate>Bounce Rate</bounce_rate>
 			<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
 			<avg_time_on_site>Avg. Visit Duration (in seconds)</avg_time_on_site>
+			<avg_time_on_site_returning>Avg. Duration of a Returning Visit (in sec)</avg_time_on_site_returning>
+			<nb_actions_per_visit_returning>Avg. Actions per Returning Visit</nb_actions_per_visit_returning>
+			<bounce_rate_returning>Bounce Rate for Returning Visits</bounce_rate_returning>
 		</processedMetrics>
 		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=API&amp;apiAction=get&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphUrl>
 		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=API&amp;apiAction=get&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
@@ -1865,10 +1865,10 @@
 	</row>
 	<row>
 		<category>Visitor Devices</category>
-		<name>Device model</name>
+		<name>Browser version</name>
 		<module>DevicesDetection</module>
-		<action>getModel</action>
-		<dimension>Device model</dimension>
+		<action>getBrowserVersions</action>
+		<dimension>Browser version</dimension>
 		<metrics>
 			<nb_visits>Visits</nb_visits>
 			<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
@@ -1887,16 +1887,16 @@
 			<bounce_rate>Bounce Rate</bounce_rate>
 			<conversion_rate>Conversion Rate</conversion_rate>
 		</processedMetrics>
-		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getModel&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
-		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getModel&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
-		<uniqueId>DevicesDetection_getModel</uniqueId>
+		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowserVersions&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
+		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowserVersions&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
+		<uniqueId>DevicesDetection_getBrowserVersions</uniqueId>
 	</row>
 	<row>
 		<category>Visitor Devices</category>
-		<name>Browser version</name>
+		<name>Device model</name>
 		<module>DevicesDetection</module>
-		<action>getBrowserVersions</action>
-		<dimension>Browser version</dimension>
+		<action>getModel</action>
+		<dimension>Device model</dimension>
 		<metrics>
 			<nb_visits>Visits</nb_visits>
 			<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
@@ -1915,9 +1915,9 @@
 			<bounce_rate>Bounce Rate</bounce_rate>
 			<conversion_rate>Conversion Rate</conversion_rate>
 		</processedMetrics>
-		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowserVersions&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
-		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getBrowserVersions&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
-		<uniqueId>DevicesDetection_getBrowserVersions</uniqueId>
+		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getModel&amp;period=day&amp;date=2009-01-04</imageGraphUrl>
+		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=DevicesDetection&amp;apiAction=getModel&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
+		<uniqueId>DevicesDetection_getModel</uniqueId>
 	</row>
 	<row>
 		<category>Visitor Devices</category>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
index 10e7fd78e3..add85693bb 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
@@ -134,7 +134,7 @@
 		<category>Visit</category>
 		<name>Device type</name>
 		<segment>deviceType</segment>
-		<acceptedValues>desktop, smartphone, tablet, feature phone, console, tv, car browser, smart display, camera</acceptedValues>
+		<acceptedValues>desktop, smartphone, tablet, feature phone, console, tv, car browser, smart display, camera, portable media player</acceptedValues>
 	</row>
 	<row>
 		<type>dimension</type>
@@ -148,7 +148,14 @@
 		<category>Visit</category>
 		<name>Operating system</name>
 		<segment>operatingSystemCode</segment>
-		<acceptedValues>WXP, WI7, MAC, LIN, AND, IPD, etc.</acceptedValues>
+		<acceptedValues>WIN, MAC, LIN, AND, IPD, etc.</acceptedValues>
+	</row>
+	<row>
+		<type>dimension</type>
+		<category>Visit</category>
+		<name>Operating system version</name>
+		<segment>operatingSystemVersion</segment>
+		<acceptedValues>XP, 7, 2.3, 5.1, ...</acceptedValues>
 	</row>
 	<row>
 		<type>dimension</type>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_phpRenderer__API.getDefaultMetricTranslations.php b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_phpRenderer__API.getDefaultMetricTranslations.php
index 008dacefe9..a8879a686c 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_phpRenderer__API.getDefaultMetricTranslations.php
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_phpRenderer__API.getDefaultMetricTranslations.php
@@ -1 +1 @@
-a:1:{i:0;a:82:{s:9:"nb_visits";s:6:"Visits";s:16:"nb_uniq_visitors";s:15:"Unique visitors";s:10:"nb_actions";s:7:"Actions";s:8:"nb_users";s:5:"Users";s:20:"nb_actions_per_visit";s:17:"Actions per Visit";s:16:"avg_time_on_site";s:20:"Avg. Time on Website";s:11:"bounce_rate";s:11:"Bounce Rate";s:15:"conversion_rate";s:15:"Conversion Rate";s:5:"label";s:5:"Label";s:4:"date";s:4:"Date";s:16:"avg_time_on_page";s:17:"Avg. time on page";s:14:"sum_time_spent";s:41:"Total time spent by visitors (in seconds)";s:16:"sum_visit_length";s:41:"Total time spent by visitors (in seconds)";s:12:"bounce_count";s:7:"Bounces";s:22:"bounce_count_returning";s:33:"Bounce Count for Returning Visits";s:11:"max_actions";s:28:"Maximum actions in one visit";s:21:"max_actions_returning";s:38:"Maximum actions in one returning visit";s:29:"nb_visits_converted_returning";s:36:"Number of converted returning visits";s:26:"sum_visit_length_returning";s:51:"Total time spent by returning visitors (in seconds)";s:19:"nb_visits_converted";s:23:"Visits with Conversions";s:14:"nb_conversions";s:11:"Conversions";s:7:"revenue";s:7:"Revenue";s:7:"nb_hits";s:9:"Pageviews";s:15:"entry_nb_visits";s:9:"Entrances";s:22:"entry_nb_uniq_visitors";s:16:"Unique entrances";s:14:"exit_nb_visits";s:5:"Exits";s:21:"exit_nb_uniq_visitors";s:12:"Unique exits";s:18:"entry_bounce_count";s:7:"Bounces";s:17:"exit_bounce_count";s:7:"Bounces";s:9:"exit_rate";s:9:"Exit rate";s:26:"sum_daily_nb_uniq_visitors";s:27:"Unique visitors (daily sum)";s:18:"sum_daily_nb_users";s:17:"Users (daily sum)";s:32:"sum_daily_entry_nb_uniq_visitors";s:28:"Unique entrances (daily sum)";s:31:"sum_daily_exit_nb_uniq_visitors";s:24:"Unique exits (daily sum)";s:16:"entry_nb_actions";s:27:"Actions after entering here";s:22:"entry_sum_visit_length";s:61:"Total time spent by visitors (in seconds) after entering here";s:12:"nb_pageviews";s:9:"Pageviews";s:17:"nb_uniq_pageviews";s:16:"Unique Pageviews";s:12:"nb_downloads";s:9:"Downloads";s:17:"nb_uniq_downloads";s:16:"Unique Downloads";s:11:"nb_outlinks";s:8:"Outlinks";s:16:"nb_uniq_outlinks";s:15:"Unique Outlinks";s:11:"nb_searches";s:8:"Searches";s:11:"nb_keywords";s:15:"Unique Keywords";s:19:"avg_time_generation";s:20:"Avg. generation time";s:19:"nb_pages_per_search";s:20:"Search Results pages";s:24:"nb_hits_following_search";s:25:"Clicked in search results";s:14:"nb_impressions";s:11:"Impressions";s:15:"nb_interactions";s:12:"Interactions";s:16:"interaction_rate";s:16:"Interaction Rate";s:9:"nb_events";s:12:"Total events";s:15:"sum_event_value";s:11:"Total value";s:15:"min_event_value";s:13:"Minimum value";s:15:"max_event_value";s:13:"Maximum value";s:15:"avg_event_value";s:13:"Average value";s:20:"nb_events_with_value";s:19:"Events with a value";s:6:"orders";s:16:"Ecommerce Orders";s:17:"ecommerce_revenue";s:15:"Product Revenue";s:17:"revenue_per_visit";s:17:"Revenue per Visit";s:8:"quantity";s:8:"Quantity";s:9:"avg_price";s:13:"Average Price";s:12:"avg_quantity";s:16:"Average Quantity";s:16:"revenue_subtotal";s:8:"Subtotal";s:11:"revenue_tax";s:3:"Tax";s:16:"revenue_shipping";s:8:"Shipping";s:16:"revenue_discount";s:8:"Discount";s:17:"avg_order_revenue";s:19:"Average Order Value";s:16:"visits_evolution";s:16:"Visits Evolution";s:17:"actions_evolution";s:17:"Actions Evolution";s:19:"pageviews_evolution";s:19:"Pageviews Evolution";s:17:"revenue_evolution";s:17:"Revenue Evolution";s:24:"nb_conversions_evolution";s:21:"Conversions Evolution";s:16:"orders_evolution";s:26:"Ecommerce Orders Evolution";s:27:"ecommerce_revenue_evolution";s:25:"Product Revenue Evolution";s:20:"nb_visits_percentage";s:8:"% Visits";s:19:"nb_visits_returning";s:16:"Returning Visits";s:20:"nb_actions_returning";s:27:"Actions by Returning Visits";s:26:"avg_time_on_site_returning";s:43:"Avg. Duration of a Returning Visit (in sec)";s:21:"bounce_rate_returning";s:32:"Bounce Rate for Returning Visits";s:30:"nb_actions_per_visit_returning";s:32:"Avg. Actions per Returning Visit";s:26:"nb_uniq_visitors_returning";s:25:"Unique returning visitors";s:18:"nb_users_returning";s:15:"Returning Users";}}
\ No newline at end of file
+a:1:{i:0;a:82:{s:9:"nb_visits";s:6:"Visits";s:16:"nb_uniq_visitors";s:15:"Unique visitors";s:10:"nb_actions";s:7:"Actions";s:8:"nb_users";s:5:"Users";s:20:"nb_actions_per_visit";s:17:"Actions per Visit";s:16:"avg_time_on_site";s:20:"Avg. Time on Website";s:11:"bounce_rate";s:11:"Bounce Rate";s:15:"conversion_rate";s:15:"Conversion Rate";s:5:"label";s:5:"Label";s:4:"date";s:4:"Date";s:16:"avg_time_on_page";s:17:"Avg. time on page";s:14:"sum_time_spent";s:41:"Total time spent by visitors (in seconds)";s:16:"sum_visit_length";s:41:"Total time spent by visitors (in seconds)";s:12:"bounce_count";s:7:"Bounces";s:22:"bounce_count_returning";s:33:"Bounce Count for Returning Visits";s:11:"max_actions";s:28:"Maximum actions in one visit";s:21:"max_actions_returning";s:38:"Maximum actions in one returning visit";s:29:"nb_visits_converted_returning";s:36:"Number of converted returning visits";s:26:"sum_visit_length_returning";s:51:"Total time spent by returning visitors (in seconds)";s:19:"nb_visits_converted";s:23:"Visits with Conversions";s:14:"nb_conversions";s:11:"Conversions";s:7:"revenue";s:7:"Revenue";s:7:"nb_hits";s:9:"Pageviews";s:15:"entry_nb_visits";s:9:"Entrances";s:22:"entry_nb_uniq_visitors";s:16:"Unique entrances";s:14:"exit_nb_visits";s:5:"Exits";s:21:"exit_nb_uniq_visitors";s:12:"Unique exits";s:18:"entry_bounce_count";s:7:"Bounces";s:17:"exit_bounce_count";s:7:"Bounces";s:9:"exit_rate";s:9:"Exit rate";s:26:"sum_daily_nb_uniq_visitors";s:27:"Unique visitors (daily sum)";s:18:"sum_daily_nb_users";s:17:"Users (daily sum)";s:32:"sum_daily_entry_nb_uniq_visitors";s:28:"Unique entrances (daily sum)";s:31:"sum_daily_exit_nb_uniq_visitors";s:24:"Unique exits (daily sum)";s:16:"entry_nb_actions";s:27:"Actions after entering here";s:22:"entry_sum_visit_length";s:61:"Total time spent by visitors (in seconds) after entering here";s:12:"nb_pageviews";s:9:"Pageviews";s:17:"nb_uniq_pageviews";s:16:"Unique Pageviews";s:12:"nb_downloads";s:9:"Downloads";s:17:"nb_uniq_downloads";s:16:"Unique Downloads";s:11:"nb_outlinks";s:8:"Outlinks";s:16:"nb_uniq_outlinks";s:15:"Unique Outlinks";s:11:"nb_searches";s:8:"Searches";s:11:"nb_keywords";s:15:"Unique Keywords";s:19:"avg_time_generation";s:20:"Avg. generation time";s:19:"nb_pages_per_search";s:20:"Search Results pages";s:24:"nb_hits_following_search";s:25:"Clicked in search results";s:16:"visits_evolution";s:16:"Visits Evolution";s:17:"actions_evolution";s:17:"Actions Evolution";s:19:"pageviews_evolution";s:19:"Pageviews Evolution";s:17:"revenue_evolution";s:17:"Revenue Evolution";s:24:"nb_conversions_evolution";s:21:"Conversions Evolution";s:16:"orders_evolution";s:26:"Ecommerce Orders Evolution";s:27:"ecommerce_revenue_evolution";s:25:"Product Revenue Evolution";s:6:"orders";s:16:"Ecommerce Orders";s:17:"ecommerce_revenue";s:15:"Product Revenue";s:17:"revenue_per_visit";s:17:"Revenue per Visit";s:8:"quantity";s:8:"Quantity";s:9:"avg_price";s:13:"Average Price";s:12:"avg_quantity";s:16:"Average Quantity";s:16:"revenue_subtotal";s:8:"Subtotal";s:11:"revenue_tax";s:3:"Tax";s:16:"revenue_shipping";s:8:"Shipping";s:16:"revenue_discount";s:8:"Discount";s:17:"avg_order_revenue";s:19:"Average Order Value";s:9:"nb_events";s:12:"Total events";s:15:"sum_event_value";s:11:"Total value";s:15:"min_event_value";s:13:"Minimum value";s:15:"max_event_value";s:13:"Maximum value";s:15:"avg_event_value";s:13:"Average value";s:20:"nb_events_with_value";s:19:"Events with a value";s:19:"nb_visits_returning";s:16:"Returning Visits";s:20:"nb_actions_returning";s:27:"Actions by Returning Visits";s:26:"avg_time_on_site_returning";s:43:"Avg. Duration of a Returning Visit (in sec)";s:21:"bounce_rate_returning";s:32:"Bounce Rate for Returning Visits";s:30:"nb_actions_per_visit_returning";s:32:"Avg. Actions per Returning Visit";s:26:"nb_uniq_visitors_returning";s:25:"Unique returning visitors";s:18:"nb_users_returning";s:15:"Returning Users";s:14:"nb_impressions";s:11:"Impressions";s:15:"nb_interactions";s:12:"Interactions";s:16:"interaction_rate";s:16:"Interaction Rate";s:20:"nb_visits_percentage";s:8:"% Visits";}}
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml
index a701470308..c751366bfd 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml
@@ -74,6 +74,7 @@
 		<row>
 			<code>fr</code>
 			<logo>plugins/UserCountry/images/flags/fr.png</logo>
+			<segment>countryCode==fr</segment>
 			<logoWidth>16</logoWidth>
 			<logoHeight>11</logoHeight>
 		</row>
diff --git a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv
index 346c1542db..aeb3df32fc 100644
--- a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv
+++ b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
index 76d48bc7b6..ad7b5f05e4 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
@@ -26,6 +26,7 @@
 					</row>
 				</itemDetails>
 				<icon>plugins/Morpheus/images/ecommerceOrder.gif</icon>
+				
 			</row>
 			<row>
 				<type>ecommerceOrder</type>
@@ -40,6 +41,7 @@
 				<itemDetails>
 				</itemDetails>
 				<icon>plugins/Morpheus/images/ecommerceOrder.gif</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -49,8 +51,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>0</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -64,43 +64,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>363</visitDuration>
 		<visitDurationPretty>6 min 3s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName3>VisitorName</customVariableName3>
-				<customVariableValue3>Great name!</customVariableValue3>
-			</row>
-			<row>
-				<customVariableName4>ValueIsZero</customVariableName4>
-				<customVariableValue4>0</customVariableValue4>
-			</row>
-			<row>
-				<customVariableName5>VisitorType</customVariableName5>
-				<customVariableValue5>NewLoggedOut</customVariableValue5>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>0</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>Poland</country>
@@ -112,21 +99,38 @@
 		<location>Poland</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName3>VisitorName</customVariableName3>
+				<customVariableValue3>Great name!</customVariableValue3>
+			</row>
+			<row>
+				<customVariableName4>ValueIsZero</customVariableName4>
+				<customVariableValue4>0</customVariableValue4>
+			</row>
+			<row>
+				<customVariableName5>VisitorType</customVariableName5>
+				<customVariableValue5>NewLoggedOut</customVariableValue5>
+			</row>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -167,6 +171,7 @@
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -196,6 +201,7 @@
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -219,6 +225,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 			<row>
 				<type>ecommerceAbandonedCart</type>
@@ -249,6 +256,7 @@
 					</row>
 				</itemDetails>
 				<icon>plugins/Morpheus/images/ecommerceAbandonedCart.gif</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -258,8 +266,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>3</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -273,43 +279,30 @@
 		<daysSinceLastEcommerceOrder>1</daysSinceLastEcommerceOrder>
 		<visitDuration>1081</visitDuration>
 		<visitDurationPretty>18 min 1s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName3>VisitorName</customVariableName3>
-				<customVariableValue3>Great name!</customVariableValue3>
-			</row>
-			<row>
-				<customVariableName4>ValueIsZero</customVariableName4>
-				<customVariableValue4>0</customVariableValue4>
-			</row>
-			<row>
-				<customVariableName5>VisitorType</customVariableName5>
-				<customVariableValue5>NewLoggedOut</customVariableValue5>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>3</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>Poland</country>
@@ -321,21 +314,38 @@
 		<location>Poland</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName3>VisitorName</customVariableName3>
+				<customVariableValue3>Great name!</customVariableValue3>
+			</row>
+			<row>
+				<customVariableName4>ValueIsZero</customVariableName4>
+				<customVariableValue4>0</customVariableValue4>
+			</row>
+			<row>
+				<customVariableName5>VisitorType</customVariableName5>
+				<customVariableValue5>NewLoggedOut</customVariableValue5>
+			</row>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml
index dda3bec0a8..b8a61be777 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml
@@ -314,7 +314,80 @@
 			<revenue>$ 0</revenue>
 		</row>
 	</reportData>
-	<reportMetadata />
+	<reportMetadata>
+		<row>
+			<segment>visitServerHour==0</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==1</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==2</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==3</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==4</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==5</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==6</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==7</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==8</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==9</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==10</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==11</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==12</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==13</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==14</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==15</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==16</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==17</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==18</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==19</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==20</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==21</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==22</segment>
+		</row>
+		<row>
+			<segment>visitServerHour==23</segment>
+		</row>
+	</reportMetadata>
 	<reportTotal>
 		<nb_visits>3</nb_visits>
 		<nb_uniq_visitors>3</nb_uniq_visitors>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml
index 2b07701c01..95ecfbfd3c 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml
@@ -71,12 +71,14 @@
 		<row>
 			<code>pl</code>
 			<logo>plugins/UserCountry/images/flags/pl.png</logo>
+			<segment>countryCode==pl</segment>
 			<logoWidth>16</logoWidth>
 			<logoHeight>11</logoHeight>
 		</row>
 		<row>
 			<code>fr</code>
 			<logo>plugins/UserCountry/images/flags/fr.png</logo>
+			<segment>countryCode==fr</segment>
 			<logoWidth>16</logoWidth>
 			<logoHeight>11</logoHeight>
 		</row>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
index 5ff6e58fba..fde6f79018 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
@@ -34,6 +34,7 @@
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -63,6 +64,7 @@
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -86,6 +88,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 			<row>
 				<type>ecommerceAbandonedCart</type>
@@ -116,6 +119,7 @@
 					</row>
 				</itemDetails>
 				<icon>plugins/Morpheus/images/ecommerceAbandonedCart.gif</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -125,8 +129,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>3</actions>
 		<userId />
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -140,43 +142,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>721</visitDuration>
 		<visitDurationPretty>12 min 1s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName3>VisitorName</customVariableName3>
-				<customVariableValue3>Great name!</customVariableValue3>
-			</row>
-			<row>
-				<customVariableName4>ValueIsZero</customVariableName4>
-				<customVariableValue4>0</customVariableValue4>
-			</row>
-			<row>
-				<customVariableName5>VisitorType</customVariableName5>
-				<customVariableValue5>NewLoggedOut</customVariableValue5>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>3</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>Poland</country>
@@ -188,21 +177,38 @@
 		<location>Poland</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName3>VisitorName</customVariableName3>
+				<customVariableValue3>Great name!</customVariableValue3>
+			</row>
+			<row>
+				<customVariableName4>ValueIsZero</customVariableName4>
+				<customVariableValue4>0</customVariableValue4>
+			</row>
+			<row>
+				<customVariableName5>VisitorType</customVariableName5>
+				<customVariableValue5>NewLoggedOut</customVariableValue5>
+			</row>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -231,6 +237,7 @@
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -248,6 +255,7 @@
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -277,6 +285,7 @@
 				<timeSpent>720</timeSpent>
 				<timeSpentPretty>12 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>ecommerceOrder</type>
@@ -305,6 +314,7 @@
 					</row>
 				</itemDetails>
 				<icon>plugins/Morpheus/images/ecommerceOrder.gif</icon>
+				
 			</row>
 			<row>
 				<type>ecommerceOrder</type>
@@ -333,6 +343,7 @@
 					</row>
 				</itemDetails>
 				<icon>plugins/Morpheus/images/ecommerceOrder.gif</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -362,6 +373,7 @@
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -391,6 +403,7 @@
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -414,6 +427,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 			<row>
 				<type>ecommerceAbandonedCart</type>
@@ -444,6 +458,7 @@
 					</row>
 				</itemDetails>
 				<icon>plugins/Morpheus/images/ecommerceAbandonedCart.gif</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -453,8 +468,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>6</actions>
 		<userId />
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -468,43 +481,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>3961</visitDuration>
 		<visitDurationPretty>1 hours 6 min</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName3>VisitorName</customVariableName3>
-				<customVariableValue3>Great name!</customVariableValue3>
-			</row>
-			<row>
-				<customVariableName4>ValueIsZero</customVariableName4>
-				<customVariableValue4>0</customVariableValue4>
-			</row>
-			<row>
-				<customVariableName5>VisitorType</customVariableName5>
-				<customVariableValue5>NewLoggedOut</customVariableValue5>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>6</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>Poland</country>
@@ -516,21 +516,38 @@
 		<location>Poland</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName3>VisitorName</customVariableName3>
+				<customVariableValue3>Great name!</customVariableValue3>
+			</row>
+			<row>
+				<customVariableName4>ValueIsZero</customVariableName4>
+				<customVariableValue4>0</customVariableValue4>
+			</row>
+			<row>
+				<customVariableName5>VisitorType</customVariableName5>
+				<customVariableValue5>NewLoggedOut</customVariableValue5>
+			</row>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -552,6 +569,7 @@
 				
 				<url>http://example.org/index.htm</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -581,6 +599,7 @@
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -610,6 +629,7 @@
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -639,6 +659,7 @@
 				<timeSpent>0</timeSpent>
 				<timeSpentPretty>0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -662,6 +683,7 @@
 					</row>
 				</customVariables>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -671,8 +693,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>4</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -686,39 +706,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>721</visitDuration>
 		<visitDurationPretty>12 min 1s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName4>ValueIsZero</customVariableName4>
-				<customVariableValue4>0</customVariableValue4>
-			</row>
-			<row>
-				<customVariableName5>VisitorType</customVariableName5>
-				<customVariableValue5>NewLoggedOut</customVariableValue5>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>4</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -730,21 +741,34 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName4>ValueIsZero</customVariableName4>
+				<customVariableValue4>0</customVariableValue4>
+			</row>
+			<row>
+				<customVariableName5>VisitorType</customVariableName5>
+				<customVariableValue5>NewLoggedOut</customVariableValue5>
+			</row>
+		</customVariables>
 		<resolution>1024x768</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml
index 1f4ae42832..284c301614 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml
@@ -31,6 +31,7 @@
 		<revenue>3111.11</revenue>
 		<code>pl</code>
 		<logo>plugins/UserCountry/images/flags/pl.png</logo>
+		<segment>countryCode==pl</segment>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -54,6 +55,7 @@
 		<revenue>10</revenue>
 		<code>fr</code>
 		<logo>plugins/UserCountry/images/flags/fr.png</logo>
+		<segment>countryCode==fr</segment>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml
index 18762c91ed..845699c6d2 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml
@@ -10,6 +10,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==0</segment>
 	</row>
 	<row>
 		<label>1h</label>
@@ -21,6 +22,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==1</segment>
 	</row>
 	<row>
 		<label>2h</label>
@@ -32,6 +34,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==2</segment>
 	</row>
 	<row>
 		<label>3h</label>
@@ -43,6 +46,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==3</segment>
 	</row>
 	<row>
 		<label>4h</label>
@@ -54,6 +58,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==4</segment>
 	</row>
 	<row>
 		<label>5h</label>
@@ -65,6 +70,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==5</segment>
 	</row>
 	<row>
 		<label>6h</label>
@@ -76,6 +82,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==6</segment>
 	</row>
 	<row>
 		<label>7h</label>
@@ -87,6 +94,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==7</segment>
 	</row>
 	<row>
 		<label>8h</label>
@@ -98,6 +106,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==8</segment>
 	</row>
 	<row>
 		<label>9h</label>
@@ -109,6 +118,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==9</segment>
 	</row>
 	<row>
 		<label>10h</label>
@@ -120,6 +130,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==10</segment>
 	</row>
 	<row>
 		<label>11h</label>
@@ -131,6 +142,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==11</segment>
 	</row>
 	<row>
 		<label>12h</label>
@@ -142,6 +154,7 @@
 		<sum_visit_length>5403</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
+		<segment>visitLocalHour==12</segment>
 	</row>
 	<row>
 		<label>13h</label>
@@ -153,6 +166,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==13</segment>
 	</row>
 	<row>
 		<label>14h</label>
@@ -164,6 +178,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==14</segment>
 	</row>
 	<row>
 		<label>15h</label>
@@ -175,6 +190,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==15</segment>
 	</row>
 	<row>
 		<label>16h</label>
@@ -186,6 +202,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==16</segment>
 	</row>
 	<row>
 		<label>17h</label>
@@ -197,6 +214,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==17</segment>
 	</row>
 	<row>
 		<label>18h</label>
@@ -208,6 +226,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==18</segment>
 	</row>
 	<row>
 		<label>19h</label>
@@ -219,6 +238,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==19</segment>
 	</row>
 	<row>
 		<label>20h</label>
@@ -230,6 +250,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==20</segment>
 	</row>
 	<row>
 		<label>21h</label>
@@ -241,6 +262,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==21</segment>
 	</row>
 	<row>
 		<label>22h</label>
@@ -252,6 +274,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==22</segment>
 	</row>
 	<row>
 		<label>23h</label>
@@ -263,5 +286,6 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitLocalHour==23</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml
index 09cede1477..84a48688b8 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml
@@ -18,6 +18,7 @@
 		</goals>
 		<nb_conversions>1</nb_conversions>
 		<revenue>10</revenue>
+		<segment>visitServerHour==0</segment>
 	</row>
 	<row>
 		<label>1h</label>
@@ -29,6 +30,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==1</segment>
 	</row>
 	<row>
 		<label>2h</label>
@@ -59,6 +61,7 @@
 		</goals>
 		<nb_conversions>2</nb_conversions>
 		<revenue>3111.11</revenue>
+		<segment>visitServerHour==2</segment>
 	</row>
 	<row>
 		<label>3h</label>
@@ -70,6 +73,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==3</segment>
 	</row>
 	<row>
 		<label>4h</label>
@@ -81,6 +85,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==4</segment>
 	</row>
 	<row>
 		<label>5h</label>
@@ -92,6 +97,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==5</segment>
 	</row>
 	<row>
 		<label>6h</label>
@@ -103,6 +109,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==6</segment>
 	</row>
 	<row>
 		<label>7h</label>
@@ -123,6 +130,7 @@
 		</goals>
 		<nb_conversions>0</nb_conversions>
 		<revenue>0</revenue>
+		<segment>visitServerHour==7</segment>
 	</row>
 	<row>
 		<label>8h</label>
@@ -134,6 +142,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==8</segment>
 	</row>
 	<row>
 		<label>9h</label>
@@ -145,6 +154,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==9</segment>
 	</row>
 	<row>
 		<label>10h</label>
@@ -156,6 +166,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==10</segment>
 	</row>
 	<row>
 		<label>11h</label>
@@ -167,6 +178,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==11</segment>
 	</row>
 	<row>
 		<label>12h</label>
@@ -178,6 +190,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==12</segment>
 	</row>
 	<row>
 		<label>13h</label>
@@ -189,6 +202,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==13</segment>
 	</row>
 	<row>
 		<label>14h</label>
@@ -200,6 +214,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==14</segment>
 	</row>
 	<row>
 		<label>15h</label>
@@ -211,6 +226,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==15</segment>
 	</row>
 	<row>
 		<label>16h</label>
@@ -222,6 +238,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==16</segment>
 	</row>
 	<row>
 		<label>17h</label>
@@ -233,6 +250,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==17</segment>
 	</row>
 	<row>
 		<label>18h</label>
@@ -244,6 +262,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==18</segment>
 	</row>
 	<row>
 		<label>19h</label>
@@ -255,6 +274,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==19</segment>
 	</row>
 	<row>
 		<label>20h</label>
@@ -266,6 +286,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==20</segment>
 	</row>
 	<row>
 		<label>21h</label>
@@ -277,6 +298,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==21</segment>
 	</row>
 	<row>
 		<label>22h</label>
@@ -288,6 +310,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==22</segment>
 	</row>
 	<row>
 		<label>23h</label>
@@ -299,5 +322,6 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==23</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
index 4fe00e7866..dc3af2db1a 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
@@ -4,8 +4,8 @@ Piwik test,5,16,16,$ 13361.11,5,4,$ 13351.11,100%,100%,100%,100%,100%,100%,100%
 Piwik test,2,1,1,$ 250,1,0,$ 0,100%,100%,100%,100%,100%,0,0
 
 Visits Summary
-nb_uniq_visitors,nb_users,nb_visits,nb_actions,max_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate
-1,0,5,16,6,3.2,00:22:49,20%
+nb_uniq_visitors,nb_visits,nb_actions,max_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate
+1,5,16,6,3.2,00:22:49,20%
 
 Visits by Server Time
 label,nb_visits,nb_actions,revenue,nb_actions_per_visit,avg_time_on_site,bounce_rate
@@ -90,7 +90,7 @@ Windowsmedia,0,0%
 
 Visitor Configuration
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Windows XP / Firefox / 1024x768,5,16,80%,3.2,00:22:49,20%
+Windows / Firefox / 1024x768,5,16,80%,3.2,00:22:49,20%
 
 Browser language
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
@@ -478,14 +478,14 @@ Device brand
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
 Unknown,5,16,80%,3.2,00:22:49,20%
 
-Device model
-label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Unknown,5,16,80%,3.2,00:22:49,20%
-
 Browser version
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
 Firefox 3.6,5,16,80%,3.2,00:22:49,20%
 
+Device model
+label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
+Unknown,5,16,80%,3.2,00:22:49,20%
+
 Operating System families
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
 Windows,5,16,80%,3.2,00:22:49,20%
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
index dd359fb284..835fdc6e71 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
@@ -6502,7 +6502,7 @@
                                                     
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
+                                                                                                                                        <img src='plugins/DevicesDetection/images/browsers/FF.gif'>
                                         &nbsp;
                                                                                                             Firefox                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -6570,7 +6570,7 @@
                                                     
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
+                                                                                                                                        <img src='plugins/DevicesDetection/images/browsers/FF.gif'>
                                         &nbsp;
                                                                                                             Firefox 3.6                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -6704,7 +6704,7 @@
                                                     
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/WI7.gif'>
+                                                                                                                                        <img src='plugins/DevicesDetection/images/os/WIN.gif'>
                                         &nbsp;
                                                                                                             Windows                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -6772,7 +6772,7 @@
                                                     
                                                                     <tr style="">
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/WXP.gif'>
+                                                                                                                                        <img src='plugins/DevicesDetection/images/os/WIN.gif'>
                                         &nbsp;
                                                                                                             Windows XP                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
index cf266ddbcc..eed4308fde 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
@@ -2,11 +2,11 @@
 <head>
     <meta charset="utf-8">
 </head>
-<body style="color: rgb(68,68,68);">
+<body style="font-family: dejavusans; color: rgb(13,13,13);line-height: 1.33;">
 
 <a id="reportTop" rel="noreferrer" target="_blank" href=""><img title="Go to Piwik" border="0" alt="Piwik" src='plugins/Morpheus/images/logo-header.png'/></a>
 
-<h1 style="color: rgb(126,115,99); font-size: 11pt;">
+<h1 style="font-weight:normal; color: rgb(13,13,13); font-size: 24pt;">
     Piwik test
 </h1>
 
@@ -15,6609 +15,6601 @@
 </p>
 
 
-    <h2 style="color: rgb(126,115,99); font-size: 11pt;">
+    <h2 style="font-weight:normal; color: rgb(13,13,13); font-size: 24pt;">
         Report list
     </h2>
     <ul>
                     <li>
-                <a href="#MultiSites_getAll" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#MultiSites_getAll" style="text-decoration:none; color: rgb(13,13,13);">
                     All Websites dashboard
                 </a>
             </li>
                     <li>
-                <a href="#VisitsSummary_get" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#VisitsSummary_get" style="text-decoration:none; color: rgb(13,13,13);">
                     Visits Summary
                 </a>
             </li>
                     <li>
-                <a href="#VisitTime_getVisitInformationPerServerTime" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#VisitTime_getVisitInformationPerServerTime" style="text-decoration:none; color: rgb(13,13,13);">
                     Visits by Server Time
                 </a>
             </li>
                     <li>
-                <a href="#VisitTime_getVisitInformationPerLocalTime" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#VisitTime_getVisitInformationPerLocalTime" style="text-decoration:none; color: rgb(13,13,13);">
                     Visits by Local Time
                 </a>
             </li>
                     <li>
-                <a href="#VisitTime_getByDayOfWeek" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#VisitTime_getByDayOfWeek" style="text-decoration:none; color: rgb(13,13,13);">
                     Visits by Day of Week
                 </a>
             </li>
                     <li>
-                <a href="#UserSettings_getResolution" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Resolution_getResolution" style="text-decoration:none; color: rgb(13,13,13);">
                     Screen Resolution
                 </a>
             </li>
                     <li>
-                <a href="#UserSettings_getPlugin" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#DevicePlugins_getPlugin" style="text-decoration:none; color: rgb(13,13,13);">
                     Browser Plugins
                 </a>
             </li>
                     <li>
-                <a href="#UserSettings_getConfiguration" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Resolution_getConfiguration" style="text-decoration:none; color: rgb(13,13,13);">
                     Visitor Configuration
                 </a>
             </li>
                     <li>
-                <a href="#UserSettings_getLanguage" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#UserLanguage_getLanguage" style="text-decoration:none; color: rgb(13,13,13);">
                     Browser language
                 </a>
             </li>
                     <li>
-                <a href="#UserSettings_getLanguageCode" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#UserLanguage_getLanguageCode" style="text-decoration:none; color: rgb(13,13,13);">
                     Language code
                 </a>
             </li>
                     <li>
-                <a href="#Goals_get_idGoal--ecommerceOrder" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Goals_get_idGoal--ecommerceOrder" style="text-decoration:none; color: rgb(13,13,13);">
                     Ecommerce Orders
                 </a>
             </li>
                     <li>
-                <a href="#Goals_getVisitsUntilConversion_idGoal--ecommerceOrder" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Goals_getVisitsUntilConversion_idGoal--ecommerceOrder" style="text-decoration:none; color: rgb(13,13,13);">
                     Ecommerce Orders - Visits to Conversion
                 </a>
             </li>
                     <li>
-                <a href="#Goals_getDaysToConversion_idGoal--ecommerceOrder" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Goals_getDaysToConversion_idGoal--ecommerceOrder" style="text-decoration:none; color: rgb(13,13,13);">
                     Ecommerce Orders - Days to Conversion
                 </a>
             </li>
                     <li>
-                <a href="#Goals_get_idGoal--ecommerceAbandonedCart" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Goals_get_idGoal--ecommerceAbandonedCart" style="text-decoration:none; color: rgb(13,13,13);">
                     Abandoned Carts
                 </a>
             </li>
                     <li>
-                <a href="#Goals_getVisitsUntilConversion_idGoal--ecommerceAbandonedCart" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Goals_getVisitsUntilConversion_idGoal--ecommerceAbandonedCart" style="text-decoration:none; color: rgb(13,13,13);">
                     Abandoned Carts - Visits to Conversion
                 </a>
             </li>
                     <li>
-                <a href="#Goals_getDaysToConversion_idGoal--ecommerceAbandonedCart" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Goals_getDaysToConversion_idGoal--ecommerceAbandonedCart" style="text-decoration:none; color: rgb(13,13,13);">
                     Abandoned Carts - Days to Conversion
                 </a>
             </li>
                     <li>
-                <a href="#Goals_getItemsSku" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Goals_getItemsSku" style="text-decoration:none; color: rgb(13,13,13);">
                     Product SKU
                 </a>
             </li>
                     <li>
-                <a href="#Goals_getItemsName" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Goals_getItemsName" style="text-decoration:none; color: rgb(13,13,13);">
                     Product Name
                 </a>
             </li>
                     <li>
-                <a href="#Goals_getItemsCategory" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Goals_getItemsCategory" style="text-decoration:none; color: rgb(13,13,13);">
                     Product Category
                 </a>
             </li>
                     <li>
-                <a href="#Actions_get" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Actions_get" style="text-decoration:none; color: rgb(13,13,13);">
                     Actions - Main metrics
                 </a>
             </li>
                     <li>
-                <a href="#Actions_getPageUrls" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Actions_getPageUrls" style="text-decoration:none; color: rgb(13,13,13);">
                     Page URLs
                 </a>
             </li>
                     <li>
-                <a href="#Actions_getEntryPageUrls" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Actions_getEntryPageUrls" style="text-decoration:none; color: rgb(13,13,13);">
                     Entry pages
                 </a>
             </li>
                     <li>
-                <a href="#Actions_getExitPageUrls" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Actions_getExitPageUrls" style="text-decoration:none; color: rgb(13,13,13);">
                     Exit pages
                 </a>
             </li>
                     <li>
-                <a href="#Actions_getPageTitles" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Actions_getPageTitles" style="text-decoration:none; color: rgb(13,13,13);">
                     Page titles
                 </a>
             </li>
                     <li>
-                <a href="#Actions_getEntryPageTitles" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Actions_getEntryPageTitles" style="text-decoration:none; color: rgb(13,13,13);">
                     Entry page titles
                 </a>
             </li>
                     <li>
-                <a href="#Actions_getExitPageTitles" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Actions_getExitPageTitles" style="text-decoration:none; color: rgb(13,13,13);">
                     Exit page titles
                 </a>
             </li>
                     <li>
-                <a href="#Actions_getOutlinks" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Actions_getOutlinks" style="text-decoration:none; color: rgb(13,13,13);">
                     Outlinks
                 </a>
             </li>
                     <li>
-                <a href="#Actions_getDownloads" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Actions_getDownloads" style="text-decoration:none; color: rgb(13,13,13);">
                     Downloads
                 </a>
             </li>
                     <li>
-                <a href="#Contents_getContentNames" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Contents_getContentNames" style="text-decoration:none; color: rgb(13,13,13);">
                     Content Name
                 </a>
             </li>
                     <li>
-                <a href="#Contents_getContentPieces" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Contents_getContentPieces" style="text-decoration:none; color: rgb(13,13,13);">
                     Content Piece
                 </a>
             </li>
                     <li>
-                <a href="#Events_getCategory" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Events_getCategory" style="text-decoration:none; color: rgb(13,13,13);">
                     Event Categories
                 </a>
             </li>
                     <li>
-                <a href="#Events_getAction" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Events_getAction" style="text-decoration:none; color: rgb(13,13,13);">
                     Event Actions
                 </a>
             </li>
                     <li>
-                <a href="#Events_getName" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Events_getName" style="text-decoration:none; color: rgb(13,13,13);">
                     Event Names
                 </a>
             </li>
                     <li>
-                <a href="#Actions_getSiteSearchKeywords" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Actions_getSiteSearchKeywords" style="text-decoration:none; color: rgb(13,13,13);">
                     Site Search Keywords
                 </a>
             </li>
                     <li>
-                <a href="#Actions_getSiteSearchNoResultKeywords" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Actions_getSiteSearchNoResultKeywords" style="text-decoration:none; color: rgb(13,13,13);">
                     Search Keywords with No Results
                 </a>
             </li>
                     <li>
-                <a href="#Actions_getSiteSearchCategories" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Actions_getSiteSearchCategories" style="text-decoration:none; color: rgb(13,13,13);">
                     Search Categories
                 </a>
             </li>
                     <li>
-                <a href="#Actions_getPageUrlsFollowingSiteSearch" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Actions_getPageUrlsFollowingSiteSearch" style="text-decoration:none; color: rgb(13,13,13);">
                     Pages Following a Site Search
                 </a>
             </li>
                     <li>
-                <a href="#Actions_getPageTitlesFollowingSiteSearch" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Actions_getPageTitlesFollowingSiteSearch" style="text-decoration:none; color: rgb(13,13,13);">
                     Page Titles Following a Site Search
                 </a>
             </li>
                     <li>
-                <a href="#Referrers_getReferrerType" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Referrers_getReferrerType" style="text-decoration:none; color: rgb(13,13,13);">
                     Referrer Type
                 </a>
             </li>
                     <li>
-                <a href="#Referrers_getAll" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Referrers_getAll" style="text-decoration:none; color: rgb(13,13,13);">
                     All Referrers
                 </a>
             </li>
                     <li>
-                <a href="#Referrers_getKeywords" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Referrers_getKeywords" style="text-decoration:none; color: rgb(13,13,13);">
                     Keywords
                 </a>
             </li>
                     <li>
-                <a href="#Referrers_getWebsites" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Referrers_getWebsites" style="text-decoration:none; color: rgb(13,13,13);">
                     Websites
                 </a>
             </li>
                     <li>
-                <a href="#Referrers_getSearchEngines" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Referrers_getSearchEngines" style="text-decoration:none; color: rgb(13,13,13);">
                     Search Engines
                 </a>
             </li>
                     <li>
-                <a href="#Referrers_getCampaigns" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Referrers_getCampaigns" style="text-decoration:none; color: rgb(13,13,13);">
                     Campaigns
                 </a>
             </li>
                     <li>
-                <a href="#Referrers_getSocials" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Referrers_getSocials" style="text-decoration:none; color: rgb(13,13,13);">
                     Social Networks
                 </a>
             </li>
                     <li>
-                <a href="#Goals_get" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Goals_get" style="text-decoration:none; color: rgb(13,13,13);">
                     Goals
                 </a>
             </li>
                     <li>
-                <a href="#Goals_getVisitsUntilConversion" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Goals_getVisitsUntilConversion" style="text-decoration:none; color: rgb(13,13,13);">
                     Visits to Conversion
                 </a>
             </li>
                     <li>
-                <a href="#Goals_getDaysToConversion" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Goals_getDaysToConversion" style="text-decoration:none; color: rgb(13,13,13);">
                     Days to Conversion
                 </a>
             </li>
                     <li>
-                <a href="#Goals_get_idGoal--1" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Goals_get_idGoal--1" style="text-decoration:none; color: rgb(13,13,13);">
                     Goal title match, triggered ONCE
                 </a>
             </li>
                     <li>
-                <a href="#Goals_getVisitsUntilConversion_idGoal--1" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Goals_getVisitsUntilConversion_idGoal--1" style="text-decoration:none; color: rgb(13,13,13);">
                     title match, triggered ONCE - Visits to Conversion
                 </a>
             </li>
                     <li>
-                <a href="#Goals_getDaysToConversion_idGoal--1" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Goals_getDaysToConversion_idGoal--1" style="text-decoration:none; color: rgb(13,13,13);">
                     title match, triggered ONCE - Days to Conversion
                 </a>
             </li>
                     <li>
-                <a href="#UserCountry_getCountry" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#UserCountry_getCountry" style="text-decoration:none; color: rgb(13,13,13);">
                     Country
                 </a>
             </li>
                     <li>
-                <a href="#UserCountry_getContinent" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#UserCountry_getContinent" style="text-decoration:none; color: rgb(13,13,13);">
                     Continent
                 </a>
             </li>
                     <li>
-                <a href="#UserCountry_getRegion" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#UserCountry_getRegion" style="text-decoration:none; color: rgb(13,13,13);">
                     Region
                 </a>
             </li>
                     <li>
-                <a href="#UserCountry_getCity" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#UserCountry_getCity" style="text-decoration:none; color: rgb(13,13,13);">
                     City
                 </a>
             </li>
                     <li>
-                <a href="#CustomVariables_getCustomVariables" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#CustomVariables_getCustomVariables" style="text-decoration:none; color: rgb(13,13,13);">
                     Custom Variables
                 </a>
             </li>
                     <li>
-                <a href="#VisitorInterest_getNumberOfVisitsPerVisitDuration" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#VisitorInterest_getNumberOfVisitsPerVisitDuration" style="text-decoration:none; color: rgb(13,13,13);">
                     Length of Visits
                 </a>
             </li>
                     <li>
-                <a href="#VisitorInterest_getNumberOfVisitsPerPage" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#VisitorInterest_getNumberOfVisitsPerPage" style="text-decoration:none; color: rgb(13,13,13);">
                     Pages per Visit
                 </a>
             </li>
                     <li>
-                <a href="#VisitorInterest_getNumberOfVisitsByVisitCount" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#VisitorInterest_getNumberOfVisitsByVisitCount" style="text-decoration:none; color: rgb(13,13,13);">
                     Visits by Visit Number
                 </a>
             </li>
                     <li>
-                <a href="#VisitorInterest_getNumberOfVisitsByDaysSinceLast" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#VisitorInterest_getNumberOfVisitsByDaysSinceLast" style="text-decoration:none; color: rgb(13,13,13);">
                     Visits by days since last visit
                 </a>
             </li>
                     <li>
-                <a href="#VisitFrequency_get" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#VisitFrequency_get" style="text-decoration:none; color: rgb(13,13,13);">
                     Returning Visits
                 </a>
             </li>
                     <li>
-                <a href="#Provider_getProvider" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#Provider_getProvider" style="text-decoration:none; color: rgb(13,13,13);">
                     Provider
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getType" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#DevicesDetection_getType" style="text-decoration:none; color: rgb(13,13,13);">
                     Device type
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getBrowsers" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#DevicesDetection_getBrowsers" style="text-decoration:none; color: rgb(13,13,13);">
                     Visitor Browser
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getBrand" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#DevicesDetection_getBrand" style="text-decoration:none; color: rgb(13,13,13);">
                     Device brand
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(68,68,68);">
-                    Device model
+                <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(13,13,13);">
+                    Browser version
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);">
-                    Browser version
+                <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(13,13,13);">
+                    Device model
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: rgb(13,13,13);">
                     Operating System families
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getOsVersions" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#DevicesDetection_getOsVersions" style="text-decoration:none; color: rgb(13,13,13);">
                     Operating System versions
                 </a>
             </li>
                     <li>
-                <a href="#DevicesDetection_getBrowserEngines" style="text-decoration:none; color: rgb(68,68,68);">
+                <a href="#DevicesDetection_getBrowserEngines" style="text-decoration:none; color: rgb(13,13,13);">
                     Browser engines
                 </a>
             </li>
             </ul>
-<h2 id="MultiSites_getAll" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="MultiSites_getAll" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     All Websites dashboard
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Pageviews&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Revenue&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Ecommerce Orders&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Product Revenue&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Piwik test                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 16
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 16
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 13361.11
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 13351.11
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Piwik test                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 250
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="VisitsSummary_get" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="VisitsSummary_get" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Visits Summary
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Name&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Value&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Unique visitors                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                                                        Users                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0
-                                                                                    </td>
-                                    </tr>
-                            
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Actions                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 16
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Maximum actions in one visit                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 6
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Actions per Visit                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3.2
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Avg. Visit Duration (in seconds)                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:22:49
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Bounce Rate                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 20%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="VisitTime_getVisitInformationPerServerTime" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="VisitTime_getVisitInformationPerServerTime" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Visits by Server Time
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Server time&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Revenue&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         0h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:12:01
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 10
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         1h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         2h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 9
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4.5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:42:01
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 3111.11
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         3h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         4h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         5h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         6h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:06:03
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 10240
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         7h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:12:01
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         8h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         9h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         10h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         11h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         12h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         13h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         14h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         15h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         16h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         17h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         18h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         19h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         20h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         21h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         22h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         23h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="VisitTime_getVisitInformationPerLocalTime" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="VisitTime_getVisitInformationPerLocalTime" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Visits by Local Time
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Local time&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         0h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         1h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         2h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         3h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         4h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         5h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         6h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         7h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         8h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         9h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         10h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         11h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         12h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 16
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3.2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:22:49
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 20%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 80%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         13h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         14h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         15h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         16h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         17h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         18h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         19h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         20h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         21h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         22h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         23h                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="VisitTime_getByDayOfWeek" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="VisitTime_getByDayOfWeek" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Visits by Day of Week
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Day of the week&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Monday                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Tuesday                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 13
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4.3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:30:01
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 66.67%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Wednesday                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1.5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:12:02
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 50%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Thursday                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Friday                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Saturday                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Sunday                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getResolution" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Resolution_getResolution" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Screen Resolution
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Resolution&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         1024x768                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 16
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3.2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:22:49
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 20%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 80%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getPlugin" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="DevicePlugins_getPlugin" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Browser Plugins
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Plugin&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;% Visits&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/plugins/cookie.gif'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicePlugins/images/plugins/cookie.gif'>
                                         &nbsp;
                                                                                                             Cookie                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/plugins/flash.gif'>
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicePlugins/images/plugins/flash.gif'>
                                         &nbsp;
                                                                                                             Flash                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/plugins/java.gif'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicePlugins/images/plugins/java.gif'>
                                         &nbsp;
                                                                                                             Java                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/plugins/director.gif'>
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicePlugins/images/plugins/director.gif'>
                                         &nbsp;
                                                                                                             Director                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/plugins/gears.gif'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicePlugins/images/plugins/gears.gif'>
                                         &nbsp;
                                                                                                             Gears                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/plugins/pdf.gif'>
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicePlugins/images/plugins/pdf.gif'>
                                         &nbsp;
                                                                                                             Pdf                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/plugins/quicktime.gif'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicePlugins/images/plugins/quicktime.gif'>
                                         &nbsp;
                                                                                                             Quicktime                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/plugins/realplayer.gif'>
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicePlugins/images/plugins/realplayer.gif'>
                                         &nbsp;
                                                                                                             Realplayer                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/plugins/silverlight.gif'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicePlugins/images/plugins/silverlight.gif'>
                                         &nbsp;
                                                                                                             Silverlight                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/plugins/windowsmedia.gif'>
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicePlugins/images/plugins/windowsmedia.gif'>
                                         &nbsp;
                                                                                                             Windowsmedia                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getConfiguration" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Resolution_getConfiguration" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Visitor Configuration
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Configuration&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                                                        Windows XP / Firefox / 1024x768                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                                                        Windows / Firefox / 1024x768                                                                                                                        </td>
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 16
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3.2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:22:49
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 20%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 80%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getLanguage" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="UserLanguage_getLanguage" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Browser language
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Language&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Polish                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 12
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:25:32
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 25%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 75%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         French                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:12:01
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserSettings_getLanguageCode" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="UserLanguage_getLanguageCode" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Language code
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Language&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Polish (pl)                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 12
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:25:32
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 25%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 75%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         French (fr)                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:12:01
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Goals_get_idGoal--ecommerceOrder" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Goals_get_idGoal--ecommerceOrder" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Ecommerce Orders
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Name&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Value&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Ecommerce Orders                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Visits with Conversions                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Revenue                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 13351.11
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Subtotal                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 2700
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Tax                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 531
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Shipping                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 120.11
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Discount                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 686
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Purchased Products                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 12
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Average Order Value                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 3337.78
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Conversion Rate                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 40%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Goals_getVisitsUntilConversion_idGoal--ecommerceOrder" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Goals_getVisitsUntilConversion_idGoal--ecommerceOrder" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Ecommerce Orders - Visits to Conversion
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits to Conversion&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversions&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         1 visit                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         2 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         3 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         4 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         5 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         6 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         7 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         8 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         9-14 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         15-25 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         26-50 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         51-100 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         101+ visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Goals_getDaysToConversion_idGoal--ecommerceOrder" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Goals_getDaysToConversion_idGoal--ecommerceOrder" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Ecommerce Orders - Days to Conversion
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Days to Conversion&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversions&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         0 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         1 day                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         2 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         3 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         4 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         5 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         6 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         7 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         8-14 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         15-30 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         31-60 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         61-120 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         121-364 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         365+ days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Goals_get_idGoal--ecommerceAbandonedCart" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Goals_get_idGoal--ecommerceAbandonedCart" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Abandoned Carts
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Name&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Value&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Abandoned Carts                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Revenue left in cart                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 7530.33
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Products left in cart                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 12
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Average Order Value                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 2510.11
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Conversion Rate                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 60%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Goals_getVisitsUntilConversion_idGoal--ecommerceAbandonedCart" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Goals_getVisitsUntilConversion_idGoal--ecommerceAbandonedCart" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Abandoned Carts - Visits to Conversion
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits to Conversion&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversions&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         1 visit                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         2 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         3 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         4 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         5 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         6 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         7 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         8 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         9-14 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         15-25 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         26-50 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         51-100 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         101+ visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Goals_getDaysToConversion_idGoal--ecommerceAbandonedCart" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Goals_getDaysToConversion_idGoal--ecommerceAbandonedCart" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Abandoned Carts - Days to Conversion
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Days to Conversion&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversions&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         0 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         1 day                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         2 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         3 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         4 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         5 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         6 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         7 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         8-14 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         15-30 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         31-60 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         61-120 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         121-364 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         365+ days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Goals_getItemsSku" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Goals_getItemsSku" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Product SKU
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Product SKU&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Product Revenue&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Quantity&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Unique Purchases&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Average Price&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Average Quantity&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Product Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         SKU2                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 1500
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 1500
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         SKU VERY nice indeed                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 1011.22
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 255.61
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1.5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 50%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         ANOTHER SKU HERE                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 600
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 6
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 100
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 6
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         TRIPOD SKU                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 200
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 100
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         SKU IN ABANDONED CART TWO                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Goals_getItemsName" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Goals_getItemsName" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Product Name
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Product Name&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Product Revenue&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Quantity&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Unique Purchases&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Average Price&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Average Quantity&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Product Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Canon SLR                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 1500
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 1500
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         PRODUCT name                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 1011.22
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 255.61
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1.5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         PRODUCT name BIS                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 600
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 6
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 100
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 6
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         TRIPOD - bought day after                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 200
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 100
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         PRODUCT THREE LEFT in cart                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 1332
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         PRODUCT TWO LEFT in cart                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Goals_getItemsCategory" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Goals_getItemsCategory" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Product Category
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Product Category&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Product Revenue&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Quantity&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Unique Purchases&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Average Price&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Average Quantity&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Product Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Electronics &amp; Cameras                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 2500
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 1000
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1.5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 66.67%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Multiple Category 1                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 1000
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 500
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Multiple Category 2                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 1000
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 500
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Multiple Category 4                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 1000
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 500
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Multiple Category 5                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 1000
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 500
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Product Category not defined                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 611.22
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 7
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 55.61
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3.5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 50%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Tools                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 200
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 100
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Category TWO LEFT in cart                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Actions_get" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Actions_get" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Actions - Main metrics
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Name&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Value&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Pageviews                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 16
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Unique Pageviews                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Downloads                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Unique Downloads                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Outlinks                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Unique Outlinks                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Searches                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Unique Keywords                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Actions_getPageUrls" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Actions_getPageUrls" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Page URLs
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Page URL&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Pageviews&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Unique Pageviews&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. time on page&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Exit rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                                                            <a style="color: rgb(68,68,68);" href='http://example.org/index.htm'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                                                            <a style="color: rgb(13,13,13);" href='http://example.org/index.htm'>
                                                                         /index.htm                                                                            </a>
                                                                                                                         </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 16
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:13:30
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Actions_getEntryPageUrls" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Actions_getEntryPageUrls" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Entry pages
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Entry Page URL&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Entrances&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounces&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                                                            <a style="color: rgb(68,68,68);" href='http://example.org/index.htm'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                                                            <a style="color: rgb(13,13,13);" href='http://example.org/index.htm'>
                                                                         /index.htm                                                                            </a>
                                                                                                                         </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Actions_getExitPageUrls" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Actions_getExitPageUrls" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Exit pages
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Exit Page URL&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Exits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Unique Pageviews&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Exit rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                                                            <a style="color: rgb(68,68,68);" href='http://example.org/index.htm'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                                                            <a style="color: rgb(13,13,13);" href='http://example.org/index.htm'>
                                                                         /index.htm                                                                            </a>
                                                                                                                         </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Actions_getPageTitles" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Actions_getPageTitles" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Page titles
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Page Name&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Pageviews&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Unique Pageviews&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. time on page&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Exit rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                          View product left in cart                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 9
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:06:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                          Another Product page                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:06:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                          Another Product page with multiple categories                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                          Another Product page with no category                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:00:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                          incredible title!                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:06:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                          Looking at Electronics &amp; Cameras page again                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:06:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                          Looking at Electronics &amp; Cameras page with a page level custom variable                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:06:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                          Looking at product page                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:12:00
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Actions_getEntryPageTitles" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Actions_getEntryPageTitles" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Entry page titles
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Entry Page title&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Entrances&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounces&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                          View product left in cart                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                          incredible title!                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                          Looking at Electronics &amp; Cameras page with a page level custom variable                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Actions_getExitPageTitles" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Actions_getExitPageTitles" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Exit page titles
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Exit Page Title&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Exits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Unique Pageviews&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Exit rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                          View product left in cart                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                          Another Product page with multiple categories                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 100%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Actions_getOutlinks" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Actions_getOutlinks" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Outlinks
 </h2>
 
     There is no data for this report.
-<h2 id="Actions_getDownloads" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Actions_getDownloads" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Downloads
 </h2>
 
     There is no data for this report.
-<h2 id="Contents_getContentNames" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Contents_getContentNames" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Content Name
 </h2>
 
     There is no data for this report.
-<h2 id="Contents_getContentPieces" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Contents_getContentPieces" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Content Piece
 </h2>
 
     There is no data for this report.
-<h2 id="Events_getCategory" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Events_getCategory" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Event Categories
 </h2>
 
     There is no data for this report.
-<h2 id="Events_getAction" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Events_getAction" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Event Actions
 </h2>
 
     There is no data for this report.
-<h2 id="Events_getName" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Events_getName" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Event Names
 </h2>
 
     There is no data for this report.
-<h2 id="Actions_getSiteSearchKeywords" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Actions_getSiteSearchKeywords" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Site Search Keywords
 </h2>
 
     There is no data for this report.
-<h2 id="Actions_getSiteSearchNoResultKeywords" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Actions_getSiteSearchNoResultKeywords" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Search Keywords with No Results
 </h2>
 
     There is no data for this report.
-<h2 id="Actions_getSiteSearchCategories" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Actions_getSiteSearchCategories" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Search Categories
 </h2>
 
     There is no data for this report.
-<h2 id="Actions_getPageUrlsFollowingSiteSearch" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Actions_getPageUrlsFollowingSiteSearch" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Pages Following a Site Search
 </h2>
 
     There is no data for this report.
-<h2 id="Actions_getPageTitlesFollowingSiteSearch" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Actions_getPageTitlesFollowingSiteSearch" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Page Titles Following a Site Search
 </h2>
 
     There is no data for this report.
-<h2 id="Referrers_getReferrerType" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Referrers_getReferrerType" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Referrer Type
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Referrer Type&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Revenue&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Direct Entry                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 16
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3.2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:22:49
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 20%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 13361.11
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Referrers_getAll" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Referrers_getAll" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     All Referrers
 </h2>
 
     There is no data for this report.
-<h2 id="Referrers_getKeywords" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Referrers_getKeywords" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Keywords
 </h2>
 
     There is no data for this report.
-<h2 id="Referrers_getWebsites" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Referrers_getWebsites" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Websites
 </h2>
 
     There is no data for this report.
-<h2 id="Referrers_getSearchEngines" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Referrers_getSearchEngines" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Search Engines
 </h2>
 
     There is no data for this report.
-<h2 id="Referrers_getCampaigns" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Referrers_getCampaigns" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Campaigns
 </h2>
 
     There is no data for this report.
-<h2 id="Referrers_getSocials" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Referrers_getSocials" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Social Networks
 </h2>
 
     There is no data for this report.
-<h2 id="Goals_get" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Goals_get" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Goals
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Name&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Value&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Conversions                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Visits with Conversions                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Revenue                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 13361.11
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Conversion Rate                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 80%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Goals_getVisitsUntilConversion" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Goals_getVisitsUntilConversion" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Visits to Conversion
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits to Conversion&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Revenue&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         1 visit                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         2 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         3 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         4 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         5 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         6 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         7 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         8 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         9-14 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         15-25 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         26-50 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         51-100 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         101+ visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Goals_getDaysToConversion" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Goals_getDaysToConversion" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Days to Conversion
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Days to Conversion&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Revenue&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         0 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         1 day                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         2 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         3 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         4 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         5 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         6 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         7 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         8-14 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         15-30 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         31-60 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         61-120 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         121-364 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         365+ days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 0
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Goals_get_idGoal--1" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Goals_get_idGoal--1" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Goal title match, triggered ONCE
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Name&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Value&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Conversions                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Visits with Conversions                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Revenue                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 10
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Conversion Rate                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 20%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Goals_getVisitsUntilConversion_idGoal--1" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Goals_getVisitsUntilConversion_idGoal--1" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     title match, triggered ONCE - Visits to Conversion
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits to Conversion&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversions&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         1 visit                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         2 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         3 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         4 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         5 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         6 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         7 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         8 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         9-14 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         15-25 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         26-50 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         51-100 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         101+ visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Goals_getDaysToConversion_idGoal--1" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Goals_getDaysToConversion_idGoal--1" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     title match, triggered ONCE - Days to Conversion
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Days to Conversion&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversions&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         0 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         1 day                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         2 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         3 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         4 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         5 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         6 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         7 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         8-14 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         15-30 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         31-60 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         61-120 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         121-364 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         365+ days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserCountry_getCountry" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="UserCountry_getCountry" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Country
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Country&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Revenue&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                         <img src='plugins/UserCountry/images/flags/pl.png'>
                                         &nbsp;
                                                                                                             Poland                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 12
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:25:32
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 25%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 13351.11
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                         <img src='plugins/UserCountry/images/flags/fr.png'>
                                         &nbsp;
                                                                                                             France                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:12:01
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 10
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserCountry_getContinent" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="UserCountry_getContinent" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Continent
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Continent&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Revenue&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Europe                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 16
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3.2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:22:49
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 20%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 13361.11
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserCountry_getRegion" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="UserCountry_getRegion" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Region
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Region&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Revenue&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                         <img src='plugins/UserCountry/images/flags/xx.png'>
                                         &nbsp;
                                                                                                             Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 16
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3.2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:22:49
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 20%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 13361.11
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="UserCountry_getCity" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="UserCountry_getCity" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     City
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;City&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Revenue&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                         <img src='plugins/UserCountry/images/flags/xx.png'>
                                         &nbsp;
                                                                                                             Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 16
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3.2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:22:49
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 20%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 13361.11
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="CustomVariables_getCustomVariables" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="CustomVariables_getCustomVariables" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Custom Variables
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Custom Variable name&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Revenue&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         ValueIsZero                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 16
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3.2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:22:49
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 20%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 13361.11
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         VisitorType                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 16
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3.2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:22:49
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 20%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 13361.11
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         VisitorName                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 12
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:25:32
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 25%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 $ 13351.11
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="VisitorInterest_getNumberOfVisitsPerVisitDuration" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="VisitorInterest_getNumberOfVisitsPerVisitDuration" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Length of Visits
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visit duration&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         0-10s                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         11-30s                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         31-60s                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         1-2 min                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         2-4 min                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         4-7 min                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         7-10 min                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         10-15 min                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         15-30 min                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         30+ min                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="VisitorInterest_getNumberOfVisitsPerPage" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="VisitorInterest_getNumberOfVisitsPerPage" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Pages per Visit
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Pages per visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         1 page                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         2 pages                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         3 pages                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         4 pages                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         5 pages                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         6-7 pages                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         8-10 pages                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         11-14 pages                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         15-20 pages                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         21+ pages                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="VisitorInterest_getNumberOfVisitsByVisitCount" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="VisitorInterest_getNumberOfVisitsByVisitCount" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Visits by Visit Number
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits by Visit Number&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;% Visits&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         1 visit                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 60%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         2 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 40%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         3 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         4 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         5 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         6 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         7 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         8 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         9-14 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         15-25 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         26-50 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         51-100 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         101-200 visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         201+ visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="VisitorInterest_getNumberOfVisitsByDaysSinceLast" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="VisitorInterest_getNumberOfVisitsByDaysSinceLast" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Visits by days since last visit
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits by days since last visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         New visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         0 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         1 day                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         2 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         3 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         4 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         5 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         6 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         7 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         8-14 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         15-30 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         31-60 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         61-120 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         121-364 days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         365+ days                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="VisitFrequency_get" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="VisitFrequency_get" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Returning Visits
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Name&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Value&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Unique returning visitors                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 1
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Returning Users                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Returning Visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 4
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Actions by Returning Visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 12
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Maximum actions in one returning visit                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 6
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Bounce Rate for Returning Visits                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 25%
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Avg. Actions per Returning Visit                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3
                                                                                     </td>
                                     </tr>
                             
-                                                                    <tr style="background-color: rgb(249,250,250)">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style=";line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Avg. Duration of a Returning Visit (in sec)                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:25:32
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="Provider_getProvider" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="Provider_getProvider" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Provider
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Provider&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                                                            <a style="color: rgb(68,68,68);" href='http://'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                                                            <a style="color: rgb(13,13,13);" href='http://'>
                                                                         Unknown                                                                            </a>
                                                                                                                         </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 16
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3.2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:22:49
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 20%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 80%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getType" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="DevicesDetection_getType" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Device type
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Device type&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                         <img src='plugins/DevicesDetection/images/screens/normal.gif'>
                                         &nbsp;
                                                                                                             Desktop                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 16
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3.2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:22:49
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 20%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 80%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getBrowsers" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="DevicesDetection_getBrowsers" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Visitor Browser
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Browser&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicesDetection/images/browsers/FF.gif'>
                                         &nbsp;
                                                                                                             Firefox                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 16
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3.2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:22:49
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 20%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 80%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getBrand" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="DevicesDetection_getBrand" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Device brand
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Device brand&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                         <img src='plugins/DevicesDetection/images/brand/Unknown.ico'>
                                         &nbsp;
                                                                                                             Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 16
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3.2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:22:49
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 20%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 80%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getModel" style="color: rgb(126,115,99); font-size: 11pt;">
-    Device model
+<h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
+    Browser version
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
-                    &nbsp;Device model&nbsp;&nbsp;
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
+                    &nbsp;Browser version&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                                                        Unknown                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicesDetection/images/browsers/FF.gif'>
+                                        &nbsp;
+                                                                                                            Firefox 3.6                                                                                                                        </td>
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 16
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3.2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:22:49
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 20%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 80%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(126,115,99); font-size: 11pt;">
-    Browser version
+<h2 id="DevicesDetection_getModel" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
+    Device model
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
-                    &nbsp;Browser version&nbsp;&nbsp;
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
+                    &nbsp;Device model&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/browsers/FF.gif'>
-                                        &nbsp;
-                                                                                                            Firefox 3.6                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                                                        Unknown                                                                                                                        </td>
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 16
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3.2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:22:49
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 20%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 80%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getOsFamilies" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="DevicesDetection_getOsFamilies" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Operating System families
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Operating system family&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/WI7.gif'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicesDetection/images/os/WIN.gif'>
                                         &nbsp;
                                                                                                             Windows                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 16
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3.2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:22:49
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 20%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 80%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getOsVersions" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="DevicesDetection_getOsVersions" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Operating System versions
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Operating System versions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                                                        <img src='plugins/UserSettings/images/os/WXP.gif'>
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
+                                                                                                                                        <img src='plugins/DevicesDetection/images/os/WIN.gif'>
                                         &nbsp;
                                                                                                             Windows XP                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 16
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3.2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:22:49
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 20%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 80%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
-<h2 id="DevicesDetection_getBrowserEngines" style="color: rgb(126,115,99); font-size: 11pt;">
+<h2 id="DevicesDetection_getBrowserEngines" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
     Browser engines
 </h2>
 
     
     
             <table style="border-collapse:collapse; margin-left: 5px;">
-            <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
-                            <th style="padding: 6px 0;">
+            <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Browser engine&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Visits&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Actions per Visit&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Avg. Time on Website&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Bounce Rate&nbsp;&nbsp;
                 </th>
-                            <th style="padding: 6px 0;">
+                            <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
                     &nbsp;Conversion Rate&nbsp;&nbsp;
                 </th>
                         </thead>
             <tbody>
                                                     
-                                                                    <tr style="">
-                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                                                    <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+                                                                <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                                                                                         Gecko (Firefox)                                                                                                                        </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 5
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 16
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 3.2
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 00:22:49
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 20%
                                                                                     </td>
-                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+                                            <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 80%
                                                                                     </td>
                                     </tr>
                         </tbody>
         </table>
         <br/>
-    <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+    <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
         Back to top
     </a>
 </body>
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicePlugins.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicePlugins.getPlugin_day.xml
new file mode 100644
index 0000000000..106f23f16b
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicePlugins.getPlugin_day.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2009-01-04" />
+	<result date="2009-01-05" />
+	<result date="2009-01-06" />
+	<result date="2009-01-07" />
+	<result date="2009-01-08" />
+	<result date="2009-01-09" />
+	<result date="2009-01-10" />
+</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicePlugins.getPlugin_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicePlugins.getPlugin_week.xml
new file mode 100644
index 0000000000..5cfb246edc
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicePlugins.getPlugin_week.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="From 2008-12-29 to 2009-01-04" />
+	<result date="From 2009-01-05 to 2009-01-11" />
+	<result date="From 2009-01-12 to 2009-01-18" />
+	<result date="From 2009-01-19 to 2009-01-25" />
+	<result date="From 2009-01-26 to 2009-02-01" />
+	<result date="From 2009-02-02 to 2009-02-08" />
+	<result date="From 2009-02-09 to 2009-02-15" />
+</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getExampleReport_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getExampleReport_day.xml
index 1b2fed39f9..49765ba76c 100644
--- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getExampleReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getExampleReport_day.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
+		<label>My Label 1</label>
+		<nb_visits>1</nb_visits>
+	</row>
+	<row>
+		<label>My Label 2</label>
 		<nb_visits>5</nb_visits>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getExampleReport_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getExampleReport_week.xml
index 1b2fed39f9..49765ba76c 100644
--- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getExampleReport_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getExampleReport_week.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
+		<label>My Label 1</label>
+		<nb_visits>1</nb_visits>
+	</row>
+	<row>
+		<label>My Label 2</label>
 		<nb_visits>5</nb_visits>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getConfiguration_day.xml
new file mode 100644
index 0000000000..106f23f16b
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getConfiguration_day.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2009-01-04" />
+	<result date="2009-01-05" />
+	<result date="2009-01-06" />
+	<result date="2009-01-07" />
+	<result date="2009-01-08" />
+	<result date="2009-01-09" />
+	<result date="2009-01-10" />
+</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getConfiguration_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getConfiguration_week.xml
new file mode 100644
index 0000000000..5cfb246edc
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getConfiguration_week.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="From 2008-12-29 to 2009-01-04" />
+	<result date="From 2009-01-05 to 2009-01-11" />
+	<result date="From 2009-01-12 to 2009-01-18" />
+	<result date="From 2009-01-19 to 2009-01-25" />
+	<result date="From 2009-01-26 to 2009-02-01" />
+	<result date="From 2009-02-02 to 2009-02-08" />
+	<result date="From 2009-02-09 to 2009-02-15" />
+</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getResolution_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getResolution_day.xml
new file mode 100644
index 0000000000..106f23f16b
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getResolution_day.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2009-01-04" />
+	<result date="2009-01-05" />
+	<result date="2009-01-06" />
+	<result date="2009-01-07" />
+	<result date="2009-01-08" />
+	<result date="2009-01-09" />
+	<result date="2009-01-10" />
+</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getResolution_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getResolution_week.xml
new file mode 100644
index 0000000000..5cfb246edc
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getResolution_week.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="From 2008-12-29 to 2009-01-04" />
+	<result date="From 2009-01-05 to 2009-01-11" />
+	<result date="From 2009-01-12 to 2009-01-18" />
+	<result date="From 2009-01-19 to 2009-01-25" />
+	<result date="From 2009-01-26 to 2009-02-01" />
+	<result date="From 2009-02-02 to 2009-02-08" />
+	<result date="From 2009-02-09 to 2009-02-15" />
+</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserLanguage.getLanguageCode_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserLanguage.getLanguageCode_day.xml
new file mode 100644
index 0000000000..106f23f16b
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserLanguage.getLanguageCode_day.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2009-01-04" />
+	<result date="2009-01-05" />
+	<result date="2009-01-06" />
+	<result date="2009-01-07" />
+	<result date="2009-01-08" />
+	<result date="2009-01-09" />
+	<result date="2009-01-10" />
+</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserLanguage.getLanguageCode_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserLanguage.getLanguageCode_week.xml
new file mode 100644
index 0000000000..5cfb246edc
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserLanguage.getLanguageCode_week.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="From 2008-12-29 to 2009-01-04" />
+	<result date="From 2009-01-05 to 2009-01-11" />
+	<result date="From 2009-01-12 to 2009-01-18" />
+	<result date="From 2009-01-19 to 2009-01-25" />
+	<result date="From 2009-01-26 to 2009-02-01" />
+	<result date="From 2009-02-02 to 2009-02-08" />
+	<result date="From 2009-02-09 to 2009-02-15" />
+</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserLanguage.getLanguage_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserLanguage.getLanguage_day.xml
new file mode 100644
index 0000000000..106f23f16b
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserLanguage.getLanguage_day.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2009-01-04" />
+	<result date="2009-01-05" />
+	<result date="2009-01-06" />
+	<result date="2009-01-07" />
+	<result date="2009-01-08" />
+	<result date="2009-01-09" />
+	<result date="2009-01-10" />
+</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserLanguage.getLanguage_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserLanguage.getLanguage_week.xml
new file mode 100644
index 0000000000..5cfb246edc
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserLanguage.getLanguage_week.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="From 2008-12-29 to 2009-01-04" />
+	<result date="From 2009-01-05 to 2009-01-11" />
+	<result date="From 2009-01-12 to 2009-01-18" />
+	<result date="From 2009-01-19 to 2009-01-25" />
+	<result date="From 2009-01-26 to 2009-02-01" />
+	<result date="From 2009-02-02 to 2009-02-08" />
+	<result date="From 2009-02-09 to 2009-02-15" />
+</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit__DevicePlugins.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_noVisit__DevicePlugins.getPlugin_day.xml
new file mode 100644
index 0000000000..c234bed59e
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_noVisit__DevicePlugins.getPlugin_day.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result />
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit__ExamplePlugin.getExampleReport_day.xml b/tests/PHPUnit/System/expected/test_noVisit__ExamplePlugin.getExampleReport_day.xml
index 1b2fed39f9..49765ba76c 100644
--- a/tests/PHPUnit/System/expected/test_noVisit__ExamplePlugin.getExampleReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__ExamplePlugin.getExampleReport_day.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
+		<label>My Label 1</label>
+		<nb_visits>1</nb_visits>
+	</row>
+	<row>
+		<label>My Label 2</label>
 		<nb_visits>5</nb_visits>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit__Resolution.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Resolution.getConfiguration_day.xml
new file mode 100644
index 0000000000..c234bed59e
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_noVisit__Resolution.getConfiguration_day.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result />
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit__Resolution.getResolution_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Resolution.getResolution_day.xml
new file mode 100644
index 0000000000..c234bed59e
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_noVisit__Resolution.getResolution_day.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result />
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit__UserLanguage.getLanguageCode_day.xml b/tests/PHPUnit/System/expected/test_noVisit__UserLanguage.getLanguageCode_day.xml
new file mode 100644
index 0000000000..c234bed59e
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_noVisit__UserLanguage.getLanguageCode_day.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result />
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit__UserLanguage.getLanguage_day.xml b/tests/PHPUnit/System/expected/test_noVisit__UserLanguage.getLanguage_day.xml
new file mode 100644
index 0000000000..c234bed59e
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_noVisit__UserLanguage.getLanguage_day.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result />
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Actions.getPageUrls_range.xml
index fdcb7efcf3..c0091c6eef 100644
--- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Actions.getPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Actions.getPageUrls_range.xml
@@ -15,6 +15,7 @@
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
 		<url>http://example.org/homepage</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fhomepage</segment>
 	</row>
 	<row>
 		<label>/news</label>
@@ -33,6 +34,7 @@
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
 		<url>http://example.org/news</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fnews</segment>
 	</row>
 	<row>
 		<label>sub1</label>
diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Resolution.getResolution_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Resolution.getResolution_range.xml
new file mode 100644
index 0000000000..ec3805d0ff
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Resolution.getResolution_range.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>1024x768</label>
+		<nb_visits>6</nb_visits>
+		<nb_actions>9</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>1083</sum_visit_length>
+		<bounce_count>3</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>resolution==1024x768</segment>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml
index 7cbd671101..1e511f6135 100644
--- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml
+++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml
@@ -12,6 +12,7 @@
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>fr</code>
 		<logo>plugins/UserCountry/images/flags/fr.png</logo>
+		<segment>countryCode==fr</segment>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserSettings.getResolution_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserSettings.getResolution_range.xml
deleted file mode 100644
index bef1e186ef..0000000000
--- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserSettings.getResolution_range.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
-	<row>
-		<label>1024x768</label>
-		<nb_visits>6</nb_visits>
-		<nb_actions>9</nb_actions>
-		<max_actions>2</max_actions>
-		<sum_visit_length>1083</sum_visit_length>
-		<bounce_count>3</bounce_count>
-		<nb_visits_converted>0</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
-	</row>
-</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml
index b054303185..4f4de53b6e 100644
--- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml
+++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml
@@ -10,6 +10,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==0</segment>
 	</row>
 	<row>
 		<label>1h</label>
@@ -21,6 +22,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==1</segment>
 	</row>
 	<row>
 		<label>2h</label>
@@ -32,6 +34,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==2</segment>
 	</row>
 	<row>
 		<label>3h</label>
@@ -43,6 +46,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==3</segment>
 	</row>
 	<row>
 		<label>4h</label>
@@ -54,6 +58,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==4</segment>
 	</row>
 	<row>
 		<label>5h</label>
@@ -65,6 +70,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==5</segment>
 	</row>
 	<row>
 		<label>6h</label>
@@ -76,6 +82,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==6</segment>
 	</row>
 	<row>
 		<label>7h</label>
@@ -87,6 +94,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==7</segment>
 	</row>
 	<row>
 		<label>8h</label>
@@ -98,6 +106,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==8</segment>
 	</row>
 	<row>
 		<label>9h</label>
@@ -109,6 +118,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==9</segment>
 	</row>
 	<row>
 		<label>10h</label>
@@ -120,6 +130,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==10</segment>
 	</row>
 	<row>
 		<label>11h</label>
@@ -131,6 +142,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==11</segment>
 	</row>
 	<row>
 		<label>12h</label>
@@ -142,6 +154,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==12</segment>
 	</row>
 	<row>
 		<label>13h</label>
@@ -153,6 +166,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==13</segment>
 	</row>
 	<row>
 		<label>14h</label>
@@ -164,6 +178,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==14</segment>
 	</row>
 	<row>
 		<label>15h</label>
@@ -175,6 +190,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==15</segment>
 	</row>
 	<row>
 		<label>16h</label>
@@ -186,6 +202,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==16</segment>
 	</row>
 	<row>
 		<label>17h</label>
@@ -197,6 +214,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==17</segment>
 	</row>
 	<row>
 		<label>18h</label>
@@ -208,6 +226,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==18</segment>
 	</row>
 	<row>
 		<label>19h</label>
@@ -219,6 +238,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==19</segment>
 	</row>
 	<row>
 		<label>20h</label>
@@ -230,6 +250,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==20</segment>
 	</row>
 	<row>
 		<label>21h</label>
@@ -241,6 +262,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==21</segment>
 	</row>
 	<row>
 		<label>22h</label>
@@ -252,6 +274,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==22</segment>
 	</row>
 	<row>
 		<label>23h</label>
@@ -263,5 +286,6 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>visitServerHour==23</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_expanded___Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_expanded___Actions.getPageUrls_range.xml
index f5ed922233..8258370871 100644
--- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_expanded___Actions.getPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_expanded___Actions.getPageUrls_range.xml
@@ -15,6 +15,7 @@
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
 		<url>http://example.org/homepage</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fhomepage</segment>
 	</row>
 	<row>
 		<label>/news</label>
@@ -33,6 +34,7 @@
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
 		<url>http://example.org/news</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fnews</segment>
 	</row>
 	<row>
 		<label>sub1</label>
diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_flattened___Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_flattened___Actions.getPageUrls_range.xml
index 1f11de6d95..2b0bf155df 100644
--- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_flattened___Actions.getPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_flattened___Actions.getPageUrls_range.xml
@@ -15,6 +15,7 @@
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
 		<url>http://example.org/homepage</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fhomepage</segment>
 	</row>
 	<row>
 		<label>news</label>
@@ -33,6 +34,7 @@
 		<bounce_rate>100%</bounce_rate>
 		<exit_rate>100%</exit_rate>
 		<url>http://example.org/news</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fnews</segment>
 	</row>
 	<row>
 		<label>sub1/sub2/sub3/news</label>
@@ -46,5 +48,6 @@
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>100%</exit_rate>
 		<url>http://example.org/sub1/sub2/sub3/news</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fsub1%2Fsub2%2Fsub3%2Fnews</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml
index 077a490219..f704570bac 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml
@@ -58,6 +58,7 @@
 		<row>
 			<code>fr</code>
 			<logo>plugins/UserCountry/images/flags/fr.png</logo>
+			<segment>countryCode==fr</segment>
 			<logoWidth>16</logoWidth>
 			<logoHeight>11</logoHeight>
 		</row>
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Actions.getPageUrls_range.xml
index 7bc6d955d2..457accfc9a 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Actions.getPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Actions.getPageUrls_range.xml
@@ -17,6 +17,7 @@
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>50%</exit_rate>
 		<url>http://example.org/homepage</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fhomepage</segment>
 	</row>
 	<row>
 		<label>user</label>
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml
index b48064a09c..a7230abb14 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml
@@ -14,6 +14,7 @@
 				
 				<pageId>5</pageId>
 				<icon>plugins/Morpheus/images/link.gif</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -23,8 +24,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -38,39 +37,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>VisitorType</customVariableName1>
-				<customVariableValue1>LoggedOut</customVariableValue1>
-			</row>
-			<row>
-				<customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2>
-				<customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.0</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -82,21 +72,34 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>VisitorType</customVariableName1>
+				<customVariableValue1>LoggedOut</customVariableValue1>
+			</row>
+			<row>
+				<customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2>
+				<customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2>
+			</row>
+		</customVariables>
 		<resolution>1111x222</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -118,6 +121,7 @@
 				
 				<url>http://example.org/homepage</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -127,6 +131,7 @@
 				
 				<pageId>4</pageId>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -136,8 +141,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -151,39 +154,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>361</visitDuration>
 		<visitDurationPretty>6 min 1s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>VisitorType</customVariableName1>
-				<customVariableValue1>LoggedOut</customVariableValue1>
-			</row>
-			<row>
-				<customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2>
-				<customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.0</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -195,21 +189,34 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>VisitorType</customVariableName1>
+				<customVariableValue1>LoggedOut</customVariableValue1>
+			</row>
+			<row>
+				<customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2>
+				<customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2>
+			</row>
+		</customVariables>
 		<resolution>1111x222</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -231,6 +238,7 @@
 				
 				<url>http://example.org/homepage</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -242,6 +250,7 @@
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -252,50 +261,53 @@
 				
 				<url>http://example.org/user/profile</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
 				<url>http://example.org/user/profile</url>
-				<pageTitle>Profile page for user *_)%</pageTitle>
+				<pageTitle>Profile page</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
-				<pageId>3</pageId>
+				<pageId>2</pageId>
 				<customVariables>
 					<row>
-						<customVariablePageName1>Language</customVariablePageName1>
-						<customVariablePageValue1>FR</customVariablePageValue1>
-					</row>
-					<row>
-						<customVariablePageName2>SET WITH EMPTY VALUE PAGE SCOPE</customVariablePageName2>
-						<customVariablePageValue2 />
+						<customVariablePageName4>Status user</customVariablePageName4>
+						<customVariablePageValue4>Loggedin</customVariablePageValue4>
 					</row>
 					<row>
-						<customVariablePageName4>Status user</customVariablePageName4>
-						<customVariablePageValue4>looking at &quot;profile page&quot;</customVariablePageValue4>
+						<customVariablePageName5>Status user</customVariablePageName5>
+						<customVariablePageValue5>looking at &quot;profile page&quot;</customVariablePageValue5>
 					</row>
 				</customVariables>
+				<timeSpent>0</timeSpent>
+				<timeSpentPretty>0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
 				<url>http://example.org/user/profile</url>
-				<pageTitle>Profile page</pageTitle>
+				<pageTitle>Profile page for user *_)%</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
-				<pageId>2</pageId>
+				<pageId>3</pageId>
 				<customVariables>
 					<row>
-						<customVariablePageName4>Status user</customVariablePageName4>
-						<customVariablePageValue4>Loggedin</customVariablePageValue4>
+						<customVariablePageName1>Language</customVariablePageName1>
+						<customVariablePageValue1>FR</customVariablePageValue1>
 					</row>
 					<row>
-						<customVariablePageName5>Status user</customVariablePageName5>
-						<customVariablePageValue5>looking at &quot;profile page&quot;</customVariablePageValue5>
+						<customVariablePageName2>SET WITH EMPTY VALUE PAGE SCOPE</customVariablePageName2>
+						<customVariablePageValue2 />
+					</row>
+					<row>
+						<customVariablePageName4>Status user</customVariablePageName4>
+						<customVariablePageValue4>looking at &quot;profile page&quot;</customVariablePageValue4>
 					</row>
 				</customVariables>
-				<timeSpent>0</timeSpent>
-				<timeSpentPretty>0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -305,8 +317,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>3</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -320,43 +330,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>364</visitDuration>
 		<visitDurationPretty>6 min 4s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>VisitorType</customVariableName1>
-				<customVariableValue1>LoggedIn</customVariableValue1>
-			</row>
-			<row>
-				<customVariableName2>SET WITH EMPTY VALUE</customVariableName2>
-				<customVariableValue2 />
-			</row>
-			<row>
-				<customVariableName3>Value will be VERY long and truncated</customVariableName3>
-				<customVariableValue3>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</customVariableValue3>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>3</actions>
+		<referrerType>search</referrerType>
+		<referrerTypeName>Search Engines</referrerTypeName>
+		<referrerName>Google</referrerName>
+		<referrerKeyword>this keyword should be ranked</referrerKeyword>
+		<referrerKeywordPosition>1</referrerKeywordPosition>
+		<referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl>
+		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
+		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>search</referrerType>
-		<referrerTypeName>Search Engines</referrerTypeName>
-		<referrerName>Google</referrerName>
-		<referrerKeyword>this keyword should be ranked</referrerKeyword>
-		<referrerKeywordPosition>1</referrerKeywordPosition>
-		<referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl>
-		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
-		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -368,21 +365,38 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>VisitorType</customVariableName1>
+				<customVariableValue1>LoggedIn</customVariableValue1>
+			</row>
+			<row>
+				<customVariableName2>SET WITH EMPTY VALUE</customVariableName2>
+				<customVariableValue2 />
+			</row>
+			<row>
+				<customVariableName3>Value will be VERY long and truncated</customVariableName3>
+				<customVariableValue3>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</customVariableValue3>
+			</row>
+		</customVariables>
 		<resolution>1111x222</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
index b48064a09c..a7230abb14 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
@@ -14,6 +14,7 @@
 				
 				<pageId>5</pageId>
 				<icon>plugins/Morpheus/images/link.gif</icon>
+				
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -23,8 +24,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -38,39 +37,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>VisitorType</customVariableName1>
-				<customVariableValue1>LoggedOut</customVariableValue1>
-			</row>
-			<row>
-				<customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2>
-				<customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.0</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -82,21 +72,34 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>VisitorType</customVariableName1>
+				<customVariableValue1>LoggedOut</customVariableValue1>
+			</row>
+			<row>
+				<customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2>
+				<customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2>
+			</row>
+		</customVariables>
 		<resolution>1111x222</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -118,6 +121,7 @@
 				
 				<url>http://example.org/homepage</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -127,6 +131,7 @@
 				
 				<pageId>4</pageId>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>1</goalConversions>
@@ -136,8 +141,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>1</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -151,39 +154,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>361</visitDuration>
 		<visitDurationPretty>6 min 1s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>VisitorType</customVariableName1>
-				<customVariableValue1>LoggedOut</customVariableValue1>
-			</row>
-			<row>
-				<customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2>
-				<customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>1</actions>
+		<referrerType>direct</referrerType>
+		<referrerTypeName>Direct Entry</referrerTypeName>
+		<referrerName />
+		<referrerKeyword />
+		<referrerKeywordPosition />
+		<referrerUrl />
+		<referrerSearchEngineUrl />
+		<referrerSearchEngineIcon />
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.0</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.0</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -195,21 +189,34 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>VisitorType</customVariableName1>
+				<customVariableValue1>LoggedOut</customVariableValue1>
+			</row>
+			<row>
+				<customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2>
+				<customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2>
+			</row>
+		</customVariables>
 		<resolution>1111x222</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
@@ -231,6 +238,7 @@
 				
 				<url>http://example.org/homepage</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
@@ -242,6 +250,7 @@
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>goal</type>
@@ -252,50 +261,53 @@
 				
 				<url>http://example.org/user/profile</url>
 				<icon>plugins/Morpheus/images/goal.png</icon>
+				
 			</row>
 			<row>
 				<type>action</type>
 				<url>http://example.org/user/profile</url>
-				<pageTitle>Profile page for user *_)%</pageTitle>
+				<pageTitle>Profile page</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
-				<pageId>3</pageId>
+				<pageId>2</pageId>
 				<customVariables>
 					<row>
-						<customVariablePageName1>Language</customVariablePageName1>
-						<customVariablePageValue1>FR</customVariablePageValue1>
-					</row>
-					<row>
-						<customVariablePageName2>SET WITH EMPTY VALUE PAGE SCOPE</customVariablePageName2>
-						<customVariablePageValue2 />
+						<customVariablePageName4>Status user</customVariablePageName4>
+						<customVariablePageValue4>Loggedin</customVariablePageValue4>
 					</row>
 					<row>
-						<customVariablePageName4>Status user</customVariablePageName4>
-						<customVariablePageValue4>looking at &quot;profile page&quot;</customVariablePageValue4>
+						<customVariablePageName5>Status user</customVariablePageName5>
+						<customVariablePageValue5>looking at &quot;profile page&quot;</customVariablePageValue5>
 					</row>
 				</customVariables>
+				<timeSpent>0</timeSpent>
+				<timeSpentPretty>0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 			<row>
 				<type>action</type>
 				<url>http://example.org/user/profile</url>
-				<pageTitle>Profile page</pageTitle>
+				<pageTitle>Profile page for user *_)%</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
-				<pageId>2</pageId>
+				<pageId>3</pageId>
 				<customVariables>
 					<row>
-						<customVariablePageName4>Status user</customVariablePageName4>
-						<customVariablePageValue4>Loggedin</customVariablePageValue4>
+						<customVariablePageName1>Language</customVariablePageName1>
+						<customVariablePageValue1>FR</customVariablePageValue1>
 					</row>
 					<row>
-						<customVariablePageName5>Status user</customVariablePageName5>
-						<customVariablePageValue5>looking at &quot;profile page&quot;</customVariablePageValue5>
+						<customVariablePageName2>SET WITH EMPTY VALUE PAGE SCOPE</customVariablePageName2>
+						<customVariablePageValue2 />
+					</row>
+					<row>
+						<customVariablePageName4>Status user</customVariablePageName4>
+						<customVariablePageValue4>looking at &quot;profile page&quot;</customVariablePageValue4>
 					</row>
 				</customVariables>
-				<timeSpent>0</timeSpent>
-				<timeSpentPretty>0s</timeSpentPretty>
 				<icon />
+				
 			</row>
 		</actionDetails>
 		<goalConversions>2</goalConversions>
@@ -305,8 +317,6 @@
 		
 		
 		
-		<searches>0</searches>
-		<actions>3</actions>
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
@@ -320,43 +330,30 @@
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<visitDuration>364</visitDuration>
 		<visitDurationPretty>6 min 4s</visitDurationPretty>
-		<customVariables>
-			<row>
-				<customVariableName1>VisitorType</customVariableName1>
-				<customVariableValue1>LoggedIn</customVariableValue1>
-			</row>
-			<row>
-				<customVariableName2>SET WITH EMPTY VALUE</customVariableName2>
-				<customVariableValue2 />
-			</row>
-			<row>
-				<customVariableName3>Value will be VERY long and truncated</customVariableName3>
-				<customVariableValue3>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</customVariableValue3>
-			</row>
-		</customVariables>
+		<searches>0</searches>
+		<actions>3</actions>
+		<referrerType>search</referrerType>
+		<referrerTypeName>Search Engines</referrerTypeName>
+		<referrerName>Google</referrerName>
+		<referrerKeyword>this keyword should be ranked</referrerKeyword>
+		<referrerKeywordPosition>1</referrerKeywordPosition>
+		<referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl>
+		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
+		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<deviceType>Desktop</deviceType>
 		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemCode>WXP</operatingSystemCode>
-		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<operatingSystemName>Windows</operatingSystemName>
+		<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+		<operatingSystemCode>WIN</operatingSystemCode>
+		<operatingSystemVersion>XP</operatingSystemVersion>
 		<browserFamily>Gecko</browserFamily>
 		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 		<browser>Firefox 3.6</browser>
 		<browserName>Firefox</browserName>
-		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
 		<events>0</events>
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl />
-		<referrerType>search</referrerType>
-		<referrerTypeName>Search Engines</referrerTypeName>
-		<referrerName>Google</referrerName>
-		<referrerKeyword>this keyword should be ranked</referrerKeyword>
-		<referrerKeywordPosition>1</referrerKeywordPosition>
-		<referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl>
-		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
-		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -368,21 +365,38 @@
 		<location>France</location>
 		<latitude />
 		<longitude />
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl />
+		<customVariables>
+			<row>
+				<customVariableName1>VisitorType</customVariableName1>
+				<customVariableValue1>LoggedIn</customVariableValue1>
+			</row>
+			<row>
+				<customVariableName2>SET WITH EMPTY VALUE</customVariableName2>
+				<customVariableValue2 />
+			</row>
+			<row>
+				<customVariableName3>Value will be VERY long and truncated</customVariableName3>
+				<customVariableValue3>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</customVariableValue3>
+			</row>
+		</customVariables>
 		<resolution>1111x222</resolution>
 		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 				<pluginName>flash</pluginName>
 			</row>
 			<row>
-				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
 		
 		
 		
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
index 60e389c7ab..583e3bcb75 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
@@ -4,11 +4,12 @@
 	<totalVisitDuration>361</totalVisitDuration>
 	<totalActions>2</totalActions>
 	<totalSearches>0</totalSearches>
-	<totalPageViews>0</totalPageViews>
+	<totalPageViewsWithTiming>0</totalPageViewsWithTiming>
 	<totalGoalConversions>1</totalGoalConversions>
 	<totalConversionsByGoal>
 		<row idgoal="1">1</row>
 	</totalConversionsByGoal>
+	<hasLatLong>0</hasLatLong>
 	<searches>
 	</searches>
 	<continents>
@@ -42,6 +43,8 @@
 		<referralSummary>Direct Entry</referralSummary>
 	</lastVisit>
 	<visitsAggregated>2</visitsAggregated>
+	
+	
 	<lastVisits>
 		<row>
 			<idSite>1</idSite>
@@ -57,6 +60,7 @@
 					
 					<pageId>5</pageId>
 					<icon>plugins/Morpheus/images/link.gif</icon>
+					
 				</row>
 			</actionDetails>
 			<goalConversions>0</goalConversions>
@@ -66,8 +70,6 @@
 			
 			
 			
-			<searches>0</searches>
-			<actions>1</actions>
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
@@ -81,39 +83,30 @@
 			<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 			<visitDuration>0</visitDuration>
 			<visitDurationPretty>0s</visitDurationPretty>
-			<customVariables>
-				<row>
-					<customVariableName1>VisitorType</customVariableName1>
-					<customVariableValue1>LoggedOut</customVariableValue1>
-				</row>
-				<row>
-					<customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2>
-					<customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2>
-				</row>
-			</customVariables>
+			<searches>0</searches>
+			<actions>1</actions>
+			<referrerType>direct</referrerType>
+			<referrerTypeName>Direct Entry</referrerTypeName>
+			<referrerName />
+			<referrerKeyword />
+			<referrerKeywordPosition />
+			<referrerUrl />
+			<referrerSearchEngineUrl />
+			<referrerSearchEngineIcon />
 			<deviceType>Desktop</deviceType>
 			<operatingSystem>Windows XP</operatingSystem>
-			<operatingSystemCode>WXP</operatingSystemCode>
-			<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+			<operatingSystemName>Windows</operatingSystemName>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+			<operatingSystemCode>WIN</operatingSystemCode>
+			<operatingSystemVersion>XP</operatingSystemVersion>
 			<browserFamily>Gecko</browserFamily>
 			<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 			<browser>Firefox 3.0</browser>
 			<browserName>Firefox</browserName>
-			<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 			<browserCode>FF</browserCode>
 			<browserVersion>3.0</browserVersion>
 			<events>0</events>
-			<provider>Unknown</provider>
-			<providerName>Unknown</providerName>
-			<providerUrl />
-			<referrerType>direct</referrerType>
-			<referrerTypeName>Direct Entry</referrerTypeName>
-			<referrerName />
-			<referrerKeyword />
-			<referrerKeywordPosition />
-			<referrerUrl />
-			<referrerSearchEngineUrl />
-			<referrerSearchEngineIcon />
 			<continent>Europe</continent>
 			<continentCode>eur</continentCode>
 			<country>France</country>
@@ -125,21 +118,34 @@
 			<location>France</location>
 			<latitude />
 			<longitude />
+			<visitLocalTime>12:34:06</visitLocalTime>
+			<visitLocalHour>12</visitLocalHour>
+			<daysSinceLastVisit>0</daysSinceLastVisit>
+			<provider>Unknown</provider>
+			<providerName>Unknown</providerName>
+			<providerUrl />
+			<customVariables>
+				<row>
+					<customVariableName1>VisitorType</customVariableName1>
+					<customVariableValue1>LoggedOut</customVariableValue1>
+				</row>
+				<row>
+					<customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2>
+					<customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2>
+				</row>
+			</customVariables>
 			<resolution>1111x222</resolution>
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			<visitLocalTime>12:34:06</visitLocalTime>
-			<visitLocalHour>12</visitLocalHour>
-			<daysSinceLastVisit>0</daysSinceLastVisit>
 			
 			
 			
@@ -162,6 +168,7 @@
 					
 					<url>http://example.org/homepage</url>
 					<icon>plugins/Morpheus/images/goal.png</icon>
+					
 				</row>
 				<row>
 					<type>action</type>
@@ -171,6 +178,7 @@
 					
 					<pageId>4</pageId>
 					<icon />
+					
 				</row>
 			</actionDetails>
 			<goalConversions>1</goalConversions>
@@ -180,8 +188,6 @@
 			
 			
 			
-			<searches>0</searches>
-			<actions>1</actions>
 			<userId />
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
@@ -195,39 +201,30 @@
 			<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 			<visitDuration>361</visitDuration>
 			<visitDurationPretty>6 min 1s</visitDurationPretty>
-			<customVariables>
-				<row>
-					<customVariableName1>VisitorType</customVariableName1>
-					<customVariableValue1>LoggedOut</customVariableValue1>
-				</row>
-				<row>
-					<customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2>
-					<customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2>
-				</row>
-			</customVariables>
+			<searches>0</searches>
+			<actions>1</actions>
+			<referrerType>direct</referrerType>
+			<referrerTypeName>Direct Entry</referrerTypeName>
+			<referrerName />
+			<referrerKeyword />
+			<referrerKeywordPosition />
+			<referrerUrl />
+			<referrerSearchEngineUrl />
+			<referrerSearchEngineIcon />
 			<deviceType>Desktop</deviceType>
 			<operatingSystem>Windows XP</operatingSystem>
-			<operatingSystemCode>WXP</operatingSystemCode>
-			<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+			<operatingSystemName>Windows</operatingSystemName>
+			<operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+			<operatingSystemCode>WIN</operatingSystemCode>
+			<operatingSystemVersion>XP</operatingSystemVersion>
 			<browserFamily>Gecko</browserFamily>
 			<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
 			<browser>Firefox 3.0</browser>
 			<browserName>Firefox</browserName>
-			<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+			<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 			<browserCode>FF</browserCode>
 			<browserVersion>3.0</browserVersion>
 			<events>0</events>
-			<provider>Unknown</provider>
-			<providerName>Unknown</providerName>
-			<providerUrl />
-			<referrerType>direct</referrerType>
-			<referrerTypeName>Direct Entry</referrerTypeName>
-			<referrerName />
-			<referrerKeyword />
-			<referrerKeywordPosition />
-			<referrerUrl />
-			<referrerSearchEngineUrl />
-			<referrerSearchEngineIcon />
 			<continent>Europe</continent>
 			<continentCode>eur</continentCode>
 			<country>France</country>
@@ -239,21 +236,34 @@
 			<location>France</location>
 			<latitude />
 			<longitude />
+			<visitLocalTime>12:34:06</visitLocalTime>
+			<visitLocalHour>12</visitLocalHour>
+			<daysSinceLastVisit>0</daysSinceLastVisit>
+			<provider>Unknown</provider>
+			<providerName>Unknown</providerName>
+			<providerUrl />
+			<customVariables>
+				<row>
+					<customVariableName1>VisitorType</customVariableName1>
+					<customVariableValue1>LoggedOut</customVariableValue1>
+				</row>
+				<row>
+					<customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2>
+					<customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2>
+				</row>
+			</customVariables>
 			<resolution>1111x222</resolution>
 			<plugins>flash, java</plugins>
 			<pluginsIcons>
 				<row>
-					<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
 					<pluginName>flash</pluginName>
 				</row>
 				<row>
-					<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+					<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
 					<pluginName>java</pluginName>
 				</row>
 			</pluginsIcons>
-			<visitLocalTime>12:34:06</visitLocalTime>
-			<visitLocalHour>12</visitLocalHour>
-			<daysSinceLastVisit>0</daysSinceLastVisit>
 			
 			
 			
@@ -263,6 +273,4 @@
 		</row>
 	</lastVisits>
 	<userId>0</userId>
-	
-	
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getCampaigns_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getCampaigns_range.xml
index 4faa5d55df..566315146e 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getCampaigns_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getCampaigns_range.xml
@@ -12,6 +12,7 @@
 		<nb_conversions>1</nb_conversions>
 		<revenue>1000</revenue>
 		<nb_visits>0</nb_visits>
+		<segment>referrerType==campaign;referrerName==campaign+name+-+yeah%21</segment>
 		<subtable>
 			<row>
 				<label>campaign keyword - right...</label>
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml
index bd1f763bd0..418287bdef 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml
@@ -10,6 +10,7 @@
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>referrerType==search;referrerKeyword==this+keyword+should+be+ranked</segment>
 		<subtable>
 			<row>
 				<label>Google</label>
@@ -41,5 +42,6 @@
 		<nb_conversions>2</nb_conversions>
 		<revenue>0</revenue>
 		<nb_visits>0</nb_visits>
+		<segment>referrerType==search;referrerKeyword==piwik</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml
index a968371537..23bcf1329b 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml
@@ -10,7 +10,8 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>15</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+		<segment>browserCode==FF;browserVersion==6.0</segment>
+		<logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
 	</row>
 	<row>
 		<label>Internet Explorer 9.0</label>
@@ -22,7 +23,8 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>15</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<logo>plugins/UserSettings/images/browsers/IE.gif</logo>
+		<segment>browserCode==IE;browserVersion==9.0</segment>
+		<logo>plugins/DevicesDetection/images/browsers/IE.gif</logo>
 	</row>
 	<row>
 		<label>Others</label>
@@ -34,6 +36,6 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>45</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
+		<logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml
index c58f00fa96..99b2ce1993 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml
@@ -10,7 +10,8 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<logo>plugins/UserSettings/images/os/LIN.gif</logo>
+		<segment>operatingSystemCode==LIN;operatingSystemVersion==</segment>
+		<logo>plugins/DevicesDetection/images/os/LIN.gif</logo>
 	</row>
 	<row>
 		<label>Android 4.0</label>
@@ -22,7 +23,8 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>15</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<logo>plugins/UserSettings/images/os/AND.gif</logo>
+		<segment>operatingSystemCode==AND;operatingSystemVersion==4.0</segment>
+		<logo>plugins/DevicesDetection/images/os/AND.gif</logo>
 	</row>
 	<row>
 		<label>Others</label>
@@ -34,6 +36,6 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>40</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<logo>plugins/UserSettings/images/os/UNK.gif</logo>
+		<logo>plugins/DevicesDetection/images/os/UNK.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getKeywords_day.xml
index dd1f7037e6..10af9e9721 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getKeywords_day.xml
@@ -10,6 +10,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>3</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerType==search;referrerKeyword==this+search+term</segment>
 		<subtable>
 			<row>
 				<label>Ask</label>
@@ -45,6 +46,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerType==search;referrerKeyword==search+term+2</segment>
 		<subtable>
 			<row>
 				<label>Alexa</label>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml
index cfcc0601a9..fbd996bbe3 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml
@@ -10,6 +10,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>3</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerType==search;referrerName==Google</segment>
 		<url>http://google.com</url>
 		<logo>plugins/Referrers/images/searchEngines/google.com.png</logo>
 		<subtable>
@@ -47,6 +48,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>3</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerType==search;referrerName==Yahoo%21</segment>
 		<url>http://search.yahoo.com</url>
 		<logo>plugins/Referrers/images/searchEngines/search.yahoo.com.png</logo>
 		<subtable>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getWebsites_day.xml
index 6b473345a8..cb46ea8f5f 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getWebsites_day.xml
@@ -10,6 +10,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>4</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerName==whatever0.com</segment>
 		<subtable>
 			<row>
 				<label>http://whatever0.com/0</label>
@@ -45,6 +46,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerName==whatever1.com</segment>
 		<subtable>
 			<row>
 				<label>http://whatever1.com/0</label>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getConfiguration_day.xml
index b90214c2e9..b90214c2e9 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getConfiguration_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getConfiguration_day.xml
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getResolution_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getResolution_day.xml
new file mode 100644
index 0000000000..70e4bab0ff
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Resolution.getResolution_day.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>1920x1080</label>
+		<nb_uniq_visitors>4</nb_uniq_visitors>
+		<nb_visits>20</nb_visits>
+		<nb_actions>20</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>20</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<segment>resolution==1920x1080</segment>
+	</row>
+	<row>
+		<label>1280x1024</label>
+		<nb_uniq_visitors>3</nb_uniq_visitors>
+		<nb_visits>15</nb_visits>
+		<nb_actions>15</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>15</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<segment>resolution==1280x1024</segment>
+	</row>
+	<row>
+		<label>Others</label>
+		<nb_uniq_visitors>8</nb_uniq_visitors>
+		<nb_visits>40</nb_visits>
+		<nb_actions>40</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>40</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml
index c9eb98ffda..b9c8e33524 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml
@@ -10,6 +10,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>city==Melbourne;regionCode==07;countryCode==au</segment>
 		<city_name>Melbourne</city_name>
 		<region>07</region>
 		<country>au</country>
@@ -27,6 +28,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>city==Nice;regionCode==B8;countryCode==fr</segment>
 		<city_name>Nice</city_name>
 		<region>B8</region>
 		<country>fr</country>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml
index 50888ce069..e1782dfd61 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml
@@ -10,6 +10,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>regionCode==07;countryCode==au</segment>
 		<region>07</region>
 		<country>au</country>
 		<country_name>Australia</country_name>
@@ -26,6 +27,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>regionCode==B8;countryCode==fr</segment>
 		<region>B8</region>
 		<country>fr</country>
 		<country_name>France</country_name>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getResolution_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getResolution_day.xml
deleted file mode 100644
index 7b29bb6e65..0000000000
--- a/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getResolution_day.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
-	<row>
-		<label>1920x1080</label>
-		<nb_uniq_visitors>4</nb_uniq_visitors>
-		<nb_visits>20</nb_visits>
-		<nb_actions>20</nb_actions>
-		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>20</bounce_count>
-		<nb_visits_converted>0</nb_visits_converted>
-	</row>
-	<row>
-		<label>1280x1024</label>
-		<nb_uniq_visitors>3</nb_uniq_visitors>
-		<nb_visits>15</nb_visits>
-		<nb_actions>15</nb_actions>
-		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>15</bounce_count>
-		<nb_visits_converted>0</nb_visits_converted>
-	</row>
-	<row>
-		<label>Others</label>
-		<nb_uniq_visitors>8</nb_uniq_visitors>
-		<nb_visits>40</nb_visits>
-		<nb_actions>40</nb_actions>
-		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>40</bounce_count>
-		<nb_visits_converted>0</nb_visits_converted>
-	</row>
-</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml
index a968371537..23bcf1329b 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml
@@ -10,7 +10,8 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>15</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
+		<segment>browserCode==FF;browserVersion==6.0</segment>
+		<logo>plugins/DevicesDetection/images/browsers/FF.gif</logo>
 	</row>
 	<row>
 		<label>Internet Explorer 9.0</label>
@@ -22,7 +23,8 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>15</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<logo>plugins/UserSettings/images/browsers/IE.gif</logo>
+		<segment>browserCode==IE;browserVersion==9.0</segment>
+		<logo>plugins/DevicesDetection/images/browsers/IE.gif</logo>
 	</row>
 	<row>
 		<label>Others</label>
@@ -34,6 +36,6 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>45</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
+		<logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml
index c58f00fa96..99b2ce1993 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml
@@ -10,7 +10,8 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<logo>plugins/UserSettings/images/os/LIN.gif</logo>
+		<segment>operatingSystemCode==LIN;operatingSystemVersion==</segment>
+		<logo>plugins/DevicesDetection/images/os/LIN.gif</logo>
 	</row>
 	<row>
 		<label>Android 4.0</label>
@@ -22,7 +23,8 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>15</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<logo>plugins/UserSettings/images/os/AND.gif</logo>
+		<segment>operatingSystemCode==AND;operatingSystemVersion==4.0</segment>
+		<logo>plugins/DevicesDetection/images/os/AND.gif</logo>
 	</row>
 	<row>
 		<label>Others</label>
@@ -34,6 +36,6 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>40</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<logo>plugins/UserSettings/images/os/UNK.gif</logo>
+		<logo>plugins/DevicesDetection/images/os/UNK.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml
index dd1f7037e6..10af9e9721 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml
@@ -10,6 +10,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>3</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerType==search;referrerKeyword==this+search+term</segment>
 		<subtable>
 			<row>
 				<label>Ask</label>
@@ -45,6 +46,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerType==search;referrerKeyword==search+term+2</segment>
 		<subtable>
 			<row>
 				<label>Alexa</label>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml
index cfcc0601a9..fbd996bbe3 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml
@@ -10,6 +10,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>3</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerType==search;referrerName==Google</segment>
 		<url>http://google.com</url>
 		<logo>plugins/Referrers/images/searchEngines/google.com.png</logo>
 		<subtable>
@@ -47,6 +48,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>3</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerType==search;referrerName==Yahoo%21</segment>
 		<url>http://search.yahoo.com</url>
 		<logo>plugins/Referrers/images/searchEngines/search.yahoo.com.png</logo>
 		<subtable>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml
index 6b473345a8..cb46ea8f5f 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml
@@ -10,6 +10,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>4</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerName==whatever0.com</segment>
 		<subtable>
 			<row>
 				<label>http://whatever0.com/0</label>
@@ -45,6 +46,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerName==whatever1.com</segment>
 		<subtable>
 			<row>
 				<label>http://whatever1.com/0</label>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Resolution.getConfiguration_day.xml
index b90214c2e9..b90214c2e9 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getConfiguration_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Resolution.getConfiguration_day.xml
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Resolution.getResolution_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Resolution.getResolution_day.xml
new file mode 100644
index 0000000000..70e4bab0ff
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Resolution.getResolution_day.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>1920x1080</label>
+		<nb_uniq_visitors>4</nb_uniq_visitors>
+		<nb_visits>20</nb_visits>
+		<nb_actions>20</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>20</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<segment>resolution==1920x1080</segment>
+	</row>
+	<row>
+		<label>1280x1024</label>
+		<nb_uniq_visitors>3</nb_uniq_visitors>
+		<nb_visits>15</nb_visits>
+		<nb_actions>15</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>15</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<segment>resolution==1280x1024</segment>
+	</row>
+	<row>
+		<label>Others</label>
+		<nb_uniq_visitors>8</nb_uniq_visitors>
+		<nb_visits>40</nb_visits>
+		<nb_actions>40</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>40</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml
index c9eb98ffda..b9c8e33524 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml
@@ -10,6 +10,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>city==Melbourne;regionCode==07;countryCode==au</segment>
 		<city_name>Melbourne</city_name>
 		<region>07</region>
 		<country>au</country>
@@ -27,6 +28,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>city==Nice;regionCode==B8;countryCode==fr</segment>
 		<city_name>Nice</city_name>
 		<region>B8</region>
 		<country>fr</country>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml
index 50888ce069..e1782dfd61 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml
@@ -10,6 +10,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>regionCode==07;countryCode==au</segment>
 		<region>07</region>
 		<country>au</country>
 		<country_name>Australia</country_name>
@@ -26,6 +27,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>regionCode==B8;countryCode==fr</segment>
 		<region>B8</region>
 		<country>fr</country>
 		<country_name>France</country_name>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getResolution_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getResolution_day.xml
deleted file mode 100644
index 7b29bb6e65..0000000000
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getResolution_day.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
-	<row>
-		<label>1920x1080</label>
-		<nb_uniq_visitors>4</nb_uniq_visitors>
-		<nb_visits>20</nb_visits>
-		<nb_actions>20</nb_actions>
-		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>20</bounce_count>
-		<nb_visits_converted>0</nb_visits_converted>
-	</row>
-	<row>
-		<label>1280x1024</label>
-		<nb_uniq_visitors>3</nb_uniq_visitors>
-		<nb_visits>15</nb_visits>
-		<nb_actions>15</nb_actions>
-		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>15</bounce_count>
-		<nb_visits_converted>0</nb_visits_converted>
-	</row>
-	<row>
-		<label>Others</label>
-		<nb_uniq_visitors>8</nb_uniq_visitors>
-		<nb_visits>40</nb_visits>
-		<nb_actions>40</nb_actions>
-		<nb_users>0</nb_users>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>40</bounce_count>
-		<nb_visits_converted>0</nb_visits_converted>
-	</row>
-</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/System/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml
index 55a4fa3bd0..aff3a51e64 100644
--- a/tests/PHPUnit/System/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml
+++ b/tests/PHPUnit/System/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml
@@ -38,6 +38,7 @@
 		</goals>
 		<nb_conversions>8</nb_conversions>
 		<revenue>1332</revenue>
+		<segment>visitServerHour==0</segment>
 	</row>
 	<row>
 		<label>1h</label>
@@ -49,6 +50,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==1</segment>
 	</row>
 	<row>
 		<label>2h</label>
@@ -60,6 +62,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==2</segment>
 	</row>
 	<row>
 		<label>3h</label>
@@ -71,6 +74,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==3</segment>
 	</row>
 	<row>
 		<label>4h</label>
@@ -82,6 +86,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==4</segment>
 	</row>
 	<row>
 		<label>5h</label>
@@ -93,6 +98,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==5</segment>
 	</row>
 	<row>
 		<label>6h</label>
@@ -104,6 +110,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==6</segment>
 	</row>
 	<row>
 		<label>7h</label>
@@ -115,6 +122,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==7</segment>
 	</row>
 	<row>
 		<label>8h</label>
@@ -126,6 +134,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==8</segment>
 	</row>
 	<row>
 		<label>9h</label>
@@ -137,6 +146,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==9</segment>
 	</row>
 	<row>
 		<label>10h</label>
@@ -148,6 +158,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==10</segment>
 	</row>
 	<row>
 		<label>11h</label>
@@ -159,6 +170,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==11</segment>
 	</row>
 	<row>
 		<label>12h</label>
@@ -170,6 +182,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==12</segment>
 	</row>
 	<row>
 		<label>13h</label>
@@ -181,6 +194,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==13</segment>
 	</row>
 	<row>
 		<label>14h</label>
@@ -192,6 +206,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==14</segment>
 	</row>
 	<row>
 		<label>15h</label>
@@ -203,6 +218,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==15</segment>
 	</row>
 	<row>
 		<label>16h</label>
@@ -214,6 +230,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==16</segment>
 	</row>
 	<row>
 		<label>17h</label>
@@ -225,6 +242,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==17</segment>
 	</row>
 	<row>
 		<label>18h</label>
@@ -236,6 +254,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==18</segment>
 	</row>
 	<row>
 		<label>19h</label>
@@ -247,6 +266,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==19</segment>
 	</row>
 	<row>
 		<label>20h</label>
@@ -258,6 +278,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==20</segment>
 	</row>
 	<row>
 		<label>21h</label>
@@ -269,6 +290,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==21</segment>
 	</row>
 	<row>
 		<label>22h</label>
@@ -280,6 +302,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==22</segment>
 	</row>
 	<row>
 		<label>23h</label>
@@ -291,5 +314,6 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>visitServerHour==23</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__Actions.getPageUrls_day.xml
index 2c178c678b..21450c0dd4 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__Actions.getPageUrls_day.xml
@@ -17,5 +17,6 @@
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>50%</exit_rate>
 		<url>http://example.org/homepage</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fhomepage</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__Actions.getPageUrls_day.xml
index 2c178c678b..21450c0dd4 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__Actions.getPageUrls_day.xml
@@ -17,5 +17,6 @@
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>50%</exit_rate>
 		<url>http://example.org/homepage</url>
+		<segment>pageUrl==http%3A%2F%2Fexample.org%2Fhomepage</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_day.xml
index 5f34b6f1bb..3048e12e70 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_day.xml
@@ -12,6 +12,7 @@
 				<sum_visit_length>364</sum_visit_length>
 				<bounce_count>0</bounce_count>
 				<nb_visits_converted>1</nb_visits_converted>
+				<segment>referrerType==search;referrerKeyword==this+keyword+should+be+ranked</segment>
 				<subtable>
 					<row>
 						<label>Google</label>
@@ -43,6 +44,7 @@
 				<nb_conversions>2</nb_conversions>
 				<revenue>0</revenue>
 				<nb_visits>0</nb_visits>
+				<segment>referrerType==search;referrerKeyword==piwik</segment>
 			</row>
 		</result>
 		<result date="2010-01-04" />
diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml
index 94f2fa7c83..70da348df7 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml
@@ -12,6 +12,7 @@
 				<nb_visits_converted>1</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_nb_users>0</sum_daily_nb_users>
+				<segment>referrerType==search;referrerKeyword==this+keyword+should+be+ranked</segment>
 				<subtable>
 					<row>
 						<label>Google</label>
@@ -43,6 +44,7 @@
 				<nb_conversions>2</nb_conversions>
 				<revenue>0</revenue>
 				<nb_visits>0</nb_visits>
+				<segment>referrerType==search;referrerKeyword==piwik</segment>
 			</row>
 		</result>
 		<result date="From 2010-01-04 to 2010-01-10" />
diff --git a/tests/PHPUnit/TestingEnvironment.php b/tests/PHPUnit/TestingEnvironment.php
index 3378f99444..97d98dbff8 100644
--- a/tests/PHPUnit/TestingEnvironment.php
+++ b/tests/PHPUnit/TestingEnvironment.php
@@ -89,7 +89,7 @@ class Piwik_TestingEnvironment
             if (isset($_SERVER['QUERY_STRING'])
                 && !$this->dontUseTestConfig
             ) {
-                @\Piwik\Log::verbose("Test Environment Variables for (%s):\n%s", $_SERVER['QUERY_STRING'], print_r($this->behaviorOverrideProperties, true));
+                @\Piwik\Log::debug("Test Environment Variables for (%s):\n%s", $_SERVER['QUERY_STRING'], print_r($this->behaviorOverrideProperties, true));
             }
         } catch (Exception $ex) {
             // ignore
@@ -101,7 +101,6 @@ class Piwik_TestingEnvironment
         $disabledPlugins = PluginManager::getInstance()->getCorePluginsDisabledByDefault();
         $disabledPlugins[] = 'LoginHttpAuth';
         $disabledPlugins[] = 'ExampleVisualization';
-        $disabledPlugins[] = 'PleineLune';
 
         $disabledPlugins = array_diff($disabledPlugins, array(
             'DBStats', 'ExampleUI', 'ExampleCommand', 'ExampleSettingsPlugin'
@@ -137,6 +136,10 @@ class Piwik_TestingEnvironment
             }
         }
 
+        if ($testingEnvironment->hostOverride) {
+            \Piwik\Url::setHost($testingEnvironment->hostOverride);
+        }
+
         if ($testingEnvironment->useXhprof) {
             \Piwik\Profiler::setupProfilerXHProf($mainRun = false, $setupDuringTracking = true);
         }
@@ -145,7 +148,7 @@ class Piwik_TestingEnvironment
             $testingEnvironment->configFileGlobal, $testingEnvironment->configFileLocal, $testingEnvironment->configFileCommon
         ));
 
-        \Piwik\CacheFile::$invalidateOpCacheBeforeRead = true;
+        \Piwik\Cache\Backend\File::$invalidateOpCacheBeforeRead = true;
 
         Piwik::addAction('Access.createAccessSingleton', function($access) use ($testingEnvironment) {
             if (!$testingEnvironment->testUseRegularAuth) {
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
deleted file mode 160000
-Subproject e1361bab91dc28ac92beaea94383a8ecb97f63e
diff --git a/tests/PHPUnit/Unit/CliMulti/OutputTest.php b/tests/PHPUnit/Unit/CliMulti/OutputTest.php
index c0105c67c3..11147627b8 100644
--- a/tests/PHPUnit/Unit/CliMulti/OutputTest.php
+++ b/tests/PHPUnit/Unit/CliMulti/OutputTest.php
@@ -58,7 +58,7 @@ class OutputTest extends UnitTestCase
 
     public function test_getPathToFile_shouldReturnFullPath()
     {
-        $expectedEnd = '/tmp/climulti/myid.output';
+        $expectedEnd = '/climulti/myid.output';
 
         $this->assertStringEndsWith($expectedEnd, $this->output->getPathToFile());
         $this->assertGreaterThan(strlen($expectedEnd), strlen($this->output->getPathToFile()));
diff --git a/tests/PHPUnit/Unit/Columns/DimensionTest.php b/tests/PHPUnit/Unit/Columns/DimensionTest.php
index 50a818cc55..d6622dd96a 100644
--- a/tests/PHPUnit/Unit/Columns/DimensionTest.php
+++ b/tests/PHPUnit/Unit/Columns/DimensionTest.php
@@ -55,7 +55,7 @@ namespace Piwik\Tests\Unit\Columns
     /**
      * @group Core
      */
-    class Core_DimensionTest extends \PHPUnit_Framework_TestCase
+    class ColumnDimensionTest extends \PHPUnit_Framework_TestCase
     {
         /**
          * @var FakeActionDimension
diff --git a/tests/PHPUnit/Unit/CommonTest.php b/tests/PHPUnit/Unit/CommonTest.php
index de1b6a2d24..8aa85ed550 100644
--- a/tests/PHPUnit/Unit/CommonTest.php
+++ b/tests/PHPUnit/Unit/CommonTest.php
@@ -11,14 +11,15 @@ namespace Piwik\Tests\Unit;
 use Exception;
 use PHPUnit_Framework_TestCase;
 use Piwik\Common;
+use Piwik\Container\StaticContainer;
 use Piwik\Filesystem;
+use Piwik\Intl\Data\Provider\RegionDataProvider;
 
 /**
  * @backupGlobals enabled
  * @group Common
- * @group Core_CommonTest
  */
-class Core_CommonTest extends PHPUnit_Framework_TestCase
+class CommonTest extends PHPUnit_Framework_TestCase
 {
     /**
      * Dataprovider for testSanitizeInputValues
@@ -337,6 +338,8 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase
      */
     public function getCountryCodeTestData()
     {
+        /** @var RegionDataProvider $regionDataProvider */
+        $regionDataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\RegionDataProvider');
 
         return array( // browser language, valid countries, expected result
             array("", array(), "xx"),
@@ -348,7 +351,7 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase
             array("fr-fr,fr-ca", array("us" => 'amn', "ca" => 'amn'), "ca"),
             array("fr-fr;q=1.0,fr-ca;q=0.9", array("us" => 'amn', "ca" => 'amn'), "ca"),
             array("fr-ca,fr;q=0.1", array("us" => 'amn', "ca" => 'amn'), "ca"),
-            array("en-us,en;q=0.5", Common::getCountriesList(), "us"),
+            array("en-us,en;q=0.5", $regionDataProvider->getCountryList(), "us"),
             array("fr-ca,fr;q=0.1", array("fr" => 'eur', "us" => 'amn', "ca" => 'amn'), "ca"),
             array("fr-fr,fr-ca", array("fr" => 'eur', "us" => 'amn', "ca" => 'amn'), "fr")
         );
@@ -360,8 +363,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase
      */
     public function testExtractCountryCodeFromBrowserLanguage($browserLanguage, $validCountries, $expected)
     {
-        include 'DataFiles/LanguageToCountry.php';
-
         $this->assertEquals($expected, Common::extractCountryCodeFromBrowserLanguage($browserLanguage, $validCountries, true));
         $this->assertEquals($expected, Common::extractCountryCodeFromBrowserLanguage($browserLanguage, $validCountries, false));
     }
@@ -386,8 +387,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase
      */
     public function testExtractCountryCodeFromBrowserLanguageInfer($browserLanguage, $validCountries, $expected, $expectedInfer)
     {
-        include "DataFiles/LanguageToCountry.php";
-
         // do not infer country from language
         $this->assertEquals($expected, Common::extractCountryCodeFromBrowserLanguage($browserLanguage, $validCountries, $enableLanguageToCountryGuess = false));
 
diff --git a/tests/PHPUnit/Unit/ConfigTest.php b/tests/PHPUnit/Unit/ConfigTest.php
index 3543871b1f..2fe32fec68 100644
--- a/tests/PHPUnit/Unit/ConfigTest.php
+++ b/tests/PHPUnit/Unit/ConfigTest.php
@@ -238,135 +238,135 @@ class ConfigTest extends PHPUnit_Framework_TestCase
             //   CACHE
             //   --> EXPECTED <--
             array('global only, not cached', array(
-                array(),                                    // local
-                array('General' => array('debug' => '1')),  // global
-                array(),                                    // common
+                array(),                                  // local
+                array('General' => array('debug' => 1)),  // global
+                array(),                                  // common
                 array(),
                 false,
             )),
 
             array('global only, cached get', array(
-                array(),                                    // local
-                array('General' => array('debug' => '1')),  // global
-                array(),                                    // common
-                array('General' => array('debug' => '1')),
+                array(),                                  // local
+                array('General' => array('debug' => 1)),  // global
+                array(),                                  // common
+                array('General' => array('debug' => 1)),
                 false,
             )),
 
             array('global only, cached set', array(
-                array(),                                    // local
-                array('General' => array('debug' => '1')),  // global
-                array(),                                    // common
-                array('General' => array('debug' => '2')),
+                array(),                                  // local
+                array('General' => array('debug' => 1)),  // global
+                array(),                                  // common
+                array('General' => array('debug' => 2)),
                 $header . "[General]\ndebug = 2\n\n",
             )),
 
             array('local copy (same), not cached', array(
-                array('General' => array('debug' => '1')),  // local
-                array('General' => array('debug' => '1')),  // global
-                array(),                                    // common
+                array('General' => array('debug' => 1)),  // local
+                array('General' => array('debug' => 1)),  // global
+                array(),                                  // common
                 array(),
                 false,
             )),
 
             array('local copy (same), cached get', array(
-                array('General' => array('debug' => '1')),  // local
-                array('General' => array('debug' => '1')),  // global
-                array(),                                    // common
-                array('General' => array('debug' => '1')),
+                array('General' => array('debug' => 1)),  // local
+                array('General' => array('debug' => 1)),  // global
+                array(),                                  // common
+                array('General' => array('debug' => 1)),
                 false,
             )),
 
             array('local copy (same), cached set', array(
-                array('General' => array('debug' => '1')),  // local
-                array('General' => array('debug' => '1')),  // global
+                array('General' => array('debug' => 1)),  // local
+                array('General' => array('debug' => 1)),  // global
                 array(),                                    // common
-                array('General' => array('debug' => '2')),
+                array('General' => array('debug' => 2)),
                 $header . "[General]\ndebug = 2\n\n",
             )),
 
             array('local copy (different), not cached', array(
-                array('General' => array('debug' => '2')),  // local
-                array('General' => array('debug' => '1')),  // global
-                array(),                                    // common
+                array('General' => array('debug' => 2)),  // local
+                array('General' => array('debug' => 1)),  // global
+                array(),                                  // common
                 array(),
                 false,
             )),
 
             array('local copy (different), cached get', array(
-                array('General' => array('debug' => '2')),  // local
-                array('General' => array('debug' => '1')),  // global
-                array(),                                    // common
-                array('General' => array('debug' => '2')),
+                array('General' => array('debug' => 2)),  // local
+                array('General' => array('debug' => 1)),  // global
+                array(),                                  // common
+                array('General' => array('debug' => 2)),
                 false,
             )),
 
             array('local copy (different), cached set', array(
-                array('General' => array('debug' => '2')),  // local
-                array('General' => array('debug' => '1')),  // global
-                array(),                                    // common
-                array('General' => array('debug' => '3')),
+                array('General' => array('debug' => 2)),  // local
+                array('General' => array('debug' => 1)),  // global
+                array(),                                  // common
+                array('General' => array('debug' => 3)),
                 $header . "[General]\ndebug = 3\n\n",
             )),
 
             array('local copy, not cached, new section', array(
-                array('Tracker' => array('anonymize' => '1')),  // local
-                array('General' => array('debug' => '1')),      // global
-                array(),                                        // common
+                array('Tracker' => array('anonymize' => 1)),  // local
+                array('General' => array('debug' => 1)),      // global
+                array(),                                      // common
                 array(),
                 false,
             )),
 
             array('local copy, cached get, new section', array(
-                array('Tracker' => array('anonymize' => '1')),  // local
-                array('General' => array('debug' => '1')),      // global
-                array(),                                        // common
-                array('Tracker' => array('anonymize' => '1')),
+                array('Tracker' => array('anonymize' => 1)),  // local
+                array('General' => array('debug' => 1)),      // global
+                array(),                                      // common
+                array('Tracker' => array('anonymize' => 1)),
                 false,
             )),
 
             array('local copy, cached set local, new section', array(
-                array('Tracker' => array('anonymize' => '1')),  // local
-                array('General' => array('debug' => '1')),      // global
-                array(),                                        // common
-                array('Tracker' => array('anonymize' => '2')),
+                array('Tracker' => array('anonymize' => 1)),  // local
+                array('General' => array('debug' => 1)),      // global
+                array(),                                      // common
+                array('Tracker' => array('anonymize' => 2)),
                 $header . "[Tracker]\nanonymize = 2\n\n",
             )),
 
             array('local copy, cached set global, new section', array(
-                array('Tracker' => array('anonymize' => '1')),  // local
-                array('General' => array('debug' => '1')),      // global
-                array(),                                        // common
-                array('General' => array('debug' => '2')),
+                array('Tracker' => array('anonymize' => 1)),  // local
+                array('General' => array('debug' => 1)),      // global
+                array(),                                      // common
+                array('General' => array('debug' => 2)),
                 $header . "[General]\ndebug = 2\n\n[Tracker]\nanonymize = 1\n\n",
             )),
 
             array('sort, common sections', array(
-                array('Tracker' => array('anonymize' => '1'),   // local
-                      'General' => array('debug' => '1')),
-                array('General' => array('debug' => '0'),       // global
-                      'Tracker' => array('anonymize' => '0')),
-                array(),                                        // common
-                array('Tracker' => array('anonymize' => '2')),
+                array('Tracker' => array('anonymize' => 1),   // local
+                      'General' => array('debug' => 1)),
+                array('General' => array('debug' => 0),       // global
+                      'Tracker' => array('anonymize' => 0)),
+                array(),                                      // common
+                array('Tracker' => array('anonymize' => 2)),
                 $header . "[General]\ndebug = 1\n\n[Tracker]\nanonymize = 2\n\n",
             )),
 
             array('sort, common sections before new section', array(
-                array('Tracker' => array('anonymize' => '1'),   // local
-                      'General' => array('debug' => '1')),
-                array('General' => array('debug' => '0'),       // global
-                      'Tracker' => array('anonymize' => '0')),
-                array(),                                        // common
+                array('Tracker' => array('anonymize' => 1),   // local
+                      'General' => array('debug' => 1)),
+                array('General' => array('debug' => 0),       // global
+                      'Tracker' => array('anonymize' => 0)),
+                array(),                                      // common
                 array('Segment' => array('dimension' => 'foo')),
                 $header . "[General]\ndebug = 1\n\n[Tracker]\nanonymize = 1\n\n[Segment]\ndimension = \"foo\"\n\n",
             )),
 
             array('change back to default', array(
-                array('Tracker' => array('anonymize' => '1')),  // local
-                array('Tracker' => array('anonymize' => '0'),   // global
-                      'General' => array('debug' => '1')),
+                array('Tracker' => array('anonymize' => 1)),  // local
+                array('Tracker' => array('anonymize' => 0),   // global
+                      'General' => array('debug' => 1)),
                 array(),                                        // common
-                array('Tracker' => array('anonymize' => '0')),
+                array('Tracker' => array('anonymize' => 0)),
                 $header
             )),
 
diff --git a/tests/PHPUnit/Unit/Container/IniConfigDefinitionSourceTest.php b/tests/PHPUnit/Unit/Container/IniConfigDefinitionSourceTest.php
index a418b9e705..e104df9a47 100644
--- a/tests/PHPUnit/Unit/Container/IniConfigDefinitionSourceTest.php
+++ b/tests/PHPUnit/Unit/Container/IniConfigDefinitionSourceTest.php
@@ -44,10 +44,10 @@ class IniConfigDefinitionSourceTest extends \PHPUnit_Framework_TestCase
         $definitionSource = new IniConfigDefinitionSource(Config::getInstance());
 
         /** @var ValueDefinition $definition */
-        $definition = $definitionSource->getDefinition('old_config.foo');
+        $definition = $definitionSource->getDefinition('ini.foo');
 
         $this->assertTrue($definition instanceof ValueDefinition);
-        $this->assertEquals('old_config.foo', $definition->getName());
+        $this->assertEquals('ini.foo', $definition->getName());
         $this->assertSame(array(), $definition->getValue());
     }
 
@@ -58,7 +58,7 @@ class IniConfigDefinitionSourceTest extends \PHPUnit_Framework_TestCase
     {
         $definitionSource = new IniConfigDefinitionSource(Config::getInstance());
 
-        $this->assertNull($definitionSource->getDefinition('old_config.foo.bar'));
+        $this->assertNull($definitionSource->getDefinition('ini.foo.bar'));
     }
 
     /**
@@ -68,7 +68,7 @@ class IniConfigDefinitionSourceTest extends \PHPUnit_Framework_TestCase
     {
         $definitionSource = new IniConfigDefinitionSource(Config::getInstance());
 
-        $this->assertNull($definitionSource->getDefinition('old_config.General.foo'));
+        $this->assertNull($definitionSource->getDefinition('ini.General.foo'));
     }
 
     /**
@@ -85,10 +85,10 @@ class IniConfigDefinitionSourceTest extends \PHPUnit_Framework_TestCase
         $definitionSource = new IniConfigDefinitionSource($config);
 
         /** @var ValueDefinition $definition */
-        $definition = $definitionSource->getDefinition('old_config.General');
+        $definition = $definitionSource->getDefinition('ini.General');
 
         $this->assertTrue($definition instanceof ValueDefinition);
-        $this->assertEquals('old_config.General', $definition->getName());
+        $this->assertEquals('ini.General', $definition->getName());
         $this->assertInternalType('array', $definition->getValue());
         $this->assertEquals(array('foo' => 'bar'), $definition->getValue());
     }
@@ -107,10 +107,10 @@ class IniConfigDefinitionSourceTest extends \PHPUnit_Framework_TestCase
         $definitionSource = new IniConfigDefinitionSource($config);
 
         /** @var ValueDefinition $definition */
-        $definition = $definitionSource->getDefinition('old_config.General.foo');
+        $definition = $definitionSource->getDefinition('ini.General.foo');
 
         $this->assertTrue($definition instanceof ValueDefinition);
-        $this->assertEquals('old_config.General.foo', $definition->getName());
+        $this->assertEquals('ini.General.foo', $definition->getName());
         $this->assertEquals('bar', $definition->getValue());
     }
 
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/AddSegmentFilterByLabelMappingTest.php b/tests/PHPUnit/Unit/DataTable/Filter/AddSegmentFilterByLabelMappingTest.php
new file mode 100644
index 0000000000..fae1dc46b3
--- /dev/null
+++ b/tests/PHPUnit/Unit/DataTable/Filter/AddSegmentFilterByLabelMappingTest.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Core\DataTable\Filter;
+
+use Piwik\DataTable;
+use Piwik\DataTable\Row;
+use Piwik\Tests\Framework\TestCase\UnitTestCase;
+
+/**
+ * @group AddSegmentByLabelMappingTest
+ * @group DataTable
+ * @group Filter
+ * @group Unit
+ * @group Core
+ */
+class AddSegmentByLabelMappingTest extends UnitTestCase
+{
+    private $filter = 'AddSegmentByLabelMapping';
+
+    /**
+     * @var DataTable
+     */
+    private $table;
+
+    public function setUp()
+    {
+        $this->table = new DataTable();
+        $this->addRow(array('label' => 1));
+        $this->addRow(array('label' => ''));
+        $this->addRow(array('label' => 3));
+        $this->addRow(array('label' => '4'));
+        $this->addRow(array('label' => 'play A movie', 'other' => 'value'));
+        $this->addRow(array('label' => 'Piwik'));
+    }
+
+    private function getEmptyMapping()
+    {
+        return array();
+    }
+
+    private function getMapping()
+    {
+        return array(
+            1 => 'Core',
+            2 => 'plugins',
+            3 => 'pluginstests'
+        );
+    }
+
+    private function addRow($columns)
+    {
+        $this->table->addRow($this->buildRow($columns));
+    }
+
+    private function buildRow($columns)
+    {
+        return new Row(array(Row::COLUMNS => $columns));
+    }
+
+    public function test_filter_shouldNotFail_IfMappingIsEmpty()
+    {
+        $this->table->filter($this->filter, array('segmentName', $this->getEmptyMapping()));
+
+        $metadata = $this->table->getRowsMetadata('segment');
+        $this->assertSame(array(false, false, false, false, false, false), $metadata);
+    }
+
+    public function test_filter_shouldMapOnlyValuesThatExistInMapping()
+    {
+        $this->table->filter($this->filter, array('segmentName', $this->getMapping()));
+
+        $metadata = $this->table->getRowsMetadata('segment');
+        $expected = array('segmentName==Core', false, 'segmentName==pluginstests', false, false, false);
+        $this->assertSame($expected, $metadata);
+    }
+
+    public function test_filter_shouldUrlEncodeValues()
+    {
+        $mapping = array(
+            1 => 'Core tests',
+            3 => 'plugins tästs'
+        );
+        $this->table->filter($this->filter, array('segmentName', $mapping));
+
+        $metadata = $this->table->getRowsMetadata('segment');
+        $expected = array('segmentName==Core+tests', false, 'segmentName==plugins+t%C3%A4sts', false, false, false);
+        $this->assertSame($expected, $metadata);
+    }
+}
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/AddSegmentFilterBySegmentValueTest.php b/tests/PHPUnit/Unit/DataTable/Filter/AddSegmentFilterBySegmentValueTest.php
new file mode 100644
index 0000000000..2815818070
--- /dev/null
+++ b/tests/PHPUnit/Unit/DataTable/Filter/AddSegmentFilterBySegmentValueTest.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Core\DataTable\Filter;
+
+use Piwik\DataTable;
+use Piwik\DataTable\Row;
+use Piwik\Plugins\Actions\Reports\GetOutlinks;
+use Piwik\Plugins\UserCountry\Reports\GetCity;
+use Piwik\Plugins\UserCountry\Reports\GetCountry;
+use Piwik\Plugins\VisitsSummary\Reports\Get;
+use Piwik\Tests\Framework\TestCase\UnitTestCase;
+
+/**
+ * @group AddSegmentBySegmentValueTest
+ * @group DataTable
+ * @group Filter
+ * @group Unit
+ * @group Core
+ */
+class AddSegmentBySegmentValueTest extends UnitTestCase
+{
+    private $filter = 'AddSegmentBySegmentValue';
+
+    /**
+     * @var DataTable
+     */
+    private $table;
+
+    private $report;
+
+    public function setUp()
+    {
+        $this->report = new GetCity();
+        $this->table = new DataTable();
+        $this->addRowWithMetadata(array('test' => '1'));
+        $this->addRowWithMetadata(array('test' => '2', 'segmentValue' => 'teeest'));
+        $this->addRowWithMetadata(array('test' => '3', 'segmentValue' => 'existing', 'segment' => 'city==mytest'));
+        $this->addRowWithMetadata(array('test' => '1', 'segmentValue' => 'test/test2.r'));
+        $this->addRowWithMetadata(array('test' => '4'));
+    }
+
+    private function addRowWithMetadata($metadata)
+    {
+        $row = new Row(array(Row::COLUMNS => array('label' => 'val1')));
+        foreach ($metadata as $name => $value) {
+            $row->setMetadata($name, $value);
+        }
+        $this->table->addRow($row);
+
+        return $row;
+    }
+
+    public function test_filter_shouldGenerateASegmentIfSegmentValueIsPresent()
+    {
+        $segmentValue = 'existing';
+        $expectedSegment = 'city==existing';
+        $this->assertSegmentForSegmentValueAndReport($this->report, $segmentValue, $expectedSegment);
+    }
+
+    public function test_filter_shouldUrlEncodeTheValue()
+    {
+        $segmentValue = 'existing täs/ts';
+        $expectedSegment = 'city==existing+t%C3%A4s%2Fts';
+        $this->assertSegmentForSegmentValueAndReport($this->report, $segmentValue, $expectedSegment);
+    }
+
+    public function test_filter_shouldNotOverwriteAnExistingSegmentValue()
+    {
+        $row = $this->addRowWithMetadata(array('segmentValue' => 'existing', 'segment' => 'city==mytest'));
+
+        $this->table->filter($this->filter, array($this->report));
+
+        $this->assertSegment('city==mytest', $row);
+    }
+
+    public function test_filter_shouldUseTheFirstSegment_IfAReportHasMultiple()
+    {
+        $report = new GetCountry();
+        $this->assertCount(2, $report->getDimension()->getSegments());
+
+        $this->assertSegmentForSegmentValueAndReport($report, $segmentValue = 'existing', 'countryCode==existing');
+    }
+
+    public function test_filter_shouldNotGenerateASegment_IfReportHasNoDimension()
+    {
+        $report = new Get(); // VisitsSummary.get has no dimension
+        $this->assertNull($report->getDimension());
+
+        $this->assertSegmentForSegmentValueAndReport($report, $segmentValue = 'existing', false);
+    }
+
+    public function test_filter_shouldNotGenerateASegment_IfDimensionHasNoSegmentFilter()
+    {
+        // outlinks currently has a dimensions but no segments, we have to use another report once it has segments
+        $report = new GetOutlinks();
+        $this->assertEmpty($report->getDimension()->getSegments());
+
+        $this->assertSegmentForSegmentValueAndReport($report, $segmentValue = 'existing', false);
+    }
+
+    public function test_filter_shouldNotFail_IfNoReportGiven()
+    {
+        $this->assertSegmentForSegmentValueAndReport($report = null, $segmentValue = 'existing', false);
+    }
+
+    public function test_filter_shouldNotFail_IfDataTableHasNoRows()
+    {
+        $table = new DataTable();
+        $table->filter($this->filter, array($this->report));
+        $this->assertSame(0, $table->getRowsCount());
+    }
+
+    private function assertSegmentForSegmentValueAndReport($report, $segmentValue, $expectedSegment)
+    {
+        $row = $this->addRowWithMetadata(array('segmentValue' => $segmentValue));
+
+        $this->table->filter($this->filter, array($report));
+
+        $this->assertSegment($expectedSegment, $row);
+    }
+
+    private function assertSegment($expected, Row $row)
+    {
+        $segment = $row->getMetadata('segment');
+        $this->assertSame($expected, $segment);
+    }
+
+}
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/AddSegmentFilterTest.php b/tests/PHPUnit/Unit/DataTable/Filter/AddSegmentFilterTest.php
new file mode 100644
index 0000000000..ef08247c9e
--- /dev/null
+++ b/tests/PHPUnit/Unit/DataTable/Filter/AddSegmentFilterTest.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Core\DataTable\Filter;
+
+use Piwik\DataTable;
+use Piwik\DataTable\Row;
+use Piwik\Tests\Framework\TestCase\UnitTestCase;
+
+/**
+ * @group AddSegmentByLabelTest
+ * @group DataTable
+ * @group Filter
+ * @group Unit
+ * @group Core
+ */
+class AddSegmentByLabelTest extends UnitTestCase
+{
+    private $filter = 'AddSegmentByLabel';
+
+    /**
+     * @var DataTable
+     */
+    private $table;
+
+    public function setUp()
+    {
+        $this->table = new DataTable();
+        $this->addRow(array('label' => 'http://piwik.org/test'));
+        $this->addRow(array('label' => ''));
+        $this->addRow(array('label' => 'search test', 'other' => 'value'));
+        $this->addRow(array('label' => 'keyword t/est'));
+        $this->addRow(array('label' => false));
+        $this->addRow(array('label' => 'play A movie', 'other' => 'value'));
+        $this->addRow(array('nb_visits' => 15));
+        $this->addRow(array('label' => 'Piwik'));
+    }
+
+    private function addRow($columns)
+    {
+        $this->table->addRow($this->buildRow($columns));
+    }
+
+    private function buildRow($columns)
+    {
+        return new Row(array(Row::COLUMNS => $columns));
+    }
+
+    public function test_filter_IfOnlyOneSegmentGiven_ShouldCopyTheValuePlain_IfOnlyOneSegmentIsGiven()
+    {
+        $segmentName = 'city';
+        $segmentStart = $segmentName . '==';
+        $this->table->filter($this->filter, array($segmentName));
+
+        $segmentValues = $this->table->getRowsMetadata('segment');
+        $expected = array(
+            $segmentStart . 'http%3A%2F%2Fpiwik.org%2Ftest',
+            false, // empty label we do not generate for this currently
+            $segmentStart . 'search+test',
+            $segmentStart . 'keyword+t%2Fest',
+            false,
+            $segmentStart . 'play+A+movie',
+            false,
+            $segmentStart . 'Piwik');
+        $this->assertSame($expected, $segmentValues);
+    }
+
+    public function test_filter_IfOnlyOneSegmentGiven_ShouldIgnoreASummaryRow()
+    {
+        $summaryRow = $this->buildRow(array('label' => 'mytest'));
+        $this->table->addSummaryRow($summaryRow);
+
+        $this->table->filter($this->filter, array('mysegment'));
+
+        $this->assertFalse($summaryRow->getMetadata('segment'));
+    }
+
+    public function test_filter_IfTwoSegmentsAreGiven_ShouldOnlyGenerateAFilterForLabelsHavingThatManyExplodedParts()
+    {
+        // must result in 2 exploded parts for city and region
+        $this->table->filter($this->filter, array(array('city', 'region'), $delimiter = ' '));
+
+        $segmentValues = $this->table->getRowsMetadata('segment');
+        $expected = array(
+            false,
+            false,
+            'city==search;region==test',
+            'city==keyword;region==t%2Fest',
+            false,
+            false,
+            false,
+            false);
+        $this->assertSame($expected, $segmentValues);
+    }
+
+    public function test_filter_IfMultipleSegmentsAreGiven_ShouldOnlyGenerateAFilterForLabelsHavingThatManyExplodedParts()
+    {
+        // must result in 3 exploded parts city, region and country
+        $this->table->filter($this->filter, array(array('city', 'region', 'country'), $delimiter = ' '));
+
+        $segmentValues = $this->table->getRowsMetadata('segment');
+        $expected = array(
+            false,
+            false,
+            false,
+            false,
+            false,
+            'city==play;region==A;country==movie',
+            false,
+            false);
+        $this->assertSame($expected, $segmentValues);
+    }
+
+    public function test_filter_IfMultipleSegmentsAreGiven_IfShouldBePossibleToIgnorePartsByUsingAnEmptyStringAsSegmentName()
+    {
+        // must result in 3 exploded parts city, region and country
+        $this->table->filter($this->filter, array(array('city', '', 'country'), $delimiter = ' '));
+
+        $segmentValues = $this->table->getRowsMetadata('segment');
+        $expected = array(
+            false,
+            false,
+            false,
+            false,
+            false,
+            'city==play;country==movie',
+            false,
+            false);
+        $this->assertSame($expected, $segmentValues);
+    }
+
+    public function test_filter_IfMultipleSegmentsAreGiven_ShouldIgnoreASummaryRow()
+    {
+        $summaryRow = $this->buildRow(array('label' => 'part1 part2'));
+        $this->table->addSummaryRow($summaryRow);
+
+        $this->table->filter($this->filter, array(array('seg1', 'seg2'), $delimiter = ' '));
+
+        $this->assertFalse($summaryRow->getMetadata('segment'));
+    }
+
+}
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/AddSegmentValueTest.php b/tests/PHPUnit/Unit/DataTable/Filter/AddSegmentValueTest.php
new file mode 100644
index 0000000000..6577c7bd5a
--- /dev/null
+++ b/tests/PHPUnit/Unit/DataTable/Filter/AddSegmentValueTest.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Core\DataTable\Filter;
+
+use Piwik\DataTable;
+use Piwik\DataTable\Row;
+use Piwik\Tests\Framework\TestCase\UnitTestCase;
+
+/**
+ * @group AddSegmentValueTest
+ * @group DataTable
+ * @group Filter
+ * @group Unit
+ * @group Core
+ */
+class AddSegmentValueTest extends UnitTestCase
+{
+    private $filter = 'AddSegmentValue';
+
+    /**
+     * @var DataTable
+     */
+    private $table;
+
+    public function setUp()
+    {
+        $this->table = new DataTable();
+        $this->addRow(array('label' => 'http://piwik.org/test'));
+        $this->addRow(array('label' => ''));
+        $this->addRow(array('label' => 'search+test', 'other' => 'value'));
+        $this->addRow(array('label' => 'keyword test'));
+        $this->addRow(array('label' => false));
+        $this->addRow(array('label' => 'play A movie', 'other' => 'value'));
+        $this->addRow(array('nb_visits' => 15));
+        $this->addRow(array('label' => 'Piwik'));
+    }
+
+    private function addRow($columns)
+    {
+        $this->table->addRow($this->buildRow($columns));
+    }
+
+    private function buildRow($columns)
+    {
+        return new Row(array(Row::COLUMNS => $columns));
+    }
+
+    public function test_filter_shouldCopyTheLabelToMetadata_IfValueIsGiven()
+    {
+        $this->table->filter($this->filter);
+
+        $segmentValues = $this->table->getRowsMetadata('segmentValue');
+        $expected = array(
+            'http://piwik.org/test',
+            '',
+            'search+test',
+            'keyword test',
+            false,
+            'play A movie',
+            false,
+            'Piwik');
+        $this->assertSame($expected, $segmentValues);
+    }
+
+    public function test_filter_ShouldIgnoreSummaryRow()
+    {
+        $summaryRow = $this->buildRow(array('label' => 'my test'));
+        $this->table->addSummaryRow($summaryRow);
+        $this->table->filter($this->filter);
+
+        $this->assertFalse($summaryRow->getMetadata('segmentValue'));
+    }
+
+    public function test_filter_ShouldCallACallbackPassingTheLabel()
+    {
+        $this->table->filter($this->filter, array(function ($label) {
+            if ($label === false) {
+                return 'was false';
+            }
+
+            return 'piwik_' . $label;
+        }));
+
+        $segmentValues = $this->table->getRowsMetadata('segmentValue');
+        $expected = array(
+            'piwik_http://piwik.org/test',
+            'piwik_',
+            'piwik_search+test',
+            'piwik_keyword test',
+            'was false',
+            'piwik_play A movie',
+            'was false',
+            'piwik_Piwik');
+        $this->assertSame($expected, $segmentValues);
+    }
+
+    public function test_filter_shouldNotGenerateASegmentValueIfReturnValueIsFalse()
+    {
+        $this->table->filter($this->filter, array(function ($label) {
+            if ($label === false) {
+                return 'was false';
+            }
+
+            return false;
+        }));
+
+        $segmentValues = $this->table->getRowsMetadata('segmentValue');
+        $expected = array(
+            false,
+            false,
+            false,
+            false,
+            'was false',
+            false,
+            'was false',
+            false);
+        $this->assertSame($expected, $segmentValues);
+    }
+
+}
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/AddSummaryRowTest.php b/tests/PHPUnit/Unit/DataTable/Filter/AddSummaryRowTest.php
index f072011675..b9701a88cd 100644
--- a/tests/PHPUnit/Unit/DataTable/Filter/AddSummaryRowTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/AddSummaryRowTest.php
@@ -11,6 +11,9 @@ namespace Piwik\Tests\Unit\DataTable\Filter;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
+/**
+ * @group DataTableTest
+ */
 class DataTable_Filter_AddSummaryRowTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/ColumnCallbackDeleteMetadataTest.php b/tests/PHPUnit/Unit/DataTable/Filter/ColumnCallbackDeleteMetadataTest.php
new file mode 100644
index 0000000000..778125487e
--- /dev/null
+++ b/tests/PHPUnit/Unit/DataTable/Filter/ColumnCallbackDeleteMetadataTest.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Core\DataTable\Filter;
+
+use Piwik\DataTable;
+use Piwik\DataTable\Row;
+use Piwik\Tests\Framework\TestCase\UnitTestCase;
+
+/**
+ * @group ColumnCallbackDeleteMetadataTest
+ * @group DataTable
+ * @group Filter
+ * @group Unit
+ * @group Core
+ */
+class ColumnCallbackDeleteMetadataTest extends UnitTestCase
+{
+    private $filter = 'ColumnCallbackDeleteMetadata';
+
+    /**
+     * @var DataTable
+     */
+    private $table;
+
+    public function setUp()
+    {
+        $this->table = new DataTable();
+        $this->addRowWithMetadata(array('test' => '1'));
+        $this->addRowWithMetadata(array('test' => '2', 'other' => 'value'));
+        $this->addRowWithMetadata(array('test' => '3'));
+        $this->addRowWithMetadata(array('test' => '1', 'other' => 'value'));
+        $this->addRowWithMetadata(array('test' => '4'));
+    }
+
+    private function buildRowWithMetadata($metadata)
+    {
+        $row = new Row(array(Row::COLUMNS => array('label' => 'val1')));
+        foreach ($metadata as $name => $value) {
+            $row->setMetadata($name, $value);
+        }
+        return $row;
+    }
+
+    private function addRowWithMetadata($metadata)
+    {
+        $row = $this->buildRowWithMetadata($metadata);
+        $this->table->addRow($row);
+
+        return $row;
+    }
+
+    public function test_filter_shouldRemoveAllMetadataEntriesHavingTheGivenName()
+    {
+        $this->table->filter($this->filter, array('test'));
+
+        $metadata = $this->table->getRowsMetadata('test');
+        $this->assertSame(array(false, false, false, false, false), $metadata);
+
+        $metadata = $this->table->getRowsMetadata('other');
+        $expected = array(false, 'value', false, 'value', false);
+        $this->assertSame($expected, $metadata);
+    }
+
+    public function test_filter_shouldRemoveAllMetadataEntriesHavingTheGivenName_EvenIfOnlySomeRowsHaveThatMetadataName()
+    {
+        $this->table->filter($this->filter, array('other'));
+
+        $metadata = $this->table->getRowsMetadata('other');
+        $this->assertSame(array(false, false, false, false, false), $metadata);
+
+        $metadata = $this->table->getRowsMetadata('test');
+        $expected = array('1', '2', '3', '1', '4');
+        $this->assertSame($expected, $metadata);
+    }
+
+    public function test_filter_shouldRemoveTheMetadataFromSubtables_IfOneIsSet()
+    {
+        $row   = $this->addRowWithMetadata(array('test' => '5', 'other' => 'value2'));
+        $table = new DataTable();
+        $table->addRow($this->buildRowWithMetadata(array('other' => 'value3')));
+        $table->addRow($this->buildRowWithMetadata(array('test' => '6')));
+        $table->addRow($this->buildRowWithMetadata(array('test' => '7', 'other' => 'value4')));
+        $row->setSubtable($table);
+
+        $this->table->filter($this->filter, array('other'));
+
+        $this->assertFalse($row->getMetadata('other'));
+
+        $metadata = $table->getRowsMetadata('other');
+        $this->assertSame(array(false, false, false), $metadata);
+    }
+}
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/ExcludeLowPopulationTest.php b/tests/PHPUnit/Unit/DataTable/Filter/ExcludeLowPopulationTest.php
index 6e8eb733b8..0f0675114f 100644
--- a/tests/PHPUnit/Unit/DataTable/Filter/ExcludeLowPopulationTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/ExcludeLowPopulationTest.php
@@ -12,6 +12,9 @@ use Piwik\DataTable\Filter\ExcludeLowPopulation;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
+/**
+ * @group DataTableTest
+ */
 class DataTable_Filter_ExcludeLowPopulationTest extends \PHPUnit_Framework_TestCase
 {
     protected function getTestDataTable()
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/LimitTest.php b/tests/PHPUnit/Unit/DataTable/Filter/LimitTest.php
index 94d2d4c84b..753220542c 100644
--- a/tests/PHPUnit/Unit/DataTable/Filter/LimitTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/LimitTest.php
@@ -12,6 +12,9 @@ use Piwik\DataTable\Filter\Limit;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
+/**
+ * @group DataTableTest
+ */
 class DataTable_Filter_LimitTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -39,9 +42,7 @@ class DataTable_Filter_LimitTest extends \PHPUnit_Framework_TestCase
         return $table;
     }
 
-    /**
-     * @group Core
-     */
+
     public function testNormal()
     {
         $offset = 2;
@@ -55,9 +56,7 @@ class DataTable_Filter_LimitTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(10, $table->getMetadata(DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME));
     }
 
-    /**
-     * @group Core
-     */
+
     public function testLimitLessThanCountShouldReturnCountLimit()
     {
         $offset = 2;
@@ -71,9 +70,7 @@ class DataTable_Filter_LimitTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(10, $table->getMetadata(DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME));
     }
 
-    /**
-     * @group Core
-     */
+
     public function testLimitIsCountShouldNotDeleteAnything()
     {
         $offset = 0;
@@ -88,9 +85,7 @@ class DataTable_Filter_LimitTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(10, $table->getMetadata(DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME));
     }
 
-    /**
-     * @group Core
-     */
+
     public function testLimitGreaterThanCountShouldReturnCountUntilCount()
     {
         $offset = 5;
@@ -105,9 +100,7 @@ class DataTable_Filter_LimitTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(10, $table->getMetadata(DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME));
     }
 
-    /**
-     * @group Core
-     */
+
     public function testLimitIsNullShouldReturnCountIsOffset()
     {
         $offset = 1;
@@ -120,9 +113,7 @@ class DataTable_Filter_LimitTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(10, $table->getMetadata(DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME));
     }
 
-    /**
-     * @group Core
-     */
+
     public function testOffsetJustBeforeSummaryRowShouldJustReturnSummaryRow()
     {
         $offset = 9;
@@ -136,9 +127,7 @@ class DataTable_Filter_LimitTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(10, $table->getMetadata(DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME));
     }
 
-    /**
-     * @group Core
-     */
+
     public function testOffsetJustBeforeSummaryRowWithBigLimitShouldJustReturnSummaryRow()
     {
         $offset = 9;
@@ -152,9 +141,7 @@ class DataTable_Filter_LimitTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(10, $table->getMetadata(DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME));
     }
 
-    /**
-     * @group Core
-     */
+
     public function testOffsetBeforeSummaryRowShouldJustReturnRowAndSummaryRow()
     {
         $offset = 8;
@@ -168,9 +155,7 @@ class DataTable_Filter_LimitTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(10, $table->getMetadata(DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME));
     }
 
-    /**
-     * @group Core
-     */
+
     public function testOffsetGreaterThanCountShouldReturnEmptyTable()
     {
         $offset = 10;
@@ -182,9 +167,7 @@ class DataTable_Filter_LimitTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(10, $table->getMetadata(DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME));
     }
 
-    /**
-     * @group Core
-     */
+
     public function testLimitIsZeroShouldReturnEmptyTable()
     {
         $offset = 0;
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/PatternRecursiveTest.php b/tests/PHPUnit/Unit/DataTable/Filter/PatternRecursiveTest.php
index 4c9cd46ab3..8ee9c439dd 100644
--- a/tests/PHPUnit/Unit/DataTable/Filter/PatternRecursiveTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/PatternRecursiveTest.php
@@ -11,6 +11,9 @@ namespace Piwik\Tests\Unit\DataTable\Filter;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
+/**
+ * @group DataTableTest
+ */
 class DataTable_Filter_PatternRecursiveTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/PatternTest.php b/tests/PHPUnit/Unit/DataTable/Filter/PatternTest.php
index e9d63f1d98..5c97588a3c 100644
--- a/tests/PHPUnit/Unit/DataTable/Filter/PatternTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/PatternTest.php
@@ -11,6 +11,9 @@ namespace Piwik\Tests\Unit\DataTable\Filter;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
+/**
+ * @group DataTableTest
+ */
 class DataTable_Filter_PatternTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/PivotByDimensionTest.php b/tests/PHPUnit/Unit/DataTable/Filter/PivotByDimensionTest.php
index f1faa99b88..d77a3ca7ed 100644
--- a/tests/PHPUnit/Unit/DataTable/Filter/PivotByDimensionTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/PivotByDimensionTest.php
@@ -17,7 +17,7 @@ use PHPUnit_Framework_TestCase;
 use Exception;
 
 /**
- * @group Core
+ * @group DataTableTest
  */
 class PivotByDimensionTest extends PHPUnit_Framework_TestCase
 {
@@ -90,13 +90,13 @@ class PivotByDimensionTest extends PHPUnit_Framework_TestCase
 
     /**
      * @expectedException Exception
-     * @expectedExceptionMessage Unsupported pivot: No segment for dimension of report 'UserSettings.UserSettings_WidgetGlobalVisitors'
+     * @expectedExceptionMessage Unsupported pivot: No segment for dimension of report 'Resolution.Resolution_WidgetGlobalVisitors'
      */
     public function test_construction_ShouldFail_WhenDimensionIsNotSubtableAndSegmentFetchingIsEnabledButThereIsNoSegment()
     {
-        $this->loadPlugins('Referrers', 'UserSettings');
+        $this->loadPlugins('Referrers', 'Resolution');
 
-        new PivotByDimension(new DataTable(), "UserSettings.GetConfiguration", "Referrers.Keyword", "nb_visits");
+        new PivotByDimension(new DataTable(), "Resolution.GetConfiguration", "Referrers.Keyword", "nb_visits");
     }
 
     /**
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/PrependSegmentFilterTest.php b/tests/PHPUnit/Unit/DataTable/Filter/PrependSegmentFilterTest.php
new file mode 100644
index 0000000000..d282db4c52
--- /dev/null
+++ b/tests/PHPUnit/Unit/DataTable/Filter/PrependSegmentFilterTest.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Core\DataTable\Filter;
+
+use Piwik\DataTable;
+use Piwik\DataTable\Row;
+use Piwik\Tests\Framework\TestCase\UnitTestCase;
+
+/**
+ * @group PrependSegmentTest
+ * @group DataTable
+ * @group Filter
+ * @group Unit
+ * @group Core
+ */
+class PrependSegmentTest extends UnitTestCase
+{
+    private $filter = 'PrependSegment';
+
+    /**
+     * @var DataTable
+     */
+    private $table;
+
+    public function setUp()
+    {
+        $this->table = new DataTable();
+        $this->addRowWithMetadata(array('test' => '1'));
+        $this->addRowWithMetadata(array('test' => '2', 'segment' => 'country=NZ'));
+        $this->addRowWithMetadata(array('test' => '3'));
+        $this->addRowWithMetadata(array('test' => '1', 'segment' => 'country=AU'));
+        $this->addRowWithMetadata(array('test' => '4', 'segment' => ''));
+    }
+
+    private function addRowWithMetadata($metadata)
+    {
+        $row = new Row(array(Row::COLUMNS => array('label' => 'val1')));
+        foreach ($metadata as $name => $value) {
+            $row->setMetadata($name, $value);
+        }
+        $this->table->addRow($row);
+    }
+
+    public function test_filter_shouldRemoveAllMetadataEntriesHavingTheGivenName()
+    {
+        $prepend = 'city=test;';
+        $this->table->filter($this->filter, array($prepend));
+
+        $metadata = $this->table->getRowsMetadata('segment');
+        $this->assertSame(array(
+            false,
+            $prepend . 'country=NZ',
+            false,
+            $prepend . 'country=AU',
+            $prepend),
+            $metadata);
+
+        // should be still the same
+        $metadata = $this->table->getRowsMetadata('test');
+        $this->assertSame(array('1', '2', '3', '1', '4'), $metadata);
+    }
+}
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/PrependValueToMetadataTest.php b/tests/PHPUnit/Unit/DataTable/Filter/PrependValueToMetadataTest.php
new file mode 100644
index 0000000000..7bb3eb5d8a
--- /dev/null
+++ b/tests/PHPUnit/Unit/DataTable/Filter/PrependValueToMetadataTest.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Core\DataTable\Filter;
+
+use Piwik\DataTable;
+use Piwik\DataTable\Row;
+use Piwik\Tests\Framework\TestCase\UnitTestCase;
+
+/**
+ * @group PrependValueToMetadataTest
+ * @group DataTable
+ * @group Filter
+ * @group Unit
+ * @group Core
+ */
+class PrependValueToMetadataTest extends UnitTestCase
+{
+    private $filter = 'PrependValueToMetadata';
+
+    /**
+     * @var DataTable
+     */
+    private $table;
+
+    public function setUp()
+    {
+        $this->table = new DataTable();
+        $this->addRowWithMetadata(array('test' => '1'));
+        $this->addRowWithMetadata(array('test' => '2', 'other' => 'value'));
+        $this->addRowWithMetadata(array('test' => '3'));
+        $this->addRowWithMetadata(array('test' => '1', 'other' => 'value'));
+        $this->addRowWithMetadata(array('test' => '4', 'other' => ''));
+    }
+
+    private function addRowWithMetadata($metadata)
+    {
+        $row = new Row(array(Row::COLUMNS => array('label' => 'val1')));
+        foreach ($metadata as $name => $value) {
+            $row->setMetadata($name, $value);
+        }
+        $this->table->addRow($row);
+    }
+
+    public function test_filter_shouldNotFailIfColumnOrValueIsNotSetOrDoesNotMatch()
+    {
+        $this->table->filter($this->filter, array('test', ''));
+        $this->table->filter($this->filter, array('', 'test'));
+        $this->table->filter($this->filter, array('', ''));
+        $this->table->filter($this->filter, array('anyrandomcolumns', 'test'));
+
+        // verify not modified
+        $metadata = $this->table->getRowsMetadata('test');
+        $this->assertSame(array('1', '2', '3', '1', '4'), $metadata);
+
+        $metadata = $this->table->getRowsMetadata('other');
+        $this->assertSame(array(false, 'value', false, 'value', ''), $metadata);
+    }
+
+    public function test_filter_shouldPrependValueToMetadataName_IfPossible()
+    {
+        $this->table->filter($this->filter, array('test', 'piwik_'));
+
+        $metadata = $this->table->getRowsMetadata('test');
+        $this->assertSame(array('piwik_1', 'piwik_2', 'piwik_3', 'piwik_1', 'piwik_4'), $metadata);
+
+        // those should still be the same
+        $metadata = $this->table->getRowsMetadata('other');
+        $this->assertSame(array(false, 'value', false, 'value', ''), $metadata);
+    }
+
+    public function test_filter_shouldOnlyPrependIfAMetadataNameIsSet()
+    {
+        $this->table->filter($this->filter, array('other', 'prependme'));
+
+        $metadata = $this->table->getRowsMetadata('other');
+        $this->assertSame(array(false, 'prependmevalue', false, 'prependmevalue', 'prependme'), $metadata);
+
+        // should still be the same
+        $metadata = $this->table->getRowsMetadata('test');
+        $this->assertSame(array('1', '2', '3', '1', '4'), $metadata);
+    }
+}
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/RangeCheckTest.php b/tests/PHPUnit/Unit/DataTable/Filter/RangeCheckTest.php
index 3c1d91a357..0deccd217f 100644
--- a/tests/PHPUnit/Unit/DataTable/Filter/RangeCheckTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/RangeCheckTest.php
@@ -12,11 +12,12 @@ use Piwik\DataTable\Filter\RangeCheck;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
+/**
+ * @group DataTableTest
+ */
 class DataTable_Filter_RangeCheckTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * @group Core
-     */
+
     public function testRangeCheckNormalDataTable()
     {
         $table = new DataTable();
@@ -34,9 +35,7 @@ class DataTable_Filter_RangeCheckTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expectedOrder, $table->getColumn('count'));
     }
 
-    /**
-     * @group Core
-     */
+
     public function testRangeCheckNormalDataTableNonIntegerValues()
     {
         $table = new DataTable();
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/SortTest.php b/tests/PHPUnit/Unit/DataTable/Filter/SortTest.php
index 4aedcb3d7e..34ec2a2c9a 100644
--- a/tests/PHPUnit/Unit/DataTable/Filter/SortTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/SortTest.php
@@ -12,11 +12,12 @@ use Piwik\DataTable\Filter\Sort;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
+/**
+ * @group DataTableTest
+ */
 class DataTable_Filter_SortTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * @group Core
-     */
+
     public function testNormalSortDescending()
     {
         $table = new DataTable();
@@ -31,9 +32,7 @@ class DataTable_Filter_SortTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expectedOrder, $table->getColumn('label'));
     }
 
-    /**
-     * @group Core
-     */
+
     public function testNormalSortAscending()
     {
         $table = new DataTable();
@@ -48,9 +47,7 @@ class DataTable_Filter_SortTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expectedOrder, $table->getColumn('label'));
     }
 
-    /**
-     * @group Core
-     */
+
     public function testMissingColumnValuesShouldAppearLastAfterSortAsc()
     {
         $table = new DataTable();
@@ -68,9 +65,7 @@ class DataTable_Filter_SortTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expectedOrder, $table->getColumn('label'));
     }
 
-    /**
-     * @group Core
-     */
+
     public function testMissingColumnValuesShouldAppearLastAfterSortDesc()
     {
         $table = new DataTable();
@@ -169,4 +164,20 @@ class DataTable_Filter_SortTest extends \PHPUnit_Framework_TestCase
         $filter->filter($table);
         $this->assertTrue(DataTable::isEqual($table, $expectedtableReverse));
     }
+
+    public function test_sortingArrayValues_doesNotError()
+    {
+        $table = new DataTable();
+        $table->addRowsFromArray(array(
+            array(Row::COLUMNS => array('label' => 'ask', 'count_array' => array(100, 1, 2) )),
+            array(Row::COLUMNS => array('label' => 'nintendo', 'count_array' => array(0, 'hello'))),
+            array(Row::COLUMNS => array('label' => 'yahoo', 'count_array' => array(10, 'test'))
+            )));
+
+        $tableOriginal = clone $table;
+
+        $filter = new Sort($table, 'count_array', 'desc');
+        $filter->filter($table);
+        $this->assertTrue(DataTable::isEqual($tableOriginal, $table));
+    }
 }
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/TruncateTest.php b/tests/PHPUnit/Unit/DataTable/Filter/TruncateTest.php
index d82e8da441..b3b5710f91 100644
--- a/tests/PHPUnit/Unit/DataTable/Filter/TruncateTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/TruncateTest.php
@@ -12,11 +12,12 @@ use Piwik\DataTable\Filter\Truncate;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
+/**
+ * @group DataTableTest
+ */
 class DataTable_Filter_TruncateTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * @group Core
-     */
+
     public function testUnrelatedDataTableNotFiltered()
     {
         // remark: this unit test would become invalid and would need to be rewritten if
@@ -38,9 +39,7 @@ class DataTable_Filter_TruncateTest extends \PHPUnit_Framework_TestCase
         $filter->filter($dataTableBeingFiltered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testForInfiniteRecursion()
     {
         $dataTableBeingFiltered = new DataTable();
@@ -62,9 +61,7 @@ class DataTable_Filter_TruncateTest extends \PHPUnit_Framework_TestCase
         $filter->filter($dataTableBeingFiltered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testOffsetIsCountSummaryRowShouldBeTheRow()
     {
         $table = $this->getDataTableCount5();
@@ -74,9 +71,7 @@ class DataTable_Filter_TruncateTest extends \PHPUnit_Framework_TestCase
         $this->assertTrue(Row::isEqual($table->getLastRow(), $this->getRow4()));
     }
 
-    /**
-     * @group Core
-     */
+
     public function testOffsetIsLessThanCountSummaryRowShouldBeTheSum()
     {
         $table = $this->getDataTableCount5();
@@ -89,9 +84,7 @@ class DataTable_Filter_TruncateTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(array_keys($table->getLastRow()->getColumns()), array_keys($expectedRow->getColumns()));
     }
 
-    /**
-     * @group Core
-     */
+
     public function testOffsetIsMoreThanCountShouldNotTruncate()
     {
         $table = $this->getDataTableCount5();
@@ -101,9 +94,7 @@ class DataTable_Filter_TruncateTest extends \PHPUnit_Framework_TestCase
         $this->assertTrue(Row::isEqual($table->getLastRow(), $this->getRow4()));
     }
 
-    /**
-     * @group Core
-     */
+
     public function testWhenThereIsAlreadyASummaryRowShouldReplaceTheSummaryRow()
     {
         $table = $this->getDataTableCount5();
@@ -116,9 +107,7 @@ class DataTable_Filter_TruncateTest extends \PHPUnit_Framework_TestCase
         $this->assertTrue(Row::isEqual($table->getLastRow(), $expectedRow));
     }
 
-    /**
-     * @group Core
-     */
+
     public function testSumTablesWithSummaryRowShouldSumTheSummaryRow()
     {
         // row0, row1, row2, rowSummary1
@@ -142,9 +131,7 @@ class DataTable_Filter_TruncateTest extends \PHPUnit_Framework_TestCase
         $this->assertTrue(DataTable::isEqual($expectedTable, $table1));
     }
 
-    /**
-     * @group Core
-     */
+
     public function testAddOneTableWithSummaryRow()
     {
         // row0, row1, row2, rowSummary1
@@ -169,9 +156,7 @@ class DataTable_Filter_TruncateTest extends \PHPUnit_Framework_TestCase
 
     }
 
-    /**
-     * @group Core
-     */
+
     public function testWhenRowsInRandomOrderButSortSpecifiedShouldComputeSummaryRowAfterSort()
     {
         $table = new DataTable;
diff --git a/tests/PHPUnit/Unit/DataTable/MapTest.php b/tests/PHPUnit/Unit/DataTable/MapTest.php
index 659e76ac8f..179e3f11df 100644
--- a/tests/PHPUnit/Unit/DataTable/MapTest.php
+++ b/tests/PHPUnit/Unit/DataTable/MapTest.php
@@ -7,6 +7,9 @@ use Piwik\DataTable\Manager;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
+/**
+ * @group DataTableTest
+ */
 class Test_DataTable_Map extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
diff --git a/tests/PHPUnit/Unit/DataTable/Renderer/CSVTest.php b/tests/PHPUnit/Unit/DataTable/Renderer/CSVTest.php
index 85691cab26..c6fd94e406 100644
--- a/tests/PHPUnit/Unit/DataTable/Renderer/CSVTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Renderer/CSVTest.php
@@ -14,6 +14,9 @@ use Piwik\DataTable\Renderer\Csv;
 use Piwik\DataTable\Row;
 use Piwik\DataTable\Simple;
 
+/**
+ * @group DataTableTest
+ */
 class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
@@ -93,9 +96,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
         return $table;
     }
 
-    /**
-     * @group Core
-     */
+
     public function testCSVTest1()
     {
         $dataTable = $this->_getDataTableTest();
@@ -111,9 +112,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testCSVTest2()
     {
         $dataTable = $this->_getDataTableSimpleTest();
@@ -125,9 +124,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testCSVTest3()
     {
         $dataTable = $this->_getDataTableSimpleOneRowTest();
@@ -139,9 +136,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testCSVTest5()
     {
         $dataTable = $this->_getDataTableSimpleOneZeroRowTest();
@@ -153,9 +148,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testCSVTest4()
     {
         $dataTable = $this->_getDataTableEmpty();
@@ -167,9 +160,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testCSVTest6()
     {
         $dataTable = $this->_getDataTableSimpleOneFalseRowTest();
@@ -181,9 +172,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testCSVRendererCorrectlyEscapesHeadersAndValues()
     {
         $dataTable = $this->_getDataTableSimpleWithCommasInCells();
@@ -301,9 +290,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
         return $table;
     }
 
-    /**
-     * @group Core
-     */
+
     public function testCSVMapTest1()
     {
         $dataTable = $this->_getDataTableMapTest();
@@ -320,9 +307,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testCSVMapTest2()
     {
         $dataTable = $this->_getDataTableSimpleMapTest();
@@ -335,9 +320,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testCSVMapTest3()
     {
         $dataTable = $this->_getDataTableSimpleOneRowMapTest();
@@ -349,9 +332,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testCSVMapisMadeOfMapTest1()
     {
         $dataTable = $this->_getDataTableMap_containsDataTableMap_normal();
@@ -368,9 +349,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testCSVMapIsMadeOfMapTest2()
     {
         $dataTable = $this->_getDataTableMap_containsDataTableMap_simple();
@@ -383,9 +362,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testCSVMapIsMadeOfMapTest3()
     {
         $dataTable = $this->_getDataTableMap_containsDataTableMap_simpleOneRow();
@@ -397,9 +374,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testRenderArray1()
     {
         $data = array();
@@ -412,9 +387,7 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testRenderArray2()
     {
         $data = array('a', 'b', 'c');
@@ -429,9 +402,7 @@ c';
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testRenderArray3()
     {
         $data = array('a' => 'b', 'c' => 'd', 'e' => 'f', 5 => 'g');
@@ -445,9 +416,7 @@ b,d,f,g';
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testRenderArray4()
     {
         $data = array('a' => 'b');
diff --git a/tests/PHPUnit/Unit/DataTable/Renderer/ConsoleTest.php b/tests/PHPUnit/Unit/DataTable/Renderer/ConsoleTest.php
index 686f6a1be6..209a7a37a7 100644
--- a/tests/PHPUnit/Unit/DataTable/Renderer/ConsoleTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Renderer/ConsoleTest.php
@@ -13,6 +13,9 @@ use Piwik\DataTable;
 use Piwik\DataTable\Renderer\Console;
 use Piwik\DataTable\Row;
 
+/**
+ * @group DataTableTest
+ */
 class DataTable_Renderer_ConsoleTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
@@ -89,9 +92,7 @@ class DataTable_Renderer_ConsoleTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testRenderArray1()
     {
         $data = array();
@@ -104,9 +105,7 @@ class DataTable_Renderer_ConsoleTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testRenderArray2()
     {
         $data = array('a', 'b', 'c');
@@ -121,9 +120,7 @@ class DataTable_Renderer_ConsoleTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testRenderArray3()
     {
         $data = array('a' => 'b', 'c' => 'd', 'e' => 'f', 5 => 'g');
@@ -136,9 +133,7 @@ class DataTable_Renderer_ConsoleTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testRenderArray4()
     {
         $data = array('a' => 'b');
diff --git a/tests/PHPUnit/Unit/DataTable/Renderer/JSONTest.php b/tests/PHPUnit/Unit/DataTable/Renderer/JSONTest.php
index 738439474c..754424182c 100644
--- a/tests/PHPUnit/Unit/DataTable/Renderer/JSONTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Renderer/JSONTest.php
@@ -14,6 +14,9 @@ use Piwik\DataTable\Renderer\Json;
 use Piwik\DataTable\Row;
 use Piwik\DataTable\Simple;
 
+/**
+ * @group DataTableTest
+ */
 class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
@@ -93,9 +96,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
         return $table;
     }
 
-    /**
-     * @group Core
-     */
+
     public function testJSONTest1()
     {
         $dataTable = $this->_getDataTableTest();
@@ -108,9 +109,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testJSONTest2()
     {
         $dataTable = $this->_getDataTableSimpleTest();
@@ -121,9 +120,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testJSONTest3()
     {
         $dataTable = $this->_getDataTableSimpleOneRowTest();
@@ -133,9 +130,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testJSONTest4()
     {
         $dataTable = $this->_getDataTableEmpty();
@@ -145,9 +140,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testJSONTest5()
     {
         $dataTable = $this->_getDataTableSimpleOneZeroRowTest();
@@ -157,9 +150,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testJSONTest6()
     {
         $dataTable = $this->_getDataTableSimpleOneFalseRowTest();
@@ -274,9 +265,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
         return $table;
     }
 
-    /**
-     * @group Core
-     */
+
     public function testJSONArrayTest1()
     {
         $dataTable = $this->_getDataTableMapTest();
@@ -288,9 +277,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testJSONMapTest2()
     {
         $dataTable = $this->_getDataTableSimpleMapTest();
@@ -303,9 +290,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testJSONMapTest3()
     {
         $dataTable = $this->_getDataTableSimpleOneRowMapTest();
@@ -317,9 +302,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testJSONMapIsMadeOfMapTest1()
     {
         $dataTable = $this->_getDataTableMap_containsDataTableMap_normal();
@@ -330,9 +313,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testJSONMapIsMadeOfMapTest2()
     {
         $dataTable = $this->_getDataTableMap_containsDataTableMap_simple();
@@ -345,9 +326,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testJSONMapIsMadeOfMapTest3()
     {
         $dataTable = $this->_getDataTableMap_containsDataTableMap_simpleOneRow();
@@ -359,9 +338,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testRenderArray1()
     {
         $data = array();
@@ -373,9 +350,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testRenderArray2()
     {
         $data = array('a', 'b', 'c', array('a' => 'b'), array(1, 2));
@@ -387,9 +362,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testRenderArray3()
     {
         $data = array('a' => 'b', 'c' => 'd', 'e' => 'f', 5 => 'g');
@@ -401,9 +374,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testRenderArray4()
     {
         $data = array('a' => 'b', 'c' => array(1, 2, 3, 4), 'e' => array('f' => 'g', 'h' => 'i', 'j' => 'k'));
@@ -415,9 +386,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testRenderArray5()
     {
         $data = array('a' => 'b');
diff --git a/tests/PHPUnit/Unit/DataTable/Renderer/PHPTest.php b/tests/PHPUnit/Unit/DataTable/Renderer/PHPTest.php
index e3201dfbe6..de8128cfb9 100644
--- a/tests/PHPUnit/Unit/DataTable/Renderer/PHPTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Renderer/PHPTest.php
@@ -14,6 +14,9 @@ use Piwik\DataTable\Renderer\Php;
 use Piwik\DataTable\Row;
 use Piwik\DataTable\Simple;
 
+/**
+ * @group DataTableTest
+ */
 class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
@@ -93,9 +96,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase
         return $table;
     }
 
-    /**
-     * @group Core
-     */
+
     public function testPHPTest1()
     {
         $dataTable = $this->_getDataTableTest();
@@ -157,9 +158,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testPHPTest2()
     {
         $dataTable = $this->_getDataTableSimpleTest();
@@ -176,9 +175,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testPHPTest3()
     {
         $dataTable = $this->_getDataTableSimpleOneRowTest();
@@ -188,9 +185,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testPHPTest4()
     {
         $dataTable = $this->_getDataTableEmpty();
@@ -200,9 +195,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testPHPTest5()
     {
         $dataTable = $this->_getDataTableSimpleOneZeroRowTest();
@@ -212,9 +205,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testPHPTest6()
     {
         $dataTable = $this->_getDataTableSimpleOneFalseRowTest();
@@ -329,9 +320,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase
         return $table;
     }
 
-    /**
-     * @group Core
-     */
+
     public function testPHPMapTest1()
     {
         $dataTable = $this->_getDataTableMapTest();
@@ -383,9 +372,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testPHPMapTest2()
     {
         $dataTable = $this->_getDataTableSimpleMapTest();
@@ -410,9 +397,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testPHPMapTest3()
     {
         $dataTable = $this->_getDataTableSimpleOneRowMapTest();
@@ -428,9 +413,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testPHPMapIsMadeOfMapTest1()
     {
         $dataTable = $this->_getDataTableMap_containsDataTableMap_normal();
@@ -484,9 +467,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testPHPMapIsMadeOfMapTest2()
     {
         $dataTable = $this->_getDataTableMap_containsDataTableMap_simple();
@@ -512,9 +493,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testPHPMapIsMadeOfMapTest3()
     {
         $dataTable = $this->_getDataTableMap_containsDataTableMap_simpleOneRow();
diff --git a/tests/PHPUnit/Unit/DataTable/Renderer/XMLTest.php b/tests/PHPUnit/Unit/DataTable/Renderer/XMLTest.php
index 1abfe94b06..e9b02a9bd1 100644
--- a/tests/PHPUnit/Unit/DataTable/Renderer/XMLTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Renderer/XMLTest.php
@@ -14,6 +14,9 @@ use Piwik\DataTable\Renderer\Xml;
 use Piwik\DataTable\Row;
 use Piwik\DataTable\Simple;
 
+/**
+ * @group DataTableTest
+ */
 class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
@@ -93,9 +96,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
         return $table;
     }
 
-    /**
-     * @group Core
-     */
+
     public function testXMLTest1()
     {
         $dataTable = $this->_getDataTableTest();
@@ -152,9 +153,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testXMLTest2()
     {
         $dataTable = $this->_getDataTableSimpleTest();
@@ -172,9 +171,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testXMLTest3()
     {
         $dataTable = $this->_getDataTableSimpleOneRowTest();
@@ -185,9 +182,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testXMLTest4()
     {
         $dataTable = $this->_getDataTableEmpty();
@@ -198,9 +193,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testXMLTest5()
     {
         $dataTable = $this->_getDataTableSimpleOneZeroRowTest();
@@ -211,9 +204,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testXMLTest6()
     {
         $dataTable = $this->_getDataTableSimpleOneFalseRowTest();
@@ -224,9 +215,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testXMLRendererSuccessfullyRendersWhenSimpleDataTableColumnsHaveInvalidXmlCharacters()
     {
         $dataTable = $this->_getDataTableSimpleWithInvalidChars();
@@ -241,9 +230,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testXMLRendererSuccessfullyRendersWhenDataTableColumnsHaveInvalidXmlCharacters()
     {
         $dataTable = $this->_getDataTableWithInvalidChars();
@@ -365,9 +352,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
         return $table;
     }
 
-    /**
-     * @group Core
-     */
+
     public function testXMLMapTest1()
     {
         $dataTable = $this->_getDataTableMapTest();
@@ -412,9 +397,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testXMLArrayIsMadeOfMapTest1()
     {
         $dataTable = $this->_getDataTableMap_containsDataTableMap_normal();
@@ -463,9 +446,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testXMLMapTest2()
     {
         $dataTable = $this->_getDataTableSimpleMapTest();
@@ -487,9 +468,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testXMLArrayIsMadeOfMapTest2()
     {
         $dataTable = $this->_getDataTableMap_containsDataTableMap_simple();
@@ -513,9 +492,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testXMLMapTest3()
     {
         $dataTable = $this->_getDataTableSimpleOneRowMapTest();
@@ -532,9 +509,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testXMLArrayIsMadeOfMapTest3()
     {
         $dataTable = $this->_getDataTableMap_containsDataTableMap_simpleOneRow();
@@ -552,9 +527,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $rendered);
     }
 
-    /**
-     * @group Core
-     */
+
     public function testRenderArray1()
     {
         $data = array();
@@ -567,9 +540,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testRenderArray2()
     {
         $data = array("firstElement",
@@ -592,9 +563,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testRenderArray3()
     {
         $data = array('a' => 'b', 'c' => 'd', 'e' => 'f', 5 => 'g');
@@ -614,9 +583,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $render->render());
     }
 
-    /**
-     * @group Core
-     */
+
     public function testRenderArray4()
     {
         $data = array('c' => array(1, 2, 3, 4), 'e' => array('f' => 'g', 'h' => 'i', 'j' => 'k'));
diff --git a/tests/PHPUnit/Unit/DataTable/RowTest.php b/tests/PHPUnit/Unit/DataTable/RowTest.php
index 53a072fa36..7033299df5 100644
--- a/tests/PHPUnit/Unit/DataTable/RowTest.php
+++ b/tests/PHPUnit/Unit/DataTable/RowTest.php
@@ -12,7 +12,7 @@ use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
 /**
- * @group Core
+ * @group DataTableTest
  */
 class RowTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/PHPUnit/Unit/DataTableTest.php b/tests/PHPUnit/Unit/DataTableTest.php
index 30320f32ce..b36dbd5146 100644
--- a/tests/PHPUnit/Unit/DataTableTest.php
+++ b/tests/PHPUnit/Unit/DataTableTest.php
@@ -14,6 +14,9 @@ use Piwik\DataTable\Row;
 use Piwik\DataTable;
 use Piwik\Timer;
 
+/**
+ * @group DataTableTest
+ */
 class DataTableTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/tests/PHPUnit/Unit/DateTest.php b/tests/PHPUnit/Unit/DateTest.php
index 9f2c286342..dadbba6461 100644
--- a/tests/PHPUnit/Unit/DateTest.php
+++ b/tests/PHPUnit/Unit/DateTest.php
@@ -13,7 +13,6 @@ use Piwik\Date;
 use Piwik\SettingsServer;
 
 /**
- * @group Core_DateTest
  */
 class DateTest extends \PHPUnit_Framework_TestCase
 {
@@ -90,6 +89,27 @@ class DateTest extends \PHPUnit_Framework_TestCase
         }
     }
 
+    public function test_getHourInUTC()
+    {
+        $date = Date::factory('today', 'UTC');
+        $hour = $date->getHourUTC();
+        $this->assertSame('0', $hour); // hour is already in UTC
+
+        $date = Date::factory('today', 'UTC+10');
+        $hour = $date->getHourUTC();
+        $this->assertSame('10', $hour);
+
+        $date = Date::factory('today');
+        $date = $date->setTime('14:00:00')->setTimezone('UTC+10'); // 14-10 = 4
+        $hour = $date->getHourUTC();
+        $this->assertSame('4', $hour);
+
+        $date = Date::factory('today');
+        $date = $date->setTime('14:00:00')->setTimezone('UTC-5'); // 14+5 = 19
+        $hour = $date->getHourUTC();
+        $this->assertSame('19', $hour);
+    }
+
     /**
      * @group Core
      */
diff --git a/tests/PHPUnit/Unit/DependencyTest.php b/tests/PHPUnit/Unit/DependencyTest.php
deleted file mode 100644
index 37912aee39..0000000000
--- a/tests/PHPUnit/Unit/DependencyTest.php
+++ /dev/null
@@ -1,289 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-namespace Piwik\Tests\Unit;
-
-use Piwik\Plugin\Dependency;
-use Piwik\Plugin\Manager as PluginManager;
-use Piwik\Version;
-
-/**
- * @group Core
- */
-class DependencyTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @var Dependency
-     */
-    private $dependency;
-
-    public function setUp()
-    {
-        parent::setUp();
-        $this->dependency = new Dependency();
-    }
-
-    public function test_getMissingDependencies_shouldReturnEmptyArray_IfNoInputGiven()
-    {
-        $this->assertMissingDependency(null, array());
-        $this->assertMissingDependency(array(), array());
-    }
-
-    public function test_getMissingDependencies_EmptyVersion_ShouldBeIgnored()
-    {
-        $this->assertMissingDependency(array('php' => ''), array());
-    }
-
-    public function test_getMissingDependencies_multipleConditions()
-    {
-        $this->assertMissingDependency(array('php' => '<5.2', 'piwik' => '<2.0'), array(
-            $this->missingPhp('<5.2'),
-            $this->missingPiwik('<2.0')
-        ));
-
-        $this->assertMissingDependency(array('php' => '<5.2', 'piwik' => '<9.0'), array(
-            $this->missingPhp('<5.2')
-        ));
-
-        $this->assertMissingDependency(array('php' => '<9.2', 'piwik' => '<2.0'), array(
-            $this->missingPiwik('<2.0')
-        ));
-
-        $this->assertMissingDependency(array('php' => '<9.2', 'piwik' => '<9.0'), array());
-    }
-
-    public function test_getMissingDependencies_multipleConditions_differentConditions()
-    {
-        $this->assertMissingDependency(array('php' => '<5.2', 'piwik' => '>2.0'), array(
-            $this->missingPhp('<5.2')
-        ));
-
-        $this->assertMissingDependency(array('php' => '>=5.3', 'piwik' => '<2.0'), array(
-            $this->missingPiwik('<2.0')
-        ));
-
-        $this->assertMissingDependency(array('php' => '!=' . PHP_VERSION, 'piwik' => '<>' . Version::VERSION), array(
-            $this->missingPhp('!=' . PHP_VERSION),
-            $this->missingPiwik('<>' . Version::VERSION)
-        ));
-    }
-
-    public function test_getMissingVersion_AND_Condition()
-    {
-        $this->assertMissingDependency(array('php' => '<2.0,>=9.0', 'piwik' => '<2.0'), array(
-            $this->missingPhp('<2.0,>=9.0', '<2.0, >=9.0'),
-            $this->missingPiwik('<2.0')
-        ));
-    }
-
-    public function test_getMissingDependencies_detectsPHPVersion()
-    {
-        $this->assertMissingDependency(array('php' => '>=2.1'), array());
-        $this->assertMissingDependency(array('php' => '>=' . PHP_VERSION), array());
-        $this->assertMissingDependency(array('php' => '>' . PHP_VERSION), array(
-            $this->missingPhp('>' . PHP_VERSION)
-        ));
-        $this->assertMissingDependency(array('php' => '>=9.2'), array(
-            $this->missingPhp('>=9.2')
-        ));
-    }
-
-    public function test_getMissingDependencies_detectsPiwikVersion()
-    {
-        $this->assertMissingDependency(array('piwik' => '>=2.1'), array());
-        $this->assertMissingDependency(array('piwik' => '>=' . Version::VERSION), array());
-        $this->assertMissingDependency(array('piwik' => '>' . Version::VERSION), array(
-            $this->missingPiwik('>' . Version::VERSION)
-        ));
-        $this->assertMissingDependency(array('piwik' => '>=9.2'), array(
-            $this->missingPiwik('>=9.2')
-        ));
-    }
-
-    public function test_getMissingDependencies_detectUnknownDependencyName()
-    {
-        $this->assertMissingDependency(array('unkNowN' => '>99.99'), array(
-            $this->buildMissingDependecy('unkNowN', '', '>99.99')
-        ));
-        $this->assertMissingDependency(array('unkNowN' => '>=0.01'), array(
-            $this->buildMissingDependecy('unkNowN', '', '>=0.01')
-        ));
-    }
-
-    public function test_getMissingDependencies_detectsPluginVersion()
-    {
-        PluginManager::getInstance()->loadAllPluginsAndGetTheirInfo();
-
-        $this->assertMissingDependency(array('Annotations' => '>=2.1'), array());
-        $this->assertMissingDependency(array('Annotations' => '>=' . Version::VERSION), array());
-        $this->assertMissingDependency(array('Annotations' => '>' . Version::VERSION), array(
-            $this->buildMissingDependecy('Annotations', Version::VERSION, '>' . Version::VERSION)
-        ));
-        $this->assertMissingDependency(array('Annotations' => '>=9.2'), array(
-            $this->buildMissingDependecy('Annotations', Version::VERSION, '>=9.2')
-        ));
-    }
-
-    public function test_getMissingDependencies_setPiwikVersion()
-    {
-        $this->assertMissingDependency(array('piwik' => '>=9.2'), array($this->missingPiwik('>=9.2')));
-
-        $this->dependency->setPiwikVersion('9.2');
-
-        $this->assertMissingDependency(array('piwik' => '>=9.2'), array());
-    }
-
-    public function test_getMissingVersion_EmptyCurrentAndRequiredVersion_ShouldBeIgnored()
-    {
-        $this->assertMissingVersion(null, null, array());
-        $this->assertMissingVersion('', '', array());
-    }
-
-    public function test_getMissingVersion_EmptyCurrentVersion_ShouldBeDeclaredAsMissing()
-    {
-        $this->assertMissingVersion('', '5.5', array('>=5.5'));
-    }
-
-    public function test_getMissingVersion_EmptyRequiredVersion_ShouldBeIgnored()
-    {
-        $this->assertMissingVersion('5.5', '', array());
-    }
-
-    public function test_getMissingVersion_shouldIgnoreAnyWhitespace()
-    {
-        $this->assertMissingVersion('5.5 ', '5.5', array());
-        $this->assertMissingVersion(' 5.5 ', '5.5', array());
-        $this->assertMissingVersion('5.5', ' 5.5', array());
-        $this->assertMissingVersion('5.5', ' 5.5 ', array());
-    }
-
-    public function test_getMissingVersion_NoComparisonDefined_ShouldUseGreatherThanOrEqualByDefault()
-    {
-        $this->assertMissingVersion('5.4', '5.2', array());
-        $this->assertMissingVersion('5.4', '5.4', array());
-        $this->assertMissingVersion('5.4', '9.2', array('>=9.2'));
-    }
-
-    public function test_getMissingVersion_GreatherThanOrEqual()
-    {
-        $this->assertMissingVersion('5.4', '>=5.2', array());
-        $this->assertMissingVersion('5.4', '>=5.4', array());
-        $this->assertMissingVersion('5.4', '>=9.2', array('>=9.2'));
-    }
-
-    public function test_getMissingVersion_GreatherThan()
-    {
-        $this->assertMissingVersion('5.4', '>5.2', array());
-        $this->assertMissingVersion('5.4', '>5.4', array('>5.4'));
-        $this->assertMissingVersion('5.4', '>9.2', array('>9.2'));
-    }
-
-    public function test_getMissingVersion_LowerThanOrEqual()
-    {
-        $this->assertMissingVersion('5.4', '<=5.2', array('<=5.2'));
-        $this->assertMissingVersion('5.4', '<=5.4', array());
-        $this->assertMissingVersion('5.4', '<=9.2', array());
-    }
-
-    public function test_getMissingVersion_lowerThan()
-    {
-        $this->assertMissingVersion('5.4', '<5.2', array('<5.2'));
-        $this->assertMissingVersion('5.4', '<5.4', array('<5.4'));
-        $this->assertMissingVersion('5.4', '<9.2', array());
-    }
-
-    public function test_getMissingVersion_notEqual()
-    {
-        $this->assertMissingVersion('5.4', '<>5.2', array());
-        $this->assertMissingVersion('5.4', '<>5.4', array('<>5.4'));
-        $this->assertMissingVersion('5.4', '<>9.2', array());
-    }
-
-    public function test_getMissingVersion_notEqualUsingBang()
-    {
-        $this->assertMissingVersion('5.4', '!=5.2', array());
-        $this->assertMissingVersion('5.4', '!=5.4', array('!=5.4'));
-        $this->assertMissingVersion('5.4', '!=9.2', array());
-    }
-
-    public function test_getMissingVersion_exact()
-    {
-        $this->assertMissingVersion('5.4', '==5.2', array('==5.2'));
-        $this->assertMissingVersion('5.4', '==5.4', array());
-        $this->assertMissingVersion('5.4', '==9.2', array('==9.2'));
-    }
-
-    public function test_getMissingVersion_AND_Condition_returnsOnlyNonMatchingVersions()
-    {
-        $this->assertMissingVersion('5.4', '<5.2,>9.0', array('<5.2', '>9.0'));
-        $this->assertMissingVersion('5.4', '>5.2,<9.0', array());
-        $this->assertMissingVersion('5.4', '>5.2,<9.0,<2.0', array('<2.0'));
-        $this->assertMissingVersion('5.4', '>5.2,<9.0,<2.0,>=9.0', array('<2.0', '>=9.0'));
-        $this->assertMissingVersion('5.4', '<2.0,>=9.0', array('<2.0', '>=9.0'));
-    }
-
-    public function test_getMissingVersion_AND_Condition_shouldIgnoreAnyWhitespace()
-    {
-        $this->assertMissingVersion('5.2', '5.5 , 5.4,   5.3', array('>=5.5', '>=5.4', '>=5.3'));
-        $this->assertMissingVersion('5.5', '5.5 , 5.4,   5.3', array());
-        $this->assertMissingVersion(' 5.2 ', '5.5 , 5.4,   5.3', array('>=5.5', '>=5.4', '>=5.3'));
-        $this->assertMissingVersion(' 5.2 ', '>5.5 , <5.4,   ==5.3', array('>5.5', '==5.3'));
-        $this->assertMissingVersion(' 5.2 ', '>5.5 , !=5.4,   ==5.3', array('>5.5', '==5.3'));
-    }
-
-    public function test_getMissingVersion()
-    {
-        $this->assertMissingVersion('5.2', '<5.2,>9.0', array('<5.2', '>9.0'));
-        $this->assertMissingVersion('5.2', '<=5.2,>9.0', array('>9.0'));
-        $this->assertMissingVersion('5.1', '<5.2,>9.0', array('>9.0'));
-        $this->assertMissingVersion('9.1', '<5.2,>9.0', array('<5.2'));
-        $this->assertMissingVersion('5.2', '>=5.2,<=9.0', array());
-        $this->assertMissingVersion('9.0', '>=5.2,<=9.0', array());
-        $this->assertMissingVersion('6.4', '>=5.2,<=9.0', array());
-    }
-
-    private function missingPiwik($requiredVersion, $causedBy = null)
-    {
-        return $this->buildMissingDependecy('piwik', Version::VERSION, $requiredVersion, $causedBy);
-    }
-
-    private function missingPhp($requiredVersion, $causedBy = null)
-    {
-        return $this->buildMissingDependecy('php', PHP_VERSION, $requiredVersion, $causedBy);
-    }
-
-    private function buildMissingDependecy($name, $currentVersion, $requiredVersion, $causedBy = null)
-    {
-        if (is_null($causedBy)) {
-            $causedBy = $requiredVersion;
-        }
-
-        return array(
-            'requirement'     => $name,
-            'actualVersion'   => $currentVersion,
-            'requiredVersion' => $requiredVersion,
-            'causedBy'        => $causedBy
-        );
-    }
-
-    private function assertMissingDependency($requires, $expectedMissing)
-    {
-        $missing = $this->dependency->getMissingDependencies($requires);
-
-        $this->assertEquals($expectedMissing, $missing);
-    }
-
-    private function assertMissingVersion($currentVersion, $requiredVersion, $expectedMissing)
-    {
-        $missing = $this->dependency->getMissingVersions($currentVersion, $requiredVersion);
-
-        $this->assertEquals($expectedMissing, $missing);
-    }
-
-}
-
diff --git a/tests/PHPUnit/Unit/DeprecatedMethodsTest.php b/tests/PHPUnit/Unit/DeprecatedMethodsTest.php
index 2150dc32ba..8336c73c4e 100644
--- a/tests/PHPUnit/Unit/DeprecatedMethodsTest.php
+++ b/tests/PHPUnit/Unit/DeprecatedMethodsTest.php
@@ -20,9 +20,9 @@ use ReflectionClass;
  */
 class DeprecatedMethodsTest extends \PHPUnit_Framework_TestCase
 {
-    public function test_version2_0_4()
+    public function test_deprecations()
     {
-        $validTill = '2015-02-25';
+        $validTill = '2015-03-10';
         $this->assertDeprecatedMethodIsRemoved('\Piwik\Period', 'factory', $validTill);
         $this->assertDeprecatedMethodIsRemoved('\Piwik\Config', 'getConfigSuperUserForBackwardCompatibility', $validTill);
         $this->assertDeprecatedMethodIsRemoved('\Piwik\Menu\MenuAdmin', 'addEntry', $validTill);
@@ -30,16 +30,7 @@ class DeprecatedMethodsTest extends \PHPUnit_Framework_TestCase
         $this->assertDeprecatedMethodIsRemoved('\Piwik\Menu\MenuTop', 'addEntry', $validTill);
         $this->assertDeprecatedMethodIsRemoved('\Piwik\Menu\MenuTop', 'removeEntry', $validTill);
 
-        $validTill = '2015-02-06';
-        $this->assertDeprecatedClassIsRemoved('\IntegrationTestCase', $validTill);
-        $this->assertDeprecatedClassIsRemoved('\DatabaseTestCase', $validTill);
-        $this->assertDeprecatedClassIsRemoved('\BenchmarkTestCase', $validTill);
-        $this->assertDeprecatedClassIsRemoved('\FakeAccess', $validTill);
-        $this->assertDeprecatedClassIsRemoved('\Piwik\Tests\ConsoleCommandTestCase', $validTill);
-        $this->assertDeprecatedClassIsRemoved('\Piwik\Tests\Fixture', $validTill);
-        $this->assertDeprecatedClassIsRemoved('\Piwik\Tests\OverrideLogin', $validTill);
-
-        $validTill = '2015-03-01';
+        $validTill = '2015-03-10';
         $this->assertDeprecatedMethodIsRemoved('Piwik\IP', 'sanitizeIp', $validTill);
         $this->assertDeprecatedMethodIsRemoved('Piwik\IP', 'sanitizeIpRange', $validTill);
         $this->assertDeprecatedMethodIsRemoved('Piwik\IP', 'P2N', $validTill);
@@ -62,7 +53,12 @@ class DeprecatedMethodsTest extends \PHPUnit_Framework_TestCase
         $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getOSFamily', $validTill);
         $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getBrowserType', $validTill);
         $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getMobileVsDesktop', $validTill);
-        $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\UserSettings', 'mapDeprecatedActions', $validTill);
+        $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getResolution', $validTill);
+        $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getConfiguration', $validTill);
+        $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getPlugin', $validTill);
+        $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getLanguage', $validTill);
+        $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getLanguageCode', $validTill);
+        $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\UserSettings', 'renameDeprecatedModuleAndAction', $validTill);
 
         $this->assertDeprecatedMethodIsRemovedInPiwik3('\Piwik\Menu\MenuAbstract', 'add');
     }
diff --git a/tests/PHPUnit/Unit/Metrics/Formatter/HtmlTest.php b/tests/PHPUnit/Unit/Metrics/Formatter/HtmlTest.php
index fd9b996f50..004e749e25 100644
--- a/tests/PHPUnit/Unit/Metrics/Formatter/HtmlTest.php
+++ b/tests/PHPUnit/Unit/Metrics/Formatter/HtmlTest.php
@@ -7,6 +7,7 @@
  */
 namespace Piwik\Tests\Unit\Metrics\Formatter;
 
+use Piwik\Intl\Locale;
 use Piwik\Metrics\Formatter\Html;
 use Piwik\Translate;
 use Piwik\Plugins\SitesManager\API as SitesManagerAPI;
@@ -34,18 +35,14 @@ class HtmlTest extends \PHPUnit_Framework_TestCase
 
         $this->formatter = new Html();
 
-        setlocale(LC_ALL, null);
-
-        Translate::loadEnglishTranslation();
+        Translate::loadAllTranslations();
         $this->setSiteManagerApiMock();
     }
 
     public function tearDown()
     {
-        Translate::unloadEnglishTranslation();
+        Translate::reset();
         $this->unsetSiteManagerApiMock();
-
-        setlocale(LC_ALL, null);
     }
 
     public function test_getPrettyTimeFromSeconds_DefaultsToShowingSentences_AndUsesNonBreakingSpaces()
@@ -64,6 +61,22 @@ class HtmlTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $value);
     }
 
+    public function test_getPrettySizeFromBytes_InFixedUnitThatIsHigherThanBestUnit()
+    {
+        $expected = '0.001465&nbsp;M';
+        $value = $this->formatter->getPrettySizeFromBytes(1536, 'M', 6);
+
+        $this->assertEquals($expected, $value);
+    }
+
+    public function test_getPrettySizeFromBytes_InUnitThatIsLowerThanBestUnit()
+    {
+        $expected = '1536&nbsp;B';
+        $value = $this->formatter->getPrettySizeFromBytes(1536, 'B');
+
+        $this->assertEquals($expected, $value);
+    }
+
     public function test_getPrettyMoney_UsesNonBreakingSpaces()
     {
         $expected = '1&nbsp;€';
diff --git a/tests/PHPUnit/Unit/Metrics/FormatterTest.php b/tests/PHPUnit/Unit/Metrics/FormatterTest.php
index 8ef4831299..36def63bb1 100644
--- a/tests/PHPUnit/Unit/Metrics/FormatterTest.php
+++ b/tests/PHPUnit/Unit/Metrics/FormatterTest.php
@@ -7,6 +7,7 @@
  */
 namespace Piwik\Tests\Unit\Metrics;
 
+use Piwik\Intl\Locale;
 use Piwik\Metrics\Formatter;
 use Piwik\Translate;
 use Piwik\Plugins\SitesManager\API as SitesManagerAPI;
@@ -50,18 +51,14 @@ class FormatterTest extends \PHPUnit_Framework_TestCase
 
         $this->formatter = new Formatter();
 
-        setlocale(LC_ALL, null);
-
-        Translate::loadEnglishTranslation();
+        Translate::loadAllTranslations();
         $this->setSiteManagerApiMock();
     }
 
     public function tearDown()
     {
-        Translate::unloadEnglishTranslation();
+        Translate::reset();
         $this->unsetSiteManagerApiMock();
-
-        setlocale(LC_ALL, null);
     }
 
     /**
@@ -83,6 +80,7 @@ class FormatterTest extends \PHPUnit_Framework_TestCase
         }
 
         $this->assertEquals($expected, $this->formatter->getPrettyNumber($number, 2));
+        Locale::setDefaultLocale();
     }
 
     /**
@@ -142,8 +140,9 @@ class FormatterTest extends \PHPUnit_Framework_TestCase
             array(0.14, '0,14'),
             array(0.14567, '0,15'),
             array(100.1234, '100,12'),
-            array(1000.45, '1.000,45'),
-            array(23456789.00, '23.456.789,00')
+            // Those last two are commented because locales are platform dependent, on some platforms the separator is '' instead of '.'
+//            array(1000.45, '1.000,45'),
+//            array(23456789.00, '23.456.789,00'),
         );
     }
 
diff --git a/tests/PHPUnit/Unit/MetricsTest.php b/tests/PHPUnit/Unit/MetricsTest.php
index 20202232ef..a943f2d2df 100644
--- a/tests/PHPUnit/Unit/MetricsTest.php
+++ b/tests/PHPUnit/Unit/MetricsTest.php
@@ -13,7 +13,7 @@ use Piwik\Metrics;
 use Piwik\Site;

 use Piwik\Tests\Framework\Mock\FakeAccess;

 

-class Core_MetricsTest extends \PHPUnit_Framework_TestCase

+class MetricsTest extends \PHPUnit_Framework_TestCase

 {

     /**

      * @group Core

@@ -80,7 +80,8 @@ class Core_MetricsTest extends \PHPUnit_Framework_TestCase
             'max_event_value' => 37,

             'nb_events_with_value' => 38,

             'nb_impressions' => 41,

-            'nb_interactions' => 42

+            'nb_interactions' => 42,

+            'nb_uniq_fingerprints' => 43,

         );

         $this->assertEquals($expectedMapping, $mapping);

     }

diff --git a/tests/PHPUnit/Unit/Period/BasePeriodTest.php b/tests/PHPUnit/Unit/Period/BasePeriodTest.php
new file mode 100644
index 0000000000..a534b1bb2e
--- /dev/null
+++ b/tests/PHPUnit/Unit/Period/BasePeriodTest.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Unit\Period;
+
+use Piwik\Translate;
+
+abstract class BasePeriodTest extends \PHPUnit_Framework_TestCase
+{
+    public function setUp()
+    {
+        parent::setUp();
+
+        Translate::loadAllTranslations();
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
+
+        Translate::reset();
+    }
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Unit/Period/DayTest.php b/tests/PHPUnit/Unit/Period/DayTest.php
index ae1ba01844..c2b4a05a5b 100644
--- a/tests/PHPUnit/Unit/Period/DayTest.php
+++ b/tests/PHPUnit/Unit/Period/DayTest.php
@@ -10,9 +10,8 @@ namespace Piwik\Tests\Unit\Period;
 
 use Piwik\Date;
 use Piwik\Period\Day;
-use Piwik\Translate;
 
-class Period_DayTest extends \PHPUnit_Framework_TestCase
+class DayTest extends BasePeriodTest
 {
     /**
      * @group Core
@@ -215,8 +214,6 @@ class Period_DayTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetLocalizedShortString()
     {
-        $this->loadEnglishTranslation();
-
         $month = new Day(Date::factory('2024-10-09'));
         $shouldBe = 'Wed 9 Oct';
         $this->assertEquals($shouldBe, $month->getLocalizedShortString());
@@ -227,8 +224,6 @@ class Period_DayTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetLocalizedLongString()
     {
-        $this->loadEnglishTranslation();
-
         $month = new Day(Date::factory('2024-10-09'));
         $shouldBe = 'Wednesday 9 October 2024';
         $this->assertEquals($shouldBe, $month->getLocalizedLongString());
@@ -239,15 +234,8 @@ class Period_DayTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetPrettyString()
     {
-        $this->loadEnglishTranslation();
-
         $month = new Day(Date::factory('2024-10-09'));
         $shouldBe = '2024-10-09';
         $this->assertEquals($shouldBe, $month->getPrettyString());
     }
-
-    private function loadEnglishTranslation()
-    {
-        Translate::reloadLanguage('en');
-    }
 }
\ No newline at end of file
diff --git a/tests/PHPUnit/Unit/Period/MonthTest.php b/tests/PHPUnit/Unit/Period/MonthTest.php
index 916f925e6d..6ef1c824e3 100644
--- a/tests/PHPUnit/Unit/Period/MonthTest.php
+++ b/tests/PHPUnit/Unit/Period/MonthTest.php
@@ -10,9 +10,8 @@ namespace Piwik\Tests\Unit\Period;
 
 use Piwik\Date;
 use Piwik\Period\Month;
-use Piwik\Translate;
 
-class Period_MonthTest extends \PHPUnit_Framework_TestCase
+class MonthTest extends BasePeriodTest
 {
     /**
      * testing december
@@ -271,8 +270,6 @@ class Period_MonthTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetLocalizedShortString()
     {
-        $this->loadEnglishTranslation();
-
         $month = new Month(Date::factory('2024-10-09'));
         $shouldBe = 'Oct 2024';
         $this->assertEquals($shouldBe, $month->getLocalizedShortString());
@@ -283,8 +280,6 @@ class Period_MonthTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetLocalizedLongString()
     {
-        $this->loadEnglishTranslation();
-
         $month = new Month(Date::factory('2024-10-09'));
         $shouldBe = '2024, October';
         $this->assertEquals($shouldBe, $month->getLocalizedLongString());
@@ -295,15 +290,9 @@ class Period_MonthTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetPrettyString()
     {
-        $this->loadEnglishTranslation();
-
         $month = new Month(Date::factory('2024-10-09'));
         $shouldBe = '2024-10';
         $this->assertEquals($shouldBe, $month->getPrettyString());
     }
 
-    private function loadEnglishTranslation()
-    {
-        Translate::reloadLanguage('en');
-    }
 }
\ No newline at end of file
diff --git a/tests/PHPUnit/Unit/Period/RangeTest.php b/tests/PHPUnit/Unit/Period/RangeTest.php
index 29c716d68b..adc84c5651 100644
--- a/tests/PHPUnit/Unit/Period/RangeTest.php
+++ b/tests/PHPUnit/Unit/Period/RangeTest.php
@@ -14,14 +14,13 @@ use Piwik\Period\Month;
 use Piwik\Period\Range;
 use Piwik\Period\Week;
 use Piwik\Period\Year;
-use Piwik\Translate;
 
-class Period_RangeTest extends \PHPUnit_Framework_TestCase
+/**
+ * @group Core
+ */
+class RangeTest extends BasePeriodTest
 {
     // test range 1
-    /**
-     * @group Core
-     */
     public function testRangeToday()
     {
         $range = new Range('day', 'last1');
@@ -36,9 +35,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($correct, $range->toString());
     }
 
-    /**
-     * @group Core
-     */
     public function testRangeTodayUtcPlus12()
     {
         // rather ugly test, UTC+23 doesn't exist, but it's a way to test that last1 in UTC+23 will be "our" UTC tomorrow
@@ -55,9 +51,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
     }
 
     // test range 2
-    /**
-     * @group Core
-     */
     public function testRange2days()
     {
         $range = new Range('day', 'last2');
@@ -74,9 +67,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
     }
 
     // test range 3
-    /**
-     * @group Core
-     */
     public function testRange5days()
     {
         $range = new Range('day', 'last50');
@@ -93,9 +83,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
     }
 
     // test range 4
-    /**
-     * @group Core
-     */
     public function testRangePrevious3days()
     {
         $range = new Range('day', 'previous3');
@@ -112,9 +99,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
     }
 
     // test range date1,date2
-    /**
-     * @group Core
-     */
     public function testRangeComma1()
     {
 
@@ -131,9 +115,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
     }
 
     // test range date1,date2
-    /**
-     * @group Core
-     */
     public function testRangeComma2()
     {
 
@@ -162,9 +143,17 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
     }
 
     // test range date1,date2
-    /**
-     * @group Core
-     */
+    // see https://github.com/piwik/piwik/issues/6194
+    public function testRangeComma3_EndDateIncludesToday()
+    {
+        $range = new Range('day', '2008-01-01,today');
+        $subPeriods = $range->getSubperiods();
+        $this->assertEquals('2008-01-01', $subPeriods[0]->toString());
+        $this->assertEquals('2008-01-02', $subPeriods[1]->toString());
+        $this->assertEquals('2008-01-03', $subPeriods[2]->toString());
+    }
+
+    // test range date1,date2
     public function testRangeWeekcomma1()
     {
         $range = new Range('week', '2007-12-22,2008-01-03');
@@ -209,9 +198,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
     }
 
     // test range date1,date2
-    /**
-     * @group Core
-     */
     public function testRangeYearcomma1()
     {
         $range = new Range('year', '2006-12-22,2007-01-03');
@@ -253,9 +239,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
     }
 
     // test range date1,date2
-    /**
-     * @group Core
-     */
     public function testRangeMonthcomma1()
     {
         $range = new Range('month', '2006-12-22,2007-01-03');
@@ -335,9 +318,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
     }
 
     // test range WEEK
-    /**
-     * @group Core
-     */
     public function testRangeWeek()
     {
         $range = new Range('week', 'last50');
@@ -357,9 +337,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
     }
 
     // test range WEEK last1
-    /**
-     * @group Core
-     */
     public function testRangeWeekLast1()
     {
         $range = new Range('week', 'last1');
@@ -369,9 +346,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
     }
 
     // test range MONTH
-    /**
-     * @group Core
-     */
     public function testRangeMonth()
     {
         $range = new Range('month', 'last20');
@@ -391,9 +365,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
     }
 
     // test range MONTH last1
-    /**
-     * @group Core
-     */
     public function testRangeMonthLast1()
     {
         $range = new Range('month', 'last1');
@@ -403,9 +374,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
     }
 
     // test range PREVIOUS MONTH
-    /**
-     * @group Core
-     */
     public function testRangePreviousmonth()
     {
         $range = new Range('month', 'previous10');
@@ -425,9 +393,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($correct, $range->toString());
     }
 
-    /**
-     * @group Core
-     */
     public function testRangePreviousmonth_onLastDayOfMonth()
     {
         $end = Date::factory('2013-10-31');
@@ -447,9 +412,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($correct, $range->toString());
     }
 
-    /**
-     * @group Core
-     */
     public function testRangePreviousweek_onLastDayOfWeek()
     {
         $end = Date::factory('2013-11-03');
@@ -466,9 +428,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($correct, $range->toString());
     }
 
-    /**
-     * @group Core
-     */
     public function testRangePreviousweek_onFirstDayOfWeek()
     {
         $end = Date::factory('2013-11-04');
@@ -485,9 +444,7 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $correct = array_reverse($correct);
         $this->assertEquals($correct, $range->toString());
     }
-    /**
-     * @group Core
-     */
+
     public function testRangeLastweek_onFirstDayOfWeek()
     {
         $end = Date::factory('2013-11-04');
@@ -504,9 +461,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($correct, $range->toString());
     }
 
-    /**
-     * @group Core
-     */
     public function testRangeLastmonth_onLastDayOfMonth()
     {
         $end = Date::factory('2013-10-31');
@@ -525,9 +479,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($correct, $range->toString());
     }
 
-    /**
-     * @group Core
-     */
     public function _testRangePreviousmonth_onFirstOfMonth()
     {
         $end = Date::factory('2013-11-01');
@@ -547,9 +498,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($correct, $range->toString());
     }
 
-    /**
-     * @group Core
-     */
     public function _testRangeLastmonth_onFirstOfMonth()
     {
         $end = Date::factory('2013-11-01');
@@ -569,9 +517,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
     }
 
     // test range YEAR
-    /**
-     * @group Core
-     */
     public function testRangeYear()
     {
         $range = new Range('year', 'last10');
@@ -591,9 +536,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
     }
 
     // test range YEAR last1
-    /**
-     * @group Core
-     */
     public function testRangeYearLast1()
     {
         $range = new Range('year', 'last1');
@@ -602,9 +544,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(array($currentYear->toString()), $range->toString());
     }
 
-    /**
-     * @group Core
-     */
     public function testCustomRangeYearUsesYearIfPossible()
     {
         $range = new Range('range', '2005-12-17,2008-01-03', 'UTC', Date::factory('2008-01-03'));
@@ -639,9 +578,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($correct, $range->toString());
     }
 
-    /**
-     * @group Core
-     */
     public function testCustomRangeIsYear_UsesFullYear()
     {
         $range = new Range('range', '2011-01-01,2011-12-31', 'UTC', Date::factory('2012-01-03'));
@@ -655,9 +591,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($correct, $range->toString());
     }
 
-    /**
-     * @group Core
-     */
     public function testCustomRangeYear_UsesCurrentYear()
     {
         $rangeString = '2013-01-01,2013-11-01';
@@ -674,9 +607,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($rangeString, $range->getRangeString());
     }
 
-    /**
-     * @group Core
-     */
     public function testCustomRangeYearUsesCurrentYear_onLastDayOfYear()
     {
         $range = new Range('range', '2013-01-01,2013-12-31', 'UTC', Date::factory('2013-12-31'));
@@ -690,9 +620,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($correct, $range->toString());
     }
 
-    /**
-     * @group Core
-     */
     public function testCustomRangeWeekInsideEndingToday()
     {
         $range = new Range('range', '2007-12-22,2008-01-03', 'UTC', Date::factory('2008-01-03'));
@@ -723,9 +650,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($correct, $range->toString());
     }
 
-    /**
-     * @group Core
-     */
     public function testRangeEndDateIsTodayAndStartDateNotStartOfTheWeek()
     {
         $range = new Range('range', '2013-10-29,2013-10-30', 'UTC', Date::factory('2013-10-30'));
@@ -739,9 +663,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($correct, $range->toString());
     }
 
-    /**
-     * @group Core
-     */
     public function testRangeEndDateIsInFuture()
     {
         $range = new Range('range', '2013-10-29,2013-10-31', 'UTC', Date::factory('2013-10-30'));
@@ -756,9 +677,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($correct, $range->toString());
     }
 
-    /**
-     * @group Core
-     */
     public function testRangePreviousmonthEndDateIsInFutureAndEndOfTheWeek()
     {
         $range = new Range('range', '2013-10-29,2013-11-03', 'UTC', Date::factory('2013-10-30'));
@@ -776,9 +694,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($correct, $range->toString());
     }
 
-    /**
-     * @group Core
-     */
     public function testCustomRangeWeekInsideEndingYesterday()
     {
         $todays = array(
@@ -814,9 +729,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         }
     }
 
-    /**
-     * @group Core
-     */
     public function testCustomRangeOnlyDaysLessThanOneWeek()
     {
         $range = new Range('range', '2007-12-30,2008-01-01');
@@ -830,9 +742,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($correct, $range->toString());
     }
 
-    /**
-     * @group Core
-     */
     public function testCustomRangeOneWeekOnly()
     {
         $range = new Range('range', '2007-12-31,2008-01-06');
@@ -852,9 +761,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($correct, $range->toString());
     }
 
-    /**
-     * @group Core
-     */
     public function testCustomRangeStartsWithWeek()
     {
         $range = new Range('range', '2007-12-31,2008-01-08');
@@ -876,9 +782,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($correct, $range->toString());
     }
 
-    /**
-     * @group Core
-     */
     public function testCustomRangeEndsWithWeek()
     {
         $range = new Range('range', '2007-12-21,2008-01-06');
@@ -910,9 +813,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($correct, $range->toString());
     }
 
-    /**
-     * @group Core
-     */
     public function testCustomRangeContainsMonthAndWeek()
     {
         $range = new Range('range', '2011-09-18,2011-11-02', 'UTC', Date::factory('2012-01-01'));
@@ -975,9 +875,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($correct, $range->toString());
     }
 
-    /**
-     * @group Core
-     */
     public function testCustomRangeContainsSeveralMonthsAndWeeksStartingWithMonth()
     {
         // Testing when "today" is in the same month, or later in the future
@@ -1089,9 +986,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         }
     }
 
-    /**
-     * @group Core
-     */
     public function testCustomRangeOneMonthOnly()
     {
         $range = new Range('range', '2011-09-01,2011-09-30');
@@ -1133,9 +1027,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($correct, $range->toString());
     }
 
-    /**
-     * @group Core
-     */
     public function test_CustomRange_startsWithWeek_EndsWithMonth()
     {
         $range = new Range('range', '2011-07-25,2011-08-31');
@@ -1188,9 +1079,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($correct, $range->toString());
     }
 
-    /**
-     * @group Core
-     */
     public function testCustomRangeBeforeIsAfterYearRight()
     {
         try {
@@ -1205,9 +1093,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->fail('Expected exception not raised');
     }
 
-    /**
-     * @group Core
-     */
     public function testCustomRangeLastN()
     {
         $range = new Range('range', 'last4');
@@ -1222,9 +1107,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($correct, $range->toString());
     }
 
-    /**
-     * @group Core
-     */
     public function testCustomRangePreviousN()
     {
         $range = new Range('range', 'previous3');
@@ -1238,9 +1120,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($correct, $range->toString());
     }
 
-    /**
-     * @group Core
-     */
     public function testCustomRangePreviousNEndToday()
     {
         $range = new Range('range', 'previous3');
@@ -1253,9 +1132,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($correct, $range->toString());
     }
 
-    /**
-     * @group Core
-     */
     public function testInvalidRangeThrows()
     {
         try {
@@ -1267,34 +1143,22 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->fail('Expected exception not raised');
     }
 
-    /**
-     * @group Core
-     */
     public function testGetLocalizedShortString()
     {
-        $this->loadEnglishTranslation();
         $month = new Range('range', '2000-12-09,2001-02-01');
         $shouldBe = '9 Dec 00 - 1 Feb 01';
         $this->assertEquals($shouldBe, $month->getLocalizedShortString());
     }
 
-    /**
-     * @group Core
-     */
     public function testGetLocalizedLongString()
     {
-        $this->loadEnglishTranslation();
         $month = new Range('range', '2023-05-09,2023-05-21');
         $shouldBe = '8 May 23 - 21 May 23';
         $this->assertEquals($shouldBe, $month->getLocalizedLongString());
     }
 
-    /**
-     * @group Core
-     */
     public function testGetPrettyString()
     {
-        $this->loadEnglishTranslation();
         $month = new Range('range', '2007-02-09,2007-03-15');
         $shouldBe = 'From 2007-02-09 to 2007-03-15';
         $this->assertEquals($shouldBe, $month->getPrettyString());
@@ -1312,9 +1176,6 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @group Core
-     *
-     *
      * @dataProvider getDataForLastNLimitsTest
      */
     public function testLastNLimits($period, $lastN, $expectedLastN)
@@ -1323,8 +1184,51 @@ class Period_RangeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expectedLastN, $range->getNumberOfSubperiods());
     }
 
-    private function loadEnglishTranslation()
+    /**
+     * @link https://github.com/piwik/piwik/pull/7057
+     */
+    public function testLastWithoutNumber_shouldBehaveLikeLast1()
+    {
+        $range = new Range('day', 'last');
+        $expected = new Range('day', 'last1');
+
+        $this->assertEquals(1, $range->getNumberOfSubperiods());
+        $this->assertEquals($expected->getRangeString(), $range->getRangeString());
+    }
+
+    /**
+     * @link https://github.com/piwik/piwik/pull/7057
+     */
+    public function testPreviousWithoutNumber_shouldBehaveLikePrevious1()
+    {
+        $range = new Range('day', 'previous');
+        $expected = new Range('day', 'previous1');
+
+        $this->assertEquals(1, $range->getNumberOfSubperiods());
+        $this->assertEquals($expected->getRangeString(), $range->getRangeString());
+    }
+
+    /**
+     * @link https://github.com/piwik/piwik/pull/7057
+     */
+    public function testLast0_shouldBehaveLikeLast1()
+    {
+        $range = new Range('day', 'last0');
+        $expected = new Range('day', 'last1');
+
+        $this->assertEquals(1, $range->getNumberOfSubperiods());
+        $this->assertEquals($expected->getRangeString(), $range->getRangeString());
+    }
+
+    /**
+     * @link https://github.com/piwik/piwik/pull/7057
+     */
+    public function testPrevious0_shouldBehaveLikePrevious1()
     {
-        Translate::reloadLanguage('en');
+        $range = new Range('day', 'previous0');
+        $expected = new Range('day', 'previous1');
+
+        $this->assertEquals(1, $range->getNumberOfSubperiods());
+        $this->assertEquals($expected->getRangeString(), $range->getRangeString());
     }
 }
diff --git a/tests/PHPUnit/Unit/Period/WeekTest.php b/tests/PHPUnit/Unit/Period/WeekTest.php
index c543a2db5d..05f54b9942 100644
--- a/tests/PHPUnit/Unit/Period/WeekTest.php
+++ b/tests/PHPUnit/Unit/Period/WeekTest.php
@@ -10,9 +10,8 @@ namespace Piwik\Tests\Unit\Period;
 
 use Piwik\Date;
 use Piwik\Period\Week;
-use Piwik\Translate;
 
-class Period_WeekTest extends \PHPUnit_Framework_TestCase
+class WeekTest extends BasePeriodTest
 {
     /**
      * test week between 2 years
@@ -123,7 +122,6 @@ class Period_WeekTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetLocalizedShortString()
     {
-        $this->loadEnglishTranslation();
         $week = new Week(Date::factory('2024-10-09'));
         $shouldBe = '7 Oct - 13 Oct 24';
         $this->assertEquals($shouldBe, $week->getLocalizedShortString());
@@ -134,7 +132,6 @@ class Period_WeekTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetLocalizedLongString()
     {
-        $this->loadEnglishTranslation();
         $week = new Week(Date::factory('2024-10-09'));
         $shouldBe = 'Week 7 October - 13 October 2024';
         $this->assertEquals($shouldBe, $week->getLocalizedLongString());
@@ -145,14 +142,8 @@ class Period_WeekTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetPrettyString()
     {
-        $this->loadEnglishTranslation();
         $week = new Week(Date::factory('2024-10-09'));
         $shouldBe = 'From 2024-10-07 to 2024-10-13';
         $this->assertEquals($shouldBe, $week->getPrettyString());
     }
-
-    private function loadEnglishTranslation()
-    {
-        Translate::reloadLanguage('en');
-    }
 }
diff --git a/tests/PHPUnit/Unit/Period/YearTest.php b/tests/PHPUnit/Unit/Period/YearTest.php
index fad41535de..13d688bda9 100644
--- a/tests/PHPUnit/Unit/Period/YearTest.php
+++ b/tests/PHPUnit/Unit/Period/YearTest.php
@@ -10,9 +10,8 @@ namespace Piwik\Tests\Unit\Period;
 
 use Piwik\Date;
 use Piwik\Period\Year;
-use Piwik\Translate;
 
-class Period_YearTest extends \PHPUnit_Framework_TestCase
+class YearTest extends BasePeriodTest
 {
     /**
      * test normal case
@@ -70,7 +69,6 @@ class Period_YearTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetLocalizedShortString()
     {
-        Translate::loadEnglishTranslation();
         $year = new Year(Date::factory('2024-10-09'));
         $shouldBe = '2024';
         $this->assertEquals($shouldBe, $year->getLocalizedShortString());
@@ -81,7 +79,6 @@ class Period_YearTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetLocalizedLongString()
     {
-        Translate::loadEnglishTranslation();
         $year = new Year(Date::factory('2024-10-09'));
         $shouldBe = '2024';
         $this->assertEquals($shouldBe, $year->getLocalizedLongString());
@@ -92,7 +89,6 @@ class Period_YearTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetPrettyString()
     {
-        Translate::loadEnglishTranslation();
         $year = new Year(Date::factory('2024-10-09'));
         $shouldBe = '2024';
         $this->assertEquals($shouldBe, $year->getPrettyString());
diff --git a/tests/PHPUnit/Unit/Plugin/Dimension/ConversionDimensionTest.php b/tests/PHPUnit/Unit/Plugin/Dimension/ConversionDimensionTest.php
index 38b2e4856f..3b8b2d9049 100644
--- a/tests/PHPUnit/Unit/Plugin/Dimension/ConversionDimensionTest.php
+++ b/tests/PHPUnit/Unit/Plugin/Dimension/ConversionDimensionTest.php
@@ -147,7 +147,7 @@ class Plugin_ConversionDimensionTest extends \PHPUnit_Framework_TestCase
 
     public function test_getAllDimensions_shouldLoadAllDimensionsButOnlyIfLoadedPlugins()
     {
-        Manager::getInstance()->loadPlugins(array('Goals', 'ExampleTracker'));
+        Manager::getInstance()->loadPlugins(array('Goals', 'Ecommerce', 'ExampleTracker'));
 
         $dimensions = ConversionDimension::getAllDimensions();
 
@@ -155,7 +155,7 @@ class Plugin_ConversionDimensionTest extends \PHPUnit_Framework_TestCase
 
         foreach ($dimensions as $dimension) {
             $this->assertInstanceOf('\Piwik\Plugin\Dimension\ConversionDimension', $dimension);
-            $this->assertRegExp('/Piwik.Plugins.(ExampleTracker|Goals).Columns/', get_class($dimension));
+            $this->assertRegExp('/Piwik.Plugins.(ExampleTracker|Ecommerce|Goals).Columns/', get_class($dimension));
         }
     }
 }
\ No newline at end of file
diff --git a/tests/PHPUnit/Unit/RankingQueryTest.php b/tests/PHPUnit/Unit/RankingQueryTest.php
index 49c24e56be..c242732ee7 100644
--- a/tests/PHPUnit/Unit/RankingQueryTest.php
+++ b/tests/PHPUnit/Unit/RankingQueryTest.php
@@ -139,7 +139,7 @@ class RankingQueryTest extends \PHPUnit_Framework_TestCase
      */
     private function checkQuery($rankingQuery, $innerQuerySql, $expected)
     {
-        $query = $rankingQuery->generateQuery($innerQuerySql);
+        $query = $rankingQuery->generateRankingQuery($innerQuerySql);
 
         $queryNoWhitespace = preg_replace("/\s+/", "", $query);
         $expectedNoWhitespace = preg_replace("/\s+/", "", $expected);
diff --git a/tests/PHPUnit/Unit/RegistryTest.php b/tests/PHPUnit/Unit/RegistryTest.php
deleted file mode 100644
index 376c857ed1..0000000000
--- a/tests/PHPUnit/Unit/RegistryTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-namespace Piwik\Tests\Unit;
-
-use Piwik\Registry;
-
-class RegistryTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @group Core
-     */
-    public function testGetInstance()
-    {
-        $instance = Registry::getInstance();
-
-        $this->assertInstanceOf('\Piwik\Registry', $instance);
-
-        // check singleton
-        $this->assertSame(Registry::getInstance(), $instance);
-    }
-
-    /**
-     * @group Core
-     */
-    public function testFuncionality()
-    {
-        $value = 'newValue';
-        $key   = 'newKey';
-
-        Registry::set($key, $value);
-        $this->assertEquals($value, Registry::get($key));
-        $this->assertTrue(Registry::isRegistered($key));
-    }
-}
diff --git a/tests/PHPUnit/Unit/ScheduledTaskTest.php b/tests/PHPUnit/Unit/ScheduledTaskTest.php
deleted file mode 100644
index 1b67ddf6f2..0000000000
--- a/tests/PHPUnit/Unit/ScheduledTaskTest.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-namespace Piwik\Tests\Unit;
-
-use Piwik\Plugins\ScheduledReports\ScheduledReports;
-use Piwik\ScheduledTask;
-
-class ScheduledTaskTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @group Core
-     */
-    public function testGetClassName()
-    {
-        $scheduledTask = new ScheduledTask(new ScheduledReports(), null, null, null);
-        $this->assertEquals('Piwik\Plugins\ScheduledReports\ScheduledReports', $scheduledTask->getClassName());
-    }
-
-    /**
-     * Dataprovider for testGetTaskName
-     */
-    public function getTaskNameTestCases()
-    {
-        return array(
-            array('CoreAdminHome.purgeOutdatedArchives', 'CoreAdminHome', 'purgeOutdatedArchives', null),
-            array('CoreAdminHome.purgeOutdatedArchives_previous30', 'CoreAdminHome', 'purgeOutdatedArchives', 'previous30'),
-            array('ScheduledReports.weeklySchedule', 'ScheduledReports', 'weeklySchedule', null),
-            array('ScheduledReports.weeklySchedule_1', 'ScheduledReports', 'weeklySchedule', 1),
-        );
-    }
-
-    /**
-     * @group Core
-     *
-     * @dataProvider getTaskNameTestCases
-     */
-    public function testGetTaskName($expectedTaskName, $className, $methodName, $methodParameter)
-    {
-        $this->assertEquals($expectedTaskName, ScheduledTask::getTaskName($className, $methodName, $methodParameter));
-    }
-}
diff --git a/tests/PHPUnit/Unit/ScheduledTime/DailyTest.php b/tests/PHPUnit/Unit/ScheduledTime/DailyTest.php
deleted file mode 100644
index 55a6c08520..0000000000
--- a/tests/PHPUnit/Unit/ScheduledTime/DailyTest.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-namespace Piwik\Tests\Unit\ScheduledTime;
-use Exception;
-use Piwik\ScheduledTime;
-
-/**
- * @group Core
- */
-class ScheduledTime_DailyTest extends \PHPUnit_Framework_TestCase
-{
-    private static $_JANUARY_01_1971_09_00_00;
-    private static $_JANUARY_01_1971_09_10_00;
-    private static $_JANUARY_01_1971_12_10_00;
-    private static $_JANUARY_02_1971_00_00_00;
-    private static $_JANUARY_02_1971_09_00_00;
-
-    public static function setUpBeforeClass()
-    {
-        parent::setUpBeforeClass();
-        self::$_JANUARY_01_1971_09_00_00 = mktime(9, 00, 00, 1, 1, 1971);
-        self::$_JANUARY_01_1971_09_10_00 = mktime(9, 10, 00, 1, 1, 1971);
-        self::$_JANUARY_01_1971_12_10_00 = mktime(12, 10, 00, 1, 1, 1971);
-        self::$_JANUARY_02_1971_00_00_00 = mktime(0, 00, 00, 1, 2, 1971);
-        self::$_JANUARY_02_1971_09_00_00 = mktime(9, 00, 00, 1, 2, 1971);
-    }
-
-    /**
-     * Tests invalid call to setHour on Daily
-     */
-    public function testSetHourScheduledTimeDailyNegative()
-    {
-        try {
-            $dailySchedule = ScheduledTime::factory('daily');
-            $dailySchedule->setHour(-1);
-
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * Tests invalid call to setHour on Daily
-     */
-    public function testSetHourScheduledTimeDailyOver24()
-    {
-        try {
-            $dailySchedule = ScheduledTime::factory('daily');
-            $dailySchedule->setHour(25);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * Tests forbidden call to setDay on Daily
-     */
-    public function testSetDayScheduledTimeDaily()
-    {
-        try {
-            $dailySchedule = ScheduledTime::factory('daily');
-            $dailySchedule->setDay(1);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * Tests getRescheduledTime on Daily with unspecified hour
-     */
-    public function testGetRescheduledTimeDailyUnspecifiedHour()
-    {
-        /*
-         * Test 1
-         *
-         * Context :
-         *  - getRescheduledTime called Friday January 1 1971 09:10:00 UTC
-         *  - setHour is not called, defaulting to midnight
-         *
-         * Expected :
-         *  getRescheduledTime returns Saturday January 2 1971 00:00:00 UTC
-         */
-        $mock = $this->getDailyMock(self::$_JANUARY_01_1971_09_10_00);
-        $this->assertEquals(self::$_JANUARY_02_1971_00_00_00, $mock->getRescheduledTime());
-    }
-
-    public function test_setTimezone_ShouldConvertRescheduledTime()
-    {
-        $oneHourInSeconds = 3600;
-
-        $mock    = $this->getDailyMock(self::$_JANUARY_01_1971_09_10_00);
-        $timeUTC = $mock->getRescheduledTime();
-        $this->assertEquals(self::$_JANUARY_02_1971_00_00_00, $timeUTC);
-
-        $mock->setTimezone('Pacific/Auckland');
-        $timeAuckland = $mock->getRescheduledTime();
-        $this->assertEquals(-13 * $oneHourInSeconds, $timeAuckland - $timeUTC);
-
-        $mock->setTimezone('America/Los_Angeles');
-        $timeLosAngeles = $mock->getRescheduledTime();
-        $this->assertEquals(8 * $oneHourInSeconds, $timeLosAngeles - $timeUTC);
-    }
-
-    /**
-     * Tests getRescheduledTime on Daily with specified hour
-     */
-    public function testGetRescheduledTimeDailySpecifiedHour()
-    {
-        /*
-         * Test 1
-         *
-         * Context :
-         *  - getRescheduledTime called Friday January 1 1971 09:00:00 UTC
-         *  - setHour is set to 9
-         *
-         * Expected :
-         *  getRescheduledTime returns Saturday January 2 1971 09:00:00 UTC
-         */
-        $mock = $this->getDailyMock(self::$_JANUARY_01_1971_09_00_00);
-        $mock->setHour(9);
-        $this->assertEquals(self::$_JANUARY_02_1971_09_00_00, $mock->getRescheduledTime());
-
-        /*
-         * Test 2
-         *
-         * Context :
-         *  - getRescheduledTime called Friday January 1 1971 12:10:00 UTC
-         *  - setHour is set to 9
-         *
-         * Expected :
-         *  getRescheduledTime returns Saturday January 2 1971 09:00:00 UTC
-         */
-
-        $mock = $this->getDailyMock(self::$_JANUARY_01_1971_12_10_00);
-        $mock->setHour(9);
-        $this->assertEquals(self::$_JANUARY_02_1971_09_00_00, $mock->getRescheduledTime());
-
-        /*
-         * Test 3
-         *
-         * Context :
-         *  - getRescheduledTime called Friday January 1 1971 12:10:00 UTC
-         *  - setHour is set to 0
-         *
-         * Expected :
-         *  getRescheduledTime returns Saturday January 2 1971 00:00:00 UTC
-         */
-        $mock = $this->getDailyMock(self::$_JANUARY_01_1971_12_10_00);
-        $mock->setHour(0);
-        $this->assertEquals(self::$_JANUARY_02_1971_00_00_00, $mock->getRescheduledTime());
-    }
-
-    /**
-     * @param  $currentTime
-     * @return \Piwik\ScheduledTime\Daily
-     */
-    private function getDailyMock($currentTime)
-    {
-        $mock = $this->getMock('\Piwik\ScheduledTime\Daily', array('getTime'));
-        $mock->expects($this->any())
-            ->method('getTime')
-            ->will($this->returnValue($currentTime));
-        return $mock;
-    }
-}
diff --git a/tests/PHPUnit/Unit/ScheduledTime/HourlyTest.php b/tests/PHPUnit/Unit/ScheduledTime/HourlyTest.php
deleted file mode 100644
index 4c71c1670a..0000000000
--- a/tests/PHPUnit/Unit/ScheduledTime/HourlyTest.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-namespace Piwik\Tests\Unit\ScheduledTime;
-
-use Exception;
-use Piwik\ScheduledTime\Hourly;
-
-class ScheduledTime_HourlyTest extends \PHPUnit_Framework_TestCase
-{
-    private static $_JANUARY_01_1971_09_00_00;
-    private static $_JANUARY_01_1971_09_10_00;
-    private static $_JANUARY_01_1971_10_00_00;
-
-    public static function setUpBeforeClass()
-    {
-        parent::setUpBeforeClass();
-        self::$_JANUARY_01_1971_09_00_00 = mktime(9, 00, 00, 1, 1, 1971);
-        self::$_JANUARY_01_1971_09_10_00 = mktime(9, 10, 00, 1, 1, 1971);
-        self::$_JANUARY_01_1971_10_00_00 = mktime(10, 00, 00, 1, 1, 1971);
-    }
-
-    /**
-     * Tests forbidden call to setHour on Hourly
-     * @group Core
-     */
-    public function testSetHourScheduledTimeHourly()
-    {
-        try {
-            $hourlySchedule = new Hourly();
-            $hourlySchedule->setHour(0);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * Tests forbidden call to setDay on Hourly
-     * @group Core
-     */
-    public function testSetDayScheduledTimeHourly()
-    {
-        try {
-            $hourlySchedule = new Hourly();
-            $hourlySchedule->setDay(1);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * Tests getRescheduledTime on Hourly
-     * @group Core
-     */
-    public function testGetRescheduledTimeHourly()
-    {
-        /*
-         * Test 1
-         *
-         * Context :
-         *  - getRescheduledTime called Friday January 1 1971 09:00:00 GMT
-         *
-         * Expected :
-         *  getRescheduledTime returns Friday January 1 1971 10:00:00 GMT
-         */
-        $mock = $this->getMock('\Piwik\ScheduledTime\Hourly', array('getTime'));
-        $mock->expects($this->any())
-            ->method('getTime')
-            ->will($this->returnValue(self::$_JANUARY_01_1971_09_00_00));
-        $this->assertEquals(self::$_JANUARY_01_1971_10_00_00, $mock->getRescheduledTime());
-
-        /*
-         * Test 2
-         *
-         * Context :
-         *  - getRescheduledTime called Friday January 1 1971 09:10:00 GMT
-         *
-         * Expected :
-         *  getRescheduledTime returns Friday January 1 1971 10:00:00 GMT
-         */
-        $mock = $this->getMock('\Piwik\ScheduledTime\Hourly', array('getTime'));
-        $mock->expects($this->any())
-            ->method('getTime')
-            ->will($this->returnValue(self::$_JANUARY_01_1971_09_10_00));
-        $this->assertEquals(self::$_JANUARY_01_1971_10_00_00, $mock->getRescheduledTime());
-    }
-}
diff --git a/tests/PHPUnit/Unit/ScheduledTime/MonthlyTest.php b/tests/PHPUnit/Unit/ScheduledTime/MonthlyTest.php
deleted file mode 100644
index 58ed51ab02..0000000000
--- a/tests/PHPUnit/Unit/ScheduledTime/MonthlyTest.php
+++ /dev/null
@@ -1,291 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-namespace Piwik\Tests\Unit\ScheduledTime;
-
-use Piwik\ScheduledTime\Monthly;
-
-/**
- * @group Core
- */
-class ScheduledTime_MonthlyTest extends \PHPUnit_Framework_TestCase
-{
-    public static $_JANUARY_01_1971_09_00_00; // initialized below class definition
-    public static $_JANUARY_02_1971_09_00_00;
-    public static $_JANUARY_05_1971_09_00_00;
-    public static $_JANUARY_15_1971_09_00_00;
-    public static $_FEBRUARY_01_1971_00_00_00;
-    public static $_FEBRUARY_02_1971_00_00_00;
-    public static $_FEBRUARY_03_1971_09_00_00;
-    public static $_FEBRUARY_21_1971_09_00_00;
-    public static $_FEBRUARY_28_1971_00_00_00;
-
-    public static function setUpBeforeClass()
-    {
-        parent::setUpBeforeClass();
-    }
-
-    /**
-     * Tests invalid call to setHour on Monthly
-     * @expectedException \Exception
-     */
-    public function testSetHourScheduledTimeMonthlyNegative()
-    {
-        $monthlySchedule = new Monthly();
-        $monthlySchedule->setHour(-1);
-    }
-
-    /**
-     * Tests invalid call to setHour on Monthly
-     * @expectedException \Exception
-     */
-    public function testSetHourScheduledTimMonthlyOver24()
-    {
-        $monthlySchedule = new Monthly();
-        $monthlySchedule->setHour(25);
-    }
-
-    /**
-     * Tests invalid call to setDay on Monthly
-     * @expectedException \Exception
-     */
-    public function testSetDayScheduledTimeMonthlyDay0()
-    {
-        $monthlySchedule = new Monthly();
-        $monthlySchedule->setDay(0);
-    }
-
-    /**
-     * Tests invalid call to setDay on Monthly
-     * @expectedException \Exception
-     */
-    public function testSetDayScheduledTimeMonthlyOver31()
-    {
-        $monthlySchedule = new Monthly();
-        $monthlySchedule->setDay(32);
-    }
-
-    /**
-     * Tests getRescheduledTime on Monthly with unspecified hour and unspecified day
-     */
-    public function testGetRescheduledTimeMonthlyUnspecifiedHourUnspecifiedDay()
-    {
-        /*
-         * Test 1
-         *
-         * Context :
-         *  - getRescheduledTime called Friday January 1 1971 09:00:00 UTC
-         *  - setHour is not called, defaulting to midnight
-         *  - setDay is not called, defaulting to first day of the month
-         *
-         * Expected :
-         *  getRescheduledTime returns Monday February 1 1971 00:00:00 UTC
-         */
-        $mock = $this->getMonthlyMock(self::$_JANUARY_01_1971_09_00_00);
-        $this->assertEquals(self::$_FEBRUARY_01_1971_00_00_00, $mock->getRescheduledTime());
-
-        /*
-         * Test 2
-         *
-         * Context :
-         *  - getRescheduledTime called Tuesday January 5 1971 09:00:00 UTC
-         *  - setHour is not called, defaulting to midnight
-         *  - setDay is not called, defaulting to first day of the month
-         *
-         * Expected :
-         *  getRescheduledTime returns Monday February 1 1971 00:00:00 UTC
-         */
-        $mock = $this->getMonthlyMock(self::$_JANUARY_05_1971_09_00_00);
-        $this->assertEquals(self::$_FEBRUARY_01_1971_00_00_00, $mock->getRescheduledTime());
-    }
-
-    public function test_setTimezone_ShouldConvertRescheduledTime()
-    {
-        $oneHourInSeconds = 3600;
-
-        $mock = $this->getMonthlyMock(self::$_JANUARY_05_1971_09_00_00);
-        $timeUTC = $mock->getRescheduledTime();
-        $this->assertEquals(self::$_FEBRUARY_01_1971_00_00_00, $timeUTC);
-
-        $mock->setTimezone('Pacific/Auckland');
-        $timeAuckland = $mock->getRescheduledTime();
-        $this->assertEquals(-13 * $oneHourInSeconds, $timeAuckland - $timeUTC);
-
-        $mock->setTimezone('America/Los_Angeles');
-        $timeLosAngeles = $mock->getRescheduledTime();
-        $this->assertEquals(8 * $oneHourInSeconds, $timeLosAngeles - $timeUTC);
-    }
-
-    /**
-     * Tests getRescheduledTime on Monthly with unspecified hour and specified day
-     *
-     * _Monthly
-     *
-     * @dataProvider getSpecifiedDayData
-     */
-    public function testGetRescheduledTimeMonthlyUnspecifiedHourSpecifiedDay($currentTime, $day, $expected)
-    {
-        $mock = $this->getMonthlyMock(self::$$currentTime);
-        $mock->setDay($day);
-        $this->assertEquals(self::$$expected, $mock->getRescheduledTime());
-    }
-
-    /**
-     * DataProvider for testGetRescheduledTimeMonthlyUnspecifiedHourSpecifiedDay
-     * @return array
-     */
-    public function getSpecifiedDayData()
-    {
-        return array(
-            /*
-             * Test 1
-             *
-             * Context :
-             *  - getRescheduledTime called Friday January 1 1971 09:00:00 UTC
-             *  - setHour is not called, defaulting to midnight
-             *  - setDay is set to 1
-             *
-             * Expected :
-             *  getRescheduledTime returns Monday February 1 1971 00:00:00 UTC
-             */
-            array('_JANUARY_01_1971_09_00_00', 1, '_FEBRUARY_01_1971_00_00_00'),
-            /*
-             * Test 2
-             *
-             * Context :
-             *  - getRescheduledTime called Saturday January 2 1971 09:00:00 UTC
-             *  - setHour is not called, defaulting to midnight
-             *  - setDay is set to 2
-             *
-             * Expected :
-             *  getRescheduledTime returns Tuesday February 2 1971 00:00:00 UTC
-             */
-            array('_JANUARY_02_1971_09_00_00', 2, '_FEBRUARY_02_1971_00_00_00'),
-            /*
-             * Test 3
-             *
-             * Context :
-             *  - getRescheduledTime called Friday January 15 1971 09:00:00 UTC
-             *  - setHour is not called, defaulting to midnight
-             *  - setDay is set to 2
-             *
-             * Expected :
-             *  getRescheduledTime returns Tuesday February 1 1971 00:00:00 UTC
-             */
-            array('_JANUARY_15_1971_09_00_00', 2, '_FEBRUARY_02_1971_00_00_00'),
-            /*
-             * Test 4
-             *
-             * Context :
-             *  - getRescheduledTime called Friday January 15 1971 09:00:00 UTC
-             *  - setHour is not called, defaulting to midnight
-             *  - setDay is set to 31
-             *
-             * Expected :
-             *  getRescheduledTime returns Sunday February 28 1971 00:00:00 UTC
-             */
-            array('_JANUARY_15_1971_09_00_00', 31, '_FEBRUARY_28_1971_00_00_00')
-        );
-    }
-
-    /**
-     * Returns the data used to test the setDayOfWeek method.
-     */
-    public function getValuesToTestSetDayOfWeek()
-    {
-        return array(
-            array(3, 0, self::$_FEBRUARY_03_1971_09_00_00),
-            array(0, 2, self::$_FEBRUARY_21_1971_09_00_00),
-        );
-    }
-
-    /**
-     * Returns the data used to test the setDayOfWeekFromString method.
-     */
-    public function getValuesToTestSetDayOfWeekByString()
-    {
-        return array(
-            array('first wednesday', self::$_FEBRUARY_03_1971_09_00_00),
-            array('ThIrD sUnDaY', self::$_FEBRUARY_21_1971_09_00_00)
-        );
-    }
-
-    /**
-     * @dataProvider getValuesToTestSetDayOfWeek
-     */
-    public function testMonthlyDayOfWeek($day, $week, $expectedTime)
-    {
-        $mock = $this->getMonthlyMock(self::$_JANUARY_15_1971_09_00_00);
-        $mock->setDayOfWeek($day, $week);
-        $this->assertEquals($expectedTime, $mock->getRescheduledTime());
-    }
-
-    /**
-     * @dataProvider getValuesToTestSetDayOfWeekByString
-     */
-    public function testMonthlyDayOfWeekByString($dayOfWeekStr, $expectedTime)
-    {
-        $mock = $this->getMonthlyMock(self::$_JANUARY_15_1971_09_00_00);
-        $mock->setDayOfWeekFromString($dayOfWeekStr);
-        $this->assertEquals($expectedTime, $mock->getRescheduledTime());
-    }
-
-    /**
-     * _Monthly
-     *
-     * @dataProvider getInvalidDayOfWeekData
-     * @expectedException \Exception
-     */
-    public function testMonthlyDayOfWeekInvalid($day, $week)
-    {
-        $mock = $this->getMonthlyMock(self::$_JANUARY_15_1971_09_00_00);
-        $mock->setDayOfWeek($day, $week);
-    }
-
-    /**
-     * DataProvider for testMonthlyDayOfWeekInvalid
-     * @return array
-     */
-    public function getInvalidDayOfWeekData()
-    {
-        return array(
-            array(-4, 0),
-            array(8, 0),
-            array(0x8, 0),
-            array('9dd', 0),
-            array(1, -5),
-            array(1, 5),
-            array(1, 0x8),
-            array(1, '9ff'),
-        );
-    }
-
-    /**
-     * @param $currentTime
-     * @return \Piwik\ScheduledTime\Monthly
-     */
-    private function getMonthlyMock($currentTime)
-    {
-        $mock = $this->getMock('\Piwik\ScheduledTime\Monthly', array('getTime'));
-        $mock->expects($this->any())
-             ->method('getTime')
-             ->will($this->returnValue($currentTime));
-
-        return $mock;
-    }
-}
-
-ScheduledTime_MonthlyTest::$_JANUARY_01_1971_09_00_00 = mktime(9, 00, 00, 1, 1, 1971);
-ScheduledTime_MonthlyTest::$_JANUARY_02_1971_09_00_00 = mktime(9, 00, 00, 1, 2, 1971);
-ScheduledTime_MonthlyTest::$_JANUARY_05_1971_09_00_00 = mktime(9, 00, 00, 1, 5, 1971);
-ScheduledTime_MonthlyTest::$_JANUARY_15_1971_09_00_00 = mktime(9, 00, 00, 1, 15, 1971);
-ScheduledTime_MonthlyTest::$_FEBRUARY_01_1971_00_00_00 = mktime(0, 00, 00, 2, 1, 1971);
-ScheduledTime_MonthlyTest::$_FEBRUARY_02_1971_00_00_00 = mktime(0, 00, 00, 2, 2, 1971);
-ScheduledTime_MonthlyTest::$_FEBRUARY_03_1971_09_00_00 = mktime(0, 00, 00, 2, 3, 1971);
-ScheduledTime_MonthlyTest::$_FEBRUARY_21_1971_09_00_00 = mktime(0, 00, 00, 2, 21, 1971);
-ScheduledTime_MonthlyTest::$_FEBRUARY_28_1971_00_00_00 = mktime(0, 00, 00, 2, 28, 1971);
\ No newline at end of file
diff --git a/tests/PHPUnit/Unit/ScheduledTime/WeeklyTest.php b/tests/PHPUnit/Unit/ScheduledTime/WeeklyTest.php
deleted file mode 100644
index 793d87f9e5..0000000000
--- a/tests/PHPUnit/Unit/ScheduledTime/WeeklyTest.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-namespace Piwik\Tests\Unit\ScheduledTime;
-
-use Exception;
-use Piwik\ScheduledTime\Weekly;
-
-/**
- * @group Core
- */
-class ScheduledTime_WeeklyTest extends \PHPUnit_Framework_TestCase
-{
-    public static $_JANUARY_01_1971_09_10_00; // initialized below class declaration
-    public static $_JANUARY_04_1971_00_00_00;
-    public static $_JANUARY_04_1971_09_00_00;
-    public static $_JANUARY_05_1971_09_00_00;
-    public static $_JANUARY_11_1971_00_00_00;
-    public static $_JANUARY_15_1971_00_00_00;
-    public static $_JANUARY_08_1971_00_00_00;
-
-    public static function setUpBeforeClass()
-    {
-        parent::setUpBeforeClass();
-    }
-
-    /**
-     * Tests invalid call to setHour on Weekly
-     */
-    public function testSetHourScheduledTimeWeeklyNegative()
-    {
-        try {
-            $weeklySchedule = new Weekly();
-            $weeklySchedule->setHour(-1);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * Tests invalid call to setHour on Weekly
-     */
-    public function testSetHourScheduledTimeWeeklyOver24()
-    {
-        try {
-            $weeklySchedule = new Weekly();
-            $weeklySchedule->setHour(25);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * Tests invalid call to setDay on Weekly
-     */
-    public function testSetDayScheduledTimeWeeklyDay0()
-    {
-        try {
-            $weeklySchedule = new Weekly();
-            $weeklySchedule->setDay(0);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * Tests invalid call to setDay on Weekly
-     */
-    public function testSetDayScheduledTimeWeeklyOver7()
-    {
-        try {
-            $weeklySchedule = new Weekly();
-            $weeklySchedule->setDay(8);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * Tests getRescheduledTime on Weekly with unspecified hour and unspecified day
-     */
-    public function testGetRescheduledTimeWeeklyUnspecifiedHourUnspecifiedDay()
-    {
-        /*
-         * Test 1
-         *
-         * Context :
-         *  - getRescheduledTime called Friday January 1 1971 09:10:00 UTC
-         *  - setHour is not called, defaulting to midnight
-         *  - setDay is not called, defaulting to monday
-         *
-         * Expected :
-         *  getRescheduledTime returns Monday January 4 1971 00:00:00 UTC
-         */
-        $mock = $this->getWeeklyMock(self::$_JANUARY_01_1971_09_10_00);
-        $this->assertEquals(self::$_JANUARY_04_1971_00_00_00, $mock->getRescheduledTime());
-    }
-
-    /**
-     * Tests getRescheduledTime on Weekly with specified hour and unspecified day
-     */
-    public function testGetRescheduledTimeWeeklySpecifiedHourUnspecifiedDay()
-    {
-        /*
-         * Test 1
-         *
-         * Context :
-         *  - getRescheduledTime called Friday January 1 1971 09:10:00 UTC
-         *  - setHour is set to 9
-         *  - setDay is not called, defaulting to monday
-         *
-         * Expected :
-         *  getRescheduledTime returns Monday January 4 1971 09:00:00 UTC
-         */
-        $mock = $this->getWeeklyMock(self::$_JANUARY_01_1971_09_10_00);
-        $mock->setHour(9);
-        $this->assertEquals(self::$_JANUARY_04_1971_09_00_00, $mock->getRescheduledTime());
-    }
-
-    /**
-     * Returns data used in testGetRescheduledTimeWeeklyUnspecifiedHourSpecifiedDay test.
-     */
-    public function getSetDayParametersToTest()
-    {
-        return array(
-            array(1, self::$_JANUARY_11_1971_00_00_00),
-            array(5, self::$_JANUARY_08_1971_00_00_00),
-            array('monday', self::$_JANUARY_11_1971_00_00_00),
-            array('Monday', self::$_JANUARY_11_1971_00_00_00),
-            array('FRIDAY', self::$_JANUARY_08_1971_00_00_00),
-            array('FrIdAy', self::$_JANUARY_08_1971_00_00_00)
-        );
-    }
-
-    public function test_setTimezone_ShouldConvertRescheduledTime()
-    {
-        $oneHourInSeconds = 3600;
-
-        $mock    = $this->getWeeklyMock(self::$_JANUARY_01_1971_09_10_00);
-        $timeUTC = $mock->getRescheduledTime();
-        $this->assertEquals(self::$_JANUARY_04_1971_00_00_00, $timeUTC);
-
-        $mock->setTimezone('Pacific/Auckland');
-        $timeAuckland = $mock->getRescheduledTime();
-        $this->assertEquals(-13 * $oneHourInSeconds, $timeAuckland - $timeUTC);
-
-        $mock->setTimezone('America/Los_Angeles');
-        $timeLosAngeles = $mock->getRescheduledTime();
-        $this->assertEquals(8 * $oneHourInSeconds, $timeLosAngeles - $timeUTC);
-    }
-
-    /**
-     * Tests getRescheduledTime on Weekly with unspecified hour and specified day
-     *
-     * Context :
-     *  - getRescheduledTime called Monday January 4 1971 09:00:00 UTC
-     *  - setHour is not called, defaulting to midnight
-     *  - setDay is set to $dayToSet
-     *
-     * @dataProvider getSetDayParametersToTest
-     */
-    public function testGetRescheduledTimeWeeklyUnspecifiedHourSpecifiedDay($dayToSet, $expectedRescheduledTime)
-    {
-        $mock = $this->getWeeklyMock(self::$_JANUARY_04_1971_09_00_00);
-        $mock->setDay($dayToSet);
-
-        $this->assertEquals($expectedRescheduledTime, $mock->getRescheduledTime());
-    }
-
-    /**
-     * @param $currentTime
-     * @return \Piwik\ScheduledTime\Weekly
-     */
-    private function getWeeklyMock($currentTime)
-    {
-        $mock = $this->getMock('\Piwik\ScheduledTime\Weekly', array('getTime'));
-        $mock->expects($this->any())
-            ->method('getTime')
-            ->will($this->returnValue($currentTime));
-        return $mock;
-    }
-}
-
-ScheduledTime_WeeklyTest::$_JANUARY_01_1971_09_10_00 = mktime(9, 10, 00, 1, 1, 1971);
-ScheduledTime_WeeklyTest::$_JANUARY_04_1971_00_00_00 = mktime(0, 00, 00, 1, 4, 1971);
-ScheduledTime_WeeklyTest::$_JANUARY_04_1971_09_00_00 = mktime(9, 00, 00, 1, 4, 1971);
-ScheduledTime_WeeklyTest::$_JANUARY_05_1971_09_00_00 = mktime(9, 00, 00, 1, 5, 1971);
-ScheduledTime_WeeklyTest::$_JANUARY_11_1971_00_00_00 = mktime(0, 00, 00, 1, 11, 1971);
-ScheduledTime_WeeklyTest::$_JANUARY_15_1971_00_00_00 = mktime(0, 00, 00, 1, 15, 1971);
-ScheduledTime_WeeklyTest::$_JANUARY_08_1971_00_00_00 = mktime(0, 00, 00, 1, 8, 1971);
\ No newline at end of file
diff --git a/tests/PHPUnit/Unit/Scheduler/Schedule/DailyTest.php b/tests/PHPUnit/Unit/Scheduler/Schedule/DailyTest.php
new file mode 100644
index 0000000000..9ad60008e6
--- /dev/null
+++ b/tests/PHPUnit/Unit/Scheduler/Schedule/DailyTest.php
@@ -0,0 +1,176 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Unit\Scheduler\Schedule;
+
+use Exception;
+use Piwik\Scheduler\Schedule\Daily;
+use Piwik\Scheduler\Schedule\Schedule;
+
+/**
+ * @group Scheduler
+ */
+class DailyTest extends \PHPUnit_Framework_TestCase
+{
+    private static $_JANUARY_01_1971_09_00_00;
+    private static $_JANUARY_01_1971_09_10_00;
+    private static $_JANUARY_01_1971_12_10_00;
+    private static $_JANUARY_02_1971_00_00_00;
+    private static $_JANUARY_02_1971_09_00_00;
+
+    public static function setUpBeforeClass()
+    {
+        parent::setUpBeforeClass();
+        self::$_JANUARY_01_1971_09_00_00 = mktime(9, 00, 00, 1, 1, 1971);
+        self::$_JANUARY_01_1971_09_10_00 = mktime(9, 10, 00, 1, 1, 1971);
+        self::$_JANUARY_01_1971_12_10_00 = mktime(12, 10, 00, 1, 1, 1971);
+        self::$_JANUARY_02_1971_00_00_00 = mktime(0, 00, 00, 1, 2, 1971);
+        self::$_JANUARY_02_1971_09_00_00 = mktime(9, 00, 00, 1, 2, 1971);
+    }
+
+    /**
+     * Tests invalid call to setHour on Daily
+     */
+    public function testSetHourScheduledTimeDailyNegative()
+    {
+        try {
+            $dailySchedule = Schedule::factory('daily');
+            $dailySchedule->setHour(-1);
+
+        } catch (Exception $e) {
+            return;
+        }
+        $this->fail('Expected exception not raised');
+    }
+
+    /**
+     * Tests invalid call to setHour on Daily
+     */
+    public function testSetHourScheduledTimeDailyOver24()
+    {
+        try {
+            $dailySchedule = Schedule::factory('daily');
+            $dailySchedule->setHour(25);
+        } catch (Exception $e) {
+            return;
+        }
+        $this->fail('Expected exception not raised');
+    }
+
+    /**
+     * Tests forbidden call to setDay on Daily
+     */
+    public function testSetDayScheduledTimeDaily()
+    {
+        try {
+            $dailySchedule = Schedule::factory('daily');
+            $dailySchedule->setDay(1);
+        } catch (Exception $e) {
+            return;
+        }
+        $this->fail('Expected exception not raised');
+    }
+
+    /**
+     * Tests getRescheduledTime on Daily with unspecified hour
+     */
+    public function testGetRescheduledTimeDailyUnspecifiedHour()
+    {
+        /*
+         * Test 1
+         *
+         * Context :
+         *  - getRescheduledTime called Friday January 1 1971 09:10:00 UTC
+         *  - setHour is not called, defaulting to midnight
+         *
+         * Expected :
+         *  getRescheduledTime returns Saturday January 2 1971 00:00:00 UTC
+         */
+        $mock = $this->getDailyMock(self::$_JANUARY_01_1971_09_10_00);
+        $this->assertEquals(self::$_JANUARY_02_1971_00_00_00, $mock->getRescheduledTime());
+    }
+
+    public function test_setTimezone_ShouldConvertRescheduledTime()
+    {
+        $oneHourInSeconds = 3600;
+
+        $mock    = $this->getDailyMock(self::$_JANUARY_01_1971_09_10_00);
+        $timeUTC = $mock->getRescheduledTime();
+        $this->assertEquals(self::$_JANUARY_02_1971_00_00_00, $timeUTC);
+
+        $mock->setTimezone('Pacific/Auckland');
+        $timeAuckland = $mock->getRescheduledTime();
+        $this->assertEquals(-13 * $oneHourInSeconds, $timeAuckland - $timeUTC);
+
+        $mock->setTimezone('America/Los_Angeles');
+        $timeLosAngeles = $mock->getRescheduledTime();
+        $this->assertEquals(8 * $oneHourInSeconds, $timeLosAngeles - $timeUTC);
+    }
+
+    /**
+     * Tests getRescheduledTime on Daily with specified hour
+     */
+    public function testGetRescheduledTimeDailySpecifiedHour()
+    {
+        /*
+         * Test 1
+         *
+         * Context :
+         *  - getRescheduledTime called Friday January 1 1971 09:00:00 UTC
+         *  - setHour is set to 9
+         *
+         * Expected :
+         *  getRescheduledTime returns Saturday January 2 1971 09:00:00 UTC
+         */
+        $mock = $this->getDailyMock(self::$_JANUARY_01_1971_09_00_00);
+        $mock->setHour(9);
+        $this->assertEquals(self::$_JANUARY_02_1971_09_00_00, $mock->getRescheduledTime());
+
+        /*
+         * Test 2
+         *
+         * Context :
+         *  - getRescheduledTime called Friday January 1 1971 12:10:00 UTC
+         *  - setHour is set to 9
+         *
+         * Expected :
+         *  getRescheduledTime returns Saturday January 2 1971 09:00:00 UTC
+         */
+
+        $mock = $this->getDailyMock(self::$_JANUARY_01_1971_12_10_00);
+        $mock->setHour(9);
+        $this->assertEquals(self::$_JANUARY_02_1971_09_00_00, $mock->getRescheduledTime());
+
+        /*
+         * Test 3
+         *
+         * Context :
+         *  - getRescheduledTime called Friday January 1 1971 12:10:00 UTC
+         *  - setHour is set to 0
+         *
+         * Expected :
+         *  getRescheduledTime returns Saturday January 2 1971 00:00:00 UTC
+         */
+        $mock = $this->getDailyMock(self::$_JANUARY_01_1971_12_10_00);
+        $mock->setHour(0);
+        $this->assertEquals(self::$_JANUARY_02_1971_00_00_00, $mock->getRescheduledTime());
+    }
+
+    /**
+     * @param  $currentTime
+     * @return Daily
+     */
+    private function getDailyMock($currentTime)
+    {
+        $mock = $this->getMock('Piwik\Scheduler\Schedule\Daily', array('getTime'));
+        $mock->expects($this->any())
+            ->method('getTime')
+            ->will($this->returnValue($currentTime));
+        return $mock;
+    }
+}
diff --git a/tests/PHPUnit/Unit/Scheduler/Schedule/HourlyTest.php b/tests/PHPUnit/Unit/Scheduler/Schedule/HourlyTest.php
new file mode 100644
index 0000000000..9bf2055312
--- /dev/null
+++ b/tests/PHPUnit/Unit/Scheduler/Schedule/HourlyTest.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Unit\Scheduler\Schedule;
+
+use Exception;
+use Piwik\Scheduler\Schedule\Hourly;
+
+/**
+ * @group Scheduler
+ */
+class HourlyTest extends \PHPUnit_Framework_TestCase
+{
+    private static $_JANUARY_01_1971_09_00_00;
+    private static $_JANUARY_01_1971_09_10_00;
+    private static $_JANUARY_01_1971_10_00_00;
+
+    public static function setUpBeforeClass()
+    {
+        parent::setUpBeforeClass();
+        self::$_JANUARY_01_1971_09_00_00 = mktime(9, 00, 00, 1, 1, 1971);
+        self::$_JANUARY_01_1971_09_10_00 = mktime(9, 10, 00, 1, 1, 1971);
+        self::$_JANUARY_01_1971_10_00_00 = mktime(10, 00, 00, 1, 1, 1971);
+    }
+
+    /**
+     * Tests forbidden call to setHour on Hourly
+     * @group Core
+     */
+    public function testSetHourScheduledTimeHourly()
+    {
+        try {
+            $hourlySchedule = new Hourly();
+            $hourlySchedule->setHour(0);
+        } catch (Exception $e) {
+            return;
+        }
+        $this->fail('Expected exception not raised');
+    }
+
+    /**
+     * Tests forbidden call to setDay on Hourly
+     * @group Core
+     */
+    public function testSetDayScheduledTimeHourly()
+    {
+        try {
+            $hourlySchedule = new Hourly();
+            $hourlySchedule->setDay(1);
+        } catch (Exception $e) {
+            return;
+        }
+        $this->fail('Expected exception not raised');
+    }
+
+    /**
+     * Tests getRescheduledTime on Hourly
+     * @group Core
+     */
+    public function testGetRescheduledTimeHourly()
+    {
+        /*
+         * Test 1
+         *
+         * Context :
+         *  - getRescheduledTime called Friday January 1 1971 09:00:00 GMT
+         *
+         * Expected :
+         *  getRescheduledTime returns Friday January 1 1971 10:00:00 GMT
+         */
+        $mock = $this->getMock('Piwik\Scheduler\Schedule\Hourly', array('getTime'));
+        $mock->expects($this->any())
+            ->method('getTime')
+            ->will($this->returnValue(self::$_JANUARY_01_1971_09_00_00));
+        $this->assertEquals(self::$_JANUARY_01_1971_10_00_00, $mock->getRescheduledTime());
+
+        /*
+         * Test 2
+         *
+         * Context :
+         *  - getRescheduledTime called Friday January 1 1971 09:10:00 GMT
+         *
+         * Expected :
+         *  getRescheduledTime returns Friday January 1 1971 10:00:00 GMT
+         */
+        $mock = $this->getMock('Piwik\Scheduler\Schedule\Hourly', array('getTime'));
+        $mock->expects($this->any())
+            ->method('getTime')
+            ->will($this->returnValue(self::$_JANUARY_01_1971_09_10_00));
+        $this->assertEquals(self::$_JANUARY_01_1971_10_00_00, $mock->getRescheduledTime());
+    }
+}
diff --git a/tests/PHPUnit/Unit/Scheduler/Schedule/MonthlyTest.php b/tests/PHPUnit/Unit/Scheduler/Schedule/MonthlyTest.php
new file mode 100644
index 0000000000..8a33e59afb
--- /dev/null
+++ b/tests/PHPUnit/Unit/Scheduler/Schedule/MonthlyTest.php
@@ -0,0 +1,291 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Unit\Scheduler\Schedule;
+
+use Piwik\Scheduler\Schedule\Monthly;
+
+/**
+ * @group Scheduler
+ */
+class MonthlyTest extends \PHPUnit_Framework_TestCase
+{
+    public static $_JANUARY_01_1971_09_00_00; // initialized below class definition
+    public static $_JANUARY_02_1971_09_00_00;
+    public static $_JANUARY_05_1971_09_00_00;
+    public static $_JANUARY_15_1971_09_00_00;
+    public static $_FEBRUARY_01_1971_00_00_00;
+    public static $_FEBRUARY_02_1971_00_00_00;
+    public static $_FEBRUARY_03_1971_09_00_00;
+    public static $_FEBRUARY_21_1971_09_00_00;
+    public static $_FEBRUARY_28_1971_00_00_00;
+
+    public static function setUpBeforeClass()
+    {
+        parent::setUpBeforeClass();
+    }
+
+    /**
+     * Tests invalid call to setHour on Monthly
+     * @expectedException \Exception
+     */
+    public function testSetHourScheduledTimeMonthlyNegative()
+    {
+        $monthlySchedule = new Monthly();
+        $monthlySchedule->setHour(-1);
+    }
+
+    /**
+     * Tests invalid call to setHour on Monthly
+     * @expectedException \Exception
+     */
+    public function testSetHourScheduledTimMonthlyOver24()
+    {
+        $monthlySchedule = new Monthly();
+        $monthlySchedule->setHour(25);
+    }
+
+    /**
+     * Tests invalid call to setDay on Monthly
+     * @expectedException \Exception
+     */
+    public function testSetDayScheduledTimeMonthlyDay0()
+    {
+        $monthlySchedule = new Monthly();
+        $monthlySchedule->setDay(0);
+    }
+
+    /**
+     * Tests invalid call to setDay on Monthly
+     * @expectedException \Exception
+     */
+    public function testSetDayScheduledTimeMonthlyOver31()
+    {
+        $monthlySchedule = new Monthly();
+        $monthlySchedule->setDay(32);
+    }
+
+    /**
+     * Tests getRescheduledTime on Monthly with unspecified hour and unspecified day
+     */
+    public function testGetRescheduledTimeMonthlyUnspecifiedHourUnspecifiedDay()
+    {
+        /*
+         * Test 1
+         *
+         * Context :
+         *  - getRescheduledTime called Friday January 1 1971 09:00:00 UTC
+         *  - setHour is not called, defaulting to midnight
+         *  - setDay is not called, defaulting to first day of the month
+         *
+         * Expected :
+         *  getRescheduledTime returns Monday February 1 1971 00:00:00 UTC
+         */
+        $mock = $this->getMonthlyMock(self::$_JANUARY_01_1971_09_00_00);
+        $this->assertEquals(self::$_FEBRUARY_01_1971_00_00_00, $mock->getRescheduledTime());
+
+        /*
+         * Test 2
+         *
+         * Context :
+         *  - getRescheduledTime called Tuesday January 5 1971 09:00:00 UTC
+         *  - setHour is not called, defaulting to midnight
+         *  - setDay is not called, defaulting to first day of the month
+         *
+         * Expected :
+         *  getRescheduledTime returns Monday February 1 1971 00:00:00 UTC
+         */
+        $mock = $this->getMonthlyMock(self::$_JANUARY_05_1971_09_00_00);
+        $this->assertEquals(self::$_FEBRUARY_01_1971_00_00_00, $mock->getRescheduledTime());
+    }
+
+    public function test_setTimezone_ShouldConvertRescheduledTime()
+    {
+        $oneHourInSeconds = 3600;
+
+        $mock = $this->getMonthlyMock(self::$_JANUARY_05_1971_09_00_00);
+        $timeUTC = $mock->getRescheduledTime();
+        $this->assertEquals(self::$_FEBRUARY_01_1971_00_00_00, $timeUTC);
+
+        $mock->setTimezone('Pacific/Auckland');
+        $timeAuckland = $mock->getRescheduledTime();
+        $this->assertEquals(-13 * $oneHourInSeconds, $timeAuckland - $timeUTC);
+
+        $mock->setTimezone('America/Los_Angeles');
+        $timeLosAngeles = $mock->getRescheduledTime();
+        $this->assertEquals(8 * $oneHourInSeconds, $timeLosAngeles - $timeUTC);
+    }
+
+    /**
+     * Tests getRescheduledTime on Monthly with unspecified hour and specified day
+     *
+     * _Monthly
+     *
+     * @dataProvider getSpecifiedDayData
+     */
+    public function testGetRescheduledTimeMonthlyUnspecifiedHourSpecifiedDay($currentTime, $day, $expected)
+    {
+        $mock = $this->getMonthlyMock(self::$$currentTime);
+        $mock->setDay($day);
+        $this->assertEquals(self::$$expected, $mock->getRescheduledTime());
+    }
+
+    /**
+     * DataProvider for testGetRescheduledTimeMonthlyUnspecifiedHourSpecifiedDay
+     * @return array
+     */
+    public function getSpecifiedDayData()
+    {
+        return array(
+            /*
+             * Test 1
+             *
+             * Context :
+             *  - getRescheduledTime called Friday January 1 1971 09:00:00 UTC
+             *  - setHour is not called, defaulting to midnight
+             *  - setDay is set to 1
+             *
+             * Expected :
+             *  getRescheduledTime returns Monday February 1 1971 00:00:00 UTC
+             */
+            array('_JANUARY_01_1971_09_00_00', 1, '_FEBRUARY_01_1971_00_00_00'),
+            /*
+             * Test 2
+             *
+             * Context :
+             *  - getRescheduledTime called Saturday January 2 1971 09:00:00 UTC
+             *  - setHour is not called, defaulting to midnight
+             *  - setDay is set to 2
+             *
+             * Expected :
+             *  getRescheduledTime returns Tuesday February 2 1971 00:00:00 UTC
+             */
+            array('_JANUARY_02_1971_09_00_00', 2, '_FEBRUARY_02_1971_00_00_00'),
+            /*
+             * Test 3
+             *
+             * Context :
+             *  - getRescheduledTime called Friday January 15 1971 09:00:00 UTC
+             *  - setHour is not called, defaulting to midnight
+             *  - setDay is set to 2
+             *
+             * Expected :
+             *  getRescheduledTime returns Tuesday February 1 1971 00:00:00 UTC
+             */
+            array('_JANUARY_15_1971_09_00_00', 2, '_FEBRUARY_02_1971_00_00_00'),
+            /*
+             * Test 4
+             *
+             * Context :
+             *  - getRescheduledTime called Friday January 15 1971 09:00:00 UTC
+             *  - setHour is not called, defaulting to midnight
+             *  - setDay is set to 31
+             *
+             * Expected :
+             *  getRescheduledTime returns Sunday February 28 1971 00:00:00 UTC
+             */
+            array('_JANUARY_15_1971_09_00_00', 31, '_FEBRUARY_28_1971_00_00_00')
+        );
+    }
+
+    /**
+     * Returns the data used to test the setDayOfWeek method.
+     */
+    public function getValuesToTestSetDayOfWeek()
+    {
+        return array(
+            array(3, 0, self::$_FEBRUARY_03_1971_09_00_00),
+            array(0, 2, self::$_FEBRUARY_21_1971_09_00_00),
+        );
+    }
+
+    /**
+     * Returns the data used to test the setDayOfWeekFromString method.
+     */
+    public function getValuesToTestSetDayOfWeekByString()
+    {
+        return array(
+            array('first wednesday', self::$_FEBRUARY_03_1971_09_00_00),
+            array('ThIrD sUnDaY', self::$_FEBRUARY_21_1971_09_00_00)
+        );
+    }
+
+    /**
+     * @dataProvider getValuesToTestSetDayOfWeek
+     */
+    public function testMonthlyDayOfWeek($day, $week, $expectedTime)
+    {
+        $mock = $this->getMonthlyMock(self::$_JANUARY_15_1971_09_00_00);
+        $mock->setDayOfWeek($day, $week);
+        $this->assertEquals($expectedTime, $mock->getRescheduledTime());
+    }
+
+    /**
+     * @dataProvider getValuesToTestSetDayOfWeekByString
+     */
+    public function testMonthlyDayOfWeekByString($dayOfWeekStr, $expectedTime)
+    {
+        $mock = $this->getMonthlyMock(self::$_JANUARY_15_1971_09_00_00);
+        $mock->setDayOfWeekFromString($dayOfWeekStr);
+        $this->assertEquals($expectedTime, $mock->getRescheduledTime());
+    }
+
+    /**
+     * _Monthly
+     *
+     * @dataProvider getInvalidDayOfWeekData
+     * @expectedException \Exception
+     */
+    public function testMonthlyDayOfWeekInvalid($day, $week)
+    {
+        $mock = $this->getMonthlyMock(self::$_JANUARY_15_1971_09_00_00);
+        $mock->setDayOfWeek($day, $week);
+    }
+
+    /**
+     * DataProvider for testMonthlyDayOfWeekInvalid
+     * @return array
+     */
+    public function getInvalidDayOfWeekData()
+    {
+        return array(
+            array(-4, 0),
+            array(8, 0),
+            array(0x8, 0),
+            array('9dd', 0),
+            array(1, -5),
+            array(1, 5),
+            array(1, 0x8),
+            array(1, '9ff'),
+        );
+    }
+
+    /**
+     * @param $currentTime
+     * @return Monthly
+     */
+    private function getMonthlyMock($currentTime)
+    {
+        $mock = $this->getMock('Piwik\Scheduler\Schedule\Monthly', array('getTime'));
+        $mock->expects($this->any())
+             ->method('getTime')
+             ->will($this->returnValue($currentTime));
+
+        return $mock;
+    }
+}
+
+MonthlyTest::$_JANUARY_01_1971_09_00_00 = mktime(9, 00, 00, 1, 1, 1971);
+MonthlyTest::$_JANUARY_02_1971_09_00_00 = mktime(9, 00, 00, 1, 2, 1971);
+MonthlyTest::$_JANUARY_05_1971_09_00_00 = mktime(9, 00, 00, 1, 5, 1971);
+MonthlyTest::$_JANUARY_15_1971_09_00_00 = mktime(9, 00, 00, 1, 15, 1971);
+MonthlyTest::$_FEBRUARY_01_1971_00_00_00 = mktime(0, 00, 00, 2, 1, 1971);
+MonthlyTest::$_FEBRUARY_02_1971_00_00_00 = mktime(0, 00, 00, 2, 2, 1971);
+MonthlyTest::$_FEBRUARY_03_1971_09_00_00 = mktime(0, 00, 00, 2, 3, 1971);
+MonthlyTest::$_FEBRUARY_21_1971_09_00_00 = mktime(0, 00, 00, 2, 21, 1971);
+MonthlyTest::$_FEBRUARY_28_1971_00_00_00 = mktime(0, 00, 00, 2, 28, 1971);
diff --git a/tests/PHPUnit/Unit/Scheduler/Schedule/WeeklyTest.php b/tests/PHPUnit/Unit/Scheduler/Schedule/WeeklyTest.php
new file mode 100644
index 0000000000..93b1e85509
--- /dev/null
+++ b/tests/PHPUnit/Unit/Scheduler/Schedule/WeeklyTest.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Unit\Scheduler\Schedule;
+
+use Exception;
+use Piwik\Scheduler\Schedule\Weekly;
+
+/**
+ * @group Scheduler
+ */
+class WeeklyTest extends \PHPUnit_Framework_TestCase
+{
+    public static $_JANUARY_01_1971_09_10_00; // initialized below class declaration
+    public static $_JANUARY_04_1971_00_00_00;
+    public static $_JANUARY_04_1971_09_00_00;
+    public static $_JANUARY_05_1971_09_00_00;
+    public static $_JANUARY_11_1971_00_00_00;
+    public static $_JANUARY_15_1971_00_00_00;
+    public static $_JANUARY_08_1971_00_00_00;
+
+    public static function setUpBeforeClass()
+    {
+        parent::setUpBeforeClass();
+    }
+
+    /**
+     * Tests invalid call to setHour on Weekly
+     */
+    public function testSetHourScheduledTimeWeeklyNegative()
+    {
+        try {
+            $weeklySchedule = new Weekly();
+            $weeklySchedule->setHour(-1);
+        } catch (Exception $e) {
+            return;
+        }
+        $this->fail('Expected exception not raised');
+    }
+
+    /**
+     * Tests invalid call to setHour on Weekly
+     */
+    public function testSetHourScheduledTimeWeeklyOver24()
+    {
+        try {
+            $weeklySchedule = new Weekly();
+            $weeklySchedule->setHour(25);
+        } catch (Exception $e) {
+            return;
+        }
+        $this->fail('Expected exception not raised');
+    }
+
+    /**
+     * Tests invalid call to setDay on Weekly
+     */
+    public function testSetDayScheduledTimeWeeklyDay0()
+    {
+        try {
+            $weeklySchedule = new Weekly();
+            $weeklySchedule->setDay(0);
+        } catch (Exception $e) {
+            return;
+        }
+        $this->fail('Expected exception not raised');
+    }
+
+    /**
+     * Tests invalid call to setDay on Weekly
+     */
+    public function testSetDayScheduledTimeWeeklyOver7()
+    {
+        try {
+            $weeklySchedule = new Weekly();
+            $weeklySchedule->setDay(8);
+        } catch (Exception $e) {
+            return;
+        }
+        $this->fail('Expected exception not raised');
+    }
+
+    /**
+     * Tests getRescheduledTime on Weekly with unspecified hour and unspecified day
+     */
+    public function testGetRescheduledTimeWeeklyUnspecifiedHourUnspecifiedDay()
+    {
+        /*
+         * Test 1
+         *
+         * Context :
+         *  - getRescheduledTime called Friday January 1 1971 09:10:00 UTC
+         *  - setHour is not called, defaulting to midnight
+         *  - setDay is not called, defaulting to monday
+         *
+         * Expected :
+         *  getRescheduledTime returns Monday January 4 1971 00:00:00 UTC
+         */
+        $mock = $this->getWeeklyMock(self::$_JANUARY_01_1971_09_10_00);
+        $this->assertEquals(self::$_JANUARY_04_1971_00_00_00, $mock->getRescheduledTime());
+    }
+
+    /**
+     * Tests getRescheduledTime on Weekly with specified hour and unspecified day
+     */
+    public function testGetRescheduledTimeWeeklySpecifiedHourUnspecifiedDay()
+    {
+        /*
+         * Test 1
+         *
+         * Context :
+         *  - getRescheduledTime called Friday January 1 1971 09:10:00 UTC
+         *  - setHour is set to 9
+         *  - setDay is not called, defaulting to monday
+         *
+         * Expected :
+         *  getRescheduledTime returns Monday January 4 1971 09:00:00 UTC
+         */
+        $mock = $this->getWeeklyMock(self::$_JANUARY_01_1971_09_10_00);
+        $mock->setHour(9);
+        $this->assertEquals(self::$_JANUARY_04_1971_09_00_00, $mock->getRescheduledTime());
+    }
+
+    /**
+     * Returns data used in testGetRescheduledTimeWeeklyUnspecifiedHourSpecifiedDay test.
+     */
+    public function getSetDayParametersToTest()
+    {
+        return array(
+            array(1, self::$_JANUARY_11_1971_00_00_00),
+            array(5, self::$_JANUARY_08_1971_00_00_00),
+            array('monday', self::$_JANUARY_11_1971_00_00_00),
+            array('Monday', self::$_JANUARY_11_1971_00_00_00),
+            array('FRIDAY', self::$_JANUARY_08_1971_00_00_00),
+            array('FrIdAy', self::$_JANUARY_08_1971_00_00_00)
+        );
+    }
+
+    public function test_setTimezone_ShouldConvertRescheduledTime()
+    {
+        $oneHourInSeconds = 3600;
+
+        $mock    = $this->getWeeklyMock(self::$_JANUARY_01_1971_09_10_00);
+        $timeUTC = $mock->getRescheduledTime();
+        $this->assertEquals(self::$_JANUARY_04_1971_00_00_00, $timeUTC);
+
+        $mock->setTimezone('Pacific/Auckland');
+        $timeAuckland = $mock->getRescheduledTime();
+        $this->assertEquals(-13 * $oneHourInSeconds, $timeAuckland - $timeUTC);
+
+        $mock->setTimezone('America/Los_Angeles');
+        $timeLosAngeles = $mock->getRescheduledTime();
+        $this->assertEquals(8 * $oneHourInSeconds, $timeLosAngeles - $timeUTC);
+    }
+
+    /**
+     * Tests getRescheduledTime on Weekly with unspecified hour and specified day
+     *
+     * Context :
+     *  - getRescheduledTime called Monday January 4 1971 09:00:00 UTC
+     *  - setHour is not called, defaulting to midnight
+     *  - setDay is set to $dayToSet
+     *
+     * @dataProvider getSetDayParametersToTest
+     */
+    public function testGetRescheduledTimeWeeklyUnspecifiedHourSpecifiedDay($dayToSet, $expectedRescheduledTime)
+    {
+        $mock = $this->getWeeklyMock(self::$_JANUARY_04_1971_09_00_00);
+        $mock->setDay($dayToSet);
+
+        $this->assertEquals($expectedRescheduledTime, $mock->getRescheduledTime());
+    }
+
+    /**
+     * @param $currentTime
+     * @return Weekly
+     */
+    private function getWeeklyMock($currentTime)
+    {
+        $mock = $this->getMock('Piwik\Scheduler\Schedule\Weekly', array('getTime'));
+        $mock->expects($this->any())
+            ->method('getTime')
+            ->will($this->returnValue($currentTime));
+        return $mock;
+    }
+}
+
+WeeklyTest::$_JANUARY_01_1971_09_10_00 = mktime(9, 10, 00, 1, 1, 1971);
+WeeklyTest::$_JANUARY_04_1971_00_00_00 = mktime(0, 00, 00, 1, 4, 1971);
+WeeklyTest::$_JANUARY_04_1971_09_00_00 = mktime(9, 00, 00, 1, 4, 1971);
+WeeklyTest::$_JANUARY_05_1971_09_00_00 = mktime(9, 00, 00, 1, 5, 1971);
+WeeklyTest::$_JANUARY_11_1971_00_00_00 = mktime(0, 00, 00, 1, 11, 1971);
+WeeklyTest::$_JANUARY_15_1971_00_00_00 = mktime(0, 00, 00, 1, 15, 1971);
+WeeklyTest::$_JANUARY_08_1971_00_00_00 = mktime(0, 00, 00, 1, 8, 1971);
diff --git a/tests/PHPUnit/Unit/Scheduler/SchedulerTest.php b/tests/PHPUnit/Unit/Scheduler/SchedulerTest.php
new file mode 100644
index 0000000000..2547d3e5e9
--- /dev/null
+++ b/tests/PHPUnit/Unit/Scheduler/SchedulerTest.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Unit\Scheduler;
+
+use Piwik\Plugin;
+use Piwik\Scheduler\Scheduler;
+use Piwik\Scheduler\Task;
+use Piwik\Scheduler\Timetable;
+use Piwik\Tests\Framework\Mock\PiwikOption;
+use Psr\Log\NullLogger;
+use ReflectionProperty;
+
+/**
+ * @group Scheduler
+ */
+class SchedulerTest extends \PHPUnit_Framework_TestCase
+{
+    private static function getTestTimetable()
+    {
+        return array(
+            'CoreAdminHome.purgeOutdatedArchives' => 1355529607,
+            'PrivacyManager.deleteReportData_1'   => 1322229607,
+        );
+    }
+
+    /**
+     * Dataprovider for testGetScheduledTimeForMethod
+     */
+    public function getScheduledTimeForMethodTestCases()
+    {
+        $timetable = serialize(self::getTestTimetable());
+
+        return array(
+            array(1355529607, 'CoreAdminHome', 'purgeOutdatedArchives', null, $timetable),
+            array(1322229607, 'PrivacyManager', 'deleteReportData', 1, $timetable),
+            array(false, 'ScheduledReports', 'weeklySchedule', null, $timetable)
+        );
+    }
+
+    /**
+     * @dataProvider getScheduledTimeForMethodTestCases
+     */
+    public function testGetScheduledTimeForMethod($expectedTime, $className, $methodName, $methodParameter, $timetable)
+    {
+        self::stubPiwikOption($timetable);
+
+        $taskLoader = $this->getMock('Piwik\Scheduler\TaskLoader');
+        $scheduler = new Scheduler($taskLoader, new NullLogger());
+
+        $this->assertEquals($expectedTime, $scheduler->getScheduledTimeForMethod($className, $methodName, $methodParameter));
+
+        self::resetPiwikOption();
+    }
+
+    /**
+     * Dataprovider for testRun
+     */
+    public function runDataProvider()
+    {
+        $now = time();
+
+        $dailySchedule = $this->getMock('Piwik\Scheduler\Schedule\Daily', array('getTime'));
+        $dailySchedule->expects($this->any())
+            ->method('getTime')
+            ->will($this->returnValue($now));
+
+        $scheduledTaskOne = new Task($this, 'scheduledTaskOne', null, $dailySchedule);
+        $scheduledTaskTwo = new Task($this, 'scheduledTaskTwo', 1, $dailySchedule);
+        $scheduledTaskThree = new Task($this, 'scheduledTaskThree', null, $dailySchedule);
+
+        $caseOneExpectedTable = array(
+            __CLASS__ . '.scheduledTaskOne'   => $scheduledTaskOne->getRescheduledTime(),
+            __CLASS__ . '.scheduledTaskTwo_1' => $now + 60000,
+            __CLASS__ . '.scheduledTaskThree' => $scheduledTaskThree->getRescheduledTime(),
+        );
+
+        $caseTwoTimetableBeforeExecution = $caseOneExpectedTable;
+        $caseTwoTimetableBeforeExecution[__CLASS__ . '.scheduledTaskThree'] = $now; // simulate elapsed time between case 1 and 2
+
+        return array(
+
+            // case 1) contains :
+            // - scheduledTaskOne: already scheduled before, should be executed and rescheduled
+            // - scheduledTaskTwo: already scheduled before, should not be executed and therefore not rescheduled
+            // - scheduledTaskThree: not already scheduled before, should be scheduled but not executed
+            array(
+                $caseOneExpectedTable,
+                // methods that should be executed
+                array(
+                    __CLASS__ . '.scheduledTaskOne'
+                ),
+                // timetable before task execution
+                array(
+                    __CLASS__ . '.scheduledTaskOne'   => $now,
+                    __CLASS__ . '.scheduledTaskTwo_1' => $now + 60000,
+                ),
+                // configured tasks
+                array(
+                    $scheduledTaskOne,
+                    $scheduledTaskTwo,
+                    $scheduledTaskThree,
+                )
+            ),
+
+            // case 2) follows case 1) with :
+            // - scheduledTaskOne: already scheduled before, should not be executed and therefore not rescheduled
+            // - scheduledTaskTwo: not configured for execution anymore, should be removed from the timetable
+            // - scheduledTaskThree: already scheduled before, should be executed and rescheduled
+            array(
+                // expected timetable
+                array(
+                    __CLASS__ . '.scheduledTaskOne'   => $scheduledTaskOne->getRescheduledTime(),
+                    __CLASS__ . '.scheduledTaskThree' => $scheduledTaskThree->getRescheduledTime()
+                ),
+                // methods that should be executed
+                array(
+                    __CLASS__ . '.scheduledTaskThree'
+                ),
+                // timetable before task execution
+                $caseTwoTimetableBeforeExecution,
+                // configured tasks
+                array(
+                    $scheduledTaskOne,
+//					$scheduledTaskTwo, Not configured anymore (ie. not returned after TaskScheduler::GET_TASKS_EVENT is issued)
+                    $scheduledTaskThree,
+                )
+            ),
+        );
+    }
+
+    public function scheduledTaskOne()
+    {
+        // nothing to do
+    }
+    public function scheduledTaskTwo($param)
+    {
+        // nothing to do
+    }
+    public function scheduledTaskThree()
+    {
+        // nothing to do
+    }
+
+    /**
+     * @dataProvider runDataProvider
+     */
+    public function testRun($expectedTimetable, $expectedExecutedTasks, $timetableBeforeTaskExecution, $configuredTasks)
+    {
+        $taskLoader = $this->getMock('Piwik\Scheduler\TaskLoader');
+        $taskLoader->expects($this->atLeastOnce())
+            ->method('loadTasks')
+            ->willReturn($configuredTasks);
+
+        // stub the piwik option object to control the returned option value
+        self::stubPiwikOption(serialize($timetableBeforeTaskExecution));
+
+        $scheduler = new Scheduler($taskLoader, new NullLogger());
+
+        // execute tasks
+        $executionResults = $scheduler->run();
+
+        // assert methods are executed
+        $executedTasks = array();
+        foreach ($executionResults as $executionResult) {
+            $executedTasks[] = $executionResult['task'];
+            $this->assertNotEmpty($executionResult['output']);
+        }
+        $this->assertEquals($expectedExecutedTasks, $executedTasks);
+
+        // assert the timetable is correctly updated
+        $timetable = new Timetable();
+        $this->assertEquals($expectedTimetable, $timetable->getTimetable());
+
+        self::resetPiwikOption();
+    }
+
+    private static function stubPiwikOption($timetable)
+    {
+        self::getReflectedPiwikOptionInstance()->setValue(new PiwikOption($timetable));
+    }
+
+    private static function resetPiwikOption()
+    {
+        self::getReflectedPiwikOptionInstance()->setValue(null);
+    }
+
+    private static function getReflectedPiwikOptionInstance()
+    {
+        $piwikOptionInstance = new ReflectionProperty('Piwik\Option', 'instance');
+        $piwikOptionInstance->setAccessible(true);
+        return $piwikOptionInstance;
+    }
+}
diff --git a/tests/PHPUnit/Unit/Scheduler/TaskTest.php b/tests/PHPUnit/Unit/Scheduler/TaskTest.php
new file mode 100644
index 0000000000..053ff1f173
--- /dev/null
+++ b/tests/PHPUnit/Unit/Scheduler/TaskTest.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Unit\Scheduler;
+
+use Piwik\Plugins\ScheduledReports\ScheduledReports;
+use Piwik\Scheduler\Task;
+
+/**
+ * @group Scheduler
+ */
+class TaskTest extends \PHPUnit_Framework_TestCase
+{
+    public function testGetClassName()
+    {
+        $scheduledTask = new Task(new ScheduledReports(), null, null, null);
+        $this->assertEquals('Piwik\Plugins\ScheduledReports\ScheduledReports', $scheduledTask->getClassName());
+    }
+
+    /**
+     * Dataprovider for testGetTaskName
+     */
+    public function getTaskNameTestCases()
+    {
+        return array(
+            array('CoreAdminHome.purgeOutdatedArchives', 'CoreAdminHome', 'purgeOutdatedArchives', null),
+            array('CoreAdminHome.purgeOutdatedArchives_previous30', 'CoreAdminHome', 'purgeOutdatedArchives', 'previous30'),
+            array('ScheduledReports.weeklySchedule', 'ScheduledReports', 'weeklySchedule', null),
+            array('ScheduledReports.weeklySchedule_1', 'ScheduledReports', 'weeklySchedule', 1),
+        );
+    }
+
+    /**
+     * @dataProvider getTaskNameTestCases
+     */
+    public function testGetTaskName($expectedTaskName, $className, $methodName, $methodParameter)
+    {
+        $this->assertEquals($expectedTaskName, Task::getTaskName($className, $methodName, $methodParameter));
+    }
+}
diff --git a/tests/PHPUnit/Unit/Scheduler/TimetableTest.php b/tests/PHPUnit/Unit/Scheduler/TimetableTest.php
new file mode 100644
index 0000000000..dfd4c1f414
--- /dev/null
+++ b/tests/PHPUnit/Unit/Scheduler/TimetableTest.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Unit\Scheduler;
+
+use Piwik\Plugin;
+use Piwik\Scheduler\Timetable;
+use Piwik\Tests\Framework\Mock\PiwikOption;
+use ReflectionProperty;
+
+/**
+ * @group Scheduler
+ */
+class TimetableTest extends \PHPUnit_Framework_TestCase
+{
+    private $timetable = array(
+        'CoreAdminHome.purgeOutdatedArchives' => 1355529607,
+        'PrivacyManager.deleteReportData_1'   => 1322229607,
+    );
+
+    /**
+     * Dataprovider for testGetTimetableFromOptionValue
+     */
+    public function getTimetableFromOptionValueTestCases()
+    {
+        return array(
+
+            // invalid option values should return a fresh array
+            array(array(), false),
+            array(array(), null),
+            array(array(), 1),
+            array(array(), ''),
+            array(array(), 'test'),
+
+            // valid serialized array
+            array(
+                array(
+                    'CoreAdminHome.purgeOutdatedArchives' => 1355529607,
+                    'PrivacyManager.deleteReportData'     => 1355529607,
+                ),
+                'a:2:{s:35:"CoreAdminHome.purgeOutdatedArchives";i:1355529607;s:31:"PrivacyManager.deleteReportData";i:1355529607;}'
+            ),
+        );
+    }
+
+    /**
+     * @dataProvider getTimetableFromOptionValueTestCases
+     */
+    public function testGetTimetableFromOptionValue($expectedTimetable, $option)
+    {
+        self::stubPiwikOption($option);
+
+        $timetable = new Timetable();
+        $this->assertEquals($expectedTimetable, $timetable->getTimetable());
+
+        self::resetPiwikOption();
+    }
+
+    /**
+     * Dataprovider for testTaskHasBeenScheduledOnce
+     */
+    public function taskHasBeenScheduledOnceTestCases()
+    {
+        return array(
+            array(true, 'CoreAdminHome.purgeOutdatedArchives', $this->timetable),
+            array(true, 'PrivacyManager.deleteReportData_1', $this->timetable),
+            array(false, 'ScheduledReports.weeklySchedule"', $this->timetable)
+        );
+    }
+
+    /**
+     * @dataProvider taskHasBeenScheduledOnceTestCases
+     */
+    public function testTaskHasBeenScheduledOnce($expectedDecision, $taskName, $timetable)
+    {
+        self::stubPiwikOption(false);
+
+        $timetableObj = new Timetable();
+        $timetableObj->setTimetable($timetable);
+        $this->assertEquals($expectedDecision, $timetableObj->taskHasBeenScheduledOnce($taskName));
+
+        self::resetPiwikOption();
+    }
+
+    /**
+     * Dataprovider for testGetScheduledTimeForMethod
+     */
+    public function getScheduledTimeForMethodTestCases()
+    {
+        $timetable = serialize($this->timetable);
+
+        return array(
+            array(1355529607, 'CoreAdminHome', 'purgeOutdatedArchives', null, $timetable),
+            array(1322229607, 'PrivacyManager', 'deleteReportData', 1, $timetable),
+            array(false, 'ScheduledReports', 'weeklySchedule', null, $timetable)
+        );
+    }
+
+    /**
+     * Dataprovider for testTaskShouldBeExecuted
+     */
+    public function taskShouldBeExecutedTestCases()
+    {
+        $timetable = $this->timetable;
+
+        // set a date in the future (should not run)
+        $timetable['CoreAdminHome.purgeOutdatedArchives'] = time() + 60000;
+
+        // set now (should run)
+        $timetable['PrivacyManager.deleteReportData_1'] = time();
+
+        return array(
+            array(false, 'CoreAdminHome.purgeOutdatedArchives', $timetable),
+            array(true, 'PrivacyManager.deleteReportData_1', $timetable),
+            array(false, 'ScheduledReports.weeklySchedule"', $timetable)
+        );
+    }
+
+    /**
+     * @dataProvider taskShouldBeExecutedTestCases
+     */
+    public function testTaskShouldBeExecuted($expectedDecision, $taskName, $timetable)
+    {
+        self::stubPiwikOption(serialize($timetable));
+
+        $timetable = new Timetable();
+        $this->assertEquals($expectedDecision, $timetable->shouldExecuteTask($taskName));
+
+        self::resetPiwikOption();
+    }
+
+    private static function stubPiwikOption($timetable)
+    {
+        self::getReflectedPiwikOptionInstance()->setValue(new PiwikOption($timetable));
+    }
+
+    private static function resetPiwikOption()
+    {
+        self::getReflectedPiwikOptionInstance()->setValue(null);
+    }
+
+    private static function getReflectedPiwikOptionInstance()
+    {
+        $piwikOptionInstance = new ReflectionProperty('Piwik\Option', 'instance');
+        $piwikOptionInstance->setAccessible(true);
+        return $piwikOptionInstance;
+    }
+}
diff --git a/tests/PHPUnit/Unit/Segment/SegmentExpressionTest.php b/tests/PHPUnit/Unit/Segment/SegmentExpressionTest.php
new file mode 100644
index 0000000000..ede256707b
--- /dev/null
+++ b/tests/PHPUnit/Unit/Segment/SegmentExpressionTest.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Unit;
+
+use Piwik\Segment\SegmentExpression;
+
+class SegmentExpressionTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Dataprovider for testSegmentSqlSimpleNoOperation
+     * @return array
+     */
+    public function getSimpleSegmentExpressions()
+    {
+        return array(
+            // classic expressions
+            array('A', " A "),
+            array('A,B', " (A OR B )"),
+            array('A;B', " A AND B "),
+            array('A;B;C', " A AND B AND C "),
+            array('A,B;C,D;E,F,G', " (A OR B) AND (C OR D) AND (E OR F OR G )"),
+
+            // unescape the backslash
+            array('A\,B\,C,D', " (A,B,C OR D )"),
+            array('\,A', ' ,A '),
+            // unescape only when it was escaping a known delimiter
+            array('\\\A', ' \\\A '),
+            // unescape at the end
+            array('\,\;\A\B,\,C,D\;E\,', ' (,;\A\B OR ,C OR D;E, )'),
+
+            // only replace when a following expression is detected
+            array('A,', ' A, '),
+            array('A;', ' A; '),
+            array('A;B;', ' A AND B; '),
+            array('A,B,', ' (A OR B, )'),
+        );
+    }
+
+    /**
+     * @dataProvider getSimpleSegmentExpressions
+     * @group Core
+     */
+    public function testSegmentSqlSimpleNoOperation($expression, $expectedSql)
+    {
+        $segment = new SegmentExpression($expression);
+        $expected = array('where' => $expectedSql, 'bind' => array(), 'join' => '');
+        $processed = $segment->getSql();
+        $this->assertEquals($expected, $processed);
+    }
+
+    /**
+     * Dataprovider for testSegmentSqlWithOperations
+     * @return array
+     */
+    public function getOperationSegmentExpressions()
+    {
+        // Filter expression => SQL string + Bind values
+        return array(
+            array('A==B%', array('where' => " A = ? ", 'bind' => array('B%'))),
+            array('ABCDEF====B===', array('where' => " ABCDEF = ? ", 'bind' => array('==B==='))),
+            array('A===B;CDEF!=C!=', array('where' => " A = ? AND ( CDEF IS NULL OR CDEF <> ? ) ", 'bind' => array('=B', 'C!='))),
+            array('A==B,C==D', array('where' => " (A = ? OR C = ? )", 'bind' => array('B', 'D'))),
+            array('A!=B;C==D', array('where' => " ( A IS NULL OR A <> ? ) AND C = ? ", 'bind' => array('B', 'D'))),
+            array('A!=B;C==D,E!=Hello World!=', array('where' => " ( A IS NULL OR A <> ? ) AND (C = ? OR ( E IS NULL OR E <> ? ) )", 'bind' => array('B', 'D', 'Hello World!='))),
+
+            array('A>B', array('where' => " A > ? ", 'bind' => array('B'))),
+            array('A<B', array('where' => " A < ? ", 'bind' => array('B'))),
+            array('A<=B', array('where' => " A <= ? ", 'bind' => array('B'))),
+            array('A>=B', array('where' => " A >= ? ", 'bind' => array('B'))),
+            array('ABCDEF>=>=>=B===', array('where' => " ABCDEF >= ? ", 'bind' => array('>=>=B==='))),
+            array('A>=<=B;CDEF>G;H>=I;J<K;L<=M', array('where' => " A >= ? AND CDEF > ? AND H >= ? AND J < ? AND L <= ? ", 'bind' => array('<=B', 'G', 'I', 'K', 'M'))),
+            array('A>=B;C>=D,E<w_ow great!', array('where' => " A >= ? AND (C >= ? OR E < ? )", 'bind' => array('B', 'D', 'w_ow great!'))),
+
+            array('A=@B_', array('where' => " A LIKE ? ", 'bind' => array('%B\_%'))),
+            array('A!@B%', array('where' => " ( A IS NULL OR A NOT LIKE ? ) ", 'bind' => array('%B\%%'))),
+        );
+    }
+
+    /**
+     * @dataProvider getOperationSegmentExpressions
+     * @group Core
+     */
+    public function testSegmentSqlWithOperations($expression, $expectedSql)
+    {
+        $segment = new SegmentExpression($expression);
+        $segment->parseSubExpressions();
+        $segment->parseSubExpressionsIntoSqlExpressions();
+        $processed = $segment->getSql();
+        $expectedSql['join'] = '';
+        $this->assertEquals($expectedSql, $processed);
+    }
+
+    /**
+     * Dataprovider for testBogusFiltersExpectExceptionThrown
+     * @return array
+     */
+    public function getBogusFilters()
+    {
+        return array(
+            array('A=B'),
+            array('C!D'),
+            array(''),
+            array('      '),
+            array(',;,'),
+            array(','),
+            array(',,'),
+            array('!='),
+        );
+    }
+
+    /**
+     * @dataProvider getBogusFilters
+     * @group Core
+     */
+    public function testBogusFiltersExpectExceptionThrown($bogus)
+    {
+        try {
+            $segment = new SegmentExpression($bogus);
+            $segment->parseSubExpressions();
+            $segment->getSql();
+        } catch (\Exception $e) {
+            return;
+        }
+        $this->fail('Expected exception not raised for:' . var_export($segment->getSql(), true));
+    }
+}
diff --git a/tests/PHPUnit/Unit/SegmentExpressionTest.php b/tests/PHPUnit/Unit/SegmentExpressionTest.php
deleted file mode 100644
index aadecc8f0e..0000000000
--- a/tests/PHPUnit/Unit/SegmentExpressionTest.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-namespace Piwik\Tests\Unit;
-
-use Piwik\SegmentExpression;
-
-class SegmentExpressionTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * Dataprovider for testSegmentSqlSimpleNoOperation
-     * @return array
-     */
-    public function getSimpleSegmentExpressions()
-    {
-        return array(
-            // classic expressions
-            array('A', " A "),
-            array('A,B', " (A OR B )"),
-            array('A;B', " A AND B "),
-            array('A;B;C', " A AND B AND C "),
-            array('A,B;C,D;E,F,G', " (A OR B) AND (C OR D) AND (E OR F OR G )"),
-
-            // unescape the backslash
-            array('A\,B\,C,D', " (A,B,C OR D )"),
-            array('\,A', ' ,A '),
-            // unescape only when it was escaping a known delimiter
-            array('\\\A', ' \\\A '),
-            // unescape at the end
-            array('\,\;\A\B,\,C,D\;E\,', ' (,;\A\B OR ,C OR D;E, )'),
-
-            // only replace when a following expression is detected
-            array('A,', ' A, '),
-            array('A;', ' A; '),
-            array('A;B;', ' A AND B; '),
-            array('A,B,', ' (A OR B, )'),
-        );
-    }
-
-    /**
-     * @dataProvider getSimpleSegmentExpressions
-     * @group Core
-     */
-    public function testSegmentSqlSimpleNoOperation($expression, $expectedSql)
-    {
-        $segment = new SegmentExpression($expression);
-        $expected = array('where' => $expectedSql, 'bind' => array(), 'join' => '');
-        $processed = $segment->getSql();
-        $this->assertEquals($expected, $processed);
-    }
-
-    /**
-     * Dataprovider for testSegmentSqlWithOperations
-     * @return array
-     */
-    public function getOperationSegmentExpressions()
-    {
-        // Filter expression => SQL string + Bind values
-        return array(
-            array('A==B%', array('where' => " A = ? ", 'bind' => array('B%'))),
-            array('ABCDEF====B===', array('where' => " ABCDEF = ? ", 'bind' => array('==B==='))),
-            array('A===B;CDEF!=C!=', array('where' => " A = ? AND ( CDEF IS NULL OR CDEF <> ? ) ", 'bind' => array('=B', 'C!='))),
-            array('A==B,C==D', array('where' => " (A = ? OR C = ? )", 'bind' => array('B', 'D'))),
-            array('A!=B;C==D', array('where' => " ( A IS NULL OR A <> ? ) AND C = ? ", 'bind' => array('B', 'D'))),
-            array('A!=B;C==D,E!=Hello World!=', array('where' => " ( A IS NULL OR A <> ? ) AND (C = ? OR ( E IS NULL OR E <> ? ) )", 'bind' => array('B', 'D', 'Hello World!='))),
-
-            array('A>B', array('where' => " A > ? ", 'bind' => array('B'))),
-            array('A<B', array('where' => " A < ? ", 'bind' => array('B'))),
-            array('A<=B', array('where' => " A <= ? ", 'bind' => array('B'))),
-            array('A>=B', array('where' => " A >= ? ", 'bind' => array('B'))),
-            array('ABCDEF>=>=>=B===', array('where' => " ABCDEF >= ? ", 'bind' => array('>=>=B==='))),
-            array('A>=<=B;CDEF>G;H>=I;J<K;L<=M', array('where' => " A >= ? AND CDEF > ? AND H >= ? AND J < ? AND L <= ? ", 'bind' => array('<=B', 'G', 'I', 'K', 'M'))),
-            array('A>=B;C>=D,E<w_ow great!', array('where' => " A >= ? AND (C >= ? OR E < ? )", 'bind' => array('B', 'D', 'w_ow great!'))),
-
-            array('A=@B_', array('where' => " A LIKE ? ", 'bind' => array('%B\_%'))),
-            array('A!@B%', array('where' => " ( A IS NULL OR A NOT LIKE ? ) ", 'bind' => array('%B\%%'))),
-        );
-    }
-
-    /**
-     * @dataProvider getOperationSegmentExpressions
-     * @group Core
-     */
-    public function testSegmentSqlWithOperations($expression, $expectedSql)
-    {
-        $segment = new SegmentExpression($expression);
-        $segment->parseSubExpressions();
-        $segment->parseSubExpressionsIntoSqlExpressions();
-        $processed = $segment->getSql();
-        $expectedSql['join'] = '';
-        $this->assertEquals($expectedSql, $processed);
-    }
-
-    /**
-     * Dataprovider for testBogusFiltersExpectExceptionThrown
-     * @return array
-     */
-    public function getBogusFilters()
-    {
-        return array(
-            array('A=B'),
-            array('C!D'),
-            array(''),
-            array('      '),
-            array(',;,'),
-            array(','),
-            array(',,'),
-            array('!='),
-        );
-    }
-
-    /**
-     * @dataProvider getBogusFilters
-     * @group Core
-     */
-    public function testBogusFiltersExpectExceptionThrown($bogus)
-    {
-        try {
-            $segment = new SegmentExpression($bogus);
-            $segment->parseSubExpressions();
-            $segment->getSql();
-        } catch (\Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised for:' . var_export($segment->getSql(), true));
-    }
-}
diff --git a/tests/PHPUnit/Unit/TaskSchedulerTest.php b/tests/PHPUnit/Unit/TaskSchedulerTest.php
deleted file mode 100644
index 762ae44de5..0000000000
--- a/tests/PHPUnit/Unit/TaskSchedulerTest.php
+++ /dev/null
@@ -1,338 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-namespace Piwik\Tests\Unit;
-
-use Piwik\EventDispatcher;
-use Piwik\Piwik;
-use Piwik\Plugin;
-use Piwik\ScheduledTask;
-use Piwik\ScheduledTaskTimetable;
-use Piwik\TaskScheduler;
-use Piwik\Tests\Framework\Mock\PiwikOption;
-use ReflectionMethod;
-use ReflectionProperty;
-
-class TaskSchedulerTest extends \PHPUnit_Framework_TestCase
-{
-    private static function getTestTimetable()
-    {
-        return array(
-            'CoreAdminHome.purgeOutdatedArchives' => 1355529607,
-            'PrivacyManager.deleteReportData_1'   => 1322229607,
-        );
-    }
-
-    /**
-     * Dataprovider for testGetTimetableFromOptionValue
-     */
-    public function getTimetableFromOptionValueTestCases()
-    {
-        return array(
-
-            // invalid option values should return a fresh array
-            array(array(), false),
-            array(array(), null),
-            array(array(), 1),
-            array(array(), ''),
-            array(array(), 'test'),
-
-            // valid serialized array
-            array(
-                array(
-                    'CoreAdminHome.purgeOutdatedArchives' => 1355529607,
-                    'PrivacyManager.deleteReportData'     => 1355529607,
-                ),
-                'a:2:{s:35:"CoreAdminHome.purgeOutdatedArchives";i:1355529607;s:31:"PrivacyManager.deleteReportData";i:1355529607;}'
-            ),
-        );
-    }
-
-    /**
-     * @group Core
-     * @dataProvider getTimetableFromOptionValueTestCases
-     */
-    public function testGetTimetableFromOptionValue($expectedTimetable, $option)
-    {
-        self::stubPiwikOption($option);
-
-        $timetable = new ScheduledTaskTimetable();
-        $this->assertEquals($expectedTimetable, $timetable->getTimetable());
-    }
-
-    /**
-     * Dataprovider for testTaskHasBeenScheduledOnce
-     */
-    public function taskHasBeenScheduledOnceTestCases()
-    {
-        $timetable = self::getTestTimetable();
-
-        return array(
-            array(true, 'CoreAdminHome.purgeOutdatedArchives', $timetable),
-            array(true, 'PrivacyManager.deleteReportData_1', $timetable),
-            array(false, 'ScheduledReports.weeklySchedule"', $timetable)
-        );
-    }
-
-    /**
-     * @group Core
-     *
-     * @dataProvider taskHasBeenScheduledOnceTestCases
-     */
-    public function testTaskHasBeenScheduledOnce($expectedDecision, $taskName, $timetable)
-    {
-        $timetableObj = new ScheduledTaskTimetable();
-        $timetableObj->setTimetable($timetable);
-        $this->assertEquals($expectedDecision, $timetableObj->taskHasBeenScheduledOnce($taskName));
-    }
-
-    /**
-     * Dataprovider for testGetScheduledTimeForMethod
-     */
-    public function getScheduledTimeForMethodTestCases()
-    {
-        $timetable = serialize(self::getTestTimetable());
-
-        return array(
-            array(1355529607, 'CoreAdminHome', 'purgeOutdatedArchives', null, $timetable),
-            array(1322229607, 'PrivacyManager', 'deleteReportData', 1, $timetable),
-            array(false, 'ScheduledReports', 'weeklySchedule', null, $timetable)
-        );
-    }
-
-    /**
-     * @group Core
-     * @dataProvider getScheduledTimeForMethodTestCases
-     */
-    public function testGetScheduledTimeForMethod($expectedTime, $className, $methodName, $methodParameter, $timetable)
-    {
-        self::stubPiwikOption($timetable);
-
-        $this->assertEquals($expectedTime, TaskScheduler::getScheduledTimeForMethod($className, $methodName, $methodParameter));
-
-        self::resetPiwikOption();
-    }
-
-    /**
-     * Dataprovider for testTaskShouldBeExecuted
-     */
-    public function taskShouldBeExecutedTestCases()
-    {
-        $timetable = self::getTestTimetable();
-
-        // set a date in the future (should not run)
-        $timetable['CoreAdminHome.purgeOutdatedArchives'] = time() + 60000;
-
-        // set now (should run)
-        $timetable['PrivacyManager.deleteReportData_1'] = time();
-
-        return array(
-            array(false, 'CoreAdminHome.purgeOutdatedArchives', $timetable),
-            array(true, 'PrivacyManager.deleteReportData_1', $timetable),
-            array(false, 'ScheduledReports.weeklySchedule"', $timetable)
-        );
-    }
-
-    /**
-     * @group Core
-     *
-     * @dataProvider taskShouldBeExecutedTestCases
-     */
-    public function testTaskShouldBeExecuted($expectedDecision, $taskName, $timetable)
-    {
-        self::stubPiwikOption(serialize($timetable));
-
-        $timetable = new ScheduledTaskTimetable();
-        $this->assertEquals($expectedDecision, $timetable->shouldExecuteTask($taskName));
-    }
-
-    /**
-     * Dataprovider for testExecuteTask
-     */
-    public function executeTaskTestCases()
-    {
-        return array(
-            array('scheduledTaskOne', null),
-            array('scheduledTaskTwo', 'parameterValue'),
-            array('scheduledTaskTwo', 1),
-        );
-    }
-
-    /**
-     * @group Core
-     *
-     * @dataProvider executeTaskTestCases
-     */
-    public function testExecuteTask($methodName, $parameterValue)
-    {
-        // assert the scheduled method is executed once with the correct parameter
-        $mock = $this->getMock('TaskSchedulerTest', array($methodName));
-        $mock->expects($this->once())->method($methodName)->with($this->equalTo($parameterValue));
-
-        $executeTask = new ReflectionMethod('\Piwik\TaskScheduler', 'executeTask');
-        $executeTask->setAccessible(true);
-
-        $this->assertNotEmpty($executeTask->invoke(
-            new TaskScheduler(),
-            new ScheduledTask ($mock, $methodName, $parameterValue, \Piwik\ScheduledTime::factory('daily'))
-        ));
-    }
-
-    /**
-     * @group Core
-     *
-     * Dataprovider for testRunTasks
-     */
-    public function testRunTasksTestCases()
-    {
-        $systemTime = time();
-
-        $dailySchedule = $this->getMock('\Piwik\ScheduledTime\Daily', array('getTime'));
-        $dailySchedule->expects($this->any())
-            ->method('getTime')
-            ->will($this->returnValue($systemTime));
-
-        $scheduledTaskOne = new ScheduledTask ($this, 'scheduledTaskOne', null, $dailySchedule);
-        $scheduledTaskTwo = new ScheduledTask ($this, 'scheduledTaskTwo', 1, $dailySchedule);
-        $scheduledTaskThree = new ScheduledTask ($this, 'scheduledTaskThree', null, $dailySchedule);
-
-        $caseOneExpectedTable = array(
-            'Piwik\Tests\Unit\TaskSchedulerTest.scheduledTaskOne'   => $scheduledTaskOne->getRescheduledTime(),
-            'Piwik\Tests\Unit\TaskSchedulerTest.scheduledTaskTwo_1' => $systemTime + 60000,
-            'Piwik\Tests\Unit\TaskSchedulerTest.scheduledTaskThree' => $scheduledTaskThree->getRescheduledTime(),
-        );
-
-        $caseTwoTimetableBeforeExecution = $caseOneExpectedTable;
-        $caseTwoTimetableBeforeExecution['Piwik\Tests\Unit\TaskSchedulerTest.scheduledTaskThree'] = $systemTime; // simulate elapsed time between case 1 and 2
-
-        return array(
-
-            // case 1) contains :
-            // - scheduledTaskOne: already scheduled before, should be executed and rescheduled
-            // - scheduledTaskTwo: already scheduled before, should not be executed and therefore not rescheduled
-            // - scheduledTaskThree: not already scheduled before, should be scheduled but not executed
-            array(
-                $caseOneExpectedTable,
-
-                // methods that should be executed
-                array(
-                    'Piwik\Tests\Unit\TaskSchedulerTest.scheduledTaskOne'
-                ),
-
-                // timetable before task execution
-                array(
-                    'Piwik\Tests\Unit\TaskSchedulerTest.scheduledTaskOne'   => $systemTime,
-                    'Piwik\Tests\Unit\TaskSchedulerTest.scheduledTaskTwo_1' => $systemTime + 60000,
-                ),
-                // configured tasks
-                array(
-                    $scheduledTaskOne,
-                    $scheduledTaskTwo,
-                    $scheduledTaskThree,
-                )
-            ),
-
-            // case 2) follows case 1) with :
-            // - scheduledTaskOne: already scheduled before, should not be executed and therefore not rescheduled
-            // - scheduledTaskTwo: not configured for execution anymore, should be removed from the timetable
-            // - scheduledTaskThree: already scheduled before, should be executed and rescheduled
-            array(
-                // expected timetable
-                array(
-                    'Piwik\Tests\Unit\TaskSchedulerTest.scheduledTaskOne'   => $scheduledTaskOne->getRescheduledTime(),
-                    'Piwik\Tests\Unit\TaskSchedulerTest.scheduledTaskThree' => $scheduledTaskThree->getRescheduledTime()
-                ),
-
-                // methods that should be executed
-                array(
-                    'Piwik\Tests\Unit\TaskSchedulerTest.scheduledTaskThree'
-                ),
-
-                // timetable before task execution
-                $caseTwoTimetableBeforeExecution,
-
-                // configured tasks
-                array(
-                    $scheduledTaskOne,
-//					$scheduledTaskTwo, Not configured anymore (ie. not returned after TaskScheduler::GET_TASKS_EVENT is issued)
-                    $scheduledTaskThree,
-                )
-            ),
-        );
-    }
-
-    public function scheduledTaskOne()
-    {
-    } // nothing to do
-    public function scheduledTaskTwo($param)
-    {
-    } // nothing to do
-    public function scheduledTaskThree()
-    {
-    } // nothing to do
-
-    /**
-     * @group Core
-     *
-     * @dataProvider testRunTasksTestCases
-     */
-    public function testRunTasks($expectedTimetable, $expectedExecutedTasks, $timetableBeforeTaskExecution, $configuredTasks)
-    {
-        // temporarily unload plugins
-        $plugins = Plugin\Manager::getInstance()->getLoadedPlugins();
-        $plugins = array_map(function (Plugin $p) { return $p->getPluginName(); }, $plugins);
-
-        Plugin\Manager::getInstance()->unloadPlugins();
-
-        // make sure the get tasks event returns our configured tasks
-        Piwik::addAction(TaskScheduler::GET_TASKS_EVENT, function(&$tasks) use($configuredTasks) {
-            $tasks = $configuredTasks;
-        });
-
-        // stub the piwik option object to control the returned option value
-        self::stubPiwikOption(serialize($timetableBeforeTaskExecution));
-        TaskScheduler::unsetInstance();
-
-        // execute tasks
-        $executionResults = TaskScheduler::runTasks();
-
-        // assert methods are executed
-        $executedTasks = array();
-        foreach ($executionResults as $executionResult) {
-            $executedTasks[] = $executionResult['task'];
-            $this->assertNotEmpty($executionResult['output']);
-        }
-        $this->assertEquals($expectedExecutedTasks, $executedTasks);
-
-        // assert the timetable is correctly updated
-        $timetable = new ScheduledTaskTimetable();
-        $this->assertEquals($expectedTimetable, $timetable->getTimetable());
-
-        // restore loaded plugins & piwik options
-        EventDispatcher::getInstance()->clearObservers(TaskScheduler::GET_TASKS_EVENT);
-        Plugin\Manager::getInstance()->loadPlugins($plugins);
-        self::resetPiwikOption();
-    }
-
-    private static function stubPiwikOption($timetable)
-    {
-        self::getReflectedPiwikOptionInstance()->setValue(new PiwikOption($timetable));
-    }
-
-    private static function resetPiwikOption()
-    {
-        self::getReflectedPiwikOptionInstance()->setValue(null);
-    }
-
-    private static function getReflectedPiwikOptionInstance()
-    {
-        $piwikOptionInstance = new ReflectionProperty('\Piwik\Option', 'instance');
-        $piwikOptionInstance->setAccessible(true);
-        return $piwikOptionInstance;
-    }
-}
diff --git a/tests/PHPUnit/Unit/Tracker/RequestSetTest.php b/tests/PHPUnit/Unit/Tracker/RequestSetTest.php
new file mode 100644
index 0000000000..4edb3f2310
--- /dev/null
+++ b/tests/PHPUnit/Unit/Tracker/RequestSetTest.php
@@ -0,0 +1,470 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Unit\Tracker;
+
+use Piwik\Tests\Framework\TestCase\UnitTestCase;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\RequestSet;
+
+class TestRequestSet extends RequestSet {
+
+    public function getRedirectUrl()
+    {
+        return parent::getRedirectUrl();
+    }
+
+    public function hasRedirectUrl()
+    {
+        return parent::hasRedirectUrl();
+    }
+
+    public function getAllSiteIdsWithinRequest()
+    {
+        return parent::getAllSiteIdsWithinRequest();
+    }
+
+    public function getEnvironment()
+    {
+        return parent::getEnvironment();
+    }
+}
+
+/**
+ * @group RequestSetTest
+ * @group RequestSet
+ * @group Tracker
+ */
+class RequestSetTest extends UnitTestCase
+{
+    /**
+     * @var TestRequestSet
+     */
+    private $requestSet;
+    private $time;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->requestSet = $this->createRequestSet();
+        $this->time = time();
+    }
+
+    private function createRequestSet()
+    {
+        return new TestRequestSet();
+    }
+
+    public function test_internalBuildRequest_ShoulBuildOneRequest()
+    {
+        $request = new Request(array('idsite' => '2'));
+        $request->setCurrentTimestamp($this->time);
+
+        $this->assertEquals($request, $this->buildRequest(2));
+    }
+
+    public function test_internalBuildRequests_ShoulBuildASetOfRequests()
+    {
+        $this->assertEquals(array(), $this->buildRequests(0));
+
+        $this->assertEquals(array($this->buildRequest(1)), $this->buildRequests(1));
+
+        $this->assertEquals(array(
+            $this->buildRequest(1),
+            $this->buildRequest(2),
+            $this->buildRequest(3)
+        ), $this->buildRequests(3));
+    }
+
+    public function test_getRequests_shouldReturnEmptyArray_IfThereAreNoRequestsInitializedYet()
+    {
+        $this->assertEquals(array(), $this->requestSet->getRequests());
+    }
+
+    public function test_setRequests_shouldNotFail_IfEmptyArrayGiven()
+    {
+        $this->requestSet->setRequests(array());
+        $this->assertEquals(array(), $this->requestSet->getRequests());
+    }
+
+    public function test_setRequests_shouldSetAndOverwriteRequests()
+    {
+        $this->requestSet->setRequests($this->buildRequests(3));
+        $this->assertEquals($this->buildRequests(3), $this->requestSet->getRequests());
+
+        // overwrite
+        $this->requestSet->setRequests($this->buildRequests(5));
+        $this->assertEquals($this->buildRequests(5), $this->requestSet->getRequests());
+
+        // overwrite
+        $this->requestSet->setRequests($this->buildRequests(1));
+        $this->assertEquals($this->buildRequests(1), $this->requestSet->getRequests());
+
+        // clear
+        $this->requestSet->setRequests(array());
+        $this->assertEquals(array(), $this->requestSet->getRequests());
+    }
+
+    public function test_setRequests_shouldConvertNonRequestInstancesToARequestInstance()
+    {
+        $requests = array(
+            $this->buildRequest(5),
+            array('idsite' => 9),
+            $this->buildRequest(2),
+            array('idsite' => 3),
+            $this->buildRequest(6)
+        );
+
+        $this->requestSet->setRequests($requests);
+
+        $setRequests = $this->requestSet->getRequests();
+        $this->assertEquals($this->buildRequest(5), $setRequests[0]);
+        $this->assertEquals($this->buildRequest(2), $setRequests[2]);
+        $this->assertEquals($this->buildRequest(6), $setRequests[4]);
+
+        $this->assertTrue($setRequests[1] instanceof Request);
+        $this->assertEquals(array('idsite' => 9), $setRequests[1]->getParams());
+
+        $this->assertTrue($setRequests[3] instanceof Request);
+        $this->assertEquals(array('idsite' => 3), $setRequests[3]->getParams());
+
+        $this->assertCount(5, $setRequests);
+    }
+
+    public function test_setRequests_shouldIgnoreEmptyRequestsButNotArrays()
+    {
+        $requests = array(
+            $this->buildRequest(5),
+            null,
+            $this->buildRequest(2),
+            0,
+            $this->buildRequest(6),
+            array()
+        );
+
+        $this->requestSet->setRequests($requests);
+
+        $expected = array($this->buildRequest(5), $this->buildRequest(2), $this->buildRequest(6), new Request(array()));
+        $this->assertEquals($expected, $this->requestSet->getRequests());
+    }
+
+    public function test_getNumberOfRequests_shouldReturnZeroIfNothingSet()
+    {
+        $this->assertEquals(0, $this->requestSet->getNumberOfRequests());
+    }
+
+    public function test_getNumberOfRequests_shouldReturnNumberOfRequests()
+    {
+        $this->requestSet->setRequests($this->buildRequests(3));
+        $this->assertSame(3, $this->requestSet->getNumberOfRequests());
+
+        $this->requestSet->setRequests($this->buildRequests(5));
+        $this->assertSame(5, $this->requestSet->getNumberOfRequests());
+
+        $this->requestSet->setRequests($this->buildRequests(1));
+        $this->assertSame(1, $this->requestSet->getNumberOfRequests());
+    }
+
+    public function test_hasRequests_shouldReturnFalse_IfNotInitializedYetOrNoDataSet()
+    {
+        $this->assertFalse($this->requestSet->hasRequests());
+
+        $this->requestSet->setRequests(array());
+        $this->assertFalse($this->requestSet->hasRequests());
+    }
+
+    public function test_hasRequests_shouldReturnTrue_IfAtLeastOneRequestIsSet()
+    {
+        $this->assertFalse($this->requestSet->hasRequests());
+
+        $this->requestSet->setRequests($this->buildRequests(1));
+        $this->assertTrue($this->requestSet->hasRequests());
+
+        $this->requestSet->setRequests($this->buildRequests(5));
+        $this->assertTrue($this->requestSet->hasRequests());
+
+        $this->requestSet->setRequests(array(null, 0));
+        $this->assertFalse($this->requestSet->hasRequests());
+    }
+
+    public function test_getTokenAuth_ShouldReturnFalse_IfNoTokenIsSetAndNoRequestParam()
+    {
+        $this->assertFalse($this->requestSet->getTokenAuth());
+    }
+
+    public function test_getTokenAuth_setTokenAuth_shouldOverwriteTheToken()
+    {
+        $this->requestSet->setTokenAuth('MKyKTokenTestIn');
+
+        $this->assertEquals('MKyKTokenTestIn', $this->requestSet->getTokenAuth());
+    }
+
+    public function test_getTokenAuth_setTokenAuth_shouldBePossibleToClearASetToken()
+    {
+        $this->requestSet->setTokenAuth('MKyKTokenTestIn');
+        $this->assertNotEmpty($this->requestSet->getTokenAuth());
+
+        $this->requestSet->setTokenAuth(null);
+        $this->assertFalse($this->requestSet->getTokenAuth()); // does now fallback to get param
+    }
+
+    public function test_getTokenAuth_ShouldFallbackToRequestParam_IfNoTokenSet()
+    {
+        $_GET['token_auth'] = 'MyTokenAuthTest';
+
+        $this->assertSame('MyTokenAuthTest', $this->requestSet->getTokenAuth());
+
+        unset($_GET['token_auth']);
+    }
+
+    public function test_getEnvironment_shouldReturnCurrentServerVar()
+    {
+        $this->assertEquals(array(
+            'server' => $_SERVER
+        ), $this->requestSet->getEnvironment());
+    }
+
+    public function test_intertnalFakeEnvironment_shouldActuallyReturnAValue()
+    {
+        $myEnv = $this->getFakeEnvironment();
+        $this->assertInternalType('array', $myEnv);
+        $this->assertNotEmpty($myEnv);
+    }
+
+    public function test_setEnvironment_shouldOverwriteAnEnvironment()
+    {
+        $this->requestSet->setEnvironment($this->getFakeEnvironment());
+
+        $this->assertEquals($this->getFakeEnvironment(), $this->requestSet->getEnvironment());
+    }
+
+    public function test_restoreEnvironment_shouldRestoreAPreviouslySetEnvironment()
+    {
+        $serverBackup = $_SERVER;
+
+        $this->requestSet->setEnvironment($this->getFakeEnvironment());
+        $this->requestSet->restoreEnvironment();
+
+        $this->assertEquals(array('mytest' => 'test'), $_SERVER);
+
+        $_SERVER = $serverBackup;
+    }
+
+    public function test_rememberEnvironment_shouldSaveCurrentEnvironment()
+    {
+        $expected = $_SERVER;
+
+        $this->requestSet->rememberEnvironment();
+
+        $this->assertEquals(array('server' => $expected), $this->requestSet->getEnvironment());
+
+        // should not change anything
+        $this->requestSet->restoreEnvironment();
+        $this->assertEquals($expected, $_SERVER);
+    }
+
+    public function test_getState_shouldReturnCurrentStateOfRequestSet()
+    {
+        $this->requestSet->setRequests($this->buildRequests(2));
+        $this->requestSet->setTokenAuth('mytoken');
+
+        $state = $this->requestSet->getState();
+
+        $expectedKeys = array('requests', 'env', 'tokenAuth', 'time');
+        $this->assertEquals($expectedKeys, array_keys($state));
+
+        $expectedRequests = array(
+            array('idsite' => 1),
+            array('idsite' => 2)
+        );
+
+        $this->assertEquals($expectedRequests, $state['requests']);
+        $this->assertEquals('mytoken', $state['tokenAuth']);
+        $this->assertTrue(is_numeric($state['time']));
+        $this->assertEquals(array('server' => $_SERVER), $state['env']);
+    }
+
+    public function test_getState_shouldRememberAnyAddedParamsFromRequestConstructor()
+    {
+        $_SERVER['HTTP_REFERER'] = 'test';
+
+        $requests = $this->buildRequests(1);
+
+        $this->requestSet->setRequests($requests);
+        $this->requestSet->setTokenAuth('mytoken');
+
+        $state = $this->requestSet->getState();
+
+        unset($_SERVER['HTTP_REFERER']);
+
+        $expectedRequests = array(
+            array('idsite' => 1)
+        );
+
+        $this->assertEquals($expectedRequests, $state['requests']);
+
+        // the actual params include an added urlref param which should NOT be in the state. otherwise we cannot detect empty requests etc
+        $this->assertEquals(array('idsite' => 1, 'url' => 'test'), $requests[0]->getParams());
+    }
+
+    public function test_restoreState_shouldRestoreRequestSet()
+    {
+        $serverBackup = $_SERVER;
+
+        $state = array(
+            'requests' => array(array('idsite' => 1), array('idsite' => 2), array('idsite' => 3)),
+            'time' => $this->time,
+            'tokenAuth' => 'tokenAuthRestored',
+            'env' => $this->getFakeEnvironment()
+        );
+
+        $this->requestSet->restoreState($state);
+
+        $this->assertEquals($this->getFakeEnvironment(), $this->requestSet->getEnvironment());
+        $this->assertEquals('tokenAuthRestored', $this->requestSet->getTokenAuth());
+
+        $expectedRequests = array(
+            new Request(array('idsite' => 1), 'tokenAuthRestored'),
+            new Request(array('idsite' => 2), 'tokenAuthRestored'),
+            new Request(array('idsite' => 3), 'tokenAuthRestored'),
+        );
+        $expectedRequests[0]->setCurrentTimestamp($this->time);
+        $expectedRequests[1]->setCurrentTimestamp($this->time);
+        $expectedRequests[2]->setCurrentTimestamp($this->time);
+
+        $requests = $this->requestSet->getRequests();
+        $this->assertEquals($expectedRequests, $requests);
+
+        // verify again just to be sure (only first one)
+        $this->assertEquals('tokenAuthRestored', $requests[0]->getTokenAuth());
+        $this->assertEquals($this->time, $requests[0]->getCurrentTimestamp());
+
+        // should not restoreEnvironment, only set the environment
+        $this->assertSame($serverBackup, $_SERVER);
+    }
+
+    public function test_restoreState_ifRequestWasEmpty_ShouldBeStillEmptyWhenRestored()
+    {
+        $_SERVER['HTTP_REFERER'] = 'test';
+
+        $this->requestSet->setRequests(array(new Request(array())));
+        $state = $this->requestSet->getState();
+
+        $requestSet = $this->createRequestSet();
+        $requestSet->restoreState($state);
+
+        unset($_SERVER['HTTP_REFERER']);
+
+        $requests = $requestSet->getRequests();
+        $this->assertTrue($requests[0]->isEmptyRequest());
+    }
+
+    public function test_restoreState_shouldResetTheStoredEnvironmentBeforeRestoringRequests()
+    {
+        $this->requestSet->setRequests(array(new Request(array())));
+        $state = $this->requestSet->getState();
+        $state['env']['server']['HTTP_REFERER'] = 'mytesturl';
+
+        $requestSet = $this->createRequestSet();
+        $requestSet->restoreState($state);
+
+        $requests = $requestSet->getRequests();
+        $this->assertTrue($requests[0]->isEmptyRequest());
+        $this->assertEquals(array('url' => 'mytesturl'), $requests[0]->getParams());
+        $this->assertTrue(empty($_SERVER['HTTP_REFERER']));
+    }
+
+    public function test_getRedirectUrl_ShouldReturnEmptyString_IfNoUrlSet()
+    {
+        $this->assertEquals('', $this->requestSet->getRedirectUrl());
+    }
+
+    public function test_getRedirectUrl_ShouldReturnTrue_IfAUrlSetIsSetViaGET()
+    {
+        $_GET['redirecturl'] = 'whatsoever';
+        $this->assertEquals('whatsoever', $this->requestSet->getRedirectUrl());
+        unset($_GET['redirecturl']);
+    }
+
+    public function test_getRedirectUrl_ShouldReturnTrue_IfAUrlSetIsSetViaPOST()
+    {
+        $_POST['redirecturl'] = 'whatsoeverPOST';
+        $this->assertEquals('whatsoeverPOST', $this->requestSet->getRedirectUrl());
+        unset($_POST['redirecturl']);
+    }
+
+    public function test_hasRedirectUrl_ShouldReturnFalse_IfNoUrlSet()
+    {
+        $this->assertFalse($this->requestSet->hasRedirectUrl());
+    }
+
+    public function test_hasRedirectUrl_ShouldReturnTrue_IfAUrlSetIsSetViaGET()
+    {
+        $_GET['redirecturl'] = 'whatsoever';
+        $this->assertTrue($this->requestSet->hasRedirectUrl());
+        unset($_GET['redirecturl']);
+    }
+
+    public function test_hasRedirectUrl_ShouldReturnTrue_IfAUrlSetIsSetViaPOST()
+    {
+        $_POST['redirecturl'] = 'whatsoever';
+        $this->assertTrue($this->requestSet->hasRedirectUrl());
+        unset($_POST['redirecturl']);
+    }
+
+    public function test_getAllSiteIdsWithinRequest_ShouldReturnEmptyArray_IfNoRequestsSet()
+    {
+        $this->assertEquals(array(), $this->requestSet->getAllSiteIdsWithinRequest());
+    }
+
+    public function test_getAllSiteIdsWithinRequest_ShouldReturnTheSiteIds_FromRequests()
+    {
+        $this->requestSet->setRequests($this->buildRequests(3));
+
+        $this->assertEquals(array(1, 2, 3), $this->requestSet->getAllSiteIdsWithinRequest());
+    }
+
+    public function test_getAllSiteIdsWithinRequest_ShouldReturnUniqueSiteIds_Unordered()
+    {
+        $this->requestSet->setRequests(array(
+            $this->buildRequest(1),
+            $this->buildRequest(5),
+            $this->buildRequest(1),
+            $this->buildRequest(2),
+            $this->buildRequest(2),
+            $this->buildRequest(9),
+        ));
+
+        $this->assertEquals(array(1, 5, 2, 9), $this->requestSet->getAllSiteIdsWithinRequest());
+    }
+
+    private function buildRequests($numRequests)
+    {
+        $requests = array();
+        for ($index = 1; $index <= $numRequests; $index++) {
+            $requests[] = $this->buildRequest($index);
+        }
+        return $requests;
+    }
+
+    private function buildRequest($idsite)
+    {
+        $request = new Request(array('idsite' => ('' . $idsite)));
+        $request->setCurrentTimestamp($this->time);
+
+        return $request;
+    }
+
+    private function getFakeEnvironment()
+    {
+        return array('server' => array('mytest' => 'test'));
+    }
+
+
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Unit/Tracker/RequestTest.php b/tests/PHPUnit/Unit/Tracker/RequestTest.php
new file mode 100644
index 0000000000..43898ec866
--- /dev/null
+++ b/tests/PHPUnit/Unit/Tracker/RequestTest.php
@@ -0,0 +1,604 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Unit\Tracker;
+
+use Piwik\Cookie;
+use Piwik\Network\IPUtils;
+use Piwik\Piwik;
+use Piwik\Plugins\CustomVariables\CustomVariables;
+use Piwik\Tests\Framework\TestCase\UnitTestCase;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\TrackerConfig;
+
+class TestRequest extends  Request {
+
+    public function getCookieName()
+    {
+        return parent::getCookieName();
+    }
+
+    public function getCookieExpire()
+    {
+        return parent::getCookieExpire();
+    }
+
+    public function getCookiePath()
+    {
+        return parent::getCookiePath();
+    }
+
+    public function makeThirdPartyCookie()
+    {
+        return parent::makeThirdPartyCookie();
+    }
+
+    public function setIsAuthenticated()
+    {
+        $this->isAuthenticated = true;
+    }
+
+}
+
+/**
+ * @group RequestSetTest
+ * @group RequestSet
+ * @group Tracker
+ */
+class RequestTest extends UnitTestCase
+{
+    /**
+     * @var TestRequest
+     */
+    private $request;
+    private $time;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->time = 1416795617;
+        $this->request = $this->buildRequest(array('idsite' => '1'));
+    }
+
+    public function test_getCurrentTimestamp_ShouldReturnTheSetTimestamp_IfNoCustomValueGiven()
+    {
+        $this->assertSame($this->time, $this->request->getCurrentTimestamp());
+    }
+
+    public function test_getCurrentTimestamp_ShouldReturnTheCurrentTimestamp_IfTimestampIsInvalid()
+    {
+        $request = $this->buildRequest(array('cdt' => '' . 5));
+        $request->setIsAuthenticated();
+        $this->assertSame($this->time, $request->getCurrentTimestamp());
+    }
+
+    public function test_cdt_ShouldReturnTheCurrentTimestamp_IfNotAuthenticatedAndTimestampIsNotRecent()
+    {
+        $request = $this->buildRequest(array('cdt' => '' . $this->time - 28800));
+        $this->assertSame($this->time, $request->getCurrentTimestamp());
+    }
+
+    public function test_cdt_ShouldReturnTheCustomTimestamp_IfNotAuthenticatedButTimestampIsRecent()
+    {
+        $request = $this->buildRequest(array('cdt' => '' . ($this->time - 5)));
+
+        $this->assertSame('' . ($this->time - 5), $request->getCurrentTimestamp());
+    }
+
+    public function test_cdt_ShouldReturnTheCustomTimestamp_IfAuthenticatedAndValid()
+    {
+        $request = $this->buildRequest(array('cdt' => '' . ($this->time - 28800)));
+        $request->setIsAuthenticated();
+        $this->assertSame('' . ($this->time - 28800), $request->getCurrentTimestamp());
+    }
+
+    public function test_cdt_ShouldReturnTheCustomTimestamp_IfTimestampIsInFuture()
+    {
+        $request = $this->buildRequest(array('cdt' => '' . ($this->time + 30800)));
+        $this->assertSame($this->time, $request->getCurrentTimestamp());
+    }
+
+    public function test_cdt_ShouldReturnTheCustomTimestamp_ShouldUseStrToTime_IfItIsNotATime()
+    {
+        $request = $this->buildRequest(array('cdt' => '5 years ago'));
+        $request->setIsAuthenticated();
+        $this->assertNotSame($this->time, $request->getCurrentTimestamp());
+        $this->assertNotEmpty($request->getCurrentTimestamp());
+    }
+
+    public function test_isEmptyRequest_ShouldReturnTrue_InCaseNoParamsSet()
+    {
+        $request = $this->buildRequest(array());
+        $this->assertTrue($request->isEmptyRequest());
+    }
+
+    public function test_isEmptyRequest_ShouldReturnTrue_InCaseNullIsSet()
+    {
+        $request = $this->buildRequest(null);
+        $this->assertTrue($request->isEmptyRequest());
+    }
+
+    public function test_isEmptyRequest_ShouldRecognizeEmptyRequest_EvenIfConstructorAddsAParam()
+    {
+        $_SERVER['HTTP_REFERER'] = 'http://www.example.com';
+
+        $request = $this->buildRequest(array());
+        $this->assertCount(1, $request->getParams());
+
+        $this->assertTrue($request->isEmptyRequest());
+
+        unset($_SERVER['HTTP_REFERER']);
+    }
+
+    public function test_isEmptyRequest_ShouldReturnFalse_InCaseAtLEastOneParamIssSet()
+    {
+        $request = $this->buildRequest(array('idsite' => 1));
+        $this->assertFalse($request->isEmptyRequest());
+    }
+
+    public function test_getTokenAuth_shouldReturnDefaultValue_IfNoneSet()
+    {
+        $request = $this->buildRequest(array('idsite' => 1));
+        $this->assertFalse($request->getTokenAuth());
+    }
+
+    public function test_getTokenAuth_shouldReturnSetTokenAuth()
+    {
+        $request = $this->buildRequestWithToken(array('idsite' => 1), 'myToken');
+        $this->assertEquals('myToken', $request->getTokenAuth());
+    }
+
+    public function test_getForcedUserId_shouldReturnFalseByDefault()
+    {
+        $this->assertFalse($this->request->getForcedUserId());
+    }
+
+    public function test_getForcedUserId_shouldReturnCustomUserId_IfSet()
+    {
+        $request = $this->buildRequest(array('uid' => 'mytest'));
+        $this->assertEquals('mytest', $request->getForcedUserId());
+    }
+
+    public function test_getForcedUserId_shouldReturnFalse_IfCustomUserIdIsEmpty()
+    {
+        $request = $this->buildRequest(array('uid' => ''));
+        $this->assertFalse($request->getForcedUserId());
+    }
+
+    public function test_getDaysSinceFirstVisit_shouldReturnZeroIfNow()
+    {
+        $this->assertEquals(0.0, $this->request->getDaysSinceFirstVisit());
+    }
+
+    public function test_getDaysSinceFirstVisit_ShouldNotReturnMinusValue()
+    {
+        $request = $this->buildRequest(array('_idts' => '' . ($this->time + 43200)));
+        $request->setIsAuthenticated();
+        $this->assertEquals(0.0, $request->getDaysSinceFirstVisit());
+    }
+
+    public function test_getDaysSinceFirstVisit_TodayMinusHalfDay()
+    {
+        $request = $this->buildRequest(array('_idts' => '' . ($this->time - 43200)));
+        $request->setIsAuthenticated();
+        $this->assertEquals(1.0, $request->getDaysSinceFirstVisit());
+    }
+
+    public function test_getDaysSinceFirstVisit_Yesterday()
+    {
+        $request = $this->buildRequest(array('_idts' => '' .($this->time - 86400)));
+        $request->setIsAuthenticated();
+        $this->assertEquals(1.0, $request->getDaysSinceFirstVisit());
+    }
+
+    public function test_getDaysSinceFirstVisit_12Days()
+    {
+        $request = $this->buildRequest(array('_idts' => '' . ($this->time - (86400 * 12))));
+        $request->setIsAuthenticated();
+        $this->assertEquals(12.0, $request->getDaysSinceFirstVisit());
+    }
+
+    public function test_getDaysSinceFirstVisit_IfTimestampIsNotValidShouldIgnoreParam()
+    {
+        $request = $this->buildRequest(array('_idts' => '' . ($this->time - (86400 * 15 * 365))));
+        $this->assertEquals(0.0, $request->getDaysSinceFirstVisit());
+    }
+
+    public function test_getDaysSinceLastOrder_shouldReturnZeroIfNow()
+    {
+        $this->assertEquals(0.0, $this->request->getDaysSinceLastOrder());
+    }
+
+    public function test_getDaysSinceLastOrder_ShouldNotReturnMinusValue()
+    {
+        $request = $this->buildRequest(array('_ects' => '' . ($this->time + 43200)));
+        $request->setIsAuthenticated();
+        $this->assertEquals(0.0, $request->getDaysSinceLastOrder());
+    }
+
+    public function test_getDaysSinceLastOrder_TodayMinusHalfDay()
+    {
+        $request = $this->buildRequest(array('_ects' => '' . ($this->time - 43200)));
+        $request->setIsAuthenticated();
+        $this->assertEquals(1.0, $request->getDaysSinceLastOrder());
+    }
+
+    public function test_getDaysSinceLastOrder_Yesterday()
+    {
+        $request = $this->buildRequest(array('_ects' => '' . ($this->time - 86400)));
+        $request->setIsAuthenticated();
+        $this->assertEquals(1.0, $request->getDaysSinceLastOrder());
+    }
+
+    public function test_getDaysSinceLastOrder_12Days()
+    {
+        $request = $this->buildRequest(array('_ects' => '' . ($this->time - (86400 * 12))));
+        $request->setIsAuthenticated();
+        $this->assertEquals(12.0, $request->getDaysSinceLastOrder());
+    }
+
+    public function test_getDaysSinceLastOrder_ShouldIgnoreParamIfInvalid()
+    {
+        $request = $this->buildRequest(array('_ects' => 5));
+        $this->assertFalse($request->getDaysSinceLastOrder());
+    }
+
+    public function test_getDaysSinceLastVisit_shouldReturnZeroIfNow()
+    {
+        $this->assertEquals(0.0, $this->request->getDaysSinceLastVisit());
+    }
+
+    public function test_getDaysSinceLastVisit_ShouldNotReturnMinusValue()
+    {
+        $request = $this->buildRequest(array('_viewts' => '' . ($this->time + 43200)));
+        $request->setIsAuthenticated();
+        $this->assertEquals(0.0, $request->getDaysSinceLastVisit());
+    }
+
+    public function test_getDaysSinceLastVisit_TodayMinusHalfDay()
+    {
+        $request = $this->buildRequest(array('_viewts' => '' . ($this->time - 43200)));
+        $request->setIsAuthenticated();
+        $this->assertEquals(1.0, $request->getDaysSinceLastVisit());
+    }
+
+    public function test_getDaysSinceLastVisit_Yesterday()
+    {
+        $request = $this->buildRequest(array('_viewts' => '' . ($this->time - 86400)));
+        $request->setIsAuthenticated();
+        $this->assertEquals(1.0, $request->getDaysSinceLastVisit());
+    }
+
+    public function test_getDaysSinceLastVisit_12Days()
+    {
+        $request = $this->buildRequest(array('_viewts' => '' . ($this->time - (86400 * 12))));
+        $request->setIsAuthenticated();
+        $this->assertEquals(12.0, $request->getDaysSinceLastVisit());
+    }
+
+    public function test_getDaysSinceLastVisit_ShouldIgnoreParamIfInvalid()
+    {
+        $request = $this->buildRequest(array('_viewts' => '' . 5));
+        $this->assertSame(0, $request->getDaysSinceLastVisit());
+    }
+
+    public function test_getGoalRevenue_ShouldReturnDefaultValue_IfNothingSet()
+    {
+        $this->assertFalse($this->request->getGoalRevenue(false));
+    }
+
+    public function test_getGoalRevenue_ShouldReturnParam_IfSet()
+    {
+        $request = $this->buildRequest(array('revenue' => '5.51'));
+        $this->assertSame(5.51, $request->getGoalRevenue(false));
+    }
+
+    public function test_getUserIdHashed_shouldReturnSetTokenAuth()
+    {
+        $hash = $this->request->getUserIdHashed(1);
+
+        $this->assertEquals('356a192b7913b04c', $hash);
+        $this->assertSame(16, strlen($hash));
+        $this->assertTrue(ctype_alnum($hash));
+
+        $this->assertEquals('da4b9237bacccdf1', $this->request->getUserIdHashed(2));
+    }
+
+    public function test_getVisitCount_shouldReturnOne_IfNotSet()
+    {
+        $this->assertEquals(1, $this->request->getVisitCount());
+    }
+
+    public function test_getVisitCount_shouldReturnTheSetValue_IfHigherThanOne()
+    {
+        $request = $this->buildRequest(array('_idvc' => 13));
+        $this->assertEquals(13, $request->getVisitCount());
+    }
+
+    public function test_getVisitCount_shouldReturnAtLEastOneEvenIfLowerValueIsSet()
+    {
+        $request = $this->buildRequest(array('_idvc' => 0));
+        $this->assertEquals(1, $request->getVisitCount());
+
+        $request = $this->buildRequest(array('_idvc' => -1));
+        $this->assertEquals(1, $request->getVisitCount());
+    }
+
+    public function test_getLocalTime_shouldFallbackToCurrentDate_IfNoParamIsSet()
+    {
+        $this->assertEquals('02:20:17', $this->request->getLocalTime());
+    }
+
+    public function test_getLocalTime_shouldReturnAtLEastOneEvenIfLowerValueIsSet()
+    {
+        $request = $this->buildRequest(array('h' => 15, 'm' => 3, 's' => 4));
+        $this->assertEquals('15:03:04', $request->getLocalTime());
+    }
+
+    public function test_getLocalTime_shouldFallbackToPartsOfCurrentDate()
+    {
+        $request = $this->buildRequest(array('h' => 5));
+        $this->assertEquals('05:20:17', $request->getLocalTime());
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage Requested parameter myCustomFaKeParaM is not a known Tracking API Parameter
+     */
+    public function test_getParam_shouldThrowException_IfTryingToAccessInvalidParam()
+    {
+        $this->request->getParam('myCustomFaKeParaM');
+    }
+
+    public function test_getParam_aString()
+    {
+        $request = $this->buildRequest(array('url' => 'test'));
+        $this->assertEquals('test', $request->getParam('url'));
+    }
+
+    public function test_getParam_aInt()
+    {
+        $request = $this->buildRequest(array('new_visit' => '12'));
+        $this->assertSame(12, $request->getParam('new_visit'));
+    }
+
+    public function test_getPlugins_shouldReturnZeroForAllIfNothingGiven()
+    {
+        $expected = array_fill(0, 10, 0);
+
+        $this->assertEquals($expected, $this->request->getPlugins());
+    }
+
+    public function test_getPlugins_shouldReturnAllOneIfAllGiven()
+    {
+        $plugins = array('fla', 'java', 'dir', 'qt', 'realp', 'pdf', 'wma', 'gears', 'ag', 'cookie');
+        $request = $this->buildRequest(array_fill_keys($plugins, '1'));
+
+        $this->assertEquals(array_fill(0, 10, 1), $request->getPlugins());
+    }
+
+    public function test_getPlugins_shouldDetectSome()
+    {
+        $plugins = array('fla' => 1, 'java', 'dir' => '1', 'qt' => '0', 'realp' => 0, 'gears', 'ag' => 1, 'cookie');
+        $request = $this->buildRequest($plugins);
+
+        $expected = array(1, 0, 1, 0, 0, 0, 0, 0, 1, 0);
+        $this->assertEquals($expected, $request->getPlugins());
+    }
+
+    public function test_getPageGenerationTime_shouldDefaultToFalse_IfNotGiven()
+    {
+        $this->assertFalse($this->request->getPageGenerationTime());
+    }
+
+    public function test_getPageGenerationTime_shouldIgnoreAnyValueLowerThan0()
+    {
+        $request = $this->buildRequest(array('gt_ms' => '0'));
+        $this->assertFalse($request->getPageGenerationTime());
+
+        $request = $this->buildRequest(array('gt_ms' => '-5'));
+        $this->assertFalse($request->getPageGenerationTime());
+    }
+
+    public function test_getPageGenerationTime_shouldIgnoreAnyValueThatIsTooHigh()
+    {
+        $request = $this->buildRequest(array('gt_ms' => '3600002'));
+        $this->assertFalse($request->getPageGenerationTime());
+    }
+
+    public function test_getPageGenerationTime_shouldReturnAValidValue()
+    {
+        $request = $this->buildRequest(array('gt_ms' => '1942'));
+        $this->assertSame(1942, $request->getPageGenerationTime());
+    }
+
+    public function test_truncateCustomVariable_shouldNotTruncateAnything_IfValueIsShortEnough()
+    {
+        $len = CustomVariables::getMaxLengthCustomVariables();
+        $input = str_pad('test', $len - 2, 't');
+
+        $result = Request::truncateCustomVariable($input);
+
+        $this->assertSame($result, $input);
+    }
+
+    public function test_truncateCustomVariable_shouldActuallyTruncateTheValue()
+    {
+        $len = CustomVariables::getMaxLengthCustomVariables();
+        $input = str_pad('test', $len + 2, 't');
+
+        $this->assertGreaterThan(100, $len);
+
+        $truncated = Request::truncateCustomVariable($input);
+
+        $this->assertEquals(str_pad('test', $len, 't'), $truncated);
+    }
+
+    public function test_getUserAgent_ShouldReturnEmptyString_IfNoneIsSet()
+    {
+        $this->assertEquals('', $this->request->getUserAgent());
+    }
+
+    public function test_getUserAgent_ShouldDefaultToServerUa_IfPossibleAndNoneIsSet()
+    {
+        $_SERVER['HTTP_USER_AGENT'] = 'MyUserAgent';
+        $this->assertSame('MyUserAgent', $this->request->getUserAgent());
+        unset($_SERVER['HTTP_USER_AGENT']);
+    }
+
+    public function test_getUserAgent_ShouldReturnTheUaFromParams_IfOneIsSet()
+    {
+        $request = $this->buildRequest(array('idsite' => '14', 'ua' => 'My Custom UA'));
+        $this->assertSame('My Custom UA', $request->getUserAgent());
+    }
+
+    public function test_getBrowserLanguage_ShouldReturnACustomSetLangParam_IfOneIsSet()
+    {
+        $request = $this->buildRequest(array('lang' => 'CusToMLang'));
+        $this->assertSame('CusToMLang', $request->getBrowserLanguage());
+    }
+
+    public function test_getBrowserLanguage_ShouldReturnADefaultLanguageInCaseNoneIsSet()
+    {
+        $envLanguage = getenv('LANG');
+        putenv('LANG=en');
+
+        $lang = $this->request->getBrowserLanguage();
+        $this->assertNotEmpty($lang);
+        $this->assertTrue(2 <= strlen($lang) && strlen($lang) <= 10);
+
+        if ($envLanguage !== false) {
+            putenv('LANG=' . $envLanguage);
+        }
+    }
+
+    public function test_makeThirdPartyCookie_ShouldReturnAnInstanceOfCookie()
+    {
+        $cookie = $this->request->makeThirdPartyCookie();
+
+        $this->assertTrue($cookie instanceof Cookie);
+    }
+
+    public function test_makeThirdPartyCookie_ShouldPreconfigureTheCookieInstance()
+    {
+        $cookie = $this->request->makeThirdPartyCookie();
+
+        $this->assertCookieContains('COOKIE _pk_uid', $cookie);
+        $this->assertCookieContains('expire: 1450750817', $cookie);
+        $this->assertCookieContains('path: ,', $cookie);
+    }
+
+    private function assertCookieContains($needle, Cookie $cookie)
+    {
+        $this->assertContains($needle, $cookie . '');
+    }
+
+    public function test_getIdSite()
+    {
+        $request = $this->buildRequest(array('idsite' => '14'));
+        $this->assertSame(14, $request->getIdSite());
+    }
+
+    public function test_getIdSite_shouldTriggerEventAndReturnThatIdSite()
+    {
+        $self = $this;
+        Piwik::addAction('Tracker.Request.getIdSite', function (&$idSite, $params) use ($self) {
+            $self->assertSame(14, $idSite);
+            $self->assertEquals(array('idsite' => '14'), $params);
+            $idSite = 12;
+        });
+
+        $request = $this->buildRequest(array('idsite' => '14'));
+        $this->assertSame(12, $request->getIdSite());
+    }
+
+    /**
+     * @expectedException \Piwik\Exception\UnexpectedWebsiteFoundException
+     * @expectedExceptionMessage Invalid idSite: '0'
+     */
+    public function test_getIdSite_shouldThrowException_IfValueIsZero()
+    {
+        $request = $this->buildRequest(array('idsite' => '0'));
+        $request->getIdSite();
+    }
+
+    /**
+     * @expectedException \Piwik\Exception\UnexpectedWebsiteFoundException
+     * @expectedExceptionMessage Invalid idSite: '-1'
+     */
+    public function test_getIdSite_shouldThrowException_IfValueIsLowerThanZero()
+    {
+        $request = $this->buildRequest(array('idsite' => '-1'));
+        $request->getIdSite();
+    }
+
+    public function test_getIpString_ShouldDefaultToServerAddress()
+    {
+        $this->assertEquals($_SERVER['REMOTE_ADDR'], $this->request->getIpString());
+    }
+
+    public function test_getIpString_ShouldDefaultToServerAddress_IfCustomIpIsSetButNotAuthenticated()
+    {
+        $request = $this->buildRequest(array('cip' => '192.192.192.192'));
+        $this->assertEquals($_SERVER['REMOTE_ADDR'], $request->getIpString());
+    }
+
+    public function test_getIpString_ShouldReturnCustomIp_IfAuthenticated()
+    {
+        $request = $this->buildRequest(array('cip' => '192.192.192.192'));
+        $request->setIsAuthenticated();
+        $this->assertEquals('192.192.192.192', $request->getIpString());
+    }
+
+    public function test_getIp()
+    {
+        $ip = $_SERVER['REMOTE_ADDR'];
+        $this->assertEquals(IPUtils::stringToBinaryIP($ip), $this->request->getIp());
+    }
+
+    public function test_getCookieName_ShouldReturnConfigValue()
+    {
+        $this->assertEquals('_pk_uid', $this->request->getCookieName());
+    }
+
+    public function test_getCookieExpire_ShouldReturnConfigValue()
+    {
+        $this->assertEquals($this->time + (60 * 60 * 24 * 393), $this->request->getCookieExpire());
+    }
+
+    public function test_getCookiePath_ShouldBeEmptyByDefault()
+    {
+        $this->assertEquals('', $this->request->getCookiePath());
+    }
+
+    public function test_getCookiePath_ShouldReturnConfigValue()
+    {
+        $oldPath = TrackerConfig::getConfigValue('cookie_path');
+        TrackerConfig::setConfigValue('cookie_path', 'test');
+
+        $this->assertEquals('test', $this->request->getCookiePath());
+
+        TrackerConfig::setConfigValue('cookie_path', $oldPath);
+    }
+
+    private function buildRequest($params)
+    {
+        $request = new TestRequest($params);
+        $request->setCurrentTimestamp($this->time);
+
+        return $request;
+    }
+
+    private function buildRequestWithToken($params, $token)
+    {
+        return new TestRequest($params, $token);
+    }
+
+
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Unit/Tracker/ResponseTest.php b/tests/PHPUnit/Unit/Tracker/ResponseTest.php
new file mode 100644
index 0000000000..9a1d1f28f7
--- /dev/null
+++ b/tests/PHPUnit/Unit/Tracker/ResponseTest.php
@@ -0,0 +1,178 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Unit\Tracker;
+
+use Piwik\Common;
+use Piwik\Tests\Framework\Fixture;
+use Piwik\Tracker\Response;
+use Piwik\Tests\Framework\Mock\Tracker;
+use Piwik\Tests\Framework\TestCase\UnitTestCase;
+use Exception;
+
+class TestResponse extends Response {
+
+    protected function logExceptionToErrorLog(Exception $e)
+    {
+        // prevent console from outputting the error_log message
+    }
+
+    public function getMessageFromException($e)
+    {
+        return parent::getMessageFromException($e);
+    }
+}
+
+/**
+ * @group BulkTracking
+ * @group ResponseTest
+ * @group Plugins
+ * @group Tracker
+ */
+class ResponseTest extends UnitTestCase
+{
+    /**
+     * @var TestResponse
+     */
+    private $response;
+
+    public function setUp()
+    {
+        parent::setUp();
+        $this->response = new TestResponse();
+    }
+
+    public function test_outputException_shouldAlwaysOutputApiResponse_IfDebugModeIsDisabled()
+    {
+        $this->response->init($this->getTracker());
+        $this->response->outputException($this->getTracker(), new Exception('My Custom Message'), 400);
+
+        Fixture::checkResponse($this->response->getOutput());
+    }
+
+    public function test_outputException_shouldOutputDebugMessageIfEnabled()
+    {
+        $tracker = $this->getTracker();
+        $this->response->init($tracker);
+
+        $tracker->enableDebugMode();
+
+        $this->response->outputException($tracker, new Exception('My Custom Message'), 400);
+
+        $content = $this->response->getOutput();
+
+        $this->assertContains('<title>Piwik &rsaquo; Error</title>', $content);
+        $this->assertContains('<p>My Custom Message', $content);
+    }
+
+    public function test_outputResponse_shouldOutputStandardApiResponse()
+    {
+        $this->response->init($this->getTracker());
+        $this->response->outputResponse($this->getTracker());
+
+        Fixture::checkResponse($this->response->getOutput());
+    }
+
+    public function test_outputResponse_shouldNotOutputApiResponse_IfDebugModeIsEnabled_AsWePrintOtherStuff()
+    {
+        $this->response->init($this->getTracker());
+
+        $tracker = $this->getTracker();
+        $tracker->enableDebugMode();
+        $this->response->outputResponse($tracker);
+
+        $this->assertEquals('', $this->response->getOutput());
+    }
+
+    public function test_outputResponse_shouldNotOutputApiResponse_IfSomethingWasPrintedUpfront()
+    {
+        $this->response->init($this->getTracker());
+
+        echo 5;
+        $this->response->outputResponse($this->getTracker());
+
+        $this->assertEquals('5', $this->response->getOutput());
+    }
+
+    public function test_outputResponse_shouldNotOutputResponseTwice_IfExceptionWasAlreadyOutput()
+    {
+        $this->response->init($this->getTracker());
+
+        $this->response->outputException($this->getTracker(), new Exception('My Custom Message'), 400);
+        $this->response->outputResponse($this->getTracker());
+
+        Fixture::checkResponse($this->response->getOutput());
+    }
+
+    public function test_outputResponse_shouldOutputNoResponse_If204HeaderIsRequested()
+    {
+        $this->response->init($this->getTracker());
+
+        $_GET['send_image'] = '0';
+        $this->response->outputResponse($this->getTracker());
+        unset($_GET['send_image']);
+
+        $this->assertEquals('', $this->response->getOutput());
+    }
+
+    public function test_outputResponse_shouldOutputPiwikMessage_InCaseNothingWasTracked()
+    {
+        $this->response->init($this->getTracker());
+
+        $tracker = $this->getTracker();
+        $tracker->setCountOfLoggedRequests(0);
+        $this->response->outputResponse($tracker);
+
+        $this->assertEquals("<a href='/'>Piwik</a> is a free/libre web <a href='http://piwik.org'>analytics</a> that lets you keep control of your data.",
+            $this->response->getOutput());
+    }
+
+    public function test_getMessageFromException_ShouldNotOutputAnyDetails_IfErrorContainsDbCredentials()
+    {
+        $message = $this->response->getMessageFromException(new Exception('Test Message', 1044));
+        $this->assertStringStartsWith("Error while connecting to the Piwik database", $message);
+
+        $message = $this->response->getMessageFromException(new Exception('Test Message', 42000));
+        $this->assertStringStartsWith("Error while connecting to the Piwik database", $message);
+    }
+
+    public function test_getMessageFromException_ShouldReturnMessageAndTrace_InCaseIsCli()
+    {
+        $message = $this->response->getMessageFromException(new Exception('Test Message', 8150));
+        $this->assertStringStartsWith("Test Message\n#0 [internal function]", $message);
+    }
+
+    public function test_getMessageFromException_ShouldOnlyReturnMessage_InCaseIsNotCli()
+    {
+        Common::$isCliMode = false;
+        $message = $this->response->getMessageFromException(new Exception('Test Message', 8150));
+        Common::$isCliMode = true;
+
+        $this->assertStringStartsWith("Test Message", $message);
+    }
+
+    public function test_outputResponse_shouldOutputApiResponse_IfTrackerIsDisabled()
+    {
+        $this->response->init($this->getTracker());
+
+        $tracker = $this->getTracker();
+        $tracker->setCountOfLoggedRequests(0);
+        $tracker->disableShouldRecordStatistics();
+        $this->response->outputResponse($tracker);
+
+        Fixture::checkResponse($this->response->getOutput());
+    }
+
+    private function getTracker()
+    {
+        $tracker = new Tracker();
+        $tracker->setCountOfLoggedRequests(5);
+        return $tracker;
+    }
+
+}
diff --git a/tests/PHPUnit/Unit/TrackerTest.php b/tests/PHPUnit/Unit/TrackerTest.php
new file mode 100644
index 0000000000..084ee627de
--- /dev/null
+++ b/tests/PHPUnit/Unit/TrackerTest.php
@@ -0,0 +1,274 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Unit;
+
+use Piwik\EventDispatcher;
+use Piwik\Piwik;
+use Piwik\Tracker\Request;
+use Piwik\Tests\Framework\Mock\Tracker\Handler;
+use Piwik\Tests\Framework\Mock\Tracker\RequestSet;
+use Piwik\Tests\Framework\TestCase\UnitTestCase;
+use Piwik\Tracker;
+use Piwik\Translate;
+
+class TestTracker extends Tracker
+{
+    public function __construct()
+    {
+        $this->record = true;
+    }
+
+    public function shouldRecordStatistics()
+    {
+        return $this->record;
+    }
+
+    public function disalbeRecordStatistics()
+    {
+        $this->record = false;
+    }
+}
+
+/**
+ * @group TrackerTest
+ * @group Tracker
+ */
+class TrackerTest extends UnitTestCase
+{
+    /**
+     * @var TestTracker
+     */
+    private $tracker;
+
+    /**
+     * @var Handler
+     */
+    private $handler;
+
+    /**
+     * @var RequestSet
+     */
+    private $requestSet;
+
+    private $time;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->time = time();
+        $this->tracker = new TestTracker();
+        $this->handler = new Handler();
+        $this->requestSet = new RequestSet();
+        $this->requestSet->setRequests(array($this->buildRequest(1), $this->buildRequest(1)));
+    }
+
+    public function tearDown()
+    {
+        EventDispatcher::getInstance()->clearObservers('Tracker.end');
+        parent::tearDown();
+    }
+
+    public function test_isDebugModeEnabled_shouldReturnFalse_ByDefault()
+    {
+        unset($GLOBALS['PIWIK_TRACKER_DEBUG']);
+        $this->assertFalse($this->tracker->isDebugModeEnabled());
+    }
+
+    public function test_isDebugModeEnabled_shouldReturnFalse_IfDisabled()
+    {
+        $GLOBALS['PIWIK_TRACKER_DEBUG'] = false;
+
+        $this->assertFalse($this->tracker->isDebugModeEnabled());
+
+        unset($GLOBALS['PIWIK_TRACKER_DEBUG']);
+    }
+
+    public function test_isDebugModeEnabled_shouldReturnTrue_IfEnabled()
+    {
+        $GLOBALS['PIWIK_TRACKER_DEBUG'] = true;
+
+        $this->assertTrue($this->tracker->isDebugModeEnabled());
+
+        unset($GLOBALS['PIWIK_TRACKER_DEBUG']);
+    }
+
+    public function test_main_shouldReturnFinishedResponse()
+    {
+        $response = $this->tracker->main($this->handler, $this->requestSet);
+
+        $this->assertEquals('My Rendered Content', $response);
+    }
+
+    public function test_main_shouldReturnResponse_EvenWhenThereWasAnExceptionDuringProcess()
+    {
+        $this->handler->enableTriggerExceptionInProcess();
+        $response = $this->tracker->main($this->handler, $this->requestSet);
+
+        $this->assertEquals('My Exception During Process', $response);
+    }
+
+    public function test_main_shouldReturnResponse_EvenWhenThereWasAnExceptionDuringInitRequests()
+    {
+        $this->requestSet->enableThrowExceptionOnInit();
+        $response = $this->tracker->main($this->handler, $this->requestSet);
+
+        $this->assertEquals('Init requests and token auth exception', $response);
+    }
+
+    public function test_main_shouldTriggerHandlerInitAndFinishEvent()
+    {
+        $this->tracker->main($this->handler, $this->requestSet);
+
+        $this->assertTrue($this->handler->isInit);
+        $this->assertTrue($this->handler->isProcessed);
+        $this->assertTrue($this->handler->isFinished);
+        $this->assertFalse($this->handler->isOnException);
+    }
+
+    public function test_main_shouldTriggerHandlerInitAndFinishEvent_EvenIfShouldNotRecordStats()
+    {
+        $this->tracker->disalbeRecordStatistics();
+        $this->tracker->main($this->handler, $this->requestSet);
+
+        $this->assertTrue($this->handler->isInit);
+        $this->assertFalse($this->handler->isProcessed);
+        $this->assertTrue($this->handler->isFinished);
+        $this->assertFalse($this->handler->isOnException);
+    }
+
+    public function test_main_shouldTriggerHandlerInitAndFinishEvent_EvenIfThereIsAnException()
+    {
+        $this->handler->enableTriggerExceptionInProcess();
+        $this->tracker->main($this->handler, $this->requestSet);
+
+        $this->assertTrue($this->handler->isInit);
+        $this->assertTrue($this->handler->isFinished);
+        $this->assertTrue($this->handler->isOnException);
+    }
+
+    public function test_main_shouldPostEndEvent()
+    {
+        $called = false;
+        Piwik::addAction('Tracker.end', function () use (&$called) {
+            $called = true;
+        });
+
+        $this->tracker->main($this->handler, $this->requestSet);
+
+        $this->assertTrue($called);
+    }
+
+    public function test_main_shouldPostEndEvent_EvenIfShouldNotRecordStats()
+    {
+        $called = false;
+        Piwik::addAction('Tracker.end', function () use (&$called) {
+            $called = true;
+        });
+
+        $this->tracker->disalbeRecordStatistics();
+        $this->tracker->main($this->handler, $this->requestSet);
+
+        $this->assertFalse($this->handler->isProcessed);
+        $this->assertTrue($called);
+    }
+
+    public function test_main_shouldPostEndEvent_EvenIfThereIsAnException()
+    {
+        $called = false;
+        Piwik::addAction('Tracker.end', function () use (&$called) {
+            $called = true;
+        });
+
+        $this->handler->enableTriggerExceptionInProcess();
+        $this->tracker->main($this->handler, $this->requestSet);
+
+        $this->assertTrue($this->handler->isOnException);
+        $this->assertTrue($called);
+    }
+
+    public function test_track_shouldTrack_IfThereAreRequests()
+    {
+        $this->tracker->track($this->handler, $this->requestSet);
+
+        $this->assertTrue($this->handler->isOnStartTrackRequests);
+        $this->assertTrue($this->handler->isProcessed);
+        $this->assertTrue($this->handler->isOnAllRequestsTracked);
+        $this->assertFalse($this->handler->isOnException);
+    }
+
+    public function test_track_shouldNotTrackAnything_IfTrackingIsDisabled()
+    {
+        $this->tracker->disalbeRecordStatistics();
+        $this->tracker->track($this->handler, $this->requestSet);
+
+        $this->assertFalse($this->handler->isOnStartTrackRequests);
+        $this->assertFalse($this->handler->isProcessed);
+        $this->assertFalse($this->handler->isOnAllRequestsTracked);
+        $this->assertFalse($this->handler->isOnException);
+    }
+
+    public function test_track_shouldNotTrackAnything_IfNoRequestsAreSet()
+    {
+        $this->requestSet->setRequests(array());
+        $this->tracker->track($this->handler, $this->requestSet);
+
+        $this->assertFalse($this->handler->isOnStartTrackRequests);
+        $this->assertFalse($this->handler->isProcessed);
+        $this->assertFalse($this->handler->isOnAllRequestsTracked);
+        $this->assertFalse($this->handler->isOnException);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedException My Exception During Process
+     */
+    public function test_track_shouldNotCatchAnyException_IfExceptionWasThrown()
+    {
+        $this->handler->enableTriggerExceptionInProcess();
+        $this->tracker->track($this->handler, $this->requestSet);
+    }
+
+    public function test_getCountOfLoggedRequests_shouldReturnZero_WhenNothingTracked()
+    {
+        $this->assertEquals(0, $this->tracker->getCountOfLoggedRequests());
+    }
+
+    public function test_hasLoggedRequests_shouldReturnFalse_WhenNothingTracked()
+    {
+        $this->assertFalse($this->tracker->hasLoggedRequests());
+    }
+
+    public function test_setCountOfLoggedRequests_shouldOverwriteNumberOfLoggedRequests()
+    {
+        $this->tracker->setCountOfLoggedRequests(5);
+        $this->assertEquals(5, $this->tracker->getCountOfLoggedRequests());
+    }
+
+    public function test_hasLoggedRequests_shouldReturnTrue_WhenSomeRequestsWereLogged()
+    {
+        $this->tracker->setCountOfLoggedRequests(1);
+        $this->assertTrue($this->tracker->hasLoggedRequests());
+
+        $this->tracker->setCountOfLoggedRequests(5);
+        $this->assertTrue($this->tracker->hasLoggedRequests());
+
+        $this->tracker->setCountOfLoggedRequests(0);
+        $this->assertFalse($this->tracker->hasLoggedRequests());
+    }
+
+    private function buildRequest($idsite)
+    {
+        $request = new Request(array('idsite' => $idsite));
+        $request->setCurrentTimestamp($this->time);
+
+        return $request;
+    }
+
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Unit/Translate/Filter/ByBaseTranslationsTest.php b/tests/PHPUnit/Unit/Translate/Filter/ByBaseTranslationsTest.php
deleted file mode 100644
index 5cec2c7ca7..0000000000
--- a/tests/PHPUnit/Unit/Translate/Filter/ByBaseTranslationsTest.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-namespace Piwik\Tests\Unit\Translate\Filter;
-
-use Piwik\Translate\Filter\ByBaseTranslations;
-
-class ByBaseTranslationsTest extends \PHPUnit_Framework_TestCase
-{
-    public function getFilterTestData()
-    {
-        return array(
-            // empty stays empty
-            array(
-                array(),
-                array(),
-                array(),
-                array()
-            ),
-            // empty plugin is removed
-            array(
-                array(
-                    'test' => array()
-                ),
-                array(),
-                array(),
-                array(
-                    'test' => array()
-                ),
-            ),
-            // not existing values/plugins are removed
-            array(
-                array(
-                    'test' => array(
-                        'key' => 'value',
-                        'test' => 'test'
-                    )
-                ),
-                array(
-                    'test' => array(
-                        'key' => 'value',
-                        'x'   => 'y'
-                    )
-                ),
-                array(
-                    'test' => array(
-                        'key' => 'value',
-                    )
-                ),
-                array(
-                    'test' => array(
-                        'test' => 'test',
-                    )
-                ),
-            ),
-            // no change if all exist
-            array(
-                array(
-                    'test' => array(
-                        'test' => 'test'
-                    )
-                ),
-                array(
-                    'test' => array(
-                        'test' => 'test'
-                    )
-                ),
-                array(
-                    'test' => array(
-                        'test' => 'test'
-                    )
-                ),
-                array()
-            ),
-            // unavailable removed, others stay
-            array(
-                array(
-                    'empty' => array(
-                        'test' => 'test'
-                    ),
-                    'test' => array(
-                        'test' => 'test',
-                        'empty' => '     ',
-                    )
-                ),
-                array(
-                    'empty' => array(
-                        'test' => 'test'
-                    ),
-                    'test' => array(
-                        'test' => 'test',
-                    )
-                ),
-                array(
-                    'empty' => array(
-                        'test' => 'test'
-                    ),
-                    'test' => array(
-                        'test' => 'test'
-                    )
-                ),
-                array(
-                    'test' => array(
-                        'empty' => '     ',
-                    )
-                )
-            ),
-            array(
-                array(
-                    'empty' => array(
-                        'test' => 'test'
-                    ),
-                    'test' => array(
-                        'test' => 'test',
-                        'empty' => '     ',
-                    )
-                ),
-                array(
-                    'empty' => array(
-                        'bla' => 'test'
-                    ),
-                    'test' => array(
-                        'test' => 'test',
-                    )
-                ),
-                array(
-                    'test' => array(
-                        'test' => 'test'
-                    )
-                ),
-                array(
-                    'empty' => array(
-                        'test' => 'test'
-                    ),
-                    'test' => array(
-                        'empty' => '     ',
-                    )
-                )
-            ),
-        );
-    }
-
-    /**
-     * @dataProvider getFilterTestData
-     * @group Core
-     */
-    public function testFilter($translations, $baseTranslations, $expected, $filteredData)
-    {
-        $filter = new ByBaseTranslations($baseTranslations);
-        $result = $filter->filter($translations);
-        $this->assertEquals($expected, $result);
-        $this->assertEquals($filteredData, $filter->getFilteredData());
-    }
-}
diff --git a/tests/PHPUnit/Unit/Translate/Filter/ByParameterCountTest.php b/tests/PHPUnit/Unit/Translate/Filter/ByParameterCountTest.php
deleted file mode 100644
index b014b0a9f1..0000000000
--- a/tests/PHPUnit/Unit/Translate/Filter/ByParameterCountTest.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-namespace Piwik\Tests\Unit\Translate\Filter;
-
-use Piwik\Translate\Filter\ByParameterCount;
-
-/**
- * @group ByParameterCountTest
- */
-class ByParameterCountTest extends \PHPUnit_Framework_TestCase
-{
-    public function getFilterTestData()
-    {
-        return array(
-            // empty stays empty - nothing to filter
-            array(
-                array(),
-                array(),
-                array(),
-                array()
-            ),
-            // empty plugin is removed
-            array(
-                array(
-                    'test' => array()
-                ),
-                array(),
-                array(),
-                array(),
-            ),
-            // value with %s will be removed, as it isn't there in base
-            array(
-                array(
-                    'test' => array(
-                        'key' => 'val%sue',
-                        'test' => 'test'
-                    )
-                ),
-                array(
-                    'test' => array(
-                        'key' => 'value',
-                    )
-                ),
-                array(),
-                array(
-                    'test' => array(
-                        'key' => 'val%sue',
-                    )
-                ),
-            ),
-            // no change if placeholder count is the same
-            array(
-                array(
-                    'test' => array(
-                        'test' => 'te%sst'
-                    )
-                ),
-                array(
-                    'test' => array(
-                        'test' => 'test%s'
-                    )
-                ),
-                array(
-                    'test' => array(
-                        'test' => 'te%sst'
-                    )
-                ),
-                array()
-            ),
-            // missing placeholder will be removed
-            array(
-                array(
-                    'empty' => array(
-                        'test' => 't%1$sest'
-                    ),
-                    'test' => array(
-                        'test' => '%1$stest',
-                        'empty' => '     ',
-                    )
-                ),
-                array(
-                    'empty' => array(
-                        'test' => 'test%1$s'
-                    ),
-                    'test' => array(
-                        'test' => '%1$stest%2$s',
-                    )
-                ),
-                array(
-                    'empty' => array(
-                        'test' => 't%1$sest'
-                    ),
-                ),
-                array(
-                    'test' => array(
-                        'test' => '%1$stest',
-                    )
-                )
-            ),
-        );
-    }
-
-    /**
-     * @dataProvider getFilterTestData
-     * @group Core
-     */
-    public function testFilter($translations, $baseTranslations, $expected, $filteredData)
-    {
-        $filter = new ByParameterCount($baseTranslations);
-        $result = $filter->filter($translations);
-        $message = sprintf("got %s but expected %s", var_export($result, true), var_export($expected, true));
-        $this->assertEquals($expected, $result, $message);
-        $this->assertEquals($filteredData, $filter->getFilteredData());
-    }
-}
diff --git a/tests/PHPUnit/Unit/Translate/Filter/EmptyTranslationsTest.php b/tests/PHPUnit/Unit/Translate/Filter/EmptyTranslationsTest.php
deleted file mode 100644
index 47ec5348db..0000000000
--- a/tests/PHPUnit/Unit/Translate/Filter/EmptyTranslationsTest.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-namespace Piwik\Tests\Unit\Translate\Filter;
-
-use Piwik\Translate\Filter\EmptyTranslations;
-
-class EmptyTranslationsTest extends \PHPUnit_Framework_TestCase
-{
-    public function getFilterTestData()
-    {
-        return array(
-            // empty stays empty
-            array(
-                array(),
-                array(),
-                array()
-            ),
-            // empty plugin is removed
-            array(
-                array(
-                    'test' => array()
-                ),
-                array(),
-                array(),
-            ),
-            // empty values/plugins are removed
-            array(
-                array(
-                    'test' => array(
-                        'empty' => '',
-                        'whitespace' => '    '
-                    )
-                ),
-                array(),
-                array(
-                    'test' => array(
-                        'empty' => '',
-                        'whitespace' => '    '
-                    )
-                ),
-            ),
-            // no change if no empty value
-            array(
-                array(
-                    'test' => array(
-                        'test' => 'test'
-                    )
-                ),
-                array(
-                    'test' => array(
-                        'test' => 'test'
-                    )
-                ),
-                array()
-            ),
-            // empty values are removed, others stay
-            array(
-                array(
-                    'empty' => array(),
-                    'test' => array(
-                        'test' => 'test',
-                        'empty' => '     ',
-                    )
-                ),
-                array(
-                    'test' => array(
-                        'test' => 'test'
-                    )
-                ),
-                array(
-                    'test' => array(
-                        'empty' => '     ',
-                    )
-                )
-            ),
-        );
-    }
-
-    /**
-     * @dataProvider getFilterTestData
-     * @group Core
-     */
-    public function testFilter($translations, $expected, $filteredData)
-    {
-        $filter = new EmptyTranslations();
-        $result = $filter->filter($translations);
-        $this->assertEquals($expected, $result);
-        $this->assertEquals($filteredData, $filter->getFilteredData());
-    }
-}
diff --git a/tests/PHPUnit/Unit/Translate/Filter/EncodedEntitiesTest.php b/tests/PHPUnit/Unit/Translate/Filter/EncodedEntitiesTest.php
deleted file mode 100644
index 19ceb5f784..0000000000
--- a/tests/PHPUnit/Unit/Translate/Filter/EncodedEntitiesTest.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-namespace Piwik\Tests\Unit\Translate\Filter;
-
-use Piwik\Translate\Filter\EncodedEntities;
-
-class EncodedEntitiesTest extends \PHPUnit_Framework_TestCase
-{
-    public function getFilterTestData()
-    {
-        return array(
-            // empty stays empty - nothing to filter
-            array(
-                array(),
-                array(),
-                array()
-            ),
-            // empty plugin is removed
-            array(
-                array(
-                    'test' => array()
-                ),
-                array(
-                    'test' => array()
-                ),
-                array(),
-            ),
-            // no entites - nothing to filter
-            array(
-                array(
-                    'test' => array(
-                        'key' => 'val%sue',
-                        'test' => 'test'
-                    )
-                ),
-                array(
-                    'test' => array(
-                        'key' => 'val%sue',
-                        'test' => 'test'
-                    )
-                ),
-                array(),
-            ),
-            // entities needs to be decodded
-            array(
-                array(
-                    'test' => array(
-                        'test' => 'te&amp;st'
-                    )
-                ),
-                array(
-                    'test' => array(
-                        'test' => 'te&st'
-                    )
-                ),
-                array(
-                    'test' => array(
-                        'test' => 'te&amp;st'
-                    )
-                ),
-            ),
-            array(
-                array(
-                    'empty' => array(
-                        'test' => 't&uuml;sest'
-                    ),
-                    'test' => array(
-                        'test' => '%1$stest',
-                        'empty' => '&tilde;',
-                    )
-                ),
-                array(
-                    'empty' => array(
-                        'test' => 'tüsest'
-                    ),
-                    'test' => array(
-                        'test' => '%1$stest',
-                        'empty' => '˜',
-                    )
-                ),
-                array(
-                    'empty' => array(
-                        'test' => 't&uuml;sest'
-                    ),
-                    'test' => array(
-                        'empty' => '&tilde;',
-                    )
-                ),
-            ),
-        );
-    }
-
-    /**
-     * @dataProvider getFilterTestData
-     * @group Core
-     */
-    public function testFilter($translations, $expected, $filteredData)
-    {
-        $filter = new EncodedEntities();
-        $result = $filter->filter($translations);
-        $this->assertEquals($expected, $result);
-        $this->assertEquals($filteredData, $filter->getFilteredData());
-    }
-}
diff --git a/tests/PHPUnit/Unit/Translate/Filter/UnnecassaryWhitespacesTest.php b/tests/PHPUnit/Unit/Translate/Filter/UnnecassaryWhitespacesTest.php
deleted file mode 100644
index 77cecf7e77..0000000000
--- a/tests/PHPUnit/Unit/Translate/Filter/UnnecassaryWhitespacesTest.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-namespace Piwik\Tests\Unit\Translate\Filter;
-
-use Piwik\Translate\Filter\UnnecassaryWhitespaces;
-
-class UnnecassaryWhitepsacesTest extends \PHPUnit_Framework_TestCase
-{
-    public function getFilterTestData()
-    {
-        return array(
-            // empty stays empty - nothing to filter
-            array(
-                array(),
-                array(),
-                array(),
-                array()
-            ),
-            // no entites - nothing to filter
-            array(
-                array(
-                    'test' => array(
-                        'key' => "val\n\n\r\n\nue",
-                        'test' => 'test'
-                    )
-                ),
-                array(
-                    'test' => array(
-                        'key' => "base val\n\nue",
-                        'test' => 'test'
-                    )
-                ),
-                array(
-                    'test' => array(
-                        'key' => "val\n\nue",
-                        'test' => 'test'
-                    )
-                ),
-                array(
-                    'test' => array(
-                        'key' => "val\n\n\r\n\nue",
-                    )
-
-                ),
-            ),
-            // entities needs to be decodded
-            array(
-                array(
-                    'test' => array(
-                        'test' => 'test                        palim'
-                    )
-                ),
-                array(
-                    'test' => array(
-                        'test' => 'no line breaks'
-                    )
-                ),
-                array(
-                    'test' => array(
-                        'test' => 'test palim'
-                    )
-                ),
-                array(
-                    'test' => array(
-                        'test' => 'test                        palim'
-                    )
-                ),
-            ),
-            array(
-                array(
-                    'empty' => array(
-                        'test' => "test\n\n\ntest"
-                    ),
-                ),
-                array(
-                    'empty' => array(
-                        'test' => 'no line break'
-                    ),
-                ),
-                array(
-                    'empty' => array(
-                        'test' => 'test test'
-                    ),
-                ),
-                array(
-                    'empty' => array(
-                        'test' => "test\n\n\ntest"
-                    ),
-                ),
-            ),
-            array(
-                array(
-                    'empty' => array(
-                        'test' => "test\n         \n\n      test"
-                    ),
-                ),
-                array(
-                    'empty' => array(
-                        'test' => 'no line break'
-                    ),
-                ),
-                array(
-                    'empty' => array(
-                        'test' => 'test test'
-                    ),
-                ),
-                array(
-                    'empty' => array(
-                        'test' => "test\n         \n\n      test"
-                    ),
-                ),
-            ),
-            array(
-                array(
-                    'empty' => array(
-                        'test' => "test\n         \n\n      test"
-                    ),
-                ),
-                array(
-                    'empty' => array(
-                        'test' => "line\n break"
-                    ),
-                ),
-                array(
-                    'empty' => array(
-                        'test' => "test\n\ntest"
-                    ),
-                ),
-                array(
-                    'empty' => array(
-                        'test' => "test\n         \n\n      test"
-                    ),
-                ),
-            ),
-        );
-    }
-
-    /**
-     * @dataProvider getFilterTestData
-     * @group Core
-     */
-    public function testFilter($translations, $baseTranslations, $expected, $filteredData)
-    {
-        $filter = new UnnecassaryWhitespaces($baseTranslations);
-        $result = $filter->filter($translations);
-        $this->assertEquals($expected, $result);
-        $this->assertEquals($filteredData, $filter->getFilteredData());
-    }
-}
diff --git a/tests/PHPUnit/Unit/Translate/Validate/CoreTranslationsTest.php b/tests/PHPUnit/Unit/Translate/Validate/CoreTranslationsTest.php
deleted file mode 100644
index 258267fd3e..0000000000
--- a/tests/PHPUnit/Unit/Translate/Validate/CoreTranslationsTest.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-namespace Piwik\Tests\Unit\Translate\Validate;
-
-use Piwik\Translate\Validate\CoreTranslations;
-
-class CoreTranslationsTest extends \PHPUnit_Framework_TestCase
-{
-    public function setUp()
-    {
-        include PIWIK_INCLUDE_PATH . '/core/DataFiles/Languages.php';
-        include PIWIK_INCLUDE_PATH . '/core/DataFiles/Countries.php';
-    }
-
-    public function getFilterTestDataValid()
-    {
-        return array(
-            array(
-                array(
-                    'General' => array_merge(array_fill(0, 251, 'test'), array(
-                                                                              'Locale'          => 'de_DE.UTF-8',
-                                                                              'TranslatorName'  => 'name',
-                                                                              'TranslatorEmail' => 'email',
-                                                                         )
-                    )
-                ),
-            )
-        );
-    }
-
-    /**
-     * @dataProvider getFilterTestDataValid
-     * @group Core
-     */
-    public function testFilterValid($translations)
-    {
-        $filter = new CoreTranslations();
-        $result = $filter->isValid($translations);
-        $this->assertTrue($result);
-    }
-
-    public function getFilterTestDataInvalid()
-    {
-        return array(
-            array(
-                array(
-                    'General' => array(
-                        'bla' => 'test text'
-                    )
-                ),
-                CoreTranslations::ERRORSTATE_LOCALEREQUIRED
-            ),
-            array(
-                array(
-                    'General' => array(
-                        'Locale' => 'de_DE.UTF-8'
-                    )
-                ),
-                CoreTranslations::ERRORSTATE_TRANSLATORINFOREQUIRED
-            ),
-            array(
-                array(
-                    'General' => array(
-                        'Locale' => 'de_DE.UTF-8',
-                        'TranslatorName' => 'name',
-                    )
-                ),
-                CoreTranslations::ERRORSTATE_TRANSLATOREMAILREQUIRED
-            ),
-            array(
-                array(
-                    'General' => array(
-                        'Locale' => 'de_DE.UTF-8',
-                        'TranslatorName' => 'name',
-                        'TranslatorEmail' => 'emails',
-                        'LayoutDirection' => 'afd'
-                    )
-                ),
-                CoreTranslations::ERRORSTATE_LAYOUTDIRECTIONINVALID
-            ),
-            array(
-                array(
-                    'General' => array(
-                        'Locale' => 'invalid',
-                        'TranslatorName' => 'name',
-                        'TranslatorEmail' => 'emails',
-                        'LayoutDirection' => 'ltr'
-                    )
-                ),
-                CoreTranslations::ERRORSTATE_LOCALEINVALID
-            ),
-            array(
-                array(
-                    'General' => array(
-                        'Locale' => 'xx_DE.UTF-8',
-                        'TranslatorName' => 'name',
-                        'TranslatorEmail' => 'emails',
-                        'LayoutDirection' => 'ltr'
-                    )
-                ),
-                CoreTranslations::ERRORSTATE_LOCALEINVALIDLANGUAGE
-            ),
-            array(
-                array(
-                    'General' => array(
-                        'Locale' => 'de_XX.UTF-8',
-                        'TranslatorName' => 'name',
-                        'TranslatorEmail' => 'emails',
-                        'LayoutDirection' => 'ltr'
-                    )
-                ),
-                CoreTranslations::ERRORSTATE_LOCALEINVALIDCOUNTRY
-            ),
-        );
-    }
-
-    /**
-     * @dataProvider getFilterTestDataInvalid
-     * @group Core
-     */
-    public function testFilterInvalid($translations, $msg)
-    {
-        $filter = new CoreTranslations();
-        $result = $filter->isValid($translations);
-        $this->assertFalse($result);
-        $this->assertEquals($msg, $filter->getMessage());
-    }
-}
diff --git a/tests/PHPUnit/Unit/Translate/Validate/NoScriptsTest.php b/tests/PHPUnit/Unit/Translate/Validate/NoScriptsTest.php
deleted file mode 100644
index 519126708d..0000000000
--- a/tests/PHPUnit/Unit/Translate/Validate/NoScriptsTest.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-namespace Piwik\Tests\Unit\Translate\Validate;
-
-use Piwik\Translate\Validate\NoScripts;
-
-class NoScriptsTest extends \PHPUnit_Framework_TestCase
-{
-    public function getFilterTestDataValid()
-    {
-        return array(
-            array(
-                array(),
-            ),
-            array(
-                array(
-                    'test' => array()
-                ),
-            ),
-            array(
-                array(
-                    'test' => array(
-                        'key' => 'val%sue',
-                        'test' => 'test'
-                    )
-                ),
-            ),
-        );
-    }
-
-    /**
-     * @dataProvider getFilterTestDataValid
-     * @group Core
-     */
-    public function testFilterValid($translations)
-    {
-        $filter = new NoScripts();
-        $result = $filter->isValid($translations);
-        $this->assertTrue($result);
-    }
-
-    public function getFilterTestDataInvalid()
-    {
-        return array(
-            array(
-                array(
-                    'test' => array(
-                        'test' => 'test text <script'
-                    )
-                ),
-            ),
-            array(
-                array(
-                    'empty' => array(
-                        'test' => 't&uuml;sest'
-                    ),
-                    'test' => array(
-                        'test' => 'bla <a href="javascript:alert();"> link </a>',
-                        'empty' => '&tilde;',
-                    )
-                ),
-            ),
-            array(
-                array(
-                    'test' => array(
-                        'test' => 'bla <a onload="alert(\'test\');">link</a>'
-                    )
-                ),
-            ),
-            array(
-                array(
-                    'test' => array(
-                        'test' => 'no <img src="test" />'
-                    )
-                ),
-            ),
-            array(
-                array(
-                    'test' => array(
-                        'test' => 'that will fail on document. or not?'
-                    )
-                ),
-            ),
-            array(
-                array(
-                    'test' => array(
-                        'test' => 'bla <a background="yellow">link</a>'
-                    )
-                ),
-            ),
-        );
-    }
-
-    /**
-     * @dataProvider getFilterTestDataInvalid
-     * @group Core
-     */
-    public function testFilterInvalid($translations)
-    {
-        $filter = new NoScripts();
-        $result = $filter->isValid($translations);
-        $this->assertFalse($result);
-    }
-}
diff --git a/tests/PHPUnit/Unit/Translate/WriterTest.php b/tests/PHPUnit/Unit/Translate/WriterTest.php
deleted file mode 100644
index 66e1efe30a..0000000000
--- a/tests/PHPUnit/Unit/Translate/WriterTest.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-namespace Piwik\Tests\Unit\Translate;
-
-use Piwik\Translate\Filter\ByBaseTranslations;
-use Piwik\Translate\Filter\ByParameterCount;
-use Piwik\Translate\Filter\UnnecassaryWhitespaces;
-use Piwik\Translate\Validate\CoreTranslations;
-use Piwik\Translate\Validate\NoScripts;
-use Piwik\Translate\Writer;
-
-class WriterTest extends \PHPUnit_Framework_TestCase
-{
-    public function setUp()
-    {
-        parent::setUp();
-        include PIWIK_INCLUDE_PATH . '/core/DataFiles/Languages.php';
-        include PIWIK_INCLUDE_PATH . '/core/DataFiles/Countries.php';
-    }
-
-    /**
-     * @group Core
-     *
-     * @dataProvider getValidConstructorData
-     */
-    public function testConstructorValid($language, $plugin)
-    {
-        $translationWriter = new Writer($language, $plugin);
-        $this->assertEquals($language, $translationWriter->getLanguage());
-        $this->assertFalse($translationWriter->hasTranslations());
-    }
-
-    public function getValidConstructorData()
-    {
-        return array(
-            array('en', ''),
-            array('de', ''),
-            array('en', 'ExamplePlugin'),
-        );
-    }
-
-    /**
-     * @group Core
-     *
-     * @expectedException \Exception
-     */
-    public function testConstructorInvalid()
-    {
-        new Writer('en', 'InValIdPlUGin');
-    }
-
-    /**
-     * @group Core
-     */
-    public function testHasTranslations()
-    {
-        $writer = new Writer('de');
-        $writer->setTranslations(array('General' => array('test' => 'test')));
-        $this->assertTrue($writer->hasTranslations());
-    }
-
-    /**
-     * @group Core
-     */
-    public function testHasNoTranslations()
-    {
-        $writer = new Writer('de');
-        $this->assertFalse($writer->hasTranslations());
-    }
-
-    /**
-     * @group Core
-     */
-    public function testSetTranslationsEmpty()
-    {
-        $writer = new Writer('de');
-        $writer->setTranslations(array());
-        $this->assertTrue($writer->isValid());
-        $this->assertFalse($writer->hasTranslations());
-    }
-
-    /**
-     * @group Core
-     *
-     * @dataProvider getInvalidTranslations
-     */
-    public function testSetTranslationsInvalid($translations, $error)
-    {
-        $writer = new Writer('de');
-        $writer->setTranslations($translations);
-        $writer->addValidator(new NoScripts());
-        $writer->addValidator(new CoreTranslations());
-        $this->assertFalse($writer->isValid());
-        $this->assertEquals($error, $writer->getValidationMessage());
-    }
-
-    public function getInvalidTranslations()
-    {
-        $translations = json_decode(file_get_contents(PIWIK_INCLUDE_PATH.'/lang/de.json'), true);
-        return array(
-            array(array('General' => array('Locale' => '')) + $translations, CoreTranslations::ERRORSTATE_LOCALEREQUIRED),
-            array(array('General' => array('Locale' => 'de_DE.UTF-8')) + $translations, CoreTranslations::ERRORSTATE_TRANSLATORINFOREQUIRED),
-            array(array('General' => array('Locale' => 'de_DE.UTF-8',
-                                           'TranslatorName' => 'name')) + $translations, CoreTranslations::ERRORSTATE_TRANSLATOREMAILREQUIRED),
-            array(array('General' => array('Locale' => 'de_DE.UTF-8',
-                                           'TranslatorName' => 'name',
-                                           'TranslatorEmail' => 'name@domain.com',
-                                           'LayoutDirection' => 'fail')) + $translations, CoreTranslations::ERRORSTATE_LAYOUTDIRECTIONINVALID),
-            array(array('General' => array('Locale' => 'invalid',
-                                           'TranslatorName' => 'name',
-                                           'TranslatorEmail' => 'name@domain.com')) + $translations, CoreTranslations::ERRORSTATE_LOCALEINVALID),
-            array(array('General' => array('Locale' => 'xx_DE.UTF-8',
-                                           'TranslatorName' => 'name',
-                                           'TranslatorEmail' => 'name@domain.com',)) + $translations, CoreTranslations::ERRORSTATE_LOCALEINVALIDLANGUAGE),
-            array(array('General' => array('Locale' => 'de_XX.UTF-8',
-                                           'TranslatorName' => 'name',
-                                           'TranslatorEmail' => 'name@domain.com',)) + $translations, CoreTranslations::ERRORSTATE_LOCALEINVALIDCOUNTRY),
-            array(array('General' => array('Locale' => '<script>')) + $translations, 'script tags restricted for language files'),
-        );
-    }
-
-    /**
-     * @group Core
-     *
-     * @expectedException \Exception
-     */
-    public function testSaveException()
-    {
-        $writer = new Writer('it');
-        $writer->save();
-    }
-
-    /**
-     * @group Core
-     *
-     * @expectedException \Exception
-     */
-    public function testSaveTemporaryException()
-    {
-        $writer = new Writer('it');
-        $writer->saveTemporary();
-    }
-
-    /**
-     * @group Core
-     */
-    public function testSaveTranslation()
-    {
-        $translations = json_decode(file_get_contents(PIWIK_INCLUDE_PATH.'/lang/en.json'), true);
-
-        $translationsToWrite = array();
-        $translationsToWrite['General'] = $translations['General'];
-        $translationsToWrite['Mobile'] = $translations['Mobile'];
-
-        $translationsToWrite['General']['Yes'] = 'string with %1$s';
-        $translationsToWrite['Plugin'] = array(
-            'Body' => "Message\nBody"
-        );
-
-        $translationWriter = new Writer('fr');
-
-        $translationWriter->addFilter(new UnnecassaryWhitespaces($translations));
-        $translationWriter->addFilter(new ByBaseTranslations($translations));
-        $translationWriter->addFilter(new ByParameterCount($translations));
-
-        $translationWriter->setTranslations($translationsToWrite);
-
-        $rc = $translationWriter->saveTemporary();
-
-        @unlink(PIWIK_INCLUDE_PATH.'/tmp/fr.json');
-
-        $this->assertGreaterThan(25000, $rc);
-
-        $this->assertCount(4, $translationWriter->getFilterMessages());
-    }
-
-    /**
-     * @group Core
-     *
-     * @dataProvider getTranslationPathTestData
-     */
-    public function testGetTranslationsPath($language, $plugin, $path)
-    {
-        $writer = new Writer($language, $plugin);
-        $this->assertEquals($path, $writer->getTranslationPath());
-    }
-
-    public function getTranslationPathTestData()
-    {
-        return array(
-            array('de', null, PIWIK_INCLUDE_PATH . '/lang/de.json'),
-            array('te', null, PIWIK_INCLUDE_PATH . '/lang/te.json'),
-            array('de', 'CoreHome', PIWIK_INCLUDE_PATH . '/plugins/CoreHome/lang/de.json'),
-            array('pt-br', 'Actions', PIWIK_INCLUDE_PATH . '/plugins/Actions/lang/pt-br.json'),
-        );
-    }
-
-    /**
-     * @group Core
-     *
-     * @dataProvider getTranslationPathTemporaryTestData
-     */
-    public function testGetTemporaryTranslationPath($language, $plugin, $path)
-    {
-        $writer = new Writer($language, $plugin);
-        $this->assertEquals($path, $writer->getTemporaryTranslationPath());
-    }
-
-    public function getTranslationPathTemporaryTestData()
-    {
-        return array(
-            array('de', null, PIWIK_INCLUDE_PATH . '/tmp/de.json'),
-            array('te', null, PIWIK_INCLUDE_PATH . '/tmp/te.json'),
-            array('de', 'CoreHome', PIWIK_INCLUDE_PATH . '/tmp/plugins/CoreHome/lang/de.json'),
-            array('pt-br', 'Actions', PIWIK_INCLUDE_PATH . '/tmp/plugins/Actions/lang/pt-br.json'),
-        );
-    }
-
-    /**
-     * @group Core
-     *
-     * @dataProvider getValidLanguages
-     */
-    public function testSetLanguageValid($language)
-    {
-        $writer = new Writer('en', null);
-        $writer->setLanguage($language);
-        $this->assertEquals(strtolower($language), $writer->getLanguage());
-    }
-
-    public function getValidLanguages()
-    {
-        return array(
-            array('de'),
-            array('te'),
-            array('pt-br'),
-            array('tzm'),
-            array('abc'),
-            array('de-de'),
-            array('DE'),
-            array('DE-DE'),
-            array('DE-de'),
-        );
-    }
-    /**
-     * @group Core
-     *
-     * @expectedException \Exception
-     * @dataProvider getInvalidLanguages
-     */
-    public function testSetLanguageInvalid($language)
-    {
-        $writer = new Writer('en', null);
-        $writer->setLanguage($language);
-    }
-
-    public function getInvalidLanguages()
-    {
-        return array(
-            array(''),
-            array('abcd'),
-            array('pt-brfr'),
-            array('00'),
-            array('a-b'),
-            array('x3'),
-            array('X4-fd'),
-            array('12-34'),
-            array('$§'),
-        );
-    }
-}
diff --git a/tests/PHPUnit/Unit/TranslateTest.php b/tests/PHPUnit/Unit/TranslateTest.php
index a26c9c3713..4cbbe376d5 100644
--- a/tests/PHPUnit/Unit/TranslateTest.php
+++ b/tests/PHPUnit/Unit/TranslateTest.php
@@ -10,6 +10,9 @@ namespace Piwik\Tests\Unit;
 
 use Piwik\Translate;
 
+/**
+ * @group Translation
+ */
 class TranslateTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/tests/PHPUnit/Unit/Translation/Loader/DevelopmentLoaderTest.php b/tests/PHPUnit/Unit/Translation/Loader/DevelopmentLoaderTest.php
new file mode 100644
index 0000000000..bc36a93f03
--- /dev/null
+++ b/tests/PHPUnit/Unit/Translation/Loader/DevelopmentLoaderTest.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Unit\Translation\Loader;
+
+use Piwik\Translation\Loader\DevelopmentLoader;
+
+/**
+ * @group Translation
+ */
+class DevelopmentLoaderTest extends \PHPUnit_Framework_TestCase
+{
+    private $translations = array(
+        'General' => array(
+            'translationId' => 'Hello',
+        ),
+    );
+
+    public function test_shouldReturnTranslationIds_ifDevelopmentLanguage()
+    {
+        $wrappedLoader = $this->getMockForAbstractClass('Piwik\Translation\Loader\LoaderInterface');
+        $loader = new DevelopmentLoader($wrappedLoader);
+
+        $wrappedLoader->expects($this->once())
+            ->method('load')
+            ->with('en', array('directory'))
+            ->willReturn($this->translations);
+
+        $translations = $loader->load(DevelopmentLoader::LANGUAGE_ID, array('directory'));
+
+        $expected = array(
+            'General' => array(
+                'translationId' => 'General_translationId',
+            ),
+        );
+
+        $this->assertEquals($expected, $translations);
+    }
+
+    public function test_shouldUseDecoratedLoader_ifNotDevelopmentLanguage()
+    {
+        $wrappedLoader = $this->getMockForAbstractClass('Piwik\Translation\Loader\LoaderInterface');
+        $loader = new DevelopmentLoader($wrappedLoader);
+
+        $wrappedLoader->expects($this->once())
+            ->method('load')
+            ->with('fr', array('directory'))
+            ->willReturn($this->translations);
+
+        $translations = $loader->load('fr', array('directory'));
+
+        $this->assertEquals($this->translations, $translations);
+    }
+}
diff --git a/tests/PHPUnit/Unit/Translation/Loader/JsonFileLoaderTest.php b/tests/PHPUnit/Unit/Translation/Loader/JsonFileLoaderTest.php
new file mode 100644
index 0000000000..d1770c491d
--- /dev/null
+++ b/tests/PHPUnit/Unit/Translation/Loader/JsonFileLoaderTest.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Unit\Translation\Loader;
+
+use Piwik\Translation\Loader\JsonFileLoader;
+
+/**
+ * @group Translation
+ */
+class JsonFileLoaderTest extends \PHPUnit_Framework_TestCase
+{
+    public function test_shouldLoadJsonFile()
+    {
+        $loader = new JsonFileLoader();
+        $translations = $loader->load('en', array(__DIR__ . '/fixtures/dir1'));
+
+        $expected = array(
+            'General' => array(
+                'test1' => 'Hello',
+                'test2' => 'Hello',
+            ),
+        );
+
+        $this->assertEquals($expected, $translations);
+    }
+
+    public function test_shouldIgnoreMissingFiles()
+    {
+        $loader = new JsonFileLoader();
+        $translations = $loader->load('foo', array(__DIR__ . '/fixtures/dir1'));
+
+        $this->assertEquals(array(), $translations);
+    }
+
+    public function test_shouldMergeTranslations_ifLoadingMultipleFiles()
+    {
+        $loader = new JsonFileLoader();
+        $translations = $loader->load('en', array(__DIR__ . '/fixtures/dir1', __DIR__ . '/fixtures/dir2'));
+
+        $expected = array(
+            'General' => array(
+                'test1' => 'Hello',
+                'test2' => 'Hello 2', // the second file should overwrite the first one
+                'test3' => 'Hello 3',
+            ),
+        );
+
+        $this->assertEquals($expected, $translations);
+    }
+}
diff --git a/tests/PHPUnit/Unit/Translation/Loader/LoaderCacheTest.php b/tests/PHPUnit/Unit/Translation/Loader/LoaderCacheTest.php
new file mode 100644
index 0000000000..2b00333396
--- /dev/null
+++ b/tests/PHPUnit/Unit/Translation/Loader/LoaderCacheTest.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Unit\Translation\Loader;
+
+use Piwik\Cache\Backend\ArrayCache;
+use Piwik\Cache\Lazy;
+use Piwik\Translation\Loader\LoaderCache;
+
+/**
+ * @group Translation
+ */
+class LoaderCacheTest extends \PHPUnit_Framework_TestCase
+{
+    public function test_shouldNotLoad_ifInCache()
+    {
+        $cache = $this->getMock('Piwik\Cache\Lazy', array(), array(), '', false);
+        $cache->expects($this->any())
+            ->method('fetch')
+            ->willReturn(array('translations!'));
+        $wrappedLoader = $this->getMockForAbstractClass('Piwik\Translation\Loader\LoaderInterface');
+        $wrappedLoader->expects($this->never())
+            ->method('load');
+
+        $loader = new LoaderCache($wrappedLoader, $cache);
+        $translations = $loader->load('en', array('foo'));
+
+        $this->assertEquals(array('translations!'), $translations);
+    }
+
+    public function test_shouldLoad_ifNotInCache()
+    {
+        $cache = $this->getMock('Piwik\Cache\Lazy', array(), array(), '', false);
+        $cache->expects($this->any())
+            ->method('fetch')
+            ->willReturn(null);
+        $wrappedLoader = $this->getMockForAbstractClass('Piwik\Translation\Loader\LoaderInterface');
+        $wrappedLoader->expects($this->once())
+            ->method('load')
+            ->with('en', array('foo'))
+            ->willReturn(array('translations!'));
+
+        $loader = new LoaderCache($wrappedLoader, $cache);
+        $translations = $loader->load('en', array('foo'));
+
+        $this->assertEquals(array('translations!'), $translations);
+    }
+
+    public function test_shouldReLoad_ifDifferentDirectories()
+    {
+        $cache = new Lazy(new ArrayCache());
+
+        $wrappedLoader = $this->getMockForAbstractClass('Piwik\Translation\Loader\LoaderInterface');
+        $wrappedLoader->expects($this->exactly(2))
+            ->method('load')
+            ->willReturn(array('translations!'));
+
+        $loader = new LoaderCache($wrappedLoader, $cache);
+
+        // Should call the wrapped loader only once
+        $loader->load('en', array('foo'));
+        $loader->load('en', array('foo'));
+
+        // Should call the wrapped loader a second time
+        $loader->load('en', array('foo', 'bar'));
+    }
+}
diff --git a/tests/PHPUnit/Unit/Translation/Loader/fixtures/dir1/en.json b/tests/PHPUnit/Unit/Translation/Loader/fixtures/dir1/en.json
new file mode 100644
index 0000000000..f7518b863d
--- /dev/null
+++ b/tests/PHPUnit/Unit/Translation/Loader/fixtures/dir1/en.json
@@ -0,0 +1,6 @@
+{
+  "General": {
+    "test1": "Hello",
+    "test2": "Hello"
+  }
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Unit/Translation/Loader/fixtures/dir1/fr.json b/tests/PHPUnit/Unit/Translation/Loader/fixtures/dir1/fr.json
new file mode 100644
index 0000000000..b1a2f0aca9
--- /dev/null
+++ b/tests/PHPUnit/Unit/Translation/Loader/fixtures/dir1/fr.json
@@ -0,0 +1,5 @@
+{
+  "General": {
+    "test1": "Bonjour"
+  }
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Unit/Translation/Loader/fixtures/dir2/en.json b/tests/PHPUnit/Unit/Translation/Loader/fixtures/dir2/en.json
new file mode 100644
index 0000000000..592e802d36
--- /dev/null
+++ b/tests/PHPUnit/Unit/Translation/Loader/fixtures/dir2/en.json
@@ -0,0 +1,6 @@
+{
+  "General": {
+    "test2": "Hello 2",
+    "test3": "Hello 3"
+  }
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Unit/Translation/TranslatorTest.php b/tests/PHPUnit/Unit/Translation/TranslatorTest.php
new file mode 100644
index 0000000000..0e97223e7d
--- /dev/null
+++ b/tests/PHPUnit/Unit/Translation/TranslatorTest.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Unit\Translation\Loader;
+
+use Piwik\Translation\Loader\JsonFileLoader;
+use Piwik\Translation\Translator;
+
+/**
+ * @group Translation
+ */
+class TranslatorTest extends \PHPUnit_Framework_TestCase
+{
+    public function test_translate_shouldReturnTranslationId_ifNoTranslationFound()
+    {
+        $loader = $this->createLoader();
+        $translator = new Translator($loader, array());
+
+        $this->assertEquals('General_foo', $translator->translate('General_foo'));
+    }
+
+    public function test_translate_shouldReturnTranslation()
+    {
+        $loader = $this->createLoader(array(
+            'General' => array(
+                'foo' => 'Hello world',
+            ),
+        ));
+        $translator = new Translator($loader, array());
+
+        $this->assertEquals('Hello world', $translator->translate('General_foo'));
+    }
+
+    public function test_translate_shouldReplacePlaceholders()
+    {
+        $loader = $this->createLoader(array(
+            'General' => array(
+                'foo' => 'Hello %s',
+            ),
+        ));
+        $translator = new Translator($loader, array());
+
+        $this->assertEquals('Hello John', $translator->translate('General_foo', 'John'));
+    }
+
+    public function test_translate_withADifferentLanguage()
+    {
+        $translator = new Translator(new JsonFileLoader(), array(__DIR__ . '/Loader/fixtures/dir1'));
+
+        $this->assertEquals('Hello', $translator->translate('General_test1'));
+
+        $translator->setCurrentLanguage('fr');
+        $this->assertEquals('fr', $translator->getCurrentLanguage());
+        $this->assertEquals('Bonjour', $translator->translate('General_test1'));
+    }
+
+    public function test_translate_shouldFallback_ifTranslationNotFound()
+    {
+        $translator = new Translator(new JsonFileLoader(), array(__DIR__ . '/Loader/fixtures/dir1'));
+        $translator->setCurrentLanguage('fr');
+        $this->assertEquals('Hello', $translator->translate('General_test2'));
+    }
+
+    public function test_addDirectory_shouldImportNewTranslations()
+    {
+        $translator = new Translator(new JsonFileLoader(), array(__DIR__ . '/Loader/fixtures/dir1'));
+        // translation not found
+        $this->assertEquals('General_test3', $translator->translate('General_test3'));
+
+        $translator->addDirectory(__DIR__ . '/Loader/fixtures/dir2');
+        // translation is now found
+        $this->assertEquals('Hello 3', $translator->translate('General_test3'));
+    }
+
+    public function test_addDirectory_shouldImportOverExistingTranslations()
+    {
+        $translator = new Translator(new JsonFileLoader(), array(__DIR__ . '/Loader/fixtures/dir1'));
+        $this->assertEquals('Hello', $translator->translate('General_test2'));
+
+        $translator->addDirectory(__DIR__ . '/Loader/fixtures/dir2');
+        $this->assertEquals('Hello 2', $translator->translate('General_test2'));
+    }
+
+    private function createLoader(array $translations = array())
+    {
+        $loader = $this->getMockForAbstractClass('Piwik\Translation\Loader\LoaderInterface');
+        $loader->expects($this->any())
+            ->method('load')
+            ->willReturn($translations);
+
+        return $loader;
+    }
+}
diff --git a/tests/PHPUnit/Unit/UrlHelperTest.php b/tests/PHPUnit/Unit/UrlHelperTest.php
index 7684f62965..189b026828 100644
--- a/tests/PHPUnit/Unit/UrlHelperTest.php
+++ b/tests/PHPUnit/Unit/UrlHelperTest.php
@@ -12,7 +12,7 @@ use Piwik\Tests\Framework\TestCase\SystemTestCase;
 use Piwik\UrlHelper;

 use Spyc;

 

-class Core_UrlHelperTest extends \PHPUnit_Framework_TestCase

+class UrlHelperTest extends \PHPUnit_Framework_TestCase

 {

     /**

      * Dataprovider for testIsUrl

@@ -193,7 +193,6 @@ class Core_UrlHelperTest extends \PHPUnit_Framework_TestCase
     private function includeDataFilesForSearchEngineTest()

     {

         include "DataFiles/SearchEngines.php";

-        include "DataFiles/Countries.php";

     }

 

     /**

diff --git a/tests/PHPUnit/Unit/VersionTest.php b/tests/PHPUnit/Unit/VersionTest.php
new file mode 100644
index 0000000000..03e588d73d
--- /dev/null
+++ b/tests/PHPUnit/Unit/VersionTest.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Unit;
+
+use Piwik\Tests\Framework\TestCase\UnitTestCase;
+use Piwik\Version;
+
+class VersionTest extends UnitTestCase
+{
+    /**
+     * @var Version
+     */
+    private $version;
+
+    public function setUp()
+    {
+        $this->version = new Version();
+    }
+
+    public function test_isStableVersion()
+    {
+        $this->assertIsStableVersion('3.3.3');
+        $this->assertIsStableVersion('3.0.0');
+        $this->assertIsStableVersion('100.999.9191');
+
+        $this->assertNotStableVersion('3.3');
+        $this->assertNotStableVersion('3.3.');
+        $this->assertNotStableVersion('3-3-3');
+        $this->assertNotStableVersion('a3.3.3');
+        $this->assertNotStableVersion('3.0.0b');
+        $this->assertNotStableVersion('3.3.3-b1');
+        $this->assertNotStableVersion('3.3.3-rc1');
+    }
+
+    public function test_isVersionNumber()
+    {
+        $this->assertIsVersionNumber('3.3.3');
+        $this->assertIsVersionNumber('3.3.3-b1');
+        $this->assertIsVersionNumber('100.999.9991-rc90');
+        $this->assertIsVersionNumber('100.999.9991-b90');
+        $this->assertIsVersionNumber('100.999.9991-beta90');
+
+        $this->assertNotVersionNumber('3.3');
+        $this->assertNotVersionNumber('3.3.');
+        $this->assertNotVersionNumber('3-3-3');
+        $this->assertNotVersionNumber('a3.3.3');
+        $this->assertNotVersionNumber('3.0.0b');
+        $this->assertNotVersionNumber('3.0.0beta1'); // missing dash
+        $this->assertNotVersionNumber('3.3.3-bbeta1'); // max 4 allowed but bbeta is 5
+    }
+
+    private function assertIsStableVersion($versionNumber)
+    {
+        $isStable = $this->version->isStableVersion($versionNumber);
+        $this->assertTrue($isStable);
+    }
+
+    private function assertNotStableVersion($versionNumber)
+    {
+        $isStable = $this->version->isStableVersion($versionNumber);
+        $this->assertFalse($isStable);
+    }
+
+    private function assertIsVersionNumber($versionNumber)
+    {
+        $isStable = $this->version->isVersionNumber($versionNumber);
+        $this->assertTrue($isStable);
+    }
+
+    private function assertNotVersionNumber($versionNumber)
+    {
+        $isStable = $this->version->isVersionNumber($versionNumber);
+        $this->assertFalse($isStable);
+    }
+
+}
diff --git a/tests/PHPUnit/bootstrap.php b/tests/PHPUnit/bootstrap.php
index a8d71efb38..5a7eb7bce2 100644
--- a/tests/PHPUnit/bootstrap.php
+++ b/tests/PHPUnit/bootstrap.php
@@ -1,5 +1,11 @@
 <?php
 
+use Piwik\Container\StaticContainer;
+use Piwik\Http;
+use Piwik\Intl\Locale;
+use Piwik\Config;
+use Piwik\SettingsPiwik;
+
 define('PIWIK_TEST_MODE', true);
 define('PIWIK_PRINT_ERROR_BACKTRACE', false);
 
@@ -15,6 +21,7 @@ if (!defined('PIWIK_USER_PATH')) {
 if (!defined('PIWIK_INCLUDE_PATH')) {
     define('PIWIK_INCLUDE_PATH', PIWIK_PATH_TEST_TO_ROOT);
 }
+
 if (!defined('PIWIK_INCLUDE_SEARCH_PATH')) {
     define('PIWIK_INCLUDE_SEARCH_PATH', get_include_path()
         . PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/vendor/bin'
@@ -25,28 +32,24 @@ if (!defined('PIWIK_INCLUDE_SEARCH_PATH')) {
 @ini_set('include_path', PIWIK_INCLUDE_SEARCH_PATH);
 @set_include_path(PIWIK_INCLUDE_SEARCH_PATH);
 @ini_set('memory_limit', -1);
-error_reporting(E_ALL | E_NOTICE);
-@date_default_timezone_set('UTC');
-
-require_once PIWIK_INCLUDE_PATH . '/core/Loader.php';
 
-\Piwik\Loader::init();
+require_once PIWIK_INCLUDE_PATH . '/core/bootstrap.php';
 
-require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php';
-require_once PIWIK_INCLUDE_PATH . '/core/testMinimumPhpVersion.php';
-require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/DatabaseTestCase.php';
-require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/IntegrationTestCase.php';
-require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/BenchmarkTestCase.php';
-require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/FakeAccess.php';
+require_once PIWIK_INCLUDE_PATH . '/libs/PiwikTracker/PiwikTracker.php';
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/TestingEnvironment.php';
 
 if (getenv('PIWIK_USE_XHPROF') == 1) {
     \Piwik\Profiler::setupProfilerXHProf();
 }
 
+// setup container for tests
+StaticContainer::setEnvironment('test');
+
+\Piwik\Config::getInstance()->setTestEnvironment();
+
 // require test fixtures
 $fixturesToLoad = array(
-    '/tests/PHPUnit/UI/Fixtures/*.php',
+    '/tests/UI/Fixtures/*.php',
     '/plugins/*/tests/Fixtures/*.php',
     '/plugins/*/Test/Fixtures/*.php',
 );
@@ -56,10 +59,11 @@ foreach($fixturesToLoad as $fixturePath) {
     }
 }
 
-function prepareServerVariables()
+Locale::setDefaultLocale();
+
+function prepareServerVariables(Config $config)
 {
-    \Piwik\Config::getInstance()->init();
-    $testConfig = \Piwik\Config::getInstance()->tests;
+    $testConfig = $config->tests;
 
     if ('@REQUEST_URI@' === $testConfig['request_uri']) {
         // config not done yet, if Piwik is installed we can automatically configure request_uri and http_host
@@ -69,8 +73,8 @@ function prepareServerVariables()
             $parsedUrl = parse_url($url);
             $testConfig['request_uri'] = $parsedUrl['path'];
             $testConfig['http_host']   = $parsedUrl['host'];
-            \Piwik\Config::getInstance()->tests = $testConfig;
-            \Piwik\Config::getInstance()->forceSave();
+            $config->tests = $testConfig;
+            $config->forceSave();
         }
     }
 
@@ -79,13 +83,41 @@ function prepareServerVariables()
     $_SERVER['REMOTE_ADDR'] = $testConfig['remote_addr'];
 }
 
-prepareServerVariables();
+function prepareTestDatabaseConfig(Config $config)
+{
+    $testDb = $config->database_tests;
+
+    if ('@USERNAME@' !== $testDb['username']) {
+        return; // testDb is already configured, we do not want to overwrite any existing settings.
+    }
+
+    $db = $config->database;
+    $testDb['username'] = $db['username'];
+
+    if (empty($testDb['password'])) {
+        $testDb['password'] = $db['password'];
+    }
+
+    if (empty($testDb['host'])) {
+        $testDb['host'] = $db['host'];
+    }
 
-// General requirement checks & help: a webserver must be running for tests to work if not running UnitTests!
-if (empty($_SERVER['argv']) || !in_array('UnitTests', $_SERVER['argv'])) {
-    checkPiwikSetupForTests();
+    $testDb['tables_prefix'] = ''; // tables_prefix has to be empty for UI tests
+
+    $config->database_tests = $testDb;
+    $config->forceSave();
+}
+
+if (!SettingsPiwik::isPiwikInstalled()) {
+    throw new Exception('Piwik needs to be installed in order to run the tests');
 }
 
+$config = Config::getInstance();
+$config->init();
+prepareServerVariables($config);
+prepareTestDatabaseConfig($config);
+checkPiwikSetupForTests();
+
 function checkPiwikSetupForTests()
 {
     if (empty($_SERVER['REQUEST_URI'])
@@ -104,7 +136,5 @@ remote_addr = \"127.0.0.1\"
 Try again.";
         exit(1);
     }
-    $baseUrl = \Piwik\Tests\Framework\Fixture::getRootUrl();
 
-    \Piwik\SettingsPiwik::checkPiwikServerWorking($baseUrl, $acceptInvalidSSLCertificates = true);
 }
diff --git a/tests/PHPUnit/proxy/includes.php b/tests/PHPUnit/proxy/includes.php
index 01a28db163..0d6b3d878c 100644
--- a/tests/PHPUnit/proxy/includes.php
+++ b/tests/PHPUnit/proxy/includes.php
@@ -1,7 +1,5 @@
 <?php
 
-// Good old test proxy endpoints have some commons
-
 if (!defined('PIWIK_INCLUDE_PATH')) {
     define('PIWIK_INCLUDE_PATH', realpath(dirname(__FILE__)) . '/../../../');
 }
@@ -9,21 +7,8 @@ if (!defined('PIWIK_USER_PATH')) {
     define('PIWIK_USER_PATH', PIWIK_INCLUDE_PATH);
 }
 
-require_once PIWIK_INCLUDE_PATH . '/core/Loader.php';
-\Piwik\Loader::init();
+require_once PIWIK_INCLUDE_PATH . '/core/bootstrap.php';
 
-require_once PIWIK_INCLUDE_PATH . '/core/EventDispatcher.php';
-require_once PIWIK_INCLUDE_PATH . '/core/Piwik.php';
-require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php';
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/TestingEnvironment.php';
-if (file_exists(PIWIK_INCLUDE_PATH . '/vendor/autoload.php')) {
-    $vendorDirectory = PIWIK_INCLUDE_PATH . '/vendor';
-} else {
-    $vendorDirectory = PIWIK_INCLUDE_PATH . '/../..';
-}
-require_once $vendorDirectory . '/autoload.php';
-require_once $vendorDirectory . '/mustangostang/spyc/Spyc.php';
-require_once $vendorDirectory . '/piwik/device-detector/DeviceDetector.php';
-
-\Piwik\SettingsServer::setMaxExecutionTime(0);
 
+Piwik\SettingsServer::setMaxExecutionTime(0);
diff --git a/tests/PHPUnit/proxy/piwik.php b/tests/PHPUnit/proxy/piwik.php
index 2acaea81bd..bc03155b25 100755
--- a/tests/PHPUnit/proxy/piwik.php
+++ b/tests/PHPUnit/proxy/piwik.php
@@ -11,7 +11,6 @@ use Piwik\DataTable\Manager;
 use Piwik\Option;
 use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
 use Piwik\Site;
-use Piwik\Tracker\Cache;
 use Piwik\Tracker;
 
 require realpath(dirname(__FILE__)) . "/includes.php";
@@ -35,4 +34,7 @@ try {
     echo "Unexpected error during tracking: " . $ex->getMessage() . "\n" . $ex->getTraceAsString() . "\n";
 }
 
-ob_end_flush();
+if (ob_get_level() > 1) {
+    ob_end_flush();
+}
+
diff --git a/tests/README.md b/tests/README.md
index faf942cba4..8849370096 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -50,8 +50,8 @@ To execute the tests:
 
 3. 	Run the tests
 
-	$ cd /path/to/piwik
-	$ ./console tests:run --testsuite unit
+    $ cd /path/to/piwik
+    $ ./console tests:run --testsuite unit
     $ ./console tests:run --testsuite integration
     $ ./console tests:run --testsuite system
 
@@ -76,7 +76,7 @@ it tests only a single method or class. Sometimes two or three classes can still
  you have to pass a dummy class or something similar but it should actually only test one class or method.
   If it has a dependency to the filesystem, web, config, database or to other plugins it is not a unit test but an
   integration test. If the test is slow it is most likely not a unit test but an integration test as well.
-  "Slow" is of course very objective and also depends on the server but if your test does not have any dependencies
+  "Slow" is of course very subjective and also depends on the server but if your test does not have any dependencies
 your test will be really fast.
 
 It is an integration test if you have any dependency to a loaded plugin, to the filesystem, web, config, database or something
@@ -89,7 +89,7 @@ It is a system test if you - for instance - make a call to Piwik itself via HTTP
 Because they fail for different reasons and the duration of the test execution is different. This allows us to execute
 all unit tests and get a result very quick. Unit tests should not fail on different systems and just run everywhere for
  example no matter whether you are using NFS or not. Once the unit tests are green one would usually execute all integration
- tests to see whether the next stage works. They take a bit longer as they have depenencies to the database and filesystem.
+ tests to see whether the next stage works. They take a bit longer as they have dependencies to the database and filesystem.
  The system and ui tests take the most time to run as they always run through the whole code.
 
 Another advantage of running the tests separately is that we are getting a more accurate code coverage. For instance when
@@ -125,10 +125,14 @@ We also have an OmniFixture that includes all other Fixtures. OmniFixture is use
 
 #### Keep OmniFixture up to date
 
-Remember to update the [Omnifixture SQL dump](https://github.com/piwik/piwik/blob/master/tests/resources/OmniFixture-dump.sql.gz) whenever you make any change to any fixture. For instance use:
-    ./console tests:setup-fixture OmniFixture --sqldump=OmniFixture-dump.sql` and then gzip. 
+Remember to update the [Omnifixture SQL dump](https://github.com/piwik/piwik/blob/master/tests/resources/OmniFixture-dump.sql.gz) whenever you make any change to any fixture. You can use:
 
-Keeping the OmniFixture up to date makes it easier to see which tests fail after each small fixture change. If we don't update the OmniFixture then we end up with many failed screenshots tests which makes it hard to see whether those changes are expected or not.
+    ./console tests:setup-fixture OmniFixture --sqldump=OmniFixture-dump.sql
+    cat OmniFixture-dump.sql | gzip > tests/resources/OmniFixture-dump.sql.gz
+
+Keeping the OmniFixture up to date makes it easier to see which tests fail after each small fixture change. 
+
+If we don't update the OmniFixture then we end up with many failed screenshots tests which makes it hard to see whether those changes are expected or not.
 
 ### Scheduled Reports Tests
 
diff --git a/tests/README.screenshots.md b/tests/README.screenshots.md
index d6976c5ba6..da3f7fd7a3 100644
--- a/tests/README.screenshots.md
+++ b/tests/README.screenshots.md
@@ -1,11 +1,12 @@
 # Screenshots UI tests
 
 Piwik contains UI tests that compare captured screenshots of URLs and UI controls with expected screenshots.
-If a captured screenshot does not match its expected screenshot, the build will fail.
+If a captured screenshot does not match its expected screenshot, the build will fail. 
 
-Read on to learn how to run, manage and create screenshot tests.
+For a plugin developer documentation have a look here: https://developer.piwik.org/guides/tests-ui
+The remaining part of this document is rather Piwik Core Developer related.
 
-## Fixing a broken build
+## Fixing a broken build 
 
 Changes made to Piwik that affect the UI (such as changes to CSS, JavaScript, Twig templates or even PHP code) may
 break the UI tests build. This is an opportunity to review your code and as a Piwik developer you should ensure that
@@ -18,7 +19,7 @@ then you should update the expected screenshots accordingly.
 
 To fix a broken build, follow these steps:
 
- * Go to the UI tests travis build: [https://travis-ci.org/piwik/piwik-ui-tests](https://travis-ci.org/piwik/piwik-ui-tests)
+ * Go to the Tests travis build: [https://travis-ci.org/piwik/piwik](https://travis-ci.org/piwik/piwik) and select the build containing `TEST_SUITE=UITests`
  * Find the build you are interested in. The UI tests build will be run for each commit in each branch, so if you're
    looking to resolve a specific failure, you'll have to find the build for the commit you've made.
  * In the build output, at the beginning of the test output, there will be a link to a image diff viewer. It will look something
@@ -32,71 +33,22 @@ To fix a broken build, follow these steps:
      * If a change is not wanted, revert or fix your commit.
      * If a change is correct, then you can set the new screenshot as the expected screenshot.
        To do so, in the diffviewer.html page click on the "Processed" link for this screenshot.
-       Then "Save this file as" and save it in the piwik/tests/PHPUnit/UI/expected-ui-screenshots/ directory.
+       Then "Save this file as" and save it in the piwik/tests/UI/expected-ui-screenshots/ directory.
        (If the screenshot test is for a plugin and not Piwik Core, the expected screenshot should be added to the
        plugin's expected screenshot directory. For example: piwik/plugins/DBStats/tests/UI/expected-ui-screenshots.)
 
      _Note: When determining whether a screenshot is correct, the data displayed is not important. Report data correctness is verified through System and other PHP tests. The UI tests should only test UI behavior._
  * Push the changes (to your code and/or to the expected-ui-screenshots directory.
- * Wait for next UI Tests build [on travis](https://travis-ci.org/piwik/piwik-ui-tests). Hopefully, the build should be green!
+ * Wait for next Test build [on travis](https://travis-ci.org/piwik/piwik). Hopefully, the build should be green!
 
 _Note: the **development:sync-ui-test-screenshots** console command can be used to speed up the process. Run **./console help development:sync-ui-test-screenshots** to learn more._
 
-## Setup screenshots tests on your dev box
-
-These tests are in another repository but are included in Piwik as a submodule. To get the tests, run the following commands:
-
-    $ git submodule init
-    $ git submodule update
-
-In order to run UI tests, you need to have [phantomjs](http://phantomjs.org) version 1.9.0 or greater
-installed on your machine. You can download phantomjs [here](http://phantomjs.org/download.html). phantomjs is headless, so even if you're on a server without the X window system, you can still run the UI tests.
-
-To generate screenshots identical to those generated by Travis, we install some extra fonts. On Ubuntu run:
-
-    $ sudo apt-get install ttf-mscorefonts-installer imagemagick imagemagick-doc
-
-Imagick is used to generate the "difference" screenshots which show which pixels have changed.
-
-Removing this font may be useful if your generated screenshots' fonts do not match the expected screenshots:
-
-    $ sudo apt-get remove ttf-bitstream-vera
-
-### Configuring screenshot testing library
-
-The screenshot testing library's configuration resides in the tests/lib/screenshot-testing/config.js file.
-If your development environment's PHP executable isn't named `php`
-or your dev Piwik install isn't at `http://localhost/` you may need to edit the contents of this file.
-
-For example if Piwik is setup at `http://localhost/piwik` modify the config.js such as:
-```
-exports.piwikUrl = "http://localhost/piwik/";
-exports.phpServer = {
-    HTTP_HOST: 'localhost',
-    REQUEST_URI: '/piwik/',
-    REMOTE_ADDR: '127.0.0.1'
-};
-
-```
-
-## Running Tests
+## <a name="run-tests"></a>Running Tests
 
 You can test the UI by running the following command in the root piwik directory:
 
     $ ./console tests:run-ui
 
-This will run every UI test in Piwik Core as well as in each plugin directory.
-
-To run a single test, run:
-
-    $ ./console tests:run-ui TestName
-
-where **TestName** is the name of a mocha test specification. For example, to run the tests within the Dashboard\_spec.js, run:
-
-    $ ./console tests:run-ui Dashboard
-
-The test names to use is determined by the test itself in the calls to `describe(...`.
-
 The following options may be useful if you plan on running the UI tests locally often:
 
  * **--persist-fixture-data**: This will save the test data in a separate database so the setup only has to be run once.
@@ -104,136 +56,3 @@ The following options may be useful if you plan on running the UI tests locally
  * **--drop**: If you've used --persist-fixture-data and need to re-setup the separate data, use this option with --persist-fixture-data.
  * **--keep-symlinks**: If you want to visit the URLs of captured pages in a browser to diagnose failures use this option.
                         This will keep the recursive symlinks in tests/PHPUnit/proxy.
-
-## Writing Tests
-
-UI screenshot tests are run directly by phantomjs and are written using [mocha](http://visionmedia.github.io/mocha/) and [chai](http://chaijs.com).
-
-To create a new test, first decide whether it will belong to Piwik Core or a plugin. If it will belong to Piwik Core, the test should be placed within the [piwik-ui-tests](https://github.com/piwik/piwik-ui-tests) repository. Otherwise, it should be placed within tests/UI sub-directory of your plugin.
-
-All test files should have \_spec.js file name suffixes (for example, **ActionsDataTable\_spec.js**).
-
-Tests should be written using [BDD](http://en.wikipedia.org/wiki/Behavior-driven_development) style, for example:
-
-    describe("TheControlImTesting", function () {
-        // ...
-    });
-
-Since screenshots can take a while to capture, you will want to override mocha's default timeout like this:
-
-    describe("TheControlImTesting", function () {
-        this.timeout(0);
-
-        // ...
-    });
-
-Each test should use Piwik's special chai extension to capture and compare screenshots:
-
-    describe("TheControlImTesting", function () {
-        this.timeout(0);
-
-        var url = // ...
-
-        it("should load correctly", function (done) {
-            expect.screenshot("screenshot_name").to.be.capture(function (page) {
-                page.load(url);
-            }, done);
-        });
-    });
-
-If you want to compare a screenshot against an already existing expected screenshot you can do the following:
-
-    it("should load correctly", function (done) {
-        expect.screenshot("screenshot_to_comapre_against", "OptionalPrefix").to.be.capture("processed_screenshot_name", function (page) {
-            page.load(url);
-        }, done);
-    });
-
-If you want to compare only parts (all content within an element / selector) of a page you can do the following:
-
-    it("should load correctly", function (done) {
-        expect.screenshot("screenshot_name").to.be.captureSelector("#content", function (page) {
-            page.load(url);
-        }, done);
-    });
-
-If you want to compare a screenshot against an already existing expected screenshot and capture a selector you can do the following:
-
-    it("should load correctly", function (done) {
-        expect.screenshot("screenshot_name").to.be.captureSelector("processed_screenshot_name", "#content", function (page) {
-            page.load(url);
-        }, done);
-    });
-
-### Manipulating Pages Before Capture
-
-The callback supplied to the `capture()` function accepts one argument: the page renderer. You can use this object to queue events to be sent to the page before taking a screenshot. For example:
-
-    .capture(function (page) {
-        page.click('.myDropDown');
-        page.mouseMove('.someOtherElement');
-    }, done);
-
-After each event the page renderer will wait for all AJAX requests to finish and for all images to load and then will wait 1s longer for any JavaScript to finish. If you want to wait longer, you can supply an extra wait time (in milliseconds) to the event queuing call:
-
-    .capture(function (page) {
-        page.click('.something');
-        page.click('.myReallyLongRunningJavaScriptFunctionButton', 10000); // will wait for 10s
-    }, done);
-
-_Note: phantomjs has its quirks and you may have to hack around to get certain behavior to work. For example, clicking a &lt;select&gt; will not open the dropdown, so dropdowns have to be manipulated via JavaScript within the page (ie, the .evaluate() method)._
-
-**Page Renderer Object Methods**
-
-The page renderer object has the following methods:
-
- * **click(selector, [modifiers], [waitTime])**: Sends a click to the element referenced by `selector`. Modifiers is an array of strings that can be used to specify keys that are pressed at the same time. Currently only `'shift'` is supported.
- * **mouseMove(selector, [waitTime])**: Sends a mouse move event to the element referenced by `selector`.
- * **mousedown(selector, [waitTime])**: Sends a mouse down event to the element referenced by `selector`.
- * **mouseup(selector, [waitTime])**: Sends a mouse up event to the element referenced by `selector`.
- * **sendKeys(selector, keyString, [waitTime])**: Clicks an element to bring it into focus and then simulates typing a string of keys.
- * **sendMouseEvent(type, pos. [waitTime])**: Sends a mouse event by name to a specific position. `type` is the name of an event that phantomjs will recognize. `pos` is a point, eg, `{x: 0, y: 0}`.
- * **dragDrop(selectorStart, selectorEnd, waitTime)**: Performs a drag/drop of an element (mousedown, mousemove, mouseup) from the element referenced by `selectorStart` and the element referenced by `selectorEnd`.
- * **wait([waitTime])**: Waits without doing anything.
- * **load(url, [waitTime])**: Loads a URL.
- * **reload([waitTime])**: Reloads the current URL.
- * **evaluate(impl, [waitTime])**: Evaluates a function (`impl`) within a webpage. `impl` is an actual function, not a string and must take no arguments.
-
-All **selector**s are jQuery selectors, so you can use jQuery only filters such as `:eq`.
-
-All events are real events, not synthetic DOM events.
-
-### Manipulating the Test Environment
-
-Sometimes it will be necessary to manipulate Piwik for testing purposes. You may want to remove randomness, manipulate data or simulate certain situations (such as there being no config.ini.php file). This section describes how you can do that.
-
-**In your screenshot tests,** use the global **testEnvironment** object. You can use this object to call Piwik API methods using the **callApi(method, params, callback)** method and to call Piwik Controller methods using the **callController(method, params, callback)** method.
-
-You can communicate with PHP code by setting data on the testEnvironment object and calling **save()**, for example:
-
-    testEnvironment.myTestVar = "abcdefg";
-    testEnvironment.save();
-
-This data will be loaded by the **TestingEnvironment** PHP class.
-
-**In your Piwik plugin,** handle the **TestingEnvironment.addHooks** event and use the data in the TestingEnvironment object. for example:
-
-    // event handler in a plugin descriptor class
-    public function addTestHooks($testingEnvironment) {
-        if ($testingEnvironment->myTestVar) {
-            // ...
-        }
-    }
-
-_Note: the Piwik environment is not initialized when the **TestingEnvironment.addHooks** event is fired, so attempts to use the Config and other objects may fail. It is best to use Piwik::addAction to inject logic._
-
-The following are examples of test environment manipulation:
-
- * [Overlay_spec.js](https://github.com/piwik/piwik-ui-tests/blob/master/specs/Overlay_spec.js)
- * [Dashboard_spec.js](https://github.com/piwik/piwik-ui-tests/blob/master/specs/Dashboard_spec.js)
- * [Login_spec.js](https://github.com/piwik/piwik-ui-tests/blob/master/specs/Login_spec.js)
-
-## Learn more
-
-Check out this blog post to learn more about Screenshot Tests in Piwik:
-[QA Screenshot Testing blog post](http://piwik.org/blog/2013/10/our-latest-improvement-to-qa-screenshot-testing/)
diff --git a/tests/README.testing-data.md b/tests/README.testing-data.md
index 63431a3966..2f926b3966 100644
--- a/tests/README.testing-data.md
+++ b/tests/README.testing-data.md
@@ -1,16 +1,9 @@
 As a developer it may be useful to generate test data. Follow these steps:
 
-1. 	Install Piwik
-2. 	Create a site with URL http://piwik.org/
-3. 	Create a Goal eg. URL Contains "blog"
-4. 	Import data from an anonimized test log file in piwik/tests/resources/ directory. Run the following command:
-
-		$ python /home/piwik/misc/log-analytics/import_logs.py --url=http://localhost/path/ --idsite=1 --enable-http-errors --enable-http-redirects --enable-static --enable-bots /path/to/piwik/tests/resources/access.log-dev-anon-9-days-nov-2012.log.bz2 
-
-	This will import 9 days worth of data from Nov 20th-Nov 29th 2012.
-
-5.	You can then archive the reports with:
-
-        $ php5 /home/piwik/console core:archive --url=http://localhost/path/
-
-You should now have some interesting data to test with in November 2012!
+* Install Piwik, for help see [Setting up Piwik](http://developer.piwik.org/guides/getting-started-part-1#getting-setup-to-extend-piwik)
+* Install and activate the `VisitorGenerator` plugin via the Marketplace if needed
+* Generate websites `./console visitorgenerator:generate-websites --limit=50`
+* Generate users `./console visitorgenerator:generate-users --limit=50`
+* Generate goals for a website `./console visitorgenerator:generate-goals --idsite=1`
+* Generate visits for a website `./console visitorgenerator:generate-visits --idsite=1`
+* Trigger the archiving in case browser archiving is disabled `./console core:archive --url=http://localhost/path/`
diff --git a/tests/UI/.gitignore b/tests/UI/.gitignore
new file mode 100644
index 0000000000..7ad59df613
--- /dev/null
+++ b/tests/UI/.gitignore
@@ -0,0 +1,10 @@
+processed-ui-screenshots/*.png
+processed-ui-screenshots/**/*.png
+processed-ui-screenshots
+screenshot-diffs/*.png
+screenshot-diffs/diff*.html
+screenshot-diffs/jquery.js
+screenshot-diffs/resemble.js
+.idea/*
+php_errors.log
+config.js
\ No newline at end of file
diff --git a/tests/UI/Fixtures/UpdaterTestFixture.php b/tests/UI/Fixtures/UpdaterTestFixture.php
new file mode 100644
index 0000000000..e2b3a0024e
--- /dev/null
+++ b/tests/UI/Fixtures/UpdaterTestFixture.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Tests\Fixtures;
+
+class UpdaterTestFixture extends SqlDump
+{
+    public function performSetUp($setupEnvironmentOnly = false)
+    {
+        $this->dumpUrl = PIWIK_INCLUDE_PATH . "/tests/UI/resources/piwik1.0.sql.gz";
+        $this->dropDatabaseInSetUp = true;
+        $this->resetPersistedFixture = true;
+
+        parent::performSetUp($setupEnvironmentOnly);
+    }
+}
\ No newline at end of file
diff --git a/tests/lib/screenshot-testing/config.js b/tests/UI/config.dist.js
index 93aa763cf1..93aa763cf1 100644
--- a/tests/lib/screenshot-testing/config.js
+++ b/tests/UI/config.dist.js
diff --git a/tests/UI/expected-ui-screenshots b/tests/UI/expected-ui-screenshots
new file mode 160000
+Subproject a19b0967a0b59bdb51c42d3517015789d2aef40
diff --git a/tests/UI/resources/piwik1.0.sql.gz b/tests/UI/resources/piwik1.0.sql.gz
new file mode 100644
index 0000000000..dbaf9ec1e0
--- /dev/null
+++ b/tests/UI/resources/piwik1.0.sql.gz
diff --git a/tests/UI/screenshot-diffs/diffgenerator.js b/tests/UI/screenshot-diffs/diffgenerator.js
new file mode 100644
index 0000000000..78063a6674
--- /dev/null
+++ b/tests/UI/screenshot-diffs/diffgenerator.js
@@ -0,0 +1,58 @@
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * Diff generator
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+resemble.outputSettings({
+    errorColor: {
+        red: 255,
+        green: 0,
+        blue: 0,
+        alpha: 125
+    },
+    errorType: 'movement',
+    transparency: 0.3
+});
+
+function compareImages(expected, expectedGithub, processed)
+{
+    resemble(processed).compareTo(expected).onComplete(function(data){
+
+        var info = 'Mismatch percentage: ' + data.misMatchPercentage + '%';
+
+        if (data.dimensionDifference && !data.isSameDimensions) {
+            info += ' Dimension difference width: ' + data.dimensionDifference.width + ' height: ' + data.dimensionDifference.height;
+        }
+
+        $('.info').text(info);
+        $('.diff').attr('src', data.getImageDataUrl());
+    });
+
+    $('.processed').attr('src', encodeURI(processed));
+    $('.expected').attr('src', encodeURI(expected));
+    $('.expectedGithub').attr('src', 'https://raw.githubusercontent.com/piwik/piwik-ui-tests/master/' + encodeURI(expectedGithub));
+}
+
+function getUrlQueryParam(sParam) {
+    var query     = window.location.search.substring(1);
+    var variables = query.split('&');
+
+    for (var index = 0; index < variables.length; index++) {
+
+        var paramName = variables[index].split('=');
+        if (paramName[0] == sParam) {
+            return paramName[1];
+        }
+    }
+}
+
+$(function () {
+    var processed = getUrlQueryParam('processed');
+    var expected  = getUrlQueryParam('expected');
+    var github    = getUrlQueryParam('github');
+    compareImages(expected, github, processed);
+});
\ No newline at end of file
diff --git a/tests/UI/screenshot-diffs/singlediff.html b/tests/UI/screenshot-diffs/singlediff.html
new file mode 100644
index 0000000000..a91ffa7a40
--- /dev/null
+++ b/tests/UI/screenshot-diffs/singlediff.html
@@ -0,0 +1,27 @@
+<html>
+<head>
+    <!-- loaded when on build-artifacts -->
+    <script src='jquery.js'></script>
+    <script src='resemble.js'></script>
+    <!-- loaded when viewing within piwik -->
+    <script src='../../../../libs/bower_components/jquery/dist/jquery.min.js'></script>
+    <script src='../../../../tests/lib/resemblejs/resemble.js'></script>
+    <script src='diffgenerator.js'></script>
+</head>
+<body>
+
+<span class="info"></span>
+<br />
+<br />
+<img class="diff">
+
+<h2>Processed</h2>
+<img class="processed">
+
+<h2>Expected</h2>
+<img class="expected">
+
+<h2>Expected GitHub</h2>
+<img class="expectedGithub">
+
+</body></html>
\ No newline at end of file
diff --git a/tests/UI/specs/ActionsDataTable_spec.js b/tests/UI/specs/ActionsDataTable_spec.js
new file mode 100644
index 0000000000..7f4874b37e
--- /dev/null
+++ b/tests/UI/specs/ActionsDataTable_spec.js
@@ -0,0 +1,94 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * ActionsDataTable screenshot tests.
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+describe("ActionsDataTable", function () {
+    this.timeout(0);
+
+    var url = "?module=Widgetize&action=iframe&idSite=1&period=year&date=2012-08-09&moduleToWidgetize=Actions&actionToWidgetize=getPageUrls&isFooterExpandedInDashboard=1";
+
+    it("should load correctly", function (done) {
+        expect.screenshot('initial').to.be.capture(function (page) {
+            page.load(url);
+        }, done);
+    });
+
+    it("should sort column correctly when column header clicked", function (done) {
+        expect.screenshot('column_sorted').to.be.capture(function (page) {
+            page.click('th#avg_time_on_page');
+        }, done);
+    });
+
+    it("should load subtables correctly when row clicked", function (done) {
+        expect.screenshot('subtables_loaded').to.be.capture(function (page) {
+            page.click('tr.subDataTable:first');
+            page.click('tr.subDataTable:eq(2)');
+        }, done);
+    });
+
+    it("should flatten table when flatten link clicked", function (done) {
+        expect.screenshot('flattened').to.be.capture(function (page) {
+            page.mouseMove('.tableConfiguration');
+            page.click('.dataTableFlatten');
+        }, done);
+    });
+
+    // Test is skipped as it randomly fails http://builds-artifacts.piwik.org/ui-tests.master/2433.1/screenshot-diffs/diffviewer.html
+    it.skip("should exclude low population rows when exclude low population link clicked", function (done) {
+        expect.screenshot('exclude_low_population').to.be.capture(function (page) {
+            page.mouseMove('.tableConfiguration');
+            page.click('.dataTableExcludeLowPopulation');
+        }, done);
+    });
+
+    it("should load normal view when switch to view hierarchical view link is clicked", function (done) {
+        expect.screenshot('unflattened').to.be.capture(function (page) {
+            // exclude low population (copied from exclude_low_population test above as it was 'skipped')
+            page.mouseMove('.tableConfiguration');
+            page.click('.dataTableExcludeLowPopulation');
+
+            page.mouseMove('.tableConfiguration');
+            page.click('.dataTableFlatten');
+        }, done);
+    });
+
+    it("should display pageview percentages when hovering over pageviews column", function (done) {
+        expect.screenshot('pageview_percentages').to.be.capture(function (page) {
+            page.mouseMove('tr:eq(2) td.column:first');
+        }, done);
+    });
+
+    it("should generate a proper title for the visitor log segmented by the current row", function (done) {
+        expect.screenshot('segmented_visitor_log_hover').to.be.capture(function (page) {
+            var row = 'tr:eq(2) ';
+            page.mouseMove(row + 'td.column:first');
+            page.mouseMove(row + 'td.label .actionSegmentVisitorLog');
+        }, done);
+    });
+
+    it("should open the visitor log segmented by the current row", function (done) {
+        expect.screenshot('segmented_visitor_log').to.be.capture(function (page) {
+            page.click('tr:eq(2) td.label .actionSegmentVisitorLog');
+        }, done);
+    });
+
+    it("should display unique pageview percentages when hovering over unique pageviews column", function (done) {
+        expect.screenshot('unique_pageview_percentages').to.be.capture(function (page) {
+            page.click('.ui-widget .ui-dialog-titlebar-close');
+
+            page.mouseMove('tr:eq(2) td.column:eq(1)');
+        }, done);
+    });
+
+    it("should search through table when search input entered and search button clicked", function (done) {
+        expect.screenshot('search').to.be.capture(function (page) {
+            page.sendKeys('.dataTableSearchPattern>input[type=text]', 'i');
+            page.click('.dataTableSearchPattern>input[type=submit]');
+        }, done);
+    });
+});
\ No newline at end of file
diff --git a/tests/UI/specs/BarGraph_spec.js b/tests/UI/specs/BarGraph_spec.js
new file mode 100644
index 0000000000..0acdd15662
--- /dev/null
+++ b/tests/UI/specs/BarGraph_spec.js
@@ -0,0 +1,33 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * Bar graph screenshot tests.
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+describe("BarGraph", function () {
+    this.timeout(0);
+
+    var url = "?module=Widgetize&action=iframe&moduleToWidgetize=Referrers&idSite=1&period=year&date=2012-08-09&"
+            + "actionToWidgetize=getKeywords&viewDataTable=graphVerticalBar&isFooterExpandedInDashboard=1";
+
+    it("should load correctly", function (done) {
+        expect.screenshot("load").to.be.capture(function (page) {
+            page.load(url);
+        }, done);
+    });
+
+    it("should display the metric picker on hover of metric picker icon", function (done) {
+        expect.screenshot('metric_picker_shown').to.be.capture(function (page) {
+            page.mouseMove('.jqplot-seriespicker');
+        }, done);
+    });
+
+    it("should display multiple metrics when another metric picked", function (done) {
+        expect.screenshot('other_metric').to.be.capture(function (page) {
+            page.click('.jqplot-seriespicker-popover input:not(:checked)');
+        }, done);
+    });
+});
\ No newline at end of file
diff --git a/tests/UI/specs/DBStats_spec.js b/tests/UI/specs/DBStats_spec.js
new file mode 100644
index 0000000000..81b815e14f
--- /dev/null
+++ b/tests/UI/specs/DBStats_spec.js
@@ -0,0 +1,20 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * Screenshot tests for the DBStats plugin.
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+describe("DBStats", function () {
+    this.timeout(0);
+
+    var url = "?module=DBStats&action=index&idSite=1&period=day&date=yesterday";
+
+    it("should load correctly", function (done) {
+        expect.screenshot('admin_page').to.be.captureSelector('#content', function (page) {
+            page.load(url);
+        }, done);
+    });
+});
\ No newline at end of file
diff --git a/tests/UI/specs/DashboardManager_spec.js b/tests/UI/specs/DashboardManager_spec.js
new file mode 100644
index 0000000000..9ada832b83
--- /dev/null
+++ b/tests/UI/specs/DashboardManager_spec.js
@@ -0,0 +1,52 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * Dashboard manager screenshot tests.
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+describe("DashboardManager", function () {
+
+    this.timeout(0);
+
+    var selectorToCapture = '.dashboard-manager';
+    var url = "?module=CoreHome&action=index&idSite=1&period=day&date=2012-01-01";
+
+    it("should load correctly", function (done) {
+        expect.screenshot("loaded").to.be.captureSelector(selectorToCapture, function (page) {
+            page.load(url);
+        }, done);
+    });
+
+    it("should expand when clicked", function (done) {
+        expect.screenshot("expanded").to.be.captureSelector(selectorToCapture, function (page) {
+            page.click('.dashboard-manager');
+        }, done);
+    });
+
+    it("should show widget for a category when category label hovered", function (done) {
+        expect.screenshot("widget_list_shown").to.be.captureSelector(selectorToCapture, function (page) {
+            page.mouseMove('.widgetpreview-categorylist>li:contains(Live!)'); // have to mouse move twice... otherwise Live! will just be highlighted
+            page.mouseMove('.widgetpreview-categorylist>li:contains(Visits Summary)');
+        }, done);
+    });
+
+    it("should load a widget preview when a widget is hovered", function (done) {
+        expect.screenshot("widget_preview").to.be.captureSelector(selectorToCapture, function (page) {
+            page.mouseMove('.widgetpreview-widgetlist>li:contains(Visits Over Time)');
+        }, done);
+    });
+
+    it("should close the manager when a widget is selected", function (done) {
+        expect.screenshot("loaded").to.be.captureSelector("widget_selected", selectorToCapture, function (page) {
+            // make sure selecting a widget does nothing
+            page.evaluate(function () {
+                $('.dashboard-manager').data('uiControlObject').widgetSelected = function () {};
+            });
+
+            page.click('.widgetpreview-widgetlist>li:contains(Visits Over Time)');
+        }, done);
+    });
+});
\ No newline at end of file
diff --git a/tests/UI/specs/Dashboard_spec.js b/tests/UI/specs/Dashboard_spec.js
new file mode 100644
index 0000000000..b485943449
--- /dev/null
+++ b/tests/UI/specs/Dashboard_spec.js
@@ -0,0 +1,216 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * Dashboard screenshot tests.
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+// TODO: should move this & dashboard manager test to Dashboard plugin
+describe("Dashboard", function () {
+    this.timeout(0);
+
+    var url = "?module=Widgetize&action=iframe&idSite=1&period=year&date=2012-08-09&moduleToWidgetize=Dashboard&"
+            + "actionToWidgetize=index&idDashboard=5";
+
+    var removeAllExtraDashboards = function (done) {
+        testEnvironment.callController("Dashboard.getAllDashboards", {}, function (err, dashboards) {
+            dashboards = (dashboards || []).filter(function (dash) {
+                return parseInt(dash.iddashboard) > 5;
+            });
+
+            var removeDashboard = function (i) {
+                if (i >= dashboards.length) {
+                    done();
+                    return;
+                }
+
+                console.log("Removing dashboard ID = " + dashboards[i].iddashboard);
+                testEnvironment.callController("Dashboard.removeDashboard", {idDashboard: dashboards[i].iddashboard}, function () {
+                    removeDashboard(i + 1);
+                });
+            };
+
+            removeDashboard(0);
+        });
+    };
+
+    var setup = function (done) {
+        // save empty layout for dashboard ID = 5
+        var layout = [
+            [
+                {
+                    uniqueId: "widgetVisitsSummarygetEvolutionGraphcolumnsArray",
+                    parameters: {module: "VisitsSummary", action: "getEvolutionGraph", columns: "nb_visits"}
+                }
+            ],
+            [],
+            []
+        ];
+
+        // TODO: should probably include an async lib
+        testEnvironment.callController("Dashboard.saveLayout", {name: 'D4', layout: JSON.stringify(layout), idDashboard: 5, idSite: 2}, function () {
+            // reset default widget selection
+            testEnvironment.callController("Dashboard.saveLayoutAsDefault", {layout: 0}, function () {
+                removeAllExtraDashboards(done);
+            });
+        });
+    };
+
+    before(setup);
+    after(setup);
+
+    it("should load correctly", function (done) {
+        expect.screenshot("loaded").to.be.capture(function (page) {
+            page.load(url, 5000);
+        }, done);
+    });
+
+    it("should move a widget when widget is drag & dropped", function (done) {
+        expect.screenshot("widget_move").to.be.capture(function (page) {
+            page.mousedown('.widgetTop');
+            page.mouseMove('#dashboardWidgetsArea > .col:eq(2)');
+            page.mouseup('#dashboardWidgetsArea > .col:eq(2)');
+        }, done);
+    });
+
+    it("should refresh widget when widget refresh icon clicked", function (done) {
+        expect.screenshot("widget_move").to.be.capture("widget_refresh", function (page) {
+            page.mouseMove('.widgetTop');
+            page.click('.button#refresh');
+            page.mouseMove('.dashboard-manager'); // let widget top hide again
+        }, done);
+    });
+
+    it("should minimise widget when widget minimise icon clicked", function (done) {
+        expect.screenshot("widget_minimised").to.be.capture(function (page) {
+            page.mouseMove('.widgetTop');
+            page.click('.button#minimise');
+        }, done);
+    });
+
+    it("should unminimise widget when widget maximise icon is clicked after being minimised", function (done) {
+        expect.screenshot("widget_move").to.be.capture("widget_unminimised", function (page) {
+            page.mouseMove('.widgetTop');
+            page.click('.button#maximise');
+            page.mouseMove('.dashboard-manager'); // let widget top hide again
+        }, done);
+    });
+
+    it("should maximise widget when widget maximise icon is clicked", function (done) {
+        expect.screenshot("widget_maximise").to.be.capture(function (page) {
+            page.mouseMove('.widgetTop');
+            page.click('.button#maximise');
+        }, done);
+    });
+
+    it("should close maximise dialog when minimise icon is clicked", function (done) {
+        expect.screenshot("widget_move").to.be.capture("widget_unmaximise", function (page) {
+            page.mouseMove('.widgetTop');
+            page.click('.button#minimise');
+            page.mouseMove('.dashboard-manager'); // let widget top hide again
+        }, done);
+    });
+
+    it("should add a widget when a widget is selected in the dashboard manager", function (done) {
+        expect.screenshot("widget_add_widget").to.be.capture(function (page) {
+            page.click('.dashboard-manager');
+
+            page.mouseMove('.widgetpreview-categorylist>li:contains(Live!)'); // have to mouse move twice... otherwise Live! will just be highlighted
+            page.mouseMove('.widgetpreview-categorylist>li:contains(Visits Summary)');
+
+            page.mouseMove('.widgetpreview-widgetlist>li:contains(Visits by Local Time)');
+
+            page.click('.widgetpreview-widgetlist>li:contains(Visits by Local Time)');
+        }, done);
+    });
+
+    it("should remove widget when remove widget icon is clicked", function (done) {
+        expect.screenshot("widget_move").to.be.capture("widget_removed", function (page) {
+            page.mouseMove('#widgetVisitTimegetVisitInformationPerLocalTime .widgetTop');
+            page.click('#widgetVisitTimegetVisitInformationPerLocalTime .button#close');
+            page.click('.ui-dialog button>span:contains(Yes)');
+            page.mouseMove('.dashboard-manager');
+        }, done);
+    });
+
+    it("should change dashboard layout when new layout is selected", function (done) {
+        expect.screenshot("change_layout").to.be.capture(function (page) {
+            page.click('.dashboard-manager');
+            page.click('li[data-action=showChangeDashboardLayoutDialog]');
+            page.click('div[layout=50-50]');
+            page.click('.ui-dialog button>span:contains(Save)', 3000);
+        }, done);
+    });
+
+    it("should rename dashboard when dashboard rename process completed", function (done) {
+        expect.screenshot("rename").to.be.capture(function (page) {
+            page.click('.dashboard-manager');
+            page.click('li[data-action=renameDashboard]');
+            page.evaluate(function () {
+                $('#newDashboardName').val('');
+            });
+            page.sendKeys('#newDashboardName', 'newname');
+
+            // sending a mouse event doesn't seem to work...
+            page.click('.ui-dialog[aria-describedby=renameDashboardConfirm] button>span:contains(Save)');
+        }, done);
+    });
+
+    it("should copy dashboard successfully when copy dashboard process completed", function (done) {
+        expect.screenshot("copied").to.be.capture(function (page) {
+            page.click('.dashboard-manager');
+            page.click('li[data-action=copyDashboardToUser]');
+            page.evaluate(function () {
+                $('#copyDashboardName').val('');
+            });
+            page.sendKeys('#copyDashboardName', 'newdash');
+            page.evaluate(function () {
+                $('#copyDashboardUser').val('superUserLogin');
+            });
+            page.click('.ui-dialog button>span:contains(Ok)');
+
+            page.load(url.replace("idDashboard=5", "idDashboard=6"));
+        }, done);
+    });
+
+    it("should reset dashboard when reset dashboard process completed", function (done) {
+        expect.screenshot("reset").to.be.capture(function (page) {
+            page.click('.dashboard-manager');
+            page.click('li[data-action=resetDashboard]');
+            page.click('.ui-dialog button>span:contains(Yes)', 10000);
+            page.mouseMove('.dashboard-manager');
+        }, done);
+    });
+
+    it("should remove dashboard when remove dashboard process completed", function (done) {
+        expect.screenshot("removed").to.be.capture(function (page) {
+            page.click('.dashboard-manager');
+            page.click('li[data-action=removeDashboard]');
+            page.click('.ui-dialog[aria-describedby=removeDashboardConfirm] button>span:contains(Yes)');
+            page.mouseMove('.dashboard-manager');
+            page.evaluate(function () {
+                $('.widgetTop').removeClass('widgetTopHover');
+            });
+        }, done);
+    });
+
+    it("should not fail when default widget selection changed", function (done) {
+        expect.screenshot("default_widget_selection_changed").to.be.capture(function (page) {
+            page.load(url);
+            page.click('.dashboard-manager');
+            page.click('li[data-action=setAsDefaultWidgets]');
+            page.click('.ui-dialog button>span:contains(Yes)');
+        }, done);
+    });
+
+    it("should create new dashboard with new default widget selection when create dashboard process completed", function (done) {
+        expect.screenshot("create_new").to.be.capture(function (page) {
+            page.click('.dashboard-manager');
+            page.click('li[data-action=createDashboard]');
+            page.sendKeys('#createDashboardName', 'newdash2');
+            page.click('.ui-dialog[aria-describedby=createDashboardConfirm] button>span:contains(Yes)');
+        }, done);
+    });
+});
\ No newline at end of file
diff --git a/tests/UI/specs/EvolutionGraph_spec.js b/tests/UI/specs/EvolutionGraph_spec.js
new file mode 100644
index 0000000000..56f3b89cec
--- /dev/null
+++ b/tests/UI/specs/EvolutionGraph_spec.js
@@ -0,0 +1,143 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * evolution graph screenshot tests.
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+describe("EvolutionGraph", function () {
+    this.timeout(0);
+
+    var url = "?module=Widgetize&action=iframe&idSite=1&period=day&date=2012-01-31&evolution_day_last_n=30"
+            + "&moduleToWidgetize=UserCountry&actionToWidgetize=getCountry&viewDataTable=graphEvolution"
+            + "&isFooterExpandedInDashboard=1";
+
+    before(function (done) {
+        testEnvironment.callApi("Annotations.deleteAll", {idSite: 3}, done);
+    });
+
+    it("should load correctly", function (done) {
+        expect.screenshot('initial').to.be.capture(function (page) {
+            page.load(url);
+        }, done);
+    });
+
+    it("should show percent metrics like bounce rate correctly", function (done) {
+        expect.screenshot('bounce_rate').to.be.capture(function (page) {
+            page.load(url + "&columns=nb_visits,bounce_rate,avg_time_on_site&filter_add_columns_when_show_all_columns=0");
+        }, done);
+    });
+
+    it("should show only one series when a label is specified", function (done) {
+        expect.screenshot('one_series').to.be.capture(function (page) {
+            page.load(url + "&label=Canada");
+        }, done);
+    });
+
+    it("should display the metric picker on hover of metric picker icon", function (done) {
+        expect.screenshot('metric_picker_shown').to.be.capture(function (page) {
+            page.mouseMove('.jqplot-seriespicker');
+        }, done);
+    });
+
+    it("should show multiple metrics when another metric picked", function (done) {
+        expect.screenshot('two_metrics').to.be.capture(function (page) {
+            page.click('.jqplot-seriespicker-popover input:not(:checked)');
+        }, done);
+    });
+
+    it("should show graph as image when export as image icon clicked", function (done) {
+        expect.screenshot('export_image').to.be.capture(function (page) {
+            page.click('#dataTableFooterExportAsImageIcon>a');
+        }, done);
+    });
+
+    it("should display more periods when limit selection changed", function (done) {
+        expect.screenshot('limit_changed').to.be.capture(function (page) {
+            page.click('.limitSelection');
+            page.evaluate(function () {
+                $('.limitSelection ul li[value=60]').click();
+            });
+        }, done);
+    });
+
+    // annotations tests
+    it("should show annotations when annotation icon on x-axis clicked", function (done) {
+        expect.screenshot('annotations_single_period').to.be.capture(function (page) {
+            page.evaluate(function () {
+                $('.limitSelection ul li[value=30]').click(); // change limit back
+            });
+
+            page.click('.evolution-annotations>span[data-count!=0]', 3000);
+        }, done);
+    });
+
+    it("should show all annotations when annotations footer link clicked", function (done) {
+        expect.screenshot('annotations_all').to.be.capture(function (page) {
+            page.click('.annotationView', 3000);
+        }, done);
+    });
+
+    it("should show no annotations message when no annotations for site", function (done) {
+        expect.screenshot('annotations_none').to.be.capture(function (page) {
+            page.load(page.getCurrentUrl().replace(/idSite=[^&]*/, "idSite=3") + "&columns=nb_visits");
+            page.click('.annotationView', 3000);
+        }, done);
+    });
+
+    it("should show add annotation form when create annotation clicked", function (done) {
+        expect.screenshot('new_annotation_form').to.be.capture(function (page) {
+            page.click('.add-annotation');
+            page.click('.annotation-period-edit>a');
+            page.evaluate(function () {
+                $('.datepicker').datepicker("setDate", new Date(2012,0,02) );
+                $(".ui-datepicker-current-day").trigger("click"); // this triggers onSelect event which sets .annotation-period-edit>a
+            });
+        }, done);
+    });
+
+    it("should add new annotation when create annotation submitted", function (done) {
+        expect.screenshot('new_annotation_submit').to.be.capture(function (page) {
+            page.sendKeys('.new-annotation-edit', 'new annotation');
+            page.click('.annotation-period-edit>a');
+            page.evaluate(function () {
+                $('.ui-datepicker-calendar td a:contains(15)').click();
+            });
+            page.click('.annotation-list-range');
+            page.click('input.new-annotation-save', 3000);
+        }, done);
+    });
+
+    it("should star annotation when star image clicked", function (done) {
+        expect.screenshot('annotation_starred').to.be.capture(function (page) {
+            page.click('.annotation-star');
+        }, done);
+    });
+
+    it("should show edit annotation form", function (done) {
+        expect.screenshot('annotation_edit_form').to.be.capture(function (page) {
+            page.click('.edit-annotation');
+        }, done);
+    });
+
+    it("should edit annotation when edit form submitted", function (done) {
+        expect.screenshot('annotation_edit_submit').to.be.capture(function (page) {
+            page.sendKeys('.annotation-edit', 'edited annotation');
+            page.click('.annotation-period-edit>a');
+            page.evaluate(function () {
+                $('.ui-datepicker-calendar td a:contains(16)').click();
+            });
+            page.click('.annotation-list-range');
+            page.click('input.annotation-save', 3000);
+        }, done);
+    });
+
+    it("should delete annotation when delete link clicked", function (done) {
+        expect.screenshot('annotation_delete').to.be.capture(function (page) {
+            page.click('.edit-annotation');
+            page.click('.delete-annotation');
+        }, done);
+    });
+});
\ No newline at end of file
diff --git a/tests/UI/specs/GoalsTable_spec.js b/tests/UI/specs/GoalsTable_spec.js
new file mode 100644
index 0000000000..d74b036367
--- /dev/null
+++ b/tests/UI/specs/GoalsTable_spec.js
@@ -0,0 +1,56 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * GoalsTable screenshot tests.
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+describe("GoalsTable", function () {
+    this.timeout(0);
+
+    var url = "?module=Widgetize&action=iframe&moduleToWidgetize=Referrers&idSite=1&period=year&date=2012-08-09&"
+            + "actionToWidgetize=getKeywords&viewDataTable=table&filter_limit=5&isFooterExpandedInDashboard=1";
+
+    it("should load when the goals icon is clicked", function (done) {
+        expect.screenshot('initial').to.be.capture(function (page) {
+            page.load(url);
+            page.click('.tableIconsGroup a[data-footer-icon-id=tableGoals]');
+        }, done);
+    });
+
+    it("should show columns for all goals when idGoal is 0", function (done) {
+        expect.screenshot('goals_table_full').to.be.capture(function (page) {
+            var url = page.getCurrentUrl().replace(/viewDataTable=[^&]*/, "viewDataTable=tableGoals") + "&idGoal=0";
+            page.load(url);
+        }, done);
+    });
+
+    it("should show columns for a single goal when idGoal is 1", function (done) {
+        expect.screenshot('goals_table_single').to.be.capture(function (page) {
+            page.load(page.getCurrentUrl().replace(/idGoal=[^&]*/, "idGoal=1"));
+        }, done);
+    });
+
+    it("should show an ecommerce view when idGoal is ecommerceOrder", function (done) {
+        expect.screenshot('goals_table_ecommerce').to.be.capture(function (page) {
+            page.load(page.getCurrentUrl().replace(/idGoal=[^&]*/, "idGoal=ecommerceOrder"));
+        }, done);
+    });
+
+    it("should show a special view when idGoal is ecommerceOrder and viewDataTable is ecommerceOrder", function (done) {
+        expect.screenshot('goals_table_ecommerce_view').to.be.capture(function (page) {
+            var url = page.getCurrentUrl().replace(/moduleToWidgetize=[^&]*/, "moduleToWidgetize=Goals")
+                                          .replace(/actionToWidgetize=[^&]*/, "actionToWidgetize=getItemsSku")
+                                          .replace(/viewDataTable=[^&]*/, "viewDataTable=ecommerceOrder");
+            page.load(url);
+        }, done);
+    });
+
+    it("should show abandoned carts data when the abandoned carts link is clicked", function (done) {
+        expect.screenshot('goals_table_abandoned_carts').to.be.capture(function (page) {
+            page.click('.tableIconsGroup a[data-footer-icon-id=ecommerceAbandonedCart]');
+        }, done);
+    });
+});
\ No newline at end of file
diff --git a/tests/UI/specs/Installation_spec.js b/tests/UI/specs/Installation_spec.js
new file mode 100644
index 0000000000..3f7bbbf387
--- /dev/null
+++ b/tests/UI/specs/Installation_spec.js
@@ -0,0 +1,136 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * Installation screenshot tests.
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+var fs = require('fs');
+
+describe("Installation", function () {
+    this.timeout(0);
+
+    this.fixture = null;
+
+    before(function () {
+        testEnvironment.testUseRegularAuth = 1;
+        testEnvironment.configFileLocal = path.join(PIWIK_INCLUDE_PATH, "/tmp/test.config.ini.php");
+        testEnvironment.dontUseTestConfig = true;
+        testEnvironment.tablesPrefix = 'piwik_';
+        testEnvironment.save();
+
+        if (fs.exists(testEnvironment.configFileLocal)) {
+            fs.remove(testEnvironment.configFileLocal);
+        }
+    });
+
+    after(function () {
+        delete testEnvironment.configFileLocal;
+        delete testEnvironment.dontUseTestConfig;
+        delete testEnvironment.tablesPrefix;
+        delete testEnvironment.testUseRegularAuth;
+        testEnvironment.save();
+    });
+
+    it("should display an error message when trying to access a resource w/o a config.ini.php file", function (done) {
+        expect.screenshot("access_no_config").to.be.capture(function (page) {
+            page.load("?module=CoreHome&action=index&ignoreClearAllViewDataTableParameters=1");
+        }, done);
+    });
+
+    it("should start the installation process when the index is visited w/o a config.ini.php file", function (done) {
+        expect.screenshot("start").to.be.capture(function (page) {
+            page.load("?ignoreClearAllViewDataTableParameters=1");
+        }, done);
+    });
+
+    it("should display the system check page when next is clicked on the first page", function (done) {
+        expect.screenshot("system_check").to.be.capture(function (page) {
+            page.click('.submit');
+        }, done);
+    });
+
+    it("should display the database setup page when next is clicked on the system check page", function (done) {
+        expect.screenshot("db_setup").to.be.capture(function (page) {
+            page.click('.submit');
+        }, done);
+    });
+
+    it("should fail when the next button is clicked and no database info is entered in the form", function (done) {
+        expect.screenshot("db_setup_fail").to.be.capture(function (page) {
+            page.click('.submit');
+        }, done);
+    });
+
+    it("should display the tables created page when next is clicked on the db setup page w/ correct info entered in the form", function (done) {
+        expect.screenshot("db_created").to.be.capture(function (page) {
+            var dbInfo = testEnvironment.readDbInfoFromConfig();
+            var username = dbInfo.username;
+            var password = dbInfo.password;
+
+            page.sendKeys('input[name=username]', username);
+
+            if (password) {
+                page.sendKeys('input[name=password]', password);
+            }
+
+            page.sendKeys('input[name=dbname]', 'newdb');
+            page.click('.submit');
+        }, done);
+    });
+
+    it("should display the superuser configuration page when next is clicked on the tables created page", function (done) {
+        expect.screenshot("superuser").to.be.capture(function (page) {
+            page.click('.submit');
+        }, done);
+    });
+
+    it("should fail when incorrect information is entered in the superuser configuration page", function (done) {
+        expect.screenshot("superuser_fail").to.be.capture(function (page) {
+            page.click('.submit');
+        }, done);
+    });
+
+    it("should display the setup a website page when next is clicked on the filled out superuser config page", function (done) {
+        expect.screenshot("setup_website").to.be.capture(function (page) {
+            page.sendKeys('input[name=login]', 'thesuperuser');
+            page.sendKeys('input[name=password]', 'thepassword');
+            page.sendKeys('input[name=password_bis]', 'thepassword');
+            page.sendKeys('input[name=email]', 'hello@piwik.org');
+            page.click('.submit');
+            page.wait(3000);
+        }, done);
+    });
+
+    it("should should fail when incorrect information is entered in the setup a website page", function (done) {
+        expect.screenshot("setup_website_fail").to.be.capture(function (page) {
+            page.click('.submit');
+        }, done);
+    });
+
+    it("should display the javascript tracking page when correct information is entered in the setup website page and next is clicked", function (done) {
+        expect.screenshot("js_tracking").to.be.capture(function (page) {
+            page.sendKeys('input[name=siteName]', 'Serenity');
+            page.sendKeys('input[name=url]', 'serenity.com');
+            page.evaluate(function () {
+                $('select[name=timezone]').val('Europe/Paris');
+                $('select[name=ecommerce]').val('1');
+            });
+            page.click('.submit');
+            page.wait(3000);
+        }, done);
+    });
+
+    it("should display the congratulations page when next is clicked on the javascript tracking page", function (done) {
+        expect.screenshot("congrats").to.be.capture(function (page) {
+            page.click('.submit');
+        }, done);
+    });
+
+    it("should continue to piwik after submitting on the privacy settings form in the congrats page", function (done) {
+        expect.screenshot('login_form', 'Login').to.be.capture(function (page) {
+            page.click('.submit');
+        }, done);
+    });
+});
\ No newline at end of file
diff --git a/tests/UI/specs/Login_spec.js b/tests/UI/specs/Login_spec.js
new file mode 100644
index 0000000000..bb8372e601
--- /dev/null
+++ b/tests/UI/specs/Login_spec.js
@@ -0,0 +1,98 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * login & password reset screenshot tests.
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+describe("Login", function () {
+    this.timeout(0);
+
+    var md5Pass = "0adcc0d741277f74c64c8abab7330d1c", // md5("smarty-pants")
+        formlessLoginUrl = "?module=Login&action=logme&login=oliverqueen&password=" + md5Pass;
+
+    before(function () {
+        testEnvironment.testUseRegularAuth = 1;
+        testEnvironment.queryParamOverride = {date: "2012-01-01", period: "year"};
+        testEnvironment.save();
+    });
+
+    after(function () {
+        testEnvironment.testUseRegularAuth = 0;
+        delete testEnvironment.queryParamOverride;
+        testEnvironment.save();
+    });
+
+    it("should load correctly", function (done) {
+        expect.screenshot("login_form").to.be.capture(function (page) {
+            page.load("");
+        }, done);
+    });
+
+    it("should fail when incorrect credentials are supplied", function (done) {
+        expect.screenshot("login_fail").to.be.capture(function (page) {
+            page.sendKeys('#login_form_login', 'superUserLogin');
+            page.sendKeys('#login_form_password', 'wrongpassword');
+            page.click('#login_form_submit');
+        }, done);
+    });
+
+    it("should redirect to Piwik when correct credentials are supplied", function (done) {
+        expect.current_page.contains("#dashboard", function (page) {
+            page.sendKeys("#login_form_login", "superUserLogin");
+            page.sendKeys("#login_form_password", "superUserPass");
+            page.click("#login_form_submit");
+        }, done);
+    });
+
+    it("should redirect to login when logout link clicked", function (done) {
+        expect.screenshot("login_form").to.be.capture("logout_form", function (page) {
+            page.click("#topBars span.title:contains(superUserLogin)");
+            page.wait(250);
+            page.click("#topBars a:contains(Sign out)");
+        }, done);
+    });
+
+    it("should display password reset form when forgot password link clicked", function (done) {
+        expect.screenshot("forgot_password").to.be.capture(function (page) {
+            page.reload();
+            page.click("a#login_form_nav");
+        }, done);
+    });
+
+    it("should send email when password reset form submitted", function (done) {
+        expect.screenshot("password_reset").to.be.capture(function (page) {
+            page.sendKeys("#reset_form_login", "superUserLogin");
+            page.sendKeys("#reset_form_password", "superUserPass2");
+            page.sendKeys("#reset_form_password_bis", "superUserPass2");
+            page.click("#reset_form_submit", 3000);
+        }, done);
+    });
+
+    it("should reset password when password reset link is clicked", function (done) {
+        expect.screenshot("password_reset_complete").to.be.capture(function (page) {
+            var expectedMailOutputFile = PIWIK_INCLUDE_PATH + '/tmp/Login.resetPassword.mail.json',
+                mailSent = JSON.parse(require("fs").read(expectedMailOutputFile)),
+                resetUrl = mailSent.contents.match(/http:\/\/.*/)[0];
+
+            page.load(resetUrl);
+        }, done);
+    });
+
+    it("should login successfully when new credentials used", function (done) {
+        expect.page("").contains("#dashboard", function (page) {
+            page.sendKeys("#login_form_login", "superUserLogin");
+            page.sendKeys("#login_form_password", "superUserPass2");
+            page.click("#login_form_submit");
+        }, done);
+    });
+
+    it("should login successfully when formless login used", function (done) {
+        expect.page("").contains('#dashboard', 'formless_login', function (page) {
+            page.click("#topBars a:contains(Sign out)");
+            page.load(formlessLoginUrl);
+        }, done);
+    });
+});
\ No newline at end of file
diff --git a/tests/UI/specs/Menus_spec.js b/tests/UI/specs/Menus_spec.js
new file mode 100644
index 0000000000..45c9efafb0
--- /dev/null
+++ b/tests/UI/specs/Menus_spec.js
@@ -0,0 +1,48 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * Screenshot tests for main, top and admin menus.
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+describe("Menus", function () {
+    this.timeout(0);
+
+    var generalParams = 'idSite=1&period=year&date=2012-08-09',
+        urlBase = 'module=CoreHome&action=index&' + generalParams
+        ;
+
+    // main menu tests
+    it('should load the main reporting menu correctly', function (done) {
+        expect.screenshot('mainmenu_loaded').to.be.captureSelector('.Menu--dashboard,.nav_sep', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=Actions&action=menuGetPageUrls");
+        }, done);
+    });
+
+    it('should change the menu when a upper menu item is clicked in the main menu', function (done) {
+        expect.screenshot('mainmenu_upper_clicked').to.be.captureSelector('.Menu--dashboard,.nav_sep', function (page) {
+            page.click('#VisitsSummary>a');
+        }, done);
+    });
+
+    it('should change the menu when a lower menu item is clicked in the main menu', function (done) {
+        expect.screenshot('mainmenu_lower_clicked').to.be.captureSelector('.Menu--dashboard,.nav_sep', function (page) {
+            page.click('#Live_indexVisitorLog>a');
+        }, done);
+    });
+
+    // admin menu tests
+    it('should load the admin reporting menu correctly', function (done) {
+        expect.screenshot('admin_loaded').to.be.captureSelector('.Menu--admin', function (page) {
+            page.load("?" + generalParams + "&module=UsersManager&action=userSettings");
+        }, done);
+    });
+
+    it('should change the admin page correctly when an admin menu item is clicked', function (done) {
+        expect.screenshot('admin_changed').to.be.captureSelector('.Menu--admin', function (page) {
+            page.click('.Menu--admin a:contains(Websites)');
+        }, done);
+    });
+});
\ No newline at end of file
diff --git a/tests/UI/specs/Overlay_spec.js b/tests/UI/specs/Overlay_spec.js
new file mode 100644
index 0000000000..f38e747474
--- /dev/null
+++ b/tests/UI/specs/Overlay_spec.js
@@ -0,0 +1,97 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * Overlay screenshot tests.
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+// TODO: should be stored in Overlay plugin
+describe("Overlay", function () {
+    this.timeout(0);
+
+    var url = null;
+
+    before(function (done) {
+        url = "?module=Overlay&period=year&date=today&idSite=3#l=" + encodeURIComponent(testEnvironment.overlayUrl).replace(/[%]/g, "$");
+        
+        testEnvironment.callApi("SitesManager.addSiteAliasUrls", {idSite: 3, urls: [config.piwikUrl]}, done);
+    });
+
+    after(function (done) {
+        testEnvironment.callApi("SitesManager.setSiteAliasUrls", {idSite: 3, urls: []}, done);
+    });
+
+    it("should load correctly", function (done) {
+        expect.screenshot("loaded").to.be.capture(function (page) {
+            page.load(url);
+        }, done);
+    });
+
+    it("should show clicks when hover over link in iframe", function (done) {
+        expect.screenshot("page_link_clicks").to.be.capture(function (page) {
+            var pos = page.webpage.evaluate(function () {
+                var iframe = $('iframe'),
+                    innerOffset = $('.btn.btn-lg', iframe.contents()).offset();
+                return {
+                    x: iframe.offset().left + innerOffset.left,
+                    y: iframe.offset().top + innerOffset.top
+                };
+            });
+            page.sendMouseEvent('mousemove', pos);
+        }, done);
+    });
+
+    it("should show stats for new links when dropdown opened", function (done) {
+        expect.screenshot("page_new_links").to.be.capture(function (page) {
+            var pos = page.webpage.evaluate(function () {
+                var iframe = $('iframe'),
+                    innerOffset = $('.dropdown-toggle', iframe.contents()).offset();
+                return {
+                    x: iframe.offset().left + innerOffset.left + 32, // position is incorrect for some reason w/o adding pixels
+                    y: iframe.offset().top + innerOffset.top
+                };
+            });
+            page.sendMouseEvent('click', pos, 2000);
+        }, done);
+    });
+
+    it("should change page when clicking on internal iframe link", function (done) {
+        expect.screenshot("page_change").to.be.capture(function (page) {
+            var pos = page.webpage.evaluate(function () {
+                var iframe = $('iframe'),
+                    innerOffset = $('ul.nav>li:nth-child(2)>a', iframe.contents()).offset();
+                return {
+                    x: iframe.offset().left + innerOffset.left + 32, // position is incorrect for some reason w/o adding pixels
+                    y: iframe.offset().top + innerOffset.top
+                };
+            });
+            page.sendMouseEvent('click', pos);
+        }, done);
+    });
+
+    it("should change date range when period changed", function (done) {
+        expect.screenshot("period_change").to.be.capture(function (page) {
+            page.evaluate(function () {
+                $('#Overlay_DateRangeSelect').val('day;yesterday').trigger('change');
+            });
+        }, done);
+    });
+
+    it("should open row evolution popup when row evolution link clicked", function (done) {
+        expect.screenshot("row_evolution").to.be.capture(function (page) {
+            page.click('#Overlay_RowEvolution');
+            page.evaluate(function () {
+                $('.jqplot-xaxis').hide(); // xaxis will change every day so hide it
+            });
+        }, done);
+    });
+
+    it("should open transitions popup when transitions link clicked", function (done) {
+        expect.screenshot("transitions").to.be.capture(function (page) {
+            page.click('button.ui-dialog-titlebar-close');
+            page.click('#Overlay_Transitions');
+        }, done);
+    });
+});
\ No newline at end of file
diff --git a/tests/UI/specs/PeriodSelector_spec.js b/tests/UI/specs/PeriodSelector_spec.js
new file mode 100644
index 0000000000..c070f4beb5
--- /dev/null
+++ b/tests/UI/specs/PeriodSelector_spec.js
@@ -0,0 +1,89 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * Period selector screenshot tests.
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+describe("PeriodSelector", function () {
+    this.timeout(0);
+
+    var url = "?module=CoreHome&action=index&idSite=1&period=day&date=2012-01-01";
+
+    it("should load correctly", function (done) {
+        expect.screenshot("loaded").to.be.captureSelector('#periodString', function (page) {
+            page.load(url);
+
+            // disable broadcast.propagateNewPage & remove loading gif
+            page.evaluate(function () {
+                broadcast.propagateNewPage = function () {};
+                $('#ajaxLoadingCalendar').remove();
+            });
+        }, done);
+    });
+
+    it("should expand when clicked", function (done) {
+        expect.screenshot("expanded").to.be.captureSelector('#periodString', function (page) {
+            page.click('.periodSelector');
+        }, done);
+    });
+
+    it("should select a date when a date is clicked in day-period mode", function (done) {
+        expect.screenshot("day_selected").to.be.captureSelector('#periodString', function (page) {
+            page.click('.period-date .ui-datepicker-calendar a:contains(12)');
+        }, done);
+    });
+
+    it("should change the month displayed when a month is selected in the month dropdown", function (done) {
+        expect.screenshot("month_changed").to.be.captureSelector('#periodString', function (page) {
+            page.evaluate(function () {
+                $('.ui-datepicker-month').val(1).trigger('change');
+            });
+        }, done);
+    });
+
+    it("should change the year displayed when a year is selected in the year dropdown", function (done) {
+        expect.screenshot("year_changed").to.be.captureSelector('#periodString', function (page) {
+            page.evaluate(function () {
+                $('.ui-datepicker-year').val(2013).trigger('change');
+            });
+        }, done);
+    });
+
+    it("should change the date when a date is clicked in week-period mode", function (done) {
+        expect.screenshot("week_selected").to.be.captureSelector('#periodString', function (page) {
+            page.click('label[for=period_id_week]');
+            page.click('.period-date .ui-datepicker-calendar a:contains(13)');
+        }, done);
+    });
+
+    it("should change the date when a date is clicked in month-period mode", function (done) {
+        expect.screenshot("month_selected").to.be.captureSelector('#periodString', function (page) {
+            page.click('label[for=period_id_month]');
+            page.click('.period-date .ui-datepicker-calendar a:contains(14)');
+        }, done);
+    });
+
+    it("should change the date when a date is clicked in year-period mode", function (done) {
+        expect.screenshot("year_selected").to.be.captureSelector('#periodString', function (page) {
+            page.click('label[for=period_id_year]');
+            page.click('.period-date .ui-datepicker-calendar a:contains(15)');
+        }, done);
+    });
+
+    it("should display the range picker when the range radio button is clicked", function (done) {
+        expect.screenshot("range_picker_displayed").to.be.captureSelector('#periodString', function (page) {
+            page.click('label[for=period_id_range]');
+        }, done);
+    });
+
+    it("should change from & to dates when range picker calendar dates are clicked", function (done) {
+        expect.screenshot("date_range_selected").to.be.captureSelector('#periodString', function (page) {
+            page.click('#calendarFrom .ui-datepicker-calendar a:contains(10)');
+            page.click('#calendarTo .ui-datepicker-calendar a:contains(18)');
+            page.mouseMove('#calendarRangeApply');
+        }, done);
+    });
+});
\ No newline at end of file
diff --git a/tests/UI/specs/PieGraph_spec.js b/tests/UI/specs/PieGraph_spec.js
new file mode 100644
index 0000000000..7c48ce2663
--- /dev/null
+++ b/tests/UI/specs/PieGraph_spec.js
@@ -0,0 +1,39 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * Pie graph screenshot tests.
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+describe("PieGraph", function () {
+    this.timeout(0);
+
+    var url = "?module=Widgetize&action=iframe&moduleToWidgetize=Referrers&idSite=1&period=year&date=2012-08-09&"
+            + "actionToWidgetize=getKeywords&viewDataTable=graphPie&isFooterExpandedInDashboard=1";
+
+    it("should load correctly", function (done) {
+        expect.screenshot("load").to.be.capture(function (page) {
+            page.load(url);
+        }, done);
+    });
+
+    it("should show tooltip on hover", function (done) {
+        expect.screenshot("pie_segment_tooltip").to.be.capture(function (page) {
+            page.mouseMove('.piwik-graph');
+        }, done);
+    });
+
+    it("should display the metric picker on hover of metric picker icon", function (done) {
+        expect.screenshot('metric_picker_shown').to.be.capture(function (page) {
+            page.mouseMove('.jqplot-seriespicker');
+        }, done);
+    });
+
+    it("should change displayed metric when another metric picked", function (done) {
+        expect.screenshot('other_metric').to.be.capture(function (page) {
+            page.click('.jqplot-seriespicker-popover input:not(:checked)');
+        }, done);
+    });
+});
\ No newline at end of file
diff --git a/tests/UI/specs/PivotByDimension_spec.js b/tests/UI/specs/PivotByDimension_spec.js
new file mode 100644
index 0000000000..f1899f3485
--- /dev/null
+++ b/tests/UI/specs/PivotByDimension_spec.js
@@ -0,0 +1,40 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * PivotByDimension UI tests
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+describe("PivotByDimension", function () {
+    this.timeout(0);
+
+    var eventsUrl = "?module=CoreHome&action=index&idSite=1&period=year&date=2012-08-09#/idSite=1&period=year&date=2012-08-09&module=Events&action=index",
+        actionsUrl = "?module=CoreHome&action=index&idSite=1&period=year&date=2012-08-09#/idSite=1&period=year&date=2012-08-09&module=Actions&action=menuGetPageUrls",
+        cvarsUrl = "?module=CoreHome&action=index&idSite=1&period=year&date=2012-08-09#/idSite=1&period=year&date=2012-08-09&module=CustomVariables&action=menuGetCustomVariables"
+        ;
+
+    it("should pivot a report correctly when the pivot cog option is selected", function (done) {
+        expect.screenshot('pivoted').to.be.captureSelector('.dataTable,.expandDataTableFooterDrawer', function (page) {
+            page.load(eventsUrl);
+            page.click('.dimension:contains(Event Names)');
+            page.click('.expandDataTableFooterDrawer');
+            page.mouseMove('.tableConfiguration');
+            page.click('.dataTablePivotBySubtable');
+        }, done);
+    });
+
+    it("should not display the pivot option on actions reports", function (done) {
+        expect.page(actionsUrl).not.contains('.dataTablePivotBySubtable', function () {}, done);
+    });
+
+    it("should display the pivot option on reports that set a custom columns_to_display", function (done) {
+        expect.screenshot('pivoted_columns_report').to.be.captureSelector('.dataTable,.expandDataTableFooterDrawer', function (page) {
+            page.load(cvarsUrl);
+            page.click('.expandDataTableFooterDrawer');
+            page.mouseMove('.tableConfiguration');
+            page.click('.dataTablePivotBySubtable');
+        }, done);
+    });
+});
\ No newline at end of file
diff --git a/tests/UI/specs/RowEvolution_spec.js b/tests/UI/specs/RowEvolution_spec.js
new file mode 100644
index 0000000000..9214ee69b6
--- /dev/null
+++ b/tests/UI/specs/RowEvolution_spec.js
@@ -0,0 +1,65 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * row evolution screenshot tests
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+describe("RowEvolution", function () {
+    this.timeout(0);
+
+    var viewDataTableUrl = "?module=Widgetize&action=iframe&moduleToWidgetize=Referrers&idSite=1&period=week&date=2012-02-09&"
+                         + "actionToWidgetize=getKeywords&viewDataTable=table&filter_limit=5";
+
+    var ecommerceItemReportWidgetized = "?module=Widgetize&action=iframe&moduleToWidgetize=Goals&actionToWidgetize=getItemsSku&idGoal=ecommerceAbandonedCart"
+                                      + "&idSite=1&period=year&date=2012-02-09&viewDataTable=ecommerceAbandonedCart&filter_limit=-1";
+
+    it('should load when icon clicked in ViewDataTable', function (done) {
+        expect.screenshot('row_evolution').to.be.captureSelector('.ui-dialog', function (page) {
+            page.load(viewDataTableUrl);
+            page.mouseMove('tbody tr:first-child');
+            page.mouseMove('a.actionRowEvolution:visible'); // necessary to get popover to display
+            page.click('a.actionRowEvolution:visible');
+        }, done);
+    });
+
+    it('should change the metric shown when a metric sparkline row is clicked', function (done) {
+        expect.screenshot('row_evolution_other_metric').to.be.captureSelector('.ui-dialog', function (page) {
+            page.click('table.metrics tr[data-i=1]');
+        }, done);
+    });
+
+    it('should show two serieses when a metric sparkline row is shift+clicked', function (done) {
+        expect.screenshot('row_evolution_multiple_series').to.be.captureSelector('.ui-dialog', function (page) {
+            page.click('table.metrics tr[data-i=2]', ['shift']);
+        }, done);
+    });
+
+    it('should load multi-row evolution correctly', function (done) {
+        expect.screenshot('multirow_evolution').to.be.captureSelector('.ui-dialog', function (page) {
+            page.click('a.rowevolution-startmulti');
+            page.mouseMove('tbody tr:nth-child(2)');
+            page.mouseMove('a.actionRowEvolution:visible');
+            page.click('a.actionRowEvolution:visible');
+        }, done);
+    });
+
+    it('should display a different row evolution metric when the metric selection is changed', function (done) {
+        expect.screenshot('multirow_evolution_other_metric').to.be.captureSelector('.ui-dialog', function (page) {
+            page.evaluate(function () {
+                $('select.multirowevoltion-metric').val($('select.multirowevoltion-metric option:nth-child(3)').val()).change();
+            });
+        }, done);
+    });
+
+    it('should display row evolution for an ecommerce item report correctly', function (done) {
+        expect.screenshot('row_evolution_ecommerce_item').to.be.captureSelector('.ui-dialog', function (page) {
+            page.load(ecommerceItemReportWidgetized);
+            page.mouseMove('tbody tr:first-child');
+            page.mouseMove('a.actionRowEvolution:visible'); // necessary to get popover to display
+            page.click('a.actionRowEvolution:visible');
+        }, done);
+    });
+});
\ No newline at end of file
diff --git a/tests/UI/specs/SegmentSelectorEditor_spec.js b/tests/UI/specs/SegmentSelectorEditor_spec.js
new file mode 100644
index 0000000000..7552977813
--- /dev/null
+++ b/tests/UI/specs/SegmentSelectorEditor_spec.js
@@ -0,0 +1,187 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * ViewDataTable screenshot tests.
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+describe("SegmentSelectorEditorTest", function () {
+    var selectorsToCapture = ".segmentEditorPanel,.segmentEditorPanel .dropdown-body,.segment-element";
+    
+    this.timeout(0);
+
+    var url = "?module=CoreHome&action=index&idSite=1&period=year&date=2012-08-09";
+
+    it("should load correctly", function (done) {
+        expect.screenshot("0_initial").to.be.captureSelector(selectorsToCapture, function (page) {
+            page.load(url);
+        }, done);
+    });
+
+    it("should open selector when control clicked", function (done) {
+        expect.screenshot("1_selector_open").to.be.captureSelector(selectorsToCapture, function (page) {
+            page.click('.segmentationContainer');
+        }, done);
+    });
+
+    it("should open segment editor when edit link clicked for existing segment", function (done) {
+        expect.screenshot("2_segment_editor_update").to.be.captureSelector(selectorsToCapture, function (page) {
+            page.click('.segmentList .editSegment');
+        }, done);
+    });
+
+    it("should start editing segment name when segment name edit link clicked", function (done) {
+        expect.screenshot("3_segment_editor_edit_name").to.be.captureSelector(selectorsToCapture, function (page) {
+            page.click('.segmentEditorPanel .editSegmentName');
+        }, done);
+    });
+
+    it("should expand segment dimension category when category name clicked in segment editor", function (done) {
+        expect.screenshot("4_segment_editor_expanded_dimensions").to.be.captureSelector(selectorsToCapture, function (page) {
+            page.click('.segmentEditorPanel .metric_category:contains(Actions)');
+        }, done);
+    });
+
+    it("should search segment dimensions when text entered in dimension search input", function (done) {
+        expect.screenshot("5_segment_editor_search_dimensions").to.be.captureSelector(selectorsToCapture, function (page) {
+            page.sendKeys('.segmentEditorPanel .segmentSearch', 'page title');
+        }, done);
+    });
+
+    it("should change segment when another available segment clicked in segment editor's available segments dropdown", function (done) {
+        expect.screenshot("6_segment_editor_different").to.be.captureSelector(selectorsToCapture, function (page) {
+            page.click('.available_segments a.dropList');
+            page.click('li.ui-menu-item a:contains(Add new segment)');
+        }, done);
+    });
+
+    it("should close the segment editor when the close link is clicked", function (done) {
+        expect.screenshot("7_segment_editor_closed").to.be.captureSelector(selectorsToCapture, function (page) {
+            page.click('.segmentEditorPanel .segment-footer .close');
+        }, done);
+    });
+
+    it("should open blank segment editor when create new segment link is clicked", function (done) {
+        expect.screenshot("8_segment_editor_create").to.be.captureSelector(selectorsToCapture, function (page) {
+            page.click('.segmentationContainer');
+            page.click('.add_new_segment');
+        }, done);
+    });
+
+    it("should add new segment expression when segment dimension drag dropped", function (done) {
+        expect.screenshot("dimension_drag_drop").to.be.captureSelector(selectorsToCapture, function (page) {
+            page.click('.segmentEditorPanel .metric_category:contains(Actions)');
+            page.dragDrop('.segmentEditorPanel li[data-metric=entryPageUrl]', '.segmentEditorPanel .ui-droppable');
+        }, done);
+    });
+
+    // phantomjs won't take screenshots of dropdown windows, so skip this test
+    it.skip("should show suggested segment values when a segment value input is focused", function (done) {
+        expect.screenshot("suggested_values").to.be.captureSelector(selectorsToCapture, function (page) {
+            page.click('.segmentEditorPanel .ui-autocomplete-input');
+        }, done);
+    });
+
+    it("should add an OR condition when a segment dimension is dragged to the OR placeholder section", function (done) {
+        expect.screenshot("drag_or_condition").to.be.captureSelector(selectorsToCapture, function (page) {
+            page.dragDrop('.segmentEditorPanel li[data-metric=entryPageTitle]', '.segmentEditorPanel .segment-add-or .ui-droppable');
+        }, done);
+    });
+
+    it("should add an AND condition when a segment dimension is dragged to the AND placeholder section", function (done) {
+        expect.screenshot("drag_and_condition").to.be.captureSelector(selectorsToCapture, function (page) {
+            page.dragDrop('.segmentEditorPanel li[data-metric=pageTitle]', '.segmentEditorPanel .segment-add-row .ui-droppable');
+        }, done);
+    });
+
+    it("should save a new segment and add it to the segment list when the form is filled out and the save button is clicked", function (done) {
+        expect.screenshot("saved").to.be.captureSelector(selectorsToCapture, function (page) {
+            page.evaluate(function () {
+                $('.metricMatchBlock>select').each(function () {
+                    $(this).val('==');
+                });
+
+                $('.metricValueBlock>input').each(function (index) {
+                    $(this).val('value ' + index);
+                });
+            });
+
+            page.sendKeys('input.edit_segment_name', 'new segment');
+            page.click('.segmentEditorPanel .metric_category:contains(Actions)'); // click somewhere else to save new name
+
+            page.click('button.saveAndApply');
+
+            page.click('.segmentationContainer');
+        }, done);
+    });
+
+    it("should show the new segment after page reload", function (done) {
+        expect.screenshot("saved").to.be.captureSelector("saved_reload", selectorsToCapture, function (page) {
+            page.reload();
+            page.click('.segmentationContainer');
+        }, done);
+    });
+
+    it("should correctly load the new segment's details when the new segment is edited", function (done) {
+        expect.screenshot("saved_details").to.be.captureSelector(selectorsToCapture, function (page) {
+            page.click('.segmentList li[data-idsegment=4] .editSegment');
+        }, done);
+    });
+
+    it("should correctly update the segment when its details are changed and saved", function (done) {
+        expect.screenshot("updated").to.be.captureSelector(selectorsToCapture, function (page) {
+            page.click('.segmentEditorPanel .editSegmentName');
+            page.evaluate(function () {
+                $('input.edit_segment_name').val('');
+            });
+            page.sendKeys('input.edit_segment_name', 'edited segment');
+            page.click('.segmentEditorPanel .metric_category:contains(Actions)'); // click somewhere else to save new name
+
+            page.evaluate(function () {
+                $('.metricMatchBlock>select').each(function () {
+                    $(this).val('!=');
+                });
+
+                $('.metricValueBlock>input').each(function (index) {
+                    $(this).val('new value ' + index);
+                });
+            });
+
+            page.click('button.saveAndApply');
+
+            page.click('.segmentationContainer');
+        }, done);
+    });
+
+    it("should show the updated segment after page reload", function (done) {
+        expect.screenshot("updated").to.be.captureSelector("updated_reload", selectorsToCapture, function (page) {
+            page.reload();
+            page.click('.segmentationContainer');
+        }, done);
+    });
+
+    it("should correctly load the updated segment's details when the updated segment is edited", function (done) {
+        expect.screenshot("updated_details").to.be.captureSelector(selectorsToCapture, function (page) {
+            page.click('.segmentList li[data-idsegment=4] .editSegment');
+        }, done);
+    });
+
+    it("should correctly remove the segment when the delete link is clicked", function (done) {
+        expect.screenshot('deleted').to.be.captureSelector(selectorsToCapture, function (page) {
+            page.click('.segmentList li[data-idsegment=4] .editSegment');
+            page.click('.segmentEditorPanel a.delete');
+            page.click('.ui-dialog button>span:contains(Yes):visible');
+
+            page.click('.segmentationContainer');
+        }, done);
+    });
+
+    it("should not show the deleted segment after page reload", function (done) {
+        expect.screenshot('deleted').to.be.captureSelector('deleted_reload', selectorsToCapture, function (page) {
+            page.reload();
+            page.click('.segmentationContainer');
+        }, done);
+    });
+});
\ No newline at end of file
diff --git a/tests/UI/specs/SiteSelector_spec.js b/tests/UI/specs/SiteSelector_spec.js
new file mode 100644
index 0000000000..71ae799558
--- /dev/null
+++ b/tests/UI/specs/SiteSelector_spec.js
@@ -0,0 +1,55 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * Site selector screenshot tests.
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+describe("SiteSelector", function () {
+    var selectorToCapture = '[piwik-siteselector],[piwik-siteselector] .custom_select';
+
+    this.timeout(0);
+
+    var url = "?module=UsersManager&action=userSettings&idSite=1&period=day&date=yesterday";
+
+    it("should load correctly", function (done) {
+        expect.screenshot("loaded").to.be.captureSelector(selectorToCapture, function (page) {
+            page.load(url);
+        }, done);
+    });
+
+    it("should display expanded when clicked", function (done) {
+        expect.screenshot("expanded").to.be.captureSelector(selectorToCapture, function (page) {
+            page.click('.sites_autocomplete');
+        }, done);
+    });
+
+    it("should show no results when search returns no results", function (done) {
+        expect.screenshot("search_no_results").to.be.captureSelector(selectorToCapture, function (page) {
+            page.sendKeys(".websiteSearch", "abc");
+        }, done);
+    });
+
+    it("should search when one character typed into search input", function (done) {
+        expect.screenshot("search_one_char").to.be.captureSelector(selectorToCapture, function (page) {
+            page.click('.reset');
+            page.sendKeys(".websiteSearch", "s");
+        }, done);
+    });
+
+    // Test is skipped as it randomly fails http://builds-artifacts.piwik.org/ui-tests.master/2295.1/screenshot-diffs/diffviewer.html
+    it.skip("should search again when second character typed into search input", function (done) {
+        expect.screenshot("search_two_chars").to.be.captureSelector(selectorToCapture, function (page) {
+            page.sendKeys(".websiteSearch", "st");
+            page.wait(3000);
+        }, done);
+    });
+
+    it("should change the site when a site is selected", function (done) {
+        expect.screenshot("site_selected").to.be.captureSelector(selectorToCapture, function (page) {
+            page.click(".custom_select_ul_list>li:visible");
+        }, done);
+    });
+});
\ No newline at end of file
diff --git a/tests/UI/specs/Transitions_spec.js b/tests/UI/specs/Transitions_spec.js
new file mode 100644
index 0000000000..246c4bb3da
--- /dev/null
+++ b/tests/UI/specs/Transitions_spec.js
@@ -0,0 +1,33 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * transitions screenshot tests
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+describe("Transitions", function () {
+    this.timeout(0);
+
+    var generalParams = 'idSite=1&period=year&date=2012-08-09',
+        urlBase = 'module=CoreHome&action=index&' + generalParams
+        ;
+
+    it('should load the transitions popup correctly for the page titles report', function (done) {
+        expect.screenshot('transitions_popup_titles').to.be.captureSelector('.ui-dialog', function (page) {
+            page.load("?" + urlBase + "#/" + generalParams + "&module=Actions&action=menuGetPageTitles");
+
+            page.mouseMove('div.dataTable tbody tr:eq(2)');
+            page.mouseMove('a.actionTransitions:visible'); // necessary to get popover to display
+            page.click('a.actionTransitions:visible');
+        }, done);
+    });
+
+    it('should load the transitions popup correctly for the page urls report', function (done) {
+        expect.screenshot('transitions_popup_urls').to.be.captureSelector('.ui-dialog', function (page) {
+            page.load("?" + urlBase + "#/" + generalParams + "&module=Actions&action=menuGetPageUrls&"
+                    + "popover=RowAction$3ATransitions$3Aurl$3Ahttp$3A$2F$2Fpiwik.net$2Fdocs$2Fmanage-websites$2F");
+        }, done);
+    });
+});
\ No newline at end of file
diff --git a/tests/UI/specs/UIIntegration_spec.js b/tests/UI/specs/UIIntegration_spec.js
new file mode 100644
index 0000000000..c1c186345b
--- /dev/null
+++ b/tests/UI/specs/UIIntegration_spec.js
@@ -0,0 +1,608 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * Screenshot integration tests.
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+describe("UIIntegrationTest", function () { // TODO: Rename to Piwik?
+    this.timeout(0);
+
+    var generalParams = 'idSite=1&period=year&date=2012-08-09',
+        idSite2Params = 'idSite=2&period=year&date=2012-08-09',
+        evolutionParams = 'idSite=1&period=day&date=2012-01-31&evolution_day_last_n=30',
+        urlBase = 'module=CoreHome&action=index&' + generalParams,
+        widgetizeParams = "module=Widgetize&action=iframe",
+        segment = encodeURIComponent("browserCode==FF") // from OmniFixture
+        ;
+
+    before(function (done) {
+        testEnvironment.queryParamOverride = {
+            forceNowValue: testEnvironment.forcedNowTimestamp,
+            visitorId: testEnvironment.forcedIdVisitor,
+            realtimeWindow: 'false'
+        };
+        testEnvironment.save();
+
+        testEnvironment.callApi("SitesManager.setSiteAliasUrls", {idSite: 3, urls: []}, done);
+    });
+
+    beforeEach(function () {
+        delete testEnvironment.configOverride;
+        testEnvironment.testUseRegularAuth = 0;
+        testEnvironment.save();
+    });
+
+    after(function () {
+        delete testEnvironment.queryParamOverride;
+        testEnvironment.testUseRegularAuth = 0;
+        testEnvironment.save();
+    });
+
+    // dashboard tests
+    it("should load dashboard1 correctly", function (done) {
+        expect.screenshot("dashboard1").to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=Dashboard&action=embeddedIndex&idDashboard=1");
+
+            page.evaluate(function () {
+                // Prevent random sizing error eg. http://builds-artifacts.piwik.org/ui-tests.master/2301.1/screenshot-diffs/diffviewer.html
+                $("[widgetid=widgetActionsgetOutlinks] .widgetContent").text('Displays different at random -> hidden');
+            });
+        }, done);
+    });
+
+    it("should load dashboard2 correctly", function (done) {
+        expect.screenshot("dashboard2").to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=Dashboard&action=embeddedIndex&idDashboard=2");
+        }, done);
+    });
+
+    it("should load dashboard3 correctly", function (done) {
+        expect.screenshot("dashboard3").to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=Dashboard&action=embeddedIndex&idDashboard=3");
+        }, done);
+    });
+
+    it("should load dashboard4 correctly", function (done) {
+        expect.screenshot("dashboard4").to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=Dashboard&action=embeddedIndex&idDashboard=4");
+        }, done);
+    });
+
+    it("should display dashboard correctly on a mobile phone", function (done) {
+        expect.screenshot("dashboard5_mobile").to.be.capture(function (page) { // capture with menu
+            page.setViewportSize(480, 320);
+            page.load("?" + urlBase + "#" + generalParams + "&module=Dashboard&action=embeddedIndex&idDashboard=5");
+        }, done);
+    });
+
+    // visitors pages
+    it('should load visitors > overview page correctly', function (done) {
+        expect.screenshot("visitors_overview").to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=VisitsSummary&action=index");
+        }, done);
+    });
+
+    it('should load visitors > visitor log page correctly', function (done) {
+        expect.screenshot("visitors_visitorlog").to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=Live&action=indexVisitorLog");
+        }, done);
+    });
+
+    it('should load the visitors > devices page correctly', function (done) {
+        expect.screenshot("visitors_devices").to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=DevicesDetection&action=index");
+        }, done);
+    });
+
+    it('should load visitors > locations & provider page correctly', function (done) {
+        expect.screenshot("visitors_locations_provider").to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=UserCountry&action=index");
+        }, done);
+    });
+
+    it('should load the visitors > settings page correctly', function (done) {
+        expect.screenshot("visitors_settings").to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=UserSettings&action=index");
+        }, done);
+    });
+
+    it('should load the visitors > times page correctly', function (done) {
+        expect.screenshot("visitors_times").to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=VisitTime&action=index");
+        }, done);
+    });
+
+    it('should load the visitors > engagement page correctly', function (done) {
+        expect.screenshot("visitors_engagement").to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=VisitFrequency&action=index");
+        }, done);
+    });
+
+    it('should load the visitors > custom variables page correctly', function (done) {
+        expect.screenshot('visitors_custom_vars').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=CustomVariables&action=menuGetCustomVariables");
+        }, done);
+    });
+
+    it('should load the visitors > real-time map page correctly', function (done) {
+        expect.screenshot('visitors_realtime_map').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + idSite2Params + "&module=UserCountryMap&action=realtimeWorldMap"
+                    + "&showDateTime=0&realtimeWindow=last2&changeVisitAlpha=0&enableAnimation=0&doNotRefreshVisits=1"
+                    + "&removeOldVisits=0");
+        }, done);
+    });
+
+    // actions pages
+    it('should load the actions > pages page correctly', function (done) {
+        expect.screenshot('actions_pages').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=Actions&action=menuGetPageUrls");
+        }, done);
+    });
+
+    it('should load the actions > entry pages page correctly', function (done) {
+        expect.screenshot('actions_entry_pages').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=Actions&action=menuGetEntryPageUrls");
+        }, done);
+    });
+
+    it('should load the actions > exit pages page correctly', function (done) {
+        expect.screenshot('actions_exit_pages').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=Actions&action=menuGetExitPageUrls");
+        }, done);
+    });
+
+    it('should load the actions > page titles page correctly', function (done) {
+        expect.screenshot('actions_page_titles').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=Actions&action=menuGetPageTitles");
+        }, done);
+    });
+
+    it('should load the actions > site search page correctly', function (done) {
+        expect.screenshot('actions_site_search').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=Actions&action=indexSiteSearch");
+        }, done);
+    });
+
+    it('should load the actions > outlinks page correctly', function (done) {
+        expect.screenshot('actions_outlinks').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=Actions&action=menuGetOutlinks");
+        }, done);
+    });
+
+    it('should load the actions > downloads page correctly', function (done) {
+        expect.screenshot('actions_downloads').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=Actions&action=menuGetDownloads");
+        }, done);
+    });
+
+    it('should load the actions > contents page correctly', function (done) {
+        expect.screenshot('actions_contents').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=Contents&action=index&period=day&date=2012-01-01");
+        }, done);
+    });
+
+    it("should show all corresponding content pieces when clicking on a content name", function (done) {
+        expect.screenshot("actions_content_name_piece").to.be.captureSelector('.pageWrap', function (page) {
+            page.click('.dataTable .subDataTable .value:contains(ImageAd)');
+        }, done);
+    });
+
+    it("should show all tracked content pieces when clicking on the table", function (done) {
+        expect.screenshot("actions_content_piece").to.be.captureSelector('.pageWrap', function (page) {
+            page.click('.reportDimension .dimension:contains(Content Piece)');
+        }, done);
+    });
+
+    it("should show all corresponding content names when clicking on a content piece", function (done) {
+        expect.screenshot("actions_content_piece_name").to.be.captureSelector('.pageWrap', function (page) {
+            page.click('.dataTable .subDataTable .value:contains(Click NOW)');
+        }, done);
+    });
+
+    // referrers pages
+    it('should load the referrers > overview page correctly', function (done) {
+        expect.screenshot('referrers_overview').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=Referrers&action=index");
+        }, done);
+    });
+
+    // referrers pages
+    it('should load the referrers > overview page correctly', function (done) {
+        expect.screenshot('referrers_allreferrers').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=Referrers&action=allReferrers");
+        }, done);
+    });
+
+    it('should load the referrers > search engines & keywords page correctly', function (done) {
+        expect.screenshot('referrers_search_engines_keywords').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=Referrers&action=getSearchEnginesAndKeywords");
+        }, done);
+    });
+
+    it('should load the referrers > websites & social page correctly', function (done) {
+        expect.screenshot('referrers_websites_social').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=Referrers&action=indexWebsites");
+        }, done);
+    });
+
+    it('should load the referrers > campaigns page correctly', function (done) {
+        expect.screenshot('referrers_campaigns').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=Referrers&action=menuGetCampaigns");
+        }, done);
+    });
+
+    // goals pages
+    it('should load the goals > ecommerce page correctly', function (done) {
+        expect.screenshot('goals_ecommerce').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=Ecommerce&action=ecommerceReport&idGoal=ecommerceOrder");
+        }, done);
+    });
+
+    it('should load the goals > overview page correctly', function (done) {
+        expect.screenshot('goals_overview').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load( "?" + urlBase + "#" + generalParams + "&module=Goals&action=index");
+        }, done);
+    });
+
+    it('should load the goals > management page correctly', function (done) {
+        expect.screenshot('goals_manage').to.be.captureSelector('.centerLargeDiv,.top_bar_sites_selector,.entityContainer', function (page) {
+            page.load( "?" + generalParams + "&module=Goals&action=manage");
+            page.wait(200);
+        }, done);
+    });
+
+    it('should load the goals > single goal page correctly', function (done) {
+        expect.screenshot('goals_individual_goal').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=Goals&action=goalReport&idGoal=1");
+        }, done);
+    });
+
+    // one page w/ segment
+    it('should load the visitors > overview page correctly when a segment is specified', function (done) {
+        expect.screenshot('visitors_overview_segment').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=VisitsSummary&action=index&segment=" + segment);
+        }, done);
+    });
+
+    // example ui pages
+    it('should load the example ui > dataTables page correctly', function (done) {
+        expect.screenshot('exampleui_dataTables').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=ExampleUI&action=dataTables");
+        }, done);
+    });
+
+    it('should load the example ui > barGraph page correctly', function (done) {
+        expect.screenshot('exampleui_barGraph').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=ExampleUI&action=barGraph");
+        }, done);
+    });
+
+    it('should load the example ui > pieGraph page correctly', function (done) {
+        expect.screenshot('exampleui_pieGraph').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=ExampleUI&action=pieGraph");
+        }, done);
+    });
+
+    it('should load the example ui > tagClouds page correctly', function (done) {
+        expect.screenshot('exampleui_tagClouds').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=ExampleUI&action=tagClouds");
+        }, done);
+    });
+
+    it('should load the example ui > sparklines page correctly', function (done) {
+        expect.screenshot('exampleui_sparklines').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=ExampleUI&action=sparklines");
+        }, done);
+    });
+
+    it('should load the example ui > evolution graph page correctly', function (done) {
+        expect.screenshot('exampleui_evolutionGraph').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=ExampleUI&action=evolutionGraph");
+        }, done);
+    });
+
+    it('should load the example ui > treemap page correctly', function (done) {
+        expect.screenshot('exampleui_treemap').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=ExampleUI&action=treemap");
+            page.wait(2000);
+        }, done);
+    });
+
+    // widgetize
+    it('should load the widgetized visitor log correctly', function (done) {
+        expect.screenshot('widgetize_visitor_log').to.be.capture(function (page) {
+            page.load("?" + widgetizeParams + "&" + generalParams + "&moduleToWidgetize=Live&actionToWidgetize=getVisitorLog");
+            page.evaluate(function () {
+                $('.expandDataTableFooterDrawer').click();
+            });
+        }, done);
+    });
+
+    it('should load the widgetized all websites dashboard correctly', function (done) {
+        expect.screenshot('widgetize_allwebsites').to.be.capture(function (page) {
+            page.load("?" + widgetizeParams + "&" + generalParams + "&moduleToWidgetize=MultiSites&actionToWidgetize=standalone");
+        }, done);
+    });
+
+    it('should widgetize the ecommerce log correctly', function (done) {
+        expect.screenshot('widgetize_ecommercelog').to.be.capture(function (page) {
+            page.load("?" + widgetizeParams + "&" + generalParams + "&moduleToWidgetize=Ecommerce&actionToWidgetize=getEcommerceLog&filter_limit=-1");
+        }, done);
+    });
+
+    it('should load the ecommerce overview page', function (done) {
+        expect.screenshot('ecommerce_overview').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=Ecommerce&action=ecommerceReport&idGoal=ecommerceOrder");
+        }, done);
+    });
+
+    it('should load the ecommerce log page', function (done) {
+        expect.screenshot('ecommerce_log').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=Ecommerce&action=ecommerceLogReport");
+        }, done);
+    });
+
+    it('should load the ecommerce products page', function (done) {
+        expect.screenshot('ecommerce_products').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=Ecommerce&action=products&idGoal=ecommerceOrder");
+        }, done);
+    });
+
+    it('should load the ecommerce sales page', function (done) {
+        expect.screenshot('ecommerce_sales').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=Ecommerce&action=sales&idGoal=ecommerceOrder");
+        }, done);
+    });
+
+    // Admin user settings (plugins not displayed)
+    it('should load the Manage > Websites admin page correctly', function (done) {
+        expect.screenshot('admin_manage_websites').to.be.captureSelector('#content', function (page) {
+            page.load("?" + generalParams + "&module=SitesManager&action=index");
+            page.evaluate(function () {
+                $('.ui-inline-help:contains(UTC time is)').hide();
+            });
+        }, done);
+    });
+
+    it('should load the Manage > Users admin page correctly', function (done) {
+        expect.screenshot('admin_manage_users').to.be.captureSelector('#content', function (page) {
+            page.load("?" + generalParams + "&module=UsersManager&action=index");
+
+            // remove token auth which can be random
+            page.evaluate(function () {
+                $('td#token_auth').each(function () {
+                    $(this).text('');
+                });
+                $('td#last_seen').each(function () {
+                    $(this).text( '' )
+                });
+            });
+        }, done);
+    });
+
+    it('should load the user settings admin page correctly', function (done) {
+        expect.screenshot('admin_user_settings').to.be.captureSelector('#content', function (page) {
+            page.load("?" + generalParams + "&module=UsersManager&action=userSettings");
+        }, done);
+    });
+
+    it('should load the Manage > Tracking Code admin page correctly', function (done) {
+        expect.screenshot('admin_manage_tracking_code').to.be.captureSelector('#content', function (page) {
+            page.load("?" + generalParams + "&module=CoreAdminHome&action=trackingCodeGenerator");
+        }, done);
+    });
+
+    it('should load the Settings > General Settings admin page correctly', function (done) {
+        expect.screenshot('admin_settings_general').to.be.captureSelector('#content', function (page) {
+            page.load("?" + generalParams + "&module=CoreAdminHome&action=generalSettings");
+        }, done);
+    });
+
+    it('should load the Settings > Privacy admin page correctly', function (done) {
+        expect.screenshot('admin_privacy_settings').to.be.captureSelector('#content,.ui-inline-help', function (page) {
+            page.load("?" + generalParams + "&module=PrivacyManager&action=privacySettings");
+        }, done);
+    });
+
+    it('should load the Privacy Opt out iframe correctly', function (done) {
+        expect.screenshot('admin_privacy_optout_iframe').to.be.capture(function (page) {
+            page.load("?module=CoreAdminHome&action=optOut&language=de");
+        }, done);
+    });
+
+    it('should load the Settings > Mobile Messaging admin page correctly', function (done) {
+        expect.screenshot('admin_settings_mobilemessaging').to.be.captureSelector('#content', function (page) {
+            page.load("?" + generalParams + "&module=MobileMessaging&action=index");
+        }, done);
+    });
+
+    it('should load the Settings > Mobile Messaging user page correctly', function (done) {
+        expect.screenshot('user_settings_mobilemessaging').to.be.captureSelector('#content', function (page) {
+            page.load("?" + generalParams + "&module=MobileMessaging&action=userSettings");
+        }, done);
+    });
+
+    it('should load the themes admin page correctly', function (done) {
+        expect.screenshot('admin_themes').to.be.captureSelector('#content', function (page) {
+            page.load("?" + generalParams + "&module=CorePluginsAdmin&action=themes");
+        }, done);
+    });
+
+    it('should load the plugins admin page correctly', function (done) {
+        expect.screenshot('admin_plugins').to.be.captureSelector('#content', function (page) {
+            page.load("?" + generalParams + "&module=CorePluginsAdmin&action=plugins");
+        }, done);
+    });
+
+    it('should load the plugin settings admin page correctly', function (done) {
+        expect.screenshot('admin_plugin_settings').to.be.captureSelector('#content', function (page) {
+            page.load("?" + generalParams + "&module=CoreAdminHome&action=adminPluginSettings");
+        }, done);
+    });
+
+    it('should load the plugin settings user page correctly', function (done) {
+        expect.screenshot('user_plugin_settings').to.be.captureSelector('#content', function (page) {
+            page.load("?" + generalParams + "&module=CoreAdminHome&action=userPluginSettings");
+        }, done);
+    });
+
+    it('should load the Settings > Visitor Generator admin page correctly', function (done) {
+        expect.screenshot('admin_visitor_generator').to.be.captureSelector('#content', function (page) {
+            page.load("?" + generalParams + "&module=VisitorGenerator&action=index");
+
+            page.evaluate(function () {
+                var $p = $('#content p:eq(1)');
+                $p.text($p.text().replace(/\(change .*\)/g, ''));
+            });
+        }, done);
+    });
+
+    // Notifications
+    it('should load the notifications page correctly', function (done) {
+        expect.screenshot('notifications').to.be.capture(function (page) {
+            page.load("?" + generalParams + "&module=ExampleUI&action=notifications&idSite=1&period=day&date=yesterday");
+            page.evaluate(function () {
+                $('#header').hide();
+            });
+        }, done);
+    });
+
+    // Fatal error safemode
+    it('should load the safemode fatal error page correctly', function (done) {
+        var message = "Call%20to%20undefined%20function%20Piwik%5CPlugins%5CFoobar%5CPiwik_Translate()",
+            file = "%2Fhome%2Fvagrant%2Fwww%2Fpiwik%2Fplugins%2FFoobar%2FFoobar.php%20line%205",
+            line = 58;
+
+        expect.screenshot('fatal_error_safemode').to.be.capture(function (page) {
+            page.load("?" + generalParams + "&module=CorePluginsAdmin&action=safemode&idSite=1&period=day&date=yesterday&activated"
+                    + "&error_message=" + message + "&error_file=" + file + "&error_line=" + line + "&tests_hide_piwik_version=1");
+        }, done);
+    });
+
+    // DB error message
+    it('should fail correctly when db information in config is incorrect', function (done) {
+        testEnvironment.configOverride = {
+            database: {
+                host: '127.50.50.50',
+                username: 'slkdfjsdlkfj',
+                password: 'slkdfjsldkfj',
+                dbname: 'abcdefg',
+                tables_prefix: 'gfedcba'
+            }
+        };
+        testEnvironment.save();
+
+        expect.screenshot('db_connect_error').to.be.capture(function (page) {
+            page.load("");
+        }, done);
+    });
+
+    // CustomAlerts plugin TODO: move to CustomAlerts plugin
+    it('should load the custom alerts list correctly', function (done) {
+        expect.screenshot('customalerts_list').to.be.capture(function (page) {
+            page.load("?" + generalParams + "&module=CustomAlerts&action=index&idSite=1&period=day&date=yesterday&tests_hide_piwik_version=1");
+        }, done);
+    });
+
+    it('should load the triggered custom alerts list correctly', function (done) {
+        expect.screenshot('customalerts_list_triggered').to.be.capture(function (page) {
+            page.load("?" + generalParams + "&module=CustomAlerts&action=historyTriggeredAlerts&idSite=1&period=day&date=yesterday&tests_hide_piwik_version=1");
+        }, done);
+    });
+
+    // top bar pages
+    it('should load the all websites dashboard correctly', function (done) {
+        expect.screenshot('all_websites').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+            page.load("?" + generalParams + "&module=MultiSites&action=index");
+        }, done);
+    });
+
+    it('should load the widgets listing page correctly', function (done) {
+        expect.screenshot('widgets_listing').to.be.captureSelector('#content', function (page) {
+            page.load("?" + generalParams + "&module=Widgetize&action=index");
+            page.mouseMove('.widgetpreview-categorylist>li:contains(Visits Summary)');
+            page.mouseMove('li[uniqueid=widgetVisitsSummarygetEvolutionGraphcolumnsArray]');
+        }, done);top
+    });
+
+    it('should load the API listing page correctly', function (done) {
+        expect.screenshot('api_listing').to.be.captureSelector('#content', function (page) {
+            page.load("?" + generalParams + "&module=API&action=listAllAPI");
+            page.evaluate(function () { // remove token_auth since it can change on each test run
+                $('span#token_auth>strong').text('dummytokenauth');
+            });
+        }, done);
+    });
+
+    it('should load the email reports page correctly', function (done) {
+        expect.screenshot('email_reports').to.be.capture(function (page) {
+            page.load("?" + generalParams + "&module=ScheduledReports&action=index");
+            page.evaluate(function () {
+                $('#header').hide();
+            });
+        }, done);
+    });
+
+    it('should load the feedback form when the feedback form link is clicked', function (done) {
+        expect.screenshot('feedback_form').to.be.capture(function (page) {
+
+            page.load("?" + generalParams + "&module=Feedback&action=index");
+
+            page.evaluate(function () {
+                $('h2 span').each(function () {
+                    if ($(this).text().indexOf("Piwik") !== -1) {
+                        var replace = $(this).text().replace(/Piwik\s*\d+\.\d+(\.\d+)?([\-a-z]*\d+)?/g, 'Piwik');
+                        $(this).text(replace);
+                    }
+                });
+
+                $('#header').hide();
+            });
+        }, done);
+    });
+
+    // date range clicked
+    it('should reload to the correct date when a date range is selected in the period selector', function (done) {
+        expect.screenshot('period_select_date_range_click').to.be.capture(function (page) {
+            page.load("?" + urlBase + "#" + generalParams + "&module=VisitTime&action=index");
+            page.evaluate(function () {
+                $(document).ready(function () {
+                    $('#date').click();
+                    $('#period_id_range').click();
+                    $('#inputCalendarFrom').val('2012-08-02');
+                    $('#inputCalendarTo').val('2012-08-12');
+                    setTimeout(function () {$('#calendarRangeApply').click();}, 500);
+                });
+            });
+        }, done);
+    });
+
+    // visitor profile popup
+    it('should load the visitor profile popup correctly', function (done) {
+        expect.screenshot('visitor_profile_popup').to.be.capture(function (page) {
+            page.load("?" + widgetizeParams + "&" + idSite2Params + "&moduleToWidgetize=Live&actionToWidgetize=getVisitorProfilePopup"
+                    + "&enableAnimation=0");
+
+            page.evaluate(function () {
+                $(document).ready(function () {
+                    $('.visitor-profile-show-map').click();
+                });
+            });
+
+            page.wait(1000);
+        }, done);
+    });
+
+    // opt out page
+    it('should load the opt out page correctly', function (done) {
+        expect.screenshot('opt_out').to.be.capture(function (page) {
+            testEnvironment.testUseRegularAuth = 1;
+            testEnvironment.save();
+
+            page.load("?module=CoreAdminHome&action=optOut&language=en");
+        }, done);
+    });
+});
\ No newline at end of file
diff --git a/tests/UI/specs/Updater_spec.js b/tests/UI/specs/Updater_spec.js
new file mode 100644
index 0000000000..0ddc8b67cb
--- /dev/null
+++ b/tests/UI/specs/Updater_spec.js
@@ -0,0 +1,37 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * Installation screenshot tests.
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+describe("Updater", function () {
+    this.timeout(0);
+
+    this.fixture = "Piwik\\Tests\\Fixtures\\UpdaterTestFixture";
+
+    before(function () {
+        testEnvironment.tablesPrefix = 'piwik_';
+        testEnvironment.save();
+    });
+
+    it("should start the updater when an old version of Piwik is detected in the DB", function (done) {
+        expect.screenshot("main").to.be.capture(function (page) {
+            page.load("");
+            page.evaluate(function () {
+                $('p').each(function () {
+                    var replace = $(this).html().replace(/(?!1\.0)\d+\.\d+(\.\d+)?([\-a-z]*\d+)?/g, '');
+                    $(this).html(replace);
+                });
+            });
+        }, done);
+    });
+
+    it("should show the donation form when the update process is complete", function (done) {
+        expect.screenshot("updated").to.be.capture(function (page) {
+            page.click('.submit');
+        }, done);
+    });
+});
\ No newline at end of file
diff --git a/tests/UI/specs/ViewDataTable_spec.js b/tests/UI/specs/ViewDataTable_spec.js
new file mode 100644
index 0000000000..7a584e7c97
--- /dev/null
+++ b/tests/UI/specs/ViewDataTable_spec.js
@@ -0,0 +1,143 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * ViewDataTable screenshot tests.
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+describe("ViewDataTableTest", function () { // TODO: should remove Test suffix from images instead of naming suites ...Test
+    this.timeout(0);
+
+    // TODO: rename screenshot files, remove numbers
+    var url = "?module=Widgetize&action=iframe&moduleToWidgetize=Referrers&idSite=1&period=year&date=2012-08-09&"
+            + "actionToWidgetize=getKeywords&viewDataTable=table&filter_limit=5&isFooterExpandedInDashboard=1";
+
+    it("should load correctly", function (done) {
+        expect.screenshot("0_initial").to.be.capture(function (page) {
+            page.load(url);
+        }, done);
+    });
+
+    it("should load all columns when all columns clicked", function (done) {
+        expect.screenshot("1_all_columns").to.be.capture(function (page) {
+            page.click('.tableIcon[data-footer-icon-id=tableAllColumns]');
+        }, done);
+    });
+
+    it("should sort a column in descending order when column clicked initially", function (done) {
+        expect.screenshot("2_column_sorted_desc").to.be.capture(function (page) {
+            page.click('th#avg_time_on_site');
+        }, done);
+    });
+
+    it("should sort a column in ascending order when column clicked second time", function (done) {
+        expect.screenshot("3_column_sorted_asc").to.be.capture(function (page) {
+            page.click('th#avg_time_on_site');
+        }, done);
+    });
+
+    it("should exclude low population rows when low population clicked", function (done) {
+        expect.screenshot("4_exclude_low_population").to.be.capture(function (page) {
+            page.mouseMove('.tableConfiguration');
+            page.click('.dataTableExcludeLowPopulation');
+        }, done);
+    });
+
+    it("should load goals table when goals footer icon clicked", function (done) {
+        expect.screenshot("5_goals").to.be.capture(function (page) {
+            page.click('.tableIcon[data-footer-icon-id=tableGoals]');
+        }, done);
+    });
+
+    it("should load bar graph when bar graph footer icon clicked", function (done) {
+        expect.screenshot('6_bar_graph').to.be.capture(function (page) {
+            page.mouseMove('.tableIconsGroup:nth-child(2)');
+            page.click('.tableIcon[data-footer-icon-id=graphVerticalBar]');
+        }, done);
+    });
+
+    it("should load pie graph when pie graph footer icon clicked", function (done) {
+        expect.screenshot('7_pie_graph').to.be.capture(function (page) {
+            page.mouseMove('.tableIconsGroup:nth-child(2)');
+            page.click('.tableIcon[data-footer-icon-id=graphPie]');
+        }, done);
+    });
+
+    it("should load a tag cloud when tag cloud footer icon clicked", function (done) {
+        expect.screenshot('8_tag_cloud').to.be.capture(function (page) {
+            page.mouseMove('.tableIconsGroup:nth-child(2)');
+            page.click('.tableIcon[data-footer-icon-id=cloud]');
+        }, done);
+    });
+
+    it("should load normal table when normal table footer icon clicked", function (done) {
+        expect.screenshot('9_normal_table').to.be.capture(function (page) {
+            page.click('.tableIcon[data-footer-icon-id=table]');
+        }, done);
+    });
+
+    it("should change the number of rows when new limit selected", function (done) {
+        expect.screenshot('10_change_limit').to.be.capture(function (page) {
+            page.click('.limitSelection');
+            page.click('.limitSelection ul li[value=10]');
+        }, done);
+    });
+
+    it("should flatten the table when the flatten link is clicked", function (done) {
+        expect.screenshot('11_flattened').to.be.capture(function (page) {
+            page.mouseMove('.tableConfiguration');
+            page.click('.dataTableFlatten');
+        }, done);
+    });
+
+    it("should show aggregate rows when the aggregate rows option is clicked", function (done) {
+        expect.screenshot('12_aggregate_shown').to.be.capture(function (page) {
+            page.mouseMove('.tableConfiguration');
+            page.click('.dataTableIncludeAggregateRows');
+        }, done);
+    });
+
+    it("should make the report hierarchical when the flatten link is clicked again", function (done) {
+        expect.screenshot('13_make_hierarchical').to.be.capture(function (page) {
+            page.mouseMove('.tableConfiguration');
+            page.click('.dataTableFlatten');
+        }, done);
+    });
+
+    it("should show the visits percent when hovering over a column", function (done) {
+        expect.screenshot('14_visits_percent').to.be.capture(function (page) {
+            page.mouseMove('td.column');
+        }, done);
+    });
+
+    it("should load subtables correctly when row clicked", function (done) {
+        expect.screenshot('subtables_loaded').to.be.capture(function (page) {
+            page.click('tr.subDataTable:first');
+            page.click('tr.subDataTable:eq(2)');
+        }, done);
+    });
+
+    it("should search the table when a search string is entered and the search button clicked", function (done) {
+        expect.screenshot('15_search').to.be.capture(function (page) {
+            page.sendKeys('.dataTableSearchPattern>input[type=text]', 'term');
+            page.click('.dataTableSearchPattern>input[type=submit]');
+        }, done);
+    });
+
+    it("should display the export options when clicking the export icon", function (done) {
+        expect.screenshot('export_options').to.be.capture(function (page) {
+            page.click('.exportToFormatIcons', 2000);
+        }, done);
+    });
+
+    it("should display a related report when related report link is clicked", function (done) {
+        expect.screenshot('related_report_click').to.be.capture(function (page) {
+            var newReportUrl = url.replace("=Referrers", "=UserSettings").replace("=getKeywords", "=getOS");
+
+            page.load(newReportUrl);
+            page.click('.datatableRelatedReports li>span:visible');
+        }, done);
+    });
+});
\ No newline at end of file
diff --git a/tests/javascript/index.php b/tests/javascript/index.php
index b4e737792d..20fade48ea 100644
--- a/tests/javascript/index.php
+++ b/tests/javascript/index.php
@@ -407,6 +407,10 @@ function PiwikTest() {
 
     module('externals');
 
+
+    // Delete cookies to prevent cookie store from impacting tests
+    deleteCookies();
+
     test("JSLint", function() {
         expect(1);
         var src = '<?php
@@ -1555,7 +1559,9 @@ function PiwikTest() {
             }
 
             strictEqual(actual.indexOf(expectedStartsWith), 0, message +  actual + ' should start with ' + expectedStartsWith);
-            strictEqual(actual.indexOf('&idsite=&rec=1'), expectedStartsWith.length);
+
+            var expectedString = '&idsite=1&rec=1';
+            strictEqual(actual.indexOf(expectedString), expectedStartsWith.length, 'did not find ' + expectedString + ' in ' + actual);
             // make sure it contains all those other tracking stuff directly afterwards so we can assume it did append
             // the other request stuff and we also make sure to compare the whole custom string as we check from
             // expectedStartsWith.length
@@ -1611,13 +1617,15 @@ function PiwikTest() {
         strictEqual(actual, undefined, 'nothing set');
 
         actual = tracker.buildContentInteractionTrackingRedirectUrl('/path?a=b');
-        assertTrackingRequest(actual, '?redirecturl=' + encodeWrapper(origin + '/path?a=b') + '&c_t=%2Fpath%3Fa%3Db', 'should build redirect url including domain when absolute path. Target should also fallback to passed url if not set');
+        assertTrackingRequest(actual, 'piwik.php?redirecturl=' + encodeWrapper(origin + '/path?a=b') + '&c_t=%2Fpath%3Fa%3Db',
+            'should build redirect url including domain when absolute path. Target should also fallback to passed url if not set');
 
         actual = tracker.buildContentInteractionTrackingRedirectUrl('path?a=b');
-        assertTrackingRequest(actual, '?redirecturl=' + toEncodedAbsoluteUrl('path?a=b') + '&c_t=path%3Fa%3Db', 'should build redirect url including domain when relative path. Target should also fallback to passed url if not set');
+        assertTrackingRequest(actual, 'piwik.php?redirecturl=' + toEncodedAbsoluteUrl('path?a=b') + '&c_t=path%3Fa%3Db',
+            'should build redirect url including domain when relative path. Target should also fallback to passed url if not set');
 
         actual = tracker.buildContentInteractionTrackingRedirectUrl('#test', 'click', 'name', 'piece', 'target');
-        assertTrackingRequest(actual, '?redirecturl=' + toEncodedAbsoluteUrl('#test') + '&c_i=click&c_n=name&c_p=piece&c_t=target', 'all params set');
+        assertTrackingRequest(actual, 'piwik.php?redirecturl=' + toEncodedAbsoluteUrl('#test') + '&c_i=click&c_n=name&c_p=piece&c_t=target', 'all params set');
 
         trackerUrl = tracker.getTrackerUrl();
         tracker.setTrackerUrl('piwik.php?test=1');
@@ -1725,7 +1733,7 @@ function PiwikTest() {
         strictEqual($(_s('#ex111')).attr('href'), 'piwik.php?xyz=makesnosense', 'trackContentImpressionClickInteraction, a tracking link should not be changed');
 
         actual = (tracker.trackContentImpressionClickInteraction(_s('#ex112')))({target: _s('#ex112')});
-        assertTrackingRequest(actual, 'c_i=click&c_n=img.jpg&c_p=img.jpg&c_t=' + originEncoded + '%2Ftests%2Fjavascript%2F%23example', 'trackContentImpressionClickInteraction, a link that is an anchor should be tracked as XHR and no redirect');
+        assertTrackingRequest(actual, 'c_i=click&c_n=img.jpg&c_p=img.jpg&c_t=' + toEncodedAbsoluteUrl('#example'), 'trackContentImpressionClickInteraction, a link that is an anchor should be tracked as XHR and no redirect');
 
         actual = (tracker.trackContentImpressionClickInteraction(_s('#ex113_target')))({target: _s('#ex113_target')});
         assertTrackingRequest(actual, 'c_i=click&c_n=img.jpg&c_p=img.jpg', 'trackContentImpressionClickInteraction, if element is not A or AREA it should always use xhr');
@@ -2007,29 +2015,31 @@ function PiwikTest() {
     });
     
     test("Default visitorId should be equal across Trackers", function() {
-        expect(4);
+        expect(5);
 
         deleteCookies();
 
         var asyncTracker = Piwik.getAsyncTracker();
-        var asyncVistorId = asyncTracker.getVisitorId();
-        equal(Piwik.getAsyncTracker().getVisitorId(), asyncVistorId, 'asyncVistorId');
-        
-        wait(2000);
+        var asyncVisitorId = asyncTracker.getVisitorId();
+        equal(Piwik.getAsyncTracker().getSiteId(), asyncTracker.getSiteId(), 'async same site id');
+        equal(Piwik.getAsyncTracker().getTrackerUrl(), asyncTracker.getTrackerUrl(), 'async same getTrackerUrl()');
 
+        wait(2000);
         var delayedTracker = Piwik.getTracker();
         var delayedVisitorId = delayedTracker.getVisitorId();
-        equal(Piwik.getAsyncTracker().getVisitorId(), delayedVisitorId, 'delayedVisitorId');
+        equal(Piwik.getAsyncTracker().getVisitorId(), delayedVisitorId, 'delayedVisitorId ' + delayedVisitorId + ' should be the same as ' + Piwik.getAsyncTracker().getVisitorId());
 
         var prefixTracker = Piwik.getTracker();
         prefixTracker.setCookieNamePrefix('_test_cookie_prefix');
 
         var prefixVisitorId = prefixTracker.getVisitorId();
-        equal(Piwik.getAsyncTracker().getVisitorId(), prefixVisitorId, 'prefixVisitorId');
+        notEqual(Piwik.getAsyncTracker().getVisitorId(), prefixVisitorId, 'Visitor ID are different when using a different cookie prefix');
 
         var customTracker = Piwik.getTracker('customTrackerUrl', '71');
         var customVisitorId = customTracker.getVisitorId();
-        equal(Piwik.getAsyncTracker().getVisitorId(), customVisitorId, 'customVisitorId');
+        notEqual(Piwik.getAsyncTracker().getVisitorId(), customVisitorId, 'Visitor ID are different on different websites');
+
+
     });
 
     test("AnalyticsTracker alias", function() {
@@ -2353,6 +2363,69 @@ function PiwikTest() {
         tracker.setTrackerUrl(trackerUrl);
     });
 
+    function getVisitorIdFromCookie(tracker) {
+        visitorCookieName = tracker.hook.test._getCookieName('id');
+        visitorCookieValue = tracker.hook.test._getCookie(visitorCookieName);
+        return visitorCookieValue.split('.')[0];
+    }
+
+    test("User ID and Visitor UUID", function() {
+        expect(16);
+        deleteCookies();
+
+        var userIdString = 'userid@mydomain.org';
+
+        var tracker = Piwik.getTracker();
+
+        // Force the cookie to be created....
+        var visitorId = tracker.getVisitorId();
+        tracker.trackPageView();
+
+        // Check cookie was created
+        ok(getVisitorIdFromCookie(tracker).length == 16, "Visitor ID from cookie should be 16 chars, got: " + getVisitorIdFromCookie(tracker));
+        equal(getVisitorIdFromCookie(tracker), visitorId, "Visitor ID from cookie is the same as Visitor ID in object");
+        equal(tracker.getVisitorId(), visitorId, "After tracking an action and updating the ID cookie, the visitor ID is still the same.");
+
+        // Visitor ID is by default set to a UUID fingerprint
+        var hashUserId = tracker.hook.test._sha1(userIdString).substr(0, 16);
+        notEqual(hashUserId, tracker.getVisitorId(), "Visitor ID " + tracker.getVisitorId() + " is not yet the hash of User ID " + hashUserId);
+        notEqual("", tracker.getVisitorId(), "Visitor ID is not empty");
+        ok( tracker.getVisitorId().length === 16, "Visitor ID is 16 chars string");
+
+        // Check that Visitor ID is the same when requested multiple times
+        var visitorId = tracker.getVisitorId();
+        equal(visitorId, tracker.getVisitorId(), "Visitor ID is the same when called multiple times");
+
+        // Building another 'tracker2' object so we can compare behavior to 'tracker'
+        var tracker2 = Piwik.getTracker();
+        equal(tracker.getVisitorId(), tracker2.getVisitorId(), "Visitor ID " + tracker.getVisitorId() + " is the same as Visitor ID 2 " + tracker2.getVisitorId());
+        notEqual("", tracker2.getVisitorId(), "Visitor ID 2 is not empty");
+        tracker2.setCookieNamePrefix("differentNamespace");
+        notEqual("", tracker2.getVisitorId(), "Visitor ID 2 is not empty");
+        notEqual(tracker.getVisitorId(), tracker2.getVisitorId(), "Setting a new namespace forces Visitor ID " + tracker.getVisitorId() + " to be different from Visitor ID 2 " + tracker2.getVisitorId());
+
+
+
+        // Set User ID and verify it was set
+        tracker.setUserId(userIdString);
+        equal(userIdString, tracker.getUserId(), "getUserId() returns User Id");
+        equal(tracker.hook.test._sha1(userIdString).substr(0, 16), tracker.getVisitorId(), "Visitor ID is the sha1 of User ID");
+
+        // Check that calling trackPageView does not change the visitor ID
+        var visitorId = tracker.getVisitorId();
+        tracker.trackPageView();
+        equal(getVisitorIdFromCookie(tracker), visitorId, "Visitor ID from cookie is the same as Visitor ID in object ("+ visitorId +"), but got: " + getVisitorIdFromCookie(tracker));
+
+        // Verify that Visitor ID is tied to User ID
+        notEqual(tracker.getVisitorId(), tracker2.getVisitorId(), "After setting a User ID, Visitor ID " + tracker.getVisitorId() + " is now different from Visitor ID2 " + tracker2.getVisitorId());
+
+        // Verify that setting the same user ID on two objects results in the same Visitor ID
+        tracker2.setUserId(userIdString);
+        equal(tracker.getVisitorId(), tracker2.getVisitorId(), "After setting the same User ID, Visitor ID are the same");
+
+
+    });
+
     test("utf8_encode(), sha1()", function() {
         expect(6);
 
@@ -2370,10 +2443,11 @@ function PiwikTest() {
     test("getRequest()", function() {
         expect(2);
 
-        var tracker = Piwik.getTracker();
+        var tracker = Piwik.getTracker('hostname', 4);
 
         tracker.setCustomData("key is X", "value is Y");
-        equal( tracker.getRequest('hello=world').indexOf('hello=world&idsite=&rec=1&r='), 0);
+        var requestString = tracker.getRequest('hello=world');
+        equal( requestString.indexOf('hello=world&idsite=4&rec=1&r='), 0, "Request string " + requestString);
 
         ok( -1 !== tracker.getRequest('hello=world').indexOf('send_image=0'), 'should disable sending image response');
     });
@@ -2586,7 +2660,7 @@ if ($sqlite) {
     });
 
     test("tracking", function() {
-        expect(102);
+        expect(101);
 
         /*
          * Prevent Opera and HtmlUnit from performing the default action (i.e., load the href URL)
@@ -2711,7 +2785,7 @@ if ($sqlite) {
             visitorId1 = Piwik.getAsyncTracker().getVisitorId();
         }]);
         visitorId2 = tracker.getVisitorId();
-        ok( visitorId1 && visitorId1 != "" && visitorId2 && visitorId2 != "" && (visitorId1 == visitorId2), "getVisitorId()" );
+        ok( visitorId1 && visitorId1 != "" && visitorId2 && visitorId2 != "" && (visitorId1 == visitorId2), "getVisitorId()" + visitorId1 + " VS " + visitorId2 );
 
         var visitorInfo1, visitorInfo2;
 
@@ -2723,7 +2797,7 @@ if ($sqlite) {
             referrer1 = Piwik.getAsyncTracker().getAttributionReferrerUrl();
         }]);
         visitorInfo2 = tracker.getVisitorInfo();
-        ok( visitorInfo1 && visitorInfo2 && visitorInfo1.length == visitorInfo2.length, "getVisitorInfo()" );
+        ok( visitorInfo1 && visitorInfo2 && visitorInfo1.length == visitorInfo2.length, "getVisitorInfo() " );
         for (var i = 0; i < 6; i++) {
             ok( visitorInfo1[i] == visitorInfo2[i], "(loadVisitorId())["+i+"]" );
         }
@@ -2828,8 +2902,6 @@ if ($sqlite) {
         var userIdString = 'userid@mydomain.org';
         tracker3.setUserId(userIdString);
 
-        equal(userIdString, tracker3.getUserId());
-
         // Append tracking url parameter
         tracker3.appendToTrackingUrl("appended=1&appended2=value");
 
diff --git a/tests/javascript/piwik.php b/tests/javascript/piwik.php
index df7f606ef2..a697931196 100644
--- a/tests/javascript/piwik.php
+++ b/tests/javascript/piwik.php
@@ -70,7 +70,7 @@ function logRequest($sqlite, $uri, $data) {
 }
 
 if (isset($_GET['requests'])) {
-	$token = get_magic_quotes_gpc() ? stripslashes($_GET['requests']) : $_GET['requests'];
+	$token = htmlentities($_GET['requests']);
 	$ua = $_SERVER['HTTP_USER_AGENT'];
 
 	echo "<html><head><title>$token</title></head><body>\n";
diff --git a/tests/javascript/piwiktest.js b/tests/javascript/piwiktest.js
index fc2db99402..415bd57d8a 100644
--- a/tests/javascript/piwiktest.js
+++ b/tests/javascript/piwiktest.js
@@ -23,6 +23,7 @@ Piwik.addPlugin('testPlugin', {
 				'_getClassesRegExp : getClassesRegExp,' +
 				'_hasCookies : hasCookies,' +
 				'_getCookie : getCookie,' +
+				'_getCookieName : getCookieName,' +
 				'_setCookie : setCookie,' +
 				'_encode : encodeWrapper,' +
 				'_decode : decodeWrapper,' +
diff --git a/tests/javascript/testrunner.js b/tests/javascript/testrunner.js
index ff74ceb28b..7ac70b4a31 100644
--- a/tests/javascript/testrunner.js
+++ b/tests/javascript/testrunner.js
@@ -64,10 +64,6 @@ page.onResourceReceived = function() {
                 errorMessage += " \nSource: " + obj.source + "\n\n";
 
                 console.log(errorMessage);
-            } else {
-                if (obj && obj.message) {
-                    console.log(obj.message);
-                }
             }
         });
     });
diff --git a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_0_initial.png b/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_0_initial.png
deleted file mode 100644
index aaf0f12fdd..0000000000
--- a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_0_initial.png
+++ /dev/null
diff --git a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_10_change_limit.png b/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_10_change_limit.png
deleted file mode 100644
index 891f8b0a6c..0000000000
--- a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_10_change_limit.png
+++ /dev/null
diff --git a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_11_flattened.png b/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_11_flattened.png
deleted file mode 100644
index 076654dfcc..0000000000
--- a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_11_flattened.png
+++ /dev/null
diff --git a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_12_aggregate_shown.png b/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_12_aggregate_shown.png
deleted file mode 100644
index db6caebadb..0000000000
--- a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_12_aggregate_shown.png
+++ /dev/null
diff --git a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_13_make_hierarchical.png b/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_13_make_hierarchical.png
deleted file mode 100644
index 891f8b0a6c..0000000000
--- a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_13_make_hierarchical.png
+++ /dev/null
diff --git a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_14_visits_percent.png b/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_14_visits_percent.png
deleted file mode 100644
index 8674bfbe32..0000000000
--- a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_14_visits_percent.png
+++ /dev/null
diff --git a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_15_search.png b/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_15_search.png
deleted file mode 100644
index 8a2f4feca1..0000000000
--- a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_15_search.png
+++ /dev/null
diff --git a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_1_all_columns.png b/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_1_all_columns.png
deleted file mode 100644
index 35c67ed7a3..0000000000
--- a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_1_all_columns.png
+++ /dev/null
diff --git a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_2_column_sorted_desc.png b/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_2_column_sorted_desc.png
deleted file mode 100644
index 7d303c01ce..0000000000
--- a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_2_column_sorted_desc.png
+++ /dev/null
diff --git a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_3_column_sorted_asc.png b/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_3_column_sorted_asc.png
deleted file mode 100644
index f11870080a..0000000000
--- a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_3_column_sorted_asc.png
+++ /dev/null
diff --git a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_4_exclude_low_population.png b/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_4_exclude_low_population.png
deleted file mode 100644
index 82370b1f4d..0000000000
--- a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_4_exclude_low_population.png
+++ /dev/null
diff --git a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_5_goals.png b/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_5_goals.png
deleted file mode 100644
index daa53ad156..0000000000
--- a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_5_goals.png
+++ /dev/null
diff --git a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_6_bar_graph.png b/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_6_bar_graph.png
deleted file mode 100644
index 64aa2330a8..0000000000
--- a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_6_bar_graph.png
+++ /dev/null
diff --git a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_7_pie_graph.png b/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_7_pie_graph.png
deleted file mode 100644
index 828621d5b6..0000000000
--- a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_7_pie_graph.png
+++ /dev/null
diff --git a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_8_tag_cloud.png b/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_8_tag_cloud.png
deleted file mode 100644
index 4f12618a1b..0000000000
--- a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_8_tag_cloud.png
+++ /dev/null
diff --git a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_9_normal_table.png b/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_9_normal_table.png
deleted file mode 100644
index 6dfe56ba90..0000000000
--- a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_9_normal_table.png
+++ /dev/null
diff --git a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_export_options.png b/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_export_options.png
deleted file mode 100644
index 1379a4f24b..0000000000
--- a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_export_options.png
+++ /dev/null
diff --git a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_related_report_click.png b/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_related_report_click.png
deleted file mode 100644
index 654b8497c3..0000000000
--- a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_related_report_click.png
+++ /dev/null
diff --git a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_subtables_loaded.png b/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_subtables_loaded.png
deleted file mode 100644
index 6853b804e8..0000000000
--- a/tests/lib/screenshot-testing/processed-ui-screenshots/ViewDataTableTest_subtables_loaded.png
+++ /dev/null
diff --git a/tests/lib/screenshot-testing/run-tests.js b/tests/lib/screenshot-testing/run-tests.js
index fd313ee4f0..86f4c7ef55 100644
--- a/tests/lib/screenshot-testing/run-tests.js
+++ b/tests/lib/screenshot-testing/run-tests.js
@@ -8,7 +8,20 @@
  */
 
 // required modules
-var config = require("./config");
+var config = require("./../../UI/config.dist");
+try {
+    var localConfig = require("./../../UI/config");
+} catch (e) {
+    localConfig = null;
+}
+
+if (localConfig) {
+    for (var prop in localConfig) {
+        if (localConfig.hasOwnProperty(prop)) {
+            config[prop] = localConfig[prop];
+        }
+    }
+}
 
 // assume the URI points to a folder and make sure Piwik won't cut off the last path segment
 if (config.phpServer.REQUEST_URI.slice(-1) != '/') {
diff --git a/tests/lib/screenshot-testing/support/app.js b/tests/lib/screenshot-testing/support/app.js
index 674377d0b6..29a7943190 100644
--- a/tests/lib/screenshot-testing/support/app.js
+++ b/tests/lib/screenshot-testing/support/app.js
@@ -33,10 +33,16 @@ var walk = function (dir, pattern, result) {
     return result;
 };
 
+var isCorePlugin = function (pathToPlugin) {
+    // if the plugin is a .git checkout, it's not part of core
+    var gitDir = path.join(pathToPlugin, '.git');
+    return !fs.exists(gitDir);
+};
+
 var Application = function () {
     this.runner = null;
 
-    var diffviewerDir = path.join(PIWIK_INCLUDE_PATH, 'tests/PHPUnit/UI', config.screenshotDiffDir);
+    var diffviewerDir = path.join(PIWIK_INCLUDE_PATH, 'tests/UI', config.screenshotDiffDir);
     this.diffViewerGenerator = new DiffViewerGenerator(diffviewerDir);
 };
 
@@ -59,6 +65,7 @@ Application.prototype.printHelpAndExit = function () {
     console.log("                            builds artifacts server. For use with travis build.");
     console.log("  --screenshot-repo:        Specifies the github repository that contains the expected screenshots");
     console.log("                            to link to in the diffviewer. For use with travis build.");
+    console.log("  --core:                   Only execute UI tests that are for Piwik core or Piwik core plugins.");
 
     phantom.exit(0);
 };
@@ -72,7 +79,7 @@ Application.prototype.init = function () {
         var suite = oldDescribe.apply(null, arguments);
         suite.baseDirectory = app.currentModulePath.match(/\/plugins\//) ? path.dirname(app.currentModulePath) : uiTestsDir;
         if (options['assume-artifacts']) {
-            suite.diffDir = path.join(PIWIK_INCLUDE_PATH, 'tests/PHPUnit/UI', config.screenshotDiffDir);
+            suite.diffDir = path.join(PIWIK_INCLUDE_PATH, 'tests/UI', config.screenshotDiffDir);
         } else {
             suite.diffDir = path.join(suite.baseDirectory, config.screenshotDiffDir);
         }
@@ -94,6 +101,12 @@ Application.prototype.loadTestModules = function () {
     // load all UI tests we can find
     var modulePaths = walk(uiTestsDir, /_spec\.js$/);
 
+    if (options.core) {
+        plugins = plugins.filter(function (path) {
+            return isCorePlugin(path);
+        });
+    }
+
     plugins.forEach(function (pluginPath) {
         walk(path.join(pluginPath, 'Test'), /_spec\.js$/, modulePaths);
         walk(path.join(pluginPath, 'tests'), /_spec\.js$/, modulePaths);
@@ -197,7 +210,7 @@ Application.prototype.doRunTests = function () {
             var symlinks = ['libs', 'plugins', 'tests', 'piwik.js'];
 
             symlinks.forEach(function (item) {
-                var file = path.join(uiTestsDir, '..', 'proxy', item);
+                var file = path.join(uiTestsDir, '..', 'PHPUnit', 'proxy', item);
                 if (fs.exists(file)) {
                     fs.remove(file);
                 }
diff --git a/tests/lib/screenshot-testing/support/chai-extras.js b/tests/lib/screenshot-testing/support/chai-extras.js
index 6b12de1998..6df4137700 100644
--- a/tests/lib/screenshot-testing/support/chai-extras.js
+++ b/tests/lib/screenshot-testing/support/chai-extras.js
@@ -40,7 +40,19 @@ function getPageLogsString(pageLogs, indent) {
 }
 
 // add capture assertion
-var pageRenderer = new PageRenderer(path.join(config.piwikUrl, "tests", "PHPUnit", "proxy"));
+var pageRenderer = new PageRenderer(config.piwikUrl + path.join("tests", "PHPUnit", "proxy"));
+
+function getProcessedScreenshotPath(screenName) {
+    var screenshotFileName = screenName + '.png',
+        dirsBase = app.runner.suite.baseDirectory,
+        processedScreenshotDir = path.join(options['store-in-ui-tests-repo'] ? uiTestsDir : dirsBase, config.processedScreenshotsDir);
+
+    if (!fs.isDirectory(processedScreenshotDir)) {
+        fs.makeTree(processedScreenshotDir);
+    }
+
+    return path.join(processedScreenshotDir, screenshotFileName);
+}
 
 function capture(screenName, compareAgainst, selector, pageSetupFn, done) {
 
@@ -54,15 +66,10 @@ function capture(screenName, compareAgainst, selector, pageSetupFn, done) {
         expectedScreenshotDir = path.join(dirsBase, config.expectedScreenshotsDir),
         expectedScreenshotPath = path.join(expectedScreenshotDir, compareAgainst + '.png'),
 
-        processedScreenshotDir = path.join(options['store-in-ui-tests-repo'] ? uiTestsDir : dirsBase, config.processedScreenshotsDir),
-        processedScreenshotPath = path.join(processedScreenshotDir, screenshotFileName),
+        processedScreenshotPath = getProcessedScreenshotPath(screenName);
 
         screenshotDiffDir = path.join(options['store-in-ui-tests-repo'] ? uiTestsDir : dirsBase, config.screenshotDiffDir);
 
-    if (!fs.isDirectory(processedScreenshotDir)) {
-        fs.makeTree(processedScreenshotDir);
-    }
-
     if (!fs.isDirectory(screenshotDiffDir)) {
         fs.makeTree(screenshotDiffDir);
     }
@@ -190,13 +197,24 @@ chai.Assertion.addChainableMethod('capture', function () {
 // add `contains` assertion
 chai.Assertion.addChainableMethod('contains', function () {
     var self = this,
-        url = this.__flags['object'],
-        elementSelector = arguments[0],
-        pageSetupFn = arguments[1],
-        done = arguments[2];
+        url = this.__flags['object']
+        ;
+
+    if (arguments.length == 3) {
+        var elementSelector = arguments[0],
+            pageSetupFn = arguments[1],
+            screenName = null,
+            done = arguments[2];
+    } else {
+        var elementSelector = arguments[0],
+            screenName = app.runner.suite.title + "_" + arguments[1],
+            pageSetupFn = arguments[2],
+            done = arguments[3];
+    }
 
-    if (url
-        && pageRenderer.getCurrentUrl() != url
+    if (url !== null
+        && url !== undefined
+        && pageRenderer.getCurrentUrl() !== url
     ) {
         pageRenderer.load(url);
     }
@@ -207,9 +225,10 @@ chai.Assertion.addChainableMethod('contains', function () {
         throw new Error("No 'done' callback specified in 'contains' assertion.");
     }
 
-    pageRenderer.capture(null, function (err) {
-        var obj = self._obj,
-            indent = "     ";
+    var capturePath = screenName ? getProcessedScreenshotPath(screenName) : null;
+
+    pageRenderer.capture(capturePath, function (err) {
+        var indent = "     ";
 
         if (err) {
             err.stack = err.message + "\n" + indent + getPageLogsString(pageRenderer.pageLogs, indent);
@@ -226,8 +245,20 @@ chai.Assertion.addChainableMethod('contains', function () {
             );
 
             done();
-        } catch (error) {
-            error.stack = getPageLogsString(pageRenderer.pageLogs, indent);
+        } catch (originalError) {
+            var stack = originalError.message + "\n\n";
+            if (capturePath) {
+                stack += indent + "View the captured screenshot at '" + capturePath + "'.";
+            } else {
+                stack += indent + "NOTE: No screenshot name was supplied to this '.contains(' assertion. If the second argument is a screenshot name, "
+                      + "the screenshot will be saved so you can debug this failure.";
+            }
+
+            stack += getPageLogsString(pageRenderer.pageLogs, indent);
+
+            var error = new AssertionError(originalError.message);
+            error.stack = stack;
+
             done(error);
         }
     });
diff --git a/tests/lib/screenshot-testing/support/diff-viewer.js b/tests/lib/screenshot-testing/support/diff-viewer.js
index f68eddf8d1..7910887fdd 100644
--- a/tests/lib/screenshot-testing/support/diff-viewer.js
+++ b/tests/lib/screenshot-testing/support/diff-viewer.js
@@ -17,11 +17,11 @@ var DiffViewerGenerator = function (diffDir) {
 };
 
 DiffViewerGenerator.prototype.getDiffPath = function (testInfo) {
-    var baseDir = path.join(PIWIK_INCLUDE_PATH, 'tests/PHPUnit/UI');
+    var baseDir = path.join(PIWIK_INCLUDE_PATH, 'tests/UI');
     return path.resolve(path.join(baseDir, config.screenshotDiffDir, testInfo.name + '.png'));
 };
 
-// TODO: diff output path shouldn't be stored in piwik-ui-tests repo
+// TODO: diff output path shouldn't be stored in piwik repo
 DiffViewerGenerator.prototype.getUrlForPath = function (path) {
     return fs.relpath(path, this.diffDir);
 };
diff --git a/tests/lib/screenshot-testing/support/globals.js b/tests/lib/screenshot-testing/support/globals.js
index 8b7fe944f8..dbbed49c0a 100644
--- a/tests/lib/screenshot-testing/support/globals.js
+++ b/tests/lib/screenshot-testing/support/globals.js
@@ -13,7 +13,7 @@ var __dirname = phantom.libraryPath;
 
 var PIWIK_INCLUDE_PATH = path.join(__dirname, '..', '..', '..');
 
-var uiTestsDir = path.join(PIWIK_INCLUDE_PATH, 'tests', 'PHPUnit', 'UI')
+var uiTestsDir = path.join(PIWIK_INCLUDE_PATH, 'tests', 'UI')
 
 var testsLibDir = path.join(__dirname, "..", "..", "lib");
 
diff --git a/tests/lib/screenshot-testing/support/page-renderer.js b/tests/lib/screenshot-testing/support/page-renderer.js
index 7e8edcb466..4f66a728f2 100644
--- a/tests/lib/screenshot-testing/support/page-renderer.js
+++ b/tests/lib/screenshot-testing/support/page-renderer.js
@@ -21,6 +21,10 @@ var PageRenderer = function (baseUrl) {
 
     this.defaultWaitTime = 1000;
     this._isLoading = false;
+
+    if (this.baseUrl.substring(-1) != '/') {
+        this.baseUrl = this.baseUrl + '/';
+    }
 };
 
 PageRenderer.prototype._recreateWebPage = function () {
@@ -164,11 +168,22 @@ PageRenderer.prototype._reload = function (callback) {
 
 PageRenderer.prototype._load = function (url, callback) {
     if (url.indexOf("://") === -1) {
-        url = path.join(this.baseUrl, url);
+        url = this.baseUrl + url;
     }
 
     this._recreateWebPage(); // calling open a second time never calls the callback
-    this.webpage.open(url, callback);
+    this.webpage.open(url, function (status) {
+        this.evaluate(function () {
+            var $ = window.jQuery;
+            if ($) {
+                $('html').addClass('uiTest');
+            }
+        });
+
+        if (callback) {
+            callback(status);
+        }
+    });
 };
 
 PageRenderer.prototype._evaluate = function (impl, callback) {
@@ -188,6 +203,10 @@ PageRenderer.prototype._getPosition = function (selector) {
         if (!offset
             || !element.length
         ) {
+            // TODO: this should get captured and outputted as part of the web page logs failure info, but
+            //       at the moment it doesn't
+            console.log("ERROR: Cannot find element '" + selector + "'.");
+
             return null;
         }
 
@@ -197,10 +216,6 @@ PageRenderer.prototype._getPosition = function (selector) {
         };
     }, selector);
 
-    if (!pos) {
-        throw new Error("Cannot find element " + selector);
-    }
-
     return pos;
 };
 
@@ -250,7 +265,15 @@ PageRenderer.prototype.capture = function (outputPath, callback, selector) {
                 var clipRect = {bottom: null, height: null, left: null, right: null, top: null, width: null};
 
                 element.each(function (index, node) {
-                    var rect = node.getBoundingClientRect();
+                    if (!$(node).is(':visible')) {
+                        return;
+                    }
+
+                    var rect = $(node).offset();
+                    rect.width = $(node).outerWidth();
+                    rect.height = $(node).outerHeight();
+                    rect.right = rect.left + rect.width;
+                    rect.bottom = rect.top + rect.height;
 
                     if (isInvalidBoundingRect(rect)) {
                         // element is not visible
@@ -311,7 +334,7 @@ PageRenderer.prototype.capture = function (outputPath, callback, selector) {
             var previousClipRect = self.webpage.clipRect;
 
             if (outputPath) {
-                setClipRect(self.webpage, selector)
+                setClipRect(self.webpage, selector);
 
                 self._setCorrectViewportSize();
                 self.webpage.render(outputPath);
diff --git a/tests/lib/screenshot-testing/support/test-environment.js b/tests/lib/screenshot-testing/support/test-environment.js
index d7d837bec3..9379ab88da 100644
--- a/tests/lib/screenshot-testing/support/test-environment.js
+++ b/tests/lib/screenshot-testing/support/test-environment.js
@@ -93,7 +93,7 @@ TestingEnvironment.prototype._call = function (params, done) {
 
 TestingEnvironment.prototype.executeConsoleCommand = function (command, args, callback) {
     var consoleFile = path.join(PIWIK_INCLUDE_PATH, 'console'),
-        commandArgs = [consoleFile, command, '-v'].concat(args),
+        commandArgs = [consoleFile, command].concat(args),
         child = require('child_process').spawn(config.php, commandArgs);
 
     var firstLine = true;
diff --git a/tests/resources/OmniFixture-dump.sql.gz b/tests/resources/OmniFixture-dump.sql.gz
index 710962a0b7..5466a04b88 100644
--- a/tests/resources/OmniFixture-dump.sql.gz
+++ b/tests/resources/OmniFixture-dump.sql.gz
diff --git a/tests/resources/TestPluginLogClass.php b/tests/resources/TestPluginLogClass.php
deleted file mode 100644
index 3a95fe0cfb..0000000000
--- a/tests/resources/TestPluginLogClass.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-namespace Piwik\Plugins\TestPlugin;
-
-use Piwik\Log;
-
-class TestLoggingUtility
-{
-    public static function doLog($message)
-    {
-        Log::warning($message);
-    }
-}
diff --git a/tests/resources/access-logs/fake_logs_cloudfront.log b/tests/resources/access-logs/fake_logs_cloudfront.log
new file mode 100644
index 0000000000..9892dc36af
--- /dev/null
+++ b/tests/resources/access-logs/fake_logs_cloudfront.log
@@ -0,0 +1,3 @@
+#Version: 1.0
+#Fields: date time x-edge-location sc-bytes c-ip cs-method cs(Host) cs-uri-stem sc-status cs(Referer) cs(User-Agent) cs-uri-query cs(Cookie) x-edge-result-type x-edge-request-id x-host-header cs-protocol cs-bytes time-taken
+2012-08-23 01:13:11 FRA2 182 192.0.2.10 GET d111111abcdef8.cloudfront.net /view/my/file.html 200 www.displaymyfiles.com Mozilla/4.0%20(compatible;%20MSIE%205.0b1;%20Mac_PowerPC) - zip=98101 RefreshHit MRVMF7KydIvxMWfJIglgwHQwZsbG2IhRJ07sn9AkKUFSHS9EXAMPLE== d111111abcdef8.cloudfront.net http - 0.001
diff --git a/tests/resources/access-logs/fake_logs_cloudfront_rtmp.log b/tests/resources/access-logs/fake_logs_cloudfront_rtmp.log
new file mode 100644
index 0000000000..117d747b40
--- /dev/null
+++ b/tests/resources/access-logs/fake_logs_cloudfront_rtmp.log
@@ -0,0 +1,4 @@
+#Version: 1.0
+#Fields: date time x-edge-location c-ip x-event sc-bytes x-cf-status x-cf-client-id cs-uri-stem cs-uri-query c-referrer x-page-url​  c-user-agent x-sname x-sname-query x-file-ext x-sid
+2012-08-12   23:51:20   SEA4   192.0.2.147   connect   2014   OK   bfd8a98bee0840d9b871b7f6ade9908f   rtmp://shqshne4jdp4b6.cloudfront.net/cfx/st​  key=value   http://player.longtailvideo.com/player.swf   http://www.longtailvideo.com/support/jw-player-setup-wizard?example=204   LNX%2010,0,32,18   -   -   -   -
+2012-08-12   23:51:21   SEA4   192.0.2.222   play   3914   OK   bfd8a98bee0840d9b871b7f6ade9908f   rtmp://shqshne4jdp4b6.cloudfront.net/cfx/st​  key=value   http://player.longtailvideo.com/player.swf   http://www.longtailvideo.com/support/jw-player-setup-wizard?example=204   LNX%2010,0,32,18   myvideo   p=2&q=4   flv   1
diff --git a/tests/resources/access-logs/fake_logs_custom.log b/tests/resources/access-logs/fake_logs_custom.log
index 85f4655d9b..2134ff1f74 100644
--- a/tests/resources/access-logs/fake_logs_custom.log
+++ b/tests/resources/access-logs/fake_logs_custom.log
@@ -2,9 +2,9 @@
 175.41.192.40 - - [30/Sep/2012:10:11:30 +0200] 200 "GET /faq/ HTTP/1.1" 234002
 175.41.192.40 - - [30/Sep/2012:10:11:56 +0200] 200 "GET /blog/category/community/ HTTP/1.1" 1324002
 175.41.192.40 - - [30/Sep/2012:10:12:03 +0200] 200 "GET /docs/manage-websites/ HTTP/1.1" 543002
-175.41.192.40 - - [30/Sep/2012:10:10:38 +0200] 200 "GET /blog/category/meta/ HTTP/1.1" 120002
+175.41.192.40 - - [30/Sep/2012:10:10:40 +0200] 200 "GET /blog/category/meta/ HTTP/1.1" 120002
 175.41.192.40 - - [30/Sep/2012:10:11:30 +0200] 200 "GET /faq/ HTTP/1.1" 294002
 175.41.192.40 - - [30/Sep/2012:10:11:56 +0200] 200 "GET /blog/category/community/ HTTP/1.1" 624002
-175.41.192.40 - - [30/Sep/2012:10:12:03 +0200] 200 "GET /docs/manage-websites/ HTTP/1.1" 343002
-175.41.192.40 - - [30/Sep/2012:10:10:38 +0200] 200 "GET /blog/category/meta/ HTTP/1.1" 23002
+175.41.192.40 - - [30/Sep/2012:10:12:04 +0200] 200 "GET /docs/manage-websites/ HTTP/1.1" 343002
+175.41.192.40 - - [30/Sep/2012:10:10:41 +0200] 200 "GET /blog/category/meta/ HTTP/1.1" 23002
 175.41.192.40 - - [30/Sep/2012:10:11:30 +0200] 200 "GET /faq/ HTTP/1.1" 237002
\ No newline at end of file
diff --git a/tests/resources/access-logs/fake_logs_custom_iis.log b/tests/resources/access-logs/fake_logs_custom_iis.log
new file mode 100644
index 0000000000..f2001c51dd
--- /dev/null
+++ b/tests/resources/access-logs/fake_logs_custom_iis.log
@@ -0,0 +1,8 @@
+#Software: IIS Advanced Logging Module
+#Version: 1.0
+#Start-Date: 2014-11-18 00:00:00.128
+#Fields:  date-local time-local s-ip cs-method cs-uri-stem cs-uri-query s-port cs-username c-ip cs(User-Agent) cs(Referer) cs(Host) sc-status sc-substatus sc-win32-status TimeTakenMS
+2012-08-15 17:00:00.363 10.10.28.140 GET /Products/theProduct - 80 user1 "70.95.0.0" "Mozilla/5.0 (Linux; Android 4.4.4; SM-G900V Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.59 Mobile Safari/537.36" "http://example.com/Search/SearchResults.pg?informationRecipient.languageCode.c=en" "xzy.example.com" 200 0 32 109
+2012-08-15 17:00:00.660 10.10.28.140 GET /Topic/hw43061 - 80 user1 "70.95.32.0" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2227.1 Safari/537.36" - "example.hello.com" 301 0 42 0
+2012-08-15 17:00:00.675 10.10.28.140 GET /hello/world/6,681965 - 80 - "173.5.0.0" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124 Safari/537.36" - "hello.example.com" 404 0 24 359
+2012-08-15 17:30:00.675 10.10.28.140 GET /hello/from/another/world/6,681965 - 80 user2 "173.5.0.0" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124 Safari/537.36" - "hello.example.com" 200 0 96 359
diff --git a/tests/resources/access-logs/fake_logs_netscaler.log b/tests/resources/access-logs/fake_logs_netscaler.log
new file mode 100644
index 0000000000..17035db670
--- /dev/null
+++ b/tests/resources/access-logs/fake_logs_netscaler.log
@@ -0,0 +1,6 @@
+#Version: 1.0
+#Software: Netscaler Web Logging(NSWL)
+#Date: 2014-02-18 11:55:13
+#Fields: date time c-ip cs-username sc-servicename s-ip s-port cs-method cs-uri-stem cs-uri-query sc-status cs-bytes sc-bytes time-taken cs-version cs(User-Agent) cs(Cookie) cs(Referer)
+2012-08-16 11:55:13 172.20.1.0 - HTTP 192.168.6.254 8080 GET /Citrix/XenApp/Wan/auth/login.jsp - 302 247 355 0 HTTP/1.1 Mozilla/4.0+(compatible;+MSIE+7.0;+Windows+NT+5.1;+Trident/4.0;+.NET+CLR+1.1.4322;+.NET+CLR+2.0.50727;+.NET+CLR+3.0.04506.648;+.NET+CLR+3.5.21022) - -
+2012-08-16 11:59:13 172.20.1.0 - HTTP 192.168.6.254 8080 GET /Citrix/XenApp/Wan/auth/silentDetection.jsp - 200 310 5609 0 HTTP/1.1 Mozilla/4.0+(compatible;+MSIE+7.0;+Windows+NT+5.1;+Trident/4.0;+.NET+CLR+1.1.4322;+.NET+CLR+2.0.50727;+.NET+CLR+3.0.04506.648;+.NET+CLR+3.5.21022) JSESSIONID=7BBF2F11B80261B27D23010421412323 -
\ No newline at end of file
diff --git a/tests/resources/access-logs/fake_logs_nginx_json.log b/tests/resources/access-logs/fake_logs_nginx_json.log
new file mode 100644
index 0000000000..4cf39dfbb0
--- /dev/null
+++ b/tests/resources/access-logs/fake_logs_nginx_json.log
@@ -0,0 +1 @@
+{"ip": "72.45.67.32","host": "piwik.net","path": "/","status": "200","referrer": "https://www.test.nl/","user_agent": "Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.95 Safari/537.36","length": 915,"generation_time_milli": 0.001,"date": "2012-08-13T13:20:31+01:00"}
\ No newline at end of file
diff --git a/tests/resources/access-logs/fake_logs_visits_in_reverse_chronological_order.log b/tests/resources/access-logs/fake_logs_visits_in_reverse_chronological_order.log
index 2d7d0fb3f9..9a7891231c 100644
--- a/tests/resources/access-logs/fake_logs_visits_in_reverse_chronological_order.log
+++ b/tests/resources/access-logs/fake_logs_visits_in_reverse_chronological_order.log
@@ -1,6 +1,6 @@
-74.125.31.147 - - [07/Apr/2013:19:00:00 +0900] "GET / HTTP/1.1" 200 9625 "-" "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0)"
+24.125.31.147 - - [07/Apr/2013:19:00:00 +0900] "GET / HTTP/1.1" 200 9625 "-" "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0)"
 
-74.125.31.147 - - [06/Apr/2013:20:00:00 +0900] "GET / HTTP/1.1" 200 9625 "-" "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0)"
+24.125.31.147 - - [06/Apr/2013:20:00:00 +0900] "GET / HTTP/1.1" 200 9625 "-" "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0)"
 
-74.125.31.147 - - [05/Apr/2013:21:00:00 +0900] "GET / HTTP/1.1" 200 9625 "-" "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0)"
+24.125.31.147 - - [05/Apr/2013:21:00:00 +0900] "GET / HTTP/1.1" 200 9625 "-" "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0)"
 
diff --git a/tests/resources/extractSearchEngineInformationFromUrlTests.yml b/tests/resources/extractSearchEngineInformationFromUrlTests.yml
index c02aec118f..6043e0d32f 100644
--- a/tests/resources/extractSearchEngineInformationFromUrlTests.yml
+++ b/tests/resources/extractSearchEngineInformationFromUrlTests.yml
@@ -432,6 +432,10 @@
   engine: 'SeeSaa'
   keywords: '日本テレビ放送網'
 
+- url: 'http://en.toppreise.ch/index.php?search=w%FCrzpr%E4nft%DF&sRes=OK'
+  engine: 'Toppreise.ch'
+  keywords: 'würzpränftß'
+
 - url: 'http://chercherfr.aguea.com/s.py?q=piwik'
   engine: 'Aguea'
   keywords: 'piwik'
diff --git a/tests/resources/staticFileServer.php b/tests/resources/staticFileServer.php
index 7975b79348..bf26da55f4 100644
--- a/tests/resources/staticFileServer.php
+++ b/tests/resources/staticFileServer.php
@@ -13,35 +13,14 @@ use Piwik\Common;
 use Piwik\ProxyHttp;
 
 define('PIWIK_DOCUMENT_ROOT', dirname(__FILE__).'/../../');
-if(file_exists(PIWIK_DOCUMENT_ROOT . '/bootstrap.php'))
-{
+if(file_exists(PIWIK_DOCUMENT_ROOT . '/bootstrap.php')) {
     require_once PIWIK_DOCUMENT_ROOT . '/bootstrap.php';
 }
-
-error_reporting(E_ALL|E_NOTICE);
-@ini_set('display_errors', defined('PIWIK_DISPLAY_ERRORS') ? PIWIK_DISPLAY_ERRORS : @ini_get('display_errors'));
-@ini_set('xdebug.show_exception_trace', 0);
-@ini_set('magic_quotes_runtime', 0);
-
-if(!defined('PIWIK_USER_PATH'))
-{
-    define('PIWIK_USER_PATH', PIWIK_DOCUMENT_ROOT);
-}
-if(!defined('PIWIK_INCLUDE_PATH'))
-{
+if (!defined('PIWIK_INCLUDE_PATH')) {
     define('PIWIK_INCLUDE_PATH', PIWIK_DOCUMENT_ROOT);
 }
 
-require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php';
-require_once PIWIK_INCLUDE_PATH . '/core/testMinimumPhpVersion.php';
-
-// NOTE: the code above this comment must be PHP4 compatible
-
-session_cache_limiter('nocache');
-@date_default_timezone_set('UTC');
-
-require_once PIWIK_INCLUDE_PATH . '/core/Loader.php';
-\Piwik\Loader::init();
+require_once PIWIK_INCLUDE_PATH . '/core/bootstrap.php';
 
 // This is Piwik logo, the static file used in this test suit
 define("TEST_FILE_LOCATION", dirname(__FILE__) . "/lipsum.txt");
diff --git a/tests/travis/autoupdate_travis_yml.sh b/tests/travis/autoupdate_travis_yml.sh
index a8abde15b9..4409d83051 100755
--- a/tests/travis/autoupdate_travis_yml.sh
+++ b/tests/travis/autoupdate_travis_yml.sh
@@ -1,9 +1,18 @@
-cd #!/bin/bash
+#!/bin/bash
 
-if [ "$PLUGIN_NAME" != "" ]; then
-    cd $PIWIK_ROOT_DIR/plugins/$PLUGIN_NAME
+if [ "$REPO_ROOT_DIR" == "" ]; then
+    if [ "$PLUGIN_NAME" != "" ]; then
+        REPO_ROOT_DIR="$PIWIK_ROOT_DIR/plugins/$PLUGIN_NAME"
+    else
+        REPO_ROOT_DIR="$PIWIK_ROOT_DIR"
+    fi
 fi
 
+# remove the command from CoreConsole if it exists
+rm $PIWIK_ROOT_DIR/plugins/CoreConsole/Commands/GenerateTravisYmlFile.php || true
+
+cd $REPO_ROOT_DIR
+
 LATEST_COMMIT_HASH=`git rev-parse $TRAVIS_BRANCH`
 CURRENT_COMMIT_HASH=`git rev-parse HEAD`
 
@@ -19,9 +28,15 @@ if [ "$LATEST_COMMIT_HASH" != "$CURRENT_COMMIT_HASH" ]; then
     exit;
 fi
 
+# if the generate:travis-yml command doesn't exist for some reason, abort auto-update w/o failing build
+if ! bash -c "$PIWIK_ROOT_DIR/console help generate:travis-yml" > /dev/null; then
+    echo "The generate:travis-yml command does not exist in this Piwik, aborting auto-update."
+    exit;
+fi
+
 # check if .travis.yml is out of date. if github token is supplied we will try to auto-update,
 # otherwise we just print a message and exit.
-if ! bash -c "$GENERATE_TRAVIS_YML_COMMAND --dump=./generated.travis.yml"; then
+if ! bash -c "$GENERATE_TRAVIS_YML_COMMAND -v --dump=./generated.travis.yml"; then
     echo "generate:travis-yml failed!"
 
     # if building for 'latest_stable' ignore the error and continue build
@@ -33,9 +48,7 @@ if ! bash -c "$GENERATE_TRAVIS_YML_COMMAND --dump=./generated.travis.yml"; then
     exit 1
 fi
 
-if [ "$PLUGIN_NAME" != "" ]; then
-    cd $PIWIK_ROOT_DIR/plugins/$PLUGIN_NAME
-fi
+cd $REPO_ROOT_DIR
 
 echo "Diffing generated with existing (located at `pwd`/.travis.yml)..."
 
@@ -53,7 +66,11 @@ if [ "$DIFF_RESULT" -eq "1" ]; then
         grep ".travis.yml file is out of date" <<< "$LAST_COMMIT_MESSAGE" > /dev/null
         LAST_COMMIT_IS_NOT_UPDATE=$?
 
-        if [ "$LAST_COMMIT_MESSAGE" == "" ] || [ "$LAST_COMMIT_IS_NOT_UPDATE" -eq "0" ]; then
+        LAST_COMMIT_TIMESTAMP=$(git log -1 HEAD --pretty=format:%ct)
+        LAST_COMMIT_TIME_FROM_NOW=$(expr $(date +%s) - $LAST_COMMIT_TIMESTAMP)
+        LAST_COMMIT_WITHIN_HOUR=$(expr $LAST_COMMIT_TIME_FROM_NOW '<=' 3600)
+
+        if [ "$LAST_COMMIT_MESSAGE" == "" ] || [[ "$LAST_COMMIT_IS_NOT_UPDATE" -eq "0" && "$LAST_COMMIT_WITHIN_HOUR" -ne "0" ]]; then
             echo "Last commit message was '$LAST_COMMIT_MESSAGE', possible recursion or error in auto-update, aborting."
         else
 
diff --git a/tests/travis/checkout_test_against_branch.sh b/tests/travis/checkout_test_against_branch.sh
new file mode 100755
index 0000000000..e458639cef
--- /dev/null
+++ b/tests/travis/checkout_test_against_branch.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+SCRIPT_DIR=`dirname $0`
+
+if [ "$TEST_AGAINST_PIWIK_BRANCH" == "" ]; then
+    if [ "$TEST_AGAINST_CORE" == "latest_stable" ]; then # test against the latest stable release of piwik core (including betas & release candidates)
+        # keeping latest_stable enabled until all plugins successfully migrated
+        export TEST_AGAINST_PIWIK_BRANCH=$(git describe --tags `git rev-list --tags --max-count=1`)
+        export TEST_AGAINST_PIWIK_BRANCH=`echo $TEST_AGAINST_PIWIK_BRANCH | tr -d ' ' | tr -d '\n'`
+
+        #echo "Testing against 'latest_stable' is no longer supported, please test against 'minimum_required_piwik'."
+        #exit 1
+    elif [[ "$TEST_AGAINST_CORE" == "minimum_required_piwik" && "$PLUGIN_NAME" != "" ]]; then # test against the minimum required Piwik in the plugin.json file
+        export TEST_AGAINST_PIWIK_BRANCH=$(php "$SCRIPT_DIR/get_required_piwik_version.php" $PLUGIN_NAME)
+
+        if ! git rev-parse "$TEST_AGAINST_PIWIK_BRANCH" >/dev/null 2>&1
+        then
+            echo "Could not find tag '$TEST_AGAINST_PIWIK_BRANCH' specified in plugin.json, testing against master."
+
+            export TEST_AGAINST_PIWIK_BRANCH=master
+        fi
+    else
+        export TEST_AGAINST_PIWIK_BRANCH=master
+    fi
+fi
+
+echo "Testing against '$TEST_AGAINST_PIWIK_BRANCH'"
+git checkout "$TEST_AGAINST_PIWIK_BRANCH"
diff --git a/tests/travis/generate_docs.sh b/tests/travis/generate_docs.sh
index d053d93af8..532442bcb0 100755
--- a/tests/travis/generate_docs.sh
+++ b/tests/travis/generate_docs.sh
@@ -25,7 +25,7 @@ phpdoc -f libs/PiwikTracker/PiwikTracker.php --title="PiwikTracker" -t docs/Piwi
 
 # Install lftp
 echo "Installing lftp"
-sudo apt-get install lftp
+sudo apt-get install lftp > /dev/null
 
 # Upload generated docs via FTP
 echo "Upload generated docs"
diff --git a/tests/travis/get_required_piwik_version.php b/tests/travis/get_required_piwik_version.php
new file mode 100644
index 0000000000..f815bc30d9
--- /dev/null
+++ b/tests/travis/get_required_piwik_version.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+// tiny script to get plugin version from plugin.json from a bash script
+require_once __DIR__ . '/../../core/Version.php';
+
+$pluginName = $argv[1];
+$pluginJsonPath = __DIR__ . "/../../plugins/$pluginName/plugin.json";
+
+$pluginJsonContents = file_get_contents($pluginJsonPath);
+$pluginJsonContents = json_decode($pluginJsonContents, true);
+
+$minimumRequiredPiwik = @$pluginJsonContents["require"]["piwik"];
+
+if (empty($minimumRequiredPiwik)) {
+    $minimumRequiredPiwik = "master";
+} else {
+    if (!preg_match("/^[^0-9]*(.*)/", $minimumRequiredPiwik, $matches)
+        || empty($matches[1])
+        || version_compare($matches[1], \Piwik\Version::VERSION) > 0
+    ) {
+        $minimumRequiredPiwik = "master";
+    } else {
+        $minimumRequiredPiwik = $matches[1];
+    }
+}
+
+echo $minimumRequiredPiwik;
\ No newline at end of file
diff --git a/tests/travis/initiate_ui_tests.sh b/tests/travis/initiate_ui_tests.sh
deleted file mode 100755
index f9c1559ce6..0000000000
--- a/tests/travis/initiate_ui_tests.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# initiate UI tests before starting system tests for php 5.5
-if [ "$TEST_SUITE" != "SystemTests" ] || [[ "$TRAVIS_PHP_VERSION" != 5\.6* ]]; then
-    echo "Not initiating UI tests (\$TEST_SUITE = $TEST_SUITE, \$TRAVIS_PHP_VERSION = $TRAVIS_PHP_VERSION)."
-    exit
-fi
-
-if [ "$PIWIK_AUTOMATION" = "" ]; then
-    echo "Automation details are not present, skipping UI tests."
-    exit
-fi
-
-COMMIT_MESSAGE=$(git log "$TRAVIS_COMMIT" -1 --pretty=%B)
-
-cd tests/PHPUnit/UI
-
-UI_BRANCH="master"
-git checkout $UI_BRANCH
-git pull --rebase origin $UI_BRANCH
-
-echo "$TRAVIS_COMMIT
-$TRAVIS_BRANCH" > piwik_commit.txt
-
-git add ./piwik_commit.txt
-git commit -m "Travis: Initiating build for commit '$TRAVIS_COMMIT' on branch '$TRAVIS_BRANCH': $COMMIT_MESSAGE"
-git remote set-url origin "https://piwik-auto-commit-bot:$PIWIK_AUTOMATION@github.com/piwik/piwik-ui-tests.git"
-
-if ! git push origin $UI_BRANCH 2> /dev/null; then
-    echo "Failed to push!"
-    exit 1
-fi
diff --git a/tests/travis/install_mysql_5.6.sh b/tests/travis/install_mysql_5.6.sh
new file mode 100755
index 0000000000..8d4dd050d4
--- /dev/null
+++ b/tests/travis/install_mysql_5.6.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# remove mysql 5.5
+sudo apt-get remove mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5 > /dev/null
+sudo apt-get autoremove > /dev/null
+sudo apt-get install libaio1 > /dev/null
+
+# install mysql 5.6
+wget -O mysql-5.6.14.deb http://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-5.6.14-debian6.0-x86_64.deb/from/http://cdn.mysql.com/  > /dev/null
+sudo dpkg -i mysql-5.6.14.deb
+sudo cp /opt/mysql/server-5.6/support-files/mysql.server /etc/init.d/mysql.server
+sudo ln -s /opt/mysql/server-5.6/bin/* /usr/bin/
+
+# some config values were changed since 5.5
+sudo sed -i'' 's/table_cache/table_open_cache/' /etc/mysql/my.cnf
+sudo sed -i'' 's/log_slow_queries/slow_query_log/' /etc/mysql/my.cnf
+sudo sed -i'' 's/basedir[^=]\+=.*$/basedir = \/opt\/mysql\/server-5.6/' /etc/mysql/my.cnf
+sudo /etc/init.d/mysql.server start
diff --git a/tests/travis/prepare.sh b/tests/travis/prepare.sh
index 93531210ce..b9f4068dbb 100755
--- a/tests/travis/prepare.sh
+++ b/tests/travis/prepare.sh
@@ -1,16 +1,16 @@
 #!/bin/bash
 set -e
 
-sudo apt-get update
+sudo apt-get update > /dev/null
 
 # Install XMLStarlet
-sudo apt-get install -qq xmlstarlet
+sudo apt-get install -qq xmlstarlet > /dev/null
 
 # Install fonts for UI tests
 if [ "$TEST_SUITE" = "UITests" ];
 then
     sudo sh -c "echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections"
-    sudo apt-get install -qq ttf-mscorefonts-installer
+    sudo apt-get install -qq ttf-mscorefonts-installer > /dev/null
 fi
 
 # Copy Piwik configuration
@@ -21,6 +21,10 @@ sed "s/PDO\\\MYSQL/${MYSQL_ADAPTER}/g" ./tests/PHPUnit/config.ini.travis.php > .
 echo "Adjusting phpunit.xml"
 cp ./tests/PHPUnit/phpunit.xml.dist ./tests/PHPUnit/phpunit.xml
 
+if grep "@REQUEST_URI@" ./tests/PHPUnit/phpunit.xml > /dev/null; then
+    sed -i 's/@REQUEST_URI@/\//g' ./tests/PHPUnit/phpunit.xml
+fi
+
 if [ -n "$PLUGIN_NAME" ];
 then
       sed -n '/<filter>/{p;:a;N;/<\/filter>/!ba;s/.*\n/<whitelist addUncoveredFilesFromWhitelist=\"true\">\n<directory suffix=\".php\">..\/..\/plugins\/'$PLUGIN_NAME'<\/directory>\n<exclude>\n<directory suffix=\".php\">..\/..\/plugins\/'$PLUGIN_NAME'\/tests<\/directory>\n<directory suffix=\".php\">..\/..\/plugins\/'$PLUGIN_NAME'\/Test<\/directory>\n<directory suffix=\".php\">..\/..\/plugins\/'$PLUGIN_NAME'\/Updates<\/directory>\n<\/exclude>\n<\/whitelist>\n/};p' ./tests/PHPUnit/phpunit.xml > ./tests/PHPUnit/phpunit.xml.new && mv ./tests/PHPUnit/phpunit.xml.new ./tests/PHPUnit/phpunit.xml
@@ -41,5 +45,10 @@ mkdir ./tmp/sessions
 mkdir ./tmp/templates_c
 mkdir ./tmp/tcpdf
 mkdir ./tmp/climulti
-chmod a+rw ./tests/lib/geoip-files
-chmod a+rw ./plugins/*/tests/System/processed
+chmod a+rw ./tests/lib/geoip-files || true
+chmod a+rw ./plugins/*/tests/System/processed || true
+chmod a+rw ./plugins/*/tests/Integration/processed || true
+
+# install phpredis
+echo 'extension="redis.so"' > ./tmp/redis.ini
+phpenv config-add ./tmp/redis.ini
diff --git a/tests/travis/setup_webserver.sh b/tests/travis/setup_webserver.sh
index 27a205d20a..f6aa59fb47 100755
--- a/tests/travis/setup_webserver.sh
+++ b/tests/travis/setup_webserver.sh
@@ -4,8 +4,8 @@ set -e
 DIR=$(dirname "$0")
 
 echo "Installing nginx"
-sudo apt-get update -qq
-sudo apt-get install -qq nginx realpath
+sudo apt-get update -qq > /dev/null
+sudo apt-get install -qq nginx realpath > /dev/null
 
 sudo service nginx stop
 
diff --git a/tests/travis/travis-helper.sh b/tests/travis/travis-helper.sh
index bf0e5ce2dd..b00585d8a3 100644
--- a/tests/travis/travis-helper.sh
+++ b/tests/travis/travis-helper.sh
@@ -21,9 +21,9 @@ travis_wait() {
   } || return 1
 
   if [ $result -eq 0 ]; then
-echo -e "\n${GREEN}The command \"$TRAVIS_CMD\" exited with $result.${RESET}"
+echo -e "\n${GREEN}The command \"${TRAVIS_CMD}\" exited with $result.${RESET}"
   else
-echo -e "\n${RED}The command \"$TRAVIS_CMD\" exited with $result.${RESET}"
+echo -e "\n${RED}The command \"${TRAVIS_CMD}\" exited with $result.${RESET}"
   fi
 
 echo -e "\n${GREEN}Log:${RESET}\n"
diff --git a/tests/travis/travis.sh b/tests/travis/travis.sh
index f9f900cbda..fcdcbfff1c 100755
--- a/tests/travis/travis.sh
+++ b/tests/travis/travis.sh
@@ -28,7 +28,12 @@ then
     then
         if [ -n "$PLUGIN_NAME" ]
         then
-            artifacts_folder="protected/ui-tests.$TRAVIS_BRANCH.$PLUGIN_NAME"
+            artifacts_folder="ui-tests.$TRAVIS_BRANCH.$PLUGIN_NAME"
+
+            if [ "$UNPROTECTED_ARTIFACTS" = "" ];
+            then
+                artifacts_folder="protected/$artifacts_folder"
+            fi
         else
             artifacts_folder="ui-tests.$TRAVIS_BRANCH"
         fi
@@ -38,14 +43,21 @@ then
         echo ""
         echo "http://builds-artifacts.piwik.org/$artifacts_folder/$TRAVIS_JOB_NUMBER/screenshot-diffs/diffviewer.html"
         echo ""
-        echo "If the new screenshots are valid, then you can copy them over to tests/PHPUnit/UI/expected-ui-screenshots/."
-        echo ""
+        echo "If the new screenshots are valid, then you can copy them over to tests/UI/expected-ui-screenshots/"
+
+        if [ -n "$PLUGIN_NAME" ]
+        then
+            echo " with command:"
+            echo ""
+            echo "./console development:sync-ui-test-screenshots $TRAVIS_JOB_NUMBER"
+            echo ""
+        fi
 
         if [ -n "$PLUGIN_NAME" ]
         then
             phantomjs ../lib/screenshot-testing/run-tests.js --assume-artifacts --persist-fixture-data --screenshot-repo=$TRAVIS_REPO_SLUG --plugin=$PLUGIN_NAME
         else
-            phantomjs ../lib/screenshot-testing/run-tests.js --store-in-ui-tests-repo --persist-fixture-data --assume-artifacts
+            phantomjs ../lib/screenshot-testing/run-tests.js --store-in-ui-tests-repo --persist-fixture-data --assume-artifacts --core
         fi
     elif [ "$TEST_SUITE" = "AllTests" ]
     then
@@ -53,19 +65,19 @@ then
     else
         if [ -n "$PLUGIN_NAME" ]
         then
-            travis_wait phpunit --configuration phpunit.xml --colors --testsuite $TEST_SUITE --group $PLUGIN_NAME --coverage-clover $PIWIK_ROOT_DIR/build/logs/clover-$PLUGIN_NAME.xml
+            travis_wait phpunit --configuration phpunit.xml --colors --testsuite $TEST_SUITE --group $PLUGIN_NAME --coverage-clover $PIWIK_ROOT_DIR/build/logs/clover-$PLUGIN_NAME.xml $PHPUNIT_EXTRA_OPTIONS
         else
-            travis_wait phpunit --configuration phpunit.xml --testsuite $TEST_SUITE --colors
+            travis_wait phpunit --configuration phpunit.xml --testsuite $TEST_SUITE --colors $PHPUNIT_EXTRA_OPTIONS
         fi
     fi
 else
     if [ "$COVERAGE" = "Unit" ]
     then
         echo "Executing tests in test suite UnitTests..."
-        phpunit --configuration phpunit.xml --testsuite UnitTests --colors --coverage-clover $TRAVIS_BUILD_DIR/build/logs/clover-unit.xml || true
+        phpunit --configuration phpunit.xml --testsuite UnitTests --colors --coverage-clover $TRAVIS_BUILD_DIR/build/logs/clover-unit.xml $PHPUNIT_EXTRA_OPTIONS || true
     elif [ "$COVERAGE" = "Integration" ]
     then
         echo "Executing tests in test suite IntegrationTests..."
-        phpunit --configuration phpunit.xml --testsuite IntegrationTests --colors --coverage-clover $TRAVIS_BUILD_DIR/build/logs/clover-integration.xml || true
+        phpunit --configuration phpunit.xml --testsuite IntegrationTests --colors --coverage-clover $TRAVIS_BUILD_DIR/build/logs/clover-integration.xml $PHPUNIT_EXTRA_OPTIONS || true
     fi;
 fi
diff --git a/tests/travis/upload_artifacts.sh b/tests/travis/upload_artifacts.sh
index c1e42142e9..20782dcab5 100755
--- a/tests/travis/upload_artifacts.sh
+++ b/tests/travis/upload_artifacts.sh
@@ -20,7 +20,12 @@ else
         if [ -n "$PLUGIN_NAME" ];
         then
             branch_name="$branch_name.$PLUGIN_NAME"
-            url_base="$url_base&protected=1"
+
+            if [ "$UNPROTECTED_ARTIFACTS" = "" ];
+            then
+                url_base="$url_base&protected=1"
+                using_protected=1
+            fi
         fi
 
         url_base="$url_base&branch=$branch_name"
@@ -36,7 +41,7 @@ else
                 cd "./plugins/$PLUGIN_NAME/tests/UI"
             fi
         else
-            cd ./tests/PHPUnit/UI
+            cd ./tests/UI
         fi
 
         # upload processed tarball
@@ -44,7 +49,7 @@ else
         curl -X POST --data-binary @processed-ui-screenshots.tar.bz2 "$url_base&artifact_name=processed-ui-screenshots"
 
         # upload diff tarball if it exists
-        cd $base_dir/tests/PHPUnit/UI
+        cd $base_dir/tests/UI
         if [ -d "./screenshot-diffs" ];
         then
             echo "Uploading artifcats..."
@@ -61,11 +66,17 @@ else
             tar -cjf screenshot-diffs.tar.bz2 screenshot-diffs
             curl -X POST --data-binary @screenshot-diffs.tar.bz2 "$url_base&artifact_name=screenshot-diffs"
 
+            url_base="http://builds-artifacts.piwik.org"
+            if [ -n "$using_protected" ];
+            then
+                url_base="$url_base/protected"
+            fi
+
             if [ -n "$PLUGIN_NAME" ];
             then
-                diffviewer_url="http://builds-artifacts.piwik.org/protected/$branch_name/$TRAVIS_JOB_NUMBER/screenshot-diffs/diffviewer.html"
+                diffviewer_url="$url_base/protected/$branch_name/$TRAVIS_JOB_NUMBER/screenshot-diffs/diffviewer.html"
             else
-                diffviewer_url="http://builds-artifacts.piwik.org/$branch_name/$TRAVIS_JOB_NUMBER/screenshot-diffs/diffviewer.html"
+                diffviewer_url="$url_base/$branch_name/$TRAVIS_JOB_NUMBER/screenshot-diffs/diffviewer.html"
             fi
 
             echo =e "View UI failures (if any) here: \n$diffviewer_url\n"